@tmsfe/tmskit 0.0.16 → 0.0.19

package/dist/index.cjs.js

@@ -8,6 +8,7 @@ var require$$2 = require('ora');
 var require$$1$2 = require('path');
 var require$$0$2 = require('fs');
 var require$$0$3 = require('shelljs');
+var require$$6 = require('glob-ignore');
 var require$$0$4 = require('async');
 var require$$1$3 = require('ejs');
 var require$$1$4 = require('inquirer');
@@ -15,7 +16,6 @@ var require$$0$5 = require('metalsmith');
 var require$$0$6 = require('lodash');
 var require$$1$5 = require('crypto');
 var require$$0$7 = require('miniprogram-ci');
-var require$$5 = require('glob-ignore');
 var require$$1$6 = require('fs-extra');
 var require$$1$7 = require('semver');
 var require$$0$8 = require('strip-comments');
@@ -26,8 +26,8 @@ var require$$0$a = require('gulp');
 var require$$0$b = require('object-assign');
 var require$$3 = require('fancy-log');
 var require$$4$1 = require('ansi-colors');
-var require$$5$1 = require('chokidar');
-var require$$6 = require('readable-stream');
+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');
@@ -46,6 +46,7 @@ var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
 var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
 var require$$0__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$0$2);
 var require$$0__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$0$3);
+var require$$6__default = /*#__PURE__*/_interopDefaultLegacy(require$$6);
 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);
@@ -53,7 +54,6 @@ var require$$0__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$0$5);
 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);
-var require$$5__default = /*#__PURE__*/_interopDefaultLegacy(require$$5);
 var require$$1__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$1$6);
 var require$$1__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$1$7);
 var require$$0__default$8 = /*#__PURE__*/_interopDefaultLegacy(require$$0$8);
@@ -64,8 +64,8 @@ var require$$0__default$a = /*#__PURE__*/_interopDefaultLegacy(require$$0$a);
 var require$$0__default$b = /*#__PURE__*/_interopDefaultLegacy(require$$0$b);
 var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);
 var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4$1);
