crabatool 1.0.38 → 1.0.39

package/index.js

@@ -4,6 +4,7 @@ var upgrade = require('./tool/upgrade.js');
 var fs = require('fs');
 var path = require('path');
 var readline = require('readline');
+const { memoryUsage } = require('process');
 
 module.exports.run = function(options) {
   //console.log(process.argv);
@@ -11,6 +12,7 @@ module.exports.run = function(options) {
   console.log('平台助手启动参数:', options);
 
   Object.assign(config, options);
+
   checkConfig();
 
   // 1. 服务端构建环境，自动化，根据命令行参数，直接调用脚手架功能
@@ -20,6 +22,8 @@ module.exports.run = function(options) {
       return checkAllJs();
     } else if (arr.includes('-run')) {
       return start();
+    } else if (arr.includes('-mergeinitjs')) {
+      return mergeInit();
     }
   }
 
@@ -27,7 +31,7 @@ module.exports.run = function(options) {
   waitInput();
 }
 
-function bindConfigByArgv(key) {
+function bindConfigByArgv(key, type) {
   if (process.argv.length < 3) return null;
 
   var arr = process.argv;
@@ -36,20 +40,25 @@ function bindConfigByArgv(key) {
     var value = arr[index + 1];
     if (!value) throw new Error(key + '参数缺少参数值');
     key = key.substr(1);
+
+    if (type == 'array') {
+      value = value.split(',');
+    } else if (type == 'boolean') {
+      value = value == 'false' || value == 0 ? false : true;
+    }
     config[key] = value;
   }
 }
+
 function checkConfig() {
   bindConfigByArgv('-webPath');
   bindConfigByArgv('-port');
   bindConfigByArgv('-modName');
-  bindConfigByArgv('-ignoreCheck');
+  bindConfigByArgv('-ignoreCheck', 'array');
   bindConfigByArgv('-webhooks');
   bindConfigByArgv('-progress');
-
-  if (config.ignoreCheck && typeof config.ignoreCheck == 'string') {
-    config.ignoreCheck = config.ignoreCheck.split(',');
-  }
+  bindConfigByArgv('-childModList', 'array');
+  bindConfigByArgv('-ignoreCompress', 'boolean');
 
   if (!config.webPath) {
     throw new Error('请检查craba.js，必须告诉工具当前项目的前端路径地址，填绝对路径哦');
@@ -190,6 +199,12 @@ function installvscode() {
   console.log('待实现');
 }
 
+function mergeInit() {
+  if (config.modName && config.childModList && config.childModList.length > 0) {
+    require('../tool/ngptool.js');
+  }
+}
+
 function checkAllJs() {
   require('./tool/checkjs.js').start();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {