fix issue #16

daxingplay · Jan 19, 2013 · a522774 · a522774
1 parent 529d6ac
commit a522774
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ Thumbs.db
 out/
 node_modules/
 .log
+projectFilesBackup/
diff --git a/lib/index.js b/lib/index.js
@@ -48,17 +48,20 @@ var ModuleCompiler = {
         suffix: '',
         charset: '',
         debug: false,
+        combine: false,
         silent: false
     },
     _packages: {},
     _mappedRules: [],
     _moduleCache: {},
     _analyzedFiles: [],
     _combinedModules: [],
+    _dependencies: {},
     _clean: function(){
         this._moduleCache = {};
         this._analyzedFiles = [];
         this._combinedModules = [];
+        this._dependencies = {};
     },
     _parseConfig: function(cfg){
         var self = this;
@@ -70,6 +73,7 @@ var ModuleCompiler = {
                     pkg.charset = '';
                 }
                 pkg.path = path.resolve(addPkgNameToPath(pkg.path, pkg.name)) || __dirname;
+                pkg.combine = !!pkg.combine;
                 if(fs.existsSync(pkg.path)){
                     self._packages[pkg.name] = pkg;
                 }
@@ -459,8 +463,7 @@ module.exports = {
      * @return {Object}
      */
     build: function(inputPath, outputPath, outputCharset){
-        var self = this,
-            target = path.resolve(inputPath),
+        var target = path.resolve(inputPath),
             result = {
                 'success': true,
                 'files': []
@@ -487,7 +490,7 @@ module.exports = {
                 result.files.push(ModuleCompiler.build(modulePath, outputPath, outputCharset));
             }else{
                 result.success = false;
-                !self._config.silent && console.info('[err]'.bold.red + ' cannot find target: %s', target);
+                !ModuleCompiler._config.silent && console.info('[err]'.bold.red + ' cannot find target: %s', target);
             }
         }
         return result;
@@ -498,6 +501,7 @@ module.exports = {
             ignoreFiles: [],
             suffix: '',
             charset: '',
+            combine: false,
             silent: false
         };
         ModuleCompiler._packages = {};

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name":"module-compiler",
-    "version":"0.0.6",
+    "version":"0.0.7",
     "description":"kissy module compiler",
     "author":"daxingplay <daxingplay@gmail.com>",
     "homepage":"",