crabatool 1.0.396 → 1.0.398

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.396",
+  "version": "1.0.398",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -20,7 +20,7 @@
     "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",
+    "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",
     "webPath": "node ./test/test.js -checkjs -webPath F:\\crabaevery\\www -modName crabaevery -Debug true",
     "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",
@@ -68,4 +68,4 @@
     "crabatool"
   ],
   "license": "UNLICENSED"
-}
+}

package/tool/bizAndInit.js

@@ -149,11 +149,11 @@ function mergeInitAndBiz() {
   var filesToMerge = [];
   
   // 1. 添加主模块的 modName.js 文件
-  // var modJs = utils.join(config.webPath, '/js/' + config.modName + '.js');
-  // if (fs.existsSync(modJs)) {
-  //   filesToMerge.push(modJs);
-  //   utils.debug('添加主模块文件: ' + modJs);
-  // }
+  var modJs = utils.join(config.webPath, '/js/' + config.modName + '.js');
+  if (fs.existsSync(modJs)) {
+    filesToMerge.push(modJs);
+    utils.debug('添加主模块文件: ' + modJs);
+  }
   
   // 2. 添加所有子模块的 init.js 文件
   config.childModList.forEach(childName => {

package/tool/merge/mergeTool.js

@@ -41,6 +41,7 @@ module.exports.run = function(opts) {
   utils.debug("输入文件清单:" + options.inPath);
   utils.debug("输出文件:" + options.outPath);
   utils.log("ignoreCompress:" + options.ignoreCompress);
+  utils.log("blackFileName:" + options.blackFileName);
 
   var startT = new Date();
   buildFolder(options);
@@ -141,13 +142,21 @@ function getAbsPath(filePath) {
 function replaceBlackFunction(content, options) {
   //return content; // 还有点问题
 
-  if (!options.blackFileName) return content;
+  if (!options.blackFileName) {
+    return content;
+  }
 
   var blackFile = getAbsPath(options.blackFileName);
-  if (!fs.existsSync(blackFile)) return content;
+  if (!fs.existsSync(blackFile)) {
+    utils.debug("黑名单不存在:" + blackFile);
+    return content;
+  }
 
   var stats = fs.statSync(blackFile);
-  if (!stats.isFile()) return content;
+  if (!stats.isFile()) {
+    utils.debug("黑名单应该是文件:" + blackFile);
+    return content;
+  }
 
   var txt = fs.readFileSync(blackFile);
   var list = txt.toString().split('\r\n');
@@ -218,6 +227,7 @@ function compressFile(filePath, options, filePath2, stats) {
   if (!filePath2) {
     // 只有当ignoreCompress为false时才执行replaceBlackFunction
     if (options.ext == '.js' && !options.ignoreCompress) {
+      utils.debug("替换黑名单:" + options.blackFileName);
       content = replaceBlackFunction(content, options); // 手动混淆和替换一些标签，更大的压缩js容量，具体替换规则请参考黑名单里的清单
     }