fis-command-release - npm Package Compare versions

Comparing version 0.3.6 to 0.3.7

package.json

 {
     "name" : "fis-command-release",
     "description" : "fis release command.",
-    "version" : "0.3.6",
+    "version" : "0.3.7",
     "author" : "FIS Team <[e-mail]>",
@@ -6,0 +6,0 @@ "homepage" : "http://fis.baidu.com/",

release.js

@@ -14,14 +14,2 @@ /*
         var root = fis.project.getProjectPath();
-        var isWin = fis.util.isWin();
-        var ignored = [];
-        [ 'output', fis.project.conf.substring(root.length + 1) ].forEach(function(pattern){
-            pattern = isWin ? pattern.replace(/\//g, '\\') : pattern;
-            ignored.push('^' + fis.util.escapeReg(pattern) + '\b');
-        });
-        if(isWin){
-            ignored.push(fis.util.escapeReg('\\.'));
-        } else {
-            ignored.push(fis.util.escapeReg('/.'));
-        }
-        ignored = new RegExp(ignored.join('|'), 'i');
         var timer = -1;
@@ -110,3 +98,3 @@ var safePathReg = /^[:\\\/ _\-.\w]+$/i;
             var cwd = fis.util.realpath(process.cwd()),
-                filename = fis.config.get('system.conf', fis.project.DEFAULT_CONF_FILE),
+                filename = fis.project.conf,
                 pos = cwd.length, conf;
@@ -117,30 +105,29 @@ do {
                 if(fis.util.exists(conf)){
+                    //init project
+                    fis.project.setProjectRoot(cwd);
                     //merge standard conf
                     fis.config.merge(fis.util.readJSON(__dirname + '/standard.json'));
-                    //init project
-                    fis.project.init(cwd, conf, function(){
-                        
-                        //configure log
-                        fis.log.level = options.debug ? fis.log.L_ALL : fis.log.level;
-                        fis.log.throw = true;
-                        
-                        //compile setup
-                        var tmp = fis.compile.setup({
-                            debug    : options.debug,
-                            optimize : options.optimize,
-                            lint     : options.lint,
-                            hash     : options.md5 > 0,
-                            domain   : options.domain
-                        });
-                        
-                        if(options.clean){
-                            fis.cache.clean(tmp);
-                        }
-                        
-                        if(options.watch){
-                            watch(options);
-                        } else {
-                            release(options);
-                        }
+                    //merge user conf
+                    fis.config.merge(fis.util.readJSON(conf));
+                    //configure log
+                    fis.log.level = options.debug ? fis.log.L_ALL : fis.log.level;
+                    fis.log.throw = true;
+                    //compile setup
+                    var tmp = fis.compile.setup({
+                        debug    : options.debug,
+                        optimize : options.optimize,
+                        lint     : options.lint,
+                        hash     : options.md5 > 0,
+                        domain   : options.domain
                     });
+                    
+                    if(options.clean){
+                        fis.cache.clean(tmp);
+                    }
+                    
+                    if(options.watch){
+                        watch(options);
+                    } else {
+                        release(options);
+                    }
                     return;
@@ -147,0 +134,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

10931

decreased by-5.47%

Lines of code

212

decreased by-4.93%

No dependency changes