crabatool 1.0.349 → 1.0.351

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.349",
+  "version": "1.0.351",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -10,6 +10,7 @@
     "start": "node run.js",
     "test": "node ./test/test.js",
     "run": "node ./test/test.js -run",
+    "mergeinitjs":"node ./test/test.js -mergeinitjs",
     "export": "node ./test/test.js -exportgspx -webPath F:\\Beefun\\srcs",
     "checkjs": "node ./test/test.js -checkjs",
     "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/test/test.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+npx crabatool -mergejs  -ignoreCompress true -targetPath /Users/yj/Desktop/CarpaNET/src/Carpa.Web/js -inNames type.js,craba.js,common.js,es6.js,controls.js,required.js,drag.js,listView.js,crabaEx.js,crabaFC.js,crabaMS.js -outName /Users/yj/Public/工作/Code/newJsBin/craba.min.js -clearCache true
+# crabatool -mergejs  -ignoreCompress true -targetPath /Users/yj/Desktop/CarpaNET/src/Carpa.Web/js -inNames grid.js,controlsEx.js,treeView.js,print.js,../../../src/Carpa.Dress/Dress.js,workflow.js,crabaeditor.js -outName /Users/yj/Public/工作/Code/newJsBin/crabaEx.min.js
+# crabatool -mergejs  -ignoreCompress true -targetPath /Users/yj/Desktop/CarpaNET/src/Carpa.Web/js -inNames crabaNgp/initMS.js,crabaNgp/businessControl.js -outName /Users/yj/Public/工作/Code/newJsBin/crabaNgp.js
+# crabatool -mergecss  -ignoreCompress true -targetPath /Users/yj/Desktop/CarpaNET/src/Carpa.Web/skins -inNames iconfont.css,craba.min.css -outName /Users/yj/Public/工作/Code/newJsBin/craba.min.css

package/tool/bizAndInit.js

@@ -12,6 +12,7 @@ function mergeBiz(childPath) {
     return utils.error('biz.js关联打包的路径不存在，如需打包请先创建目录：' + bizPath);
   }
   utils.log('biz.js打包启动:' + bizPath);
+  utils.log('ignoreCompress=' + config.ignoreCompress)
 
   var watchAction = function() {
     utils.debug('打包中');

package/tool/compress.js

@@ -159,7 +159,7 @@ function compressAndMergeCss(inNames, rootPath, outName) {
   });
 
   var targetCss = utils.join(_tempSkinPath, outName);
-  compressCss(inNames, targetCss, onEnd);
+  compressCss(inNames, targetCss);
   /*
   var p = fork(_mergeCssPath, [`${[inNames]}`, `${[targetJs]}`, _compressArgs]);
   p.on('exit', () => {
@@ -168,7 +168,7 @@ function compressAndMergeCss(inNames, rootPath, outName) {
   */
 }
 
-function compressCss(inNames, targetCss, onEnd) {
+function compressCss(inNames, targetCss) {
   mergeTool.run({
     inPath: inNames,
     outPath: targetCss,
@@ -176,8 +176,4 @@ function compressCss(inNames, targetCss, onEnd) {
     hidejspath: config.hidejspath,
     ignoreCompress: config.ignoreCompress
   });
-
-  if (onEnd) {
-    onEnd();
-  }
 }

package/tool/merge/mergeTool.js

@@ -40,6 +40,7 @@ module.exports.run = function(opts) {
 
   utils.debug("输入文件清单:" + options.inPath);
   utils.debug("输出文件:" + options.outPath);
+  utils.log("ignoreCompress:" + options.ignoreCompress);
 
   var startT = new Date();
   buildFolder(options);
@@ -79,8 +80,7 @@ function buildFolder(options) {
     if (ext != options.ext) return; // .js或.css
 
     if (!checkFileCache(stats, filePath, options)) { // 检查文件是否修改过，且是否上次压缩过缓存
-      copyFileToCache1(filePath, stats);
-      compressFile(filePath, options);
+      compressFile(filePath, options, null, stats);
     }
   });
 
@@ -167,14 +167,7 @@ function replaceBlackFunction(content, options) {
   return content;
 }
 
-function getCachePath1(filePath) {
-  var fileName = path.basename(filePath);
-  var hashName = utils.getHashCode(path.dirname(filePath));
-  var cachePath = path.join(__cachePath, 'source', hashName, fileName);
-  return cachePath;
-}
-
-function getCachePath2(filePath) {
+function getCachePath(filePath) {
   var fileName = path.basename(filePath);
   var hashName = utils.getHashCode(path.dirname(filePath));
   var cachePath = path.join(__cachePath, 'compress', hashName, fileName);
@@ -182,12 +175,12 @@ function getCachePath2(filePath) {
 }
 
 function checkFileCache(stats1, filePath, options) {
-  if (config.clearCache) {
+  if (config.clearCache || options.ignoreCompress) {
     utils.debug('不使用缓存');
     return false;
   }
 
-  var cachePath = getCachePath1(filePath);
+  var cachePath = getCachePath(filePath);
   utils.debug('检查缓存:' + cachePath);
   if (!fs.existsSync(cachePath)) {
     utils.debug('没有缓存:' + cachePath);
@@ -206,7 +199,7 @@ function checkFileCache(stats1, filePath, options) {
 }
 
 function writeCacheFile(filePath, options) {
-  var cachePath = getCachePath2(filePath);
+  var cachePath = getCachePath(filePath);
   if (!fs.existsSync(cachePath)) {
     utils.debug("缓存文件不存在");
     return false;
@@ -218,9 +211,7 @@ function writeCacheFile(filePath, options) {
   return true;
 }
 
-function compressFile(filePath, options, filePath2) {
-  utils.debug("压缩和合并文件:" + filePath);
-
+function compressFile(filePath, options, filePath2, stats) {
   var content = fs.readFileSync(filePath);
   content = content.toString().replace(__bom, '');
 
@@ -231,6 +222,7 @@ function compressFile(filePath, options, filePath2) {
 
     // 压缩js或css文件
     if (!options.ignoreCompress) {
+      utils.debug("压缩文件:" + filePath);
       content = utils.toUtf8(content);
       if (options.ext == '.js') {
         content = UglifyJS.minify(content, compressOptions).code;
@@ -241,7 +233,7 @@ function compressFile(filePath, options, filePath2) {
         });
       }
 
-      copyByteToCache2(filePath, content);
+      copyByteToCache(filePath, content, stats);
     }
   }
 
@@ -253,19 +245,10 @@ function compressFile(filePath, options, filePath2) {
   utils.debug('文件打包完成:' + filePath + '\r\n');
 }
 
-
-function copyFileToCache1(filePath, stats) {
-  var cachePath = getCachePath1(filePath);
-  utils.debug("拷贝到缓存1:" + cachePath);
+function copyByteToCache(filePath, content, stats) {
+  var cachePath = getCachePath(filePath);
   utils.mkdirsSync(cachePath);
-
-  fs.copyFileSync(filePath, cachePath);
-  fs.utimesSync(cachePath, stats.atime, stats.mtime); // 必须同步文件时间
-}
-
-function copyByteToCache2(filePath, content) {
-  var cachePath = getCachePath2(filePath);
-  utils.mkdirsSync(cachePath);
-  utils.debug("拷贝到缓存2:" + cachePath);
+  utils.debug("拷贝到缓存:" + cachePath);
   fs.writeFileSync(cachePath, content, 'utf8');
+  fs.utimesSync(cachePath, stats.atime, stats.mtime); // 必须同步文件时间
 }