@tmsfe/tmskit 0.0.10 → 0.0.13

package/dist/index.cjs.js

@@ -1,58 +1,56 @@
 'use strict';
 
 var require$$0 = require('chalk');
+var require$$1 = require('moment');
 var require$$0$1 = require('commander');
-var require$$1 = require('leven');
+var require$$1$1 = require('leven');
 var require$$2 = require('ora');
-var require$$3 = require('path');
+var require$$1$2 = require('path');
 var require$$0$2 = require('fs');
 var require$$0$3 = require('shelljs');
 var require$$0$4 = require('async');
-var require$$1$1 = require('ejs');
-var require$$1$2 = require('inquirer');
+var require$$1$3 = require('ejs');
+var require$$1$4 = require('inquirer');
 var require$$0$5 = require('metalsmith');
 var require$$0$6 = require('lodash');
-var require$$1$3 = require('crypto');
+var require$$1$5 = require('crypto');
 var require$$0$7 = require('miniprogram-ci');
 var require$$5 = require('glob-ignore');
-var require$$1$4 = require('fs-extra');
-var require$$9 = require('console');
+var require$$1$6 = require('fs-extra');
 var require$$0$8 = require('strip-comments');
 var require$$0$9 = require('through2');
-var require$$1$5 = require('precinct');
-var require$$1$6 = require('htmlparser2');
+var require$$1$7 = require('precinct');
+var require$$1$8 = require('htmlparser2');
 var require$$0$a = require('gulp');
-var require$$1$7 = require('gulp-px-to-rpx');
-var require$$2$1 = require('gulp-watch');
-var require$$1$8 = require('semver');
+var require$$0$b = require('gulp-watch');
+var require$$1$9 = require('semver');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
 var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
-var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
+var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
+var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
-var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);
+var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
 var require$$0__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$0$2);
 var require$$0__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$0$3);
 var require$$0__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$0$4);
-var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
-var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
+var require$$1__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$1$3);
+var require$$1__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$1$4);
 var require$$0__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$0$5);
 var require$$0__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$0$6);
-var require$$1__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$1$3);
+var require$$1__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$1$5);
 var require$$0__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$0$7);
 var require$$5__default = /*#__PURE__*/_interopDefaultLegacy(require$$5);
-var require$$1__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$1$4);
-var require$$9__default = /*#__PURE__*/_interopDefaultLegacy(require$$9);
+var require$$1__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$1$6);
 var require$$0__default$8 = /*#__PURE__*/_interopDefaultLegacy(require$$0$8);
 var require$$0__default$9 = /*#__PURE__*/_interopDefaultLegacy(require$$0$9);
-var require$$1__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$1$5);
-var require$$1__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$1$6);
-var require$$0__default$a = /*#__PURE__*/_interopDefaultLegacy(require$$0$a);
 var require$$1__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$1$7);
-var require$$2__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$2$1);
 var require$$1__default$8 = /*#__PURE__*/_interopDefaultLegacy(require$$1$8);
