crabatool 1.0.462 → 1.0.463

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.462",
+  "version": "1.0.463",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -13,7 +13,7 @@
     "mergeinitjs": "node ./test/test.js -mergeinitjs",
     "export": "node ./test/test.js -exportgspx -webPath F:/Beefun/srcs",
     "checkjs": "node ./test/test.js -checkjs",
-    "mergeFiles": "node ./test/test.js -mergeFiles -modName shell -webPath F:/shell-gerrit/web/src/main/resources/static/shell/ -targetPath F:/shell-gerrit/web/src/main/resources/static/shell/ -inNames skins/craba.min.css,skins/blueSky/skin.css,skins/shell.css,pages/RetailHome.gspx,pages/RetailHome.js,basics/Company.gspx,basics/Company.js,basics/PicUploadForm.gspx,basics/PicUploadForm.js,js/innerNotice.js,Main.gspx,Main.js,js/init.js,js/timingCollector.js,js/help.plug.js -outName F:/shell-gerrit/web/src/main/resources/static/shell/shell.res.js",
+    "mergeFiles": "node ./test/test.js -mergeFiles -modName shell -webPath F:/shell-gerrit/web/src/main/resources/static/shell/ -targetPath F:/shell-gerrit/web/src/main/resources/static/shell/ -inNames skins/craba.min.css,skins/blueSky/skin.css,skins/shell.css,pages/RetailHome.gspx,pages/RetailHome.js,basics/Company.gspx,basics/Company.js,basics/PicUploadForm.gspx,basics/PicUploadForm.js,js/innerNotice.js,Main.gspx,Main.js,js/init.js,js/timingCollector.js,js/help.plug.js -outName F:/shell-gerrit/web/src/main/resources/static/shell/shell.res.js -clearCache true",
     "mergeJxcFiles": "node ./test/test.js -mergeFiles -modName jxc -webPath F:/jxc/jxc-web/src/main/resources/static/jxc/ -targetPath F:/jxc/jxc-web/src/main/resources/static/jxc/ -inNames skins/blueSky/skin.css,js/wpsSettings.js,baseinfo/js/qiniu.min.js,baseinfo/js/baseinfo.constant.js,baseinfo/js/grid.ext.js,finance/js/finance.constant.js,baseinfo/js/lockScreen.js -initJs F:/jxc/jxc-web/src/main/resources/static/jxc/js/init.js",
     "mergeSaleFiles": "node ./test/test.js -mergeFiles -modName sale -webPath F:/sale/web/src/main/resources/static/sale/ -targetPath F:/sale/web/src/main/resources/static/sale/ -inNames skins/style/ColorSelectCss.css,skins/blueSky/skin.css,js/jquery.min.js,analysiscloud/js/wpsSettings.js,shopsale/js/payway.js,shopsale/js/billposter.js,eshoporder/eshopsaleorder/RetailHomeData.gspx,eshoporder/eshopsaleorder/RetailHomeData.js -initJs F:/sale/web/src/main/resources/static/sale/js/init.js",
     "checkiconfont": "node ./test/test.js -checkiconfont -webPath F:/crabaevery/www -modName crabaevery -reportHost http://127.0.0.1:9998 -ignoreFiles biconfont/iconfont.js,iconfont/iconfont.js -cssFiles skins/retail/skin.css",

package/tool/compress.js

@@ -269,6 +269,7 @@ function compressCss(inNames, targetCss) {
 
   console.log('compress完成', inNames, targetCss);
   console.log('\r\n');
+  //console.log(content);
   return content;
 }
 

package/tool/merge/mergeTool.js

@@ -241,16 +241,18 @@ function compressFile(filePath, options, filePath2, stats) {
     // 压缩js或css文件
     if (!options.ignoreCompress) {
       utils.debug("压缩文件:" + filePath);
-      content = utils.toUtf8(content);
       if (options.ext == '.js') {
+        content = utils.toUtf8(content);
         content = UglifyJS.minify(content, compressOptions).code;
       } else {
+        if (content.includes('.name.stop')) {
+          console.log(content);
+        }
         content = UglifyCss.processString(content, {
           maxLineLen: 1000,
           expandVars: false
         });
       }
-
       copyByteToCache(filePath, content, stats, options);
     }
   }