@tmsfe/tmskit 0.0.5-beta.4 → 0.0.6

package/dist/index.cjs.js

@@ -3,18 +3,20 @@
 var require$$0 = require('commander');
 var require$$1 = require('leven');
 var require$$2 = require('ora');
-var require$$1$1 = require('path');
+var require$$3$1 = require('path');
 var require$$0$1 = require('fs');
-var require$$5 = require('shelljs');
+var require$$4 = require('shelljs');
 var require$$6$1 = require('download-git-repo');
 var require$$0$2 = require('chalk');
 var require$$0$3 = require('async');
-var require$$1$2 = require('ejs');
-var require$$1$3 = require('inquirer');
+var require$$1$1 = require('ejs');
+var require$$1$2 = require('inquirer');
 var require$$0$4 = require('metalsmith');
 var require$$0$5 = require('lodash');
 var require$$0$6 = require('miniprogram-ci');
-var require$$3$1 = require('glob-ignore');
+var require$$5 = require('glob-ignore');
+var require$$1$3 = require('fs-extra');
+var require$$2$1 = require('crypto');
 var require$$0$7 = require('through2');
 var require$$0$8 = require('strip-comments');
 var require$$1$4 = require('precinct');
@@ -22,10 +24,8 @@ var require$$1$5 = require('htmlparser2');
 var require$$0$9 = require('postcss');
 var require$$0$a = require('gulp');
 var require$$1$6 = require('gulp-px-to-rpx');
-var require$$2$1 = require('gulp-postcss');
+var require$$2$2 = require('gulp-postcss');
 var require$$3$2 = require('gulp-watch');
-var require$$4 = require('gulp-cache');
-var require$$5$1 = require('gulp-image');
 var require$$1$7 = require('semver');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
@@ -33,18 +33,20 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
-var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
+var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3$1);
 var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
-var require$$5__default = /*#__PURE__*/_interopDefaultLegacy(require$$5);
+var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
 var require$$6__default = /*#__PURE__*/_interopDefaultLegacy(require$$6$1);
 var require$$0__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$0$2);
 var require$$0__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$0$3);
+var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
-var require$$1__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$1$3);
 var require$$0__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$0$4);
 var require$$0__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$0$5);
 var require$$0__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$0$6);
-var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3$1);
+var require$$5__default = /*#__PURE__*/_interopDefaultLegacy(require$$5);
+var require$$1__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$1$3);
+var require$$2__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$2$1);
 var require$$0__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$0$7);
 var require$$0__default$8 = /*#__PURE__*/_interopDefaultLegacy(require$$0$8);
 var require$$1__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$1$4);
@@ -52,10 +54,8 @@ var require$$1__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$1$5);
 var require$$0__default$9 = /*#__PURE__*/_interopDefaultLegacy(require$$0$9);
 var require$$0__default$a = /*#__PURE__*/_interopDefaultLegacy(require$$0$a);
 var require$$1__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$1$6);
-var require$$2__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$2$1);
+var require$$2__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$2$2);
 var require$$3__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$3$2);
