@tmsfe/tmskit 0.0.17 → 0.0.18

package/dist/index.cjs.js

@@ -105,7 +105,7 @@ const resetCfg = decodeURIComponent('%1B%5B0m'); // \033[0m转义后的字符按
  * @returns {undefined} 无
  */
 
-const fail$8 = (message = '') => {
+const fail$9 = (message = '') => {
   const redStyleConfig = decodeURIComponent('%1B%5B41%3B30m'); // \033[41;30m转义后的字符按，console时输出红色文字
 
   const greenFontStyleConfig = decodeURIComponent('%1B%5B41%3B37m'); // \033[41;30m转义后的字符按，console时输出红底白色文字
@@ -140,7 +140,7 @@ const warn$2 = message => {
 const info$9 = (...args) => console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
 
 var log$1 = {
-  fail: fail$8,
+  fail: fail$9,
   succeed: succeed$2,
   warn: warn$2,
   info: info$9
@@ -149,8 +149,8 @@ var log$1 = {
 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$b = require$$1__default$2;
+const fs$e = require$$0__default$2;
 const shelljs$7 = require$$0__default$3;
 const {
   info: info$8
@@ -163,8 +163,8 @@ const shelljsOptions = {
 
 const cwd = process.cwd();
 
-function resolve$e(...args) {
-  return path$c.resolve(cwd, ...args);
+function resolve$f(...args) {
+  return path$b.resolve(cwd, ...args);
 }
 /**
  * 用户输入命令时，进行提示
@@ -194,7 +194,7 @@ const suggestCommands$1 = unknownCommand => {
  */
 
 
-function isObject$1(obj) {
+function isObject$2(obj) {
   return Object.prototype.toString.call(obj) === '[object Object]';
 }
 /**
@@ -220,8 +220,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$e.existsSync(dest)) {
+      shelljs$7.rm('-rf', path$b.join(dest));
     }
 
     shelljs$7.mkdir('-p', dest);
@@ -334,12 +334,30 @@ const mergeMap = function (obj, src) {
 };
 
 const relativeCwdPath$1 = function (file) {
-  return path$c.relative(process.cwd(), file);
+  return path$b.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;
 };
 
 var widgets = {
-  resolve: resolve$e,
-  isObject: isObject$1,
+  resolve: resolve$f,
+  isObject: isObject$2,
   isArray: isArray$1,
   createTask: createTask$3,
   downloadRepoForGit: downloadRepoForGit$2,
@@ -348,23 +366,24 @@ var widgets = {
   camelize,
   npmInstall: npmInstall$1,
   mergeMap,
-  relativeCwdPath: relativeCwdPath$1
+  relativeCwdPath: relativeCwdPath$1,
+  filterField: filterField$3
 };
 
-const path$b = require('path');
+const path$a = require('path');
 
 const os = require('os'); // 用户目录
 
 
 const HOME_DIR = os.homedir(); // 所有文件的缓存目录
 
-const CACHE_DIR$2 = path$b.resolve(HOME_DIR, '.tmskit'); // 脚手架模板代码所在目录
+const CACHE_DIR$2 = path$a.resolve(HOME_DIR, '.tmskit'); // 脚手架模板代码所在目录
 
-const TEMPLATE_DIR$1 = path$b.resolve(CACHE_DIR$2, 'template'); // 第三方模块源码存放的临时缓存目录
+const TEMPLATE_DIR$1 = path$a.resolve(CACHE_DIR$2, 'template'); // 第三方模块源码存放的临时缓存目录
 
-const MODULE_CODE_DIR$1 = path$b.resolve(CACHE_DIR$2, 'modules_code'); // 脚手架模板代码的具体路径
+const MODULE_CODE_DIR$1 = path$a.resolve(CACHE_DIR$2, 'modules_code'); // 脚手架模板代码的具体路径
 
-const TEMPLATE_PATH$1 = path$b.resolve(TEMPLATE_DIR$1, 'tools/tms-cli-template'); // 脚手架的名称
+const TEMPLATE_PATH$1 = path$a.resolve(TEMPLATE_DIR$1, 'tools/tmskit-template'); // 脚手架的名称
 
 const TMS_NAME$1 = 'tmskit'; // 脚手架的配置名称
 
@@ -375,10 +394,10 @@ const DEFAULT_MODULE_DIR = 'modules'; // 模块代码的默认在modules子目
 
 const DEFAULT_CLOUD_MODULE_DIR = './cloud'; // 模块的配置文件的名称
 
-const MODULE_CONFIG_FILENAME$1 = 'module.config.json'; // 默认的webpack entry
+const MODULE_CONFIG_FILENAME$2 = 'module.config.json'; // 默认的webpack entry
 
 const DEFAULT_WEBPACK_ENTRY = {
-  app: path$b.resolve(process.cwd(), 'app')
+  app: path$a.resolve(process.cwd(), 'app')
 }; // 默认从源码拷贝到编译后的配置
 
 const DEFAULT_COPY_CONFIG$1 = ['package.json', 'sitemap.json'];
@@ -387,7 +406,6 @@ const ENV = {
   prod: 'production'
 };
 const TEMPLATE_TKIT_DIR$2 = '_tmskit';
-const MODULE_CONFIG_INVALID_KEY = ['entranceDeclare', 'entryPagePath'];
 
 var constant = /*#__PURE__*/Object.freeze({
 	__proto__: null,
@@ -399,20 +417,19 @@ var constant = /*#__PURE__*/Object.freeze({
 	TMS_CONFIG_FILENAME: TMS_CONFIG_FILENAME$1,
 	TMS_PRIVATE_FILENAME: TMS_PRIVATE_FILENAME$1,
 	DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR,
-	MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1,
+	MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$2,
 	DEFAULT_WEBPACK_ENTRY: DEFAULT_WEBPACK_ENTRY,
 	DEFAULT_COPY_CONFIG: DEFAULT_COPY_CONFIG$1,
 	MODULE_CODE_DIR: MODULE_CODE_DIR$1,
 	ENV: ENV,
 	TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$2,
-	MODULE_CONFIG_INVALID_KEY: MODULE_CONFIG_INVALID_KEY,
 	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$d = require$$0__default$2;
+const path$9 = require$$1__default$2;
 const {
   info: info$7
 } = log$1;
@@ -425,12 +442,12 @@ const {
  * @returns
  */
 
-const isDirEmpty = dirname => fs$c.promises.readdir(dirname).then(files => files.length === 0); // 判断是否是文件
+const isDirEmpty = dirname => fs$d.promises.readdir(dirname).then(files => files.length === 0); // 判断是否是文件
 
 
 const isFile = pathName => {
   try {
-    const stat = fs$c.lstatSync(pathName);
+    const stat = fs$d.lstatSync(pathName);
     return stat.isFile();
   } catch {
     return false;
@@ -443,8 +460,8 @@ const isFile = pathName => {
 
 
 const ensureDirExist$1 = dirname => {
-  if (!fs$c.existsSync(dirname)) {
-    fs$c.mkdirSync(dirname, {
+  if (!fs$d.existsSync(dirname)) {
+    fs$d.mkdirSync(dirname, {
       recursive: true
     });
   }
@@ -452,20 +469,20 @@ const ensureDirExist$1 = dirname => {
 
 
 const copyFile = function (src, dest) {
-  if (fs$c.existsSync(dest)) {
-    fs$c.unlinkSync(dest);
+  if (fs$d.existsSync(dest)) {
+    fs$d.unlinkSync(dest);
   }
 
-  const dir = path$a.dirname(dest);
+  const dir = path$9.dirname(dest);
   ensureDirExist$1(dir);
-  fs$c.copyFileSync(src, dest);
+  fs$d.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$d.existsSync(destFile)) {
+    const depDestContent = fs$d.readFileSync(destFile, 'utf8');
+    const depOriginContent = fs$d.readFileSync(originFile, 'utf8');
 
     if (depDestContent !== depOriginContent) {
       info$7(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
@@ -483,7 +500,7 @@ function ext$3(filePath, extensions) {
   let extPath = ''; // try catch需要包裹：用来处理'./lib/timer'没有后缀的情况
 
   try {
-    const stat = fs$c.lstatSync(newFilePath);
+    const stat = fs$d.lstatSync(newFilePath);
 
     if (stat.isDirectory()) {
       extPath = newFilePath[newFilePath.length - 1] === '/' ? 'index' : '/index';
@@ -494,7 +511,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$d.existsSync(file)) {
       return {
         ext,
         extPath: extPath + ext,
@@ -512,11 +529,11 @@ function ext$3(filePath, extensions) {
 
 
 const fileInDir$3 = (dir, file) => {
-  if (!fs$c.existsSync(dir) || !fs$c.existsSync(file)) {
+  if (!fs$d.existsSync(dir) || !fs$d.existsSync(file)) {
     return false;
   }
 
-  const relativePath = path$a.relative(dir, file);
+  const relativePath = path$9.relative(dir, file);
 
   if (relativePath.startsWith('..')) {
     return false;
@@ -529,10 +546,10 @@ function findAllFilesOfDir$1(dir) {
   const list = [];
 
   function listFile(dir) {
-    const arr = fs$c.readdirSync(dir);
+    const arr = fs$d.readdirSync(dir);
     arr.forEach(item => {
-      const fullPath = path$a.join(dir, item);
-      const stats = fs$c.statSync(fullPath);
+      const fullPath = path$9.join(dir, item);
+      const stats = fs$d.statSync(fullPath);
 
       if (stats.isDirectory()) {
         listFile(fullPath);
@@ -578,10 +595,10 @@ const render$1 = (files, metalsmith, next) => {
 
 var render_1 = render$1;
 
-const fs$b = require$$0__default$2;
+const fs$c = 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 +612,12 @@ const {
 const parseTemplateQuestions = dir => {
   let prompts = [];
 
-  if (!fs$b.existsSync(`${dir}/questions.json`)) {
+  if (!fs$c.existsSync(`${dir}/questions.json`)) {
     return prompts;
   }
 
   try {
-    const json = JSON.parse(fs$b.readFileSync(`${dir}/questions.json`));
+    const json = JSON.parse(fs$c.readFileSync(`${dir}/questions.json`));
 
     if (Array.isArray(json) && json.length > 0) {
       json.forEach((item, index) => {
@@ -633,7 +650,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 +692,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$8 = require$$1__default$2;
+const fs$b = require$$0__default$2;
 const shelljs$6 = require$$0__default$3;
 const {
   TEMPLATE_DIR,
@@ -686,11 +703,11 @@ const {
 const {
   downloadRepoForGit: downloadRepoForGit$1,
   createTask: createTask$2,
-  resolve: resolve$c
+  resolve: resolve$d
 } = widgets;
 const io$2 = io$3;
 const {
-  fail: fail$7,
+  fail: fail$8,
   succeed: succeed$1,
   info: info$6
 } = log$1;
@@ -703,9 +720,9 @@ const generator = generator_1;
 
 async function createAppDir(targetDir) {
   // 如果目录非空或者已经存在，提示用户，做选择
-  if (fs$a.existsSync(targetDir)) {
+  if (fs$b.existsSync(targetDir)) {
     if (!(await io$2.isDirEmpty(targetDir))) {
-      fail$7('该目录名已经存在，换个项目名字吧~');
+      fail$8('该目录名已经存在，换个项目名字吧~');
       process.exit(1);
     }
   } else {
@@ -721,7 +738,7 @@ async function createAppDir(targetDir) {
 
 async function create(appName) {
   const cwd = process.cwd();
-  const targetDir = path$9.resolve(cwd, appName);
+  const targetDir = path$8.resolve(cwd, appName);
   const appType = 'mp';
   await createAppDir(targetDir); // 创建缓存目录
 
@@ -729,13 +746,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$8.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,23 +766,21 @@ async function create(appName) {
       });
     }
 
-    shelljs$6.rm('-rf', resolve$c(appName, TEMPLATE_TKIT_DIR));
+    shelljs$6.rm('-rf', resolve$d(appName, TEMPLATE_TKIT_DIR));
     succeed$1('项目创建完成.');
   }).catch(err => {
-    fail$7(err.message);
+    fail$8(err.message);
     info$6('详细的错误信息:', err);
   });
 }
 
 var create_1 = create;
 
-var buildAppJson = {exports: {}};
-
 var defaultTmsConfig$1 = {
   // 全局的环境配置项
   envData: {},
   // 模块配置信息
-  modules: [],
+  modules: {},
   cloudDir: 'cloud',
   // 第三方依赖代码需要拷贝到本项目的
   dependencies: {},
@@ -783,33 +798,32 @@ 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$a = require$$0__default$2;
 const {
   TMS_CONFIG_FILENAME,
-  MODULE_CONFIG_FILENAME,
+  MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1,
   TMS_PRIVATE_FILENAME
 } = require$$4;
 const {
-  resolve: resolve$b,
-  isObject,
+  resolve: resolve$c,
+  isObject: isObject$1,
   isArray
 } = widgets;
 const defaultTmsConfig = defaultTmsConfig$1;
 const {
-  fail: fail$6
+  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)) {
-    fail$6('当前执行目录没有tms.config.js的配置项，请进行配置');
+  if (!fs$a.existsSync(tmsConfigPath)) {
+    fail$7('当前执行目录没有tms.config.js的配置项，请进行配置');
     process.exit(1);
   }
 
@@ -819,35 +833,8 @@ const readTmsConfig$1 = function (env) {
     env
   }); // 合并默认值
 
-  loadash.mergeWith(tmsConfig, defaultTmsConfig); // modules兼容处理
-
-  tmsConfig.modules = convertModules(tmsConfig.modules);
+  loadash$1.mergeWith(tmsConfig, defaultTmsConfig);
   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;
 };
 /**
  * 读取tms.private.config.js
@@ -856,17 +843,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$a.existsSync(tmsPrivatePath)) {
     tmsPrivateCf = require(tmsPrivatePath);
-  } // 处理modules字段
-
-
-  if (tmsPrivateCf.modules instanceof Array) {
-    Object.assign(tmsPrivateCf.modules, {
-      include: tmsPrivateCf.modules
-    });
   }
 
   return tmsPrivateCf;
@@ -882,12 +862,12 @@ 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);
   });
 
   if (targetModules.length === 0) {
-    fail$6(`你启动的模块无效${modules.join(',')}无效，请检查tms.config.json>modules>${modules.join(',')}
+    fail$7(`你启动的模块无效${modules.join(',')}无效，请检查tms.config.json>modules>${modules.join(',')}
     >name字段与module.config.json的name字段是否一致`);
     isQuit && process.exit(1);
   }
@@ -926,14 +906,6 @@ function adaptMpCgContent(fileContent, appName) {
       i--; // eslint-disable-line
     }
   } else {
-    if (appName && content.mpConfig && content.mpConfig[appName]) {
-      content = { ...content,
-        ...content.mpConfig[appName]
-      };
-      delete content.mpConfig;
-      delete content.isSubpackages;
-    }
-
     content = handleContent(appName, content);
   }
 
@@ -947,15 +919,15 @@ function adaptMpCgContent(fileContent, appName) {
  */
 
 
-function getModuleConfig(modules = [], appName, moduleConfigFilename) {
+function getModuleConfig$1(modules = [], appName, moduleConfigFilename) {
   const modulesConfig = {};
   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$a.existsSync(moduleConfigPath)) {
+      const content = fs$a.readFileSync(moduleConfigPath, 'utf-8');
       modulesConfig[moduleConfigPath] = adaptMpCgContent(content, appName);
     }
   });
@@ -976,14 +948,14 @@ const tmsModulesMergeLocalModuleCfg$3 = (modules, appName) => {
     path: relativePath,
     name: moduleName
   }, moduleIndex) => {
-    const moduleConfigPath = resolve$b(relativePath, MODULE_CONFIG_FILENAME);
+    const moduleConfigPath = resolve$c(relativePath, MODULE_CONFIG_FILENAME$1);
 
-    if (fs$9.existsSync(moduleConfigPath)) {
+    if (fs$a.existsSync(moduleConfigPath)) {
       try {
         let findModule = false;
-        let moduleConfigContent = fs$9.readFileSync(moduleConfigPath, 'utf-8');
+        let moduleConfigContent = fs$a.readFileSync(moduleConfigPath, 'utf-8');
         moduleConfigContent = adaptMpCgContent(moduleConfigContent, appName);
-        const moduleContentArr = isObject(moduleConfigContent) ? [moduleConfigContent] : moduleConfigContent;
+        const moduleContentArr = isObject$1(moduleConfigContent) ? [moduleConfigContent] : moduleConfigContent;
         moduleContentArr.forEach(({
           name
         }, moduleContentArrIndex) => {
@@ -996,11 +968,11 @@ const tmsModulesMergeLocalModuleCfg$3 = (modules, appName) => {
         });
 
         if (!findModule) {
-          fail$6(`启动模块${moduleName}在${moduleConfigPath}没有找到，请检查配置`);
+          fail$7(`启动模块${moduleName}在${moduleConfigPath}没有找到，请检查配置`);
           process.exit(1);
         }
       } catch (e) {
-        fail$6(`${moduleConfigPath}配置错误: ${e}`);
+        fail$7(`${moduleConfigPath}配置错误: ${e}`);
         newModules.push({ ...modules[moduleIndex]
         });
       }
@@ -1052,7 +1024,7 @@ const subModulesMergeDepModules$2 = (tmsConfig, modules) => {
 var tmsMpconfig = {
   readTmsConfig: readTmsConfig$1,
   readTmsPrivateCf: readTmsPrivateCf$1,
-  getModuleConfig,
+  getModuleConfig: getModuleConfig$1,
   checkModules: checkModules$1,
   tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$3,
   subModulesMergeDepModules: subModulesMergeDepModules$2
@@ -1084,236 +1056,224 @@ var global_1 = {
 };
 
 const {
-  fail: fail$5
+  fail: fail$6
 } = log$1;
 const {
   global: global$5
 } = global_1;
 
-function handleError$5(error) {
+function handleError$6(error) {
   const errMsg = typeof error === 'object' ? error.message : error;
   const isDev = global$5.getData('isDev');
 
   if (isDev) {
-    fail$5(errMsg);
+    fail$6(errMsg);
   } else {
-    fail$5(errMsg);
+    fail$6(errMsg);
     process.exit(1);
   }
 }
 
 var handleError_1 = {
-  handleError: handleError$5
+  handleError: handleError$6
 };
 
 /**
  * 生成编译后的app.json
  */
+/* eslint-disable no-param-reassign */
 
-(function (module) {
-  /* eslint-disable no-param-reassign */
-  const fs = require$$0__default$2;
-  const {
-    MODULE_CONFIG_FILENAME,
-    MODULE_CONFIG_INVALID_KEY
-  } = require$$4;
-  const {
-    getModuleConfig
-  } = tmsMpconfig;
-  const {
-    fail
-  } = log$1;
-  const {
-    resolve,
-    isObject
-  } = widgets;
-  const {
-    handleError
-  } = handleError_1;
-  const {
-    global
-  } = global_1;
-  /**
-   * 更新appJson里面的主包配置
-   * @param { object } appJson appJson信息
-   * @param { array } mainPackages 小程序主包信息
-   * @returns { object } appJson小程序主页配置信息
-   */
-
-  function updateMainPackages(appJson, mainPackages = []) {
-    let foundMainPackages = appJson.subpackages.filter(subpackage => mainPackages.includes(subpackage.name));
-
-    if (foundMainPackages.length === 0) {
-      // 没找到主包
-      foundMainPackages = [appJson.subpackages[0]];
-    } // 拼装 app.pages
-
+const fs$9 = require$$0__default$2;
+const {
+  MODULE_CONFIG_FILENAME
+} = require$$4;
+const {
+  getModuleConfig
+} = tmsMpconfig;
+const {
+  fail: fail$5
+} = log$1;
+const {
+  resolve: resolve$b,
+  isObject,
+  filterField: filterField$2
+} = widgets;
+const {
+  handleError: handleError$5
+} = handleError_1;
+const {
+  global: global$4
+} = global_1;
+/**
+ * 更新appJson里面的主包配置
+ * @param { object } appJson appJson信息
+ * @param { array } mainPackages 小程序主包信息
+ * @returns { object } appJson小程序主页配置信息
+ */
 
-    foundMainPackages.forEach(subpackage => {
-      if (!subpackage.pages || !subpackage.pages.length) {
-        fail(`主包 ${subpackage} 不能没有 pages`);
-        process.exit(-1);
-      }
+function updateMainPackages(appJson, mainPackages = []) {
+  let foundMainPackages = appJson.subpackages.filter(subpackage => mainPackages.includes(subpackage.name));
 
-      subpackage.pages.forEach(page => {
-        appJson.pages.push(`${subpackage.root}/${page}`);
-      });
+  if (foundMainPackages.length === 0) {
+    // 没找到主包
+    foundMainPackages = [appJson.subpackages[0]];
+  } // 拼装 app.pages
 
-      if (subpackage.plugins) {
-        Object.assign(appJson.plugins, subpackage.plugins);
-      }
-    }); // 去掉 subpackages 中的主包配置
 
-    const foundMainPackageNames = foundMainPackages.map(item => item.name);
-    appJson.subpackages = appJson.subpackages.filter(subpackage => !foundMainPackageNames.includes(subpackage.name));
-    return appJson;
-  }
-  /**
-   * 获取app.json内容
-   * @param {string} sourceAppJsonPath app.json存在的源码路径
-   * @returns
-   */
+  foundMainPackages.forEach(subpackage => {
+    if (!subpackage.pages || !subpackage.pages.length) {
+      fail$5(`主包 ${subpackage} 不能没有 pages`);
+      process.exit(-1);
+    }
 
+    subpackage.pages.forEach(page => {
+      appJson.pages.push(`${subpackage.root}/${page}`);
+    });
 
-  const getAppJsonContent = sourceAppJsonPath => {
-    if (!fs.existsSync(sourceAppJsonPath)) {
-      fail(`当前路径 ${sourceAppJsonPath} 没找到app.json`);
-      process.exit(1);
+    if (subpackage.plugins) {
+      Object.assign(appJson.plugins, subpackage.plugins);
     }
+  }); // 去掉 subpackages 中的主包配置
 
-    const appJson = JSON.parse(fs.readFileSync(sourceAppJsonPath), 'utf-8'); // 加入默认值
+  const foundMainPackageNames = foundMainPackages.map(item => item.name);
+  appJson.subpackages = appJson.subpackages.filter(subpackage => !foundMainPackageNames.includes(subpackage.name));
+  return appJson;
+}
+/**
+ * 获取app.json内容
+ * @param {string} sourceAppJsonPath app.json存在的源码路径
+ * @returns
+ */
 
-    appJson.subpackages = [];
-    appJson.pages = []; // appJson.plugins = {};
 
-    delete appJson.entranceDeclare;
-    return appJson;
-  };
-  /**
-   * 更新app.json中的subpackages
-   * @param {Object} appJson
-   * @param {Object} modulesConfigs
-   */
+const getAppJsonContent = sourceAppJsonPath => {
+  if (!fs$9.existsSync(sourceAppJsonPath)) {
+    fail$5(`当前路径 ${sourceAppJsonPath} 没找到app.json`);
+    process.exit(1);
+  }
 
+  const appJson = JSON.parse(fs$9.readFileSync(sourceAppJsonPath), 'utf-8'); // 加入默认值
 
-  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 = [];
+  appJson.pages = [];
+  return appJson;
+};
+/**
+ * 更新app.json中的subpackages
+ * @param {Object} appJson
+ * @param {Object} modulesConfigs
+ */
 
-    appJson.subpackages.sort((item1, item2) => item1.name.localeCompare(item2.name));
-  };
-  /**
-   * 处理合并subpackages后的appjson, 整理重复不合法的地方
-   * @param {Object} appJson appjson
-   */
 
+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);
+  }
 
-  const fixAppJson = appJson => {
-    const {
-      subpackages
-    } = appJson;
-    const pluginsMap = {};
-    Object.keys(appJson.plugins || {}).forEach(key => pluginsMap[key] = ['app.json']);
-    const subps = subpackages.map(subp => {
-      const invalidKeys = [];
-      Object.keys(subp).forEach(key => {
-        if (key === 'dependencies') {
-          // eslint-disable-next-line
-          delete subp.dependencies;
-          return;
-        }
+  appJson.subpackages.sort((item1, item2) => item1.name.localeCompare(item2.name));
+};
+/**
+ * 处理合并subpackages后的appjson, 整理重复不合法的地方
+ * @param {Object} appJson appjson
+ */
 
-        if (key === 'plugins') {
-          Object.keys(subp.plugins).forEach(pk => {
-            pluginsMap[pk] ? pluginsMap[pk].push(`分包${subp.name}`) : pluginsMap[pk] = [`分包${subp.name}`];
-          });
-          return;
-        }
 
-        if (MODULE_CONFIG_INVALID_KEY.indexOf(key) > -1) {
-          // 如果分包配置中有不支持的key，则错误提醒
-          invalidKeys.push(key);
-          return;
-        }
+const fixAppJson = appJson => {
+  const {
+    subpackages
+  } = appJson;
+  const pluginsMap = {};
+  Object.keys(appJson.plugins || {}).forEach(key => pluginsMap[key] = ['app.json']);
+  const subps = subpackages.map(subp => {
+    const arrOfFileType = ['requiredBackgroundModes', 'embeddedAppIdList'];
+    const objOfFileType = ['preloadRule'];
+    Object.keys(subp).forEach(key => {
+      if (key === 'plugins') {
+        Object.keys(subp.plugins).forEach(pk => {
+          pluginsMap[pk] ? pluginsMap[pk].push(`分包${subp.name}`) : pluginsMap[pk] = [`分包${subp.name}`];
+        });
+      } // 分包里数组类型字段，提到appjson最上层
 
-        if (['requiredBackgroundModes', 'embeddedAppIdList'].indexOf(key) > -1) {
-          // 提到appjson最上层处理
-          const preVal = appJson[key];
-          preVal ? appJson[key] = Array.from(new Set(preVal.slice(0).concat(subp[key]))) : appJson[key] = subp[key].slice(0);
-          return;
-        }
-      });
 
-      if (invalidKeys.length) {
-        fail(`不支持分包${subp === null || subp === void 0 ? void 0 : subp.name}配置${invalidKeys.join(',')}\n`);
-      }
+      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最上层
 
-      invalidKeys.concat(['requiredBackgroundModes', 'embeddedAppIdList']).forEach(k => delete subp[k]);
-      return subp;
-    }); // 如果plugins重复，则错误提示
 
-    const pluginsErrMsg = Object.keys(pluginsMap).map(pk => {
-      if (pluginsMap[pk].length > 1) {
-        return `${pluginsMap[pk].join(',')}重复配置plugin(${pk});`;
+      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;
       }
+    });
+    return filterField$2(subp, [...arrOfFileType, ...objOfFileType, 'dependencies']);
+  }); // 如果plugins重复，则错误提示
 
-      return '';
-    }).reduce((pre, cur) => pre + cur, '');
-
-    if (pluginsErrMsg) {
-      fail(`plugins配置出现错误:${pluginsErrMsg}`);
+  const pluginsErrMsg = Object.keys(pluginsMap).map(pk => {
+    if (pluginsMap[pk].length > 1) {
+      return `${pluginsMap[pk].join(',')}重复配置plugin(${pk});`;
     }
 
-    appJson.subpackages = subps;
-  };
-  /**
-   * 动态生成编译后的app.json
-   * @param {object} tmsConfig
-   * @param {array} modules 用户要编译的模块列表
-   * @returns
-   */
+    return '';
+  }).reduce((pre, cur) => pre + cur, '');
 
+  if (pluginsErrMsg) {
+    throw new Error(`plugins配置出现错误:${pluginsErrMsg}`);
+  }
 
-  function buildOutputAppJson(tmsConfig, modules) {
-    try {
-      var _tmsConfig$hooks;
+  appJson.subpackages = subps;
+};
+/**
+ * 动态生成编译后的app.json
+ * @param {object} tmsConfig
+ * @param {array} modules 用户要编译的模块列表
+ * @returns
+ */
 
-      // 获取当前 modules 下的所有子模块的配置内容
-      const modulesConfigs = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME); // 获取app.json的配置
 
-      const appJson = getAppJsonContent(resolve('./app.json')); // 更新app.json中的subpackages
+function buildOutputAppJson$1(tmsConfig, modules) {
+  try {
+    var _tmsConfig$hooks;
 
-      updateSubpackages(appJson, modulesConfigs); // 处理appJson中重复||冲突的地方
+    // 获取当前 modules 下的所有子模块的配置内容
+    const modulesConfigs = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME); // 获取app.json的配置
 
-      fixAppJson(appJson); // 更新主包，需在subpackages处理完成后执行， pages/
+    const appJson = getAppJsonContent(resolve$b('./app.json')); // 更新app.json中的subpackages
 
-      updateMainPackages(appJson, tmsConfig.mainPackages);
-      fs.writeFileSync(resolve(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+    updateSubpackages(appJson, modulesConfigs); // 处理appJson中重复||冲突的地方
 
-      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;
+    fixAppJson(appJson); // 更新主包，需在subpackages处理完成后执行， pages/
 
-        tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$hooks2 = tmsConfig.hooks) === null || _tmsConfig$hooks2 === void 0 ? void 0 : _tmsConfig$hooks2.updateAppJson({
-          tmsConfig,
-          module,
-          appJson,
-          isDev: global.getData('isDev')
-        });
-      }
+    updateMainPackages(appJson, tmsConfig.mainPackages);
+    fs$9.writeFileSync(resolve$b(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
 
-      return appJson;
-    } catch (e) {
-      handleError(`生成app.json出现错误: ${e}`);
+    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']),
+        modules,
+        appJson,
+        isDev: global$4.getData('isDev')
+      });
     }
+
+    return appJson;
+  } catch (e) {
+    handleError$5(`生成app.json出现错误: ${e}`);
   }
+}
 
-  module.exports = {
-    buildOutputAppJson
-  };
-})(buildAppJson);
+var buildAppJson = {
+  buildOutputAppJson: buildOutputAppJson$1
+};
 
 /**
  * 下载第三方代码
@@ -1335,7 +1295,7 @@ const {
   handleError: handleError$4
 } = handleError_1;
 const {
-  global: global$4
+  global: global$3
 } = global_1;
 /**
  * 处理用户没有clone git仓库权限问题,拼接tms.private.config.js的账号信息
@@ -1345,15 +1305,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)) {
@@ -1892,9 +1852,6 @@ const {
 const {
   mpNpmInstallAll
 } = npm;
-const {
-  global: global$3
-} = global_1;
 const {
   fail: fail$3
 } = log$1;
@@ -1914,13 +1871,12 @@ async function install$2(tmsConfig, modules) {
     if (fs$6.existsSync(modulePackagePath)) shelljs$4.cp('-Rf', modulePackagePath, outputModuleDir);
   }); // 小程序npm install
 
-  await createTask$1(mpNpmInstallAll, '小程序 开始npm install', '小程序npm install 完成')(modules, resolve$9(tmsConfig.outputDir), `${CACHE_DIR$1}/node_modules`);
-  const tmsPrivateCf = global$3.getData('tmsPrivateCf'); // 构建miniprogram_npm
+  await createTask$1(mpNpmInstallAll, '小程序 开始npm install', '小程序npm install 完成')(modules, resolve$9(tmsConfig.outputDir), `${CACHE_DIR$1}/node_modules`); // 构建miniprogram_npm
 
   await createTask$1(buildMpNpm, '开始构建miniprogram_npm', '构建miniprogram_npm 完成')({
     appId: tmsConfig.appId,
     projectPath: resolve$9('./'),
-    privateKey: tmsPrivateCf.privateKey
+    privateKey: tmsConfig.privateKey
   });
 }
 
@@ -2027,7 +1983,7 @@ const {
 } = widgets;
 const {
   buildOutputAppJson
-} = buildAppJson.exports;
+} = buildAppJson;
 const {
   MODULE_CODE_DIR,
   DEFAULT_COPY_CONFIG
@@ -3088,11 +3044,12 @@ var watch_1 = function (globValue, watchOptions, callback, module) {
   } = require$$0__default$a;
   const {
     resolve,
-    mergeMap
+    mergeMap,
+    filterField
   } = widgets;
   const {
     buildOutputAppJson
-  } = buildAppJson.exports;
+  } = buildAppJson;
   const {
     DEFAULT_COPY_CONFIG
   } = require$$4;
@@ -3275,7 +3232,7 @@ 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
         }));
       }
@@ -3299,7 +3256,8 @@ var watch_1 = function (globValue, watchOptions, callback, module) {
 const shelljs$1 = require$$0__default$3;
 const compileDev = dev$3.exports;
 const {
-  resolve: resolve$2
+  resolve: resolve$2,
+  filterField: filterField$1
 } = widgets;
 const init$4 = init_1;
 const {
@@ -3316,7 +3274,7 @@ 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) {
@@ -3352,7 +3310,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
     }));
   }
@@ -3370,7 +3328,8 @@ var build$2 = async (tmsConfig, newModules) => {
 
 const shelljs = require$$0__default$3;
 const {
-  resolve: resolve$1
+  resolve: resolve$1,
+  filterField
 } = widgets;
 const init$3 = init_1;
 const compileBuild = build$2;
@@ -3389,7 +3348,7 @@ async function build$1(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: false,
-      tmsConfig,
+      tmsConfig: filterField(tmsConfig, ['gitAccount']),
       modules: newModules
     }));
   }
@@ -3463,6 +3422,8 @@ var cloud$1 = async tmsConfig => {
   }
 };
 
+/* eslint-disable no-param-reassign */
+const loadash = require$$0__default$6;
 const init$2 = init_1;
 const dev = dev_1;
 const build = build_1;
@@ -3495,40 +3456,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);
+};
 
-    if (modulePrivateCfg.blockRemote === true) {
-      return moduleAll.filter(module => module.repoInfo === undefined).map(item => item.name);
-    }
-  }
+const mergeConfig = (tmsConfig, tmsPrivateCf) => {
+  const modules = {};
 
-  return moduleAll.map(item => item.name);
+  if (Array.isArray(tmsConfig.modules)) {
+    modules.all = tmsConfig.modules;
+    tmsConfig.modules = modules;
+  } // 合并默认值
+
+
+  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分包进行编译；
@@ -3538,7 +3519,6 @@ async function run(commandName, cmd) {
   global.setData({
     env,
     cmd,
-    tmsPrivateCf,
     tmsConfig
   });
 
@@ -3627,7 +3607,7 @@ var entry = [{
 
 var require$$7 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.17",
+	version: "0.0.18",
 	description: "tmskit",
 	main: "dist/index.cjs",
 	bin: {