@tmsfe/tmskit 0.0.19 → 0.0.20

package/dist/index.cjs.js

@@ -13,6 +13,8 @@ var require$$0$4 = require('async');
 var require$$1$3 = require('ejs');
 var require$$1$4 = require('inquirer');
 var require$$0$5 = require('metalsmith');
+var require$$9 = require('request');
+var require$$10 = require('unzipper');
 var require$$0$6 = require('lodash');
 var require$$1$5 = require('crypto');
 var require$$0$7 = require('miniprogram-ci');
@@ -30,10 +32,10 @@ var require$$5 = require('chokidar');
 var require$$6$1 = require('readable-stream');
 var require$$7$1 = require('vinyl-file');
 var require$$8 = require('vinyl');
-var require$$9 = require('anymatch');
+var require$$9$1 = require('anymatch');
 var require$$11 = require('glob-parent');
 var require$$2$1 = require('plugin-error');
-var require$$10 = require('path-is-absolute');
+var require$$10$1 = require('path-is-absolute');
 var require$$12 = require('slash');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
@@ -51,6 +53,8 @@ var require$$0__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$0$4);
 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$$9__default = /*#__PURE__*/_interopDefaultLegacy(require$$9);
+var require$$10__default = /*#__PURE__*/_interopDefaultLegacy(require$$10);
 var require$$0__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$0$6);
 var require$$1__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$1$5);
 var require$$0__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$0$7);
@@ -68,10 +72,10 @@ var require$$5__default = /*#__PURE__*/_interopDefaultLegacy(require$$5);
 var require$$6__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$6$1);
 var require$$7__default = /*#__PURE__*/_interopDefaultLegacy(require$$7$1);
 var require$$8__default = /*#__PURE__*/_interopDefaultLegacy(require$$8);
-var require$$9__default = /*#__PURE__*/_interopDefaultLegacy(require$$9);
+var require$$9__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$9$1);
 var require$$11__default = /*#__PURE__*/_interopDefaultLegacy(require$$11);
 var require$$2__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$2$1);