+var require$$0__default$a = /*#__PURE__*/_interopDefaultLegacy(require$$0$a);
+var require$$0__default$b = /*#__PURE__*/_interopDefaultLegacy(require$$0$b);
+var require$$1__default$9 = /*#__PURE__*/_interopDefaultLegacy(require$$1$9);
 
 function getAugmentedNamespace(n) {
 	if (n.__esModule) return n;
@@ -72,6 +70,7 @@ function getAugmentedNamespace(n) {
 var src$2 = {};
 
 const chalk$3 = require$$0__default;
+const moment = require$$1__default;
 /**
  * 本文件提供无依赖的在终端打印彩色文字的方法。
  */
@@ -89,7 +88,7 @@ const fail$9 = (message = '') => {
 
   const greenFontStyleConfig = decodeURIComponent('%1B%5B41%3B37m'); // \033[41;30m转义后的字符按，console时输出红底白色文字
 
-  console.log(`${redStyleConfig} ERROR ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
+  console.log(`\n${moment().format('YYYY-MM-DD HH:mm:ss')}`, `${redStyleConfig} ERROR ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
 };
 /**
  * 打印绿底黑字格式的文字
@@ -103,7 +102,7 @@ const succeed$1 = (message = '') => {
 
   const greenFontStyleConfig = decodeURIComponent('%1B%5B40%3B32m'); // \033[40;32m转义后的字符按，console时输出绿色文字
 
-  console.log(`${greenStyleConfig} Success ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
+  console.log(`\n${moment().format('YYYY-MM-DD HH:mm:ss')}`, `${greenStyleConfig} Success ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
 };
 /**
  * 打印warn提示
@@ -113,10 +112,10 @@ const succeed$1 = (message = '') => {
 
 
 const warn = message => {
-  console.log(chalk$3.yellow(message));
+  console.log(`\n${moment().format('YYYY-MM-DD HH:mm:ss')}`, chalk$3.yellow(message));
 };
 
-const info$9 = (...args) => console.log(...args);
+const info$9 = (...args) => console.log(`\n${moment().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
 
 var log$1 = {
   fail: fail$9,
@@ -126,9 +125,9 @@ var log$1 = {
 };
 
 const program$1 = require$$0__default$1;
-const leven = require$$1__default;
+const leven = require$$1__default$1;
 const ora = require$$2__default;
-const path$a = require$$3__default;
+const path$b = require$$1__default$2;
 const fs$e = require$$0__default$2;
 const shelljs$6 = require$$0__default$3;
 const {
@@ -142,8 +141,8 @@ const shelljsOptions = {
 
 const cwd = process.cwd();
 
-function resolve$f(...args) {
-  return path$a.resolve(cwd, ...args);
+function resolve$g(...args) {
+  return path$b.resolve(cwd, ...args);
 }
 /**
  * 用户输入命令时，进行提示
@@ -200,7 +199,7 @@ function downloadRepoForGit$2(url, dest, branch) {
   return new Promise((resolve, reject) => {
     // 如果目标目录不存在
     if (fs$e.existsSync(dest)) {
-      shelljs$6.rm('-rf', path$a.join(dest));
+      shelljs$6.rm('-rf', path$b.join(dest));
     }
 
     shelljs$6.mkdir('-p', dest);
@@ -251,7 +250,7 @@ function pullRepoForGit$1(dest, branch) {
 
 function npmInstall$1(dir) {
   return new Promise((resolve, reject) => {
-    shelljs$6.exec('npx yarn --production --registry http://mirrors.tencent.com/npm/', {
+    shelljs$6.exec('npm install --production --registry http://mirrors.tencent.com/npm/', {
       cwd: dir,
       silent: true
     }, (code, stdout, stderr) => {
@@ -285,7 +284,6 @@ function createTask$3(task, startText, endText) {
     const start = Date.now();
     const spinner = ora(startText);
     spinner.start();
-    info$8('\n');
     const result = await task(...args);
     endText && spinner.succeed(`${endText}, ${cost(start)}ms`);
     spinner.stop();
@@ -300,8 +298,24 @@ function createTask$3(task, startText, endText) {
 
 const camelize = str => str.replace(/-(\w)/g, (a, c) => c ? c.toUpperCase() : '');
 
+const mergeMap = function (obj, src) {
+  for (const [k, v] of src) {
+    if (obj.has(k)) {
+      obj.set(k, obj.get(k) + v);
+    } else {
+      obj.set(k, v);
+    }
+  }
+
+  return obj;
+};
+
+const relativeCwdPath$1 = function (file) {
+  return path$b.relative(process.cwd(), file);
+};
+
 var widgets = {
-  resolve: resolve$f,
+  resolve: resolve$g,
   isObject: isObject$2,
   isArray: isArray$1,
   createTask: createTask$3,
@@ -309,25 +323,27 @@ var widgets = {
   pullRepoForGit: pullRepoForGit$1,
   suggestCommands: suggestCommands$1,
   camelize,
-  npmInstall: npmInstall$1
+  npmInstall: npmInstall$1,
+  mergeMap,
+  relativeCwdPath: relativeCwdPath$1
 };
 
-const path$9 = require('path');
+const path$a = require('path');
 
 const os = require('os'); // 用户目录
 
 
 const HOME_DIR = os.homedir(); // 所有文件的缓存目录
 
-const CACHE_DIR$1 = path$9.resolve(HOME_DIR, '.tmskit'); // 脚手架模板代码所在目录
+const CACHE_DIR$1 = path$a.resolve(HOME_DIR, '.tmskit'); // 脚手架模板代码所在目录
 
-const TEMPLATE_DIR$1 = path$9.resolve(CACHE_DIR$1, 'template'); // 第三方模块源码存放的临时缓存目录
+const TEMPLATE_DIR$1 = path$a.resolve(CACHE_DIR$1, 'template'); // 第三方模块源码存放的临时缓存目录
 
-const MODULE_CODE_DIR$2 = path$9.resolve(CACHE_DIR$1, 'modules_code'); // 脚手架模板代码的具体路径
+const MODULE_CODE_DIR$2 = path$a.resolve(CACHE_DIR$1, 'modules_code'); // 脚手架模板代码的具体路径
 
-const TEMPLATE_PATH$1 = path$9.resolve(TEMPLATE_DIR$1, 'tools/tms-cli-template'); // 脚手架的名称
+const TEMPLATE_PATH$1 = path$a.resolve(TEMPLATE_DIR$1, 'tools/tms-cli-template'); // 脚手架的名称
 
-const TMS_NAME$2 = 'tmskit'; // 脚手架的配置名称
+const TMS_NAME$1 = 'tmskit'; // 脚手架的配置名称
 
 const TMS_CONFIG_FILENAME$1 = 'tms.config.js';
 const TMS_PRIVATE_FILENAME$1 = 'tms.private.config.js'; // 模块代码的默认在modules子目录
@@ -336,10 +352,10 @@ const DEFAULT_MODULE_DIR = 'modules'; // 模块代码的默认在modules子目
 
 const DEFAULT_CLOUD_MODULE_DIR$1 = './cloud'; // 模块的配置文件的名称
 
-const MODULE_CONFIG_FILENAME$3 = 'module.config.json'; // 默认的webpack entry
+const MODULE_CONFIG_FILENAME$2 = 'module.config.json'; // 默认的webpack entry
 
 const DEFAULT_WEBPACK_ENTRY = {
-  app: path$9.resolve(process.cwd(), 'app')
+  app: path$a.resolve(process.cwd(), 'app')
 }; // 默认从源码拷贝到编译后的配置
 
 const DEFAULT_COPY_CONFIG$1 = ['package.json', 'sitemap.json'];
@@ -356,11 +372,11 @@ var constant = /*#__PURE__*/Object.freeze({
 	CACHE_DIR: CACHE_DIR$1,
 	TEMPLATE_DIR: TEMPLATE_DIR$1,
 	TEMPLATE_PATH: TEMPLATE_PATH$1,
-	TMS_NAME: TMS_NAME$2,
+	TMS_NAME: TMS_NAME$1,
 	TMS_CONFIG_FILENAME: TMS_CONFIG_FILENAME$1,
 	TMS_PRIVATE_FILENAME: TMS_PRIVATE_FILENAME$1,
 	DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR,
-	MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$3,
+	MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$2,
 	DEFAULT_WEBPACK_ENTRY: DEFAULT_WEBPACK_ENTRY,
 	DEFAULT_COPY_CONFIG: DEFAULT_COPY_CONFIG$1,
 	MODULE_CODE_DIR: MODULE_CODE_DIR$2,
@@ -373,10 +389,13 @@ var constant = /*#__PURE__*/Object.freeze({
 var require$$4 = /*@__PURE__*/getAugmentedNamespace(constant);
 
 const fs$d = require$$0__default$2;
-const path$8 = require$$3__default;
+const path$9 = require$$1__default$2;
 const {
   info: info$7
 } = log$1;
+const {
+  relativeCwdPath
+} = widgets;
 /**
  * 判断目录是否为空
  * @param {string} dirname 目录名
@@ -414,7 +433,7 @@ const copyFile = function (src, dest) {
     fs$d.unlinkSync(dest);
   }
 
-  const dir = path$8.dirname(dest);
+  const dir = path$9.dirname(dest);
   ensureDirExist(dir);
   fs$d.copyFileSync(src, dest);
 }; // 判断文件内容是否一致，不一致再进行拷贝
@@ -426,11 +445,11 @@ function diffContentCopyFile$3(originFile, destFile) {
     const depOriginContent = fs$d.readFileSync(originFile, 'utf8');
 
     if (depDestContent !== depOriginContent) {
-      info$7(`拷贝${originFile}内容到${destFile}`);
+      info$7(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
       copyFile(originFile, destFile);
     }
   } else {
-    info$7(`拷贝${originFile}内容到${destFile}`);
+    info$7(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
     copyFile(originFile, destFile);
   }
 } // 添加后缀
@@ -474,7 +493,7 @@ const fileInDir$3 = (dir, file) => {
     return false;
   }
 
-  const relativePath = path$8.relative(dir, file);
+  const relativePath = path$9.relative(dir, file);
 
   if (relativePath.startsWith('..')) {
     return false;
@@ -494,7 +513,7 @@ var io$2 = {
 };
 
 const async = require$$0__default$4;
-const ejs = require$$1__default$1;
+const ejs = require$$1__default$3;
 
 const render$1 = (files, metalsmith, next) => {
   const keys = Object.keys(files);
@@ -514,9 +533,9 @@ const render$1 = (files, metalsmith, next) => {
 var render_1 = render$1;
 
 const fs$c = require$$0__default$2;
-const inquirer = require$$1__default$2;
+const inquirer = require$$1__default$4;
 const {
-  resolve: resolve$e
+  resolve: resolve$f
 } = widgets;
 const {
   TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$1
@@ -568,7 +587,7 @@ const isQuestionType = result => {
 };
 
 const ask$1 = templateDir => (files, metalsmith, next) => {
-  const prompts = parseTemplateQuestions(resolve$e(templateDir, TEMPLATE_TKIT_DIR$1));
+  const prompts = parseTemplateQuestions(resolve$f(templateDir, TEMPLATE_TKIT_DIR$1));
   const metadata = metalsmith.metadata();
   const filteredPrompts = prompts.filter(prompt => {
     if (metadata[prompt.name] && `${metadata[prompt.name]}`.trim() !== '') {
@@ -610,7 +629,7 @@ const generator$1 = (buildDir, distDir, preMetadata) => new Promise((resolve, re
 
 var generator_1 = generator$1;
 
-const path$7 = require$$3__default;
+const path$8 = require$$1__default$2;
 const fs$b = require$$0__default$2;
 const shelljs$5 = require$$0__default$3;
 const {
@@ -621,7 +640,7 @@ const {
 const {
   downloadRepoForGit: downloadRepoForGit$1,
   createTask: createTask$2,
-  resolve: resolve$d
+  resolve: resolve$e
 } = widgets;
 const io$1 = io$2;
 const {
@@ -656,7 +675,7 @@ async function createAppDir(targetDir) {
 
 async function create(appName) {
   const cwd = process.cwd();
-  const targetDir = path$7.resolve(cwd, appName);
+  const targetDir = path$8.resolve(cwd, appName);
   const appType = 'mp';
   await createAppDir(targetDir); // 创建缓存目录
 
@@ -664,13 +683,13 @@ async function create(appName) {
 
   await createTask$2(downloadRepoForGit$1, '拉取模板仓库', '拉取模板仓库完成')('https://git.woa.com/tmsfe/tms-frontend.git', TEMPLATE_DIR, 'master'); // 生成模板(1. 询问问题， 2. ejs生成模板  3.生成到目标目录)
 
-  generator(path$7.join(TEMPLATE_PATH, appType), targetDir, {
+  generator(path$8.join(TEMPLATE_PATH, appType), targetDir, {
     appName,
     appType
   }).then(() => {
     shelljs$5.cd(appName);
 
-    const hooks = require(resolve$d(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
+    const hooks = require(resolve$e(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
 
     if (hooks.afterCreate) {
       hooks.afterCreate.forEach(item => {
@@ -684,7 +703,7 @@ async function create(appName) {
       });
     }
 
-    shelljs$5.rm('-rf', resolve$d(appName, TEMPLATE_TKIT_DIR));
+    shelljs$5.rm('-rf', resolve$e(appName, TEMPLATE_TKIT_DIR));
     succeed('项目创建完成.');
   }).catch(err => {
     fail$8(err.message);
@@ -719,13 +738,12 @@ var defaultTmsConfig$1 = {
 const loadash = require$$0__default$6;
 const fs$a = require$$0__default$2;
 const {
-  TMS_NAME: TMS_NAME$1,
   TMS_CONFIG_FILENAME,
-  MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$2,
+  MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1,
   TMS_PRIVATE_FILENAME
 } = require$$4;
 const {
-  resolve: resolve$c,
+  resolve: resolve$d,
   isObject: isObject$1,
   isArray
 } = widgets;
@@ -733,14 +751,14 @@ const defaultTmsConfig = defaultTmsConfig$1;
 const {
   fail: fail$7
 } = log$1;
-const path$6 = require$$3__default;
+const path$7 = require$$1__default$2;
 /**
  * 读取tms.config.js
  * @param env {string} 环境变量
  */
 
 const readTmsConfig$1 = function (env) {
-  const tmsConfigPath = resolve$c(TMS_CONFIG_FILENAME);
+  const tmsConfigPath = resolve$d(TMS_CONFIG_FILENAME);
 
   if (!fs$a.existsSync(tmsConfigPath)) {
     fail$7('当前执行目录没有tms.config.js的配置项，请进行配置');
@@ -768,14 +786,14 @@ const convertModules = modules => {
     if (typeof module === 'string') {
       // 路径字符串
       Object.assign(newModule, {
-        name: path$6.basename(module),
+        name: path$7.basename(module),
         path: module
       });
     } else if (typeof module === 'object') {
       Object.assign(newModule, module);
 
       if (module.name === undefined) {
-        newModule.name = path$6.basename(module.path);
+        newModule.name = path$7.basename(module.path);
       }
     }
 
@@ -790,7 +808,7 @@ const convertModules = modules => {
 
 const readTmsPrivateCf$1 = function () {
   let tmsPrivateCf = {};
-  const tmsPrivatePath = resolve$c(TMS_PRIVATE_FILENAME);
+  const tmsPrivatePath = resolve$d(TMS_PRIVATE_FILENAME);
 
   if (fs$a.existsSync(tmsPrivatePath)) {
     tmsPrivateCf = require(tmsPrivatePath);
@@ -813,7 +831,7 @@ const readTmsPrivateCf$1 = function () {
  */
 
 
-const checkModules$1 = function (tmsConfig, modules) {
+const checkModules$1 = function (tmsConfig, modules, isQuit = false) {
   const targetModules = [];
   modules.forEach(moduleName => {
     const module = tmsConfig.modules.find(module => module.name === moduleName);
@@ -821,8 +839,9 @@ const checkModules$1 = function (tmsConfig, modules) {
   });
 
   if (targetModules.length === 0) {
-    fail$7(`你启动的模块无效，尝试 ${TMS_NAME$1} -m moduleName`);
-    process.exit(1);
+    fail$7(`你启动的模块无效${modules.join(',')}无效，请检查tms.config.json>modules>${modules.join(',')}
+    >name字段与module.config.json的name字段是否一致`);
+    isQuit && process.exit(1);
   }
 
   return targetModules;
@@ -883,7 +902,7 @@ function getModuleConfig$1(modules = [], appName, moduleConfigFilename) {
   modules.forEach(({
     path
   }) => {
-    const moduleConfigPath = resolve$c(path, moduleConfigFilename);
+    const moduleConfigPath = resolve$d(path, moduleConfigFilename);
 
     if (fs$a.existsSync(moduleConfigPath)) {
       const content = fs$a.readFileSync(moduleConfigPath, 'utf-8');
@@ -907,7 +926,7 @@ const tmsModulesMergeLocalModuleCfg$3 = (modules, appName) => {
     path: relativePath,
     name: moduleName
   }, moduleIndex) => {
-    const moduleConfigPath = resolve$c(relativePath, MODULE_CONFIG_FILENAME$2);
+    const moduleConfigPath = resolve$d(relativePath, MODULE_CONFIG_FILENAME$1);
 
     if (fs$a.existsSync(moduleConfigPath)) {
       try {
@@ -927,7 +946,7 @@ const tmsModulesMergeLocalModuleCfg$3 = (modules, appName) => {
         });
 
         if (!findModule) {
-          fail$7(`启动模块${moduleName}在${moduleConfigPath}没有找到，请检查配置`);
+          fail$7(`启动模块${moduleName}在${moduleConfigPath}没有找到或pages为空，请检查配置`);
           process.exit(1);
         }
       } catch (e) {
@@ -967,10 +986,13 @@ const subModulesMergeDepModules$2 = (tmsConfig, modules) => {
       // 如果所有模块的dep都在moduleNames内，则所有依赖都齐了
       // 否则递归处理，根据name找到相关配置加到modules里
       if (moduleNames.indexOf(item) === -1) {
-        isOver = false;
         const tmpModules = checkModules$1(tmsConfig, [...new Set([item])]);
-        mergeModules = [...mergeModules, ...tmpModules];
-        mergeModules = tmsModulesMergeLocalModuleCfg$3(mergeModules, tmsConfig.appName);
+
+        if (tmpModules.length > 0) {
+          isOver = false;
+          mergeModules = [...mergeModules, ...tmpModules];
+          mergeModules = tmsModulesMergeLocalModuleCfg$3(mergeModules, tmsConfig.appName);
+        }
       }
     });
   });
@@ -987,7 +1009,7 @@ var tmsMpconfig = {
   subModulesMergeDepModules: subModulesMergeDepModules$2
 };
 
-const global$5 = {
+const global$6 = {
   data: {},
 
   setData(...args) {
@@ -1009,19 +1031,19 @@ const global$5 = {
 
 };
 var global_1 = {
-  global: global$5
+  global: global$6
 };
 
 const {
   fail: fail$6
 } = log$1;
 const {
-  global: global$4
+  global: global$5
 } = global_1;
 
 function handleError$5(error) {
   const errMsg = typeof error === 'object' ? error.message : error;
-  const isDev = global$4.getData('isDev');
+  const isDev = global$5.getData('isDev');
 
   if (isDev) {
     fail$6(errMsg);
@@ -1040,7 +1062,7 @@ var handleError_1 = {
  */
 const fs$9 = require$$0__default$2;
 const {
-  MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1,
+  MODULE_CONFIG_FILENAME,
   MODULE_CONFIG_INVALID_KEY
 } = require$$4;
 const {
@@ -1051,7 +1073,7 @@ const {
   fail: fail$5
 } = log$1;
 const {
-  resolve: resolve$b,
+  resolve: resolve$c,
   isObject
 } = widgets;
 const {
@@ -1210,16 +1232,16 @@ const fixAppJson = appJson => {
 function buildOutputAppJson$1(tmsConfig, modules) {
   try {
     // 获取当前 modules 下的所有子模块的配置内容
-    const modulesConfig = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME$1); // 获取app.json的配置
+    const modulesConfig = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME); // 获取app.json的配置
 
-    const appJson = getAppJsonContent(resolve$b('./app.json')); // 更新app.json中的subpackages
+    const appJson = getAppJsonContent(resolve$c('./app.json')); // 更新app.json中的subpackages
 
     updateSubpackages(appJson, modulesConfig); // 处理appJson中重复||冲突的地方
 
     fixAppJson(appJson); // 更新主包，需在subpackages处理完成后执行， pages/
 
     updateMainPackages(appJson, tmsConfig.mainPackages);
-    fs$9.writeFileSync(resolve$b(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+    fs$9.writeFileSync(resolve$c(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
     return appJson;
   } catch (e) {
     handleError$4(`生成app.json出现错误: ${e}`);
@@ -1232,7 +1254,7 @@ var buildAppJson = {
 
 const fs$8 = require$$0__default$2;
 const {
-  resolve: resolve$a
+  resolve: resolve$b
 } = widgets;
 const {
   handleError: handleError$3
@@ -1249,7 +1271,12 @@ const symLink$1 = tmsConfig => {
   try {
     if (tmsConfig.cloudModules) {
       tmsConfig.cloudModules.forEach(item => {
-        fs$8.symlinkSync(resolve$a(item.path), resolve$a(DEFAULT_CLOUD_MODULE_DIR, item.name));
+        const path = resolve$b(DEFAULT_CLOUD_MODULE_DIR, item.name);
+        fs$8.access(path, fs$8.constants.F_OK, res => {
+          if (res) {
+            fs$8.symlinkSync(resolve$b(item.path), path);
+          }
+        });
       });
     }
   } catch (e) {
@@ -1265,11 +1292,11 @@ var symbolicLink = {
  * 下载第三方代码
  */
 const MetalSmith = require$$0__default$5;
-const crypto$1 = require$$1__default$3;
+const crypto$1 = require$$1__default$5;
 const {
   downloadRepoForGit,
   pullRepoForGit,
-  resolve: resolve$9
+  resolve: resolve$a
 } = widgets;
 const {
   fail: fail$4,
@@ -1281,7 +1308,7 @@ const {
   handleError: handleError$2
 } = handleError_1;
 const {
-  global: global$3
+  global: global$4
 } = global_1;
 /**
  * 处理用户没有clone git仓库权限问题,拼接tms.private.config.js的账号信息
@@ -1291,15 +1318,15 @@ const {
  */
 
 function replaceGitUrlAccount(httpRepoUrl, moduleName) {
-  var _tmsPrivateCf$gitAcco;
+  var _tmsPrivateCf$gitAcco, _tmsPrivateCf$gitAcco2;
 
   // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
-  const tmsPrivateCf = global$3.getData('tmsPrivateCf');
+  const tmsPrivateCf = global$4.getData('tmsPrivateCf');
   let gitUrl = httpRepoUrl;
   const {
     username = '',
     pass = ''
-  } = (tmsPrivateCf === null || tmsPrivateCf === void 0 ? void 0 : (_tmsPrivateCf$gitAcco = tmsPrivateCf.gitAccout) === null || _tmsPrivateCf$gitAcco === void 0 ? void 0 : _tmsPrivateCf$gitAcco[moduleName]) || {};
+  } = (tmsPrivateCf === null || tmsPrivateCf === void 0 ? void 0 : (_tmsPrivateCf$gitAcco = tmsPrivateCf.gitAccout) === null || _tmsPrivateCf$gitAcco === void 0 ? void 0 : _tmsPrivateCf$gitAcco[moduleName]) || (tmsPrivateCf === null || tmsPrivateCf === void 0 ? void 0 : (_tmsPrivateCf$gitAcco2 = tmsPrivateCf.gitAccount) === null || _tmsPrivateCf$gitAcco2 === void 0 ? void 0 : _tmsPrivateCf$gitAcco2[moduleName]) || {};
   const urlPrefixReg = /http(s)?:\/\//;
 
   if (username && pass && urlPrefixReg.test(gitUrl)) {
@@ -1354,7 +1381,8 @@ function md5ByGitUrlBranch(gitUrl, branch) {
 
 
 async function cloneModules$1(sourceDir, targetDir, modules) {
-  // 收集下载模块代码的任务
+  const cwd = process.cwd(); // 收集下载模块代码的任务
+
   const downloadTasksMap = collectDownLoadTasksMap(sourceDir, targetDir, modules); // 开始执行下载和移动代码的任务
 
   const arrPromises = [];
@@ -1374,6 +1402,7 @@ async function cloneModules$1(sourceDir, targetDir, modules) {
     }));
   });
   await Promise.all(arrPromises);
+  shelljs$4.cd(cwd);
 }
 /**
  * 收集下载模块代码的任务
@@ -1414,9 +1443,9 @@ function collectDownLoadTasksMap(sourceDir, targetDir, modules) {
 
       const md5Key = md5ByGitUrlBranch(gitUrl, branch); // git源码临时存在的源目录
 
-      const sourcePath = resolve$9(sourceDir, md5Key); // 模块源码要放到目标目录
+      const sourcePath = resolve$a(sourceDir, md5Key); // 模块源码要放到目标目录
 
-      const targetPath = resolve$9(targetDir, path); // 从git源码仓库中找到模块源码路径 (一个仓库存在存放多个模块的情况)
+      const targetPath = resolve$a(targetDir, path); // 从git源码仓库中找到模块源码路径 (一个仓库存在存放多个模块的情况)
 
       const sourceModulePath = gitPath ? `${sourcePath}/${gitPath}` : sourcePath; // 下载完代码后，添加回调函数（主要将模块代码从临时目录移动代码到目标目录）
 
@@ -1443,12 +1472,12 @@ function collectDownLoadTasksMap(sourceDir, targetDir, modules) {
 
         if (fs$7.existsSync(sourcePath) && fs$7.existsSync(`${sourcePath}/.git`)) {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
-            info$5(`git pull仓库:${httpRepoUrl}`);
+            info$5(`git pull:${httpRepoUrl}`);
             return pullRepoForGit(sourcePath, branch);
           };
         } else {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
-            info$5(`git clone仓库: ${httpRepoUrl}`);
+            info$5(`git clone: ${httpRepoUrl}`);
             return downloadRepoForGit(gitUrl, sourcePath, branch);
           };
         }
@@ -1503,7 +1532,7 @@ var cloneModules_1 = {
 };
 
 const ci = require$$0__default$7;
-const path$5 = require$$3__default;
+const path$6 = require$$1__default$2;
 /**
  * 获取小程序ci的Project对象
  * @returns {Object} 小程序ci对象
@@ -1517,7 +1546,7 @@ const getMpCi = ({
 }) => {
   var _cfgJsonContent$packO;
 
-  const cfgJsonContent = require(path$5.join(projectPath, 'project.config.json'));
+  const cfgJsonContent = require(path$6.join(projectPath, 'project.config.json'));
 
   const ignores = (cfgJsonContent === null || cfgJsonContent === void 0 ? void 0 : (_cfgJsonContent$packO = cfgJsonContent.packOptions) === null || _cfgJsonContent$packO === void 0 ? void 0 : _cfgJsonContent$packO.ignore.map(({
     value
@@ -1587,9 +1616,9 @@ var mpCi = {
  * 本文件主要负责项目或者分包依赖的npm的安装
  */
 const fs$6 = require$$0__default$2;
-const fsExtra = require$$1__default$4;
-const crypto = require$$1__default$3;
-const path$4 = require$$3__default;
+const fsExtra = require$$1__default$6;
+const crypto = require$$1__default$5;
+const path$5 = require$$1__default$2;
 const shell = require$$0__default$3;
 const glob = require$$5__default;
 const log = log$1;
@@ -1599,9 +1628,6 @@ const {
 const {
   handleError: handleError$1
 } = handleError_1;
-const {
-  info: info$4
-} = require$$9__default;
 const shellJsOption = {
   async: false,
   silent: true
@@ -1632,14 +1658,14 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
 
     if (Object.keys(md5Obj.dependencies).length !== 0) {
       const md5Key = crypto.createHash('md5').update(JSON.stringify(md5Obj)).digest('hex');
-      const cacheNMPath = path$4.join(cacheDir, md5Key);
-      const cacheNMTarFile = path$4.join(cacheNMPath, 'node_modules.tar.gz'); // 下载后，添加回调函数 (拷贝node_modules.tar.gz到编译目录并解压)
+      const cacheNMPath = path$5.join(cacheDir, md5Key);
+      const cacheNMTarFile = path$5.join(cacheNMPath, 'node_modules.tar.gz'); // 下载后，添加回调函数 (拷贝node_modules.tar.gz到编译目录并解压)
 
       const callback = {
         params: {
           cacheNMPath,
           cacheNMTarFile,
-          packageJsonDir: path$4.dirname(packageJsonPath),
+          packageJsonDir: path$5.dirname(packageJsonPath),
           shell
         },
         fn: async (cacheNMPath, cacheNMTarFile, packageJsonDir, shell) => {
@@ -1648,8 +1674,8 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
           const newShellJsOption = { ...shellJsOption,
             cwd: packageJsonDir
           };
-          shell.exec('tar -xzvf ./node_modules.tar.gz -C ./', newShellJsOption);
-          shell.exec('rm -rf ./node_modules.tar.gz', newShellJsOption);
+          shell.exec('tar -xvf ./node_modules.tar.gz -C ./', newShellJsOption);
+          shell.rm('-rf', './node_modules');
         }
       };
 
@@ -1666,13 +1692,13 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
           promiseTask = (packageJsonPath, cacheNMPath, shell) => {
             fsExtra.emptydirSync(cacheNMPath);
             shell.cp('-f', packageJsonPath, cacheNMPath);
-            info$4(`npm install: ${packageJsonPath}`);
+            log.info(`npm install: ${packageJsonPath}`);
             return npmInstall(cacheNMPath).then(() => {
               const newShellJsOption = { ...shellJsOption,
                 cwd: cacheNMPath
               };
-              shell.exec('tar -zcvf ./node_modules.tar.gz ./node_modules', newShellJsOption);
-              shell.exec('rm -rf ./node_modules', newShellJsOption);
+              shell.exec('tar -cvf ./node_modules.tar.gz ./node_modules', newShellJsOption);
+              shell.rm('-rf', './node_modules');
             });
           };
         }
@@ -1695,6 +1721,7 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
 
 
 const mpNpmInstallAll$1 = async (modules, contextDir, cacheDir) => {
+  const cwd = process.cwd();
   const packageJsonFiles = await findAllPackageJson(modules, contextDir); // 收集npm install的任务
 
   const npmTasksMap = collectNpmTasksMap(packageJsonFiles, cacheDir); // 开始执行npm install和回调（移动）的任务
@@ -1716,6 +1743,7 @@ const mpNpmInstallAll$1 = async (modules, contextDir, cacheDir) => {
     }));
   });
   await Promise.all(arrPromises);
+  shell.cd(cwd);
 };
 /**
   * 递归查找指定条件的文件
@@ -1751,7 +1779,7 @@ const findFilesByFilter = (startPath, filter) => {
 
     const files = fs$6.readdirSync(startPath);
     files.forEach(file => {
-      const filename = path$4.join(startPath, file);
+      const filename = path$5.join(startPath, file);
       const stat = fs$6.lstatSync(filename); // 当前文件是文件夹类型，继续递归
 
       if (stat.isDirectory()) {
@@ -1778,7 +1806,7 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
   const packageJsonName = 'package.json'; // 查找文件名
 
   const cwd = contextDir || dirPath;
-  const result = [path$4.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
+  const result = [path$5.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
 
   subRoots.forEach(subRoot => {
     if (!subRoot.root) {
@@ -1786,7 +1814,7 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
       process.exit(1);
     }
 
-    const toppath = path$4.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
+    const toppath = path$5.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
 
     const list = findFilesByFilter(toppath, packageJsonName);
     result.push(...list);
@@ -1802,7 +1830,7 @@ function cloudNpmInstall$1(contextDir) {
       }
 
       files.forEach(file => {
-        const dir = path$4.dirname(file);
+        const dir = path$5.dirname(file);
         shell.cd(dir);
         shell.exec('npx npm install --production --registry http://mirrors.tencent.com/npm/', {
           silent: false
@@ -1821,7 +1849,7 @@ var npm = {
 
 const {
   createTask: createTask$1,
-  resolve: resolve$8
+  resolve: resolve$9
 } = widgets;
 const {
   buildMpNpm
@@ -1834,21 +1862,21 @@ const {
   mpNpmInstallAll
 } = npm;
 const {
-  global: global$2
+  global: global$3
 } = global_1;
 
 async function install$2(tmsConfig, modules, isCloud = false) {
   // 小程序npm install
-  await createTask$1(mpNpmInstallAll, '小程序 开始npm install', '小程序npm install 完成')(modules, resolve$8(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`);
-  const tmsPrivateCf = global$2.getData('tmsPrivateCf'); // 构建miniprogram_npm
+  await createTask$1(mpNpmInstallAll, '小程序 开始npm install', '小程序npm install 完成')(modules, resolve$9(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`);
+  const tmsPrivateCf = global$3.getData('tmsPrivateCf'); // 构建miniprogram_npm
 
   await createTask$1(buildMpNpm, '开始构建miniprogram_npm', '构建miniprogram_npm 完成')({
     appId: tmsConfig.appId,
-    projectPath: resolve$8('./'),
+    projectPath: resolve$9('./'),
     privateKey: tmsPrivateCf.privateKey
   }); // 安装云函数的
 
-  isCloud && createTask$1(cloudNpmInstall, '云函数npm install', '云函数npm install安装完毕')(resolve$8(tmsConfig.cloudDir));
+  isCloud && createTask$1(cloudNpmInstall, '云函数npm install', '云函数npm install安装完毕')(resolve$9(tmsConfig.cloudDir));
 }
 
 var install_1 = install$2;
@@ -1857,7 +1885,7 @@ const shelljs$3 = require$$0__default$3;
 const fs$5 = require$$0__default$2;
 const io = io$2;
 const {
-  resolve: resolve$7,
+  resolve: resolve$8,
   createTask
 } = widgets;
 const {
@@ -1879,7 +1907,7 @@ const {
 } = tmsMpconfig;
 const {
   fail: fail$3,
-  info: info$3
+  info: info$4
 } = log$1;
 const install$1 = install_1;
 /**
@@ -1891,31 +1919,31 @@ const install$1 = install_1;
  */
 
 const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
-  const outputDir = resolve$7(tmsConfig.outputDir);
+  const outputDir = resolve$8(tmsConfig.outputDir);
   io.ensureDirExist(outputDir);
   defaultFiles.forEach(item => {
-    if (fs$5.existsSync(resolve$7(item))) {
-      shelljs$3.cp('-rf', resolve$7(item), resolve$7(tmsConfig.outputDir, item));
+    if (fs$5.existsSync(resolve$8(item))) {
+      shelljs$3.cp('-rf', resolve$8(item), resolve$8(tmsConfig.outputDir, item));
     }
   }); // 拷贝模块的package.json到编译输出目录
 
   targetModules.forEach(item => {
-    const outputModuleDir = resolve$7(`${tmsConfig.outputDir}/${item.root}`);
+    const outputModuleDir = resolve$8(`${tmsConfig.outputDir}/${item.root}`);
 
-    if (!fs$5.existsSync(resolve$7(item.path))) {
+    if (!fs$5.existsSync(resolve$8(item.path))) {
       fail$3(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
       process.exit(1);
     }
 
     io.ensureDirExist(outputModuleDir);
-    const modulePackagePath = resolve$7(item.path, 'package.json');
+    const modulePackagePath = resolve$8(item.path, 'package.json');
     if (fs$5.existsSync(modulePackagePath)) shelljs$3.cp('-Rf', modulePackagePath, outputModuleDir);
   });
 };
 
 async function task(tmsConfig, targetModules) {
   // 下载和移动代码
-  await createTask(cloneModules, '开始下载模块代码', '下载模块代码码完成')(MODULE_CODE_DIR$1, resolve$7('./'), targetModules); // tms.config.js的modules 合并 module.config.json的配置项
+  await createTask(cloneModules, '开始下载模块代码', '下载模块代码码完成')(MODULE_CODE_DIR$1, resolve$8('./'), targetModules); // tms.config.js的modules 合并 module.config.json的配置项
 
   let newModules = tmsModulesMergeLocalModuleCfg$2(targetModules, tmsConfig.appName); // A分包依赖了B分包的代码， merge B分包进行编译；
 
@@ -1939,7 +1967,7 @@ async function init$5(tmsConfig, targetModules) {
   } catch (error) {
     const errMsg = typeof error === 'object' ? error.message : error;
     fail$3(`init流程出现错误${errMsg}`);
-    info$3('详细的错误信息', error);
+    info$4('详细的错误信息', error);
     process.exit(1);
   }
 }
@@ -2004,8 +2032,8 @@ var pluginError_1 = {
 
 /* eslint-disable no-param-reassign */
 const through$2 = require$$0__default$9;
-const precinct = require$$1__default$5;
-const path$3 = require$$3__default;
+const precinct = require$$1__default$7;
+const path$4 = require$$1__default$2;
 const {
   findCssImports
 } = findCssImport;
@@ -2015,7 +2043,7 @@ const {
   diffContentCopyFile: diffContentCopyFile$2
 } = io$2;
 const {
-  resolve: resolve$6
+  resolve: resolve$7
 } = widgets;
 const fs$4 = require$$0__default$2;
 const {
@@ -2035,11 +2063,11 @@ const dfsFindCommonDep$2 = function (anaFileOriginFile, anaFileDestFile, extensi
       pluginError$2(e, isWatch);
     }
 
-    const deps = cssFilter.indexOf(path$3.extname(anaFileOriginFile)) > -1 ? findCssImports(contents) : precinct(contents);
+    const deps = cssFilter.indexOf(path$4.extname(anaFileOriginFile)) > -1 ? findCssImports(contents) : precinct(contents);
     deps.forEach(depItem => {
       if (depItem.startsWith('.')) {
         // 被依赖文件的存在的绝对路径
-        const depOriginPath = path$3.join(path$3.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
+        const depOriginPath = path$4.join(path$4.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
 
         const {
           ext: extAlias,
@@ -2052,7 +2080,7 @@ const dfsFindCommonDep$2 = function (anaFileOriginFile, anaFileDestFile, extensi
           return;
         }
 
-        const depDestPath = resolve$6(path$3.dirname(anaFileDestFile), depItem);
+        const depDestPath = resolve$7(path$4.dirname(anaFileDestFile), depItem);
         const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
 
         if (!resDep.has(depDestFile)) {
@@ -2076,19 +2104,19 @@ function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
   const stream = through$2.obj(function (file, enc, cb) {
     // 依赖分析的文件
     const anaFileOriginFile = file.history[0];
-    const anaFileRelativeModule = path$3.relative(resolve$6(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$6(tmsConfig.outputDir, module.to, anaFileRelativeModule);
+    const anaFileRelativeModule = path$4.relative(resolve$7(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve$7(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
-      const deps = cssFilter.indexOf(path$3.extname(file.path)) > -1 ? findCssImports(contents) : precinct(contents);
+      const deps = cssFilter.indexOf(path$4.extname(file.path)) > -1 ? findCssImports(contents) : precinct(contents);
       const copyModules = new Map();
       Object.keys(tmsConfig.dependencies).forEach(includeName => {
         const includePath = tmsConfig.dependencies[includeName];
         deps.forEach(depItem => {
           if (depItem.indexOf(includeName) > -1) {
             // 被依赖文件的存在的绝对路径 (eg: /User/thirdparty/loadsh)
-            const depOriginPath = path$3.join(path$3.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
+            const depOriginPath = path$4.join(path$4.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
 
             const {
               ext: extAlias,
@@ -2106,7 +2134,7 @@ function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
             const regRes = depItem.match(reg) || [];
 
             if (regRes[2]) {
-              const depDestPath = resolve$6(tmsConfig.outputDir, module.to, includeName, regRes[2]);
+              const depDestPath = resolve$7(tmsConfig.outputDir, module.to, includeName, regRes[2]);
               const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
 
               if (!copyModules.has(depDestFile)) {
@@ -2114,7 +2142,7 @@ function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
                   depOriginFile,
                   depDestFile,
                   beforeDepPath: depItem,
-                  afterDepPath: path$3.relative(path$3.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/')
+                  afterDepPath: path$4.relative(path$4.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/')
                 });
               }
             }
@@ -2152,14 +2180,14 @@ var mpCommonDep_1 = {
 
 /* eslint-disable no-param-reassign */
 const through$1 = require$$0__default$9;
-const path$2 = require$$3__default;
+const path$3 = require$$1__default$2;
 const {
   ext: ext$1,
   fileInDir: fileInDir$1,
   diffContentCopyFile: diffContentCopyFile$1
 } = io$2;
 const {
-  resolve: resolve$5
+  resolve: resolve$6
 } = widgets;
 const fs$3 = require$$0__default$2;
 const {
@@ -2173,8 +2201,8 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
   const stream = through$1.obj(function (file, enc, cb) {
     // 当前分析的文件的路径
     const anaFileOriginFile = file.history[0];
-    const anaFileRelativeModule = path$2.relative(resolve$5(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$5(tmsConfig.outputDir, module.to, anaFileRelativeModule);
+    const anaFileRelativeModule = path$3.relative(resolve$6(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve$6(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
@@ -2194,7 +2222,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
               const componentPath = contents.usingComponents[componentKey];
 
               if (componentPath.indexOf(includeName) > -1) {
-                const depOriginPath = path$2.join(path$2.dirname(anaFileOriginFile), componentPath); // 被依赖文件加上后缀
+                const depOriginPath = path$3.join(path$3.dirname(anaFileOriginFile), componentPath); // 被依赖文件加上后缀
 
                 const {
                   ext: extAlias,
@@ -2213,7 +2241,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
                 const regRes = componentPath.match(reg) || [];
 
                 if (regRes[2]) {
-                  const depDestPath = resolve$5(tmsConfig.outputDir, module.to, includeName, regRes[2]);
+                  const depDestPath = resolve$6(tmsConfig.outputDir, module.to, includeName, regRes[2]);
                   const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
 
                   if (!copyModules.has(depDestFile)) {
@@ -2222,7 +2250,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
                       depOriginExt: extAlias,
                       depDestFile,
                       beforeDepPath: componentPath,
-                      afterDepPath: path$2.relative(path$2.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/')
+                      afterDepPath: path$3.relative(path$3.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/')
                     });
                   }
                 }
@@ -2280,16 +2308,16 @@ var mpJsonDep_1 = {
 
 /* eslint-disable no-param-reassign */
 const through = require$$0__default$9;
-const htmlparser2 = require$$1__default$6;
+const htmlparser2 = require$$1__default$8;
 const fs$2 = require$$0__default$2;
-const path$1 = require$$3__default;
+const path$2 = require$$1__default$2;
 const {
   diffContentCopyFile,
   ext,
   fileInDir
 } = io$2;
 const {
-  resolve: resolve$4
+  resolve: resolve$5
 } = widgets;
 const {
   dfsFindCommonDep
@@ -2338,7 +2366,7 @@ const dfsFindWxmlDep = function (anaFileOriginFile, anaFileDestFile, isWatch = t
         var _attributes$src;
 
         if (attributes !== null && attributes !== void 0 && (_attributes$src = attributes.src) !== null && _attributes$src !== void 0 && _attributes$src.startsWith('.')) {
-          const depOriginPath = path$1.join(path$1.dirname(anaFileOriginFile), attributes.src); // 被依赖文件加上后缀
+          const depOriginPath = path$2.join(path$2.dirname(anaFileOriginFile), attributes.src); // 被依赖文件加上后缀
 
           const {
             ext,
@@ -2351,7 +2379,7 @@ const dfsFindWxmlDep = function (anaFileOriginFile, anaFileDestFile, isWatch = t
             return;
           }
 
-          const depDestPath = path$1.join(path$1.dirname(anaFileDestFile), attributes.src);
+          const depDestPath = path$2.join(path$2.dirname(anaFileDestFile), attributes.src);
           const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath; // 收集wxml依赖
 
           if (['import', 'include'].indexOf(name) > -1) {
@@ -2403,8 +2431,8 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
   const stream = through.obj(function (file, enc, cb) {
     // 依赖分析的文件
     const anaFileOriginFile = file.history[0];
-    const anaFileRelativeModule = path$1.relative(resolve$4(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$4(tmsConfig.outputDir, module.to, anaFileRelativeModule);
+    const anaFileRelativeModule = path$2.relative(resolve$5(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve$5(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
@@ -2414,7 +2442,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
           const nameFilter = ['import', 'include', 'wxs'];
 
           if (nameFilter.indexOf(name) > -1 && attributes.src) {
-            const depOriginPath = path$1.join(path$1.dirname(anaFileOriginFile), attributes.src); // 处理后缀(源码引入依赖时，后缀不全的情况)
+            const depOriginPath = path$2.join(path$2.dirname(anaFileOriginFile), attributes.src); // 处理后缀(源码引入依赖时，后缀不全的情况)
 
             const {
               ext,
@@ -2435,7 +2463,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
                 const regRes = attributes.src.match(reg) || [];
 
                 if (regRes[2]) {
-                  const depDestPath = resolve$4(tmsConfig.outputDir, module.to, includeName, regRes[2]);
+                  const depDestPath = resolve$5(tmsConfig.outputDir, module.to, includeName, regRes[2]);
                   const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath;
 
                   if (!copyModules.has(depDestFile)) {
@@ -2443,7 +2471,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
                       depOriginFile,
                       depDestFile,
                       beforeDepPath: attributes.src,
-                      afterDepPath: path$1.relative(path$1.dirname(anaFileDestFile), depDestFile).replace(/\\/g, '/')
+                      afterDepPath: path$2.relative(path$2.dirname(anaFileDestFile), depDestFile).replace(/\\/g, '/')
                     });
                   }
                 }
@@ -2500,11 +2528,9 @@ var mpWxmlDep_1 = {
 
 const {
   src: src$1,
-  dest,
-  lastRun
-} = require$$0__default$a;
-const px2rpx = require$$1__default$7;
-const watch = require$$2__default$1; // const cache = require('gulp-cache');
+  dest
+} = require$$0__default$a; // const px2rpx = require('gulp-px-to-rpx');
+// const cache = require('gulp-cache');
 // const image = require('gulp-image');
 // const replaceEnv = require('./plugins/replaceEnv');
 
@@ -2521,87 +2547,168 @@ const {
 
 const {
   fail: fail$1
-} = log$1;
-
-const since = task => file => lastRun(task) > file.stat.ctime ? lastRun(task) : 0;
+} = log$1; // const since = task => file => (lastRun(task) > file.stat.ctime ? lastRun(task) : 0);
 
 var compile = function (tmsConfig, {
   glob,
   destPath,
   srcOption,
   module,
-  watchOption = {
-    events: ['change', 'add', 'unlink']
-  },
   isWatch
 }) {
+  const compileTasksMap = new Map();
   Object.keys(glob).forEach(globKey => {
     const globValue = glob[globKey];
 
-    const task = () => src$1(globValue, { ...srcOption,
-      since: since(task)
-    });
-
-    let srcPipe = task();
-
-    if (isWatch) {
-      srcPipe = srcPipe.pipe(watch(globValue, watchOption));
-    }
-
     switch (globKey) {
       case 'js':
-        srcPipe // .pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData))
-        .pipe(mpCommonDep(tmsConfig, module, ['.js', '.ts', '.wxs', '.json'], isWatch)).pipe(dest(destPath)).on('error', err => {
-          fail$1(`js编译报错${err}`);
+        compileTasksMap.set(globValue, {
+          module,
+          taskFn: () => {
+            // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
+            // const srcPipe = srcTask();
+            const srcPipe = src$1(globValue, { ...srcOption
+            });
+            return srcPipe // .pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData))
+            .pipe(mpCommonDep(tmsConfig, module, ['.js', '.ts', '.wxs', '.json'], isWatch)).pipe(dest(destPath)).on('error', err => {
+              fail$1(`js编译报错${err}`);
+            });
+          }
         });
         break;
 
       case 'wxss':
-        srcPipe.pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isWatch)).on('error', err => {
-          fail$1(`mpCommonDep编译报错${err}`);
-        }) // .pipe(postcss([base64()]))
-        // .on('error', (err) => {
-        //   fail(`postcss编译报错${err}`);
-        // })
-        .pipe(px2rpx({
-          designWidth: 375,
-          // 设计稿宽度，默认为750
-          precision: 2 // 小数最大精度，默认为6
-
-        })).pipe(dest(destPath));
+        compileTasksMap.set(globValue, {
+          module,
+          taskFn: () => {
+            // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
+            // const srcPipe = srcTask();
+            const srcPipe = src$1(globValue, { ...srcOption
+            });
+            return srcPipe.pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isWatch)).on('error', err => {
+              fail$1(`mpCommonDep编译报错${err}`);
+            }) // .pipe(postcss([base64()]))
+            // .on('error', (err) => {
+            //   fail(`postcss编译报错${err}`);
+            // })
+            // .pipe(px2rpx({
+            //   designWidth: 375, // 设计稿宽度，默认为750
+            //   precision: 2, // 小数最大精度，默认为6
+            // }))
+            .pipe(dest(destPath));
+          }
+        });
         break;
 
       case 'json':
-        srcPipe.pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch)).on('error', err => {
-          fail$1(`mpJsonDep编译报错${err}`);
-        }).pipe(dest(destPath));
+        compileTasksMap.set(globValue, {
+          module,
+          taskFn: () => {
+            // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
+            // const srcPipe = srcTask();
+            const srcPipe = src$1(globValue, { ...srcOption
+            });
+            return srcPipe.pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch)).on('error', err => {
+              fail$1(`mpJsonDep编译报错${err}`);
+            }).pipe(dest(destPath));
+          }
+        });
         break;
 
       case 'wxml':
-        srcPipe.pipe(mpWxmlDep(tmsConfig, module, isWatch)).pipe(dest(destPath));
+        compileTasksMap.set(globValue, {
+          module,
+          taskFn: () => {
+            // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
+            // const srcPipe = srcTask();
+            const srcPipe = src$1(globValue, { ...srcOption
+            });
+            return srcPipe.pipe(mpWxmlDep(tmsConfig, module, isWatch)).pipe(dest(destPath));
+          }
+        });
         break;
 
       case 'image':
-        srcPipe // .pipe(cache(image()))
-        // .on('error', (err) => {
-        //   fail(`image编译报错${err}`);
-        // })
-        .pipe(dest(destPath));
+        compileTasksMap.set(globValue, {
+          module,
+          taskFn: () => {
+            // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
+            // const srcPipe = srcTask();
+            const srcPipe = src$1(globValue, { ...srcOption
+            });
+            return srcPipe // .pipe(cache(image()))
+            // .on('error', (err) => {
+            //   fail(`image编译报错${err}`);
+            // })
+            .pipe(dest(destPath));
+          }
+        });
         break;
 
       case 'other':
-        srcPipe.pipe(dest(destPath));
+        compileTasksMap.set(globValue, {
+          module,
+          taskFn: () => {
+            // const srcTask = () => src(globValue, { ...srcOption, since: since(srcTask) });
+            // const srcPipe = srcTask();
+            const srcPipe = src$1(globValue, { ...srcOption
+            });
+            return srcPipe.pipe(dest(destPath));
+          }
+        });
         break;
     }
   });
+  return compileTasksMap;
+};
+
+const watch = require$$0__default$b;
+const path$1 = require$$1__default$2;
+const shellJs = require$$0__default$3;
+const {
+  info: info$3
+} = log$1;
+const {
+  resolve: resolve$4
+} = widgets;
+const {
+  global: global$2
+} = global_1;
+
+var watch_1 = function (glob, watchOptions, callback, module) {
+  watch(glob, {
+    readDelay: 100,
+    ...watchOptions
+  }, vinyl => {
+    const file = vinyl.history[0];
+    const fileDirArr = file.replace(/\\/g, '/').split('/');
+    const fileName = fileDirArr.slice(fileDirArr.length - 2).join('/');
+
+    if (vinyl.event === 'unlink' || vinyl.event === 'unlinkDir') {
+      const tmsConfig = global$2.getData('tmsConfig');
+      const anaFileRelativeModule = path$1.relative(resolve$4(module.from), file);
+      const anaFileDestFile = resolve$4(tmsConfig.outputDir, module.to, anaFileRelativeModule);
+      info$3(`删除${fileName}`);
+      shellJs.rm('-rf', anaFileDestFile);
+      return;
+    }
+
+    info$3(`更新${fileName}`);
+    return callback(vinyl);
+  });
 };
 
 (function (module) {
-  const path = require$$3__default;
+  const path = require$$1__default$2;
   const fs = require$$0__default$2;
-  const watch = require$$2__default$1;
+  const ora = require$$2__default;
   const {
-    resolve
+    parallel,
+    series
+  } = require$$0__default$a;
+  const {
+    resolve,
+    mergeMap
   } = widgets;
   const {
     buildOutputAppJson
@@ -2610,6 +2717,11 @@ var compile = function (tmsConfig, {
     DEFAULT_COPY_CONFIG
   } = require$$4;
   const compile$1 = compile;
+  const watch = watch_1;
+  const {
+    info
+  } = log$1;
+  const watchEvents = ['add', 'change', 'unlink', 'unlinkDir'];
 
   function excludeGlob(glob) {
     const otherArr = new Set();
@@ -2640,20 +2752,19 @@ var compile = function (tmsConfig, {
   }
 
   module.exports = async (tmsConfig, newModules, isWatch = true) => {
-    // 监听app.json
+    const compileTasksMap = new Map(); // 监听app.json
+
     if (isWatch) {
-      watch(resolve('app.json'), {
+      watch([resolve('app.json')], {
         ignoreInitial: false,
-        events: ['add', 'change']
-      }, () => {
-        buildOutputAppJson(tmsConfig, newModules, isWatch);
-      });
+        events: watchEvents
+      }, () => buildOutputAppJson(tmsConfig, newModules, isWatch));
     } else {
       buildOutputAppJson(tmsConfig, newModules, isWatch);
     } // 监听根目录的文件
 
 
-    compile$1(tmsConfig, {
+    mergeMap(compileTasksMap, compile$1(tmsConfig, {
       glob: {
         json: DEFAULT_COPY_CONFIG.map(item => resolve(item)) // wxss: ['app.less', 'app.wxss'].map(item => resolve(item)),
         // js: ['app.js', 'app.ts'].map(item => resolve(item)),
@@ -2668,7 +2779,7 @@ var compile = function (tmsConfig, {
         allowEmpty: true
       },
       isWatch
-    }); // 监听模块的文件
+    })); // 监听模块的文件
 
     for (let module of newModules) {
       // 处理默认参数
@@ -2680,23 +2791,21 @@ var compile = function (tmsConfig, {
 
       if (isWatch) {
         // 监听模块配置文件
-        watch(`${resolve(module.path)}/**/module.config.json`, {
-          events: ['change']
-        }, () => {
-          buildOutputAppJson(tmsConfig, newModules, isWatch);
-        });
+        watch([`${resolve(module.path)}/**/module.config.json`], {
+          events: watchEvents
+        }, () => buildOutputAppJson(tmsConfig, newModules, isWatch));
       }
 
       const excludes = module.exclude.map(key => `!${resolve(key)}`);
       const modulePath = adaptPath(module.path);
       const glob = {
         js: [`${modulePath}/**/*.{js,ts,wxs}`, ...excludes],
-        json: [`${modulePath}/**/*.json`, ...excludes],
+        json: [`${modulePath}/**/*.json`, `!${modulePath}/**/module.config.json`, ...excludes],
         wxss: [`${modulePath}/**/*.{less,wxss}`, ...excludes],
         wxml: [`${modulePath}/**/*.wxml`, ...excludes],
         image: [`${modulePath}/**/*.{png,jpg,jpeg,gif,svg}`, ...excludes]
       };
-      compile$1(tmsConfig, {
+      mergeMap(compileTasksMap, compile$1(tmsConfig, {
         glob: { ...glob,
           other: [`${modulePath}/**/*`, ...excludeGlob(glob)]
         },
@@ -2709,7 +2818,7 @@ var compile = function (tmsConfig, {
           allowEmpty: true
         },
         isWatch
-      });
+      }));
     } // 静态资源目录-拷贝
 
 
@@ -2734,7 +2843,7 @@ var compile = function (tmsConfig, {
         }
 
         const from = fs.lstatSync(item.from).isFile() ? path.dirname(item.from) : item.from;
-        compile$1(tmsConfig, {
+        mergeMap(compileTasksMap, compile$1(tmsConfig, {
           glob,
           destPath: item.to,
           module: {
@@ -2745,18 +2854,56 @@ var compile = function (tmsConfig, {
             allowEmpty: true
           },
           isWatch
+        }));
+      }
+    }
+
+    let sTime;
+    let eTime;
+    const spinner = ora();
+
+    function end(cb) {
+      if (isWatch) {
+        compileTasksMap.forEach(({
+          taskFn,
+          module
+        }, globValue) => {
+          watch(globValue, {
+            ignoreInitial: true,
+            events: watchEvents
+          }, taskFn, module);
         });
       }
+
+      eTime = new Date().getTime() - sTime;
+      spinner.succeed(`首次编译完成， 耗时${eTime / 1000}s, 微信开发者工具打开项目即刻预览。`);
+      spinner.stop();
+      cb();
     }
+
+    function start(cb) {
+      info('启动编译...');
+      spinner.start();
+      sTime = new Date().getTime();
+      cb();
+    }
+
+    const compileTasks = [];
+    compileTasksMap.forEach(({
+      taskFn
+    }) => {
+      compileTasks.push(taskFn);
+    });
+    series(start, parallel(...compileTasks), end)();
   };
 })(dev$3);
 
 const fs$1 = require$$0__default$2;
-const semver$1 = require$$1__default$8;
+const semver$1 = require$$1__default$9;
 const {
   resolve: resolve$3
 } = widgets;
-const path = require$$3__default;
+const path = require$$1__default$2;
 const shelljs$2 = require$$0__default$3;
 const {
   handleError
@@ -2848,7 +2995,6 @@ const {
   resolve: resolve$2
 } = widgets;
 const {
-  MODULE_CONFIG_FILENAME,
   MODULE_CODE_DIR
 } = require$$4;
 const {
@@ -2861,17 +3007,12 @@ const {
   fail
 } = log$1;
 
-function checkModule(targetModules, contextDir) {
+function checkModule(targetModules) {
   // 判断\源码\dist\是否存在用户指定的模块
   for (const item of targetModules) {
     // 此模块没有root字段(原因：没有merge到module.config.json的配置项。第三方模块的代码可能还没有下载)
     if (!item.root) {
       return true;
-    } // 判断dist目录是否有该模块
-
-
-    if (!fs.existsSync(`${contextDir}/${item.root}/${MODULE_CONFIG_FILENAME}`)) {
-      return true;
     } // 判断第三方远程模块git地址与branch是否有更新
 
 
@@ -2911,7 +3052,7 @@ function isInit$1(tmsConfig, targetModules, contextDir) {
   } // 判断模块信息
 
 
-  if (checkModule(targetModules, contextDir)) {
+  if (checkModule(targetModules)) {
     return true;
   } //  判断package.json的版本是否有新的版本
 
@@ -3066,7 +3207,7 @@ async function run(commandName, cmd) {
   const tmsConfig = readTmsConfig(env); // 处理module参数
 
   const specificModules = getSpecificModules(handleModuleArg(cmd), tmsPrivateCf.modules, tmsConfig.modules);
-  const modules = checkModules(tmsConfig, [...new Set([...tmsConfig.mainPackages, ...specificModules])]); // tms.config.js的modules 合并 module.config.json的配置项
+  const modules = checkModules(tmsConfig, [...new Set([...tmsConfig.mainPackages, ...specificModules])], true); // tms.config.js的modules 合并 module.config.json的配置项
 
   let newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName); // A分包依赖了B分包的代码， merge B分包进行编译；
 
@@ -3075,7 +3216,8 @@ async function run(commandName, cmd) {
   global.setData({
     env,
     cmd,
-    tmsPrivateCf
+    tmsPrivateCf,
+    tmsConfig
   });
 
   switch (commandName) {
@@ -3152,7 +3294,7 @@ var entry = [{
 
 var require$$7 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.10",
+	version: "0.0.13",
 	description: "tmskit",
 	main: "dist/index.cjs",
 	bin: {
@@ -3195,9 +3337,6 @@ var require$$7 = {
 		"fs-extra": "^10.0.1",
 		"glob-ignore": "^1.0.2",
 		gulp: "^4.0.2",
-		"gulp-cache": "^1.1.3",
-		"gulp-postcss": "^9.0.1",
-		"gulp-px-to-rpx": "^1.0.7",
 		"gulp-watch": "^5.0.1",
 		htmlparser2: "^7.2.0",
 		inquirer: "^7.3.3",
@@ -3205,6 +3344,7 @@ var require$$7 = {
 		lodash: "^4.17.21",
 		metalsmith: "^2.3.0",
 		"miniprogram-ci": "1.4.13",
+		moment: "^2.29.1",
 		"object-assign": "^4.0.1",
 		ora: "^5.1.0",
 		"plugin-error": "^1.0.0",
@@ -3224,7 +3364,7 @@ var require$$7 = {
 	}
 };
 
-const semver = require$$1__default$8;
+const semver = require$$1__default$9;
 const packageJson = require$$7;
 const chalk$1 = require$$0__default;
 const {
@@ -3300,15 +3440,12 @@ function registerCommand(program, commands) {
 
 registerCommand(program, commands);
 program.on('--help', () => {
-  info();
   info(`  Run ${chalk.cyan(`${TMS_NAME}  <command> --help`)} for detailed usage of given command.`);
-  info();
 }); // 捕获未注册的命令
 
 program.arguments('<command>').action(cmd => {
   program.outputHelp();
-  info(`  ${chalk.red(`Unknown command ${chalk.yellow(cmd)}.`)}`);
-  info();
+  info(` ${chalk.red(`Unknown command ${chalk.yellow(cmd)}.`)}`);
   suggestCommands(cmd);
   process.exitCode = 1;
 });