crabatool 1.0.39 → 1.0.42

package/index.js

@@ -4,7 +4,6 @@ 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);
@@ -82,21 +81,36 @@ function checkConfig() {
 }
 
 
+async function waitFolder() {
+  const projectPath = await question('请输入项目生成路径（必须为空路径）：');
+  if (!path.isAbsolute(projectPath)) {
+    console.log('路径不合法，请输入绝对路径，如:f:\\craba_web');
+    return waitFolder();
+  }
+  if (fs.existsSync(projectPath)) {
+    if (fs.readdirSync(projectPath).length > 0) {
+      console.log(':::输入的项目路径不为空，避免文件覆盖或冲突，请重新输入一个空路径或不存在的路径:::');
+      return waitFolder();
+    }
+  }
+  return projectPath;
+}
+
+function rlPromisify(fn) {
+  return async function(t) {
+    return new Promise(function(resolve) { fn(t, resolve) });
+  };
+}
+
 function waitInput() {
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
   });
 
-  function rlPromisify(fn) {
-    return async (t) => {
-      return new Promise(resolve => fn(t, resolve));
-    };
-  }
-
   const question = rlPromisify(rl.question.bind(rl));
 
-  (async () => {
+  (async function() {
     var ques = [
       "1. 启动服务。\t\t\t\t主要包含：自动合并打包init.js和biz.js，查看本地平台的版本",
       "2. 更新当前项目的平台，然后启动服务。\t主要包含：从<内网>拉取环境相关资源，再拷贝到webPath路径下覆盖老文件，替代手工操作，同时解决npm不稳定问题",
@@ -147,21 +161,6 @@ function waitInput() {
       console.error('无效输入,请继续。\r\n\r\n');
       waitInput(); // 重复
     }
-
-    async function waitFolder() {
-      const projectPath = await question('请输入项目生成路径（必须为空路径）：');
-      if (!path.isAbsolute(projectPath)) {
-        console.log('路径不合法，请输入绝对路径，如:f:\\craba_web');
-        return waitFolder();
-      }
-      if (fs.existsSync(projectPath)) {
-        if (fs.readdirSync(projectPath).length > 0) {
-          console.log(':::输入的项目路径不为空，避免文件覆盖或冲突，请重新输入一个空路径或不存在的路径:::');
-          return waitFolder();
-        }
-      }
-      return projectPath;
-    }
   })();
 }
 
@@ -201,7 +200,10 @@ function installvscode() {
 
 function mergeInit() {
   if (config.modName && config.childModList && config.childModList.length > 0) {
+    config.mergeinitjs = true; // 标记仅打包，不监视文件变动
     require('../tool/ngptool.js');
+  } else {
+    console.log('mergeinitjs缺少其他相关参数配置，因此不会执行打包init.js操作')
   }
 }
 

package/package.json

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

package/tool/ngptool.js

@@ -28,12 +28,15 @@ function mergeBiz() {
       utils.debug('打包完成');
     });
   }
-  watcher
-    .on('ready', () => utils.debug(`${bizPath}，Initial scan complete. Ready for changes.`))
-    //.on('add', path => log(`File ${path} has been added`))
-    .on('change', path => watchAction({ event: 'change', eventPath: path }))
-    .on('unlink', path => watchAction({ event: 'remove', eventPath: path }));
 
+  // 只打包的情况就不监视文件
+  if (!config.mergeinitjs) {
+    watcher
+      .on('ready', () => utils.debug(`${bizPath}，Initial scan complete. Ready for changes.`))
+      //.on('add', path => log(`File ${path} has been added`))
+      .on('change', path => watchAction({ event: 'change', eventPath: path }))
+      .on('unlink', path => watchAction({ event: 'remove', eventPath: path }));
+  }
   watchAction();// 启动就打包一次
 }
 
@@ -57,10 +60,14 @@ function mergeInit() {
   }
 
   var watchJs = function(jsPath) {
+    // 只打包的情况就不监视文件
+    if (config.mergeinitjs) return;
+
     var watcher = chokidar.watch([jsPath], {
       persistent: true,
       usePolling: true
     });
+
     watcher
       .on('ready', () => utils.debug(`${jsPath}，Initial scan complete. Ready for changes.`))
       //.on('add', path => log(`File ${path} has been added`))