-var require$$10__default = /*#__PURE__*/_interopDefaultLegacy(require$$10);
+var require$$10__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$10$1);
 var require$$12__default = /*#__PURE__*/_interopDefaultLegacy(require$$12);
 
 function getAugmentedNamespace(n) {
@@ -91,7 +95,7 @@ function getAugmentedNamespace(n) {
 
 var src$2 = {};
 
-const chalk$3 = require$$0__default;
+const chalk$4 = require$$0__default;
 const moment = require$$1__default;
 /**
  * 本文件提供无依赖的在终端打印彩色文字的方法。
@@ -105,7 +109,7 @@ const resetCfg = decodeURIComponent('%1B%5B0m'); // \033[0m转义后的字符按
  * @returns {undefined} 无
  */
 
-const fail$9 = (message = '') => {
+const fail$a = (message = '') => {
   const redStyleConfig = decodeURIComponent('%1B%5B41%3B30m'); // \033[41;30m转义后的字符按，console时输出红色文字
 
   const greenFontStyleConfig = decodeURIComponent('%1B%5B41%3B37m'); // \033[41;30m转义后的字符按，console时输出红底白色文字
@@ -134,29 +138,29 @@ const succeed$2 = (message = '') => {
 
 
 const warn$2 = message => {
-  console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, chalk$3.yellow(message));
+  console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, chalk$4.yellow(message));
 };
 
-const info$a = (...args) => console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
+const info$d = (...args) => console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
 
 var log$1 = {
-  fail: fail$9,
+  fail: fail$a,
   succeed: succeed$2,
   warn: warn$2,
-  info: info$a
+  info: info$d
 };
 
 const program$1 = require$$0__default$1;
 const leven = require$$1__default$1;
-const ora = require$$2__default;
-const path$d = require$$1__default$2;
+const ora$1 = require$$2__default;
+const path$e = require$$1__default$2;
 const fs$g = require$$0__default$2;
 const shelljs$7 = require$$0__default$3;
 const glob$1 = require$$6__default;
 const {
-  info: info$9
+  info: info$c
 } = log$1;
-const chalk$2 = require$$0__default;
+const chalk$3 = require$$0__default;
 const shelljsOptions = {
   slient: true,
   async: false
@@ -165,7 +169,7 @@ const shelljsOptions = {
 const cwd = process.cwd();
 
 function resolve$f(...args) {
-  return path$d.resolve(cwd, ...args);
+  return path$e.resolve(cwd, ...args);
 }
 /**
  * 用户输入命令时，进行提示
@@ -185,7 +189,7 @@ const suggestCommands$1 = unknownCommand => {
   });
 
   if (suggestion) {
-    info$9(`  ${chalk$2.red(`Did you mean ${chalk$2.yellow(suggestion)}?`)}`);
+    info$c(`  ${chalk$3.red(`Did you mean ${chalk$3.yellow(suggestion)}?`)}`);
   }
 };
 /**
@@ -195,7 +199,7 @@ const suggestCommands$1 = unknownCommand => {
  */
 
 
-function isObject$2(obj) {
+function isObject(obj) {
   return Object.prototype.toString.call(obj) === '[object Object]';
 }
 /**
@@ -205,7 +209,7 @@ function isObject$2(obj) {
  */
 
 
-function isArray$1(obj) {
+function isArray(obj) {
   return Object.prototype.toString.call(obj) === '[object Array]';
 }
 /**
@@ -217,12 +221,12 @@ function isArray$1(obj) {
  */
 
 
-function downloadRepoForGit$2(url, dest, branch) {
+function downloadRepoForGit$1(url, dest, branch) {
   const cwd = process.cwd();
   return new Promise((resolve, reject) => {
     // 如果目标目录不存在
     if (fs$g.existsSync(dest)) {
-      shelljs$7.rm('-rf', path$d.join(dest));
+      shelljs$7.rm('-rf', path$e.join(dest));
     }
 
     shelljs$7.mkdir('-p', dest);
@@ -302,11 +306,11 @@ const cost = start => Date.now() - start;
  */
 
 
-function createTask$3(task, startText, endText) {
+function createTask$2(task, startText, endText) {
   return async (...args) => {
     const start = Date.now();
-    const spinner = ora();
-    info$9(startText);
+    const spinner = ora$1();
+    info$c(startText);
     spinner.start();
     const result = await task(...args);
     endText && spinner.succeed(`${endText}, 耗时${cost(start) / 1000}s`);
@@ -322,7 +326,7 @@ function createTask$3(task, startText, endText) {
 
 const camelize = str => str.replace(/-(\w)/g, (a, c) => c ? c.toUpperCase() : '');
 
-const mergeMap = function (obj, src) {
+const mergeMap$1 = function (obj, src) {
   for (const [k, v] of src) {
     if (obj.has(k)) {
       obj.set(k, obj.get(k) + v);
@@ -335,7 +339,7 @@ const mergeMap = function (obj, src) {
 };
 
 const relativeCwdPath$1 = function (file) {
-  return path$d.relative(process.cwd(), file);
+  return path$e.relative(process.cwd(), file);
 };
 /**
  * 从一个对象中，检索出去几个字段
@@ -345,7 +349,7 @@ const relativeCwdPath$1 = function (file) {
  */
 
 
-const filterField$3 = (obj, filterNames = []) => {
+const filterField$4 = (obj, filterNames = []) => {
   const newObj = { ...obj
   };
   filterNames.forEach(name => {
@@ -371,58 +375,72 @@ function findFiles(globPath, filter = []) {
 
 var widgets = {
   resolve: resolve$f,
-  isObject: isObject$2,
-  isArray: isArray$1,
-  createTask: createTask$3,
-  downloadRepoForGit: downloadRepoForGit$2,
+  isObject,
+  isArray,
+  createTask: createTask$2,
+  downloadRepoForGit: downloadRepoForGit$1,
   pullRepoForGit: pullRepoForGit$1,
   suggestCommands: suggestCommands$1,
   camelize,
   npmInstall: npmInstall$2,
-  mergeMap,
+  mergeMap: mergeMap$1,
   relativeCwdPath: relativeCwdPath$1,
-  filterField: filterField$3,
+  filterField: filterField$4,
   findFiles
 };
 
-const path$c = require('path');
+const path$d = require('path');
 
 const os = require('os'); // 用户目录
 
 
 const HOME_DIR = os.homedir(); // 所有文件的缓存目录
 
-const CACHE_DIR$3 = path$c.resolve(HOME_DIR, '.tmskit'); // 缓存文件
+const CACHE_DIR$3 = path$d.resolve(HOME_DIR, '.tmskit'); // 缓存文件
 
 const CACHE_FILE$1 = 'cache_file.json'; // 脚手架模板代码所在目录
 
-const TEMPLATE_DIR$1 = path$c.resolve(CACHE_DIR$3, 'template'); // 第三方模块源码存放的临时缓存目录
+const TEMPLATE_DIR$1 = path$d.resolve(CACHE_DIR$3, 'template'); // 模板的名称
 
-const MODULE_CODE_DIR$1 = path$c.resolve(CACHE_DIR$3, 'modules_code'); // 脚手架模板代码的具体路径
+const TEMPLATE_NAME$1 = 'tmskit-template'; // 第三方模块源码存放的临时缓存目录
 
-const TEMPLATE_PATH$1 = path$c.resolve(TEMPLATE_DIR$1, 'tools/tmskit-template'); // 脚手架的名称
+const MODULE_CODE_DIR$1 = path$d.resolve(CACHE_DIR$3, 'modules_code'); // 脚手架模板的远程地址
+
+const TEMPLATE_URL$1 = 'https://tms-web-1g1czzwka2fd06f2-1301126013.tcloudbaseapp.com/tmskit-template/tmskit-template.zip'; // 脚手架的名称
 
 const TMS_NAME$1 = 'tmskit'; // 脚手架的配置名称
 
-const TMS_CONFIG_FILENAME$1 = 'tms.config.js';
-const TMS_PRIVATE_FILENAME$1 = 'tms.private.config.js'; // 模块代码的默认在modules子目录
+const TMS_CONFIG_FILENAME = 'tms.config.js';
+const TMS_PRIVATE_FILENAME = 'tms.private.config.js'; // 模块代码的默认在modules子目录
 
 const DEFAULT_MODULE_DIR = 'modules'; // 模块代码的默认在modules子目录
 
 const DEFAULT_CLOUD_MODULE_DIR = './cloud'; // 模块的配置文件的名称
 
-const MODULE_CONFIG_FILENAME$2 = 'module.config.json'; // 默认的webpack entry
+const MODULE_CONFIG_FILENAME = 'module.config.json'; // 默认的webpack entry
 
 const DEFAULT_WEBPACK_ENTRY = {
-  app: path$c.resolve(process.cwd(), 'app')
+  app: path$d.resolve(process.cwd(), 'app')
 }; // 默认从源码拷贝到编译后的配置
 
-const DEFAULT_COPY_CONFIG$1 = ['package.json', 'sitemap.json'];
+const DEFAULT_COPY_CONFIG$2 = ['package.json', 'sitemap.json'];
 const ENV = {
   dev: 'development',
   prod: 'production'
 };
 const TEMPLATE_TKIT_DIR$2 = '_tmskit';
+const CREATE_TEMPLATE_QUESTION$1 = [{
+  type: 'list',
+  name: 'projectType',
+  message: '选择你要创建的模板',
+  choices: [{
+    name: '小程序项目',
+    value: 'mp'
+  }, {
+    name: '小程序模块',
+    value: 'mp-module'
+  }]
+}];
 
 var constant = /*#__PURE__*/Object.freeze({
 	__proto__: null,
@@ -430,26 +448,28 @@ var constant = /*#__PURE__*/Object.freeze({
 	CACHE_DIR: CACHE_DIR$3,
 	CACHE_FILE: CACHE_FILE$1,
 	TEMPLATE_DIR: TEMPLATE_DIR$1,
-	TEMPLATE_PATH: TEMPLATE_PATH$1,
+	TEMPLATE_NAME: TEMPLATE_NAME$1,
 	TMS_NAME: TMS_NAME$1,
-	TMS_CONFIG_FILENAME: TMS_CONFIG_FILENAME$1,
-	TMS_PRIVATE_FILENAME: TMS_PRIVATE_FILENAME$1,
+	TMS_CONFIG_FILENAME: TMS_CONFIG_FILENAME,
+	TMS_PRIVATE_FILENAME: TMS_PRIVATE_FILENAME,
 	DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR,
-	MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$2,
+	MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME,
 	DEFAULT_WEBPACK_ENTRY: DEFAULT_WEBPACK_ENTRY,
-	DEFAULT_COPY_CONFIG: DEFAULT_COPY_CONFIG$1,
+	DEFAULT_COPY_CONFIG: DEFAULT_COPY_CONFIG$2,
 	MODULE_CODE_DIR: MODULE_CODE_DIR$1,
 	ENV: ENV,
 	TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$2,
-	DEFAULT_CLOUD_MODULE_DIR: DEFAULT_CLOUD_MODULE_DIR
+	DEFAULT_CLOUD_MODULE_DIR: DEFAULT_CLOUD_MODULE_DIR,
+	CREATE_TEMPLATE_QUESTION: CREATE_TEMPLATE_QUESTION$1,
+	TEMPLATE_URL: TEMPLATE_URL$1
 });
 
 var require$$4 = /*@__PURE__*/getAugmentedNamespace(constant);
 
 const fs$f = require$$0__default$2;
-const path$b = require$$1__default$2;
+const path$c = require$$1__default$2;
 const {
-  info: info$8
+  info: info$b
 } = log$1;
 const {
   relativeCwdPath
@@ -491,7 +511,7 @@ const copyFile = function (src, dest) {
     fs$f.unlinkSync(dest);
   }
 
-  const dir = path$b.dirname(dest);
+  const dir = path$c.dirname(dest);
   ensureDirExist$2(dir);
   fs$f.copyFileSync(src, dest);
 }; // 判断文件内容是否一致，不一致再进行拷贝
@@ -503,11 +523,11 @@ function diffContentCopyFile$3(originFile, destFile) {
     const depOriginContent = fs$f.readFileSync(originFile, 'utf8');
 
     if (depDestContent !== depOriginContent) {
-      info$8(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
+      info$b(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
       copyFile(originFile, destFile);
     }
   } else {
-    info$8(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
+    info$b(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
     copyFile(originFile, destFile);
   }
 } // 添加后缀
@@ -551,7 +571,7 @@ const fileInDir$3 = (dir, file) => {
     return false;
   }
 
-  const relativePath = path$b.relative(dir, file);
+  const relativePath = path$c.relative(dir, file);
 
   if (relativePath.startsWith('..')) {
     return false;
@@ -566,7 +586,7 @@ function findAllFilesOfDir$1(dir) {
   function listFile(dir) {
     const arr = fs$f.readdirSync(dir);
     arr.forEach(item => {
-      const fullPath = path$b.join(dir, item);
+      const fullPath = path$c.join(dir, item);
       const stats = fs$f.statSync(fullPath);
 
       if (stats.isDirectory()) {
@@ -614,7 +634,7 @@ const render$1 = (files, metalsmith, next) => {
 var render_1 = render$1;
 
 const fs$e = require$$0__default$2;
-const inquirer = require$$1__default$4;
+const inquirer$1 = require$$1__default$4;
 const {
   resolve: resolve$e
 } = widgets;
@@ -677,7 +697,7 @@ const ask$1 = templateDir => (files, metalsmith, next) => {
 
     return true;
   });
-  inquirer.prompt(filteredPrompts).then(res => {
+  inquirer$1.prompt(filteredPrompts).then(res => {
     for (const prompt of filteredPrompts) {
       metadata[prompt.name] = res[prompt.name];
     }
@@ -698,7 +718,7 @@ const render = render_1;
 const ask = ask_1;
 const FILES_TO_IGNORE = ignoreFiles;
 
-const generator$1 = (buildDir, distDir, preMetadata) => new Promise((resolve, reject) => {
+const generator$1 = (buildDir, distDir, preMetadata = {}) => new Promise((resolve, reject) => {
   Metalsmith(buildDir).metadata(preMetadata).ignore(FILES_TO_IGNORE).clean(false).use(ask(buildDir)).source('./').destination(distDir).use(render).build(err => {
     if (err) {
       reject(err);
@@ -710,91 +730,138 @@ const generator$1 = (buildDir, distDir, preMetadata) => new Promise((resolve, re
 
 var generator_1 = generator$1;
 
-const path$a = require$$1__default$2;
+const path$b = require$$1__default$2;
 const fs$d = require$$0__default$2;
 const shelljs$6 = require$$0__default$3;
+const inquirer = require$$1__default$4;
 const {
   TEMPLATE_DIR,
-  TEMPLATE_PATH,
-  TEMPLATE_TKIT_DIR
+  TEMPLATE_URL,
+  TEMPLATE_NAME,
+  TEMPLATE_TKIT_DIR,
+  CREATE_TEMPLATE_QUESTION
 } = require$$4;
 const {
-  downloadRepoForGit: downloadRepoForGit$1,
-  createTask: createTask$2,
   resolve: resolve$d
 } = widgets;
 const io$2 = io$3;
 const {
-  fail: fail$8,
+  fail: fail$9,
   succeed: succeed$1,
-  info: info$7
+  info: info$a
 } = log$1;
 const generator = generator_1;
+const request = require$$9__default;
+const unzip = require$$10__default;
 /**
  * 如果该目录下面存在文件，换个名字
  * @param { string } targetDir 当前文件夹
  * @returns { undefined }
  */
 
-async function createAppDir(targetDir) {
+async function createProjectDir(targetDir) {
   // 如果目录非空或者已经存在，提示用户，做选择
   if (fs$d.existsSync(targetDir)) {
     if (!(await io$2.isDirEmpty(targetDir))) {
-      fail$8('该目录名已经存在，换个项目名字吧~');
+      fail$9('该目录名已经存在，换个项目名字吧~');
       process.exit(1);
     }
   } else {
     shelljs$6.mkdir('-p', targetDir);
   }
 }
+/**
+ * 下载和解压远程的小程序模板
+ * @param {string} templateDir
+ * @param {string} templateUrl
+ * @param {string} templateName
+ * @returns
+ */
+
+
+function downloadAndUnZipTemplate(templateDir, templateUrl, templateName) {
+  return new Promise((resolve, reject) => {
+    const localZipPath = `${templateDir}/${templateName}.zip`;
+    const stream = fs$d.createWriteStream(localZipPath);
+    request(`${templateUrl}?v=${new Date().getTime()}`).pipe(stream).on('close', err => {
+      if (err) {
+        reject(err);
+        return;
+      }
+
+      fs$d.createReadStream(localZipPath).pipe(unzip.Extract({
+        path: templateDir
+      })).on('close', err => {
+        if (err) {
+          reject(err);
+          return;
+        }
+
+        resolve();
+      });
+    });
+  });
+}
 /**
  * 创建本地小程序运行环境
- * @param { string } appType 项目类型
- * @param { string } appName 项目名称
+ * @param { string } projectType 项目类型
+ * @param { string } projectName 项目名称
  */
 
 
-async function create(appName) {
+async function create(projectName) {
   const cwd = process.cwd();
-  const targetDir = path$a.resolve(cwd, appName);
-  const appType = 'mp';
-  await createAppDir(targetDir); // 创建缓存目录
+  const targetDir = path$b.resolve(cwd, projectName);
+  const {
+    projectType
+  } = await inquirer.prompt(CREATE_TEMPLATE_QUESTION); // 创建项目目录
 
-  io$2.ensureDirExist(TEMPLATE_DIR); // 拉取git模板
+  await createProjectDir(targetDir); // 新创建缓存目录
 
-  await createTask$2(downloadRepoForGit$1, '拉取模板仓库', '拉取模板仓库完成')('https://git.woa.com/tmsfe/tms-frontend.git', TEMPLATE_DIR, 'master'); // 生成模板(1. 询问问题， 2. ejs生成模板  3.生成到目标目录)
+  if (fs$d.existsSync(TEMPLATE_DIR)) {
+    shelljs$6.rm('-rf', TEMPLATE_DIR);
+  }
 
-  generator(path$a.join(TEMPLATE_PATH, appType), targetDir, {
-    appName,
-    appType
-  }).then(() => {
-    shelljs$6.cd(appName);
+  fs$d.mkdirSync(TEMPLATE_DIR, {
+    recursive: true
+  }); // 下载和解压模板
 
-    const hooks = require(resolve$d(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
+  await downloadAndUnZipTemplate(TEMPLATE_DIR, TEMPLATE_URL, TEMPLATE_NAME); // 生成模板(1. 询问问题， 2. ejs生成模板  3.生成到目标目录)
 
-    if (hooks.afterCreate) {
-      hooks.afterCreate.forEach(item => {
-        if (typeof item === 'function') {
-          item.call(null, shelljs$6, {
-            appName
-          });
-        } else {
-          shelljs$6.exec(item);
-        }
-      });
+  generator(path$b.join(TEMPLATE_DIR, TEMPLATE_NAME, projectType), targetDir).then(() => {
+    shelljs$6.cd(projectName);
+    const hookFilePath = resolve$d(projectName, TEMPLATE_TKIT_DIR, 'hooks.js');
+
+    if (fs$d.existsSync(hookFilePath)) {
+      const hooks = require(hookFilePath);
+
+      if (hooks.afterCreate) {
+        hooks.afterCreate.forEach(item => {
+          if (typeof item === 'function') {
+            item.call(null, shelljs$6, {
+              projectName
+            });
+          } else {
+            shelljs$6.exec(item);
+          }
+        });
+      }
+
+      shelljs$6.rm('-rf', resolve$d(projectName, TEMPLATE_TKIT_DIR));
     }
 
-    shelljs$6.rm('-rf', resolve$d(appName, TEMPLATE_TKIT_DIR));
     succeed$1('项目创建完成.');
   }).catch(err => {
-    fail$8(err.message);
-    info$7('详细的错误信息:', err);
+    fail$9(err.message);
+    info$a('详细的错误信息:', err);
   });
 }
 
 var create_1 = create;
 
-var defaultTmsConfig$1 = {
+var tmsMpconfig = {exports: {}};
+
+var defaultTmsConfig = {
   // 全局的环境配置项
   envData: {},
   // 模块配置信息
@@ -816,236 +883,249 @@ var defaultTmsConfig$1 = {
 /**
  * 用来读取处理tms.config.js与module.config.json字段
  */
-const loadash$1 = require$$0__default$6;
-const fs$c = require$$0__default$2;
-const {
-  TMS_CONFIG_FILENAME,
-  MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1,
-  TMS_PRIVATE_FILENAME
-} = require$$4;
-const {
-  resolve: resolve$c,
-  isObject: isObject$1,
-  isArray
-} = widgets;
-const defaultTmsConfig = defaultTmsConfig$1;
-const {
-  fail: fail$7
-} = log$1;
-/**
- * 读取tms.config.js
- * @param env {string} 环境变量
- */
-
-const readTmsConfig$1 = function (env) {
-  const tmsConfigPath = resolve$c(TMS_CONFIG_FILENAME);
 
-  if (!fs$c.existsSync(tmsConfigPath)) {
-    fail$7('当前执行目录没有tms.config.js的配置项，请进行配置');
-    process.exit(1);
-  }
+(function (module) {
+  /* eslint-disable no-param-reassign, no-nested-ternary */
+  const loadash = require$$0__default$6;
+  const fs = require$$0__default$2;
+  const {
+    TMS_CONFIG_FILENAME,
+    MODULE_CONFIG_FILENAME,
+    TMS_PRIVATE_FILENAME
+  } = require$$4;
+  const {
+    resolve,
+    isObject,
+    isArray
+  } = widgets;
+  const defaultTmsConfig$1 = defaultTmsConfig;
+  const {
+    fail
+  } = log$1;
+  /**
+   * 读取tms.config.js
+   * @param env {string} 环境变量
+   */
 
-  const tmsConfigFn = require(tmsConfigPath);
+  const readTmsConfig = function (env) {
+    const tmsConfigPath = resolve(TMS_CONFIG_FILENAME);
 
-  const tmsConfig = tmsConfigFn({
-    env
-  }); // 合并默认值
+    if (!fs.existsSync(tmsConfigPath)) {
+      fail('当前执行目录没有tms.config.js的配置项，请进行配置');
+      process.exit(1);
+    }
 
-  return loadash$1.mergeWith(defaultTmsConfig, tmsConfig);
-};
-/**
- * 读取tms.private.config.js
- */
+    const tmsConfigFn = require(tmsConfigPath);
 
+    const tmsConfig = tmsConfigFn({
+      env
+    }); // 合并默认值
 
-const readTmsPrivateCf$1 = function () {
-  let tmsPrivateCf = {};
-  const tmsPrivatePath = resolve$c(TMS_PRIVATE_FILENAME);
+    return loadash.mergeWith(defaultTmsConfig$1, tmsConfig);
+  };
+  /**
+   * 读取tms.private.config.js
+   */
 
-  if (fs$c.existsSync(tmsPrivatePath)) {
-    tmsPrivateCf = require(tmsPrivatePath);
-  }
 
-  return tmsPrivateCf;
-};
-/**
- * 从tms.config.json中检索用户传入的有效modules
- * @param { object } tmsConfig
- * @param { array } modules
- * @returns
- */
+  const readTmsPrivateCf = function () {
+    let tmsPrivateCf = {};
+    const tmsPrivatePath = resolve(TMS_PRIVATE_FILENAME);
 
+    if (fs.existsSync(tmsPrivatePath)) {
+      tmsPrivateCf = require(tmsPrivatePath);
+    }
 
-const checkModules$1 = function (tmsConfig, modules, isQuit = false) {
-  const targetModules = [];
-  modules.forEach(moduleName => {
-    const module = tmsConfig.modules.all.find(module => module.name === moduleName);
-    module && targetModules.push(module);
-  });
+    return tmsPrivateCf;
+  };
+  /**
+   * 从tms.config.json中检索用户传入的有效modules
+   * @param { object } tmsConfig
+   * @param { array } modules
+   * @returns
+   */
+
+
+  const checkModules = function (tmsConfig, modules, isQuit = false) {
+    const targetModules = [];
+    modules.forEach(moduleName => {
+      const module = tmsConfig.modules.all.find(module => module.moduleName === moduleName);
+      module && targetModules.push(module);
+    });
 
-  if (targetModules.length === 0) {
-    fail$7(`你启动的模块无效${modules.join(',')}无效，请检查tms.config.json>modules>${modules.join(',')}
+    if (targetModules.length === 0) {
+      fail(`你启动的模块无效${modules.join(',')}无效，请检查tms.config.json>modules>${modules.join(',')}
     >name字段与module.config.json的name字段是否一致`);
-    isQuit && process.exit(1);
-  }
+      isQuit && process.exit(1);
+    }
 
-  return targetModules;
-};
-/**
- * 适配处理module.config.json的字段
- * @param { object } fileContent module.config.json的内容
- * @param { string } appName 小程序的名称
- */
+    return targetModules;
+  };
+  /**
+   * 适配处理module.config.json的字段
+   * @param { object } fileContent module.config.json的内容
+   * @param { string } appName 小程序的名称
+   */
 
 
-function adaptMpCgContent(fileContent, appName) {
-  const handleContent = function (appName, current) {
-    let res = current;
+  function adaptMpCgContent(fileContent, appName) {
+    const handleContent = function (appName, current) {
+      let res = current;
 
-    if (appName && current.mpConfig && current.mpConfig[appName]) {
-      res = { ...current,
-        ...current.mpConfig[appName]
-      };
-    }
+      if (appName && current.mpConfig && current.mpConfig[appName]) {
+        res = { ...current,
+          ...current.mpConfig[appName]
+        };
+      }
 
-    delete res.mpConfig;
-    delete res.isSubpackages;
-    return res;
-  };
+      delete res.mpConfig;
+      delete res.isSubpackages;
+      return res;
+    };
 
-  let content = JSON.parse(fileContent);
+    let content = fileContent;
 
-  if (isArray(content)) {
-    let i = content.length - 1;
+    if (isArray(content)) {
+      let i = content.length - 1;
 
-    while (i >= 0) {
-      content[i] = handleContent(appName, content[i]);
-      i--; // eslint-disable-line
+      while (i >= 0) {
+        content[i] = handleContent(appName, content[i]);
+        i--; // eslint-disable-line
+      }
+    } else {
+      content = handleContent(appName, content);
     }
-  } else {
-    content = handleContent(appName, content);
+
+    return content;
   }
+  /**
+   * 获取模块module.config.json中的配置信息
+   * @param {array} modules 用户要编译的模块列表
+   * @param { string } appName 小程序的名称
+   * @param {boolean} notFindIsQuit 找不到配置文件是否退出
+   */
+
+
+  function getModulesConfig(modules = [], appName, notFindIsQuit) {
+    const modulesConfig = [];
+    modules.forEach(moduleItem => {
+      if (!moduleItem.path) {
+        throw new Error(`${moduleItem.moduleName}模块路径配置没有找到`);
+      }
 
-  return content;
-}
-/**
- * 递归获取本地所有模块的配置信息
- * @param {array} modules 用户要编译的模块列表
- * @param { string } appName 小程序的名称
- * @param { string } moduleConfigFilename moduleConfig的文件名
- */
+      const moduleConfigPath = resolve(moduleItem.path, MODULE_CONFIG_FILENAME);
 
+      if (!fs.existsSync(moduleConfigPath)) {
+        if (notFindIsQuit) {
+          throw new Error(`${moduleItem.moduleName}模块的配置文件module.config.json在${moduleItem.path}目录下没有找到`);
+        }
 
-function getModuleConfig$1(modules = [], appName, moduleConfigFilename) {
-  const modulesConfig = {};
-  modules.forEach(({
-    path
-  }) => {
-    const moduleConfigPath = resolve$c(path, moduleConfigFilename);
+        return;
+      }
 
-    if (fs$c.existsSync(moduleConfigPath)) {
-      const content = fs$c.readFileSync(moduleConfigPath, 'utf-8');
-      modulesConfig[moduleConfigPath] = adaptMpCgContent(content, appName);
-    }
-  });
-  return modulesConfig;
-}
-/**
- * tms.config.js的modules 合并 module.config.json的配置项
- * @param {array} modules
- * @param {string} appName
- * @param {string} moduleDir
- * @returns
- */
+      let moduleConfig;
 
+      try {
+        moduleConfig = JSON.parse(fs.readFileSync(moduleConfigPath, 'utf-8'));
+      } catch (e) {
+        throw new Error(`${moduleConfigPath}json解析报错: ${e}`);
+      } // 兼容历史逻辑，后续可删除--- start
 
-const tmsModulesMergeLocalModuleCfg$3 = (modules, appName) => {
-  const newModules = [];
-  modules.forEach(({
-    path: relativePath,
-    name: moduleName
-  }, moduleIndex) => {
-    const moduleConfigPath = resolve$c(relativePath, MODULE_CONFIG_FILENAME$1);
 
-    if (fs$c.existsSync(moduleConfigPath)) {
-      try {
-        let findModule = false;
-        let moduleConfigContent = fs$c.readFileSync(moduleConfigPath, 'utf-8');
-        moduleConfigContent = adaptMpCgContent(moduleConfigContent, appName);
-        const moduleContentArr = isObject$1(moduleConfigContent) ? [moduleConfigContent] : moduleConfigContent;
-        moduleContentArr.forEach(({
-          name
-        }, moduleContentArrIndex) => {
-          if (name === moduleName) {
-            findModule = true;
-            newModules.push({ ...modules[moduleIndex],
-              ...moduleContentArr[moduleContentArrIndex]
-            });
-          }
-        });
+      if (!moduleItem.moduleName) moduleItem.moduleName = moduleItem.name;
+      delete moduleItem.name;
+      let subPackages = isObject(moduleConfig) && moduleConfig.subPackages ? moduleConfig.subPackages : isObject(moduleConfig) ? [moduleConfig] : moduleConfig;
+      subPackages = adaptMpCgContent(subPackages, appName);
+      let dependencies = moduleConfig.dependencies || [];
+      subPackages.forEach(item => {
+        item.path = moduleItem.path;
 
-        if (!findModule) {
-          fail$7(`启动模块${moduleName}在${moduleConfigPath}没有找到，请检查配置`);
-          process.exit(1);
+        if (item.dependencies) {
+          dependencies = dependencies.concat(item.dependencies);
         }
-      } catch (e) {
-        fail$7(`${moduleConfigPath}配置错误: ${e}`);
-        newModules.push({ ...modules[moduleIndex]
+      });
+      moduleItem.subPackages = subPackages;
+      moduleItem.dependencies = dependencies; // 兼容逻辑--- end
+
+      modulesConfig.push(moduleItem);
+    });
+    return modulesConfig;
+  }
+  /**
+   * 获取分包内容 （读取module.config.json的配置项）
+   * @param {array} modules
+   * @returns
+   */
+
+
+  const getSubPackages = modules => {
+    const newSubPackages = [];
+    modules.forEach(module => {
+      (module.subPackages || []).forEach(item => {
+        newSubPackages.push({
+          path: module.path,
+          ...item
         });
-      }
-    } else {
-      newModules.push({ ...modules[moduleIndex]
       });
-    }
-  });
-  return newModules;
-};
-/**
- * 分包依赖了分包的模块 合并所依赖的modules
- * @param { object } tmsConfig
- * @param {array} modules
- * @param {string} moduleDir
- * @returns
- */
+    });
+    return newSubPackages;
+  };
+  /**
+   * 获取所有的模块，合并模块的依赖模块
+   * @param { object } tmsConfig
+   * @param {array} modules
+   * @param {boolean} notFindIsQuit 找不到配置文件是否退出
+   * @returns
+   */
 
 
-const subModulesMergeDepModules$2 = (tmsConfig, modules) => {
-  const moduleNames = [];
-  modules.forEach(({
-    name: moduleName
-  }) => {
-    moduleNames.push(moduleName);
-  });
-  let mergeModules = modules;
-  let isOver = true;
-  modules.forEach(({
-    dependencies: dependencyModules
-  }) => {
-    dependencyModules === null || dependencyModules === void 0 ? void 0 : dependencyModules.forEach(item => {
-      // 如果所有模块的dep都在moduleNames内，则所有依赖都齐了
-      // 否则递归处理，根据name找到相关配置加到modules里
-      if (moduleNames.indexOf(item) === -1) {
-        const tmpModules = checkModules$1(tmsConfig, [...new Set([item])]);
-
-        if (tmpModules.length > 0) {
-          isOver = false;
-          mergeModules = [...mergeModules, ...tmpModules];
-          mergeModules = tmsModulesMergeLocalModuleCfg$3(mergeModules, tmsConfig.appName);
+  const getModulesByMergeDepModules = (tmsConfig, modules, notFindIsQuit = false) => {
+    const allModules = new Map();
+
+    function dfs(tmsConfig, modules) {
+      modules.forEach(moduleItem => {
+        const [moduleConfig = {}] = getModulesConfig([moduleItem], tmsConfig.appName, notFindIsQuit);
+
+        if (!allModules.has(moduleItem.moduleName)) {
+          allModules.set(moduleItem.moduleName, { ...moduleItem,
+            ...moduleConfig
+          });
+          const dependenciesModules = [];
+          ((moduleConfig === null || moduleConfig === void 0 ? void 0 : moduleConfig.dependencies) || []).forEach(dependenciesModule => {
+            tmsConfig.modules.all.forEach(module => {
+              if (dependenciesModule === module.moduleName) {
+                dependenciesModules.push({ ...module
+                });
+              }
+            });
+          });
+
+          if (dependenciesModules.length) {
+            dfs(tmsConfig, dependenciesModules);
+          }
         }
-      }
-    });
-  });
-  return isOver ? mergeModules : subModulesMergeDepModules$2(tmsConfig, mergeModules);
-};
+      });
+    }
 
-var tmsMpconfig = {
-  readTmsConfig: readTmsConfig$1,
-  readTmsPrivateCf: readTmsPrivateCf$1,
-  getModuleConfig: getModuleConfig$1,
-  checkModules: checkModules$1,
-  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$3,
-  subModulesMergeDepModules: subModulesMergeDepModules$2
-};
+    dfs(tmsConfig, modules);
+    const modulesArr = [];
+
+    for (const module of allModules.values()) {
+      modulesArr.push(module);
+    }
+
+    return modulesArr;
+  };
+
+  module.exports = {
+    readTmsConfig,
+    readTmsPrivateCf,
+    getModulesConfig,
+    checkModules,
+    getSubPackages,
+    getModulesByMergeDepModules
+  };
+})(tmsMpconfig);
 
 const global$6 = {
   data: {},
@@ -1073,20 +1153,26 @@ var global_1 = {
 };
 
 const {
-  fail: fail$6
+  fail: fail$8
 } = log$1;
 const {
   global: global$5
 } = global_1;
 
-function handleError$6(error) {
+function handleError$6(error, isQuit = false) {
   const errMsg = typeof error === 'object' ? error.message : error;
+
+  if (isQuit) {
+    fail$8(errMsg);
+    process.exit(1);
+  }
+
   const isDev = global$5.getData('isDev');
 
   if (isDev) {
-    fail$6(errMsg);
+    fail$8(errMsg);
   } else {
-    fail$6(errMsg);
+    fail$8(errMsg);
     process.exit(1);
   }
 }
@@ -1100,20 +1186,18 @@ var handleError_1 = {
  */
 /* eslint-disable no-param-reassign */
 
-const fs$b = require$$0__default$2;
-const {
-  MODULE_CONFIG_FILENAME
-} = require$$4;
+const fs$c = require$$0__default$2;
 const {
-  getModuleConfig
-} = tmsMpconfig;
+  getSubPackages: getSubPackages$3,
+  getModulesConfig
+} = tmsMpconfig.exports;
 const {
-  fail: fail$5
+  fail: fail$7,
+  info: info$9
 } = log$1;
 const {
-  resolve: resolve$b,
-  isObject,
-  filterField: filterField$2
+  resolve: resolve$c,
+  filterField: filterField$3
 } = widgets;
 const {
   handleError: handleError$5
@@ -1139,7 +1223,7 @@ function updateMainPackages(appJson, mainPackages = []) {
 
   foundMainPackages.forEach(subpackage => {
     if (!subpackage.pages || !subpackage.pages.length) {
-      fail$5(`主包 ${subpackage} 不能没有 pages`);
+      fail$7(`主包 ${subpackage} 不能没有 pages`);
       process.exit(-1);
     }
 
@@ -1164,33 +1248,17 @@ function updateMainPackages(appJson, mainPackages = []) {
 
 
 const getAppJsonContent = sourceAppJsonPath => {
-  if (!fs$b.existsSync(sourceAppJsonPath)) {
-    fail$5(`当前路径 ${sourceAppJsonPath} 没找到app.json`);
+  if (!fs$c.existsSync(sourceAppJsonPath)) {
+    fail$7(`当前路径 ${sourceAppJsonPath} 没找到app.json`);
     process.exit(1);
   }
 
-  const appJson = JSON.parse(fs$b.readFileSync(sourceAppJsonPath), 'utf-8'); // 加入默认值
+  const appJson = JSON.parse(fs$c.readFileSync(sourceAppJsonPath), 'utf-8'); // 加入默认值
 
   appJson.subpackages = [];
   appJson.pages = [];
   return appJson;
 };
-/**
- * 更新app.json中的subpackages
- * @param {Object} appJson
- * @param {Object} modulesConfigs
- */
-
-
-const updateSubpackages = (appJson, modulesConfigs) => {
-  // eslint-disable-next-line
-  for (const modulePath in modulesConfigs) {
-    const moduleInfo = isObject(modulesConfigs[modulePath]) ? [modulesConfigs[modulePath]] : modulesConfigs[modulePath];
-    appJson.subpackages = appJson.subpackages.concat(moduleInfo);
-  }
-
-  appJson.subpackages.sort((item1, item2) => item1.name.localeCompare(item2.name));
-};
 /**
  * 处理合并subpackages后的appjson, 整理重复不合法的地方
  * @param {Object} appJson appjson
@@ -1230,7 +1298,7 @@ const fixAppJson = appJson => {
         appJson[key] = preloadRuleMap;
       }
     });
-    return filterField$2(subp, [...arrOfFileType, ...objOfFileType, 'dependencies']);
+    return filterField$3(subp, [...arrOfFileType, ...objOfFileType, 'dependencies', 'path']);
   }); // 如果plugins重复，则错误提示
 
   const pluginsErrMsg = Object.keys(pluginsMap).map(pk => {
@@ -1255,27 +1323,30 @@ const fixAppJson = appJson => {
  */
 
 
-function buildOutputAppJson$1(tmsConfig, modules) {
+function buildOutputAppJson$2(tmsConfig, modules) {
   try {
     var _tmsConfig$hooks;
 
-    // 获取当前 modules 下的所有子模块的配置内容
-    const modulesConfigs = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME); // 获取app.json的配置
+    // 获取所有模块，合并模块依赖的模块
+    const modulesConfig = getModulesConfig(modules, tmsConfig.appName, false); // 获取所有的分包
+
+    const subPackages = getSubPackages$3(modulesConfig); // 获取app.json的配置
 
-    const appJson = getAppJsonContent(resolve$b('./app.json')); // 更新app.json中的subpackages
+    const appJson = getAppJsonContent(resolve$c('./app.json')); // 更新app.json中的subpackages
 
-    updateSubpackages(appJson, modulesConfigs); // 处理appJson中重复||冲突的地方
+    appJson.subpackages = subPackages;
+    appJson.subpackages.sort((item1, item2) => item1.name.localeCompare(item2.name)); // 处理appJson中重复||冲突的地方
 
     fixAppJson(appJson); // 更新主包，需在subpackages处理完成后执行， pages/
 
     updateMainPackages(appJson, tmsConfig.mainPackages);
-    fs$b.writeFileSync(resolve$b(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+    fs$c.writeFileSync(resolve$c(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
 
     if (typeof (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$hooks = tmsConfig.hooks) === null || _tmsConfig$hooks === void 0 ? void 0 : _tmsConfig$hooks.updateAppJson) === 'function') {
       var _tmsConfig$hooks2;
 
       tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$hooks2 = tmsConfig.hooks) === null || _tmsConfig$hooks2 === void 0 ? void 0 : _tmsConfig$hooks2.updateAppJson({
-        tmsConfig: filterField$2(tmsConfig, ['gitAccount']),
+        tmsConfig: filterField$3(tmsConfig, ['gitAccount']),
         modules,
         appJson,
         isDev: global$4.getData('isDev')
@@ -1285,11 +1356,12 @@ function buildOutputAppJson$1(tmsConfig, modules) {
     return appJson;
   } catch (e) {
     handleError$5(`生成app.json出现错误: ${e}`);
+    info$9(e);
   }
 }
 
 var buildAppJson = {
-  buildOutputAppJson: buildOutputAppJson$1
+  buildOutputAppJson: buildOutputAppJson$2
 };
 
 /**
@@ -1300,13 +1372,13 @@ const crypto$2 = require$$1__default$5;
 const {
   downloadRepoForGit,
   pullRepoForGit,
-  resolve: resolve$a
+  resolve: resolve$b
 } = widgets;
 const {
-  fail: fail$4,
-  info: info$6
+  fail: fail$6,
+  info: info$8
 } = log$1;
-const fs$a = require$$0__default$2;
+const fs$b = require$$0__default$2;
 const shelljs$5 = require$$0__default$3;
 const {
   handleError: handleError$4
@@ -1322,7 +1394,7 @@ const {
  */
 
 function replaceGitUrlAccount(httpRepoUrl, moduleName) {
-  var _tmsConfig$gitAccout, _tmsConfig$gitAccount;
+  var _tmsConfig$gitAccount;
 
   // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
   const tmsConfig = global$3.getData('tmsConfig');
@@ -1330,7 +1402,7 @@ function replaceGitUrlAccount(httpRepoUrl, moduleName) {
   const {
     username = '',
     pass = ''
-  } = (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gitAccout = tmsConfig.gitAccout) === null || _tmsConfig$gitAccout === void 0 ? void 0 : _tmsConfig$gitAccout[moduleName]) || (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gitAccount = tmsConfig.gitAccount) === null || _tmsConfig$gitAccount === void 0 ? void 0 : _tmsConfig$gitAccount[moduleName]) || {};
+  } = (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gitAccount = tmsConfig.gitAccount) === null || _tmsConfig$gitAccount === void 0 ? void 0 : _tmsConfig$gitAccount[moduleName]) || {};
   const urlPrefixReg = /http(s)?:\/\//;
 
   if (username && pass && urlPrefixReg.test(gitUrl)) {
@@ -1353,7 +1425,7 @@ function moveFile(sourceDir, targetDir, ignore = []) {
   return new Promise((resolve, reject) => {
     MetalSmith(__dirname).ignore(ignore).source(sourceDir).destination(targetDir).build(e => {
       if (e) {
-        fail$4(`${sourceDir} moveFile ${targetDir}出现错误: ${e}`);
+        fail$6(`${sourceDir} moveFile ${targetDir}出现错误: ${e}`);
         reject(e);
       }
 
@@ -1440,16 +1512,16 @@ function collectDownLoadTasksMap(sourceDir, targetDir, modules) {
           path: gitPath = ''
         },
         path,
-        name
+        moduleName
       } = moduleInfo; // 处理仓库权限问题
 
-      const gitUrl = replaceGitUrlAccount(httpRepoUrl, name); // 根据gitUrl与branch计算md5
+      const gitUrl = replaceGitUrlAccount(httpRepoUrl, moduleName); // 根据gitUrl与branch计算md5
 
       const md5Key = md5ByGitUrlBranch(gitUrl, branch); // git源码临时存在的源目录
 
-      const sourcePath = resolve$a(sourceDir, md5Key); // 模块源码要放到目标目录
+      const sourcePath = resolve$b(sourceDir, md5Key); // 模块源码要放到目标目录
 
-      const targetPath = resolve$a(targetDir, path); // 从git源码仓库中找到模块源码路径 (一个仓库存在存放多个模块的情况)
+      const targetPath = resolve$b(targetDir, path); // 从git源码仓库中找到模块源码路径 (一个仓库存在存放多个模块的情况)
 
       const sourceModulePath = gitPath ? `${sourcePath}/${gitPath}` : sourcePath; // 下载完代码后，添加回调函数（主要将模块代码从临时目录移动代码到目标目录）
 
@@ -1459,7 +1531,7 @@ function collectDownLoadTasksMap(sourceDir, targetDir, modules) {
           targetPath
         },
         fn: async (sourceModulePath, targetPath) => {
-          if (fs$a.existsSync(targetPath)) {
+          if (fs$b.existsSync(targetPath)) {
             shelljs$5.rm('-rf', `${targetPath}/*`);
           }
 
@@ -1474,14 +1546,14 @@ function collectDownLoadTasksMap(sourceDir, targetDir, modules) {
       } else {
         let promiseTask;
 
-        if (fs$a.existsSync(sourcePath) && fs$a.existsSync(`${sourcePath}/.git`)) {
+        if (fs$b.existsSync(sourcePath) && fs$b.existsSync(`${sourcePath}/.git`)) {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
-            info$6(`git pull:${httpRepoUrl}`);
+            info$8(`git pull:${httpRepoUrl}`);
             return pullRepoForGit(sourcePath, branch);
           };
         } else {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
-            info$6(`git clone: ${httpRepoUrl}`);
+            info$8(`git clone: ${httpRepoUrl}`);
             return downloadRepoForGit(gitUrl, sourcePath, branch);
           };
         }
@@ -1517,12 +1589,12 @@ function checkRemoteModGitUrlBranch(sourceDir, moduleInfo) {
         buildGitTag,
         httpRepoUrl
       },
-      name
+      moduleName
     } = moduleInfo;
-    const gitUrl = replaceGitUrlAccount(httpRepoUrl, name);
+    const gitUrl = replaceGitUrlAccount(httpRepoUrl, moduleName);
     const md5Key = md5ByGitUrlBranch(gitUrl, buildGitTag);
 
-    if (!fs$a.existsSync(`${sourceDir}/${md5Key}`)) {
+    if (!fs$b.existsSync(`${sourceDir}/${md5Key}`)) {
       return true;
     }
   }
@@ -1536,7 +1608,7 @@ var cloneModules_1 = {
 };
 
 const ci = require$$0__default$7;
-const path$9 = require$$1__default$2;
+const path$a = require$$1__default$2;
 /**
  * 获取小程序ci的Project对象
  * @returns {Object} 小程序ci对象
@@ -1550,7 +1622,7 @@ const getMpCi = ({
 }) => {
   var _cfgJsonContent$packO;
 
-  const cfgJsonContent = require(path$9.join(projectPath, 'project.config.json'));
+  const cfgJsonContent = require(path$a.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
@@ -1616,8 +1688,8 @@ var mpCi = {
   buildMpNpm: buildMpNpm$1
 };
 
-const fs$9 = require$$0__default$2;
-const path$8 = require$$1__default$2;
+const fs$a = require$$0__default$2;
+const path$9 = require$$1__default$2;
 const {
   CACHE_FILE,
   CACHE_DIR: CACHE_DIR$2
@@ -1631,7 +1703,7 @@ function getCache$1(projectDir, type) {
 
   const filePath = `${CACHE_DIR$2}/${CACHE_FILE}`;
 
-  if (!fs$9.existsSync(filePath)) {
+  if (!fs$a.existsSync(filePath)) {
     return null;
   }
 
@@ -1643,10 +1715,10 @@ function getCache$1(projectDir, type) {
 function setCache$1(projectDir, type = 'miniprogram_npm', data) {
   const filePath = `${CACHE_DIR$2}/${CACHE_FILE}`;
 
-  if (!fs$9.existsSync(filePath)) {
-    const dir = path$8.dirname(filePath);
+  if (!fs$a.existsSync(filePath)) {
+    const dir = path$9.dirname(filePath);
     ensureDirExist$1(dir);
-    fs$9.writeFileSync(filePath, '{}');
+    fs$a.writeFileSync(filePath, '{}');
   }
 
   const content = require(filePath);
@@ -1658,7 +1730,7 @@ function setCache$1(projectDir, type = 'miniprogram_npm', data) {
   content[projectDir] = {
     [type]: data
   };
-  fs$9.writeFileSync(filePath, JSON.stringify(content, null, 2));
+  fs$a.writeFileSync(filePath, JSON.stringify(content, null, 2));
 }
 
 var cache = {
@@ -1669,10 +1741,10 @@ var cache = {
 /**
  * 本文件主要负责项目或者分包依赖的npm的安装
  */
-const fs$8 = require$$0__default$2;
+const fs$9 = require$$0__default$2;
 const fsExtra = require$$1__default$6;
 const crypto$1 = require$$1__default$5;
-const path$7 = require$$1__default$2;
+const path$8 = require$$1__default$2;
 const shell = require$$0__default$3;
 const glob = require$$6__default;
 const log = log$1;
@@ -1704,22 +1776,29 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
   const npmTasksMap = new Map();
 
   for (const packageJsonPath of packageJsonFiles) {
-    const packageContent = fs$8.readFileSync(packageJsonPath);
-    const packageJson = JSON.parse(packageContent);
+    const packageContent = fs$9.readFileSync(packageJsonPath);
+    let packageJson;
+
+    try {
+      packageJson = JSON.parse(packageContent);
+    } catch (e) {
+      throw new Error(`${packageJsonPath}json解析出现错误:${e}`);
+    }
+
     const md5Obj = {
       dependencies: packageJson.dependencies || {}
     };
 
     if (Object.keys(md5Obj.dependencies).length !== 0) {
       const md5Key = crypto$1.createHash('md5').update(JSON.stringify(md5Obj)).digest('hex');
-      const cacheNMPath = path$7.join(cacheDir, md5Key);
-      const cacheNMTarFile = path$7.join(cacheNMPath, 'node_modules.tar.gz'); // 下载后，添加回调函数 (拷贝node_modules.tar.gz到编译目录并解压)
+      const cacheNMPath = path$8.join(cacheDir, md5Key);
+      const cacheNMTarFile = path$8.join(cacheNMPath, 'node_modules.tar.gz'); // 下载后，添加回调函数 (拷贝node_modules.tar.gz到编译目录并解压)
 
       const callback = {
         params: {
           cacheNMPath,
           cacheNMTarFile,
-          packageJsonDir: path$7.dirname(packageJsonPath),
+          packageJsonDir: path$8.dirname(packageJsonPath),
           shell
         },
         fn: async (cacheNMPath, cacheNMTarFile, packageJsonDir, shell) => {
@@ -1795,7 +1874,7 @@ const npmInstallAll$1 = async (modules, contextDir, cacheDir) => {
       }) => fn(...Object.keys(cParams).map(key => cParams[key])));
       return Promise.all(callArr);
     }).catch(e => {
-      handleError$3(`npm install ${params.packageJsonPath}出现错误：${e}`);
+      handleError$3(`npm install ${params.packageJsonPath}出现错误：${e}`, true);
     }));
   });
   await Promise.all(arrPromises);
@@ -1821,7 +1900,7 @@ const findFilesByFilter = (startPath, filter) => {
 
   const find = (startPath, filter) => {
     // 目录不存在
-    if (!fs$8.existsSync(startPath)) {
+    if (!fs$9.existsSync(startPath)) {
       log.fail(`${startPath}目录不存在`);
       process.exit(-1);
       return;
@@ -1834,10 +1913,10 @@ const findFilesByFilter = (startPath, filter) => {
       return;
     }
 
-    const files = fs$8.readdirSync(startPath);
+    const files = fs$9.readdirSync(startPath);
     files.forEach(file => {
-      const filename = path$7.join(startPath, file);
-      const stat = fs$8.lstatSync(filename); // 当前文件是文件夹类型，继续递归
+      const filename = path$8.join(startPath, file);
+      const stat = fs$9.lstatSync(filename); // 当前文件是文件夹类型，继续递归
 
       if (stat.isDirectory()) {
         find(filename, filter);
@@ -1863,7 +1942,7 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
   const packageJsonName = 'package.json'; // 查找文件名
 
   const cwd = contextDir || dirPath;
-  const result = [path$7.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
+  const result = [path$8.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
 
   subRoots.forEach(subRoot => {
     if (!subRoot.root) {
@@ -1871,7 +1950,7 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
       process.exit(1);
     }
 
-    const toppath = path$7.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
+    const toppath = path$8.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
 
     const list = findFilesByFilter(toppath, packageJsonName);
     result.push(...list);
@@ -1887,7 +1966,7 @@ function cloudNpmInstall(contextDir) {
       }
 
       files.forEach(file => {
-        const dir = path$7.dirname(file);
+        const dir = path$8.dirname(file);
         shell.cd(dir);
         shell.exec('npx npm install --production --registry http://mirrors.tencent.com/npm/', {
           silent: false
@@ -1905,12 +1984,12 @@ var npm = {
 };
 
 const crypto = require$$1__default$5;
-const fs$7 = require$$0__default$2;
+const fs$8 = require$$0__default$2;
 
 function fileMd5$1(filePath) {
   return new Promise((resolve, reject) => {
     const md5sum = crypto.createHash('md5');
-    const stream = fs$7.ReadStream(filePath);
+    const stream = fs$8.ReadStream(filePath);
     stream.on('data', d => {
       md5sum.update(d);
     });
@@ -1928,12 +2007,12 @@ var md5 = {
   fileMd5: fileMd5$1
 };
 
-const fs$6 = require$$0__default$2;
+const fs$7 = require$$0__default$2;
 const semver$1 = require$$1__default$7;
 const {
-  resolve: resolve$9
+  resolve: resolve$a
 } = widgets;
-const path$6 = require$$1__default$2;
+const path$7 = require$$1__default$2;
 const shelljs$4 = require$$0__default$3;
 const {
   handleError: handleError$2
@@ -1942,60 +2021,77 @@ const {
 const getLatestVersion = npmName => {
   const data = shelljs$4.exec(`npm view ${npmName} version`);
   return data.stdout || '0.0.0';
-};
-/**
- * 检查package.json的依赖大于node_module的版本，则返回true
- * @param {*} modules 模块
- * @param {*} cwd  待检查package.json所在的目录 (eg: 当前执行脚本的目录)
- * @param {*} outputDir  待检查node_modules存放的目录 （eg: dist/node_modules）
- * @returns
- */
+}; // 收集package.json
 
 
-const isDependenciesUpdate$1 = (modules, cwd, outputDir) => {
-  // 步骤1. 收集package.json
+function collectHasPackageJson(modules, cwd, outputDir) {
   const packageJsonName = 'package.json'; // 查找文件名
   // 1.1根目录的package.json
 
   const packageArr = [{
-    srcPackageDir: path$6.join(cwd, packageJsonName),
-    destNpmDir: resolve$9(outputDir, 'node_modules')
+    srcPackageDir: path$7.join(cwd, packageJsonName),
+    destNpmDir: resolve$a(outputDir, 'node_modules')
   }]; // 1.2模块的package.json
 
   modules.forEach(item => {
-    const srcPackageDir = path$6.join(cwd, item.path, 'package.json');
+    const srcPackageDir = path$7.join(cwd, item.path, 'package.json');
 
-    if (fs$6.existsSync(srcPackageDir)) {
+    if (fs$7.existsSync(srcPackageDir)) {
       packageArr.push({
         srcPackageDir,
-        destNpmDir: resolve$9(outputDir, item.root, 'node_modules')
+        destNpmDir: resolve$a(outputDir, item.root, 'node_modules')
       });
     }
-  }); // 步骤2. 比较package.json的依赖与node_modules依赖的版本号
+  });
+  return packageArr;
+} // 读取package.json的依赖
 
-  for (const item of packageArr) {
-    const packageJson = fs$6.readFileSync(item.srcPackageDir, 'utf-8');
-    let dependencies = {};
 
-    try {
-      const json = JSON.parse(packageJson);
-      dependencies = json !== null && json !== void 0 && json.dependencies ? json === null || json === void 0 ? void 0 : json.dependencies : {};
-    } catch (e) {
-      handleError$2(`解析${item.srcPackageDir}报错，请检查是否是正确的json配置项 ${e}`);
-    }
+function readPackageDependencies(srcPackageDir) {
+  const packageJson = fs$7.readFileSync(srcPackageDir, 'utf-8');
+  let dependencies = {};
+
+  try {
+    const json = packageJson ? JSON.parse(packageJson) : {};
+    dependencies = (json === null || json === void 0 ? void 0 : json.dependencies) || {};
+  } catch (e) {
+    handleError$2(`解析${srcPackageDir}报错，请检查是否是正确的json配置项 ${e}`);
+  }
 
+  return dependencies;
+}
+/**
+ * 检查package.json的依赖大于node_module的版本，则返回true
+ * @param {*} modules 模块
+ * @param {*} cwd  待检查package.json所在的目录 (eg: 当前执行脚本的目录)
+ * @param {*} outputDir  待检查node_modules存放的目录 （eg: dist/node_modules）
+ * @returns
+ */
+
+
+const isDependenciesUpdate$1 = (modules, cwd, outputDir) => {
+  // 步骤1. 收集package.json
+  const packageArr = collectHasPackageJson(modules, cwd, outputDir); // 步骤2. 比较package.json的依赖与node_modules依赖的版本号
+
+  return checkPackageVersion$1(packageArr);
+}; // 比较package.json的依赖与node_modules依赖的版本号
+
+
+const checkPackageVersion$1 = packageArr => {
+  for (const item of packageArr) {
+    const dependencies = readPackageDependencies(item.srcPackageDir);
     const dependenciesKeys = Object.keys(dependencies);
 
     for (const key of dependenciesKeys) {
-      const depPath = path$6.join(item.destNpmDir, key);
+      const depPath = path$7.join(item.destNpmDir, key);
 
-      if (!fs$6.existsSync(depPath)) {
+      if (!fs$7.existsSync(depPath)) {
         return true;
       }
 
-      const depPackagePath = path$6.join(depPath, 'package.json');
+      const depPackagePath = path$7.join(depPath, 'package.json');
 
-      if (fs$6.existsSync(depPackagePath)) {
+      if (fs$7.existsSync(depPackagePath)) {
         const packageData = require(depPackagePath);
 
         if (dependencies[key] === 'latest') {
@@ -2017,16 +2113,17 @@ const isDependenciesUpdate$1 = (modules, cwd, outputDir) => {
 };
 
 var checkDependencies = {
-  isDependenciesUpdate: isDependenciesUpdate$1
+  isDependenciesUpdate: isDependenciesUpdate$1,
+  checkPackageVersion: checkPackageVersion$1
 };
 
 const shelljs$3 = require$$0__default$3;
-const fs$5 = require$$0__default$2;
-const path$5 = require$$1__default$2;
+const fs$6 = require$$0__default$2;
+const path$6 = require$$1__default$2;
 const io$1 = io$3;
 const {
   createTask: createTask$1,
-  resolve: resolve$8
+  resolve: resolve$9
 } = widgets;
 const {
   buildMpNpm
@@ -2042,8 +2139,8 @@ const {
   npmInstallAll
 } = npm;
 const {
-  fail: fail$3,
-  info: info$5
+  fail: fail$5,
+  info: info$7
 } = log$1;
 const {
   fileMd5
@@ -2052,7 +2149,7 @@ const {
   isDependenciesUpdate
 } = checkDependencies;
 
-async function install$2(tmsConfig, modules, env, useCache = true) {
+async function install$2(tmsConfig, modules, useCache = true) {
   const cwd = process.cwd();
   const npmInstallRes = await createTask$1(npmInstall, '小程序 开始npm install', '小程序npm install 完成')(tmsConfig, modules, useCache); // 如果npm install 没有命中缓存，则说明node_module有更新，此时必须构建miniprogram_npm
 
@@ -2069,8 +2166,8 @@ async function install$2(tmsConfig, modules, env, useCache = true) {
 
 async function npmInstall(tmsConfig, modules, useCache) {
   // 如果依赖没有更新和使用缓存数据（则命中缓存）
-  if (!isDependenciesUpdate(modules, resolve$8('./'), tmsConfig.outputDir) && useCache) {
-    info$5('node_modules命中缓存');
+  if (!isDependenciesUpdate(modules, resolve$9('./'), tmsConfig.outputDir) && useCache) {
+    info$7('node_modules命中缓存');
     return {
       isCache: true
     };
@@ -2078,18 +2175,18 @@ async function npmInstall(tmsConfig, modules, useCache) {
 
 
   modules.forEach(item => {
-    const outputModuleDir = resolve$8(`${tmsConfig.outputDir}/${item.root}`);
+    const outputModuleDir = resolve$9(`${tmsConfig.outputDir}/${item.root}`);
 
-    if (!fs$5.existsSync(resolve$8(item.path))) {
-      fail$3(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
+    if (!fs$6.existsSync(resolve$9(item.path))) {
+      fail$5(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
       process.exit(1);
     }
 
     io$1.ensureDirExist(outputModuleDir);
-    const modulePackagePath = resolve$8(item.path, 'package.json');
-    if (fs$5.existsSync(modulePackagePath)) shelljs$3.cp('-Rf', modulePackagePath, outputModuleDir);
+    const modulePackagePath = resolve$9(item.path, 'package.json');
+    if (fs$6.existsSync(modulePackagePath)) shelljs$3.cp('-Rf', modulePackagePath, outputModuleDir);
   });
-  await npmInstallAll(modules, resolve$8(tmsConfig.outputDir), `${CACHE_DIR$1}/node_modules`);
+  await npmInstallAll(modules, resolve$9(tmsConfig.outputDir), `${CACHE_DIR$1}/node_modules`);
   return {
     isCache: false
   };
@@ -2098,16 +2195,16 @@ async function npmInstall(tmsConfig, modules, useCache) {
 
 async function mpCiInstall(tmsConfig, modules, useCache) {
   const packageJsonFiles = [];
-  const rootPackFile = resolve$8(`${tmsConfig.outputDir}/package.json`);
+  const rootPackFile = resolve$9(`${tmsConfig.outputDir}/package.json`);
 
-  if (fs$5.existsSync(rootPackFile)) {
+  if (fs$6.existsSync(rootPackFile)) {
     packageJsonFiles.push(rootPackFile);
   }
 
   modules.forEach(item => {
-    const packageJsonFile = resolve$8(`${tmsConfig.outputDir}/${item.root}/package.json`);
+    const packageJsonFile = resolve$9(`${tmsConfig.outputDir}/${item.root}/package.json`);
 
-    if (fs$5.existsSync(packageJsonFile)) {
+    if (fs$6.existsSync(packageJsonFile)) {
       packageJsonFiles.push(packageJsonFile);
     }
   });
@@ -2120,8 +2217,8 @@ async function mpCiInstall(tmsConfig, modules, useCache) {
   if (useCache) {
     let flag = true;
     await Promise.all(packageJsonFiles.map(async item => {
-      const packageDir = path$5.dirname(item);
-      const mpDir = resolve$8(`${packageDir}/miniprogram_npm`);
+      const packageDir = path$6.dirname(item);
+      const mpDir = resolve$9(`${packageDir}/miniprogram_npm`);
       const md5Value = await getMNPMd5(packageDir);
       const preCache = getCache(mpDir, 'miniprogram_npm'); // console.log('miniprogram_npm', preCache, md5Value);
       // 上一次构建成功 && 上次md5与当前本地的miniprogram_npm的md5 一致，才可以进入缓存
@@ -2134,14 +2231,14 @@ async function mpCiInstall(tmsConfig, modules, useCache) {
   }
 
   if (isCache) {
-    info$5('miniprogram_npm命中缓存');
+    info$7('miniprogram_npm命中缓存');
     return;
   } // 即将构建，在cache中标记开始
 
 
   await Promise.all(packageJsonFiles.map(async item => {
-    const packageDir = path$5.dirname(item);
-    const mpDir = resolve$8(`${packageDir}/miniprogram_npm`);
+    const packageDir = path$6.dirname(item);
+    const mpDir = resolve$9(`${packageDir}/miniprogram_npm`);
     setCache(mpDir, 'miniprogram_npm', {
       md5: '',
       status: statusMap.doing
@@ -2149,13 +2246,13 @@ async function mpCiInstall(tmsConfig, modules, useCache) {
   }));
   await buildMpNpm({
     appId: tmsConfig.appId,
-    projectPath: resolve$8('./'),
+    projectPath: resolve$9('./'),
     privateKey: tmsConfig.privateKey
   }); // 构建成功后，计算md5写入cache
 
   await Promise.all(packageJsonFiles.map(async item => {
-    const packageDir = path$5.dirname(item);
-    const mpDir = resolve$8(`${packageDir}/miniprogram_npm`);
+    const packageDir = path$6.dirname(item);
+    const mpDir = resolve$9(`${packageDir}/miniprogram_npm`);
     const md5Value = await getMNPMd5(packageDir);
     setCache(mpDir, 'miniprogram_npm', {
       md5: md5Value,
@@ -2172,13 +2269,14 @@ async function getMNPMd5(cwd) {
   };
   shelljs$3.cd(cwd);
 
-  if (fs$5.existsSync('miniprogram_npm')) {
+  if (fs$6.existsSync('miniprogram_npm')) {
     shelljs$3.exec('tar -cvf ./miniprogram_npm.tar.gz ./miniprogram_npm', {
       cwd,
       ...shellJsOption
     });
-    const md5Value = await fileMd5('./miniprogram_npm.tar.gz');
-    shelljs$3.rm('-rf', path$5.join(cwd, './miniprogram_npm.tar.gz'));
+    const tarDir = path$6.join(cwd, './miniprogram_npm.tar.gz');
+    const md5Value = await fileMd5(tarDir);
+    shelljs$3.rm('-rf', tarDir);
     return md5Value;
   }
 
@@ -2188,29 +2286,29 @@ async function getMNPMd5(cwd) {
 var install_1 = install$2;
 
 const shelljs$2 = require$$0__default$3;
-const fs$4 = require$$0__default$2;
+const fs$5 = require$$0__default$2;
 const io = io$3;
 const {
-  resolve: resolve$7,
+  resolve: resolve$8,
   createTask
 } = widgets;
 const {
-  buildOutputAppJson
+  buildOutputAppJson: buildOutputAppJson$1
 } = buildAppJson;
 const {
   MODULE_CODE_DIR,
-  DEFAULT_COPY_CONFIG
+  DEFAULT_COPY_CONFIG: DEFAULT_COPY_CONFIG$1
 } = require$$4;
 const {
   cloneModules
 } = cloneModules_1;
 const {
-  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$2,
-  subModulesMergeDepModules: subModulesMergeDepModules$1
-} = tmsMpconfig;
+  getModulesByMergeDepModules: getModulesByMergeDepModules$2,
+  getSubPackages: getSubPackages$2
+} = tmsMpconfig.exports;
 const {
-  fail: fail$2,
-  info: info$4
+  fail: fail$4,
+  info: info$6
 } = log$1;
 const install$1 = install_1;
 /**
@@ -2222,11 +2320,11 @@ const install$1 = install_1;
  */
 
 const cpFilesToOutput = function (tmsConfig, defaultFiles) {
-  const outputDir = resolve$7(tmsConfig.outputDir);
+  const outputDir = resolve$8(tmsConfig.outputDir);
   io.ensureDirExist(outputDir);
   defaultFiles.forEach(item => {
-    if (fs$4.existsSync(resolve$7(item))) {
-      shelljs$2.cp('-rf', resolve$7(item), resolve$7(tmsConfig.outputDir, item));
+    if (fs$5.existsSync(resolve$8(item))) {
+      shelljs$2.cp('-rf', resolve$8(item), resolve$8(tmsConfig.outputDir, item));
     }
   });
 };
@@ -2244,7 +2342,7 @@ function checkConfig(targetModules) {
     } // 判断源码目录是否有该模块
 
 
-    if (item.path && !fs$4.existsSync(resolve$7(item.path))) {
+    if (item.path && !fs$5.existsSync(resolve$8(item.path))) {
       throw new Error(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
     }
   }
@@ -2254,39 +2352,38 @@ function checkConfig(targetModules) {
 
 async function task(tmsConfig, targetModules) {
   // 下载和移动代码
-  await createTask(cloneModules, '开始下载模块代码', '下载模块代码码完成')(MODULE_CODE_DIR, resolve$7('./'), targetModules); // tms.config.js的modules 合并 module.config.json的配置项
+  await createTask(cloneModules, '开始下载模块代码', '下载模块代码码完成')(MODULE_CODE_DIR, resolve$8('./'), targetModules); // 获取所有模块，合并模块依赖的模块
 
-  let newModules = tmsModulesMergeLocalModuleCfg$2(targetModules, tmsConfig.appName); // A分包依赖了B分包的代码， merge B分包进行编译；
+  const newModules = getModulesByMergeDepModules$2(tmsConfig, targetModules, true); // 获取所有的分包
 
-  newModules = subModulesMergeDepModules$1(tmsConfig, newModules);
-  checkConfig(newModules); // 拷贝相关配置文件到输出目录
+  const newSubPackages = getSubPackages$2(newModules);
+  checkConfig(newSubPackages); // 拷贝相关配置文件到输出目录
 
-  await createTask(cpFilesToOutput, '开始拷贝文件到编译输出目录', '拷贝文件到编译输出目录完成')(tmsConfig, DEFAULT_COPY_CONFIG); // install
+  await createTask(cpFilesToOutput, '开始拷贝文件到编译输出目录', '拷贝文件到编译输出目录完成')(tmsConfig, DEFAULT_COPY_CONFIG$1); // install
 
-  await install$1(tmsConfig, newModules); // 动态生成编译后的app.json;
+  await install$1(tmsConfig, newSubPackages); // 动态生成编译后的app.json;
 
-  await createTask(buildOutputAppJson, '开始生成编译后的app.json', '生成编译后的app.json完成')(tmsConfig, newModules);
-  return newModules;
+  await createTask(buildOutputAppJson$1, '开始生成编译后的app.json', '生成编译后的app.json完成')(tmsConfig, newModules);
+  return {
+    modules: newModules,
+    subPackages: newSubPackages
+  };
 }
 
 async function init$5(tmsConfig, targetModules) {
   try {
-    const newModules = await task(tmsConfig, targetModules);
-    return {
-      targetModules: newModules
-    };
+    const taskRes = await task(tmsConfig, targetModules);
+    return taskRes;
   } catch (error) {
     const errMsg = typeof error === 'object' ? error.message : error;
-    fail$2(`初始化流程出现错误${errMsg}`);
-    info$4('详细的错误信息', error);
+    fail$4(`初始化流程出现错误${errMsg}`);
+    info$6('详细的错误信息', error);
     process.exit(1);
   }
 }
 
 var init_1 = init$5;
 
-var dev$3 = {exports: {}};
-
 /* eslint-disable no-param-reassign */
 const strip = require$$0__default$8; // 匹配规则
 
@@ -2323,16 +2420,16 @@ var findCssImport = {
 
 /* eslint-disable no-param-reassign */
 const {
-  fail: fail$1
+  fail: fail$3
 } = log$1;
 
 function pluginError$3(error, isWatch) {
   const errMsg = error.message;
 
   if (isWatch) {
-    fail$1(errMsg);
+    fail$3(errMsg);
   } else {
-    fail$1(errMsg);
+    fail$3(errMsg);
     process.exit(1);
   }
 }
@@ -2344,7 +2441,7 @@ var pluginError_1 = {
 /* eslint-disable no-param-reassign */
 const through$2 = require$$0__default$9;
 const precinct = require$$1__default$8;
-const path$4 = require$$1__default$2;
+const path$5 = require$$1__default$2;
 const {
   findCssImports
 } = findCssImport;
@@ -2354,9 +2451,9 @@ const {
   diffContentCopyFile: diffContentCopyFile$2
 } = io$3;
 const {
-  resolve: resolve$6
+  resolve: resolve$7
 } = widgets;
-const fs$3 = require$$0__default$2;
+const fs$4 = require$$0__default$2;
 const {
   pluginError: pluginError$2
 } = pluginError_1;
@@ -2369,16 +2466,16 @@ const dfsFindCommonDep$2 = function (anaFileOriginFile, anaFileDestFile, extensi
     let contents = '';
 
     try {
-      contents = fs$3.readFileSync(anaFileOriginFile, 'utf8');
+      contents = fs$4.readFileSync(anaFileOriginFile, 'utf8');
     } catch (e) {
       pluginError$2(e, isWatch);
     }
 
-    const deps = cssFilter.indexOf(path$4.extname(anaFileOriginFile)) > -1 ? findCssImports(contents) : precinct(contents);
+    const deps = cssFilter.indexOf(path$5.extname(anaFileOriginFile)) > -1 ? findCssImports(contents) : precinct(contents);
     deps.forEach(depItem => {
       if (depItem.startsWith('.')) {
         // 被依赖文件的存在的绝对路径
-        const depOriginPath = path$4.join(path$4.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
+        const depOriginPath = path$5.join(path$5.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
 
         const {
           ext: extAlias,
@@ -2386,12 +2483,12 @@ const dfsFindCommonDep$2 = function (anaFileOriginFile, anaFileDestFile, extensi
           extPath
         } = ext$2(depOriginPath, extensions);
 
-        if (!fs$3.existsSync(depOriginFile)) {
+        if (!fs$4.existsSync(depOriginFile)) {
           pluginError$2(new Error(`${anaFileOriginFile}引用路径${depOriginFile}文件不存在, 请检查应用路径`), isWatch);
           return;
         }
 
-        const depDestPath = resolve$6(path$4.dirname(anaFileDestFile), depItem);
+        const depDestPath = resolve$7(path$5.dirname(anaFileDestFile), depItem);
         const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
 
         if (!resDep.has(depDestFile)) {
@@ -2415,19 +2512,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$4.relative(resolve$6(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$6(tmsConfig.outputDir, module.to, anaFileRelativeModule);
+    const anaFileRelativeModule = path$5.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$4.extname(file.path)) > -1 ? findCssImports(contents) : precinct(contents);
+      const deps = cssFilter.indexOf(path$5.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$4.join(path$4.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
+            const depOriginPath = path$5.join(path$5.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
 
             const {
               ext: extAlias,
@@ -2445,7 +2542,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)) {
@@ -2453,7 +2550,7 @@ function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
                   depOriginFile,
                   depDestFile,
                   beforeDepPath: depItem,
-                  afterDepPath: path$4.relative(path$4.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/')
+                  afterDepPath: path$5.relative(path$5.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/')
                 });
               }
             }
@@ -2491,16 +2588,16 @@ var mpCommonDep_1 = {
 
 /* eslint-disable no-param-reassign */
 const through$1 = require$$0__default$9;
-const path$3 = require$$1__default$2;
+const path$4 = require$$1__default$2;
 const {
   ext: ext$1,
   fileInDir: fileInDir$1,
   diffContentCopyFile: diffContentCopyFile$1
 } = io$3;
 const {
-  resolve: resolve$5
+  resolve: resolve$6
 } = widgets;
-const fs$2 = require$$0__default$2;
+const fs$3 = require$$0__default$2;
 const {
   pluginError: pluginError$1
 } = pluginError_1;
@@ -2512,8 +2609,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$3.relative(resolve$5(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$5(tmsConfig.outputDir, module.to, anaFileRelativeModule);
+    const anaFileRelativeModule = path$4.relative(resolve$6(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve$6(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
@@ -2533,7 +2630,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
               const componentPath = contents.usingComponents[componentKey];
 
               if (componentPath.indexOf(includeName) > -1) {
-                const depOriginPath = path$3.join(path$3.dirname(anaFileOriginFile), componentPath); // 被依赖文件加上后缀
+                const depOriginPath = path$4.join(path$4.dirname(anaFileOriginFile), componentPath); // 被依赖文件加上后缀
 
                 const {
                   ext: extAlias,
@@ -2552,7 +2649,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)) {
@@ -2561,7 +2658,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
                       depOriginExt: extAlias,
                       depDestFile,
                       beforeDepPath: componentPath,
-                      afterDepPath: path$3.relative(path$3.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/')
+                      afterDepPath: path$4.relative(path$4.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/')
                     });
                   }
                 }
@@ -2586,7 +2683,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
           const originFile = depOriginFile.replace(depOriginExt, extKey);
           const destFile = depDestFile.replace(depOriginExt, extKey);
 
-          if (fs$2.existsSync(originFile)) {
+          if (fs$3.existsSync(originFile)) {
             diffContentCopyFile$1(originFile, destFile);
             const extensionsFilter = ['.js', '.ts', '.wxss', '.less'];
 
@@ -2620,15 +2717,15 @@ var mpJsonDep_1 = {
 /* eslint-disable no-param-reassign */
 const through = require$$0__default$9;
 const htmlparser2 = require$$1__default$9;
-const fs$1 = require$$0__default$2;
-const path$2 = require$$1__default$2;
+const fs$2 = require$$0__default$2;
+const path$3 = require$$1__default$2;
 const {
   diffContentCopyFile,
   ext,
   fileInDir
 } = io$3;
 const {
-  resolve: resolve$4
+  resolve: resolve$5
 } = widgets;
 const {
   dfsFindCommonDep
@@ -2667,7 +2764,7 @@ const dfsFindWxmlDep = function (anaFileOriginFile, anaFileDestFile, isWatch = t
     let contents = '';
 
     try {
-      contents = fs$1.readFileSync(anaFileOriginFile, 'utf8');
+      contents = fs$2.readFileSync(anaFileOriginFile, 'utf8');
     } catch (e) {
       pluginError(e, isWatch);
     }
@@ -2677,7 +2774,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$2.join(path$2.dirname(anaFileOriginFile), attributes.src); // 被依赖文件加上后缀
+          const depOriginPath = path$3.join(path$3.dirname(anaFileOriginFile), attributes.src); // 被依赖文件加上后缀
 
           const {
             ext,
@@ -2685,12 +2782,12 @@ const dfsFindWxmlDep = function (anaFileOriginFile, anaFileDestFile, isWatch = t
             extPath
           } = extFile(name, depOriginPath);
 
-          if (!fs$1.existsSync(depOriginFile)) {
+          if (!fs$2.existsSync(depOriginFile)) {
             pluginError(new Error(`${anaFileOriginFile}引用的路径${depOriginFile}找不到应用文件，请检查引用路径`), isWatch);
             return;
           }
 
-          const depDestPath = path$2.join(path$2.dirname(anaFileDestFile), attributes.src);
+          const depDestPath = path$3.join(path$3.dirname(anaFileDestFile), attributes.src);
           const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath; // 收集wxml依赖
 
           if (['import', 'include'].indexOf(name) > -1) {
@@ -2742,8 +2839,8 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
   const stream = through.obj(function (file, enc, cb) {
     // 依赖分析的文件
     const anaFileOriginFile = file.history[0];
-    const anaFileRelativeModule = path$2.relative(resolve$4(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$4(tmsConfig.outputDir, module.to, anaFileRelativeModule);
+    const anaFileRelativeModule = path$3.relative(resolve$5(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve$5(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
@@ -2753,7 +2850,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
           const nameFilter = ['import', 'include', 'wxs'];
 
           if (nameFilter.indexOf(name) > -1 && attributes.src) {
-            const depOriginPath = path$2.join(path$2.dirname(anaFileOriginFile), attributes.src); // 处理后缀(源码引入依赖时，后缀不全的情况)
+            const depOriginPath = path$3.join(path$3.dirname(anaFileOriginFile), attributes.src); // 处理后缀(源码引入依赖时，后缀不全的情况)
 
             const {
               ext,
@@ -2774,7 +2871,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)) {
@@ -2782,7 +2879,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
                       depOriginFile,
                       depDestFile,
                       beforeDepPath: attributes.src,
-                      afterDepPath: path$2.relative(path$2.dirname(anaFileDestFile), depDestFile).replace(/\\/g, '/')
+                      afterDepPath: path$3.relative(path$3.dirname(anaFileDestFile), depDestFile).replace(/\\/g, '/')
                     });
                   }
                 }
@@ -2801,7 +2898,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
         beforeDepPath,
         afterDepPath
       }) => {
-        if (fs$1.existsSync(depOriginFile)) {
+        if (fs$2.existsSync(depOriginFile)) {
           diffContentCopyFile(depOriginFile, depDestFile);
           const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
           contents = contents.replace(reg, `"${afterDepPath}"`);
@@ -2857,10 +2954,10 @@ const {
 // const base64 = require('./plugins/postcss-font-base64');
 
 const {
-  fail
+  fail: fail$2
 } = log$1; // const since = task => file => (lastRun(task) > file.stat.ctime ? lastRun(task) : 0);
 
-var compile = function (tmsConfig, {
+var compile$1 = function (tmsConfig, {
   glob,
   destPath,
   srcOption,
@@ -2882,11 +2979,11 @@ var compile = function (tmsConfig, {
             });
             return srcPipe // .pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData))
             .pipe(mpCommonDep(tmsConfig, module, ['.js', '.ts', '.wxs', '.json'], isDev)).on('error', err => {
-              fail(`mpCommonDep编译报错${err}`);
+              fail$2(`mpCommonDep编译报错${err}`);
             }).pipe(dest(newDestPath, {
               overwrite: true
             })).on('error', err => {
-              fail(`js编译报错${err}`);
+              fail$2(`js编译报错${err}`);
             });
           }
         });
@@ -2901,7 +2998,7 @@ var compile = function (tmsConfig, {
             const srcPipe = src$1(newGlobValue, { ...srcOption
             });
             return srcPipe.pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isDev)).on('error', err => {
-              fail(`mpCommonDep编译报错${err}`);
+              fail$2(`mpCommonDep编译报错${err}`);
             }) // .pipe(postcss([base64()]))
             // .on('error', (err) => {
             //   fail(`postcss编译报错${err}`);
@@ -2911,7 +3008,7 @@ var compile = function (tmsConfig, {
             //   precision: 2, // 小数最大精度，默认为6
             // }))
             .pipe(dest(newDestPath)).on('error', err => {
-              fail(`wxss编译报错${err}`);
+              fail$2(`wxss编译报错${err}`);
             });
           }
         });
@@ -2926,9 +3023,9 @@ var compile = function (tmsConfig, {
             const srcPipe = src$1(newGlobValue, { ...srcOption
             });
             return srcPipe.pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isDev)).on('error', err => {
-              fail(`mpJsonDep编译报错${err}`);
+              fail$2(`mpJsonDep编译报错${err}`);
             }).pipe(dest(newDestPath)).on('error', err => {
-              fail(`json编译报错${err}`);
+              fail$2(`json编译报错${err}`);
             });
           }
         });
@@ -2943,9 +3040,9 @@ var compile = function (tmsConfig, {
             const srcPipe = src$1(newGlobValue, { ...srcOption
             });
             return srcPipe.pipe(mpWxmlDep(tmsConfig, module, isDev)).on('error', err => {
-              fail(`mpWxmlDep编译报错${err}`);
+              fail$2(`mpWxmlDep编译报错${err}`);
             }).pipe(dest(newDestPath)).on('error', err => {
-              fail(`wxml编译报错${err}`);
+              fail$2(`wxml编译报错${err}`);
             });
           }
         });
@@ -2964,7 +3061,7 @@ var compile = function (tmsConfig, {
             //   fail(`image编译报错${err}`);
             // })
             .pipe(dest(newDestPath)).on('error', err => {
-              fail(`image编译报错${err}`);
+              fail$2(`image编译报错${err}`);
             });
           }
         });
@@ -2979,7 +3076,7 @@ var compile = function (tmsConfig, {
             const srcPipe = src$1(newGlobValue, { ...srcOption
             });
             return srcPipe.pipe(dest(newDestPath)).on('error', err => {
-              fail(`编译报错${err}`);
+              fail$2(`编译报错${err}`);
             });
           }
         });
@@ -2993,7 +3090,7 @@ var compile = function (tmsConfig, {
 // 该文件源于npm包 gulp-watch 但内部有bug, 故源码进行单独修改
 
 const assign = require$$0__default$b;
-const path$1 = require$$1__default$2;
+const path$2 = require$$1__default$2;
 const PluginError = require$$2__default$1;
 const fancyLog = require$$3__default;
 const colors = require$$4__default;
@@ -3003,8 +3100,8 @@ const {
 } = require$$6__default$1;
 const vinyl = require$$7__default;
 const File = require$$8__default;
-const anymatch = require$$9__default;
-const pathIsAbsolute = require$$10__default;
+const anymatch = require$$9__default$1;
+const pathIsAbsolute = require$$10__default$1;
 const globParent = require$$11__default;
 const slash = require$$12__default;
 
@@ -3024,7 +3121,7 @@ function normalizeGlobs(globs) {
   return globs;
 }
 
-function watch$1(globs, opts, cb) {
+function watch$2(globs, opts, cb) {
   globs = normalizeGlobs(globs);
 
   if (typeof opts === 'function') {
@@ -3032,16 +3129,16 @@ function watch$1(globs, opts, cb) {
     opts = {};
   }
 
-  opts = assign({}, watch$1._defaultOptions, opts);
+  opts = assign({}, watch$2._defaultOptions, opts);
 
   cb = cb || function () {};
 
   function resolveFilepath(filepath) {
     if (pathIsAbsolute(filepath)) {
-      return path$1.normalize(filepath);
+      return path$2.normalize(filepath);
     }
 
-    return path$1.resolve(opts.cwd || process.cwd(), filepath);
+    return path$2.resolve(opts.cwd || process.cwd(), filepath);
   }
 
   function resolveGlob(glob) {
@@ -3097,7 +3194,7 @@ function watch$1(globs, opts, cb) {
     let glob;
     let currentFilepath = filepath;
 
-    while (!(glob = globs[anymatch(globs, currentFilepath, true)]) && currentFilepath !== (currentFilepath = path$1.dirname(currentFilepath))) {} // eslint-disable-line no-empty-blocks/no-empty-blocks
+    while (!(glob = globs[anymatch(globs, currentFilepath, true)]) && currentFilepath !== (currentFilepath = path$2.dirname(currentFilepath))) {} // eslint-disable-line no-empty-blocks/no-empty-blocks
 
 
     if (!glob) {
@@ -3106,7 +3203,7 @@ function watch$1(globs, opts, cb) {
     }
 
     if (!baseForced) {
-      fileOpts.base = path$1.normalize(globParent(glob));
+      fileOpts.base = path$2.normalize(globParent(glob));
     } // Do not stat deleted files
 
 
@@ -3157,54 +3254,76 @@ function watch$1(globs, opts, cb) {
 // Avoid modifying gulp-watch's default options inside a library/reusable package, please.
 
 
-watch$1._defaultOptions = {
+watch$2._defaultOptions = {
   events: ['add', 'change', 'unlink'],
   ignoreInitial: true,
   readDelay: 10
 };
-var gulpWatch = watch$1;
+var gulpWatch = watch$2;
 
-const watch = gulpWatch;
-const path = require$$1__default$2;
+/* eslint-disable no-restricted-syntax */
+const watch$1 = gulpWatch;
+const path$1 = require$$1__default$2;
 const shellJs = require$$0__default$3;
 const {
-  info: info$3,
-  warn: warn$1
+  info: info$5,
+  warn: warn$1,
+  fail: fail$1
 } = log$1;
 const {
-  resolve: resolve$3
+  resolve: resolve$4
 } = widgets;
 const {
   global: global$2
 } = global_1;
+const {
+  checkPackageVersion
+} = checkDependencies;
 const {
   findAllFilesOfDir
 } = io$3;
 const TIP_MAP = {
-  'package.json': '若依赖有变动，请重新执行tmskit run dev',
-  'module.config.json': '若dependencies字段有变动，需要重新执行tmskit run dev才会生效'
+  'package.json': {
+    tip: '依赖版本有变动，请重新执行tmskit run dev',
+    check: (sourceFile, targetFile) => {
+      const targetArr = targetFile.split('/');
+      targetArr[targetArr.length - 1] = 'node_modules';
+      const packageArr = [{
+        srcPackageDir: sourceFile,
+        destNpmDir: targetArr.join('/')
+      }];
+      return checkPackageVersion(packageArr);
+    }
+  },
+  'module.config.json': {
+    tip: '若dependencies字段有变动，请重新执行tmskit run dev才会生效',
+    check: () => true
+  }
 };
 
-const logTip = (fileName, tipMap) => {
-  // eslint-disable-next-line
-  for (const item in tipMap) {
-    if (fileName.indexOf(item) > -1) {
-      warn$1(`${fileName}有更新, ${tipMap[item]}`);
-      return;
+const logTip = (fileName, sourceFile, targetFile, tipMap) => {
+  try {
+    for (const item in tipMap) {
+      if (fileName.indexOf(item) > -1 && tipMap[item].check(sourceFile, targetFile)) {
+        warn$1(`${fileName}有更新, ${tipMap[item].tip}`);
+        return;
+      }
     }
-  }
 
-  info$3(`${fileName}有更新`);
+    info$5(`${fileName}有更新`);
+  } catch (e) {
+    fail$1(`${sourceFile}文件更新提示出现错误:  ${e.message}`);
+  }
 };
 
 const getTargetFile = (sourceFile, module, outputDir) => {
-  const sourceFileRelativeModule = path.relative(resolve$3(module.from), sourceFile);
-  const targetFile = resolve$3(outputDir, module.to, sourceFileRelativeModule);
+  const sourceFileRelativeModule = path$1.relative(resolve$4(module.from), sourceFile);
+  const targetFile = resolve$4(outputDir, module.to, sourceFileRelativeModule);
   return targetFile;
 };
 
 var watch_1 = function (globValue, watchOptions, callback, module) {
-  watch(globValue, { // readDelay: 100,
+  watch$1(globValue, { // readDelay: 100,
     ...watchOptions
   }, vinyl => {
     const sourceFile = vinyl.history[0];
@@ -3213,15 +3332,15 @@ var watch_1 = function (globValue, watchOptions, callback, module) {
     const tmsConfig = global$2.getData('tmsConfig');
 
     if (vinyl.event === 'addDir') {
-      info$3(`更新${sourceFileName}目录`);
+      info$5(`更新${sourceFileName}目录`);
       const files = findAllFilesOfDir(sourceFile);
 
       for (const file of files) {
         const fileDirArr = file.replace(/\\/g, '/').split('/');
         const fileName = fileDirArr.slice(fileDirArr.length - 2).join('/');
         const targetFile = getTargetFile(file, module, tmsConfig.outputDir);
-        logTip(fileName, TIP_MAP);
-        callback([file], path.dirname(targetFile));
+        logTip(fileName, sourceFile, targetFile, TIP_MAP);
+        callback([file], path$1.dirname(targetFile));
       }
 
       return;
@@ -3230,248 +3349,254 @@ var watch_1 = function (globValue, watchOptions, callback, module) {
     const targetFile = getTargetFile(sourceFile, module, tmsConfig.outputDir);
 
     if (vinyl.event === 'unlink' || vinyl.event === 'unlinkDir') {
-      info$3(`删除${sourceFileName}`);
+      info$5(`删除${sourceFileName}`);
       shellJs.rm('-rf', targetFile);
       return;
     }
 
-    logTip(sourceFileName, TIP_MAP);
-    return callback([sourceFile], path.dirname(targetFile));
+    logTip(sourceFileName, sourceFile, targetFile, TIP_MAP);
+    return callback([sourceFile], path$1.dirname(targetFile));
   });
 };
 
-(function (module) {
-  const path = require$$1__default$2;
-  const fs = require$$0__default$2;
-  const ora = require$$2__default;
-  const chalk = require$$0__default;
-  const {
-    parallel,
-    series
-  } = require$$0__default$a;
-  const {
-    resolve,
-    mergeMap,
-    filterField
-  } = widgets;
-  const {
-    buildOutputAppJson
-  } = buildAppJson;
-  const {
-    DEFAULT_COPY_CONFIG
-  } = require$$4;
-  const compile$1 = compile;
-  const watch = watch_1;
-  const {
-    info
-  } = log$1;
-  const watchEvents = ['add', 'change', 'unlink', 'addDir', 'unlinkDir'];
-
-  function excludeGlob(glob) {
-    const otherArr = new Set();
-    otherArr.add('!**/*.{ttf,otf,woff,eot}');
-    Object.keys(glob).forEach(globKey => {
-      if (typeof glob[globKey] === 'string') {
-        const data = glob[globKey].startsWith('!') ? glob[globKey] : `!${glob[globKey]}`;
-        otherArr.add(data);
-      }
+const path = require$$1__default$2;
+const fs$1 = require$$0__default$2;
+const ora = require$$2__default;
+const chalk$2 = require$$0__default;
+const {
+  parallel,
+  series
+} = require$$0__default$a;
+const {
+  resolve: resolve$3,
+  mergeMap,
+  filterField: filterField$2
+} = widgets;
+const {
+  buildOutputAppJson
+} = buildAppJson;
+const {
+  DEFAULT_COPY_CONFIG
+} = require$$4;
+const compile = compile$1;
+const watch = watch_1;
+const {
+  info: info$4
+} = log$1;
+const watchEvents = ['add', 'change', 'unlink', 'addDir', 'unlinkDir'];
 
-      if (Array.isArray(glob[globKey])) {
-        glob[globKey].forEach(value => {
-          if (typeof value === 'string') {
-            const data = value.startsWith('!') ? value : `!${value}`;
-            otherArr.add(data);
-          }
-        });
-      }
-    });
-    return Array.from(otherArr);
-  }
+function excludeGlob(glob) {
+  const otherArr = new Set();
+  otherArr.add('!**/*.{ttf,otf,woff,eot}');
+  Object.keys(glob).forEach(globKey => {
+    if (typeof glob[globKey] === 'string') {
+      const data = glob[globKey].startsWith('!') ? glob[globKey] : `!${glob[globKey]}`;
+      otherArr.add(data);
+    }
 
-  function adaptPath(pathDir) {
-    let newPath = pathDir;
-    newPath = newPath.startsWith('/') ? newPath : resolve(newPath);
-    newPath = newPath.endsWith('/') ? newPath.slice(0, newPath.length - 1) : newPath;
-    return newPath;
-  }
+    if (Array.isArray(glob[globKey])) {
+      glob[globKey].forEach(value => {
+        if (typeof value === 'string') {
+          const data = value.startsWith('!') ? value : `!${value}`;
+          otherArr.add(data);
+        }
+      });
+    }
+  });
+  return Array.from(otherArr);
+}
+
+function adaptPath(pathDir, cwd = '') {
+  let newPath = pathDir;
+  newPath = newPath.startsWith('/') ? newPath : resolve$3(cwd, newPath);
+  newPath = newPath.endsWith('/') ? newPath.slice(0, newPath.length - 1) : newPath;
+  return newPath;
+}
 
-  module.exports = async (tmsConfig, newModules, isDev = true) => {
-    const compileTasksMap = new Map(); // 监听根目录的文件
+var dev$3 = async (tmsConfig, modules, subPackages, isDev = true) => {
+  const compileTasksMap = new Map(); // 监听根目录的文件
+
+  mergeMap(compileTasksMap, compile(tmsConfig, {
+    glob: {
+      json: DEFAULT_COPY_CONFIG.map(item => resolve$3(item))
+    },
+    module: {
+      from: resolve$3(),
+      to: resolve$3(tmsConfig.outputDir)
+    },
+    destPath: resolve$3(tmsConfig.outputDir),
+    srcOption: {
+      allowEmpty: true
+    },
+    isDev
+  })); // 监听模块的文件
+
+  for (let pkg of subPackages) {
+    // 处理默认参数
+    pkg = { ...{
+        exclude: []
+      },
+      ...pkg
+    };
+    const packagePath = adaptPath(pkg.path);
+
+    if (isDev) {
+      // 监听模块配置文件
+      watch([`${packagePath}/**/module.config.json`], {
+        events: watchEvents
+      }, () => buildOutputAppJson(tmsConfig, modules, isDev), {
+        from: packagePath,
+        to: packagePath
+      });
+    }
 
-    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)),
+    const excludes = pkg.exclude.map(ePath => {
+      const newPath = adaptPath(ePath, packagePath);
+      const ext = path.extname(ePath).slice(1);
 
+      if (ext) {
+        return `!${resolve$3(packagePath, newPath)}`;
+      }
+
+      return `!${resolve$3(packagePath, newPath)}/**/*`;
+    });
+    const glob = {
+      js: [`${packagePath}/**/*.{js,ts,wxs}`, ...excludes],
+      json: [`${packagePath}/**/*.json`, `!${packagePath}/**/module.config.json`, ...excludes],
+      wxss: [`${packagePath}/**/*.{less,wxss,scss,sass,styl}`, ...excludes],
+      wxml: [`${packagePath}/**/*.wxml`, ...excludes],
+      image: [`${packagePath}/**/*.{png,jpg,jpeg,gif,svg}`, ...excludes]
+    };
+    mergeMap(compileTasksMap, compile(tmsConfig, {
+      glob: { ...glob,
+        other: [`${packagePath}/**/*`, ...excludeGlob(glob)]
       },
+      destPath: resolve$3(tmsConfig.outputDir, pkg.root),
       module: {
-        from: resolve(),
-        to: resolve(tmsConfig.outputDir)
+        from: pkg.path,
+        to: pkg.root
       },
-      destPath: resolve(tmsConfig.outputDir),
       srcOption: {
         allowEmpty: true
       },
       isDev
-    })); // 监听模块的文件
+    }));
+  } // 静态资源目录-拷贝
 
-    for (let module of newModules) {
-      // 处理默认参数
-      module = { ...{
-          exclude: []
-        },
-        ...module
-      };
-      const modulePath = adaptPath(module.path);
 
-      if (isDev) {
-        // 监听模块配置文件
-        watch([`${modulePath}/**/module.config.json`], {
-          events: watchEvents
-        }, () => buildOutputAppJson(tmsConfig, newModules, isDev), {
-          from: modulePath,
-          to: modulePath
-        });
+  if (tmsConfig !== null && tmsConfig !== void 0 && tmsConfig.static && (tmsConfig === null || tmsConfig === void 0 ? void 0 : tmsConfig.static.length) > 0) {
+    for (const item of tmsConfig.static) {
+      item.from = adaptPath(item.from);
+      item.to = adaptPath(item.to);
+      let glob = {};
+      const ext = path.extname(item.from).slice(1);
+
+      if (ext) {
+        glob[ext] = [item.from];
+      } else {
+        glob = {
+          js: [`${item.from}/**/*.{js,ts,wxs}`],
+          json: [`${item.from}/**/*.json`],
+          wxss: [`${item.from}/**/*.{less,wxss,scss,sass,styl}`],
+          wxml: [`${item.from}/**/*.wxml`],
+          image: [`${item.from}/**/*.{png,jpg,jpeg,gif,svg}`]
+        };
+        glob.other = [`${item.from}/**/*`, ...excludeGlob(glob)];
       }
 
-      const excludes = module.exclude.map(key => `!${resolve(key)}`);
-      const glob = {
-        js: [`${modulePath}/**/*.{js,ts,wxs}`, ...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]
-      };
-      mergeMap(compileTasksMap, compile$1(tmsConfig, {
-        glob: { ...glob,
-          other: [`${modulePath}/**/*`, ...excludeGlob(glob)]
-        },
-        destPath: resolve(tmsConfig.outputDir, module.root),
+      const from = fs$1.lstatSync(item.from).isFile() ? path.dirname(item.from) : item.from;
+      mergeMap(compileTasksMap, compile(tmsConfig, {
+        glob,
+        destPath: item.to,
         module: {
-          from: module.path,
-          to: module.root
+          from,
+          to: item.to
         },
         srcOption: {
           allowEmpty: true
         },
         isDev
       }));
-    } // 静态资源目录-拷贝
-
-
-    if (tmsConfig !== null && tmsConfig !== void 0 && tmsConfig.static && (tmsConfig === null || tmsConfig === void 0 ? void 0 : tmsConfig.static.length) > 0) {
-      for (const item of tmsConfig.static) {
-        item.from = adaptPath(item.from);
-        item.to = adaptPath(item.to);
-        let glob = {};
-        const ext = path.extname(item.from).slice(1);
-
-        if (ext) {
-          glob[ext] = [item.from];
-        } else {
-          glob = {
-            js: [`${item.from}/**/*.{js,ts,wxs}`],
-            json: [`${item.from}/**/*.json`],
-            wxss: [`${item.from}/**/*.{less,wxss}`],
-            wxml: [`${item.from}/**/*.wxml`],
-            image: [`${item.from}/**/*.{png,jpg,jpeg,gif,svg}`]
-          };
-          glob.other = [`${item.from}/**/*`, ...excludeGlob(glob)];
-        }
-
-        const from = fs.lstatSync(item.from).isFile() ? path.dirname(item.from) : item.from;
-        mergeMap(compileTasksMap, compile$1(tmsConfig, {
-          glob,
-          destPath: item.to,
-          module: {
-            from,
-            to: item.to
-          },
-          srcOption: {
-            allowEmpty: true
-          },
-          isDev
-        }));
-      }
     }
+  }
 
-    let sTime;
-    let eTime;
-    const spinner = ora();
+  let sTime;
+  let eTime;
+  const spinner = ora();
 
-    function start(cb) {
-      info('启动编译...');
-      spinner.start();
-      sTime = new Date().getTime();
-      cb();
-    }
+  function start(cb) {
+    info$4('启动编译...');
+    spinner.start();
+    sTime = new Date().getTime();
+    cb();
+  }
 
-    async function end(cb) {
-      var _tmsConfig$hooks;
+  async function end(cb) {
+    var _tmsConfig$hooks;
 
-      if (isDev) {
-        // 监听app.json
-        watch([resolve('app.json')], {
-          ignoreInitial: false,
+    if (isDev) {
+      // 监听app.json
+      watch([resolve$3('app.json')], {
+        ignoreInitial: false,
+        events: watchEvents
+      }, () => buildOutputAppJson(tmsConfig, modules, isDev), {
+        from: resolve$3(),
+        to: resolve$3(tmsConfig.outputDir)
+      }); // 监听其他文件
+
+      compileTasksMap.forEach(({
+        taskFn,
+        module
+      }, globValue) => {
+        watch(globValue, {
+          ignoreInitial: true,
           events: watchEvents
-        }, () => buildOutputAppJson(tmsConfig, newModules, isDev), {
-          from: resolve(),
-          to: resolve(tmsConfig.outputDir)
-        }); // 监听其他文件
-
-        compileTasksMap.forEach(({
-          taskFn,
-          module
-        }, globValue) => {
-          watch(globValue, {
-            ignoreInitial: true,
-            events: watchEvents
-          }, taskFn, module);
-        });
-      } else {
-        buildOutputAppJson(tmsConfig, newModules, isDev);
-      }
-
-      eTime = new Date().getTime() - sTime;
+        }, taskFn, module);
+      });
+    } else {
+      buildOutputAppJson(tmsConfig, modules, isDev);
+    }
 
-      if (typeof (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$hooks = tmsConfig.hooks) === null || _tmsConfig$hooks === void 0 ? void 0 : _tmsConfig$hooks.afterCompile) === 'function') {
-        var _tmsConfig$hooks2;
+    eTime = new Date().getTime() - sTime;
 
-        await (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$hooks2 = tmsConfig.hooks) === null || _tmsConfig$hooks2 === void 0 ? void 0 : _tmsConfig$hooks2.afterCompile({
-          isDev,
-          tmsConfig: filterField(tmsConfig, ['gitAccount']),
-          modules: newModules
-        }));
-      }
+    if (typeof (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$hooks = tmsConfig.hooks) === null || _tmsConfig$hooks === void 0 ? void 0 : _tmsConfig$hooks.afterCompile) === 'function') {
+      var _tmsConfig$hooks2;
 
-      spinner.succeed(chalk.green(`首次编译完成, 耗时${eTime / 1000}s, 微信开发者工具打开项目即可预览。`));
-      spinner.stop();
-      cb();
+      await (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$hooks2 = tmsConfig.hooks) === null || _tmsConfig$hooks2 === void 0 ? void 0 : _tmsConfig$hooks2.afterCompile({
+        isDev,
+        tmsConfig: filterField$2(tmsConfig, ['gitAccount']),
+        modules
+      }));
     }
 
-    const compileTasks = [];
-    compileTasksMap.forEach(({
-      taskFn
-    }) => {
-      compileTasks.push(taskFn);
-    }); // 一次性完成编译任务（编译完成后再添加watch任务-封装到end函数里面）
+    spinner.succeed(chalk$2.green(`首次编译完成, 耗时${eTime / 1000}s, 微信开发者工具打开项目即可预览。`));
+    spinner.stop();
+    cb();
+  }
 
-    series(start, parallel(...compileTasks), end)();
-  };
-})(dev$3);
+  const compileTasks = [];
+  compileTasksMap.forEach(({
+    taskFn
+  }) => {
+    compileTasks.push(taskFn);
+  }); // 一次性完成编译任务（编译完成后再添加watch任务-封装到end函数里面）
+
+  series(start, parallel(...compileTasks), end)();
+};
 
 const shelljs$1 = require$$0__default$3;
-const compileDev = dev$3.exports;
+const compileDev = dev$3;
 const {
   resolve: resolve$2,
   filterField: filterField$1
 } = widgets;
 const init$4 = init_1;
 const {
-  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$1
-} = tmsMpconfig;
+  getModulesByMergeDepModules: getModulesByMergeDepModules$1,
+  getSubPackages: getSubPackages$1
+} = tmsMpconfig.exports;
 const {
-  info: info$2
+  info: info$3
 } = log$1;
 const {
   global: global$1
@@ -3480,11 +3605,14 @@ const {
   CACHE_DIR
 } = require$$4; // 用户编译分包时，需要将dist中其他分包(主包不能删除)的内容删除，否则其他分包的内容混入到主包(导致主包的体积超2M)
 
-function delOtherModule(tmsConfig, targetModules) {
-  const modules = tmsModulesMergeLocalModuleCfg$1(tmsConfig.modules.all, tmsConfig.appName);
-  const targetModulesName = targetModules.map(item => item.name);
-  modules.forEach(item => {
-    if (item.root && targetModulesName.indexOf(item.name) === -1) {
+function delOtherPackages(tmsConfig, targetSubPackages) {
+  // 获取所有模块，合并模块依赖的模块
+  const allModules = getModulesByMergeDepModules$1(tmsConfig, tmsConfig.modules.all); // 获取所有的分包
+
+  const allSubPackages = getSubPackages$1(allModules);
+  const targetSubPackagesName = targetSubPackages.map(item => item.name);
+  allSubPackages.forEach(item => {
+    if (item.root && targetSubPackagesName.indexOf(item.name) === -1) {
       const moduleRootDir = resolve$2(`${tmsConfig.outputDir}/${item.root}`);
       shelljs$1.rm('-rf', `${moduleRootDir}/*`, {
         silent: true
@@ -3494,10 +3622,9 @@ function delOtherModule(tmsConfig, targetModules) {
   });
 }
 
-async function dev$2(tmsConfig, targetModules, env) {
+async function dev$2(tmsConfig, targetModules) {
   var _tmsConfig$hooks;
 
-  let newModules = targetModules;
   const {
     noCache
   } = global$1.getData('cmd');
@@ -3508,9 +3635,11 @@ async function dev$2(tmsConfig, targetModules, env) {
   } // 初始化操作
 
 
-  const initData = await init$4(tmsConfig, newModules);
-  newModules = initData.targetModules;
-  info$2('当前dev启动的有效模块', newModules.map(item => item.name).sort());
+  const {
+    subPackages,
+    modules: newModules
+  } = await init$4(tmsConfig, targetModules);
+  info$3('当前dev启动的有效模块', newModules.map(item => item.moduleName).sort());
 
   if (typeof (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$hooks = tmsConfig.hooks) === null || _tmsConfig$hooks === void 0 ? void 0 : _tmsConfig$hooks.beforeCompile) === 'function') {
     var _tmsConfig$hooks2;
@@ -3521,16 +3650,16 @@ async function dev$2(tmsConfig, targetModules, env) {
       modules: newModules
     }));
   }
-  delOtherModule(tmsConfig, newModules);
-  compileDev(tmsConfig, newModules, env);
+  delOtherPackages(tmsConfig, subPackages);
+  compileDev(tmsConfig, newModules, subPackages, true);
 }
 
 var dev_1 = dev$2;
 
-const dev$1 = dev$3.exports;
+const dev$1 = dev$3;
 
-var build$2 = async (tmsConfig, newModules) => {
-  dev$1(tmsConfig, newModules, false);
+var build$2 = async (tmsConfig, newModules, subPackages, isDev) => {
+  dev$1(tmsConfig, newModules, subPackages, isDev);
 };
 
 const shelljs = require$$0__default$3;
@@ -3541,25 +3670,27 @@ const {
 const init$3 = init_1;
 const compileBuild = build$2;
 
-async function build$1(tmsConfig, targetModules, env) {
+async function build$1(tmsConfig, targetModules) {
   var _tmsConfig$hooks;
 
   // 开始构建前，清理输出目录
   await shelljs.rm('-rf', resolve$1(tmsConfig.outputDir));
   const {
-    targetModules: newModules
+    modules: newModules,
+    subPackages
   } = await init$3(tmsConfig, targetModules);
+  const isDev = false;
 
   if (typeof (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$hooks = tmsConfig.hooks) === null || _tmsConfig$hooks === void 0 ? void 0 : _tmsConfig$hooks.beforeCompile) === 'function') {
     var _tmsConfig$hooks2;
 
     await (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$hooks2 = tmsConfig.hooks) === null || _tmsConfig$hooks2 === void 0 ? void 0 : _tmsConfig$hooks2.beforeCompile({
-      isDev: false,
+      isDev,
       tmsConfig: filterField(tmsConfig, ['gitAccount']),
       modules: newModules
     }));
   }
-  compileBuild(tmsConfig, newModules, env);
+  compileBuild(tmsConfig, newModules, subPackages, isDev);
 }
 
 var build_1 = build$1;
@@ -3636,6 +3767,10 @@ const dev = dev_1;
 const build = build_1;
 const install = install_1;
 const cloud = cloud$1;
+const {
+  fail,
+  info: info$2
+} = log$1;
 const {
   global
 } = global_1;
@@ -3643,9 +3778,9 @@ const {
   readTmsConfig,
   readTmsPrivateCf,
   checkModules,
-  tmsModulesMergeLocalModuleCfg,
-  subModulesMergeDepModules
-} = tmsMpconfig;
+  getModulesByMergeDepModules,
+  getSubPackages
+} = tmsMpconfig.exports;
 
 const handleModuleArg = cmd => {
   // 单模块或多模块开发-用户通过脚手架参数指定的模块
@@ -3680,15 +3815,22 @@ const getSpecificModules = (moduleArg, modules) => {
   }
 
   if ((exclude === null || exclude === void 0 ? void 0 : exclude.length) > 0) {
-    return all.filter(module => !exclude.includes(module.name)).map(item => item.name);
+    return all.filter(module => !exclude.includes(module.moduleName)).map(item => item.moduleName);
   }
 
   if (blockRemote === true) {
-    return all.filter(module => module.repoInfo === undefined).map(item => item.name);
+    return all.filter(module => module.repoInfo === undefined).map(item => item.moduleName);
   }
 
-  return all.map(item => item.name);
+  return all.map(item => item.moduleName);
 };
+/**
+ * 合并tms.config.js 与 tms.private.config.js的配置项
+ * @param {*} tmsConfig
+ * @param {*} tmsPrivateCf
+ * @returns
+ */
+
 
 const mergeConfig = (tmsConfig, tmsPrivateCf) => {
   const modules = {};
@@ -3708,62 +3850,69 @@ const mergeConfig = (tmsConfig, tmsPrivateCf) => {
 };
 
 async function run(commandName, cmd) {
-  // 用户本地的私有项目配置
-  const tmsPrivateCf = readTmsPrivateCf();
-  const {
-    env = tmsPrivateCf === null || tmsPrivateCf === void 0 ? void 0 : tmsPrivateCf.env
-  } = cmd;
-  let tmsConfig = readTmsConfig(env);
-  tmsConfig = mergeConfig(tmsConfig, tmsPrivateCf); // 处理module参数
+  try {
+    // 用户本地的私有项目配置
+    const tmsPrivateCf = readTmsPrivateCf();
+    const {
+      env = tmsPrivateCf === null || tmsPrivateCf === void 0 ? void 0 : tmsPrivateCf.env
+    } = cmd;
+    let tmsConfig = readTmsConfig(env);
+    tmsConfig = mergeConfig(tmsConfig, tmsPrivateCf); // 处理module参数
 
-  const specificModules = getSpecificModules(handleModuleArg(cmd), tmsConfig.modules);
-  const modules = checkModules(tmsConfig, [...new Set([...tmsConfig.mainPackages, ...specificModules])], true); // tms.config.js的modules 合并 module.config.json的配置项
+    const specificModules = getSpecificModules(handleModuleArg(cmd), tmsConfig.modules);
+    const modules = checkModules(tmsConfig, [...new Set([...tmsConfig.mainPackages, ...specificModules])], true); // 获取所有模块，合并模块依赖的模块
 
-  let newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName); // A分包依赖了B分包的代码， merge B分包进行编译；
+    const newModules = getModulesByMergeDepModules(tmsConfig, modules); // 获取所有的分包
 
-  newModules = subModulesMergeDepModules(tmsConfig, newModules); // 缓存数据
+    const subPackages = getSubPackages(newModules); // 缓存数据
 
-  global.setData({
-    env,
-    cmd,
-    tmsConfig
-  });
+    global.setData({
+      env,
+      cmd,
+      tmsConfig
+    });
 
-  switch (commandName) {
-    case 'init':
-      init$2(tmsConfig, newModules, env);
-      return;
+    switch (commandName) {
+      case 'init':
+        init$2(tmsConfig, newModules);
+        return;
 
-    case 'dev':
-      global.setData('isDev', true);
-      dev(tmsConfig, newModules, env);
-      return;
+      case 'dev':
+        global.setData('isDev', true);
+        dev(tmsConfig, newModules);
+        return;
 
-    case 'cloud':
-      cloud(tmsConfig, env);
-      return;
+      case 'cloud':
+        cloud(tmsConfig);
+        return;
 
-    case 'install':
-      install(tmsConfig, newModules, env, false);
-      return;
+      case 'install':
+        install(tmsConfig, subPackages, false);
+        return;
 
-    case 'build':
-      global.setData('isDev', false);
-      build(tmsConfig, newModules, env);
-      return;
+      case 'build':
+        global.setData('isDev', false);
+        build(tmsConfig, newModules);
+        return;
 
-    default:
-      return;
+      default:
+        return;
+    }
+  } catch (error) {
+    const errMsg = typeof error === 'object' ? error.message : error;
+    fail(`构建出现错误: ${errMsg}`);
+    info$2('详细错误信息', error);
+    process.exit(1);
   }
 }
 
 var run_1 = run;
 
 var entry = [{
-  command: 'create <app-name>',
+  command: 'create <project-name>',
   description: '创建新的应用',
-  action: (appName, cmd) => {
-    create_1(appName, cmd);
+  action: projectName => {
+    create_1(projectName);
   }
 }, {
   name: 'run',
@@ -3814,7 +3963,7 @@ var entry = [{
 
 var require$$7 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.19",
+	version: "0.0.20",
 	description: "tmskit",
 	main: "dist/index.cjs",
 	bin: {
@@ -3855,21 +4004,16 @@ var require$$7 = {
 	dependencies: {
 		"ansi-colors": "1.1.0",
 		anymatch: "^1.3.0",
-		"fancy-log": "1.3.2",
-		"glob-parent": "^3.0.1",
-		"path-is-absolute": "^1.0.1",
-		"readable-stream": "^2.2.2",
-		slash: "^1.0.0",
-		vinyl: "^2.1.0",
-		"vinyl-file": "^2.0.0",
 		async: "^3.2.2",
 		chalk: "^4.1.0",
 		chokidar: "^3.5.3",
 		commander: "^8.3.0",
 		"copy-webpack-plugin": "^9.1.0",
 		ejs: "^3.1.5",
+		"fancy-log": "1.3.2",
 		"fs-extra": "^10.0.1",
 		"glob-ignore": "^1.0.2",
+		"glob-parent": "^3.0.1",
 		gulp: "^4.0.2",
 		"gulp-watch": "^5.0.1",
 		htmlparser2: "^7.2.0",
@@ -3881,13 +4025,20 @@ var require$$7 = {
 		moment: "^2.29.2",
 		"object-assign": "^4.0.1",
 		ora: "^5.1.0",
+		"path-is-absolute": "^1.0.1",
 		"plugin-error": "^1.0.0",
 		postcss: "^8.4.6",
 		precinct: "^8.3.1",
+		"readable-stream": "^2.2.2",
 		"replace-ext": "^2.0.0",
+		request: "^2.88.2",
 		shelljs: "^0.8.4",
+		slash: "^1.0.0",
 		"strip-comments": "^2.0.1",
 		through2: "^4.0.2",
+		unzipper: "^0.10.11",
+		vinyl: "^2.1.0",
+		"vinyl-file": "^2.0.0",
 		"vinyl-sourcemaps-apply": "^0.2.0"
 	},
 	engines: {