crabatool 1.0.458 → 1.0.463

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.458",
+  "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

@@ -185,9 +185,14 @@ function compressFiles(inNames, outName, initJs) {
   });
 
   var resContent = `$app.addRes(${JSON.stringify(json)});`;
+  var crabaJs = false;
+  if (outName && outName.includes('craba.min.js')) {
+    initJs = outName;
+    crabaJs = true;
+  }
   if (initJs) { // 资源包压缩到init.js里面一次性下放
     if (!fs.existsSync(initJs)) {
-      console.log('打包失败，init.js不存在', initJs);
+      console.log('打包失败，打包res资源的js不存在', initJs);
       return;
     }
     var initJsContent = fs.readFileSync(initJs, 'utf-8');
@@ -197,11 +202,13 @@ function compressFiles(inNames, outName, initJs) {
     var endIndex = initJsContent.indexOf(resEnd);
     if (startIndex > -1 && endIndex > -1) {
       initJsContent = initJsContent.slice(0, startIndex + resStart.length) + '\r\n' + resContent + '\r\n' + initJsContent.slice(endIndex);
+    } else if (crabaJs) {
+      initJsContent = initJsContent + '\r\n' + resStart + '\r\n' + resContent + '\r\n' + resEnd;
     } else {
       initJsContent = resStart + '\r\n' + resContent + '\r\n' + resEnd + '\r\n' + initJsContent;
     }
     fs.writeFileSync(initJs, initJsContent);
-    console.log('compressFiles完成，资源包追加initjs的方式，路径：', initJs);
+    console.log('compressFiles完成，资源包追加js的方式，路径：', initJs);
   } else {
     utils.mkdirsSync(outName);
     fs.writeFileSync(outName, resContent);
@@ -262,6 +269,7 @@ function compressCss(inNames, targetCss) {
 
   console.log('compress完成', inNames, targetCss);
   console.log('\r\n');
+  //console.log(content);
   return content;
 }
 
@@ -288,7 +296,7 @@ function compressGspx(filePath) {
   xml = removeXMLComments(xml); // 手动替换注释，xml-minifier的removeComments没有生效的
   xml = safeXmlMinify(xml);
   return xml.trim();
-  
+
   /*
   let minified = xmlMinifier.minify(xml, {
     collapseWhitespace: true,   // 折叠空白

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);
     }
   }