crabatool 1.0.277 → 1.0.280

package/index.js

@@ -104,6 +104,7 @@ function checkFast(args) {
     start.bindAndCheckConfig('-inNames');
     start.bindAndCheckConfig('-outName');
     start.bindAndCheckConfig('-targetPath');
+    start.bindAndCheckConfig('-exp');
     require('./tool/compress.js').mergeJs(); // 打包压缩js和css
     return false;
   }

package/lib/server.js

@@ -62,5 +62,7 @@ server.listen(config.port, hostname, () => {
   }
 
   utils.log(`Server running at ${url}`);
-  utils.openProcess(url);
+  if (!config.noOpen) {
+    utils.openProcess(url);
+  }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.277",
+  "version": "1.0.280",
   "description": "crabatool",
   "main": "index.js",
   "bin": {

package/tool/merge/mergeTool.js

@@ -85,10 +85,23 @@ function buildFolder(options) {
   });
 
   if (options.__filesContent.length > 0) {
+    var content = options.__filesContent.join('\r\n');
+
+    // 替换变量
+    if (config.exp) {
+      var list = config.exp.split(';');
+      list.forEach(function(item) {
+        var arr = item.split('=');
+        var key = arr[0].trim();
+        var value = arr[1].trim();
+        content = content.replaceAll(key, value);
+      });
+    }
+
     var fileOutPath = options.outPath;
     fileOutPath = getAbsPath(fileOutPath);
     utils.mkdirsSync(fileOutPath);
-    fs.writeFileSync(fileOutPath, __bom + options.__filesContent.join('\r\n'), 'utf8'); // "\ufeff"->> utf-8 BOM标记
+    fs.writeFileSync(fileOutPath, __bom + content, 'utf8'); // "\ufeff"->> utf-8 BOM标记
     utils.debug("打包文件成功:" + fileOutPath);
   }
 }

package/tool/start.js

@@ -75,14 +75,14 @@ class Start {
 
   initArgs() {
     var keys = [
-      { name: '-webPath', type: '' },
-      { name: '-port', type: '' },
-      { name: '-modName', type: '' },
-      { name: '-webhooks', type: '' },
-      { name: '-progress', type: '' },
-      { name: '-host', type: '' },
-      { name: '-version', type: '' },
-      { name: '-branchName', type: '' },
+      { name: '-webPath', type: '' }, // 网站路径
+      { name: '-port', type: '' }, // 网站端口
+      { name: '-modName', type: '' }, // ngp的服务、模块名称
+      { name: '-webhooks', type: '' }, // 检测报告推送的地址
+      { name: '-progress', type: '' }, // 是否显示检测进度条
+      { name: '-host', type: '' }, // 配置crabatool依赖的服务地址，切换服务用
+      { name: '-version', type: '' }, // 配置更新平台的版本
+      { name: '-branchName', type: '' }, // 配置更新平台的分支名
       { name: '-abortUrl', type: '' },
 
       { name: '-ignoreCheck', type: 'array' },
@@ -94,6 +94,7 @@ class Start {
       { name: '-Debug', type: 'boolean' },
       { name: '-checkgspx', type: 'boolean' },
       { name: '-checkutf8', type: 'boolean' },
+
       { name: '-proxy', type: 'json' },
       { name: '-proxySrc', type: '' }
     ];