-var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
-var require$$5__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$5$1);
 var require$$1__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$1$7);
 
 function getAugmentedNamespace(n) {
@@ -78,19 +78,19 @@ var src$2 = {};
 const program$1 = require$$0__default;
 const leven = require$$1__default;
 const ora = require$$2__default;
-const path$a = require$$1__default$1;
+const path$b = require$$3__default;
 const fs$e = require$$0__default$1;
-const shelljs$6 = require$$5__default;
+const shelljs$6 = require$$4__default;
 const download = require$$6__default;
 const chalk$3 = require$$0__default$2;
-const shelljsOptons = {
+const shelljsOptions = {
   slient: true
 }; // 获取当前目录
 
 const cwd = process.cwd();
 
 function resolve$d(...args) {
-  return path$a.resolve(cwd, ...args);
+  return path$b.resolve(cwd, ...args);
 }
 /**
  * 封装logs
@@ -189,15 +189,20 @@ function downloadRepo(dest, downloadOptions = {
 
 function downloadRepoForGit$2(url, dest, branch) {
   const cwd = process.cwd();
-  return new Promise(resolve => {
+  return new Promise((resolve, reject) => {
     // 如果目标目录不存在
     if (fs$e.existsSync(dest)) {
-      shelljs$6.rm('-rf', path$a.join(dest));
+      shelljs$6.rm('-rf', path$b.join(dest));
     }
 
     shelljs$6.mkdir('-p', dest);
     shelljs$6.cd(dest);
-    shelljs$6.exec(`git clone ${url} ${dest} --branch ${branch} --depth 1`, shelljsOptons);
+    const gitCloneRes = shelljs$6.exec(`git clone ${url} ${dest} --branch ${branch} --depth 1`, shelljsOptions);
+
+    if (gitCloneRes.code !== 0) {
+      reject(gitCloneRes.stderr);
+    }
+
     shelljs$6.cd(cwd);
     resolve();
   });
@@ -222,21 +227,12 @@ const cost = start => Date.now() - start;
 function createTask$4(task, startText, endText) {
   return async (...args) => {
     const start = Date.now();
-    let result;
     const spinner = ora(startText);
     spinner.start();
-
-    try {
-      result = await task(...args);
-    } catch (e) {
-      result = e;
-      console.log(chalk$3.red(e));
-      process.exit(-1);
-    } finally {
-      endText && spinner.succeed(`${endText}, ${cost(start)}ms`);
-      spinner.stop();
-    }
-
+    console.log('\n');
+    const result = await task(...args);
+    endText && spinner.succeed(`${endText}, ${cost(start)}ms`);
+    spinner.stop();
     return result;
   };
 }
@@ -260,35 +256,35 @@ var widgets = {
   camelize
 };
 
-const path$9 = require('path'); // 用户目录
+const path$a = require('path'); // 用户目录
 
 
 const HOME_DIR = process.env.HOME; // 所有文件的缓存目录
 
-const CACHE_DIR$1 = path$9.resolve(HOME_DIR, '.tmskit'); // 脚手架模板代码所在目录
+const CACHE_DIR$1 = path$a.resolve(HOME_DIR, '.tmskit'); // 脚手架模板代码所在目录
 
-const TEMPLATE_DIR$1 = path$9.resolve(CACHE_DIR$1, 'template'); // 第三方模块源码存放的临时缓存目录
+const TEMPLATE_DIR$1 = path$a.resolve(CACHE_DIR$1, 'template'); // 第三方模块源码存放的临时缓存目录
 
-const MODULE_CODE_DIR$1 = path$9.resolve(CACHE_DIR$1, 'modules_code'); // 脚手架模板代码的具体路径
+const MODULE_CODE_DIR$1 = path$a.resolve(CACHE_DIR$1, 'modules_code'); // 脚手架模板代码的具体路径
 
-const TEMPLATE_PATH$1 = path$9.resolve(TEMPLATE_DIR$1, 'tools/tms-cli-template'); // 脚手架的名称
+const TEMPLATE_PATH$1 = path$a.resolve(TEMPLATE_DIR$1, 'tools/tms-cli-template'); // 脚手架的名称
 
 const TMS_NAME$2 = 'tmskit'; // 脚手架的配置名称
 
-const TMS_CONFIG_FILENAME$1 = 'tms.config.js'; // 模块代码的默认在modules子目录
+const TMS_CONFIG_FILENAME$1 = 'tms.config.js';
+const TMS_PRIVATE_FILENAME$1 = 'tms.private.config.js'; // 模块代码的默认在modules子目录
 
-const DEFAULT_MODULE_DIR$4 = 'modules'; // 模块的配置文件的名称
+const DEFAULT_MODULE_DIR = 'modules'; // 模块的配置文件的名称
 
-const MODULE_CONFIG_FILENAME$2 = 'module.config.json'; // 默认的webpack entry
+const MODULE_CONFIG_FILENAME$3 = 'module.config.json'; // 默认的webpack entry
 
 const DEFAULT_WEBPACK_ENTRY = {
-  app: path$9.resolve(process.cwd(), 'app')
+  app: path$a.resolve(process.cwd(), 'app')
 }; // 默认从源码拷贝到编译后的配置
 
 const DEFAULT_COPY_CONFIG$1 = ['package.json', 'sitemap.json']; // 开发模式
 
 const MODE$1 = {
-  main: 'tkitmain',
   all: 'all',
   multi: 'multi'
 };
@@ -307,8 +303,9 @@ var constant = /*#__PURE__*/Object.freeze({
 	TEMPLATE_PATH: TEMPLATE_PATH$1,
 	TMS_NAME: TMS_NAME$2,
 	TMS_CONFIG_FILENAME: TMS_CONFIG_FILENAME$1,
-	DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR$4,
-	MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$2,
+	TMS_PRIVATE_FILENAME: TMS_PRIVATE_FILENAME$1,
+	DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR,
+	MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$3,
 	DEFAULT_WEBPACK_ENTRY: DEFAULT_WEBPACK_ENTRY,
 	DEFAULT_COPY_CONFIG: DEFAULT_COPY_CONFIG$1,
 	MODULE_CODE_DIR: MODULE_CODE_DIR$1,
@@ -321,7 +318,7 @@ var constant = /*#__PURE__*/Object.freeze({
 var require$$3 = /*@__PURE__*/getAugmentedNamespace(constant);
 
 const fs$d = require$$0__default$1;
-const path$8 = require$$1__default$1;
+const path$9 = require$$3__default;
 /**
  * 判断目录是否为空
  * @param {string} dirname 目录名
@@ -359,7 +356,7 @@ const copyFile = function (src, dest) {
     fs$d.unlinkSync(dest);
   }
 
-  const dir = dest.substr(0, dest.lastIndexOf('/'));
+  const dir = path$9.dirname(dest);
   ensureDirExist(dir);
   fs$d.copyFileSync(src, dest);
 }; // 判断文件内容是否一致，不一致再进行拷贝
@@ -419,7 +416,7 @@ const fileInDir$3 = (dir, file) => {
     return false;
   }
 
-  const relativePath = path$8.relative(dir, file);
+  const relativePath = path$9.relative(dir, file);
 
   if (relativePath.startsWith('..')) {
     return false;
@@ -490,7 +487,7 @@ var log$2 = {
 };
 
 const async = require$$0__default$3;
-const ejs = require$$1__default$2;
+const ejs = require$$1__default$1;
 
 const render$1 = (files, metalsmith, next) => {
   const keys = Object.keys(files);
@@ -510,7 +507,7 @@ const render$1 = (files, metalsmith, next) => {
 var render_1 = render$1;
 
 const fs$c = require$$0__default$1;
-const inquirer = require$$1__default$3;
+const inquirer = require$$1__default$2;
 const {
   resolve: resolve$c
 } = widgets;
@@ -606,9 +603,9 @@ const generator$1 = (buildDir, distDir, preMetadata) => new Promise((resolve, re
 
 var generator_1 = generator$1;
 
-const path$7 = require$$1__default$1;
+const path$8 = require$$3__default;
 const fs$b = require$$0__default$1;
-const shelljs$5 = require$$5__default;
+const shelljs$5 = require$$4__default;
 const {
   TEMPLATE_DIR,
   TEMPLATE_PATH,
@@ -651,7 +648,7 @@ async function createAppDir(targetDir) {
 
 async function create(appName) {
   const cwd = process.cwd();
-  const targetDir = path$7.resolve(cwd, appName);
+  const targetDir = path$8.resolve(cwd, appName);
   const appType = 'mp';
   await createAppDir(targetDir); // 创建缓存目录
 
@@ -659,7 +656,7 @@ async function create(appName) {
 
   await createTask$3(downloadRepoForGit$1, '拉取模板仓库', '拉取模板仓库完成')('https://git.woa.com/tmsfe/tms-frontend.git', TEMPLATE_DIR, 'master'); // 生成模板(1. 询问问题， 2. ejs生成模板  3.生成到目标目录)
 
-  generator(path$7.join(TEMPLATE_PATH, appType), targetDir, {
+  generator(path$8.join(TEMPLATE_PATH, appType), targetDir, {
     appName,
     appType
   }).then(() => {
@@ -689,39 +686,55 @@ async function create(appName) {
 
 var create_1 = create;
 
+const {
+  fail: fail$8
+} = log$2;
+
+function handleError$3(error, isDev = false) {
+  const errMsg = typeof error === 'object' ? error.message : error;
+
+  if (isDev) {
+    fail$8(errMsg);
+  } else {
+    fail$8(errMsg);
+    process.exit(1);
+  }
+}
+
+var handleError_1 = {
+  handleError: handleError$3
+};
+
 const fs$a = require$$0__default$1;
 const {
-  DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR$3,
-  MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1,
+  MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$2,
   MODULE_CONFIG_INVALID_KEY
 } = require$$3;
 const {
-  fail: fail$8
+  fail: fail$7
 } = log$2;
 const {
   resolve: resolve$a,
   isObject: isObject$1,
   isArray
 } = widgets;
+const {
+  handleError: handleError$2
+} = handleError_1;
 /**
  * 获取每个模块下面的信息，并且收集，后续更新到appJson里面
  * @param { object } file 操作目录下面所有的文件
  * @param { string } appName 小程序的名称
  */
 
-function setModuleConfig$1(file, appName, moduleDir) {
+function setModuleConfig$1(file, appName) {
   const content = file.contents ? JSON.parse(file.contents.toString()) : JSON.parse(file);
 
-  if (isObject$1(content)) {
-    content.root = content.root.indexOf(moduleDir) > -1 ? content.root : `${moduleDir}/${content.root}`;
-  }
-
   if (isArray(content)) {
     let i = content.length - 1;
 
     while (i >= 0) {
       let current = content[i];
-      current.root = current.root.indexOf(moduleDir) > -1 ? current.root : `${moduleDir}/${current.root}`;
 
       if (appName && current.mpConfig && current.mpConfig[appName]) {
         current = { ...current,
@@ -743,7 +756,7 @@ function setModuleConfig$1(file, appName, moduleDir) {
  */
 
 
-function getLocalModuleConfig(modules = [], appName, moduleDir, moduleConfigFilename) {
+function getLocalModuleConfig(modules = [], appName, moduleConfigFilename) {
   const modulesConfig = {};
   modules.forEach(({
     path
@@ -752,7 +765,7 @@ function getLocalModuleConfig(modules = [], appName, moduleDir, moduleConfigFile
 
     if (fs$a.existsSync(moduleConfigPath)) {
       const content = fs$a.readFileSync(moduleConfigPath, 'utf-8');
-      modulesConfig[moduleConfigPath] = setModuleConfig$1(content, appName, moduleDir);
+      modulesConfig[moduleConfigPath] = setModuleConfig$1(content, appName);
     }
   });
   return modulesConfig;
@@ -776,7 +789,7 @@ function updateMainPackages(appJson, mainPackages = []) {
 
   foundMainPackages.forEach(subpackage => {
     if (!subpackage.pages || !subpackage.pages.length) {
-      fail$8(`主包 ${subpackage} 不能没有 pages`);
+      fail$7(`主包 ${subpackage} 不能没有 pages`);
       process.exit(-1);
     }
 
@@ -803,7 +816,7 @@ function updateMainPackages(appJson, mainPackages = []) {
 
 const getAppJsonContent = sourceAppJsonPath => {
   if (!fs$a.existsSync(sourceAppJsonPath)) {
-    fail$8(`当前路径 ${sourceAppJsonPath} 没找到app.json`);
+    fail$7(`当前路径 ${sourceAppJsonPath} 没找到app.json`);
     process.exit(1);
   }
 
@@ -825,11 +838,25 @@ const getAppJsonContent = sourceAppJsonPath => {
 const updateSubpackages = (appJson, modulesConfig) => {
   // eslint-disable-next-line
   for (const name in modulesConfig) {
-    const moduleInfo = isObject$1(modulesConfig[name]) ? [modulesConfig[name]] : modulesConfig[name]; // eslint-disable-next-line
+    const moduleInfo = isObject$1(modulesConfig[name]) ? [modulesConfig[name]] : modulesConfig[name]; // 过滤 pages 为空的情况
+
+    const validModules = getValidModules$1(moduleInfo); // eslint-disable-next-line
 
-    appJson.subpackages = appJson.subpackages.concat(moduleInfo);
+    appJson.subpackages = appJson.subpackages.concat(validModules);
   }
 };
+/**
+ * 过滤页面为空的分包
+ * @param {Array} moduleCfg 模块配置内容
+ * @returns pages不为空的分包
+ */
+
+
+const getValidModules$1 = moduleCfg => {
+  // 过滤 pages 为空的情况
+  const validModules = moduleCfg.filter(item => item.pages.length > 0);
+  return validModules;
+};
 /**
  * 处理合并subpackages后的appjson, 整理重复不合法的地方
  * @param {Object} appJson appjson
@@ -845,6 +872,12 @@ const processAppJson = appJson => {
   const subps = subpackages.map(subp => {
     const invalidKeys = [];
     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}`];
@@ -869,7 +902,7 @@ const processAppJson = appJson => {
     });
 
     if (invalidKeys.length) {
-      fail$8(`不支持分包${subp === null || subp === void 0 ? void 0 : subp.name}配置${invalidKeys.join(',')}\n`);
+      fail$7(`不支持分包${subp === null || subp === void 0 ? void 0 : subp.name}配置${invalidKeys.join(',')}\n`);
     } // eslint-disable-next-line
 
 
@@ -886,7 +919,7 @@ const processAppJson = appJson => {
   }).reduce((pre, cur) => pre + cur, '');
 
   if (pluginsErrMsg) {
-    fail$8(pluginsErrMsg);
+    fail$7(`plugins配置出现错误:${pluginsErrMsg}`);
   } // eslint-disable-next-line
 
 
@@ -900,23 +933,28 @@ const processAppJson = appJson => {
  */
 
 
-function buildOutputAppJson$1(tmsConfig, modules) {
-  // 获取当前 modules 下的所有子模块的配置内容
-  const modulesConfig = getLocalModuleConfig(modules, tmsConfig.appName, DEFAULT_MODULE_DIR$3, MODULE_CONFIG_FILENAME$1); // 获取app.json的配置
+function buildOutputAppJson$1(tmsConfig, modules, isDev) {
+  try {
+    // 获取当前 modules 下的所有子模块的配置内容
+    const modulesConfig = getLocalModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME$2); // 获取app.json的配置
 
-  const appJson = getAppJsonContent(resolve$a('./app.json')); // 更新app.json中的subpackages
+    const appJson = getAppJsonContent(resolve$a('./app.json')); // 更新app.json中的subpackages
 
-  updateSubpackages(appJson, modulesConfig); // 处理appJson中重复||冲突的地方
+    updateSubpackages(appJson, modulesConfig); // 处理appJson中重复||冲突的地方
 
-  processAppJson(appJson); // 更新主包，需在subpackages处理完成后执行， pages/
+    processAppJson(appJson); // 更新主包，需在subpackages处理完成后执行， pages/
 
-  updateMainPackages(appJson, tmsConfig.mainPackages);
-  fs$a.writeFileSync(resolve$a(`${tmsConfig.gulp.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
-  return appJson;
+    updateMainPackages(appJson, tmsConfig.mainPackages);
+    fs$a.writeFileSync(resolve$a(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+    return appJson;
+  } catch (e) {
+    handleError$2(`生成app.json出现错误: ${e}`, isDev);
+  }
 }
 
 var buildAppJson = {
   setModuleConfig: setModuleConfig$1,
+  getValidModules: getValidModules$1,
   buildOutputAppJson: buildOutputAppJson$1
 };
 
@@ -955,156 +993,55 @@ var global = {
   getGlobalInstance: getGlobalInstance$1
 };
 
-const MetalSmith = require$$0__default$4;
-const {
-  getGlobalInstance
-} = global;
-const {
-  downloadRepoForGit,
-  resolve: resolve$9
-} = widgets;
-const {
-  fail: fail$7
-} = log$2;
-const fs$9 = require$$0__default$1;
-const shelljs$4 = require$$5__default;
-/**
- * 对克隆下来的模块进行相应的文件处理操作，比如收集处理模块信息，进行信息缓存等操作
- * @param { string } sourceDir 缓存文件夹
- * @param { string } targetDir 目标文件夹
- * @param { arrary } ignore
- * @returns { undefined } no return
- */
-
-function moveFile(sourceDir, targetDir, ignore = []) {
-  // 删除不是文件夹的文件
-  return new Promise(resolve => {
-    MetalSmith(__dirname).ignore(ignore).source(sourceDir).destination(targetDir).build(e => {
-      if (e) {
-        fail$7(e); // eslint-disable-line
-
-        console.log('MetalSmith 详细的错误信息:', e);
-      }
-
-      resolve();
-    });
-  });
-}
-/**
- * 下载目标模块
- * @param { string } sourceDir 缓存文件夹
- * @param { string } targetDir 目标文件夹
- * @returns { array } modules 描述模块的列表
- */
-
-
-async function cloneModules$1(sourceDir, targetDir, modules) {
-  // 根据小程序的配置文件下载模块， 并且处理信息
-  for (const moduleInfo of modules) {
-    // eslint-disable-line
-    if (moduleInfo.repoInfo) {
-      await downLoadAndMoveModule(sourceDir, targetDir, moduleInfo);
-    }
-  }
-}
-/**
- * 下载模块信息并且将它移动到对应的位置
- * @param { string } sourceDir 代码缓存文件夹
- * @param { string } targetDir 代码要放到的目标文件夹
- * @returns { array } moduleInfo 描述模块的信息
- */
-
-
-async function downLoadAndMoveModule(sourceDir, targetDir, moduleInfo) {
-  const {
-    repoInfo: {
-      buildGitTag,
-      httpRepoUrl
-    },
-    path
-  } = moduleInfo; // 源码临时存在的源目录
-
-  let sourcePath = resolve$9(sourceDir, path); // 源码要放到目标目录
-
-  const targetPath = resolve$9(targetDir, path); // 设置模块的构建分支
-
-  const cloneBranch = buildGitTag && typeof buildGitTag === 'string' ? buildGitTag : 'master'; // 检查缓存中有没有
-
-  const globalInstance = getGlobalInstance();
-  const moduleInCache = globalInstance.getModuleCache(httpRepoUrl, cloneBranch);
-
-  try {
-    if (!moduleInCache) {
-      await downloadRepoForGit(httpRepoUrl, sourcePath, cloneBranch);
-      globalInstance.setModuleCache(httpRepoUrl, cloneBranch, sourcePath);
-    } else {
-      sourcePath = globalInstance.getModuleCache(httpRepoUrl, cloneBranch).dest;
-    }
-
-    if (fs$9.existsSync(targetPath)) {
-      shelljs$4.rm('-rf', targetPath);
-    }
-
-    await moveFile(sourcePath, targetPath, ['node_modules', '.git']);
-  } catch (e) {
-    fail$7(`downLoadAndMoveModule ${e}`); // eslint-disable-line
-
-    process.exit(-1);
-  }
-}
-
-var cloneModules_1 = {
-  cloneModules: cloneModules$1
-};
-
 var defaultTmsConfig$1 = {
   // 全局的环境配置项
   envData: {},
   // 模块配置信息
   modules: [],
   cloudDir: 'cloud',
-  gulp: {
-    // 第三方依赖代码需要拷贝到本项目的
-    dependencies: {},
+  // 第三方依赖代码需要拷贝到本项目的
+  dependencies: {},
 
-    /** 编译输出文件夹位置 */
-    outputDir: 'dist',
+  /** 编译输出文件夹位置 */
+  outputDir: 'dist',
 
-    /** 源码监听路径 */
-    sourceDir: './',
+  /** 源码监听路径 */
+  sourceDir: './',
 
-    /** 静态资源目录 */
-    static: []
-  }
+  /** 静态资源目录 */
+  static: []
 };
 
 const loadash = require$$0__default$5;
-const fs$8 = require$$0__default$1;
+const fs$9 = require$$0__default$1;
 const {
   TMS_NAME: TMS_NAME$1,
   TMS_CONFIG_FILENAME,
-  MODULE_CONFIG_FILENAME
+  MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1,
+  TMS_PRIVATE_FILENAME
 } = require$$3;
 const {
-  resolve: resolve$8,
+  resolve: resolve$9,
   isObject
 } = widgets;
 const {
-  setModuleConfig
+  setModuleConfig,
+  getValidModules
 } = buildAppJson;
 const defaultTmsConfig = defaultTmsConfig$1;
 const {
   fail: fail$6
 } = log$2;
+const path$7 = require$$3__default;
 /**
- * 读取tms.config.json
+ * 读取tms.config.js
  * @param env {string} 环境变量
  */
 
 const readTmsConfig$1 = function (env) {
-  const tmsConfigPath = resolve$8(TMS_CONFIG_FILENAME);
+  const tmsConfigPath = resolve$9(TMS_CONFIG_FILENAME);
 
-  if (!fs$8.existsSync(tmsConfigPath)) {
+  if (!fs$9.existsSync(tmsConfigPath)) {
     fail$6('当前执行目录没有tms.config.js的配置项，请进行配置');
     process.exit(1);
   }
@@ -1115,8 +1052,50 @@ const readTmsConfig$1 = function (env) {
     env
   }); // 合并默认值
 
-  loadash.mergeWith(tmsConfig, defaultTmsConfig);
+  loadash.mergeWith(tmsConfig, defaultTmsConfig); // modules兼容处理
+
+  tmsConfig.modules = convertModules(tmsConfig.modules);
   return tmsConfig;
+}; // convertModules 处理默认值
+
+
+const convertModules = modules => {
+  const newModules = [];
+  modules.forEach((module, index) => {
+    const newModule = {};
+
+    if (typeof module === 'string') {
+      // 路径字符串
+      Object.assign(newModule, {
+        name: path$7.basename(module),
+        path: module
+      });
+    } else if (typeof module === 'object') {
+      Object.assign(newModule, module);
+
+      if (module.name === undefined) {
+        newModule.name = path$7.basename(module.path);
+      }
+    }
+
+    newModules.push(newModule);
+  });
+  return newModules;
+};
+/**
+ * 读取tms.private.js
+ */
+
+
+const readTmsPrivateCf$2 = function () {
+  let tmsPrivateCg;
+  const tmsPrivatePath = resolve$9(TMS_PRIVATE_FILENAME);
+
+  if (fs$9.existsSync(tmsPrivatePath)) {
+    tmsPrivateCg = require(tmsPrivatePath);
+  }
+
+  return tmsPrivateCg;
 };
 /**
  * 从tms.config.json中检索用户传入的有效modules
@@ -1149,27 +1128,33 @@ const checkModules$1 = function (tmsConfig, modules) {
  */
 
 
-const tmsModulesMergeLocalModuleCfg$3 = (modules, appName, moduleDir) => {
+const tmsModulesMergeLocalModuleCfg$3 = (modules, appName) => {
   const newModules = [];
   modules.forEach(({
     path: relativePath,
     name: moduleName
   }, moduleIndex) => {
-    const moduleConfigPath = resolve$8(relativePath, MODULE_CONFIG_FILENAME);
-
-    if (fs$8.existsSync(moduleConfigPath)) {
-      let moduleConfigContent = fs$8.readFileSync(moduleConfigPath, 'utf-8');
-      moduleConfigContent = setModuleConfig(moduleConfigContent, appName, moduleDir);
-      const moduleContentArr = isObject(moduleConfigContent) ? [moduleConfigContent] : moduleConfigContent;
-      moduleContentArr.forEach(({
-        name
-      }, moduleContentArrIndex) => {
-        if (name === moduleName) {
-          newModules.push({ ...modules[moduleIndex],
-            ...moduleContentArr[moduleContentArrIndex]
-          });
-        }
-      });
+    const moduleConfigPath = resolve$9(relativePath, MODULE_CONFIG_FILENAME$1);
+
+    if (fs$9.existsSync(moduleConfigPath)) {
+      try {
+        let moduleConfigContent = fs$9.readFileSync(moduleConfigPath, 'utf-8');
+        moduleConfigContent = setModuleConfig(moduleConfigContent, appName);
+        const moduleContentArr = isObject(moduleConfigContent) ? [moduleConfigContent] : moduleConfigContent;
+        getValidModules(moduleContentArr).forEach(({
+          name
+        }, moduleContentArrIndex) => {
+          if (name === moduleName) {
+            newModules.push({ ...modules[moduleIndex],
+              ...moduleContentArr[moduleContentArrIndex]
+            });
+          }
+        });
+      } catch (e) {
+        fail$6(`${moduleConfigPath}配置错误: ${e}`);
+        newModules.push({ ...modules[moduleIndex]
+        });
+      }
     } else {
       newModules.push({ ...modules[moduleIndex]
       });
@@ -1177,16 +1162,186 @@ const tmsModulesMergeLocalModuleCfg$3 = (modules, appName, moduleDir) => {
   });
   return newModules;
 };
+/**
+ * 分包依赖了分包的模块 合并所依赖的modules
+ * @param { object } tmsConfig
+ * @param {array} modules
+ * @param {string} moduleDir
+ * @returns
+ */
+
+
+const subModulesMergeDepModules$2 = (tmsConfig, modules) => {
+  const moduleNames = [];
+  modules.forEach(({
+    name: moduleName
+  }) => {
+    moduleNames.push(moduleName);
+  });
+  let mergeModules = modules;
+  let isOver = true;
+  modules.forEach(({
+    dependencies: dependencyModules
+  }) => {
+    dependencyModules === null || dependencyModules === void 0 ? void 0 : dependencyModules.forEach(item => {
+      // 如果所有模块的dep都在moduleNames内，则所有依赖都齐了
+      // 否则递归处理，根据name找到相关配置加到modules里
+      if (moduleNames.indexOf(item) === -1) {
+        isOver = false;
+        const tmpModules = checkModules$1(tmsConfig, [...new Set([item])]);
+        mergeModules = [...mergeModules, ...tmpModules];
+        mergeModules = tmsModulesMergeLocalModuleCfg$3(mergeModules, tmsConfig.appName);
+      }
+    });
+  });
+  return isOver ? mergeModules : subModulesMergeDepModules$2(tmsConfig, mergeModules);
+};
 
 var tkitUtils = {
   readTmsConfig: readTmsConfig$1,
+  readTmsPrivateCf: readTmsPrivateCf$2,
   checkModules: checkModules$1,
-  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$3
+  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$3,
+  subModulesMergeDepModules: subModulesMergeDepModules$2
+};
+
+const MetalSmith = require$$0__default$4;
+const {
+  getGlobalInstance
+} = global;
+const {
+  downloadRepoForGit,
+  resolve: resolve$8
+} = widgets;
+const {
+  readTmsPrivateCf: readTmsPrivateCf$1
+} = tkitUtils;
+const {
+  fail: fail$5
+} = log$2;
+const fs$8 = require$$0__default$1;
+const shelljs$4 = require$$4__default;
+const {
+  handleError: handleError$1
+} = handleError_1;
+/**
+ * 处理用户没有clone git仓库权限问题——拼接账号信息
+ * @param {*} httpRepoUrl
+ * @param {*} moduleName
+ * @returns
+ */
+
+function replaceGitUrlAccount(httpRepoUrl, moduleName, privateCf) {
+  var _privateCf$gitAccout;
+
+  let gitUrl = httpRepoUrl;
+  const {
+    username = '',
+    pass = ''
+  } = (privateCf === null || privateCf === void 0 ? void 0 : (_privateCf$gitAccout = privateCf.gitAccout) === null || _privateCf$gitAccout === void 0 ? void 0 : _privateCf$gitAccout[moduleName]) || {};
+  const urlPrefixReg = /http(s)?:\/\//;
+
+  if (username && pass && urlPrefixReg.test(gitUrl)) {
+    gitUrl = gitUrl.replace(urlPrefixReg, val => `${val}${encodeURIComponent(username)}:${pass}@`);
+  }
+
+  return gitUrl;
+}
+/**
+ * 对克隆下来的模块进行相应的文件处理操作，比如收集处理模块信息，进行信息缓存等操作
+ * @param { string } sourceDir 缓存文件夹
+ * @param { string } targetDir 目标文件夹
+ * @param { arrary } ignore
+ * @returns { undefined } no return
+ */
+
+
+function moveFile(sourceDir, targetDir, ignore = []) {
+  // 删除不是文件夹的文件
+  return new Promise((resolve, reject) => {
+    MetalSmith(__dirname).ignore(ignore).source(sourceDir).destination(targetDir).build(e => {
+      if (e) {
+        fail$5(`${sourceDir} moveFile ${targetDir}出现错误: ${e}`);
+        reject(e);
+      }
+
+      resolve();
+    });
+  });
+}
+/**
+ * 下载目标模块
+ * @param { string } sourceDir 缓存文件夹
+ * @param { string } targetDir 目标文件夹
+ * @param { boolean } isDev 是否是dev
+ * @returns { array } modules 描述模块的列表
+ */
+
+
+async function cloneModules$1(sourceDir, targetDir, modules, isDev) {
+  // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
+  const privateCf = readTmsPrivateCf$1(); // 根据小程序的配置文件下载模块， 并且处理信息
+
+  for (const moduleInfo of modules) {
+    if (moduleInfo.repoInfo) {
+      await downLoadAndMoveModule(sourceDir, targetDir, moduleInfo, privateCf, isDev);
+    }
+  }
+}
+/**
+ * 下载模块信息并且将它移动到对应的位置
+ * @param { string } sourceDir 代码缓存文件夹
+ * @param { string } targetDir 代码要放到的目标文件夹
+ * @param { boolean } isDev 是否是dev
+ * @returns { array } moduleInfo 描述模块的信息
+ */
+
+
+async function downLoadAndMoveModule(sourceDir, targetDir, moduleInfo, privateCf, isDev) {
+  const {
+    repoInfo: {
+      buildGitTag,
+      httpRepoUrl
+    },
+    path,
+    name
+  } = moduleInfo; // 源码临时存在的源目录
+
+  let sourcePath = resolve$8(sourceDir, name); // 源码要放到目标目录
+
+  const targetPath = resolve$8(targetDir, path); // 设置模块的构建分支
+
+  const cloneBranch = buildGitTag && typeof buildGitTag === 'string' ? buildGitTag : 'master'; // 检查缓存中有没有
+
+  const globalInstance = getGlobalInstance();
+  const moduleInCache = globalInstance.getModuleCache(httpRepoUrl, cloneBranch);
+
+  try {
+    if (!moduleInCache) {
+      // 处理仓库权限问题
+      const gitUrl = replaceGitUrlAccount(httpRepoUrl, name, privateCf);
+      await downloadRepoForGit(gitUrl, sourcePath, cloneBranch);
+      globalInstance.setModuleCache(httpRepoUrl, cloneBranch, sourcePath);
+    } else {
+      sourcePath = globalInstance.getModuleCache(httpRepoUrl, cloneBranch).dest;
+    }
+
+    if (fs$8.existsSync(targetPath)) {
+      shelljs$4.rm('-rf', `${targetPath}/*`);
+    }
+
+    await moveFile(sourcePath, targetPath, ['node_modules', '.git']);
+  } catch (e) {
+    handleError$1(e, isDev);
+  }
+}
+
+var cloneModules_1 = {
+  cloneModules: cloneModules$1
 };
 
-/* eslint-disable require-jsdoc */
 const ci = require$$0__default$6;
-const path$6 = require$$1__default$1;
+const path$6 = require$$3__default;
 /**
  * 获取小程序ci的Project对象
  * @returns {Object} 小程序ci对象
@@ -1270,66 +1425,78 @@ var mpCiUtils = {
  * 本文件主要负责项目或者分包依赖的npm的安装
  */
 const fs$7 = require$$0__default$1;
-const path$5 = require$$1__default$1;
-const shell = require$$5__default;
-const glob = require$$3__default;
+const fsExtra = require$$1__default$3;
+const crypto = require$$2__default$1;
+const path$5 = require$$3__default;
+const shell = require$$4__default;
+const glob = require$$5__default;
 const LOG = log$2;
-const dirpath = process.cwd(); // 项目根目录
-
-const getTarNpmFilename = targetDir => `${targetDir.replace(/\//g, '-')}.tar.gz`; // 缓存npm包
+const shellJsOption = {
+  async: false,
+  silent: true
+};
+const dirPath = process.cwd(); // 项目根目录
+
+const install$3 = async (packageJsonPath = '', retry = true, cacheDir) => {
+  const obj = {};
+  const packageContent = fs$7.readFileSync(packageJsonPath);
+  const packageJson = JSON.parse(packageContent);
+  obj.dependencies = packageJson.dependencies || {}; // obj.devDependencies = packageJson.devDependencies || {};
+  // dependencies和devDependencies字段为空,没有需要安装的npm包,直接return
+  // if (Object.keys(obj.dependencies).length === 0 && Object.keys(obj.devDependencies).length === 0) {
+
+  if (Object.keys(obj.dependencies).length === 0) {
+    return;
+  } // 以package.json中dependencies字段stringify后的md5值作为缓存key
+  // 任意包名或者版本号的差异,将导致md5后的差异,从而导致缓存失效,重新下载
+  // 如此来保证npm缓存的准确性
+
+
+  const str = JSON.stringify(obj);
+  const key = crypto.createHash('md5').update(str).digest('hex');
+  const keyPath = path$5.join(cacheDir, key);
+  const tarFile = path$5.join(keyPath, 'node_modules.tar.gz'); // npm缓存路径不存在
+  // 或者缓存的包大小小于512byte,认为缓存不合法
+  // 清空缓存目录,重新下载npm包缓存
+
+  const missCache = !fsExtra.pathExistsSync(keyPath) || !fsExtra.existsSync(tarFile) || fsExtra.statSync(tarFile).size < 512;
+
+  if (missCache) {
+    console.log(`未命中缓存，下载${packageJsonPath}依赖`);
+    fsExtra.emptydirSync(keyPath);
+    shell.cp('-f', packageJsonPath, keyPath);
+    shell.cd(keyPath);
 
+    try {
+      shell.exec('npx yarn --production --registry http://mirrors.tencent.com/npm/', shellJsOption);
+    } catch (err) {
+      console.log('err', err);
 
-const npmCache = function (targetDir, cacheDir) {
-  if (!fs$7.existsSync(cacheDir)) {
-    fs$7.mkdirSync(cacheDir);
-  }
+      if (retry) {
+        return await install$3(packageJsonPath, false);
+      }
 
-  const tarNpmFilename = getTarNpmFilename(targetDir);
-  const tarNpmFilePath = `${cacheDir}/${tarNpmFilename}`;
+      throw err;
+    }
 
-  if (fs$7.existsSync(tarNpmFilePath)) {
-    shell.rm('-rf', tarNpmFilePath);
+    shell.exec('tar -zcvf ./node_modules.tar.gz ./node_modules', shellJsOption);
+    shell.exec('rm -rf ./node_modules', shellJsOption);
   }
 
-  const cmd = `tar -zcvf ${tarNpmFilePath} ./node_modules`;
-  shell.exec(cmd, {
-    async: true,
-    silent: true
-  }); // tar -zcvf /Users/odile/.tmskit/node_modules.tar.gz  ./node_modules
-}; // 获取缓存npm包
-
-
-const getNpmCache = function (targetDir, cacheDir) {
-  const tarNpmFilename = getTarNpmFilename(targetDir);
-  const tarNpmFilePath = `${cacheDir}/${tarNpmFilename}`;
-
-  if (fs$7.existsSync(tarNpmFilePath)) {
-    const cmd = `tar -zxvf ${tarNpmFilePath} -C ./`;
-    shell.exec(cmd, {
-      async: false,
-      silent: true
-    });
-  } // tar -zxvf /Users/odile/.tmskit/node_modules.tar.gz  -C ./
-
+  shell.cp('-Rf', tarFile, `${path$5.dirname(packageJsonPath)}/`);
+  shell.cd(path$5.dirname(packageJsonPath));
+  shell.exec('tar -xzvf ./node_modules.tar.gz -C ./', shellJsOption);
+  shell.exec('rm -rf ./node_modules.tar.gz', shellJsOption);
+  return {
+    missCache,
+    key
+  };
 }; // 遍历安装指定目录下所有项目的npm依赖
 
 
 const mpNpmInstallAll$1 = async (modules, contextDir, cacheDir) => {
   const packageJsonFiles = await findAllPackageJson(modules, contextDir);
-  await Promise.all(packageJsonFiles.map(file => new Promise(resolve => {
-    const dir = path$5.dirname(file);
-    shell.cd(dir);
-
-    if (!fs$7.existsSync(`${dir}/node_modules`)) {
-      getNpmCache(dir, cacheDir);
-    }
-
-    shell.exec('npx pnpm install --prod --registry http://mirrors.tencent.com/npm/', {
-      silent: false
-    });
-    resolve();
-    npmCache(dir, cacheDir);
-  })));
+  await Promise.all(packageJsonFiles.map(file => install$3(file, true, cacheDir)));
 };
 /**
  * 递归查找指定条件的文件
@@ -1391,7 +1558,7 @@ const findFilesByFilter = (startPath, filter) => {
 const findAllPackageJson = (subRoots = [], contextDir) => {
   const packageJsonName = 'package.json'; // 查找文件名
 
-  const cwd = contextDir || dirpath;
+  const cwd = contextDir || dirPath;
   const result = [path$5.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
 
   subRoots.forEach(subRoot => {
@@ -1441,21 +1608,16 @@ const {
   buildMpNpm
 } = mpCiUtils;
 const {
-  CACHE_DIR,
-  DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR$2
+  CACHE_DIR
 } = require$$3;
 const {
   cloudNpmInstall,
   mpNpmInstallAll
 } = npmUtils;
-const {
-  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$2
-} = tkitUtils;
-
-async function install$2(tmsConfig, modules, isCloud = true) {
-  const newModules = tmsModulesMergeLocalModuleCfg$2(modules, tmsConfig.appName, DEFAULT_MODULE_DIR$2); // 小程序npm install
 
-  await createTask$2(mpNpmInstallAll, '小程序 开始npm install', '小程序npm install 完成')(newModules, resolve$7(tmsConfig.gulp.outputDir), `${CACHE_DIR}/node_modules`); // 构建miniprograme_npm
+async function install$2(tmsConfig, modules, isCloud = false) {
+  // 小程序npm install
+  await createTask$2(mpNpmInstallAll, '小程序 开始npm install', '小程序npm install 完成')(modules, resolve$7(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`); // 构建miniprograme_npm
 
   await createTask$2(buildMpNpm, '开始构建miniprograme_npm', '构建miniprograme_npm 完成')({
     appId: tmsConfig.appId,
@@ -1468,7 +1630,7 @@ async function install$2(tmsConfig, modules, isCloud = true) {
 
 var install_1 = install$2;
 
-const shelljs$3 = require$$5__default;
+const shelljs$3 = require$$4__default;
 const fs$6 = require$$0__default$1;
 const io = io$2;
 const {
@@ -1480,17 +1642,17 @@ const {
 } = buildAppJson;
 const {
   MODULE_CODE_DIR,
-  DEFAULT_COPY_CONFIG,
-  DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR$1
+  DEFAULT_COPY_CONFIG
 } = require$$3;
 const {
   cloneModules
 } = cloneModules_1;
 const {
-  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$1
+  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$2,
+  subModulesMergeDepModules: subModulesMergeDepModules$1
 } = tkitUtils;
 const {
-  fail: fail$5
+  fail: fail$4
 } = log$2;
 const install$1 = install_1;
 /**
@@ -1502,19 +1664,19 @@ const install$1 = install_1;
  */
 
 const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
-  const outputDir = resolve$6(tmsConfig.gulp.outputDir);
+  const outputDir = resolve$6(tmsConfig.outputDir);
   io.ensureDirExist(outputDir);
   defaultFiles.forEach(item => {
     if (fs$6.existsSync(resolve$6(item))) {
-      shelljs$3.cp('-rf', resolve$6(item), resolve$6(tmsConfig.gulp.outputDir, item));
+      shelljs$3.cp('-rf', resolve$6(item), resolve$6(tmsConfig.outputDir, item));
     }
   }); // 拷贝模块的package.json到编译输出目录
 
   targetModules.forEach(item => {
-    const outputModuleDir = resolve$6(`${tmsConfig.gulp.outputDir}/${item.root}`);
+    const outputModuleDir = resolve$6(`${tmsConfig.outputDir}/${item.root}`);
 
     if (!fs$6.existsSync(resolve$6(item.path))) {
-      fail$5(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
+      fail$4(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
       process.exit(1);
     }
 
@@ -1524,29 +1686,36 @@ const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
   });
 };
 
-async function task(tmsConfig, targetModules) {
+async function task(tmsConfig, targetModules, isDev) {
   // 下载和移动代码
-  await createTask$1(cloneModules, '开始下载模块代码完成', '下载模块代码码完成')(MODULE_CODE_DIR, resolve$6('./'), targetModules); // tms.config.js的modules 合并 module.config.json的配置项
+  await createTask$1(cloneModules, '开始下载模块代码完成', '下载模块代码码完成')(MODULE_CODE_DIR, resolve$6('./'), targetModules, isDev); // tms.config.js的modules 合并 module.config.json的配置项
+
+  let newModules = tmsModulesMergeLocalModuleCfg$2(targetModules, tmsConfig.appName); // A分包依赖了B分包的代码， merge B分包进行编译；
 
-  const newModules = tmsModulesMergeLocalModuleCfg$1(targetModules, tmsConfig.appName, DEFAULT_MODULE_DIR$1);
-  console.log('当前init的有效模块', newModules.map(item => item.name)); // 拷贝相关配置文件到输出目录
+  newModules = subModulesMergeDepModules$1(tmsConfig, newModules); // 拷贝相关配置文件到输出目录
 
   await createTask$1(cpFilesToOutput, '开始拷贝文件到编译输出目录', '拷贝文件到编译输出目录完成')(tmsConfig, newModules, DEFAULT_COPY_CONFIG); // install
 
   await install$1(tmsConfig, newModules, false); // 动态生成编译后的app.json;
 
-  await createTask$1(buildOutputAppJson, '开始生成编译后的app.json', '生成编译后的app.json完成')(tmsConfig, newModules);
+  await createTask$1(buildOutputAppJson, '开始生成编译后的app.json', '生成编译后的app.json完成')(tmsConfig, newModules, isDev);
   return newModules;
 }
 
-async function bootstrap(tmsConfig, targetModules) {
-  const newModules = await task(tmsConfig, targetModules);
-  return {
-    targetModules: newModules
-  };
+async function init$5(tmsConfig, targetModules, isDev) {
+  try {
+    const newModules = await task(tmsConfig, targetModules, isDev);
+    return {
+      targetModules: newModules
+    };
+  } catch (error) {
+    const errMsg = typeof error === 'object' ? error.message : error;
+    fail$4(`init流程出现错误${errMsg}`);
+    process.exit(1);
+  }
 }
 
-var init$5 = bootstrap;
+var init_1 = init$5;
 
 var dev$3 = {exports: {}};
 
@@ -1570,7 +1739,7 @@ function replaceEnv$1(reg = /process\.env(\.(\w*))?/g, envData) {
       } // eslint-disable-next-line
 
 
-      file.contents = new Buffer(contents);
+      file.contents = Buffer.from(contents);
     }
 
     this.push(file);
@@ -1617,16 +1786,16 @@ var findCssImport = {
 
 /* eslint-disable no-param-reassign */
 const {
-  fail: fail$4
+  fail: fail$3
 } = log$2;
 
 function pluginError$3(error, isWatch) {
   const errMsg = error.message;
 
   if (isWatch) {
-    fail$4(errMsg);
+    fail$3(errMsg);
   } else {
-    fail$4(errMsg);
+    fail$3(errMsg);
     process.exit(1);
   }
 }
@@ -1638,7 +1807,7 @@ var pluginError_1 = {
 /* eslint-disable no-param-reassign */
 const through$2 = require$$0__default$7;
 const precinct = require$$1__default$4;
-const path$4 = require$$1__default$1;
+const path$4 = require$$3__default;
 const {
   findCssImports
 } = findCssImport;
@@ -1710,14 +1879,14 @@ function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
     // 依赖分析的文件
     const anaFileOriginFile = file.history[0];
     const anaFileRelativeModule = path$4.relative(resolve$5(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$5(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+    const anaFileDestFile = resolve$5(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
       const deps = cssFilter.indexOf(path$4.extname(file.path)) > -1 ? findCssImports(contents) : precinct(contents);
       const copyModules = new Map();
-      Object.keys(tmsConfig.gulp.dependencies).forEach(includeName => {
-        const includePath = tmsConfig.gulp.dependencies[includeName];
+      Object.keys(tmsConfig.dependencies).forEach(includeName => {
+        const includePath = tmsConfig.dependencies[includeName];
         deps.forEach(depItem => {
           if (depItem.indexOf(includeName) > -1) {
             // 被依赖文件的存在的绝对路径 (eg: /User/thirdparty/loadsh)
@@ -1739,7 +1908,7 @@ function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
             const regRes = depItem.match(reg) || [];
 
             if (regRes[2]) {
-              const depDestPath = resolve$5(tmsConfig.gulp.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)) {
@@ -1747,7 +1916,7 @@ function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
                   depOriginFile,
                   depDestFile,
                   beforeDepPath: depItem,
-                  afterDepPath: path$4.relative(path$4.dirname(anaFileDestFile), depDestPath)
+                  afterDepPath: path$4.relative(path$4.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/')
                 });
               }
             }
@@ -1769,7 +1938,7 @@ function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
           diffContentCopyFile$2(item.depOriginFile, item.depDestFile);
         }); // console.log('mpCommonDep defs', defs);
       });
-      file.contents = new Buffer(contents);
+      file.contents = Buffer.from(contents);
     }
 
     this.push(file);
@@ -1785,7 +1954,7 @@ var mpCommonDep_1 = {
 
 /* eslint-disable no-param-reassign */
 const through$1 = require$$0__default$7;
-const path$3 = require$$1__default$1;
+const path$3 = require$$3__default;
 const {
   ext: ext$1,
   fileInDir: fileInDir$1,
@@ -1807,7 +1976,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
     // 当前分析的文件的路径
     const anaFileOriginFile = file.history[0];
     const anaFileRelativeModule = path$3.relative(resolve$4(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$4(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+    const anaFileDestFile = resolve$4(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       const copyModules = new Map();
@@ -1817,8 +1986,8 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
         contents = JSON.parse(contents);
 
         if (contents.usingComponents) {
-          Object.keys(tmsConfig.gulp.dependencies).forEach(includeName => {
-            const includePath = tmsConfig.gulp.dependencies[includeName];
+          Object.keys(tmsConfig.dependencies).forEach(includeName => {
+            const includePath = tmsConfig.dependencies[includeName];
             Object.keys(contents.usingComponents).forEach(componentKey => {
               const componentPath = contents.usingComponents[componentKey];
 
@@ -1842,7 +2011,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
                 const regRes = componentPath.match(reg) || [];
 
                 if (regRes[2]) {
-                  const depDestPath = resolve$4(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+                  const depDestPath = resolve$4(tmsConfig.outputDir, module.to, includeName, regRes[2]);
                   const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
 
                   if (!copyModules.has(depDestFile)) {
@@ -1851,7 +2020,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
                       depOriginExt: extAlias,
                       depDestFile,
                       beforeDepPath: componentPath,
-                      afterDepPath: path$3.relative(path$3.dirname(anaFileDestFile), depDestPath)
+                      afterDepPath: path$3.relative(path$3.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/')
                     });
                   }
                 }
@@ -1894,7 +2063,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
         contents = contents.replace(reg, `"${afterDepPath}"`);
       });
       contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
-      file.contents = new Buffer(contents);
+      file.contents = Buffer.from(contents);
     }
 
     this.push(file);
@@ -1911,7 +2080,7 @@ var mpJsonDep_1 = {
 const through = require$$0__default$7;
 const htmlparser2 = require$$1__default$5;
 const fs$3 = require$$0__default$1;
-const path$2 = require$$1__default$1;
+const path$2 = require$$3__default;
 const {
   diffContentCopyFile,
   ext,
@@ -2033,7 +2202,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
     // 依赖分析的文件
     const anaFileOriginFile = file.history[0];
     const anaFileRelativeModule = path$2.relative(resolve$3(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$3(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+    const anaFileDestFile = resolve$3(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
@@ -2050,9 +2219,9 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
               file: depOriginFile,
               extPath
             } = extFile(name, depOriginPath);
-            Object.keys(tmsConfig.gulp.dependencies).forEach(includeName => {
+            Object.keys(tmsConfig.dependencies).forEach(includeName => {
               if (attributes.src.indexOf(includeName) > -1) {
-                const includePath = tmsConfig.gulp.dependencies[includeName];
+                const includePath = tmsConfig.dependencies[includeName];
 
                 if (!fileInDir(includePath, depOriginFile)) {
                   pluginError(new Error(`${anaFileOriginFile}引用路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`), isWatch);
@@ -2064,7 +2233,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
                 const regRes = attributes.src.match(reg) || [];
 
                 if (regRes[2]) {
-                  const depDestPath = resolve$3(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+                  const depDestPath = resolve$3(tmsConfig.outputDir, module.to, includeName, regRes[2]);
                   const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath;
 
                   if (!copyModules.has(depDestFile)) {
@@ -2072,7 +2241,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
                       depOriginFile,
                       depDestFile,
                       beforeDepPath: attributes.src,
-                      afterDepPath: path$2.relative(path$2.dirname(anaFileDestFile), depDestFile)
+                      afterDepPath: path$2.relative(path$2.dirname(anaFileDestFile), depDestFile).replace(/\\/g, '/')
                     });
                   }
                 }
@@ -2113,7 +2282,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
           });
         }
       });
-      file.contents = new Buffer(contents);
+      file.contents = Buffer.from(contents);
     }
 
     this.push(file);
@@ -2130,9 +2299,9 @@ var mpWxmlDep_1 = {
 /* eslint-disable no-param-reassign */
 const postcss$1 = require$$0__default$9;
 const fs$2 = require$$0__default$1;
-const path$1 = require$$1__default$1;
+const path$1 = require$$3__default;
 const {
-  fail: fail$3
+  fail: fail$2
 } = log$2;
 var postcssFontBase64 = postcss$1.plugin('postcss-font-base64', options => {
   options = { ...options,
@@ -2183,13 +2352,13 @@ var postcssFontBase64 = postcss$1.plugin('postcss-font-base64', options => {
         return readAndEncodeFile(file);
       }
 
-      fail$3(`${file} does not exist.`);
+      fail$2(`${file} does not exist.`);
       return '';
     }
 
     function readAndEncodeFile(file) {
       const bitmap = fs$2.readFileSync(file);
-      return new Buffer(bitmap).toString('base64');
+      return Buffer.from(bitmap).toString('base64');
     }
   };
 });
@@ -2200,10 +2369,10 @@ const {
   lastRun
 } = require$$0__default$a;
 const px2rpx = require$$1__default$6;
-const postcss = require$$2__default$1;
-const watch = require$$3__default$1;
-const cache = require$$4__default;
-const image = require$$5__default$1;
+const postcss = require$$2__default$2;
+const watch = require$$3__default$1; // const cache = require('gulp-cache');
+// const image = require('gulp-image');
+
 const replaceEnv = replaceEnv_1;
 const {
   mpCommonDep
@@ -2216,7 +2385,7 @@ const {
 } = mpWxmlDep_1;
 const base64 = postcssFontBase64;
 const {
-  fail: fail$2
+  fail: fail$1
 } = log$2;
 
 const since = task => file => lastRun(task) > file.stat.ctime ? lastRun(task) : 0;
@@ -2247,13 +2416,13 @@ var compile = function (tmsConfig, {
     switch (globKey) {
       case 'js':
         srcPipe.pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData)).pipe(mpCommonDep(tmsConfig, module, ['.js', '.ts', '.wxs', '.json'], isWatch)).pipe(dest(destPath)).on('error', err => {
-          fail$2(`js编译报错${err}`);
+          fail$1(`js编译报错${err}`);
         });
         break;
 
       case 'wxss':
         srcPipe.pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isWatch)).pipe(postcss([base64()])).on('error', err => {
-          fail$2(`postcss编译报错${err}`);
+          fail$1(`postcss编译报错${err}`);
         }).pipe(px2rpx({
           designWidth: 375,
           // 设计稿宽度，默认为750
@@ -2264,7 +2433,7 @@ var compile = function (tmsConfig, {
 
       case 'json':
         srcPipe.pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch)).on('error', err => {
-          fail$2(`json编译报错${err}`);
+          fail$1(`json编译报错${err}`);
         }).pipe(dest(destPath));
         break;
 
@@ -2273,9 +2442,11 @@ var compile = function (tmsConfig, {
         break;
 
       case 'image':
-        srcPipe.pipe(cache(image())).on('error', err => {
-          fail$2(`image编译报错${err}`);
-        }).pipe(dest(destPath));
+        srcPipe // .pipe(cache(image()))
+        // .on('error', (err) => {
+        //   fail(`image编译报错${err}`);
+        // })
+        .pipe(dest(destPath));
         break;
 
       case 'other':
@@ -2320,18 +2491,16 @@ var compile = function (tmsConfig, {
   }
 
   module.exports = async (tmsConfig, newModules, isWatch = true) => {
-    var _tmsConfig$gulp, _tmsConfig$gulp2;
-
     // 监听app.json
     if (isWatch) {
       watch(resolve('app.json'), {
         ignoreInitial: false,
         events: ['add', 'change']
       }, () => {
-        buildOutputAppJson(tmsConfig, newModules);
+        buildOutputAppJson(tmsConfig, newModules, isWatch);
       });
     } else {
-      buildOutputAppJson(tmsConfig, newModules);
+      buildOutputAppJson(tmsConfig, newModules, isWatch);
     } // 监听根目录的文件
 
 
@@ -2345,7 +2514,7 @@ var compile = function (tmsConfig, {
         from: '',
         to: ''
       },
-      destPath: resolve(tmsConfig.gulp.outputDir),
+      destPath: resolve(tmsConfig.outputDir),
       srcOption: {
         allowEmpty: true
       },
@@ -2365,7 +2534,7 @@ var compile = function (tmsConfig, {
         watch(`${resolve(module.path)}/**/module.config.json`, {
           events: ['change']
         }, () => {
-          buildOutputAppJson(tmsConfig, newModules);
+          buildOutputAppJson(tmsConfig, newModules, isWatch);
         });
       }
 
@@ -2381,7 +2550,7 @@ var compile = function (tmsConfig, {
         glob: { ...glob,
           other: [`${resolve(module.path)}/**/*`, ...excludeGlob(glob)]
         },
-        destPath: resolve(tmsConfig.gulp.outputDir, module.root),
+        destPath: resolve(tmsConfig.outputDir, module.root),
         module: {
           from: module.path,
           to: module.root
@@ -2391,25 +2560,18 @@ var compile = function (tmsConfig, {
         },
         isWatch
       });
-    } // 监听copy模块
-
+    } // 静态资源目录-拷贝
 
-    if (tmsConfig !== null && tmsConfig !== void 0 && (_tmsConfig$gulp = tmsConfig.gulp) !== null && _tmsConfig$gulp !== void 0 && _tmsConfig$gulp.static && (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gulp2 = tmsConfig.gulp) === null || _tmsConfig$gulp2 === void 0 ? void 0 : _tmsConfig$gulp2.static.length) > 0) {
-      for (const item of (_tmsConfig$gulp3 = tmsConfig.gulp) === null || _tmsConfig$gulp3 === void 0 ? void 0 : _tmsConfig$gulp3.static) {
-        var _tmsConfig$gulp3;
 
-        const glob = {
-          js: `${item.from}/**/*.{js,ts,wxs}`,
-          json: `${item.from}/**/*.json`,
-          wxss: `${item.from}/**/*.{less,wxss}`,
-          wxml: `${item.from}/**/*.wxml`,
-          image: `${item.from}/**/*.{png,jpg,jpeg,gif,svg}`
-        };
+    if (tmsConfig !== null && tmsConfig !== void 0 && tmsConfig.static && (tmsConfig === null || tmsConfig === void 0 ? void 0 : tmsConfig.static.length) > 0) {
+      for (const item of tmsConfig.static) {
+        const from = item !== null && item !== void 0 && item.from.startsWith('/') ? item.from : resolve(item.from);
+        const to = item !== null && item !== void 0 && item.to.startsWith('/') ? item.to : resolve(item.to);
         compile$1(tmsConfig, {
-          glob: { ...glob,
-            other: [`${item.from}/**/*`, ...excludeGlob(glob)]
+          glob: {
+            other: [from]
           },
-          destPath: item.to,
+          destPath: to,
           module: item,
           srcOption: {
             allowEmpty: true
@@ -2426,11 +2588,11 @@ const semver$1 = require$$1__default$7;
 const {
   resolve: resolve$2
 } = widgets;
-const path = require$$1__default$1;
+const path = require$$3__default;
+const shelljs$2 = require$$4__default;
 const {
-  fail: fail$1
-} = log$2;
-const shelljs$2 = require$$5__default;
+  handleError
+} = handleError_1;
 
 const getLatestVersion = npmName => {
   const data = shelljs$2.exec(`npm view ${npmName} version`);
@@ -2445,7 +2607,7 @@ const getLatestVersion = npmName => {
  */
 
 
-const checkDependencies$1 = (modules, cwd, outputDir) => {
+const checkDependencies$1 = (modules, cwd, outputDir, isDev) => {
   // 步骤1. 收集package.json
   const packageJsonName = 'package.json'; // 查找文件名
   // 1.1根目录的package.json
@@ -2468,13 +2630,13 @@ const checkDependencies$1 = (modules, cwd, outputDir) => {
 
   for (const item of packageArr) {
     const packageJson = fs$1.readFileSync(item.srcPackageDir, 'utf-8');
-    let dependencies;
+    let dependencies = {};
 
     try {
-      dependencies = JSON.parse(packageJson).dependencies;
+      const json = JSON.parse(packageJson);
+      dependencies = json !== null && json !== void 0 && json.dependencies ? json === null || json === void 0 ? void 0 : json.dependencies : {};
     } catch (e) {
-      fail$1(`解析${packageJson}报错，请检查是否是正确的json配置项`);
-      process.exit(1);
+      handleError(`解析${item.srcPackageDir}报错，请检查是否是正确的json配置项`, isDev);
     }
 
     const dependenciesKeys = Object.keys(dependencies);
@@ -2518,12 +2680,12 @@ const fs = require$$0__default$1;
 const {
   resolve: resolve$1
 } = widgets;
-const init$4 = init$5;
+const init$4 = init_1;
 const {
-  DEFAULT_MODULE_DIR
+  MODULE_CONFIG_FILENAME
 } = require$$3;
 const {
-  tmsModulesMergeLocalModuleCfg
+  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$1
 } = tkitUtils;
 const {
   checkDependencies
@@ -2531,8 +2693,9 @@ const {
 const {
   fail
 } = log$2;
+const shelljs$1 = require$$4__default; // const io = require('../../../utils/io');
 
-function isInit(tmsConfig, targetModules, contextDir) {
+function isInit(tmsConfig, targetModules, contextDir, isDev) {
   // 判断是否存在dist目录
   if (!fs.existsSync(contextDir)) {
     return true;
@@ -2558,10 +2721,10 @@ function isInit(tmsConfig, targetModules, contextDir) {
     // 此模块没有root字段(原因：没有merge到module.config.json的配置项。第三方模块的代码可能还没有下载)
     if (!item.root) {
       return true;
-    } // 判断编译目录是否有该模块
+    } // 判断dist目录是否有该模块
 
 
-    if (!fs.existsSync(`${contextDir}/${item.root}`)) {
+    if (!fs.existsSync(`${contextDir}/${item.root}/${MODULE_CONFIG_FILENAME}`)) {
       return true;
     } // 判断源码目录是否有该模块
 
@@ -2573,52 +2736,67 @@ function isInit(tmsConfig, targetModules, contextDir) {
   } //  判断package.json的版本是否有新的版本
 
 
-  return checkDependencies(targetModules, resolve$1('./'), tmsConfig.gulp.outputDir);
+  return checkDependencies(targetModules, resolve$1('./'), tmsConfig.outputDir, isDev);
+} // 用户编译分包时，需要将dist中其他分包(主包不能删除)的内容删除，否则其他分包的内容混入到主包(导致主包的体积超2M)
+
+
+function delOtherModule(tmsConfig, targetModules) {
+  const modules = tmsModulesMergeLocalModuleCfg$1(tmsConfig.modules, 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}`);
+      shelljs$1.rm('-rf', `${moduleRootDir}/*`, {
+        silent: true
+      }); // 解决微信开发者工具（dist/app.json: ["subpackages"][0]["root"] 字段需为 目录）错误 - 提前创建该目录
+      // io.ensureDirExist(moduleRootDir);
+    }
+  });
 }
 
 async function dev$2(tmsConfig, targetModules, env) {
-  // tms.config.js的modules 合并 module.config.json的配置项
-  let newModules = tmsModulesMergeLocalModuleCfg(targetModules, tmsConfig.appName, DEFAULT_MODULE_DIR); // 判断是否进行init命令
+  let newModules = targetModules;
+  const isDev = true; // 判断是否进行init命令
 
-  if (isInit(tmsConfig, newModules, resolve$1('dist'))) {
-    // init函数会将 最新的tms.config.js的modules 合并 module.config.json的配置项 返回，不需要再做重复工作
-    const initData = await init$4(tmsConfig, targetModules);
+  if (isInit(tmsConfig, targetModules, resolve$1('dist'), isDev)) {
+    // init函数 下载第三方代码后，会将最新的tms.config.js的modules 合并 module.config.json的配置项返回
+    const initData = await init$4(tmsConfig, newModules, isDev);
     newModules = initData.targetModules;
   }
 
-  console.log('当前dev启动的有效模块', newModules.map(item => item.name));
+  console.log('当前dev启动的有效模块', newModules.map(item => item.name).sort());
+  delOtherModule(tmsConfig, newModules);
   gulpDev(tmsConfig, newModules, env);
 }
 
 var dev_1 = dev$2;
 
-const shelljs$1 = require$$5__default;
 const dev$1 = dev$3.exports;
 
 var build$2 = async (tmsConfig, newModules) => {
-  shelljs$1.rm('-rf', tmsConfig.gulp.outputDir);
   dev$1(tmsConfig, newModules, false);
 };
 
-const shelljs = require$$5__default;
+const shelljs = require$$4__default;
 const {
   resolve
 } = widgets;
-const init$3 = init$5;
+const init$3 = init_1;
 const gulpBuild = build$2;
 
 async function build$1(tmsConfig, targetModules, env) {
   // 开始构建前，清理输出目录
-  await shelljs.rm('-rf', resolve(tmsConfig.gulp.outputDir));
+  await shelljs.rm('-rf', resolve(tmsConfig.outputDir));
+  const isDev = false;
   const {
     targetModules: newModules
-  } = await init$3(tmsConfig, targetModules);
+  } = await init$3(tmsConfig, targetModules, isDev);
   gulpBuild(tmsConfig, newModules, env);
 }
 
 var build_1 = build$1;
 
-const init$2 = init$5;
+const init$2 = init_1;
 const dev = dev_1;
 const build = build_1;
 const install = install_1;
@@ -2630,23 +2808,27 @@ const {
 } = require$$3;
 const {
   readTmsConfig,
+  readTmsPrivateCf,
   checkModules
 } = tkitUtils;
+const {
+  tmsModulesMergeLocalModuleCfg,
+  subModulesMergeDepModules
+} = tkitUtils;
 
-const handleModulesArg = cmd => {
-  // 主模块开发
-  if (cmd.module === MODE.main) {
-    return MODE.main;
-  } // 单模块 或 多模块开发
-
-
-  const {
-    argv
-  } = process;
-  const reset = argv.indexOf('-m') > -1 ? argv.slice(argv.indexOf('-m') + 1) : [];
-
+const handleModulesArg = (cmd, tmsPrivateCg) => {
+  // 单模块或多模块开发-用户通过脚手架参数指定的模块
   if (cmd.module) {
+    const {
+      argv
+    } = process;
+    const reset = argv.indexOf('-m') > -1 ? argv.slice(argv.indexOf('-m') + 1) : [];
     return [cmd.module, ...reset];
+  } // 单模块或多模块开发-用户在tms.private.js指定的模块
+
+
+  if (tmsPrivateCg !== null && tmsPrivateCg !== void 0 && tmsPrivateCg.modules && (tmsPrivateCg === null || tmsPrivateCg === void 0 ? void 0 : tmsPrivateCg.modules.length) > 0) {
+    return tmsPrivateCg === null || tmsPrivateCg === void 0 ? void 0 : tmsPrivateCg.modules;
   } // 全量模块
 
 
@@ -2654,38 +2836,44 @@ const handleModulesArg = cmd => {
 };
 
 async function run(commandName, cmd) {
-  const moduleArg = handleModulesArg(cmd);
+  // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
+  const tmsPrivateCg = readTmsPrivateCf(); // 处理module参数
+
+  const moduleArg = handleModulesArg(cmd, tmsPrivateCg);
   const {
-    env
+    env = tmsPrivateCg === null || tmsPrivateCg === void 0 ? void 0 : tmsPrivateCg.env
   } = cmd;
   const tmsConfig = await createTask(readTmsConfig, '开始读取脚手架的配置项', '读取脚手架的配置项完成')(env);
-  let modules; // 主模块
+  let modules;
 
-  if (moduleArg === MODE.main) {
-    modules = checkModules(tmsConfig, [...new Set([...tmsConfig.mainPackages])]);
-  } else if (moduleArg === MODE.all) {
+  if (moduleArg === MODE.all) {
     // 全量模块
     modules = tmsConfig.modules;
   } else {
     // 检查用户输入modules的有效性
     modules = checkModules(tmsConfig, [...new Set([...tmsConfig.mainPackages, ...moduleArg])]);
-  }
+  } // tms.config.js的modules 合并 module.config.json的配置项
+
+
+  let newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName); // A分包依赖了B分包的代码， merge B分包进行编译；
+
+  newModules = subModulesMergeDepModules(tmsConfig, newModules);
 
   switch (commandName) {
     case 'init':
-      init$2(tmsConfig, modules, env);
+      init$2(tmsConfig, newModules, env);
       return;
 
     case 'dev':
-      dev(tmsConfig, modules, env);
+      dev(tmsConfig, newModules, env);
       return;
 
     case 'install':
-      install(tmsConfig, modules, env);
+      install(tmsConfig, newModules, env);
       return;
 
     case 'build':
-      build(tmsConfig, modules, env);
+      build(tmsConfig, newModules, env);
       return;
 
     default:
@@ -2738,7 +2926,7 @@ var entry = [{
 
 var require$$6 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.5-beta.4",
+	version: "0.0.6",
 	description: "tmskit",
 	main: "main.js",
 	bin: {
@@ -2779,6 +2967,7 @@ var require$$6 = {
 		"copy-webpack-plugin": "^9.1.0",
 		"download-git-repo": "^3.0.2",
 		ejs: "^3.1.5",
+		"fs-extra": "^10.0.1",
 		"glob-ignore": "^1.0.2",
 		gulp: "^4.0.2",
 		"gulp-cache": "^1.1.3",