-var require$$5__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$5$1);
-var require$$6__default = /*#__PURE__*/_interopDefaultLegacy(require$$6);
+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);
@@ -119,7 +119,7 @@ const fail$9 = (message = '') => {
  */
 
 
-const succeed$1 = (message = '') => {
+const succeed$2 = (message = '') => {
   const greenStyleConfig = decodeURIComponent('%1B%5B42%3B30m'); // \033[42;30m转义后的字符按，console时输出绿色文字
 
   const greenFontStyleConfig = decodeURIComponent('%1B%5B40%3B32m'); // \033[40;32m转义后的字符按，console时输出绿色文字
@@ -133,27 +133,28 @@ const succeed$1 = (message = '') => {
  */
 
 
-const warn$1 = message => {
+const warn$2 = message => {
   console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, chalk$3.yellow(message));
 };
 
-const info$9 = (...args) => console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
+const info$a = (...args) => console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
 
 var log$1 = {
   fail: fail$9,
-  succeed: succeed$1,
-  warn: warn$1,
-  info: info$9
+  succeed: succeed$2,
+  warn: warn$2,
+  info: info$a
 };
 
 const program$1 = require$$0__default$1;
 const leven = require$$1__default$1;
 const ora = require$$2__default;
-const path$c = require$$1__default$2;
-const fs$d = require$$0__default$2;
+const path$d = 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$8
+  info: info$9
 } = log$1;
 const chalk$2 = require$$0__default;
 const shelljsOptions = {
@@ -163,8 +164,8 @@ const shelljsOptions = {
 
 const cwd = process.cwd();
 
-function resolve$e(...args) {
-  return path$c.resolve(cwd, ...args);
+function resolve$f(...args) {
+  return path$d.resolve(cwd, ...args);
 }
 /**
  * 用户输入命令时，进行提示
@@ -184,7 +185,7 @@ const suggestCommands$1 = unknownCommand => {
   });
 
   if (suggestion) {
-    info$8(`  ${chalk$2.red(`Did you mean ${chalk$2.yellow(suggestion)}?`)}`);
+    info$9(`  ${chalk$2.red(`Did you mean ${chalk$2.yellow(suggestion)}?`)}`);
   }
 };
 /**
@@ -220,8 +221,8 @@ function downloadRepoForGit$2(url, dest, branch) {
   const cwd = process.cwd();
   return new Promise((resolve, reject) => {
     // 如果目标目录不存在
-    if (fs$d.existsSync(dest)) {
-      shelljs$7.rm('-rf', path$c.join(dest));
+    if (fs$g.existsSync(dest)) {
+      shelljs$7.rm('-rf', path$d.join(dest));
     }
 
     shelljs$7.mkdir('-p', dest);
@@ -270,7 +271,7 @@ function pullRepoForGit$1(dest, branch) {
  */
 
 
-function npmInstall$1(dir) {
+function npmInstall$2(dir) {
   return new Promise((resolve, reject) => {
     shelljs$7.exec('npm install --production --registry http://mirrors.tencent.com/npm/', {
       cwd: dir,
@@ -305,7 +306,7 @@ function createTask$3(task, startText, endText) {
   return async (...args) => {
     const start = Date.now();
     const spinner = ora();
-    info$8(startText);
+    info$9(startText);
     spinner.start();
     const result = await task(...args);
     endText && spinner.succeed(`${endText}, 耗时${cost(start) / 1000}s`);
@@ -334,11 +335,42 @@ const mergeMap = function (obj, src) {
 };
 
 const relativeCwdPath$1 = function (file) {
-  return path$c.relative(process.cwd(), file);
+  return path$d.relative(process.cwd(), file);
 };
+/**
+ * 从一个对象中，检索出去几个字段
+ * @param {*} obj
+ * @param {*} name
+ * @returns
+ */
+
+
+const filterField$3 = (obj, filterNames = []) => {
+  const newObj = { ...obj
+  };
+  filterNames.forEach(name => {
+    if (newObj[name]) {
+      delete newObj[name];
+    }
+  });
+  return newObj;
+}; // 检索出文件列表
+
+
+function findFiles(globPath, filter = []) {
+  return new Promise((resolve, reject) => {
+    glob$1(globPath, filter, (err, files) => {
+      if (err) {
+        reject(err);
+      }
+
+      resolve(files);
+    });
+  });
+}
 
 var widgets = {
-  resolve: resolve$e,
+  resolve: resolve$f,
   isObject: isObject$2,
   isArray: isArray$1,
   createTask: createTask$3,
@@ -346,25 +378,29 @@ var widgets = {
   pullRepoForGit: pullRepoForGit$1,
   suggestCommands: suggestCommands$1,
   camelize,
-  npmInstall: npmInstall$1,
+  npmInstall: npmInstall$2,
   mergeMap,
-  relativeCwdPath: relativeCwdPath$1
+  relativeCwdPath: relativeCwdPath$1,
+  filterField: filterField$3,
+  findFiles
 };
 
-const path$b = require('path');
+const path$c = require('path');
 
 const os = require('os'); // 用户目录
 
 
 const HOME_DIR = os.homedir(); // 所有文件的缓存目录
 
-const CACHE_DIR$2 = path$b.resolve(HOME_DIR, '.tmskit'); // 脚手架模板代码所在目录
+const CACHE_DIR$3 = path$c.resolve(HOME_DIR, '.tmskit'); // 缓存文件
 
-const TEMPLATE_DIR$1 = path$b.resolve(CACHE_DIR$2, 'template'); // 第三方模块源码存放的临时缓存目录
+const CACHE_FILE$1 = 'cache_file.json'; // 脚手架模板代码所在目录
 
-const MODULE_CODE_DIR$1 = path$b.resolve(CACHE_DIR$2, 'modules_code'); // 脚手架模板代码的具体路径
+const TEMPLATE_DIR$1 = path$c.resolve(CACHE_DIR$3, 'template'); // 第三方模块源码存放的临时缓存目录
 
-const TEMPLATE_PATH$1 = path$b.resolve(TEMPLATE_DIR$1, 'tools/tms-cli-template'); // 脚手架的名称
+const MODULE_CODE_DIR$1 = path$c.resolve(CACHE_DIR$3, 'modules_code'); // 脚手架模板代码的具体路径
+
+const TEMPLATE_PATH$1 = path$c.resolve(TEMPLATE_DIR$1, 'tools/tmskit-template'); // 脚手架的名称
 
 const TMS_NAME$1 = 'tmskit'; // 脚手架的配置名称
 
@@ -378,7 +414,7 @@ const DEFAULT_CLOUD_MODULE_DIR = './cloud'; // 模块的配置文件的名称
 const MODULE_CONFIG_FILENAME$2 = 'module.config.json'; // 默认的webpack entry
 
 const DEFAULT_WEBPACK_ENTRY = {
-  app: path$b.resolve(process.cwd(), 'app')
+  app: path$c.resolve(process.cwd(), 'app')
 }; // 默认从源码拷贝到编译后的配置
 
 const DEFAULT_COPY_CONFIG$1 = ['package.json', 'sitemap.json'];
@@ -387,12 +423,12 @@ const ENV = {
   prod: 'production'
 };
 const TEMPLATE_TKIT_DIR$2 = '_tmskit';
-const MODULE_CONFIG_INVALID_KEY$1 = ['entranceDeclare', 'entryPagePath'];
 
 var constant = /*#__PURE__*/Object.freeze({
 	__proto__: null,
 	HOME_DIR: HOME_DIR,
-	CACHE_DIR: CACHE_DIR$2,
+	CACHE_DIR: CACHE_DIR$3,
+	CACHE_FILE: CACHE_FILE$1,
 	TEMPLATE_DIR: TEMPLATE_DIR$1,
 	TEMPLATE_PATH: TEMPLATE_PATH$1,
 	TMS_NAME: TMS_NAME$1,
@@ -405,16 +441,15 @@ var constant = /*#__PURE__*/Object.freeze({
 	MODULE_CODE_DIR: MODULE_CODE_DIR$1,
 	ENV: ENV,
 	TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$2,
-	MODULE_CONFIG_INVALID_KEY: MODULE_CONFIG_INVALID_KEY$1,
 	DEFAULT_CLOUD_MODULE_DIR: DEFAULT_CLOUD_MODULE_DIR
 });
 
 var require$$4 = /*@__PURE__*/getAugmentedNamespace(constant);
 
-const fs$c = require$$0__default$2;
-const path$a = require$$1__default$2;
+const fs$f = require$$0__default$2;
+const path$b = require$$1__default$2;
 const {
-  info: info$7
+  info: info$8
 } = log$1;
 const {
   relativeCwdPath
@@ -425,12 +460,12 @@ const {
  * @returns
  */
 
-const isDirEmpty = dirname => fs$c.promises.readdir(dirname).then(files => files.length === 0); // 判断是否是文件
+const isDirEmpty = dirname => fs$f.promises.readdir(dirname).then(files => files.length === 0); // 判断是否是文件
 
 
 const isFile = pathName => {
   try {
-    const stat = fs$c.lstatSync(pathName);
+    const stat = fs$f.lstatSync(pathName);
     return stat.isFile();
   } catch {
     return false;
@@ -442,9 +477,9 @@ const isFile = pathName => {
  */
 
 
-const ensureDirExist = dirname => {
-  if (!fs$c.existsSync(dirname)) {
-    fs$c.mkdirSync(dirname, {
+const ensureDirExist$2 = dirname => {
+  if (!fs$f.existsSync(dirname)) {
+    fs$f.mkdirSync(dirname, {
       recursive: true
     });
   }
@@ -452,27 +487,27 @@ const ensureDirExist = dirname => {
 
 
 const copyFile = function (src, dest) {
-  if (fs$c.existsSync(dest)) {
-    fs$c.unlinkSync(dest);
+  if (fs$f.existsSync(dest)) {
+    fs$f.unlinkSync(dest);
   }
 
-  const dir = path$a.dirname(dest);
-  ensureDirExist(dir);
-  fs$c.copyFileSync(src, dest);
+  const dir = path$b.dirname(dest);
+  ensureDirExist$2(dir);
+  fs$f.copyFileSync(src, dest);
 }; // 判断文件内容是否一致，不一致再进行拷贝
 
 
 function diffContentCopyFile$3(originFile, destFile) {
-  if (fs$c.existsSync(destFile)) {
-    const depDestContent = fs$c.readFileSync(destFile, 'utf8');
-    const depOriginContent = fs$c.readFileSync(originFile, 'utf8');
+  if (fs$f.existsSync(destFile)) {
+    const depDestContent = fs$f.readFileSync(destFile, 'utf8');
+    const depOriginContent = fs$f.readFileSync(originFile, 'utf8');
 
     if (depDestContent !== depOriginContent) {
-      info$7(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
+      info$8(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
       copyFile(originFile, destFile);
     }
   } else {
-    info$7(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
+    info$8(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
     copyFile(originFile, destFile);
   }
 } // 添加后缀
@@ -483,7 +518,7 @@ function ext$3(filePath, extensions) {
   let extPath = ''; // try catch需要包裹：用来处理'./lib/timer'没有后缀的情况
 
   try {
-    const stat = fs$c.lstatSync(newFilePath);
+    const stat = fs$f.lstatSync(newFilePath);
 
     if (stat.isDirectory()) {
       extPath = newFilePath[newFilePath.length - 1] === '/' ? 'index' : '/index';
@@ -494,7 +529,7 @@ function ext$3(filePath, extensions) {
   for (const ext of extensions) {
     const file = newFilePath.endsWith(ext) ? newFilePath : newFilePath + ext;
 
-    if (fs$c.existsSync(file)) {
+    if (fs$f.existsSync(file)) {
       return {
         ext,
         extPath: extPath + ext,
@@ -512,11 +547,11 @@ function ext$3(filePath, extensions) {
 
 
 const fileInDir$3 = (dir, file) => {
-  if (!fs$c.existsSync(dir) || !fs$c.existsSync(file)) {
+  if (!fs$f.existsSync(dir) || !fs$f.existsSync(file)) {
     return false;
   }
 
-  const relativePath = path$a.relative(dir, file);
+  const relativePath = path$b.relative(dir, file);
 
   if (relativePath.startsWith('..')) {
     return false;
@@ -529,10 +564,10 @@ function findAllFilesOfDir$1(dir) {
   const list = [];
 
   function listFile(dir) {
-    const arr = fs$c.readdirSync(dir);
+    const arr = fs$f.readdirSync(dir);
     arr.forEach(item => {
-      const fullPath = path$a.join(dir, item);
-      const stats = fs$c.statSync(fullPath);
+      const fullPath = path$b.join(dir, item);
+      const stats = fs$f.statSync(fullPath);
 
       if (stats.isDirectory()) {
         listFile(fullPath);
@@ -551,7 +586,7 @@ var io$3 = {
   isDirEmpty,
   copyFile,
   diffContentCopyFile: diffContentCopyFile$3,
-  ensureDirExist,
+  ensureDirExist: ensureDirExist$2,
   ext: ext$3,
   fileInDir: fileInDir$3,
   isFile,
@@ -578,10 +613,10 @@ const render$1 = (files, metalsmith, next) => {
 
 var render_1 = render$1;
 
-const fs$b = require$$0__default$2;
+const fs$e = require$$0__default$2;
 const inquirer = require$$1__default$4;
 const {
-  resolve: resolve$d
+  resolve: resolve$e
 } = widgets;
 const {
   TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$1
@@ -595,12 +630,12 @@ const {
 const parseTemplateQuestions = dir => {
   let prompts = [];
 
-  if (!fs$b.existsSync(`${dir}/questions.json`)) {
+  if (!fs$e.existsSync(`${dir}/questions.json`)) {
     return prompts;
   }
 
   try {
-    const json = JSON.parse(fs$b.readFileSync(`${dir}/questions.json`));
+    const json = JSON.parse(fs$e.readFileSync(`${dir}/questions.json`));
 
     if (Array.isArray(json) && json.length > 0) {
       json.forEach((item, index) => {
@@ -633,7 +668,7 @@ const isQuestionType = result => {
 };
 
 const ask$1 = templateDir => (files, metalsmith, next) => {
-  const prompts = parseTemplateQuestions(resolve$d(templateDir, TEMPLATE_TKIT_DIR$1));
+  const prompts = parseTemplateQuestions(resolve$e(templateDir, TEMPLATE_TKIT_DIR$1));
   const metadata = metalsmith.metadata();
   const filteredPrompts = prompts.filter(prompt => {
     if (metadata[prompt.name] && `${metadata[prompt.name]}`.trim() !== '') {
@@ -675,8 +710,8 @@ const generator$1 = (buildDir, distDir, preMetadata) => new Promise((resolve, re
 
 var generator_1 = generator$1;
 
-const path$9 = require$$1__default$2;
-const fs$a = require$$0__default$2;
+const path$a = require$$1__default$2;
+const fs$d = require$$0__default$2;
 const shelljs$6 = require$$0__default$3;
 const {
   TEMPLATE_DIR,
@@ -686,13 +721,13 @@ const {
 const {
   downloadRepoForGit: downloadRepoForGit$1,
   createTask: createTask$2,
-  resolve: resolve$c
+  resolve: resolve$d
 } = widgets;
 const io$2 = io$3;
 const {
   fail: fail$8,
-  succeed,
-  info: info$6
+  succeed: succeed$1,
+  info: info$7
 } = log$1;
 const generator = generator_1;
 /**
@@ -703,7 +738,7 @@ const generator = generator_1;
 
 async function createAppDir(targetDir) {
   // 如果目录非空或者已经存在，提示用户，做选择
-  if (fs$a.existsSync(targetDir)) {
+  if (fs$d.existsSync(targetDir)) {
     if (!(await io$2.isDirEmpty(targetDir))) {
       fail$8('该目录名已经存在，换个项目名字吧~');
       process.exit(1);
@@ -721,7 +756,7 @@ async function createAppDir(targetDir) {
 
 async function create(appName) {
   const cwd = process.cwd();
-  const targetDir = path$9.resolve(cwd, appName);
+  const targetDir = path$a.resolve(cwd, appName);
   const appType = 'mp';
   await createAppDir(targetDir); // 创建缓存目录
 
@@ -729,13 +764,13 @@ async function create(appName) {
 
   await createTask$2(downloadRepoForGit$1, '拉取模板仓库', '拉取模板仓库完成')('https://git.woa.com/tmsfe/tms-frontend.git', TEMPLATE_DIR, 'master'); // 生成模板(1. 询问问题， 2. ejs生成模板  3.生成到目标目录)
 
-  generator(path$9.join(TEMPLATE_PATH, appType), targetDir, {
+  generator(path$a.join(TEMPLATE_PATH, appType), targetDir, {
     appName,
     appType
   }).then(() => {
     shelljs$6.cd(appName);
 
-    const hooks = require(resolve$c(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
+    const hooks = require(resolve$d(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
 
     if (hooks.afterCreate) {
       hooks.afterCreate.forEach(item => {
@@ -749,11 +784,11 @@ async function create(appName) {
       });
     }
 
-    shelljs$6.rm('-rf', resolve$c(appName, TEMPLATE_TKIT_DIR));
-    succeed('项目创建完成.');
+    shelljs$6.rm('-rf', resolve$d(appName, TEMPLATE_TKIT_DIR));
+    succeed$1('项目创建完成.');
   }).catch(err => {
     fail$8(err.message);
-    info$6('详细的错误信息:', err);
+    info$7('详细的错误信息:', err);
   });
 }
 
@@ -763,7 +798,7 @@ var defaultTmsConfig$1 = {
   // 全局的环境配置项
   envData: {},
   // 模块配置信息
-  modules: [],
+  modules: {},
   cloudDir: 'cloud',
   // 第三方依赖代码需要拷贝到本项目的
   dependencies: {},
@@ -781,15 +816,15 @@ var defaultTmsConfig$1 = {
 /**
  * 用来读取处理tms.config.js与module.config.json字段
  */
-const loadash = require$$0__default$6;
-const fs$9 = require$$0__default$2;
+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$b,
+  resolve: resolve$c,
   isObject: isObject$1,
   isArray
 } = widgets;
@@ -797,16 +832,15 @@ const defaultTmsConfig = defaultTmsConfig$1;
 const {
   fail: fail$7
 } = log$1;
-const path$8 = require$$1__default$2;
 /**
  * 读取tms.config.js
  * @param env {string} 环境变量
  */
 
 const readTmsConfig$1 = function (env) {
-  const tmsConfigPath = resolve$b(TMS_CONFIG_FILENAME);
+  const tmsConfigPath = resolve$c(TMS_CONFIG_FILENAME);
 
-  if (!fs$9.existsSync(tmsConfigPath)) {
+  if (!fs$c.existsSync(tmsConfigPath)) {
     fail$7('当前执行目录没有tms.config.js的配置项，请进行配置');
     process.exit(1);
   }
@@ -817,35 +851,7 @@ const readTmsConfig$1 = function (env) {
     env
   }); // 合并默认值
 
-  loadash.mergeWith(tmsConfig, defaultTmsConfig); // modules兼容处理
-
-  tmsConfig.modules = convertModules(tmsConfig.modules);
-  return tmsConfig;
-}; // convertModules 处理默认值
-
-
-const convertModules = modules => {
-  const newModules = [];
-  modules.forEach(module => {
-    const newModule = {};
-
-    if (typeof module === 'string') {
-      // 路径字符串
-      Object.assign(newModule, {
-        name: path$8.basename(module),
-        path: module
-      });
-    } else if (typeof module === 'object') {
-      Object.assign(newModule, module);
-
-      if (module.name === undefined) {
-        newModule.name = path$8.basename(module.path);
-      }
-    }
-
-    newModules.push(newModule);
-  });
-  return newModules;
+  return loadash$1.mergeWith(defaultTmsConfig, tmsConfig);
 };
 /**
  * 读取tms.private.config.js
@@ -854,17 +860,10 @@ const convertModules = modules => {
 
 const readTmsPrivateCf$1 = function () {
   let tmsPrivateCf = {};
-  const tmsPrivatePath = resolve$b(TMS_PRIVATE_FILENAME);
+  const tmsPrivatePath = resolve$c(TMS_PRIVATE_FILENAME);
 
-  if (fs$9.existsSync(tmsPrivatePath)) {
+  if (fs$c.existsSync(tmsPrivatePath)) {
     tmsPrivateCf = require(tmsPrivatePath);
-  } // 处理modules字段
-
-
-  if (tmsPrivateCf.modules instanceof Array) {
-    Object.assign(tmsPrivateCf.modules, {
-      include: tmsPrivateCf.modules
-    });
   }
 
   return tmsPrivateCf;
@@ -880,7 +879,7 @@ const readTmsPrivateCf$1 = function () {
 const checkModules$1 = function (tmsConfig, modules, isQuit = false) {
   const targetModules = [];
   modules.forEach(moduleName => {
-    const module = tmsConfig.modules.find(module => module.name === moduleName);
+    const module = tmsConfig.modules.all.find(module => module.name === moduleName);
     module && targetModules.push(module);
   });
 
@@ -892,18 +891,6 @@ const checkModules$1 = function (tmsConfig, modules, isQuit = false) {
 
   return targetModules;
 };
-/**
- * 过滤页面为空的分包
- * @param {Array} moduleCfg 模块配置内容
- * @returns pages不为空的分包
- */
-
-
-const getValidModules$1 = moduleCfg => {
-  // 过滤 pages 为空的情况
-  const validModules = moduleCfg.filter(item => item.pages.length > 0);
-  return validModules;
-};
 /**
  * 适配处理module.config.json的字段
  * @param { object } fileContent module.config.json的内容
@@ -912,25 +899,31 @@ const getValidModules$1 = moduleCfg => {
 
 
 function adaptMpCgContent(fileContent, appName) {
-  const content = fileContent.contents ? JSON.parse(fileContent.contents.toString()) : JSON.parse(fileContent);
+  const handleContent = function (appName, current) {
+    let res = current;
+
+    if (appName && current.mpConfig && current.mpConfig[appName]) {
+      res = { ...current,
+        ...current.mpConfig[appName]
+      };
+    }
+
+    delete res.mpConfig;
+    delete res.isSubpackages;
+    return res;
+  };
+
+  let content = JSON.parse(fileContent);
 
   if (isArray(content)) {
     let i = content.length - 1;
 
     while (i >= 0) {
-      let current = content[i];
-
-      if (appName && current.mpConfig && current.mpConfig[appName]) {
-        current = { ...current,
-          ...current.mpConfig[appName]
-        };
-      }
-
-      delete current.mpConfig;
-      delete current.isSubpackages;
-      content[i] = current;
+      content[i] = handleContent(appName, content[i]);
       i--; // eslint-disable-line
     }
+  } else {
+    content = handleContent(appName, content);
   }
 
   return content;
@@ -948,10 +941,10 @@ function getModuleConfig$1(modules = [], appName, moduleConfigFilename) {
   modules.forEach(({
     path
   }) => {
-    const moduleConfigPath = resolve$b(path, moduleConfigFilename);
+    const moduleConfigPath = resolve$c(path, moduleConfigFilename);
 
-    if (fs$9.existsSync(moduleConfigPath)) {
-      const content = fs$9.readFileSync(moduleConfigPath, 'utf-8');
+    if (fs$c.existsSync(moduleConfigPath)) {
+      const content = fs$c.readFileSync(moduleConfigPath, 'utf-8');
       modulesConfig[moduleConfigPath] = adaptMpCgContent(content, appName);
     }
   });
@@ -972,15 +965,15 @@ const tmsModulesMergeLocalModuleCfg$3 = (modules, appName) => {
     path: relativePath,
     name: moduleName
   }, moduleIndex) => {
-    const moduleConfigPath = resolve$b(relativePath, MODULE_CONFIG_FILENAME$1);
+    const moduleConfigPath = resolve$c(relativePath, MODULE_CONFIG_FILENAME$1);
 
-    if (fs$9.existsSync(moduleConfigPath)) {
+    if (fs$c.existsSync(moduleConfigPath)) {
       try {
         let findModule = false;
-        let moduleConfigContent = fs$9.readFileSync(moduleConfigPath, 'utf-8');
+        let moduleConfigContent = fs$c.readFileSync(moduleConfigPath, 'utf-8');
         moduleConfigContent = adaptMpCgContent(moduleConfigContent, appName);
         const moduleContentArr = isObject$1(moduleConfigContent) ? [moduleConfigContent] : moduleConfigContent;
-        getValidModules$1(moduleContentArr).forEach(({
+        moduleContentArr.forEach(({
           name
         }, moduleContentArrIndex) => {
           if (name === moduleName) {
@@ -992,7 +985,7 @@ const tmsModulesMergeLocalModuleCfg$3 = (modules, appName) => {
         });
 
         if (!findModule) {
-          fail$7(`启动模块${moduleName}在${moduleConfigPath}没有找到或pages为空，请检查配置`);
+          fail$7(`启动模块${moduleName}在${moduleConfigPath}没有找到，请检查配置`);
           process.exit(1);
         }
       } catch (e) {
@@ -1049,7 +1042,6 @@ var tmsMpconfig = {
   readTmsConfig: readTmsConfig$1,
   readTmsPrivateCf: readTmsPrivateCf$1,
   getModuleConfig: getModuleConfig$1,
-  getValidModules: getValidModules$1,
   checkModules: checkModules$1,
   tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$3,
   subModulesMergeDepModules: subModulesMergeDepModules$2
@@ -1087,7 +1079,7 @@ const {
   global: global$5
 } = global_1;
 
-function handleError$4(error) {
+function handleError$6(error) {
   const errMsg = typeof error === 'object' ? error.message : error;
   const isDev = global$5.getData('isDev');
 
@@ -1100,31 +1092,35 @@ function handleError$4(error) {
 }
 
 var handleError_1 = {
-  handleError: handleError$4
+  handleError: handleError$6
 };
 
 /**
  * 生成编译后的app.json
  */
-const fs$8 = require$$0__default$2;
+/* eslint-disable no-param-reassign */
+
+const fs$b = require$$0__default$2;
 const {
-  MODULE_CONFIG_FILENAME,
-  MODULE_CONFIG_INVALID_KEY
+  MODULE_CONFIG_FILENAME
 } = require$$4;
 const {
-  getModuleConfig,
-  getValidModules
+  getModuleConfig
 } = tmsMpconfig;
 const {
   fail: fail$5
 } = log$1;
 const {
-  resolve: resolve$a,
-  isObject
+  resolve: resolve$b,
+  isObject,
+  filterField: filterField$2
 } = widgets;
 const {
-  handleError: handleError$3
+  handleError: handleError$5
 } = handleError_1;
+const {
+  global: global$4
+} = global_1;
 /**
  * 更新appJson里面的主包配置
  * @param { object } appJson appJson信息
@@ -1156,8 +1152,7 @@ function updateMainPackages(appJson, mainPackages = []) {
     }
   }); // 去掉 subpackages 中的主包配置
 
-  const foundMainPackageNames = foundMainPackages.map(item => item.name); // eslint-disable-next-line
-
+  const foundMainPackageNames = foundMainPackages.map(item => item.name);
   appJson.subpackages = appJson.subpackages.filter(subpackage => !foundMainPackageNames.includes(subpackage.name));
   return appJson;
 }
@@ -1169,35 +1164,32 @@ function updateMainPackages(appJson, mainPackages = []) {
 
 
 const getAppJsonContent = sourceAppJsonPath => {
-  if (!fs$8.existsSync(sourceAppJsonPath)) {
+  if (!fs$b.existsSync(sourceAppJsonPath)) {
     fail$5(`当前路径 ${sourceAppJsonPath} 没找到app.json`);
     process.exit(1);
   }
 
-  const appJson = JSON.parse(fs$8.readFileSync(sourceAppJsonPath), 'utf-8'); // 加入默认值
+  const appJson = JSON.parse(fs$b.readFileSync(sourceAppJsonPath), 'utf-8'); // 加入默认值
 
   appJson.subpackages = [];
-  appJson.pages = []; // appJson.plugins = {};
-
-  delete appJson.entranceDeclare;
+  appJson.pages = [];
   return appJson;
 };
 /**
  * 更新app.json中的subpackages
  * @param {Object} appJson
- * @param {Object} modulesConfig
+ * @param {Object} modulesConfigs
  */
 
 
-const updateSubpackages = (appJson, modulesConfig) => {
+const updateSubpackages = (appJson, modulesConfigs) => {
   // eslint-disable-next-line
-  for (const name in modulesConfig) {
-    const moduleInfo = isObject(modulesConfig[name]) ? [modulesConfig[name]] : modulesConfig[name]; // 过滤 pages 为空的情况
-
-    const validModules = getValidModules(moduleInfo); // eslint-disable-next-line
-
-    appJson.subpackages = appJson.subpackages.concat(validModules);
+  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, 整理重复不合法的地方
@@ -1212,44 +1204,33 @@ const fixAppJson = appJson => {
   const pluginsMap = {};
   Object.keys(appJson.plugins || {}).forEach(key => pluginsMap[key] = ['app.json']);
   const subps = subpackages.map(subp => {
-    const invalidKeys = [];
+    const arrOfFileType = ['requiredBackgroundModes', 'embeddedAppIdList'];
+    const objOfFileType = ['preloadRule'];
     Object.keys(subp).forEach(key => {
-      if (key === 'dependencies') {
-        // eslint-disable-next-line
-        delete subp.dependencies;
-        return;
-      }
-
       if (key === 'plugins') {
         Object.keys(subp.plugins).forEach(pk => {
           pluginsMap[pk] ? pluginsMap[pk].push(`分包${subp.name}`) : pluginsMap[pk] = [`分包${subp.name}`];
         });
-        return;
-      }
+      } // 分包里数组类型字段，提到appjson最上层
 
-      if (MODULE_CONFIG_INVALID_KEY.indexOf(key) > -1) {
-        // 如果分包配置中有不支持的key，则错误提醒
-        invalidKeys.push(key);
-        return;
-      }
 
-      if (['requiredBackgroundModes', 'embeddedAppIdList'].indexOf(key) > -1) {
-        // 提到appjson最上层处理
-        const preVal = appJson[key]; // eslint-disable-next-line
+      if (arrOfFileType.indexOf(key) > -1) {
+        const preVal = appJson[key];
+        preVal ? appJson[key] = Array.from(new Set(preVal.slice(0).concat(subp[key]))) : appJson[key] = subp[key].slice(0);
+      } // 分包里对象类型字段，提到appjson最上层
+
 
-        preVal ? appJson[key] = Array.from(new Set(preVal // eslint-disable-next-line
-        .slice(0).concat(subp[key]))) : appJson[key] = subp[key].slice(0);
-        return;
+      if (objOfFileType.indexOf(key) > -1) {
+        const preloadRuleMap = appJson[key] || {};
+        subp[key] && Object.keys(subp[key]).forEach(page => {
+          if (!preloadRuleMap[page]) {
+            preloadRuleMap[page] = subp[key][page];
+          }
+        });
+        appJson[key] = preloadRuleMap;
       }
     });
-
-    if (invalidKeys.length) {
-      fail$5(`不支持分包${subp === null || subp === void 0 ? void 0 : subp.name}配置${invalidKeys.join(',')}\n`);
-    } // eslint-disable-next-line
-
-
-    invalidKeys.concat(['requiredBackgroundModes', 'embeddedAppIdList']).forEach(k => delete subp[k]);
-    return subp;
+    return filterField$2(subp, [...arrOfFileType, ...objOfFileType, 'dependencies']);
   }); // 如果plugins重复，则错误提示
 
   const pluginsErrMsg = Object.keys(pluginsMap).map(pk => {
@@ -1261,9 +1242,8 @@ const fixAppJson = appJson => {
   }).reduce((pre, cur) => pre + cur, '');
 
   if (pluginsErrMsg) {
-    fail$5(`plugins配置出现错误:${pluginsErrMsg}`);
-  } // eslint-disable-next-line
-
+    throw new Error(`plugins配置出现错误:${pluginsErrMsg}`);
+  }
 
   appJson.subpackages = subps;
 };
@@ -1280,26 +1260,31 @@ function buildOutputAppJson$1(tmsConfig, modules) {
     var _tmsConfig$hooks;
 
     // 获取当前 modules 下的所有子模块的配置内容
-    const modulesConfig = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME); // 获取app.json的配置
+    const modulesConfigs = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME); // 获取app.json的配置
 
-    const appJson = getAppJsonContent(resolve$a('./app.json')); // 更新app.json中的subpackages
+    const appJson = getAppJsonContent(resolve$b('./app.json')); // 更新app.json中的subpackages
 
-    updateSubpackages(appJson, modulesConfig); // 处理appJson中重复||冲突的地方
+    updateSubpackages(appJson, modulesConfigs); // 处理appJson中重复||冲突的地方
 
     fixAppJson(appJson); // 更新主包，需在subpackages处理完成后执行， pages/
 
     updateMainPackages(appJson, tmsConfig.mainPackages);
-    fs$8.writeFileSync(resolve$a(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+    fs$b.writeFileSync(resolve$b(`${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(appJson);
+      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']),
+        modules,
+        appJson,
+        isDev: global$4.getData('isDev')
+      });
     }
 
     return appJson;
   } catch (e) {
-    handleError$3(`生成app.json出现错误: ${e}`);
+    handleError$5(`生成app.json出现错误: ${e}`);
   }
 }
 
@@ -1311,23 +1296,23 @@ var buildAppJson = {
  * 下载第三方代码
  */
 const MetalSmith = require$$0__default$5;
-const crypto$1 = require$$1__default$5;
+const crypto$2 = require$$1__default$5;
 const {
   downloadRepoForGit,
   pullRepoForGit,
-  resolve: resolve$9
+  resolve: resolve$a
 } = widgets;
 const {
   fail: fail$4,
-  info: info$5
+  info: info$6
 } = log$1;
-const fs$7 = require$$0__default$2;
+const fs$a = require$$0__default$2;
 const shelljs$5 = require$$0__default$3;
 const {
-  handleError: handleError$2
+  handleError: handleError$4
 } = handleError_1;
 const {
-  global: global$4
+  global: global$3
 } = global_1;
 /**
  * 处理用户没有clone git仓库权限问题,拼接tms.private.config.js的账号信息
@@ -1337,15 +1322,15 @@ const {
  */
 
 function replaceGitUrlAccount(httpRepoUrl, moduleName) {
-  var _tmsPrivateCf$gitAcco, _tmsPrivateCf$gitAcco2;
+  var _tmsConfig$gitAccout, _tmsConfig$gitAccount;
 
   // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
-  const tmsPrivateCf = global$4.getData('tmsPrivateCf');
+  const tmsConfig = global$3.getData('tmsConfig');
   let gitUrl = httpRepoUrl;
   const {
     username = '',
     pass = ''
-  } = (tmsPrivateCf === null || tmsPrivateCf === void 0 ? void 0 : (_tmsPrivateCf$gitAcco = tmsPrivateCf.gitAccout) === null || _tmsPrivateCf$gitAcco === void 0 ? void 0 : _tmsPrivateCf$gitAcco[moduleName]) || (tmsPrivateCf === null || tmsPrivateCf === void 0 ? void 0 : (_tmsPrivateCf$gitAcco2 = tmsPrivateCf.gitAccount) === null || _tmsPrivateCf$gitAcco2 === void 0 ? void 0 : _tmsPrivateCf$gitAcco2[moduleName]) || {};
+  } = (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]) || {};
   const urlPrefixReg = /http(s)?:\/\//;
 
   if (username && pass && urlPrefixReg.test(gitUrl)) {
@@ -1386,7 +1371,7 @@ function moveFile(sourceDir, targetDir, ignore = []) {
 
 function md5ByGitUrlBranch(gitUrl, branch) {
   const newBranch = branch && typeof branch === 'string' ? branch : 'master';
-  return crypto$1.createHash('md5').update(JSON.stringify({
+  return crypto$2.createHash('md5').update(JSON.stringify({
     gitUrl,
     branch: newBranch
   })).digest('hex');
@@ -1417,7 +1402,7 @@ async function cloneModules$1(sourceDir, targetDir, modules) {
       }) => fn(...Object.keys(cParams).map(key => cParams[key])));
       return Promise.all(callArr);
     }).catch(e => {
-      handleError$2(`下载代码${params.httpRepoUrl}出现错误：${e}`);
+      handleError$4(`下载代码${params.httpRepoUrl}出现错误：${e}`);
     }));
   });
   await Promise.all(arrPromises);
@@ -1462,9 +1447,9 @@ function collectDownLoadTasksMap(sourceDir, targetDir, modules) {
 
       const md5Key = md5ByGitUrlBranch(gitUrl, branch); // git源码临时存在的源目录
 
-      const sourcePath = resolve$9(sourceDir, md5Key); // 模块源码要放到目标目录
+      const sourcePath = resolve$a(sourceDir, md5Key); // 模块源码要放到目标目录
 
-      const targetPath = resolve$9(targetDir, path); // 从git源码仓库中找到模块源码路径 (一个仓库存在存放多个模块的情况)
+      const targetPath = resolve$a(targetDir, path); // 从git源码仓库中找到模块源码路径 (一个仓库存在存放多个模块的情况)
 
       const sourceModulePath = gitPath ? `${sourcePath}/${gitPath}` : sourcePath; // 下载完代码后，添加回调函数（主要将模块代码从临时目录移动代码到目标目录）
 
@@ -1474,7 +1459,7 @@ function collectDownLoadTasksMap(sourceDir, targetDir, modules) {
           targetPath
         },
         fn: async (sourceModulePath, targetPath) => {
-          if (fs$7.existsSync(targetPath)) {
+          if (fs$a.existsSync(targetPath)) {
             shelljs$5.rm('-rf', `${targetPath}/*`);
           }
 
@@ -1489,14 +1474,14 @@ function collectDownLoadTasksMap(sourceDir, targetDir, modules) {
       } else {
         let promiseTask;
 
-        if (fs$7.existsSync(sourcePath) && fs$7.existsSync(`${sourcePath}/.git`)) {
+        if (fs$a.existsSync(sourcePath) && fs$a.existsSync(`${sourcePath}/.git`)) {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
-            info$5(`git pull:${httpRepoUrl}`);
+            info$6(`git pull:${httpRepoUrl}`);
             return pullRepoForGit(sourcePath, branch);
           };
         } else {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
-            info$5(`git clone: ${httpRepoUrl}`);
+            info$6(`git clone: ${httpRepoUrl}`);
             return downloadRepoForGit(gitUrl, sourcePath, branch);
           };
         }
@@ -1537,7 +1522,7 @@ function checkRemoteModGitUrlBranch(sourceDir, moduleInfo) {
     const gitUrl = replaceGitUrlAccount(httpRepoUrl, name);
     const md5Key = md5ByGitUrlBranch(gitUrl, buildGitTag);
 
-    if (!fs$7.existsSync(`${sourceDir}/${md5Key}`)) {
+    if (!fs$a.existsSync(`${sourceDir}/${md5Key}`)) {
       return true;
     }
   }
@@ -1551,7 +1536,7 @@ var cloneModules_1 = {
 };
 
 const ci = require$$0__default$7;
-const path$7 = require$$1__default$2;
+const path$9 = require$$1__default$2;
 /**
  * 获取小程序ci的Project对象
  * @returns {Object} 小程序ci对象
@@ -1565,7 +1550,7 @@ const getMpCi = ({
 }) => {
   var _cfgJsonContent$packO;
 
-  const cfgJsonContent = require(path$7.join(projectPath, 'project.config.json'));
+  const cfgJsonContent = require(path$9.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
@@ -1631,21 +1616,71 @@ var mpCi = {
   buildMpNpm: buildMpNpm$1
 };
 
+const fs$9 = require$$0__default$2;
+const path$8 = require$$1__default$2;
+const {
+  CACHE_FILE,
+  CACHE_DIR: CACHE_DIR$2
+} = require$$4;
+const {
+  ensureDirExist: ensureDirExist$1
+} = io$3;
+
+function getCache$1(projectDir, type) {
+  var _content$projectDir;
+
+  const filePath = `${CACHE_DIR$2}/${CACHE_FILE}`;
+
+  if (!fs$9.existsSync(filePath)) {
+    return null;
+  }
+
+  const content = require(filePath);
+
+  return content === null || content === void 0 ? void 0 : (_content$projectDir = content[projectDir]) === null || _content$projectDir === void 0 ? void 0 : _content$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);
+    ensureDirExist$1(dir);
+    fs$9.writeFileSync(filePath, '{}');
+  }
+
+  const content = require(filePath);
+
+  if (!content[projectDir]) {
+    content[projectDir] = {};
+  }
+
+  content[projectDir] = {
+    [type]: data
+  };
+  fs$9.writeFileSync(filePath, JSON.stringify(content, null, 2));
+}
+
+var cache = {
+  setCache: setCache$1,
+  getCache: getCache$1
+};
+
 /**
  * 本文件主要负责项目或者分包依赖的npm的安装
  */
-const fs$6 = require$$0__default$2;
+const fs$8 = require$$0__default$2;
 const fsExtra = require$$1__default$6;
-const crypto = require$$1__default$5;
-const path$6 = require$$1__default$2;
+const crypto$1 = require$$1__default$5;
+const path$7 = require$$1__default$2;
 const shell = require$$0__default$3;
-const glob = require$$5__default;
+const glob = require$$6__default;
 const log = log$1;
 const {
-  npmInstall
+  npmInstall: npmInstall$1
 } = widgets;
 const {
-  handleError: handleError$1
+  handleError: handleError$3
 } = handleError_1;
 const shellJsOption = {
   async: false,
@@ -1669,22 +1704,22 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
   const npmTasksMap = new Map();
 
   for (const packageJsonPath of packageJsonFiles) {
-    const packageContent = fs$6.readFileSync(packageJsonPath);
+    const packageContent = fs$8.readFileSync(packageJsonPath);
     const packageJson = JSON.parse(packageContent);
     const md5Obj = {
       dependencies: packageJson.dependencies || {}
     };
 
     if (Object.keys(md5Obj.dependencies).length !== 0) {
-      const md5Key = crypto.createHash('md5').update(JSON.stringify(md5Obj)).digest('hex');
-      const cacheNMPath = path$6.join(cacheDir, md5Key);
-      const cacheNMTarFile = path$6.join(cacheNMPath, 'node_modules.tar.gz'); // 下载后，添加回调函数 (拷贝node_modules.tar.gz到编译目录并解压)
+      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 callback = {
         params: {
           cacheNMPath,
           cacheNMTarFile,
-          packageJsonDir: path$6.dirname(packageJsonPath),
+          packageJsonDir: path$7.dirname(packageJsonPath),
           shell
         },
         fn: async (cacheNMPath, cacheNMTarFile, packageJsonDir, shell) => {
@@ -1713,7 +1748,7 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
             fsExtra.emptydirSync(cacheNMPath);
             shell.cp('-f', packageJsonPath, cacheNMPath);
             log.info(`npm install: ${packageJsonPath}`);
-            return npmInstall(cacheNMPath).then(() => {
+            return npmInstall$1(cacheNMPath).then(() => {
               const newShellJsOption = { ...shellJsOption,
                 cwd: cacheNMPath
               };
@@ -1741,7 +1776,7 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
 }; // 遍历安装指定目录下所有项目的npm依赖
 
 
-const mpNpmInstallAll$1 = async (modules, contextDir, cacheDir) => {
+const npmInstallAll$1 = async (modules, contextDir, cacheDir) => {
   const cwd = process.cwd();
   const packageJsonFiles = await findAllPackageJson(modules, contextDir); // 收集npm install的任务
 
@@ -1760,11 +1795,12 @@ const mpNpmInstallAll$1 = async (modules, contextDir, cacheDir) => {
       }) => fn(...Object.keys(cParams).map(key => cParams[key])));
       return Promise.all(callArr);
     }).catch(e => {
-      handleError$1(`npm install ${params.packageJsonPath}出现错误：${e}`);
+      handleError$3(`npm install ${params.packageJsonPath}出现错误：${e}`);
     }));
   });
   await Promise.all(arrPromises);
   shell.cd(cwd);
+  return packageJsonFiles;
 };
 /**
   * 递归查找指定条件的文件
@@ -1785,7 +1821,7 @@ const findFilesByFilter = (startPath, filter) => {
 
   const find = (startPath, filter) => {
     // 目录不存在
-    if (!fs$6.existsSync(startPath)) {
+    if (!fs$8.existsSync(startPath)) {
       log.fail(`${startPath}目录不存在`);
       process.exit(-1);
       return;
@@ -1798,10 +1834,10 @@ const findFilesByFilter = (startPath, filter) => {
       return;
     }
 
-    const files = fs$6.readdirSync(startPath);
+    const files = fs$8.readdirSync(startPath);
     files.forEach(file => {
-      const filename = path$6.join(startPath, file);
-      const stat = fs$6.lstatSync(filename); // 当前文件是文件夹类型，继续递归
+      const filename = path$7.join(startPath, file);
+      const stat = fs$8.lstatSync(filename); // 当前文件是文件夹类型，继续递归
 
       if (stat.isDirectory()) {
         find(filename, filter);
@@ -1827,7 +1863,7 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
   const packageJsonName = 'package.json'; // 查找文件名
 
   const cwd = contextDir || dirPath;
-  const result = [path$6.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
+  const result = [path$7.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
 
   subRoots.forEach(subRoot => {
     if (!subRoot.root) {
@@ -1835,7 +1871,7 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
       process.exit(1);
     }
 
-    const toppath = path$6.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
+    const toppath = path$7.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
 
     const list = findFilesByFilter(toppath, packageJsonName);
     result.push(...list);
@@ -1851,7 +1887,7 @@ function cloudNpmInstall(contextDir) {
       }
 
       files.forEach(file => {
-        const dir = path$6.dirname(file);
+        const dir = path$7.dirname(file);
         shell.cd(dir);
         shell.exec('npx npm install --production --registry http://mirrors.tencent.com/npm/', {
           silent: false
@@ -1864,73 +1900,47 @@ function cloudNpmInstall(contextDir) {
 
 var npm = {
   cloudNpmInstall,
-  mpNpmInstallAll: mpNpmInstallAll$1,
+  npmInstallAll: npmInstallAll$1,
   findAllPackageJson
 };
 
-const shelljs$4 = require$$0__default$3;
-const fs$5 = require$$0__default$2;
-const io$1 = io$3;
-const {
-  createTask: createTask$1,
-  resolve: resolve$8
-} = widgets;
-const {
-  buildMpNpm
-} = mpCi;
-const {
-  CACHE_DIR: CACHE_DIR$1
-} = require$$4;
-const {
-  mpNpmInstallAll
-} = npm;
-const {
-  global: global$3
-} = global_1;
-const {
-  fail: fail$3
-} = log$1;
-
-async function install$2(tmsConfig, modules) {
-  // 拷贝模块的package.json到编译输出目录
-  modules.forEach(item => {
-    const outputModuleDir = resolve$8(`${tmsConfig.outputDir}/${item.root}`);
-
-    if (!fs$5.existsSync(resolve$8(item.path))) {
-      fail$3(`${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$4.cp('-Rf', modulePackagePath, outputModuleDir);
-  }); // 小程序npm install
-
-  await createTask$1(mpNpmInstallAll, '小程序 开始npm install', '小程序npm install 完成')(modules, resolve$8(tmsConfig.outputDir), `${CACHE_DIR$1}/node_modules`);
-  const tmsPrivateCf = global$3.getData('tmsPrivateCf'); // 构建miniprogram_npm
+const crypto = require$$1__default$5;
+const fs$7 = require$$0__default$2;
 
-  await createTask$1(buildMpNpm, '开始构建miniprogram_npm', '构建miniprogram_npm 完成')({
-    appId: tmsConfig.appId,
-    projectPath: resolve$8('./'),
-    privateKey: tmsPrivateCf.privateKey
+function fileMd5$1(filePath) {
+  return new Promise((resolve, reject) => {
+    const md5sum = crypto.createHash('md5');
+    const stream = fs$7.ReadStream(filePath);
+    stream.on('data', d => {
+      md5sum.update(d);
+    });
+    stream.on('error', err => {
+      reject(err);
+    });
+    stream.on('end', () => {
+      const hash = md5sum.digest('hex');
+      resolve(hash);
+    });
   });
 }
 
-var install_1 = install$2;
+var md5 = {
+  fileMd5: fileMd5$1
+};
 
-const fs$4 = require$$0__default$2;
+const fs$6 = require$$0__default$2;
 const semver$1 = require$$1__default$7;
 const {
-  resolve: resolve$7
+  resolve: resolve$9
 } = widgets;
-const path$5 = require$$1__default$2;
-const shelljs$3 = require$$0__default$3;
+const path$6 = require$$1__default$2;
+const shelljs$4 = require$$0__default$3;
 const {
-  handleError
+  handleError: handleError$2
 } = handleError_1;
 
 const getLatestVersion = npmName => {
-  const data = shelljs$3.exec(`npm view ${npmName} version`);
+  const data = shelljs$4.exec(`npm view ${npmName} version`);
   return data.stdout || '0.0.0';
 };
 /**
@@ -1942,50 +1952,50 @@ const getLatestVersion = npmName => {
  */
 
 
-const checkDependencies$1 = (modules, cwd, outputDir) => {
+const isDependenciesUpdate$1 = (modules, cwd, outputDir) => {
   // 步骤1. 收集package.json
   const packageJsonName = 'package.json'; // 查找文件名
   // 1.1根目录的package.json
 
   const packageArr = [{
-    srcPackageDir: path$5.join(cwd, packageJsonName),
-    destNpmDir: resolve$7(outputDir, 'node_modules')
+    srcPackageDir: path$6.join(cwd, packageJsonName),
+    destNpmDir: resolve$9(outputDir, 'node_modules')
   }]; // 1.2模块的package.json
 
   modules.forEach(item => {
-    const srcPackageDir = path$5.join(cwd, item.path, 'package.json');
+    const srcPackageDir = path$6.join(cwd, item.path, 'package.json');
 
-    if (fs$4.existsSync(srcPackageDir)) {
+    if (fs$6.existsSync(srcPackageDir)) {
       packageArr.push({
         srcPackageDir,
-        destNpmDir: resolve$7(outputDir, item.root, 'node_modules')
+        destNpmDir: resolve$9(outputDir, item.root, 'node_modules')
       });
     }
   }); // 步骤2. 比较package.json的依赖与node_modules依赖的版本号
 
   for (const item of packageArr) {
-    const packageJson = fs$4.readFileSync(item.srcPackageDir, 'utf-8');
+    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(`解析${item.srcPackageDir}报错，请检查是否是正确的json配置项 ${e}`);
+      handleError$2(`解析${item.srcPackageDir}报错，请检查是否是正确的json配置项 ${e}`);
     }
 
     const dependenciesKeys = Object.keys(dependencies);
 
     for (const key of dependenciesKeys) {
-      const depPath = path$5.join(item.destNpmDir, key);
+      const depPath = path$6.join(item.destNpmDir, key);
 
-      if (!fs$4.existsSync(depPath)) {
+      if (!fs$6.existsSync(depPath)) {
         return true;
       }
 
-      const depPackagePath = path$5.join(depPath, 'package.json');
+      const depPackagePath = path$6.join(depPath, 'package.json');
 
-      if (fs$4.existsSync(depPackagePath)) {
+      if (fs$6.existsSync(depPackagePath)) {
         const packageData = require(depPackagePath);
 
         if (dependencies[key] === 'latest') {
@@ -2006,15 +2016,182 @@ const checkDependencies$1 = (modules, cwd, outputDir) => {
   return false;
 };
 
-var checkDependencies_1 = {
-  checkDependencies: checkDependencies$1
+var checkDependencies = {
+  isDependenciesUpdate: isDependenciesUpdate$1
 };
 
+const shelljs$3 = require$$0__default$3;
+const fs$5 = require$$0__default$2;
+const path$5 = require$$1__default$2;
+const io$1 = io$3;
+const {
+  createTask: createTask$1,
+  resolve: resolve$8
+} = widgets;
+const {
+  buildMpNpm
+} = mpCi;
+const {
+  setCache,
+  getCache
+} = cache;
+const {
+  CACHE_DIR: CACHE_DIR$1
+} = require$$4;
+const {
+  npmInstallAll
+} = npm;
+const {
+  fail: fail$3,
+  info: info$5
+} = log$1;
+const {
+  fileMd5
+} = md5;
+const {
+  isDependenciesUpdate
+} = checkDependencies;
+
+async function install$2(tmsConfig, modules, env, 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
+
+  if (!npmInstallRes.isCache) {
+    // 构建miniprogram_npm, 不使用缓存
+    await createTask$1(mpCiInstall, '开始构建miniprogram_npm', '构建miniprogram_npm 完成')(tmsConfig, modules, false);
+  } else {
+    // 构建miniprogram_npm
+    await createTask$1(mpCiInstall, '开始构建miniprogram_npm', '构建miniprogram_npm 完成')(tmsConfig, modules, useCache);
+  }
+
+  shelljs$3.cd(cwd);
+}
+
+async function npmInstall(tmsConfig, modules, useCache) {
+  // 如果依赖没有更新和使用缓存数据（则命中缓存）
+  if (!isDependenciesUpdate(modules, resolve$8('./'), tmsConfig.outputDir) && useCache) {
+    info$5('node_modules命中缓存');
+    return {
+      isCache: true
+    };
+  } // 拷贝模块的package.json到编译输出目录
+
+
+  modules.forEach(item => {
+    const outputModuleDir = resolve$8(`${tmsConfig.outputDir}/${item.root}`);
+
+    if (!fs$5.existsSync(resolve$8(item.path))) {
+      fail$3(`${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);
+  });
+  await npmInstallAll(modules, resolve$8(tmsConfig.outputDir), `${CACHE_DIR$1}/node_modules`);
+  return {
+    isCache: false
+  };
+} // 构建miniprogram_npm
+
+
+async function mpCiInstall(tmsConfig, modules, useCache) {
+  const packageJsonFiles = [];
+  const rootPackFile = resolve$8(`${tmsConfig.outputDir}/package.json`);
+
+  if (fs$5.existsSync(rootPackFile)) {
+    packageJsonFiles.push(rootPackFile);
+  }
+
+  modules.forEach(item => {
+    const packageJsonFile = resolve$8(`${tmsConfig.outputDir}/${item.root}/package.json`);
+
+    if (fs$5.existsSync(packageJsonFile)) {
+      packageJsonFiles.push(packageJsonFile);
+    }
+  });
+  let isCache = false;
+  const statusMap = {
+    success: 1,
+    doing: 2
+  };
+
+  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 md5Value = await getMNPMd5(packageDir);
+      const preCache = getCache(mpDir, 'miniprogram_npm'); // console.log('miniprogram_npm', preCache, md5Value);
+      // 上一次构建成功 && 上次md5与当前本地的miniprogram_npm的md5 一致，才可以进入缓存
+
+      if ((preCache === null || preCache === void 0 ? void 0 : preCache.status) !== statusMap.success || (preCache === null || preCache === void 0 ? void 0 : preCache.md5) !== md5Value) {
+        flag = false;
+      }
+    }));
+    isCache = flag;
+  }
+
+  if (isCache) {
+    info$5('miniprogram_npm命中缓存');
+    return;
+  } // 即将构建，在cache中标记开始
+
+
+  await Promise.all(packageJsonFiles.map(async item => {
+    const packageDir = path$5.dirname(item);
+    const mpDir = resolve$8(`${packageDir}/miniprogram_npm`);
+    setCache(mpDir, 'miniprogram_npm', {
+      md5: '',
+      status: statusMap.doing
+    });
+  }));
+  await buildMpNpm({
+    appId: tmsConfig.appId,
+    projectPath: resolve$8('./'),
+    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 md5Value = await getMNPMd5(packageDir);
+    setCache(mpDir, 'miniprogram_npm', {
+      md5: md5Value,
+      status: statusMap.success
+    });
+  }));
+} // 计算miniprogram_npm压缩文件的md5值
+
+
+async function getMNPMd5(cwd) {
+  const shellJsOption = {
+    async: false,
+    silent: true
+  };
+  shelljs$3.cd(cwd);
+
+  if (fs$5.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'));
+    return md5Value;
+  }
+
+  return '';
+}
+
+var install_1 = install$2;
+
 const shelljs$2 = require$$0__default$3;
-const fs$3 = require$$0__default$2;
+const fs$4 = require$$0__default$2;
 const io = io$3;
 const {
-  resolve: resolve$6,
+  resolve: resolve$7,
   createTask
 } = widgets;
 const {
@@ -2036,9 +2213,6 @@ const {
   info: info$4
 } = log$1;
 const install$1 = install_1;
-const {
-  checkDependencies
-} = checkDependencies_1;
 /**
  * 拷贝相关配置文件到编译输出目录
  * @param { object } tmsConfig
@@ -2048,11 +2222,11 @@ const {
  */
 
 const cpFilesToOutput = function (tmsConfig, defaultFiles) {
-  const outputDir = resolve$6(tmsConfig.outputDir);
+  const outputDir = resolve$7(tmsConfig.outputDir);
   io.ensureDirExist(outputDir);
   defaultFiles.forEach(item => {
-    if (fs$3.existsSync(resolve$6(item))) {
-      shelljs$2.cp('-rf', resolve$6(item), resolve$6(tmsConfig.outputDir, item));
+    if (fs$4.existsSync(resolve$7(item))) {
+      shelljs$2.cp('-rf', resolve$7(item), resolve$7(tmsConfig.outputDir, item));
     }
   });
 };
@@ -2070,7 +2244,7 @@ function checkConfig(targetModules) {
     } // 判断源码目录是否有该模块
 
 
-    if (item.path && !fs$3.existsSync(resolve$6(item.path))) {
+    if (item.path && !fs$4.existsSync(resolve$7(item.path))) {
       throw new Error(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
     }
   }
@@ -2080,7 +2254,7 @@ function checkConfig(targetModules) {
 
 async function task(tmsConfig, targetModules) {
   // 下载和移动代码
-  await createTask(cloneModules, '开始下载模块代码', '下载模块代码码完成')(MODULE_CODE_DIR, resolve$6('./'), targetModules); // tms.config.js的modules 合并 module.config.json的配置项
+  await createTask(cloneModules, '开始下载模块代码', '下载模块代码码完成')(MODULE_CODE_DIR, resolve$7('./'), targetModules); // tms.config.js的modules 合并 module.config.json的配置项
 
   let newModules = tmsModulesMergeLocalModuleCfg$2(targetModules, tmsConfig.appName); // A分包依赖了B分包的代码， merge B分包进行编译；
 
@@ -2089,10 +2263,7 @@ async function task(tmsConfig, targetModules) {
 
   await createTask(cpFilesToOutput, '开始拷贝文件到编译输出目录', '拷贝文件到编译输出目录完成')(tmsConfig, DEFAULT_COPY_CONFIG); // install
 
-  if (checkDependencies(newModules, resolve$6('./'), tmsConfig.outputDir)) {
-    await install$1(tmsConfig, newModules);
-  } // 动态生成编译后的app.json;
-
+  await install$1(tmsConfig, newModules); // 动态生成编译后的app.json;
 
   await createTask(buildOutputAppJson, '开始生成编译后的app.json', '生成编译后的app.json完成')(tmsConfig, newModules);
   return newModules;
@@ -2183,9 +2354,9 @@ const {
   diffContentCopyFile: diffContentCopyFile$2
 } = 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$2
 } = pluginError_1;
@@ -2198,7 +2369,7 @@ const dfsFindCommonDep$2 = function (anaFileOriginFile, anaFileDestFile, extensi
     let contents = '';
 
     try {
-      contents = fs$2.readFileSync(anaFileOriginFile, 'utf8');
+      contents = fs$3.readFileSync(anaFileOriginFile, 'utf8');
     } catch (e) {
       pluginError$2(e, isWatch);
     }
@@ -2215,12 +2386,12 @@ const dfsFindCommonDep$2 = function (anaFileOriginFile, anaFileDestFile, extensi
           extPath
         } = ext$2(depOriginPath, extensions);
 
-        if (!fs$2.existsSync(depOriginFile)) {
+        if (!fs$3.existsSync(depOriginFile)) {
           pluginError$2(new Error(`${anaFileOriginFile}引用路径${depOriginFile}文件不存在, 请检查应用路径`), isWatch);
           return;
         }
 
-        const depDestPath = resolve$5(path$4.dirname(anaFileDestFile), depItem);
+        const depDestPath = resolve$6(path$4.dirname(anaFileDestFile), depItem);
         const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
 
         if (!resDep.has(depDestFile)) {
@@ -2244,8 +2415,8 @@ 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$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);
@@ -2274,7 +2445,7 @@ function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
             const regRes = depItem.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)) {
@@ -2327,9 +2498,9 @@ const {
   diffContentCopyFile: diffContentCopyFile$1
 } = io$3;
 const {
-  resolve: resolve$4
+  resolve: resolve$5
 } = widgets;
-const fs$1 = require$$0__default$2;
+const fs$2 = require$$0__default$2;
 const {
   pluginError: pluginError$1
 } = pluginError_1;
@@ -2341,8 +2512,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$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);
@@ -2377,11 +2548,11 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
                 } // eslint-disable-next-line
 
 
-                const reg = new RegExp(`^(\./\.\.\/)+.*\/${includeName}\/(.*)`);
+                const reg = new RegExp(`^(\./|\.\.\/)+.*\/${includeName}\/(.*)`);
                 const regRes = componentPath.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(extAlias) ? depDestPath : depDestPath + extPath;
 
                   if (!copyModules.has(depDestFile)) {
@@ -2415,7 +2586,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
           const originFile = depOriginFile.replace(depOriginExt, extKey);
           const destFile = depDestFile.replace(depOriginExt, extKey);
 
-          if (fs$1.existsSync(originFile)) {
+          if (fs$2.existsSync(originFile)) {
             diffContentCopyFile$1(originFile, destFile);
             const extensionsFilter = ['.js', '.ts', '.wxss', '.less'];
 
@@ -2449,7 +2620,7 @@ var mpJsonDep_1 = {
 /* eslint-disable no-param-reassign */
 const through = require$$0__default$9;
 const htmlparser2 = require$$1__default$9;
-const fs = require$$0__default$2;
+const fs$1 = require$$0__default$2;
 const path$2 = require$$1__default$2;
 const {
   diffContentCopyFile,
@@ -2457,7 +2628,7 @@ const {
   fileInDir
 } = io$3;
 const {
-  resolve: resolve$3
+  resolve: resolve$4
 } = widgets;
 const {
   dfsFindCommonDep
@@ -2496,7 +2667,7 @@ const dfsFindWxmlDep = function (anaFileOriginFile, anaFileDestFile, isWatch = t
     let contents = '';
 
     try {
-      contents = fs.readFileSync(anaFileOriginFile, 'utf8');
+      contents = fs$1.readFileSync(anaFileOriginFile, 'utf8');
     } catch (e) {
       pluginError(e, isWatch);
     }
@@ -2514,7 +2685,7 @@ const dfsFindWxmlDep = function (anaFileOriginFile, anaFileDestFile, isWatch = t
             extPath
           } = extFile(name, depOriginPath);
 
-          if (!fs.existsSync(depOriginFile)) {
+          if (!fs$1.existsSync(depOriginFile)) {
             pluginError(new Error(`${anaFileOriginFile}引用的路径${depOriginFile}找不到应用文件，请检查引用路径`), isWatch);
             return;
           }
@@ -2571,8 +2742,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$3(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$3(tmsConfig.outputDir, module.to, anaFileRelativeModule);
+    const anaFileRelativeModule = path$2.relative(resolve$4(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve$4(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
@@ -2603,7 +2774,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
                 const regRes = attributes.src.match(reg) || [];
 
                 if (regRes[2]) {
-                  const depDestPath = resolve$3(tmsConfig.outputDir, module.to, includeName, regRes[2]);
+                  const depDestPath = resolve$4(tmsConfig.outputDir, module.to, includeName, regRes[2]);
                   const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath;
 
                   if (!copyModules.has(depDestFile)) {
@@ -2630,7 +2801,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
         beforeDepPath,
         afterDepPath
       }) => {
-        if (fs.existsSync(depOriginFile)) {
+        if (fs$1.existsSync(depOriginFile)) {
           diffContentCopyFile(depOriginFile, depDestFile);
           const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
           contents = contents.replace(reg, `"${afterDepPath}"`);
@@ -2826,10 +2997,10 @@ const path$1 = require$$1__default$2;
 const PluginError = require$$2__default$1;
 const fancyLog = require$$3__default;
 const colors = require$$4__default;
-const chokidar = require$$5__default$1;
+const chokidar = require$$5__default;
 const {
   Duplex
-} = require$$6__default;
+} = require$$6__default$1;
 const vinyl = require$$7__default;
 const File = require$$8__default;
 const anymatch = require$$9__default;
@@ -2998,10 +3169,10 @@ const path = require$$1__default$2;
 const shellJs = require$$0__default$3;
 const {
   info: info$3,
-  warn
+  warn: warn$1
 } = log$1;
 const {
-  resolve: resolve$2
+  resolve: resolve$3
 } = widgets;
 const {
   global: global$2
@@ -3018,7 +3189,7 @@ const logTip = (fileName, tipMap) => {
   // eslint-disable-next-line
   for (const item in tipMap) {
     if (fileName.indexOf(item) > -1) {
-      warn(`${fileName}有更新, ${tipMap[item]}`);
+      warn$1(`${fileName}有更新, ${tipMap[item]}`);
       return;
     }
   }
@@ -3027,8 +3198,8 @@ const logTip = (fileName, tipMap) => {
 };
 
 const getTargetFile = (sourceFile, module, outputDir) => {
-  const sourceFileRelativeModule = path.relative(resolve$2(module.from), sourceFile);
-  const targetFile = resolve$2(outputDir, module.to, sourceFileRelativeModule);
+  const sourceFileRelativeModule = path.relative(resolve$3(module.from), sourceFile);
+  const targetFile = resolve$3(outputDir, module.to, sourceFileRelativeModule);
   return targetFile;
 };
 
@@ -3073,13 +3244,15 @@ var watch_1 = function (globValue, watchOptions, callback, 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
+    mergeMap,
+    filterField
   } = widgets;
   const {
     buildOutputAppJson
@@ -3123,20 +3296,7 @@ var watch_1 = function (globValue, watchOptions, callback, module) {
   }
 
   module.exports = async (tmsConfig, newModules, isDev = true) => {
-    const compileTasksMap = new Map(); // 监听app.json
-
-    if (isDev) {
-      watch([resolve('app.json')], {
-        ignoreInitial: false,
-        events: watchEvents
-      }, () => buildOutputAppJson(tmsConfig, newModules, isDev), {
-        from: resolve(),
-        to: resolve(tmsConfig.outputDir)
-      });
-    } else {
-      buildOutputAppJson(tmsConfig, newModules, isDev);
-    } // 监听根目录的文件
-
+    const compileTasksMap = new Map(); // 监听根目录的文件
 
     mergeMap(compileTasksMap, compile$1(tmsConfig, {
       glob: {
@@ -3250,6 +3410,15 @@ var watch_1 = function (globValue, watchOptions, callback, module) {
       var _tmsConfig$hooks;
 
       if (isDev) {
+        // 监听app.json
+        watch([resolve('app.json')], {
+          ignoreInitial: false,
+          events: watchEvents
+        }, () => buildOutputAppJson(tmsConfig, newModules, isDev), {
+          from: resolve(),
+          to: resolve(tmsConfig.outputDir)
+        }); // 监听其他文件
+
         compileTasksMap.forEach(({
           taskFn,
           module
@@ -3259,6 +3428,8 @@ var watch_1 = function (globValue, watchOptions, callback, module) {
             events: watchEvents
           }, taskFn, module);
         });
+      } else {
+        buildOutputAppJson(tmsConfig, newModules, isDev);
       }
 
       eTime = new Date().getTime() - sTime;
@@ -3268,12 +3439,12 @@ var watch_1 = function (globValue, watchOptions, callback, module) {
 
         await (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$hooks2 = tmsConfig.hooks) === null || _tmsConfig$hooks2 === void 0 ? void 0 : _tmsConfig$hooks2.afterCompile({
           isDev,
-          tmsConfig,
+          tmsConfig: filterField(tmsConfig, ['gitAccount']),
           modules: newModules
         }));
       }
 
-      spinner.succeed(`首次编译完成, 耗时${eTime / 1000}s, 微信开发者工具打开项目即可预览。`);
+      spinner.succeed(chalk.green(`首次编译完成, 耗时${eTime / 1000}s, 微信开发者工具打开项目即可预览。`));
       spinner.stop();
       cb();
     }
@@ -3283,7 +3454,8 @@ var watch_1 = function (globValue, watchOptions, callback, module) {
       taskFn
     }) => {
       compileTasks.push(taskFn);
-    });
+    }); // 一次性完成编译任务（编译完成后再添加watch任务-封装到end函数里面）
+
     series(start, parallel(...compileTasks), end)();
   };
 })(dev$3);
@@ -3291,7 +3463,8 @@ var watch_1 = function (globValue, watchOptions, callback, module) {
 const shelljs$1 = require$$0__default$3;
 const compileDev = dev$3.exports;
 const {
-  resolve: resolve$1
+  resolve: resolve$2,
+  filterField: filterField$1
 } = widgets;
 const init$4 = init_1;
 const {
@@ -3308,11 +3481,11 @@ const {
 } = require$$4; // 用户编译分包时，需要将dist中其他分包(主包不能删除)的内容删除，否则其他分包的内容混入到主包(导致主包的体积超2M)
 
 function delOtherModule(tmsConfig, targetModules) {
-  const modules = tmsModulesMergeLocalModuleCfg$1(tmsConfig.modules, tmsConfig.appName);
+  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) {
-      const moduleRootDir = resolve$1(`dist/${item.root}`);
+      const moduleRootDir = resolve$2(`${tmsConfig.outputDir}/${item.root}`);
       shelljs$1.rm('-rf', `${moduleRootDir}/*`, {
         silent: true
       }); // 解决微信开发者工具（dist/app.json: ["subpackages"][0]["root"] 字段需为 目录）错误 - 提前创建该目录
@@ -3330,7 +3503,7 @@ async function dev$2(tmsConfig, targetModules, env) {
   } = global$1.getData('cmd');
 
   if (noCache) {
-    shelljs$1.rm('-rf', resolve$1(tmsConfig.outputDir));
+    shelljs$1.rm('-rf', resolve$2(tmsConfig.outputDir));
     shelljs$1.rm('-rf', CACHE_DIR);
   } // 初始化操作
 
@@ -3344,7 +3517,7 @@ async function dev$2(tmsConfig, targetModules, env) {
 
     await (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$hooks2 = tmsConfig.hooks) === null || _tmsConfig$hooks2 === void 0 ? void 0 : _tmsConfig$hooks2.beforeCompile({
       isDev: true,
-      tmsConfig,
+      tmsConfig: filterField$1(tmsConfig, ['gitAccount']),
       modules: newModules
     }));
   }
@@ -3362,26 +3535,107 @@ var build$2 = async (tmsConfig, newModules) => {
 
 const shelljs = require$$0__default$3;
 const {
-  resolve
+  resolve: resolve$1,
+  filterField
 } = widgets;
 const init$3 = init_1;
 const compileBuild = build$2;
 
 async function build$1(tmsConfig, targetModules, env) {
+  var _tmsConfig$hooks;
+
   // 开始构建前，清理输出目录
-  await shelljs.rm('-rf', resolve(tmsConfig.outputDir));
+  await shelljs.rm('-rf', resolve$1(tmsConfig.outputDir));
   const {
     targetModules: newModules
   } = await init$3(tmsConfig, targetModules);
+
+  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,
+      tmsConfig: filterField(tmsConfig, ['gitAccount']),
+      modules: newModules
+    }));
+  }
   compileBuild(tmsConfig, newModules, env);
 }
 
 var build_1 = build$1;
 
+const fs = require$$0__default$2;
+const {
+  resolve
+} = widgets;
+const {
+  handleError: handleError$1
+} = handleError_1;
+const {
+  ensureDirExist
+} = io$3;
+const {
+  warn
+} = log$1;
+/**
+ * 根据相关配置创建软链接
+ * @param { object } tmsConfig
+ */
+
+const symLink$1 = tmsConfig => {
+  try {
+    ensureDirExist(resolve(tmsConfig.cloudDir));
+
+    if (tmsConfig.cloudModules) {
+      tmsConfig.cloudModules.forEach(item => {
+        const sourcePath = resolve(item.path);
+        const targetPath = resolve(tmsConfig.cloudDir, item.name);
+
+        if (!fs.existsSync(sourcePath)) {
+          warn(`云函数${sourcePath}不存在`);
+          return;
+        }
+
+        if (!fs.existsSync(targetPath)) {
+          fs.symlinkSync(sourcePath, targetPath);
+        }
+      });
+    }
+  } catch (e) {
+    handleError$1(`创建软链错误: ${e}`);
+  }
+};
+
+var symbolicLink = {
+  symLink: symLink$1
+};
+
+const {
+  symLink
+} = symbolicLink;
+const {
+  handleError
+} = handleError_1;
+const {
+  succeed
+} = log$1;
+
+var cloud$1 = async tmsConfig => {
+  try {
+    await symLink(tmsConfig);
+    succeed('云函数创建软链成功');
+  } catch (e) {
+    handleError(`创建软链错误: ${e}`);
+  }
+};
+
+/* eslint-disable no-param-reassign */
+const loadash = require$$0__default$6;
 const init$2 = init_1;
 const dev = dev_1;
 const build = build_1;
 const install = install_1;
+const cloud = cloud$1;
 const {
   global
 } = global_1;
@@ -3409,40 +3663,60 @@ const handleModuleArg = cmd => {
  */
 
 
-const getSpecificModules = (moduleArg, modulePrivateCfg, moduleAll) => {
+const getSpecificModules = (moduleArg, modules) => {
   if (moduleArg.length > 0) {
     return moduleArg;
-  } // 单模块或多模块开发-用户在tms.private.js指定的模块
+  }
 
+  const {
+    all,
+    include,
+    exclude,
+    blockRemote
+  } = modules; // 单模块或多模块开发-用户在tms.private.js指定的模块
+
+  if ((include === null || include === void 0 ? void 0 : include.length) > 0) {
+    return include;
+  }
 
-  if (modulePrivateCfg) {
-    var _modulePrivateCfg$inc, _modulePrivateCfg$exc;
+  if ((exclude === null || exclude === void 0 ? void 0 : exclude.length) > 0) {
+    return all.filter(module => !exclude.includes(module.name)).map(item => item.name);
+  }
 
-    if (((_modulePrivateCfg$inc = modulePrivateCfg.include) === null || _modulePrivateCfg$inc === void 0 ? void 0 : _modulePrivateCfg$inc.length) > 0) {
-      return modulePrivateCfg.include;
-    }
+  if (blockRemote === true) {
+    return all.filter(module => module.repoInfo === undefined).map(item => item.name);
+  }
 
-    if (((_modulePrivateCfg$exc = modulePrivateCfg.exclude) === null || _modulePrivateCfg$exc === void 0 ? void 0 : _modulePrivateCfg$exc.length) > 0) {
-      return moduleAll.filter(module => !modulePrivateCfg.exclude.includes(module.name)).map(item => item.name);
-    }
+  return all.map(item => item.name);
+};
+
+const mergeConfig = (tmsConfig, tmsPrivateCf) => {
+  const modules = {};
+
+  if (Array.isArray(tmsConfig.modules)) {
+    modules.all = tmsConfig.modules;
+    tmsConfig.modules = modules;
+  } // 合并默认值
 
-    if (modulePrivateCfg.blockRemote === true) {
-      return moduleAll.filter(module => module.repoInfo === undefined).map(item => item.name);
-    }
-  }
 
-  return moduleAll.map(item => item.name);
+  const res = loadash.mergeWith(tmsConfig, tmsPrivateCf, (objValue, srcValue) => {
+    if (loadash.isArray(objValue) && objValue[0] && loadash.isObject(objValue[0])) {
+      return objValue.concat(srcValue);
+    }
+  });
+  return res;
 };
 
 async function run(commandName, cmd) {
-  // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
+  // 用户本地的私有项目配置
   const tmsPrivateCf = readTmsPrivateCf();
   const {
     env = tmsPrivateCf === null || tmsPrivateCf === void 0 ? void 0 : tmsPrivateCf.env
   } = cmd;
-  const tmsConfig = readTmsConfig(env); // 处理module参数
+  let tmsConfig = readTmsConfig(env);
+  tmsConfig = mergeConfig(tmsConfig, tmsPrivateCf); // 处理module参数
 
-  const specificModules = getSpecificModules(handleModuleArg(cmd), tmsPrivateCf.modules, tmsConfig.modules);
+  const specificModules = getSpecificModules(handleModuleArg(cmd), tmsConfig.modules);
   const modules = checkModules(tmsConfig, [...new Set([...tmsConfig.mainPackages, ...specificModules])], true); // tms.config.js的modules 合并 module.config.json的配置项
 
   let newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName); // A分包依赖了B分包的代码， merge B分包进行编译；
@@ -3452,7 +3726,6 @@ async function run(commandName, cmd) {
   global.setData({
     env,
     cmd,
-    tmsPrivateCf,
     tmsConfig
   });
 
@@ -3466,8 +3739,12 @@ async function run(commandName, cmd) {
       dev(tmsConfig, newModules, env);
       return;
 
+    case 'cloud':
+      cloud(tmsConfig, env);
+      return;
+
     case 'install':
-      install(tmsConfig, newModules, env);
+      install(tmsConfig, newModules, env, false);
       return;
 
     case 'build':
@@ -3506,6 +3783,13 @@ var entry = [{
     action: cmd => {
       run_1('dev', cmd);
     }
+  }, {
+    command: 'cloud',
+    description: '云函数开发',
+    options: [['-m, --module [moduleName]', '模块名称'], ['-e, --env [env]', '环境变量']],
+    action: cmd => {
+      run_1('cloud', cmd);
+    }
   }, {
     command: 'build',
     description: 'prod 打包编译',
@@ -3530,7 +3814,7 @@ var entry = [{
 
 var require$$7 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.16",
+	version: "0.0.19",
 	description: "tmskit",
 	main: "dist/index.cjs",
 	bin: {
@@ -3594,7 +3878,7 @@ var require$$7 = {
 		lodash: "^4.17.21",
 		metalsmith: "^2.3.0",
 		"miniprogram-ci": "1.4.13",
-		moment: "^2.29.1",
+		moment: "^2.29.2",
 		"object-assign": "^4.0.1",
 		ora: "^5.1.0",
 		"plugin-error": "^1.0.0",