crabatool 1.0.448 → 1.0.449

package/index.js

@@ -194,6 +194,16 @@ async function checkFast(args) {
     return false;
   }
 
+  if (args.includes('-mergeFiles')) { // 将特定文件压缩后，路径作为key，合并到一个json文件包，减少http请求
+    start.bindAndCheckConfig('-inNames');
+    start.bindAndCheckConfig('-outName');
+    start.bindConfigByArgv('-targetPath');
+    start.bindConfigByArgv('-exp');
+    config.mergeFile = true;
+    require('./tool/compress.js').mergeFiles(); // 打包压缩js和css
+    return false;
+  }
+
   if (args.includes('-mergejs')) {
     start.bindAndCheckConfig('-inNames');
     start.bindAndCheckConfig('-outName');
@@ -206,7 +216,7 @@ async function checkFast(args) {
   if (args.includes('-mergecss')) {
     start.bindAndCheckConfig('-inNames');
     start.bindAndCheckConfig('-outName');
-    start.bindAndCheckConfig('-targetPath');
+    start.bindConfigByArgv('-targetPath');
     start.bindConfigByArgv('-exp');
     require('./tool/compress.js').mergeCss(); // 打包压缩js和css
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.448",
+  "version": "1.0.449",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -13,6 +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 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",
@@ -69,7 +70,8 @@
     "sync-request": "^6.1.0",
     "uglify-js": "^3.15.1",
     "uglifycss": "^0.0.29",
-    "xml-js": "^1.6.11"
+    "xml-js": "^1.6.11",
+    "xml-minifier": "^1.0.1"
   },
   "repository": {
     "type": "git",

package/tool/compress.js

@@ -34,6 +34,14 @@ module.exports.run = function() {
   doCompress(); // 打包、压缩、合并js和css到临时目录下
 }
 
+module.exports.mergeFiles = function() {
+  var inNames = config.inNames.split(',');
+  inNames = inNames.map((s) => {
+    return path.join(config.targetPath, s);
+  });
+  compressFiles(inNames, config.outName);
+}
+
 module.exports.mergeJs = function() {
   var inNames = config.inNames.split(',');
   inNames = inNames.map((s) => {
@@ -50,7 +58,6 @@ module.exports.mergeCss = function() {
   compressCss(inNames, config.outName);
 }
 
-
 function updateCrabaVersion() {
   var pkg = utils.readPackage(_pkgPath);
 
@@ -148,13 +155,39 @@ function compressCrabaJs(inNames, outName, onEnd) {
   compressJs(inNames, targetJs, onEnd)
 }
 
+function compressFiles(inNames, outName) {
+  console.log('compressFiles开始，打包文件数：', inNames.length);
+  config.hidejspath = true;
+  config.ignoreCompress = false;
+
+  var json = {};
+  inNames.forEach(function(filePath) {
+    var path2 = filePath.replace(config.webPath, '');
+    path2 = path.join(config.modName, path2).replaceAll('\\', '/');
+    var ext = path.extname(filePath).toLowerCase();
+    var content = '';
+    if (ext == '.js') {
+      content = compressJs(filePath);
+    } else if (ext == '.css') {
+      content = compressCss(filePath);
+    } else if (ext == '.gspx') {
+      content = compressGspx(filePath);
+    }
+    json[path2] = content;
+  });
+
+  utils.mkdirsSync(outName);
+  fs.writeFileSync(outName, `$app.addRes(${JSON.stringify(json)},'${config.modName}')`);
+  console.log('compressFiles完成，资源包路径：', outName);
+}
+
 function compressJs(inNames, targetJs, onEnd) {
-  mergeTool.run({
+  var content = mergeTool.run({
     inPath: inNames,
     outPath: targetJs,
     ext: '.js',
     ignoreCompress: config.ignoreCompress,
-    blackFileName: _blackFilePath,
+    blackFileName: targetJs ? _blackFilePath : null,
     hidejspath: config.hidejspath
   });
 
@@ -165,6 +198,7 @@ function compressJs(inNames, targetJs, onEnd) {
   console.log('compress完成', inNames, targetJs);
   console.log('\r\n');
 
+  return content;
   /*
   var p = fork(_mergeJsPath, [`${[inNames]}`, `${[targetJs]}`, _compressArgs, _blackFilePath, config.hidejspath]);
   p.on('exit', () => {
@@ -190,7 +224,7 @@ function compressAndMergeCss(inNames, rootPath, outName) {
 }
 
 function compressCss(inNames, targetCss) {
-  mergeTool.run({
+  var content = mergeTool.run({
     inPath: inNames,
     outPath: targetCss,
     ext: '.css',
@@ -200,5 +234,12 @@ function compressCss(inNames, targetCss) {
 
   console.log('compress完成', inNames, targetCss);
   console.log('\r\n');
+  return content;
+}
 
+function compressGspx(filePath) {
+  const xmlMinifier = require('xml-minifier');
+  let xml = fs.readFileSync(filePath, 'utf8');
+  let minified = xmlMinifier.minify(xml);
+  return minified;
 }

package/tool/merge/mergeTool.js

@@ -26,7 +26,7 @@ var config = require('../../lib/config.js');
 var __cachePath = path.join(os.tmpdir(), '__crabatoolcache', config.version);
 
 module.exports.run = function(opts) {
-  if (!opts.inPath || !opts.outPath) {
+  if (!opts.inPath) {
     throw ("args参数不能为空");
   }
 
@@ -44,7 +44,7 @@ module.exports.run = function(opts) {
   utils.log("blackFileName:" + options.blackFileName);
 
   var startT = new Date();
-  buildFolder(options);
+  var content = buildFolder(options);
   var endT = new Date();
 
   var fcount = options.__filesContent.length;
@@ -53,6 +53,7 @@ module.exports.run = function(opts) {
   }
 
   utils.debug(`打包完成${options.outPath}\t 耗时:${endT.getTime() - startT.getTime()}毫秒\t合并文件数:${fcount}个\r\n\r\n`);
+  return content;
 }
 
 
@@ -98,6 +99,10 @@ function buildFolder(options) {
         content = content.replaceAll(key, value);
       });
     }
+    // 没有输出文件，直接返回压缩后的文件
+    if (!options.outPath) {
+      return content;
+    }
 
     var fileOutPath = options.outPath;
     fileOutPath = getAbsPath(fileOutPath);

package/tool/openFileWatcher.js

@@ -515,12 +515,12 @@ class OpenFileWatcher {
     console.log(`   ${encodingText} | ${sizeText} | ${eslintText} | ${compatText}`);
 
     // 如果有严重问题，显示详细信息
-    if (eslintSummary.status === 'error' || eslintSummary.errors > 0) {
-      console.log(chalk.red('   严重问题详情:'));
-      eslintSummary.issues.filter(issue => issue.severity === 'error').forEach(issue => {
-        console.log(chalk.red(`      第${issue.line}行: ${issue.message}`));
-      });
-    }
+    // if (eslintSummary.status === 'error' || eslintSummary.errors > 0) {
+    //   console.log(chalk.red('   严重问题详情:'));
+    //   eslintSummary.issues.filter(issue => issue.severity === 'error').forEach(issue => {
+    //     console.log(chalk.red(`      第${issue.line}行: ${issue.message}`));
+    //   });
+    // }
 
     // 如果有兼容性问题，显示详情
     if (compatSummary.hasES6 && compatSummary.samples.length > 0) {
@@ -557,20 +557,20 @@ class OpenFileWatcher {
     const errors = [];
 
     // 添加ESLint严重错误
-    if (eslintSummary.issues) {
-      eslintSummary.issues.forEach(issue => {
-        if (issue.severity === 'error') {
-          errors.push({
-            type: issue.type,
-            severity: issue.severity,
-            line: issue.line,
-            column: issue.column,
-            message: issue.message,
-            ruleId: issue.ruleId
-          });
-        }
-      });
-    }
+    // if (eslintSummary.issues) {
+    //   eslintSummary.issues.forEach(issue => {
+    //     if (issue.severity === 'error') {
+    //       errors.push({
+    //         type: issue.type,
+    //         severity: issue.severity,
+    //         line: issue.line,
+    //         column: issue.column,
+    //         message: issue.message,
+    //         ruleId: issue.ruleId
+    //       });
+    //     }
+    //   });
+    // }
 
     // 添加兼容性严重错误
     if (compatSummary.issues) {