crabatool 1.0.455 → 1.0.457

package/index.js

@@ -204,7 +204,8 @@ async function checkFast(args) {
 
   if (args.includes('-mergeFiles')) { // 将特定文件压缩后，路径作为key，合并到一个json文件包，减少http请求
     start.bindAndCheckConfig('-inNames');
-    start.bindAndCheckConfig('-outName');
+    start.bindConfigByArgv('-outName');
+    start.bindConfigByArgv('-initJs');
     start.bindConfigByArgv('-targetPath');
     start.bindConfigByArgv('-exp');
     config.mergeFile = true;

package/lib/utils.js

@@ -49,6 +49,16 @@ class Utils {
     constructor() {
         this.cryptoKey = '$wssf20119@.Z+Q$';
     }
+    
+    removePathPrefix(fullPath, prefix) {
+        // 规范化路径（统一分隔符为当前系统的分隔符）
+        const normalizedFullPath = path.normalize(fullPath);
+        const normalizedPrefix = path.normalize(prefix);
+
+        // 使用 path.relative 计算相对路径
+        return path.relative(normalizedPrefix, normalizedFullPath);
+    }
+
     isLocal(req) {
         //const hostname = os.hostname();
         //console.log(req.headers.host);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.455",
+  "version": "1.0.457",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -9,30 +9,32 @@
   "scripts": {
     "start": "node run.js",
     "test": "node ./test/test.js",
-    "run": "node ./test/test.js -run -webPath F:\\basicweb\\www -refresh true",
+    "run": "node ./test/test.js -run -webPath F:/basicweb/www -refresh true",
     "mergeinitjs": "node ./test/test.js -mergeinitjs",
-    "export": "node ./test/test.js -exportgspx -webPath F:\\Beefun\\srcs",
+    "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 js\\crabaNgp.js,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",
-    "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",
-    "checkiconfontBf": "node ./test/test.js -checkiconfont -webPath F:\\Beefun\\srcs -modName beefun -reportHost http://127.0.0.1:9998 -ignoreFiles biconfont\\iconfont.js,iconfont\\iconfont.js",
-    "checkiconfontCraba": "node ./test/test.js -checkiconfont -webPath F:\\CarpaNET_NEW\\src\\Carpa.Web\\js -modName craba -reportHost http://127.0.0.1:9998 -ignoreFiles biconfont\\iconfont.js,iconfont\\iconfont.js -cssFiles ../skins/craba.min.css",
+    "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 js/crabaNgp.js,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",
+    "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",
+    "checkiconfontBf": "node ./test/test.js -checkiconfont -webPath F:/Beefun/srcs -modName beefun -reportHost http://127.0.0.1:9998 -ignoreFiles biconfont/iconfont.js,iconfont/iconfont.js",
+    "checkiconfontCraba": "node ./test/test.js -checkiconfont -webPath F:/CarpaNET_NEW/src/Carpa.Web/js -modName craba -reportHost http://127.0.0.1:9998 -ignoreFiles biconfont/iconfont.js,iconfont/iconfont.js -cssFiles ../skins/craba.min.css",
     "beefun": "node ./test/beefun.js -checkjs",
-    "checkUpdate": "node run.js -checkUpdate -version master -webPath F:\\crabaevery\\www",
-    "upload": "node run.js -upload -version master -Debug true -host http://127.0.0.1:9998 -hidejspath true -targetPath F:\\CarpaNET_NEW",
-    "crabaNgp": "node run.js -mergejs -hidejspath true -targetPath F:\\CarpaNET_NEW\\src\\Carpa.Web\\js\\crabaNgp -inNames initMs.js,businessControl.js -outName F:\\CarpaMS\\src\\js\\crabaNgp.js",
-    "mergeJs2": "node run.js -mergejs -targetPath -inNames F:\\CarpaNET_NEW\\src\\Carpa.Web\\js\\craba.js,F:\\CarpaNET_NEW\\src\\Carpa.Web\\js\\controls.js -outName F:\\a.js -ignorecompress true",
-    "checkcrabaevery": "node ./test/test.js -checkjs -webPath F:\\crabaevery\\www -modName crabaevery -Debug false",
-    "biconfont": "node ./test/test.js -iconfont -zipPath F:\\crabaevery\\www\\biconfont -fontPath F:\\crabaevery\\www\\skins\\bicon -prefix .bicon- -fontName biconfont",
-    "aiconfont": "node ./test/test.js -iconfont -zipPath F:\\crabaevery\\www\\iconfont -fontPath F:\\CarpaNET_NEW\\src\\Carpa.Web\\skins -prefix .aicon- -fontName iconfont",
+    "checkUpdate": "node run.js -checkUpdate -version master -webPath F:/crabaevery/www",
+    "upload": "node run.js -upload -version master -Debug true -host http://127.0.0.1:9998 -hidejspath true -targetPath F:/CarpaNET_NEW",
+    "crabaNgp": "node run.js -mergejs -hidejspath true -targetPath F:/CarpaNET_NEW/src/Carpa.Web/js/crabaNgp -inNames initMs.js,businessControl.js -outName F:/CarpaMS/src/js/crabaNgp.js",
+    "mergeJs2": "node run.js -mergejs -targetPath -inNames F:/CarpaNET_NEW/src/Carpa.Web/js/craba.js,F:/CarpaNET_NEW/src/Carpa.Web/js/controls.js -outName F:/a.js -ignorecompress true",
+    "checkcrabaevery": "node ./test/test.js -checkjs -webPath F:/crabaevery/www -modName crabaevery -Debug false",
+    "biconfont": "node ./test/test.js -iconfont -zipPath F:/crabaevery/www/biconfont -fontPath F:/crabaevery/www/skins/bicon -prefix .bicon- -fontName biconfont",
+    "aiconfont": "node ./test/test.js -iconfont -zipPath F:/crabaevery/www/iconfont -fontPath F:/CarpaNET_NEW/src/Carpa.Web/skins -prefix .aicon- -fontName iconfont",
     "makeHash": "node run.js -makeHash -webPath ./test/ -modName craba  -files http://crabadoc.ca.com/js/utils/utils.js,F:/newcrabadoc/www/js/utils/utils.js,./test/test.js,./test/beefun.js,https://s5.vip.wpscdn.cn/web-libs/2t/js/userinfo-collect/1.0.3/vas2t-userinfo-collect.min.js?a=1 -outJson ./hash.json -hashName sha384",
     "makeHash2": "node run.js -makeHash -webPath ./test/ -modName craba -files ./test/  -exts .js -outJson ./hash2.json -hashName sha384",
     "pageHash": "node run.js -pageHash /Test/TestMasterDetail.gspx",
-    "addVersion": "node run.js -addVersion -file F:\\basicweb\\www\\index.html -exp AUTOVERSION",
-    "gspxHash": "node run.js -gspxHash -webPath F:\\Beefun\\srcs\\Beefun",
-    "runShell": "node run.js -run -webPath F:\\shell-gerrit\\web\\src\\main\\resources\\static\\shell\\ -port 10000 -modName shell",
-    "runShellLocal": "node run.js -run -webPath F:\\shell-gerrit\\web\\src\\main\\resources\\static\\shell\\ -port 10000 -modName shell -localLogin true",
-    "runJxc": "node run.js -run -webPath F:\\jxc\\jxc-web\\src\\main\\resources\\static\\jxc\\ -port 10001 -modName jxc",
+    "addVersion": "node run.js -addVersion -file F:/basicweb/www/index.html -exp AUTOVERSION",
+    "gspxHash": "node run.js -gspxHash -webPath F:/Beefun/srcs/Beefun",
+    "runShell": "node run.js -run -webPath F:/shell-gerrit/web/src/main/resources/static/shell/ -port 10000 -modName shell",
+    "runShellLocal": "node run.js -run -webPath F:/shell-gerrit/web/src/main/resources/static/shell/ -port 10000 -modName shell -localLogin true",
+    "runJxc": "node run.js -run -webPath F:/jxc/jxc-web/src/main/resources/static/jxc/ -port 10001 -modName jxc",
     "runMacJxc": "node run.js -run -webPath /Users/yj/Desktop/jxc/jxc-web/src/main/resources/static/jxc -port 10001 -modName jxc",
     "testBasicWeb": "node run.js -run -webPath /Users/yj/Public/工作/Code/basicweb/www -port 9977 -refresh true",
     "open-file-watch": "node examples/simple-file-watch.js",

package/tool/compress.js

@@ -39,7 +39,7 @@ module.exports.mergeFiles = function() {
   inNames = inNames.map((s) => {
     return path.join(config.targetPath, s);
   });
-  compressFiles(inNames, config.outName);
+  compressFiles(inNames, config.outName, config.initJs);
 }
 
 module.exports.mergeJs = function() {
@@ -155,14 +155,14 @@ function compressCrabaJs(inNames, outName, onEnd) {
   compressJs(inNames, targetJs, onEnd)
 }
 
-function compressFiles(inNames, outName) {
+function compressFiles(inNames, outName, initJs) {
   console.log('compressFiles开始，打包文件数：', inNames.length);
   config.hidejspath = true;
   config.ignoreCompress = false;
 
   var json = {};
   inNames.forEach(function(filePath) {
-    var path2 = filePath.replace(config.webPath, '');
+    var path2 = utils.removePathPrefix(filePath, config.webPath);
     if (config.modName) {
       path2 = path.join(config.modName, path2);
     }
@@ -184,9 +184,29 @@ function compressFiles(inNames, outName) {
     json[path2] = content;
   });
 
-  utils.mkdirsSync(outName);
-  fs.writeFileSync(outName, `$app.addRes(${JSON.stringify(json)})`);
-  console.log('compressFiles完成，资源包路径：', outName);
+  var resContent = `$app.addRes(${JSON.stringify(json)});`;
+  if (initJs) { // 资源包压缩到init.js里面一次性下放
+    if (!fs.existsSync(initJs)) {
+      console.log('打包失败，init.js不存在', initJs);
+      return;
+    }
+    var initJsContent = fs.readFileSync(initJs, 'utf-8');
+    var resStart = '/*请不要删除此注释--resStart--*/';
+    var resEnd = '/*请不要删除此注释--resEnd--*/';
+    var startIndex = initJsContent.indexOf(resStart);
+    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 {
+      initJsContent = resStart + '\r\n' + resContent + '\r\n' + resEnd + '\r\n' + initJsContent;
+    }
+    fs.writeFileSync(initJs, initJsContent);
+    console.log('compressFiles完成，资源包追加initjs的方式，路径：', initJs);
+  } else {
+    utils.mkdirsSync(outName);
+    fs.writeFileSync(outName, resContent);
+    console.log('compressFiles完成，单独创建资源包的方式，路径：', outName);
+  }
 }
 
 function compressJs(inNames, targetJs, onEnd) {