@tmsfe/tmskit 0.0.5 → 0.0.6

package/dist/index.cjs.js

@@ -3,48 +3,60 @@
 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$$0$2 = require('shelljs');
+var require$$4 = require('shelljs');
 var require$$6$1 = require('download-git-repo');
-var require$$0$3 = require('chalk');
-var require$$0$4 = require('async');
-var require$$1$2 = require('ejs');
-var require$$1$3 = require('inquirer');
-var require$$0$5 = require('metalsmith');
+var require$$0$2 = require('chalk');
+var require$$0$3 = require('async');
+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$$0$7 = require('lodash');
-var require$$7 = require('replace-ext');
-var require$$0$8 = require('webpack-chain');
-var require$$0$9 = require('webpack');
-var require$$0$a = require('webpack/lib/SingleEntryPlugin');
-var require$$3$1 = require('copy-webpack-plugin');
-var require$$1$4 = require('semver');
-var require$$3$2 = 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');
+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$2 = require('gulp-postcss');
+var require$$3$2 = require('gulp-watch');
+var require$$1$7 = require('semver');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
 var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 var require$$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$$0__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$0$2);
+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$$0__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$0$4);
+var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
-var require$$1__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$1$3);
+var require$$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$$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$$7__default = /*#__PURE__*/_interopDefaultLegacy(require$$7);
 var require$$0__default$8 = /*#__PURE__*/_interopDefaultLegacy(require$$0$8);
+var require$$1__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$1$4);
+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$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3$1);
-var require$$1__default$4 = /*#__PURE__*/_interopDefaultLegacy(require$$1$4);
+var require$$1__default$6 = /*#__PURE__*/_interopDefaultLegacy(require$$1$6);
+var require$$2__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$2$2);
 var require$$3__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$3$2);
+var require$$1__default$7 = /*#__PURE__*/_interopDefaultLegacy(require$$1$7);
 
 function getAugmentedNamespace(n) {
 	if (n.__esModule) return n;
@@ -61,24 +73,24 @@ function getAugmentedNamespace(n) {
 	return a;
 }
 
-var src$1 = {};
+var src$2 = {};
 
 const program$1 = require$$0__default;
 const leven = require$$1__default;
 const ora = require$$2__default;
-const path$7 = require$$1__default$1;
-const fs$b = require$$0__default$1;
-const shelljs$6 = require$$0__default$2;
+const path$b = require$$3__default;
+const fs$e = require$$0__default$1;
+const shelljs$6 = require$$4__default;
 const download = require$$6__default;
-const chalk$3 = require$$0__default$3;
-const shelljsOptons = {
+const chalk$3 = require$$0__default$2;
+const shelljsOptions = {
   slient: true
 }; // 获取当前目录
 
 const cwd = process.cwd();
 
-function resolve$c(...args) {
-  return path$7.resolve(cwd, ...args);
+function resolve$d(...args) {
+  return path$b.resolve(cwd, ...args);
 }
 /**
  * 封装logs
@@ -147,7 +159,7 @@ function downloadRepo(dest, downloadOptions = {
     branch
   } = downloadOptions;
 
-  if (fs$b.existsSync(dest)) {
+  if (fs$e.existsSync(dest)) {
     shelljs$6.rm('-rf', dest);
   }
 
@@ -177,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$b.existsSync(dest)) {
-      shelljs$6.rm('-rf', path$7.join(dest));
+    if (fs$e.existsSync(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();
   });
@@ -207,24 +224,15 @@ const cost = start => Date.now() - start;
  */
 
 
-function createTask$5(task, startText, endText) {
+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;
   };
 }
@@ -237,46 +245,46 @@ function createTask$5(task, startText, endText) {
 const camelize = str => str.replace(/-(\w)/g, (a, c) => c ? c.toUpperCase() : '');
 
 var widgets = {
-  resolve: resolve$c,
+  resolve: resolve$d,
   log: log$3,
   isObject: isObject$2,
   isArray: isArray$1,
-  createTask: createTask$5,
+  createTask: createTask$4,
   downloadRepo,
   downloadRepoForGit: downloadRepoForGit$2,
   suggestCommands: suggestCommands$1,
   camelize
 };
 
-const path$6 = require('path'); // 用户目录
+const path$a = require('path'); // 用户目录
 
 
 const HOME_DIR = process.env.HOME; // 所有文件的缓存目录
 
-const CACHE_DIR$1 = path$6.resolve(HOME_DIR, '.tmskit'); // 脚手架模板代码所在目录
+const CACHE_DIR$1 = path$a.resolve(HOME_DIR, '.tmskit'); // 脚手架模板代码所在目录
 
-const TEMPLATE_DIR$1 = path$6.resolve(CACHE_DIR$1, 'template'); // 第三方模块源码存放的临时缓存目录
+const TEMPLATE_DIR$1 = path$a.resolve(CACHE_DIR$1, 'template'); // 第三方模块源码存放的临时缓存目录
 
-const MODULE_CODE_DIR$1 = path$6.resolve(CACHE_DIR$1, 'modules_code'); // 脚手架模板代码的具体路径
+const MODULE_CODE_DIR$1 = path$a.resolve(CACHE_DIR$1, 'modules_code'); // 脚手架模板代码的具体路径
 
-const TEMPLATE_PATH$1 = path$6.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$5 = '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$2 = {
-  app: path$6.resolve(process.cwd(), 'app')
+const DEFAULT_WEBPACK_ENTRY = {
+  app: path$a.resolve(process.cwd(), 'app')
 }; // 默认从源码拷贝到编译后的配置
 
-const DEFAULT_COPY_CONFIG$3 = ['package.json', 'app.js', 'app.ts', 'app.less', 'app.wxss', 'sitemap.json']; // 开发模式
+const DEFAULT_COPY_CONFIG$1 = ['package.json', 'sitemap.json']; // 开发模式
 
 const MODE$1 = {
-  main: 'tkitmain',
   all: 'all',
   multi: 'multi'
 };
@@ -285,6 +293,7 @@ const ENV = {
   prod: 'production'
 };
 const TEMPLATE_TKIT_DIR$2 = '_tmskit';
+const MODULE_CONFIG_INVALID_KEY$1 = ['entranceDeclare', 'entryPagePath'];
 
 var constant = /*#__PURE__*/Object.freeze({
 	__proto__: null,
@@ -294,26 +303,39 @@ 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$5,
-	MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$2,
-	DEFAULT_WEBPACK_ENTRY: DEFAULT_WEBPACK_ENTRY$2,
-	DEFAULT_COPY_CONFIG: DEFAULT_COPY_CONFIG$3,
+	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,
 	MODE: MODE$1,
 	ENV: ENV,
-	TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$2
+	TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$2,
+	MODULE_CONFIG_INVALID_KEY: MODULE_CONFIG_INVALID_KEY$1
 });
 
 var require$$3 = /*@__PURE__*/getAugmentedNamespace(constant);
 
-const fs$a = require$$0__default$1;
+const fs$d = require$$0__default$1;
+const path$9 = require$$3__default;
 /**
  * 判断目录是否为空
  * @param {string} dirname 目录名
  * @returns
  */
 
-const isDirEmpty = dirname => fs$a.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$d.lstatSync(pathName);
+    return stat.isFile();
+  } catch {
+    return false;
+  }
+};
 /**
  * 确保目录存在，不存在就创建一个
  * @param {*} dirname 目录名
@@ -321,19 +343,99 @@ const isDirEmpty = dirname => fs$a.promises.readdir(dirname).then(files => files
 
 
 const ensureDirExist = dirname => {
-  if (!fs$a.existsSync(dirname)) {
-    fs$a.mkdirSync(dirname, {
+  if (!fs$d.existsSync(dirname)) {
+    fs$d.mkdirSync(dirname, {
       recursive: true
     });
   }
+}; // 复制文件
+
+
+const copyFile = function (src, dest) {
+  if (fs$d.existsSync(dest)) {
+    fs$d.unlinkSync(dest);
+  }
+
+  const dir = path$9.dirname(dest);
+  ensureDirExist(dir);
+  fs$d.copyFileSync(src, dest);
+}; // 判断文件内容是否一致，不一致再进行拷贝
+
+
+function diffContentCopyFile$3(originFile, destFile) {
+  if (fs$d.existsSync(destFile)) {
+    const depDestContent = fs$d.readFileSync(destFile, 'utf8');
+    const depOriginContent = fs$d.readFileSync(originFile, 'utf8');
+
+    if (depDestContent !== depOriginContent) {
+      console.log(`拷贝${originFile}内容到${destFile}`);
+      copyFile(originFile, destFile);
+    }
+  } else {
+    console.log(`拷贝${originFile}内容到${destFile}`);
+    copyFile(originFile, destFile);
+  }
+} // 添加后缀
+
+
+function ext$3(filePath, extensions) {
+  let newFilePath = filePath;
+  let extPath = ''; // try catch需要包裹：用来处理'./lib/timer'没有后缀的情况
+
+  try {
+    const stat = fs$d.lstatSync(newFilePath);
+
+    if (stat.isDirectory()) {
+      extPath = newFilePath[newFilePath.length - 1] === '/' ? 'index' : '/index';
+      newFilePath += extPath;
+    }
+  } catch (e) {}
+
+  for (const ext of extensions) {
+    const file = newFilePath.endsWith(ext) ? newFilePath : newFilePath + ext;
+
+    if (fs$d.existsSync(file)) {
+      return {
+        ext,
+        extPath: extPath + ext,
+        file
+      };
+    }
+  }
+
+  return {
+    ext: '',
+    extPath,
+    file: filePath
+  };
+} // 判断文件是否在某个目录
+
+
+const fileInDir$3 = (dir, file) => {
+  if (!fs$d.existsSync(dir) || !fs$d.existsSync(file)) {
+    return false;
+  }
+
+  const relativePath = path$9.relative(dir, file);
+
+  if (relativePath.startsWith('..')) {
+    return false;
+  }
+
+  return true;
 };
 
 var io$2 = {
   isDirEmpty,
-  ensureDirExist
+  copyFile,
+  diffContentCopyFile: diffContentCopyFile$3,
+  ensureDirExist,
+  ext: ext$3,
+  fileInDir: fileInDir$3,
+  isFile
 };
 
-const chalk$2 = require$$0__default$3;
+const chalk$2 = require$$0__default$2;
 /**
  * 本文件提供无依赖的在终端打印彩色文字的方法。
  */
@@ -384,8 +486,8 @@ var log$2 = {
   warn
 };
 
-const async = require$$0__default$4;
-const ejs = require$$1__default$2;
+const async = require$$0__default$3;
+const ejs = require$$1__default$1;
 
 const render$1 = (files, metalsmith, next) => {
   const keys = Object.keys(files);
@@ -404,10 +506,10 @@ const render$1 = (files, metalsmith, next) => {
 
 var render_1 = render$1;
 
-const fs$9 = require$$0__default$1;
-const inquirer = require$$1__default$3;
+const fs$c = require$$0__default$1;
+const inquirer = require$$1__default$2;
 const {
-  resolve: resolve$b
+  resolve: resolve$c
 } = widgets;
 const {
   TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$1
@@ -421,12 +523,12 @@ const {
 const parseTemplateQuestions = dir => {
   let prompts = [];
 
-  if (!fs$9.existsSync(`${dir}/questions.json`)) {
+  if (!fs$c.existsSync(`${dir}/questions.json`)) {
     return prompts;
   }
 
   try {
-    const json = JSON.parse(fs$9.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) => {
@@ -459,7 +561,7 @@ const isQuestionType = result => {
 };
 
 const ask$1 = templateDir => (files, metalsmith, next) => {
-  const prompts = parseTemplateQuestions(resolve$b(templateDir, TEMPLATE_TKIT_DIR$1));
+  const prompts = parseTemplateQuestions(resolve$c(templateDir, TEMPLATE_TKIT_DIR$1));
   const metadata = metalsmith.metadata();
   const filteredPrompts = prompts.filter(prompt => {
     if (metadata[prompt.name] && `${metadata[prompt.name]}`.trim() !== '') {
@@ -484,7 +586,7 @@ var ask_1 = ask$1;
 const FILES_TO_IGNORE$1 = ['node_modules'];
 var ignoreFiles = FILES_TO_IGNORE$1;
 
-const Metalsmith = require$$0__default$5;
+const Metalsmith = require$$0__default$4;
 const render = render_1;
 const ask = ask_1;
 const FILES_TO_IGNORE = ignoreFiles;
@@ -501,9 +603,9 @@ const generator$1 = (buildDir, distDir, preMetadata) => new Promise((resolve, re
 
 var generator_1 = generator$1;
 
-const path$5 = require$$1__default$1;
-const fs$8 = require$$0__default$1;
-const shelljs$5 = require$$0__default$2;
+const path$8 = require$$3__default;
+const fs$b = require$$0__default$1;
+const shelljs$5 = require$$4__default;
 const {
   TEMPLATE_DIR,
   TEMPLATE_PATH,
@@ -511,8 +613,8 @@ const {
 } = require$$3;
 const {
   downloadRepoForGit: downloadRepoForGit$1,
-  createTask: createTask$4,
-  resolve: resolve$a
+  createTask: createTask$3,
+  resolve: resolve$b
 } = widgets;
 const io$1 = io$2;
 const {
@@ -528,7 +630,7 @@ const generator = generator_1;
 
 async function createAppDir(targetDir) {
   // 如果目录非空或者已经存在，提示用户，做选择
-  if (fs$8.existsSync(targetDir)) {
+  if (fs$b.existsSync(targetDir)) {
     if (!(await io$1.isDirEmpty(targetDir))) {
       fail$9('该目录名已经存在，换个项目名字吧~');
       process.exit(1);
@@ -546,21 +648,21 @@ async function createAppDir(targetDir) {
 
 async function create(appName) {
   const cwd = process.cwd();
-  const targetDir = path$5.resolve(cwd, appName);
+  const targetDir = path$8.resolve(cwd, appName);
   const appType = 'mp';
   await createAppDir(targetDir); // 创建缓存目录
 
   io$1.ensureDirExist(TEMPLATE_DIR); // 拉取git模板
 
-  await createTask$4(downloadRepoForGit$1, '拉取模板仓库', '拉取模板仓库完成')('https://git.woa.com/tmsfe/tms-frontend.git', TEMPLATE_DIR, 'master'); // 生成模板(1. 询问问题， 2. ejs生成模板  3.生成到目标目录)
+  await createTask$3(downloadRepoForGit$1, '拉取模板仓库', '拉取模板仓库完成')('https://git.woa.com/tmsfe/tms-frontend.git', TEMPLATE_DIR, 'master'); // 生成模板(1. 询问问题， 2. ejs生成模板  3.生成到目标目录)
 
-  generator(path$5.join(TEMPLATE_PATH, appType), targetDir, {
+  generator(path$8.join(TEMPLATE_PATH, appType), targetDir, {
     appName,
     appType
   }).then(() => {
     shelljs$5.cd(appName);
 
-    const hooks = require(resolve$a(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
+    const hooks = require(resolve$b(appName, TEMPLATE_TKIT_DIR, 'hooks.js'));
 
     if (hooks.afterCreate) {
       hooks.afterCreate.forEach(item => {
@@ -574,7 +676,7 @@ async function create(appName) {
       });
     }
 
-    shelljs$5.rm('-rf', resolve$a(appName, TEMPLATE_TKIT_DIR));
+    shelljs$5.rm('-rf', resolve$b(appName, TEMPLATE_TKIT_DIR));
     succeed('项目创建完成.');
   }).catch(err => {
     fail$9(err.message);
@@ -584,38 +686,55 @@ async function create(appName) {
 
 var create_1 = create;
 
-const fs$7 = require$$0__default$1;
 const {
-  DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR$4,
-  MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1
+  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 {
+  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$9,
+  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,
@@ -637,16 +756,16 @@ function setModuleConfig$1(file, appName, moduleDir) {
  */
 
 
-function getLocalModuleConfig(modules = [], appName, moduleDir, moduleConfigFilename) {
+function getLocalModuleConfig(modules = [], appName, moduleConfigFilename) {
   const modulesConfig = {};
   modules.forEach(({
     path
   }) => {
-    const moduleConfigPath = resolve$9(path, moduleConfigFilename);
+    const moduleConfigPath = resolve$a(path, moduleConfigFilename);
 
-    if (fs$7.existsSync(moduleConfigPath)) {
-      const content = fs$7.readFileSync(moduleConfigPath, 'utf-8');
-      modulesConfig[moduleConfigPath] = setModuleConfig$1(content, appName, moduleDir);
+    if (fs$a.existsSync(moduleConfigPath)) {
+      const content = fs$a.readFileSync(moduleConfigPath, 'utf-8');
+      modulesConfig[moduleConfigPath] = setModuleConfig$1(content, appName);
     }
   });
   return modulesConfig;
@@ -670,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);
     }
 
@@ -696,16 +815,16 @@ function updateMainPackages(appJson, mainPackages = []) {
 
 
 const getAppJsonContent = sourceAppJsonPath => {
-  if (!fs$7.existsSync(sourceAppJsonPath)) {
-    fail$8(`当前路径 ${sourceAppJsonPath} 没找到app.json`);
+  if (!fs$a.existsSync(sourceAppJsonPath)) {
+    fail$7(`当前路径 ${sourceAppJsonPath} 没找到app.json`);
     process.exit(1);
   }
 
-  const appJson = JSON.parse(fs$7.readFileSync(sourceAppJsonPath), 'utf-8'); // 加入默认值
+  const appJson = JSON.parse(fs$a.readFileSync(sourceAppJsonPath), 'utf-8'); // 加入默认值
 
   appJson.subpackages = [];
-  appJson.pages = [];
-  appJson.plugins = {};
+  appJson.pages = []; // appJson.plugins = {};
+
   delete appJson.entranceDeclare;
   return appJson;
 };
@@ -719,11 +838,93 @@ 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
+ */
+
+
+const processAppJson = 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;
+      }
+
+      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;
+      }
+
+      if (['requiredBackgroundModes', 'embeddedAppIdList'].indexOf(key) > -1) {
+        // 提到appjson最上层处理
+        const preVal = appJson[key]; // eslint-disable-next-line
+
+        preVal ? appJson[key] = Array.from(new Set(preVal // eslint-disable-next-line
+        .slice(0).concat(subp[key]))) : appJson[key] = subp[key].slice(0);
+        return;
+      }
+    });
+
+    if (invalidKeys.length) {
+      fail$7(`不支持分包${subp === null || subp === void 0 ? void 0 : subp.name}配置${invalidKeys.join(',')}\n`);
+    } // eslint-disable-next-line
+
+
+    invalidKeys.concat(['requiredBackgroundModes', 'embeddedAppIdList']).forEach(k => delete subp[k]);
+    return subp;
+  }); // 如果plugins重复，则错误提示
+
+  const pluginsErrMsg = Object.keys(pluginsMap).map(pk => {
+    if (pluginsMap[pk].length > 1) {
+      return `${pluginsMap[pk].join(',')}重复配置plugin(${pk});`;
+    }
+
+    return '';
+  }).reduce((pre, cur) => pre + cur, '');
+
+  if (pluginsErrMsg) {
+    fail$7(`plugins配置出现错误:${pluginsErrMsg}`);
+  } // eslint-disable-next-line
+
+
+  appJson.subpackages = subps;
+};
 /**
  * 动态生成编译后的app.json
  * @param {object} tmsConfig
@@ -732,283 +933,279 @@ const updateSubpackages = (appJson, modulesConfig) => {
  */
 
 
-function buildOutputAppJson$2(tmsConfig, modules) {
-  // 获取当前 modules 下的所有子模块的配置内容
-  const modulesConfig = getLocalModuleConfig(modules, tmsConfig.appName, DEFAULT_MODULE_DIR$4, 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$9('./app.json')); // 更新app.json中的subpackages
+    updateSubpackages(appJson, modulesConfig); // 处理appJson中重复||冲突的地方
 
-  updateSubpackages(appJson, modulesConfig); // 更新主包，需在subpackages处理完成后执行， pages/
+    processAppJson(appJson); // 更新主包，需在subpackages处理完成后执行， pages/
 
-  updateMainPackages(appJson, tmsConfig.mainPackages);
-  fs$7.writeFileSync(resolve$9(`${tmsConfig.webpack.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,
-  buildOutputAppJson: buildOutputAppJson$2
+  getValidModules: getValidModules$1,
+  buildOutputAppJson: buildOutputAppJson$1
 };
 
-/**
- * 本文件主要负责项目或者分包依赖的npm的安装
- */
-const fs$6 = require$$0__default$1;
-const path$4 = require$$1__default$1;
-const shell = require$$0__default$2;
-const LOG = log$2;
-const dirpath = process.cwd(); // 项目根目录
-
-const getTarNpmFilename = targetDir => `${targetDir.replaceAll('/', '-')}.tar.gz`; // 缓存npm包
-
-
-const npmCache = function (targetDir, cacheDir) {
-  if (!fs$6.existsSync(cacheDir)) {
-    fs$6.mkdirSync(cacheDir);
+class Globale {
+  constructor() {
+    this.moduleCache = {};
   }
 
-  const tarNpmFilename = getTarNpmFilename(targetDir);
-  const tarNpmFilePath = `${cacheDir}/${tarNpmFilename}`;
+  setModuleCache(url, branch, dest) {
+    const instance = getGlobalInstance$1();
+    const key = `${branch}:${url}`;
+    instance.moduleCache[key] = {
+      dest
+    };
+    return instance.moduleCache[key];
+  }
 
-  if (fs$6.existsSync(tarNpmFilePath)) {
-    shell.rm('-rf', tarNpmFilePath);
+  getModuleCache(url, branch) {
+    const instance = getGlobalInstance$1();
+    return instance.moduleCache[`${branch}:${url}`];
   }
 
-  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包
+}
 
+let instance;
 
-const getNpmCache = function (targetDir, cacheDir) {
-  const tarNpmFilename = getTarNpmFilename(targetDir);
-  const tarNpmFilePath = `${cacheDir}/${tarNpmFilename}`;
+function getGlobalInstance$1() {
+  if (instance) {
+    return instance;
+  }
 
-  if (fs$6.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 ./
+  return instance = new Globale();
+}
 
-}; // 遍历安装指定目录下所有项目的npm依赖
+var global = {
+  getGlobalInstance: getGlobalInstance$1
+};
 
+var defaultTmsConfig$1 = {
+  // 全局的环境配置项
+  envData: {},
+  // 模块配置信息
+  modules: [],
+  cloudDir: 'cloud',
+  // 第三方依赖代码需要拷贝到本项目的
+  dependencies: {},
 
-const npmInstallAll$1 = async (modules, contextDir, cacheDir) => {
-  const packageJsonFiles = await findAllPackageJson$1(modules, contextDir);
-  await Promise.all(packageJsonFiles.map(file => new Promise(resolve => {
-    const dir = path$4.dirname(file);
-    shell.cd(dir);
+  /** 编译输出文件夹位置 */
+  outputDir: 'dist',
 
-    if (!fs$6.existsSync(`${dir}/node_modules`)) {
-      getNpmCache(dir, cacheDir);
-    }
+  /** 源码监听路径 */
+  sourceDir: './',
 
-    shell.exec('npx pnpm install --prod --registry http://mirrors.tencent.com/npm/', {
-      silent: false
-    });
-    resolve();
-    npmCache(dir, cacheDir);
-  })));
+  /** 静态资源目录 */
+  static: []
 };
+
+const loadash = require$$0__default$5;
+const fs$9 = require$$0__default$1;
+const {
+  TMS_NAME: TMS_NAME$1,
+  TMS_CONFIG_FILENAME,
+  MODULE_CONFIG_FILENAME: MODULE_CONFIG_FILENAME$1,
+  TMS_PRIVATE_FILENAME
+} = require$$3;
+const {
+  resolve: resolve$9,
+  isObject
+} = widgets;
+const {
+  setModuleConfig,
+  getValidModules
+} = buildAppJson;
+const defaultTmsConfig = defaultTmsConfig$1;
+const {
+  fail: fail$6
+} = log$2;
+const path$7 = require$$3__default;
 /**
- * 递归查找指定条件的文件
- * @param {String} startPath 开始查找的根路径
- * @param {String} filter 匹配的字符串
- * @returns {Array<String>} 查找到的文件路径列表
+ * 读取tms.config.js
+ * @param env {string} 环境变量
  */
 
+const readTmsConfig$1 = function (env) {
+  const tmsConfigPath = resolve$9(TMS_CONFIG_FILENAME);
 
-const findFilesByFilter = (startPath, filter) => {
-  const result = [];
-  /**
-   * 根据指定的筛选器查找文件
-   * @param {String} startPath 开始查找的文件夹路径
-   * @param {String} filter 筛选器
-   * @returns {Undefined} 无需返回值
-   */
+  if (!fs$9.existsSync(tmsConfigPath)) {
+    fail$6('当前执行目录没有tms.config.js的配置项，请进行配置');
+    process.exit(1);
+  }
 
-  const find = (startPath, filter) => {
-    // 目录不存在
-    if (!fs$6.existsSync(startPath)) {
-      LOG.fail(`${startPath}目录不存在`);
-      process.exit(-1);
-      return;
-    } // 当前目录下的所有文件 / 文件夹
+  const tmsConfigFn = require(tmsConfigPath);
 
+  const tmsConfig = tmsConfigFn({
+    env
+  }); // 合并默认值
 
-    const exceptDir = ['node_modules', 'miniprogram_npm'];
+  loadash.mergeWith(tmsConfig, defaultTmsConfig); // modules兼容处理
 
-    if (exceptDir.find(item => startPath.indexOf(item) > -1)) {
-      return;
-    }
+  tmsConfig.modules = convertModules(tmsConfig.modules);
+  return tmsConfig;
+}; // convertModules 处理默认值
 
-    const files = fs$6.readdirSync(startPath);
-    files.forEach(file => {
-      const filename = path$4.join(startPath, file);
-      const stat = fs$6.lstatSync(filename); // 当前文件是文件夹类型，继续递归
 
-      if (stat.isDirectory()) {
-        find(filename, filter);
-      } else if (filename.indexOf(filter) >= 0) {
-        // 文件类型
-        result.push(filename);
+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);
       }
-    });
-  };
+    }
 
-  find(startPath, filter);
-  return result;
+    newModules.push(newModule);
+  });
+  return newModules;
 };
 /**
- * 找到项目中所有的package.json文件
- * @param {Array<String>} subRoots 需要安装npm依赖的路径
- * @param {String} contextDir 命令运行的目录
- * @returns {Array<String>} 找到的所有package.json文件的路径
+ * 读取tms.private.js
  */
 
 
-const findAllPackageJson$1 = (subRoots = [], contextDir) => {
-  const packageJsonName = 'package.json'; // 查找文件名
-
-  const cwd = contextDir || dirpath;
-  const result = [path$4.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
+const readTmsPrivateCf$2 = function () {
+  let tmsPrivateCg;
+  const tmsPrivatePath = resolve$9(TMS_PRIVATE_FILENAME);
 
-  subRoots.forEach(subRoot => {
-    const toppath = path$4.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
+  if (fs$9.existsSync(tmsPrivatePath)) {
+    tmsPrivateCg = require(tmsPrivatePath);
+  }
 
-    const list = findFilesByFilter(toppath, packageJsonName);
-    result.push(...list);
-  });
-  return result;
+  return tmsPrivateCg;
 };
-
-var npmUtils = {
-  npmInstallAll: npmInstallAll$1,
-  findAllPackageJson: findAllPackageJson$1
-};
-
-/* eslint-disable require-jsdoc */
-const ci = require$$0__default$6;
-const path$3 = require$$1__default$1;
 /**
- * 获取小程序ci的Project对象
- * @returns {Object} 小程序ci对象
+ * 从tms.config.json中检索用户传入的有效modules
+ * @param { object } tmsConfig
+ * @param { array } modules
+ * @returns
  */
 
-const getMpCi = ({
-  appId,
-  projectPath,
-  type = 'miniProgram',
-  privateKey = 'TODO'
-}) => {
-  var _cfgJsonContent$packO;
-
-  const cfgJsonContent = require(path$3.join(projectPath, 'project.config.json'));
 
-  const ignores = (cfgJsonContent === null || cfgJsonContent === void 0 ? void 0 : (_cfgJsonContent$packO = cfgJsonContent.packOptions) === null || _cfgJsonContent$packO === void 0 ? void 0 : _cfgJsonContent$packO.ignore.map(({
-    value
-  }) => value)) || [];
-  return new ci.Project({
-    appid: appId,
-    privateKey,
-    type,
-    projectPath,
-    ignores: ['node_modules/**/*', ...ignores]
+const checkModules$1 = function (tmsConfig, modules) {
+  const targetModules = [];
+  modules.forEach(moduleName => {
+    const module = tmsConfig.modules.find(module => module.name === moduleName);
+    module && targetModules.push(module);
   });
-}; // 用小程序ci工具构建小程序
 
+  if (targetModules.length === 0) {
+    fail$6(`你启动的模块无效，尝试 ${TMS_NAME$1} -m moduleName`);
+    process.exit(1);
+  }
 
-const packMpProject = async project => {
-  await ci.packNpm(project, {
-    ignores: ['cloud/**/*']
-  });
+  return targetModules;
 };
 /**
- * 格式化构建npm结果信息
- * @param {Array<String>} warning 构建时的告警信息
- * @returns {String} npm构建错误信息
+ * tms.config.js的modules 合并 module.config.json的配置项
+ * @param {array} modules
+ * @param {string} appName
+ * @param {string} moduleDir
+ * @returns
  */
 
 
-const formatPackNpmWarning = warning => {
-  if (!warning) {
-    return '';
-  }
-
-  const result = warning.map((it, index) => `${index + 1}. ${it.msg}
-  \t@ ${it.jsPath}:${it.tips}`).join('---------------\n');
-  return result;
+const tmsModulesMergeLocalModuleCfg$3 = (modules, appName) => {
+  const newModules = [];
+  modules.forEach(({
+    path: relativePath,
+    name: moduleName
+  }, moduleIndex) => {
+    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]
+      });
+    }
+  });
+  return newModules;
 };
 /**
- * 构建miniprogram_npm
- *  @returns {Object} 小程序ci对象
+ * 分包依赖了分包的模块 合并所依赖的modules
+ * @param { object } tmsConfig
+ * @param {array} modules
+ * @param {string} moduleDir
+ * @returns
  */
 
 
-const buildMpNpm$2 = async ({
-  appId,
-  projectPath,
-  privateKey
-}) => {
-  const mpCi = await getMpCi({
-    appId,
-    projectPath,
-    privateKey
+const subModulesMergeDepModules$2 = (tmsConfig, modules) => {
+  const moduleNames = [];
+  modules.forEach(({
+    name: moduleName
+  }) => {
+    moduleNames.push(moduleName);
   });
-  const packNpmWarning = await packMpProject(mpCi);
-  const packNpmMsg = formatPackNpmWarning(packNpmWarning);
-
-  if (packNpmMsg) {
-    return Promise.reject(packNpmMsg);
-  }
-
-  return Promise.resolve();
-};
-
-var mpCiUtils = {
-  buildMpNpm: buildMpNpm$2
+  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);
 };
 
-class Globale {
-  constructor() {
-    this.moduleCache = {};
-  }
-
-  setModuleCache(url, branch, dest) {
-    const instance = getGlobalInstance$1();
-    const key = `${branch}:${url}`;
-    instance.moduleCache[key] = {
-      dest
-    };
-    return instance.moduleCache[key];
-  }
-
-  getModuleCache(url, branch) {
-    const instance = getGlobalInstance$1();
-    return instance.moduleCache[`${branch}:${url}`];
-  }
-
-}
-
-let instance;
-
-function getGlobalInstance$1() {
-  if (instance) {
-    return instance;
-  }
-
-  return instance = new Globale();
-}
-
-var global = {
-  getGlobalInstance: getGlobalInstance$1
+var tkitUtils = {
+  readTmsConfig: readTmsConfig$1,
+  readTmsPrivateCf: readTmsPrivateCf$2,
+  checkModules: checkModules$1,
+  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$3,
+  subModulesMergeDepModules: subModulesMergeDepModules$2
 };
 
-const MetalSmith = require$$0__default$5;
+const MetalSmith = require$$0__default$4;
 const {
   getGlobalInstance
 } = global;
@@ -1017,10 +1214,39 @@ const {
   resolve: resolve$8
 } = widgets;
 const {
-  fail: fail$7
+  readTmsPrivateCf: readTmsPrivateCf$1
+} = tkitUtils;
+const {
+  fail: fail$5
 } = log$2;
-const fs$5 = require$$0__default$1;
-const shelljs$4 = require$$0__default$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 缓存文件夹
@@ -1029,14 +1255,14 @@ const shelljs$4 = require$$0__default$2;
  * @returns { undefined } no return
  */
 
+
 function moveFile(sourceDir, targetDir, ignore = []) {
   // 删除不是文件夹的文件
-  return new Promise(resolve => {
+  return new Promise((resolve, reject) => {
     MetalSmith(__dirname).ignore(ignore).source(sourceDir).destination(targetDir).build(e => {
       if (e) {
-        fail$7(e); // eslint-disable-line
-
-        console.log('MetalSmith 详细的错误信息:', e);
+        fail$5(`${sourceDir} moveFile ${targetDir}出现错误: ${e}`);
+        reject(e);
       }
 
       resolve();
@@ -1047,16 +1273,18 @@ function moveFile(sourceDir, targetDir, ignore = []) {
  * 下载目标模块
  * @param { string } sourceDir 缓存文件夹
  * @param { string } targetDir 目标文件夹
+ * @param { boolean } isDev 是否是dev
  * @returns { array } modules 描述模块的列表
  */
 
 
-async function cloneModules$1(sourceDir, targetDir, modules) {
-  // 根据小程序的配置文件下载模块， 并且处理信息
+async function cloneModules$1(sourceDir, targetDir, modules, isDev) {
+  // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
+  const privateCf = readTmsPrivateCf$1(); // 根据小程序的配置文件下载模块， 并且处理信息
+
   for (const moduleInfo of modules) {
-    // eslint-disable-line
     if (moduleInfo.repoInfo) {
-      await downLoadAndMoveModule(sourceDir, targetDir, moduleInfo);
+      await downLoadAndMoveModule(sourceDir, targetDir, moduleInfo, privateCf, isDev);
     }
   }
 }
@@ -1064,20 +1292,22 @@ async function cloneModules$1(sourceDir, targetDir, modules) {
  * 下载模块信息并且将它移动到对应的位置
  * @param { string } sourceDir 代码缓存文件夹
  * @param { string } targetDir 代码要放到的目标文件夹
+ * @param { boolean } isDev 是否是dev
  * @returns { array } moduleInfo 描述模块的信息
  */
 
 
-async function downLoadAndMoveModule(sourceDir, targetDir, moduleInfo) {
+async function downLoadAndMoveModule(sourceDir, targetDir, moduleInfo, privateCf, isDev) {
   const {
     repoInfo: {
       buildGitTag,
       httpRepoUrl
     },
-    path
+    path,
+    name
   } = moduleInfo; // 源码临时存在的源目录
 
-  let sourcePath = resolve$8(sourceDir, path); // 源码要放到目标目录
+  let sourcePath = resolve$8(sourceDir, name); // 源码要放到目标目录
 
   const targetPath = resolve$8(targetDir, path); // 设置模块的构建分支
 
@@ -1088,21 +1318,21 @@ async function downLoadAndMoveModule(sourceDir, targetDir, moduleInfo) {
 
   try {
     if (!moduleInCache) {
-      await downloadRepoForGit(httpRepoUrl, sourcePath, cloneBranch);
+      // 处理仓库权限问题
+      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$5.existsSync(targetPath)) {
-      shelljs$4.rm('-rf', targetPath);
+    if (fs$8.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);
+    handleError$1(e, isDev);
   }
 }
 
@@ -1110,165 +1340,323 @@ var cloneModules_1 = {
   cloneModules: cloneModules$1
 };
 
-var defaultTmsConfig$1 = {
-  // 全局的环境配置项
-  envData: {},
-  // 模块配置信息
-  modules: [],
-  webpack: {
-    /** 编译输出文件夹位置 */
-    outputDir: 'dist',
+const ci = require$$0__default$6;
+const path$6 = require$$3__default;
+/**
+ * 获取小程序ci的Project对象
+ * @returns {Object} 小程序ci对象
+ */
 
-    /** 源码监听路径 */
-    sourceDir: './',
+const getMpCi = ({
+  appId,
+  projectPath,
+  type = 'miniProgram',
+  privateKey = 'TODO'
+}) => {
+  var _cfgJsonContent$packO;
 
-    /** 源码Map */
-    sourceMap: 'none',
+  const cfgJsonContent = require(path$6.join(projectPath, 'project.config.json'));
 
-    /** 别名 */
-    alias: {}
+  const ignores = (cfgJsonContent === null || cfgJsonContent === void 0 ? void 0 : (_cfgJsonContent$packO = cfgJsonContent.packOptions) === null || _cfgJsonContent$packO === void 0 ? void 0 : _cfgJsonContent$packO.ignore.map(({
+    value
+  }) => value)) || [];
+  return new ci.Project({
+    appid: appId,
+    privateKey,
+    type,
+    projectPath,
+    ignores: ['node_modules/**/*', ...ignores]
+  });
+}; // 用小程序ci工具构建小程序
+
+
+const packMpProject = async project => {
+  await ci.packNpm(project, {
+    ignores: ['cloud/**/*']
+  });
+};
+/**
+ * 格式化构建npm结果信息
+ * @param {Array<String>} warning 构建时的告警信息
+ * @returns {String} npm构建错误信息
+ */
+
+
+const formatPackNpmWarning = warning => {
+  if (!warning) {
+    return '';
   }
+
+  const result = warning.map((it, index) => `${index + 1}. ${it.msg}
+  \t@ ${it.jsPath}:${it.tips}`).join('---------------\n');
+  return result;
+};
+/**
+ * 构建miniprogram_npm
+ *  @returns {Object} 小程序ci对象
+ */
+
+
+const buildMpNpm$1 = async ({
+  appId,
+  projectPath,
+  privateKey
+}) => {
+  const mpCi = await getMpCi({
+    appId,
+    projectPath,
+    privateKey
+  });
+  const packNpmWarning = await packMpProject(mpCi);
+  const packNpmMsg = formatPackNpmWarning(packNpmWarning);
+
+  if (packNpmMsg) {
+    return Promise.reject(packNpmMsg);
+  }
+
+  return Promise.resolve();
+};
+
+var mpCiUtils = {
+  buildMpNpm: buildMpNpm$1
 };
 
-const loadash = require$$0__default$7;
-const fs$4 = require$$0__default$1;
-const {
-  TMS_NAME: TMS_NAME$1,
-  TMS_CONFIG_FILENAME,
-  MODULE_CONFIG_FILENAME
-} = require$$3;
-const {
-  resolve: resolve$7,
-  isObject
-} = widgets;
-const {
-  setModuleConfig
-} = buildAppJson;
-const defaultTmsConfig = defaultTmsConfig$1;
-const {
-  fail: fail$6
-} = log$2;
 /**
- * 读取tms.config.json
- * @param env {string} 环境变量
+ * 本文件主要负责项目或者分包依赖的npm的安装
  */
+const fs$7 = require$$0__default$1;
+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 shellJsOption = {
+  async: false,
+  silent: true
+};
+const dirPath = process.cwd(); // 项目根目录
 
-const readTmsConfig$1 = function (env) {
-  const tmsConfigPath = resolve$7(TMS_CONFIG_FILENAME);
+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 (!fs$4.existsSync(tmsConfigPath)) {
-    fail$6('当前执行目录没有tms.config.js的配置项，请进行配置');
-    process.exit(1);
+  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);
+
+      if (retry) {
+        return await install$3(packageJsonPath, false);
+      }
+
+      throw err;
+    }
+
+    shell.exec('tar -zcvf ./node_modules.tar.gz ./node_modules', shellJsOption);
+    shell.exec('rm -rf ./node_modules', shellJsOption);
   }
 
-  const tmsConfigFn = require(tmsConfigPath);
+  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 tmsConfig = tmsConfigFn({
-    env
-  }); // 合并默认值
 
-  loadash.mergeWith(tmsConfig, defaultTmsConfig);
-  return tmsConfig;
+const mpNpmInstallAll$1 = async (modules, contextDir, cacheDir) => {
+  const packageJsonFiles = await findAllPackageJson(modules, contextDir);
+  await Promise.all(packageJsonFiles.map(file => install$3(file, true, cacheDir)));
 };
 /**
- * 从tms.config.json中检索用户传入的有效modules
- * @param { object } tmsConfig
- * @param { array } modules
- * @returns
+ * 递归查找指定条件的文件
+ * @param {String} startPath 开始查找的根路径
+ * @param {String} filter 匹配的字符串
+ * @returns {Array<String>} 查找到的文件路径列表
  */
 
 
-const checkModules$1 = function (tmsConfig, modules) {
-  const targetModules = [];
-  modules.forEach(moduleName => {
-    const module = tmsConfig.modules.find(module => module.name === moduleName);
-    module && targetModules.push(module);
-  });
+const findFilesByFilter = (startPath, filter) => {
+  const result = [];
+  /**
+   * 根据指定的筛选器查找文件
+   * @param {String} startPath 开始查找的文件夹路径
+   * @param {String} filter 筛选器
+   * @returns {Undefined} 无需返回值
+   */
 
-  if (targetModules.length === 0) {
-    fail$6(`你启动的模块无效，尝试 ${TMS_NAME$1} -m moduleName`);
-    process.exit(1);
-  }
+  const find = (startPath, filter) => {
+    // 目录不存在
+    if (!fs$7.existsSync(startPath)) {
+      LOG.fail(`${startPath}目录不存在`);
+      process.exit(-1);
+      return;
+    } // 当前目录下的所有文件 / 文件夹
 
-  return targetModules;
+
+    const exceptDir = ['node_modules', 'miniprogram_npm'];
+
+    if (exceptDir.find(item => startPath.indexOf(item) > -1)) {
+      return;
+    }
+
+    const files = fs$7.readdirSync(startPath);
+    files.forEach(file => {
+      const filename = path$5.join(startPath, file);
+      const stat = fs$7.lstatSync(filename); // 当前文件是文件夹类型，继续递归
+
+      if (stat.isDirectory()) {
+        find(filename, filter);
+      } else if (filename.indexOf(filter) >= 0) {
+        // 文件类型
+        result.push(filename);
+      }
+    });
+  };
+
+  find(startPath, filter);
+  return result;
 };
 /**
- * tms.config.js的modules 合并 module.config.json的配置项
- * @param {array} modules
- * @param {string} appName
- * @param {string} moduleDir
- * @returns
+ * 找到项目中所有的package.json文件
+ * @param {Array<String>} subRoots 需要安装npm依赖的路径
+ * @param {String} contextDir 命令运行的目录
+ * @returns {Array<String>} 找到的所有package.json文件的路径
  */
 
 
-const tmsModulesMergeLocalModuleCfg$3 = (modules, appName, moduleDir) => {
-  const newModules = [];
-  modules.forEach(({
-    path: relativePath,
-    name: moduleName
-  }, moduleIndex) => {
-    const moduleConfigPath = resolve$7(relativePath, MODULE_CONFIG_FILENAME);
-
-    if (fs$4.existsSync(moduleConfigPath)) {
-      let moduleConfigContent = fs$4.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]
-          });
-        }
-      });
-    } else {
-      newModules.push({ ...modules[moduleIndex]
-      });
+const findAllPackageJson = (subRoots = [], contextDir) => {
+  const packageJsonName = 'package.json'; // 查找文件名
+
+  const cwd = contextDir || dirPath;
+  const result = [path$5.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
+
+  subRoots.forEach(subRoot => {
+    if (!subRoot.root) {
+      LOG.fail(`请检查${subRoot.name}的module.config.json是否有root字段`);
+      process.exit(1);
     }
+
+    const toppath = path$5.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
+
+    const list = findFilesByFilter(toppath, packageJsonName);
+    result.push(...list);
   });
-  return newModules;
+  return result;
 };
 
-var tkitUtils = {
-  readTmsConfig: readTmsConfig$1,
-  checkModules: checkModules$1,
-  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$3
+function cloudNpmInstall$1(contextDir) {
+  return new Promise((resolve, reject) => {
+    glob(`${contextDir}/**/package.json`, ['node_modules', 'miniprogram_npm'], (err, files) => {
+      if (err) {
+        reject(err);
+      }
+
+      files.forEach(file => {
+        const dir = path$5.dirname(file);
+        shell.cd(dir);
+        shell.exec('npx npm install --production --registry http://mirrors.tencent.com/npm/', {
+          silent: false
+        });
+      });
+      resolve();
+    });
+  });
+}
+
+var npmUtils = {
+  cloudNpmInstall: cloudNpmInstall$1,
+  mpNpmInstallAll: mpNpmInstallAll$1,
+  findAllPackageJson
 };
 
-const shelljs$3 = require$$0__default$2;
-const fs$3 = require$$0__default$1;
-const io = io$2;
 const {
-  resolve: resolve$6,
-  createTask: createTask$3
+  createTask: createTask$2,
+  resolve: resolve$7
 } = widgets;
 const {
-  buildOutputAppJson: buildOutputAppJson$1
-} = buildAppJson;
+  buildMpNpm
+} = mpCiUtils;
+const {
+  CACHE_DIR
+} = require$$3;
 const {
-  npmInstallAll
+  cloudNpmInstall,
+  mpNpmInstallAll
 } = npmUtils;
+
+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,
+    projectPath: resolve$7('./'),
+    privateKey: tmsConfig.privateKey
+  }); // 安装云函数的
+
+  isCloud && createTask$2(cloudNpmInstall, '云函数npm install', '云函数npm install安装完毕')(resolve$7(tmsConfig.cloudDir));
+}
+
+var install_1 = install$2;
+
+const shelljs$3 = require$$4__default;
+const fs$6 = require$$0__default$1;
+const io = io$2;
 const {
-  buildMpNpm: buildMpNpm$1
-} = mpCiUtils;
+  resolve: resolve$6,
+  createTask: createTask$1
+} = widgets;
+const {
+  buildOutputAppJson
+} = buildAppJson;
 const {
   MODULE_CODE_DIR,
-  CACHE_DIR,
-  DEFAULT_COPY_CONFIG: DEFAULT_COPY_CONFIG$2,
-  DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR$3
+  DEFAULT_COPY_CONFIG
 } = require$$3;
 const {
   cloneModules
 } = cloneModules_1;
 const {
-  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$2
+  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$2,
+  subModulesMergeDepModules: subModulesMergeDepModules$1
 } = tkitUtils;
 const {
-  fail: fail$5
+  fail: fail$4
 } = log$2;
+const install$1 = install_1;
 /**
- * 拷贝package.json\模块的代码到编译输出目录
+ * 拷贝相关配置文件到编译输出目录
  * @param { object } tmsConfig
  * @param { array } modules
  * @param { array } defaultFiles 默认需要拷贝的配置项
@@ -1276,504 +1664,935 @@ const {
  */
 
 const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
-  const outputDir = resolve$6(tmsConfig.webpack.outputDir);
+  const outputDir = resolve$6(tmsConfig.outputDir);
   io.ensureDirExist(outputDir);
   defaultFiles.forEach(item => {
-    if (fs$3.existsSync(resolve$6(item))) {
-      shelljs$3.cp('-rf', resolve$6(item), resolve$6(tmsConfig.webpack.outputDir, item));
+    if (fs$6.existsSync(resolve$6(item))) {
+      shelljs$3.cp('-rf', resolve$6(item), resolve$6(tmsConfig.outputDir, item));
     }
-  }); // 拷贝模块的代码到编译输出目录
+  }); // 拷贝模块的package.json到编译输出目录
 
   targetModules.forEach(item => {
-    const outputModuleDir = resolve$6(`${tmsConfig.webpack.outputDir}/${item.root}`);
+    const outputModuleDir = resolve$6(`${tmsConfig.outputDir}/${item.root}`);
 
-    if (!fs$3.existsSync(resolve$6(item.path))) {
-      fail$5(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
+    if (!fs$6.existsSync(resolve$6(item.path))) {
+      fail$4(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
       process.exit(1);
     }
 
-    if (!fs$3.existsSync(outputModuleDir)) {
-      shelljs$3.mkdir('-p', outputModuleDir);
-    } else {
-      // 删除除了node_modules、miniprogram_npm 的其他文件
-      // eslint-disable-next-line
-      shelljs$3.exec('find . -not \( -name node_modules -or -name miniprogram_npm \)  -delete', {
-        silent: true
-      });
-    }
-
-    shelljs$3.cp('-Rf', `${resolve$6(item.path)}/*`, outputModuleDir);
+    io.ensureDirExist(outputModuleDir);
+    const modulePackagePath = resolve$6(item.path, 'package.json');
+    if (fs$6.existsSync(modulePackagePath)) shelljs$3.cp('-Rf', modulePackagePath, outputModuleDir);
   });
 };
 
-async function task(tmsConfig, targetModules) {
+async function task(tmsConfig, targetModules, isDev) {
   // 下载和移动代码
-  await createTask$3(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的配置项
 
-  const newModules = tmsModulesMergeLocalModuleCfg$2(targetModules, tmsConfig.appName, DEFAULT_MODULE_DIR$3);
-  console.log('当前init的有效模块', newModules.map(item => item.name)); // 拷贝相关配置文件到输出目录
+  let newModules = tmsModulesMergeLocalModuleCfg$2(targetModules, tmsConfig.appName); // A分包依赖了B分包的代码， merge B分包进行编译；
 
-  await createTask$3(cpFilesToOutput, '开始拷贝文件到编译输出目录', '拷贝文件到编译输出目录完成')(tmsConfig, newModules, DEFAULT_COPY_CONFIG$2); // npm install
+  newModules = subModulesMergeDepModules$1(tmsConfig, newModules); // 拷贝相关配置文件到输出目录
 
-  await createTask$3(npmInstallAll, '开始npm install', 'npm install 完成')(newModules, resolve$6(tmsConfig.webpack.outputDir), `${CACHE_DIR}/node_modules`); // 构建miniprograme_npm
+  await createTask$1(cpFilesToOutput, '开始拷贝文件到编译输出目录', '拷贝文件到编译输出目录完成')(tmsConfig, newModules, DEFAULT_COPY_CONFIG); // install
 
-  await createTask$3(buildMpNpm$1, '开始构建miniprograme_npm', '构建miniprograme_npm 完成')({
-    appId: tmsConfig.appId,
-    projectPath: resolve$6('./'),
-    privateKey: tmsConfig.privateKey
-  }); // 动态生成编译后的app.json;
+  await install$1(tmsConfig, newModules, false); // 动态生成编译后的app.json;
 
-  await createTask$3(buildOutputAppJson$1, '开始生成编译后的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;
 
-const path$2 = require$$1__default$1;
-const fs$2 = require$$0__default$1;
+var dev$3 = {exports: {}};
+
+const through$3 = require$$0__default$7;
+
+function replaceEnv$1(reg = /process\.env(\.(\w*))?/g, envData) {
+  const stream = through$3.obj(function (file, enc, cb) {
+    if (file.isBuffer()) {
+      let contents = String(file.contents);
+      let resReg; // eslint-disable-next-line
+
+      while ((resReg = reg.exec(contents)) !== null) {
+        const [reg1, reg2, reg3] = resReg;
+
+        if (reg1 && reg2 && reg3) {
+          const value = typeof envData[reg3] === 'object' ? JSON.stringify(envData[reg3]) : envData[reg3];
+          contents = contents.replace(reg1, value);
+        } else if (reg1 && !reg2 && !reg3) {
+          contents = contents.replace(reg1, JSON.stringify(envData));
+        }
+      } // eslint-disable-next-line
+
+
+      file.contents = Buffer.from(contents);
+    }
+
+    this.push(file);
+    cb();
+  });
+  return stream;
+}
+
+var replaceEnv_1 = replaceEnv$1;
+
+/* eslint-disable no-param-reassign */
+const strip = require$$0__default$8; // 匹配规则
+
+const MATCH_RULE = new RegExp(/@import *(?:url\(['"]?([^'")]+)['"]?\)|['"]([^'"]+)['"]);?/g);
+/**
+ * 获取样式文件中的@import语句
+ * @param code 代码片段
+ * @returns 结果数组
+ */
+
+const findCssImports$1 = code => {
+  // 将buffer转成字符串
+  code = code.toString(); // 去除注释
+
+  code = strip.block(code); // 定义最后返回的结果
+
+  const result = [];
+  let matchList; // 循环遍历代码段，直至匹配结果为空
+
+  while (matchList = MATCH_RULE.exec(code)) {
+    var _matchList, _matchList2;
+
+    // 存入结果数组
+    result.push(((_matchList = matchList) === null || _matchList === void 0 ? void 0 : _matchList[1]) || ((_matchList2 = matchList) === null || _matchList2 === void 0 ? void 0 : _matchList2[2]));
+  } // 返回结果
+
+
+  return result;
+};
+
+var findCssImport = {
+  findCssImports: findCssImports$1
+};
+
+/* eslint-disable no-param-reassign */
 const {
-  resolve: resolve$5
-} = widgets;
+  fail: fail$3
+} = log$2;
+
+function pluginError$3(error, isWatch) {
+  const errMsg = error.message;
+
+  if (isWatch) {
+    fail$3(errMsg);
+  } else {
+    fail$3(errMsg);
+    process.exit(1);
+  }
+}
+
+var pluginError_1 = {
+  pluginError: pluginError$3
+};
+
+/* eslint-disable no-param-reassign */
+const through$2 = require$$0__default$7;
+const precinct = require$$1__default$4;
+const path$4 = require$$3__default;
 const {
-  buildOutputAppJson
-} = buildAppJson;
+  findCssImports
+} = findCssImport;
 const {
-  tmsModulesMergeLocalModuleCfg: tmsModulesMergeLocalModuleCfg$1
-} = tkitUtils;
+  ext: ext$2,
+  fileInDir: fileInDir$2,
+  diffContentCopyFile: diffContentCopyFile$2
+} = io$2;
 const {
-  findAllPackageJson
-} = npmUtils;
+  resolve: resolve$5
+} = widgets;
+const fs$5 = require$$0__default$1;
 const {
-  fail: fail$4
-} = log$2;
-const replaceExt = require$$7__default;
-const extensions = ['.ts', '.js'];
+  pluginError: pluginError$2
+} = pluginError_1;
+const cssFilter = ['.less', '.wxss'];
 
-function ext(entry, extensions) {
-  let newEntry = entry;
-
-  try {
-    const stat = fs$2.lstatSync(newEntry);
+const dfsFindCommonDep$2 = function (anaFileOriginFile, anaFileDestFile, extensions, isWatch = true) {
+  const resDep = new Map();
 
-    if (stat.isDirectory()) {
-      newEntry += newEntry[newEntry.length - 1] === '/' ? 'index' : '/index';
-    }
-  } catch (e) {}
+  function dfs(anaFileOriginFile, anaFileDestFile, extensions) {
+    let contents = '';
 
-  for (const ext of extensions) {
-    const file = replaceExt(newEntry, ext);
-
-    if (fs$2.existsSync(file)) {
-      return {
-        file,
-        ext
-      };
+    try {
+      contents = fs$5.readFileSync(anaFileOriginFile, 'utf8');
+    } catch (e) {
+      pluginError$2(e, isWatch);
     }
-  }
 
-  return null;
-} // 获取所有的package.json里的依赖包Dir
+    const deps = cssFilter.indexOf(path$4.extname(anaFileOriginFile)) > -1 ? findCssImports(contents) : precinct(contents);
+    deps.forEach(depItem => {
+      if (depItem.startsWith('.')) {
+        // 被依赖文件的存在的绝对路径
+        const depOriginPath = path$4.join(path$4.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
+
+        const {
+          ext: extAlias,
+          file: depOriginFile,
+          extPath
+        } = ext$2(depOriginPath, extensions);
+
+        if (!fs$5.existsSync(depOriginFile)) {
+          pluginError$2(new Error(`${anaFileOriginFile}引用路径${depOriginFile}文件不存在, 请检查应用路径`), isWatch);
+          return;
+        }
 
+        const depDestPath = resolve$5(path$4.dirname(anaFileDestFile), depItem);
+        const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
 
-function getAlias$1(modules) {
-  const alias = {};
-  const allPackages = findAllPackageJson(modules, resolve$5('./dist'));
-  allPackages.forEach(packageFilePath => {
-    const {
-      dependencies
-    } = require(packageFilePath);
-
-    Object.keys(dependencies).forEach(dependence => {
-      alias[dependence] = path$2.join(path$2.dirname(packageFilePath), `./miniprogram_npm/${dependence}`);
+        if (!resDep.has(depDestFile)) {
+          resDep.set(depDestFile, {
+            anaFileOriginFile,
+            anaFileDestFile,
+            depDestFile,
+            depOriginFile
+          });
+          dfs(depOriginFile, depDestFile, extensions);
+        }
+      }
     });
-  });
-  return alias;
-} // 根据用户选择的modules，找到module.config.json的配置信息，找到所有的page
-
+  }
 
-function getPageEntry(modules, tmsConfig, moduleDir) {
-  const entry = {}; // tms.config.js的modules 合并 module.config.json的配置项
+  dfs(anaFileOriginFile, anaFileDestFile, extensions);
+  return resDep;
+};
 
-  const newModules = tmsModulesMergeLocalModuleCfg$1(modules, tmsConfig.appName, moduleDir);
-  newModules.forEach(({
-    path: relativePath,
-    pages,
-    root
-  }) => {
-    pages.forEach(page => {
-      const pageJsonPath = `${resolve$5(relativePath, page)}.json`;
+function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
+  const stream = through$2.obj(function (file, enc, cb) {
+    // 依赖分析的文件
+    const anaFileOriginFile = file.history[0];
+    const anaFileRelativeModule = path$4.relative(resolve$5(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve$5(tmsConfig.outputDir, module.to, anaFileRelativeModule);
+
+    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.dependencies).forEach(includeName => {
+        const includePath = tmsConfig.dependencies[includeName];
+        deps.forEach(depItem => {
+          if (depItem.indexOf(includeName) > -1) {
+            // 被依赖文件的存在的绝对路径 (eg: /User/thirdparty/loadsh)
+            const depOriginPath = path$4.join(path$4.dirname(anaFileOriginFile), depItem); // 被依赖文件加上后缀
+
+            const {
+              ext: extAlias,
+              file: depOriginFile,
+              extPath
+            } = ext$2(depOriginPath, extensions);
+
+            if (!fileInDir$2(includePath, depOriginFile)) {
+              pluginError$2(new Error(`${anaFileOriginFile}引用路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`), isWatch);
+              return;
+            } // eslint-disable-next-line
+
+
+            const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+            const regRes = depItem.match(reg) || [];
+
+            if (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)) {
+                copyModules.set(depDestFile, {
+                  depOriginFile,
+                  depDestFile,
+                  beforeDepPath: depItem,
+                  afterDepPath: path$4.relative(path$4.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/')
+                });
+              }
+            }
+          }
+        });
+      }); // console.log('mpCommonDep copyModules', copyModules);
+
+      copyModules.forEach(({
+        depOriginFile,
+        depDestFile,
+        beforeDepPath,
+        afterDepPath
+      }) => {
+        diffContentCopyFile$2(depOriginFile, depDestFile);
+        const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
+        contents = contents.replace(reg, `"${afterDepPath}"`);
+        const defs = dfsFindCommonDep$2(depOriginFile, depDestFile, extensions, isWatch);
+        defs.forEach(item => {
+          diffContentCopyFile$2(item.depOriginFile, item.depDestFile);
+        }); // console.log('mpCommonDep defs', defs);
+      });
+      file.contents = Buffer.from(contents);
+    }
 
-      if (fs$2.existsSync(pageJsonPath)) {
-        const pageJsonContent = JSON.parse(fs$2.readFileSync(pageJsonPath, 'utf-8'));
-        const pageDir = path$2.dirname(pageJsonPath); // 该页面所在的目录
+    this.push(file);
+    cb();
+  });
+  return stream;
+}
 
-        const extValue = ext(resolve$5(relativePath, page), extensions);
+var mpCommonDep_1 = {
+  mpCommonDep: mpCommonDep$1,
+  dfsFindCommonDep: dfsFindCommonDep$2
+};
 
-        if (!extValue) {
-          fail$4(`当前${page}找不到入口.js或.ts文件`);
-          process.exit(1);
+/* eslint-disable no-param-reassign */
+const through$1 = require$$0__default$7;
+const path$3 = require$$3__default;
+const {
+  ext: ext$1,
+  fileInDir: fileInDir$1,
+  diffContentCopyFile: diffContentCopyFile$1
+} = io$2;
+const {
+  resolve: resolve$4
+} = widgets;
+const fs$4 = require$$0__default$1;
+const {
+  pluginError: pluginError$1
+} = pluginError_1;
+const {
+  dfsFindCommonDep: dfsFindCommonDep$1
+} = mpCommonDep_1;
+
+function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch) {
+  const stream = through$1.obj(function (file, enc, cb) {
+    // 当前分析的文件的路径
+    const anaFileOriginFile = file.history[0];
+    const anaFileRelativeModule = path$3.relative(resolve$4(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve$4(tmsConfig.outputDir, module.to, anaFileRelativeModule);
+
+    if (file.isBuffer()) {
+      const copyModules = new Map();
+      let contents = String(file.contents);
+
+      try {
+        contents = JSON.parse(contents);
+
+        if (contents.usingComponents) {
+          Object.keys(tmsConfig.dependencies).forEach(includeName => {
+            const includePath = tmsConfig.dependencies[includeName];
+            Object.keys(contents.usingComponents).forEach(componentKey => {
+              const componentPath = contents.usingComponents[componentKey];
+
+              if (componentPath.indexOf(includeName) > -1) {
+                const depOriginPath = path$3.join(path$3.dirname(anaFileOriginFile), componentPath); // 被依赖文件加上后缀
+
+                const {
+                  ext: extAlias,
+                  file: depOriginFile,
+                  extPath
+                } = ext$1(depOriginPath, extensions);
+                const isFileInDir = fileInDir$1(includePath, depOriginFile);
+
+                if (!isFileInDir) {
+                  pluginError$1(new Error(`${anaFileOriginFile}引用的路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`), isWatch);
+                  return;
+                } // eslint-disable-next-line
+
+
+                const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+                const regRes = componentPath.match(reg) || [];
+
+                if (regRes[2]) {
+                  const depDestPath = resolve$4(tmsConfig.outputDir, module.to, includeName, regRes[2]);
+                  const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
+
+                  if (!copyModules.has(depDestFile)) {
+                    copyModules.set(depDestFile, {
+                      depOriginFile,
+                      depOriginExt: extAlias,
+                      depDestFile,
+                      beforeDepPath: componentPath,
+                      afterDepPath: path$3.relative(path$3.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/')
+                    });
+                  }
+                }
+              }
+            });
+          });
         }
+      } catch (e) {
+        pluginError$1(e, isWatch);
+      } // console.log('json copyModules', copyModules);
+
+
+      copyModules.forEach(({
+        depOriginFile,
+        depOriginExt,
+        depDestFile,
+        beforeDepPath,
+        afterDepPath
+      }) => {
+        // 拷贝当前依赖组件几个部分 wxml、wxss、wxs、json
+        filesExt.forEach(extKey => {
+          const originFile = depOriginFile.replace(depOriginExt, extKey);
+          const destFile = depDestFile.replace(depOriginExt, extKey);
+
+          if (fs$4.existsSync(originFile)) {
+            diffContentCopyFile$1(originFile, destFile);
+            const extensionsFilter = ['.js', '.ts', '.wxss', '.less'];
+
+            if (extensionsFilter.indexOf(extKey) > -1) {
+              const defs = dfsFindCommonDep$1(originFile, destFile, extensionsFilter); // console.log('json defs', defs);
+
+              defs.forEach(item => {
+                diffContentCopyFile$1(item.depOriginFile, item.depDestFile);
+              });
+            }
+          }
+        });
+        contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
+        const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
+        contents = contents.replace(reg, `"${afterDepPath}"`);
+      });
+      contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
+      file.contents = Buffer.from(contents);
+    }
 
-        const entryKey = `${root}/${page}${extValue.ext}`;
-        Object.assign(entry, {
-          [entryKey]: extValue.file
-        }, getComponentEntry(pageJsonContent, pageDir, path$2.dirname(entryKey)));
-      }
-    });
+    this.push(file);
+    cb();
   });
-  return entry;
-} // 根据appJson，获取所有的page
+  return stream;
+}
 
+var mpJsonDep_1 = {
+  mpJsonDep: mpJsonDep$1
+};
 
-function getEntry$2(defaultWebpackEntry, modules, tmsConfig, moduleDir) {
-  const defaultEntry = {};
-  Object.keys(defaultWebpackEntry).forEach(key => {
-    const extValue = ext(defaultWebpackEntry[key], extensions);
-    defaultEntry[key + extValue.ext] = extValue.file;
-  });
-  return { ...defaultEntry,
-    ...getPageEntry(modules, tmsConfig, moduleDir)
+/* eslint-disable no-param-reassign */
+const through = require$$0__default$7;
+const htmlparser2 = require$$1__default$5;
+const fs$3 = require$$0__default$1;
+const path$2 = require$$3__default;
+const {
+  diffContentCopyFile,
+  ext,
+  fileInDir
+} = io$2;
+const {
+  resolve: resolve$3
+} = widgets;
+const {
+  dfsFindCommonDep
+} = mpCommonDep_1;
+const {
+  pluginError
+} = pluginError_1; // 处理后缀(源码引入依赖时，不带后缀的情况)
+
+const extFile = function (name, file) {
+  const extMap = {
+    import: '.wxml',
+    include: '.wxml',
+    wxs: '.wxs'
   };
-} // 根据pageJson，filePath，获取页面引入的所有component
+  let extObj = {};
 
+  if (Object.keys(extMap).indexOf(name) > -1 && !file.endsWith(extMap[name])) {
+    extObj = ext(file, [extMap[name]]);
+  }
 
-function getComponentEntry(pageJson, pagePath, pageKey) {
-  const componentEntry = {};
+  return {
+    extPath: extObj.extPath || '',
+    ext: extObj.ext || '',
+    file: extObj.file || file
+  };
+};
 
-  function task(json, dir, rootKey) {
-    if (!json.usingComponents) {
-      return;
-    }
+const dfsFindWxmlDep = function (anaFileOriginFile, anaFileDestFile, isWatch = true) {
+  const resDep = {
+    image: new Map(),
+    wxml: new Map(),
+    wxs: new Map()
+  };
+
+  function dfs(anaFileOriginFile, anaFileDestFile) {
+    let contents = '';
 
-    const componentKeys = Object.keys(json.usingComponents); // 如果存在依赖的组件
+    try {
+      contents = fs$3.readFileSync(anaFileOriginFile, 'utf8');
+    } catch (e) {
+      pluginError(e, isWatch);
+    }
 
-    componentKeys.forEach(key => {
-      if (json.usingComponents[key].startsWith('.')) {
-        // 拼出组件所在位置的绝对路径
-        const comValue = path$2.join(dir, json.usingComponents[key]);
-        const extValue = ext(comValue, extensions);
-        const comKey = path$2.resolve('/', rootKey, json.usingComponents[key]);
+    const parser = new htmlparser2.Parser({
+      onopentag(name, attributes) {
+        var _attributes$src;
 
-        if (!extValue) {
-          fail$4(`当前page: ${pagePath} component: ${comValue}找不到入口.js或.ts文件`);
-          process.exit(1);
-        }
+        if (attributes !== null && attributes !== void 0 && (_attributes$src = attributes.src) !== null && _attributes$src !== void 0 && _attributes$src.startsWith('.')) {
+          const depOriginPath = path$2.join(path$2.dirname(anaFileOriginFile), attributes.src); // 被依赖文件加上后缀
 
-        componentEntry[`${comKey.slice(1)}${extValue.ext}`] = extValue.file;
-        const comJsonPath = `${comValue}.json`;
+          const {
+            ext,
+            file: depOriginFile,
+            extPath
+          } = extFile(name, depOriginPath);
 
-        if (fs$2.existsSync(comJsonPath)) {
-          const comJsonContent = JSON.parse(fs$2.readFileSync(comJsonPath, 'utf-8'));
-          const comDir = path$2.dirname(comJsonPath); // 该页面所在的目录
+          if (!fs$3.existsSync(depOriginFile)) {
+            pluginError(new Error(`${anaFileOriginFile}引用的路径${depOriginFile}找不到应用文件，请检查引用路径`), isWatch);
+            return;
+          }
 
-          task(comJsonContent, comDir, path$2.dirname(comKey));
+          const depDestPath = path$2.join(path$2.dirname(anaFileDestFile), attributes.src);
+          const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath; // 收集wxml依赖
+
+          if (['import', 'include'].indexOf(name) > -1) {
+            resDep.wxml.set(depDestFile, {
+              anaFileOriginFile,
+              anaFileDestFile,
+              depDestFile,
+              depOriginFile
+            });
+            dfs(depOriginFile, depDestFile);
+          } // 收集image依赖
+          // if (name === 'image') {
+          //   resDep.image.set(attributes.src, {
+          //     anaFileOriginFile,
+          //     anaFileDestFile,
+          //     depDestFile,
+          //     depOriginFile,
+          //   });
+          //   dfs(depOriginFile, depDestFile);
+          // }
+          // 收集wxs依赖
+
+
+          if (name === 'wxs') {
+            resDep.wxs.set(depDestFile, {
+              anaFileOriginFile,
+              anaFileDestFile,
+              depDestFile,
+              depOriginFile
+            });
+            const defs = dfsFindCommonDep(depOriginFile, depDestFile, ['.wxs']);
+            defs.forEach((item, key) => {
+              resDep.wxs.set(key, item);
+            });
+          }
         }
       }
+
     });
+    parser.write(contents);
+    parser.end();
   }
 
-  task(pageJson, pagePath, pageKey);
-  return componentEntry;
-} // 根据modules处理需要拷贝的模块，copy-webpack-plugin需要的参数
+  dfs(anaFileOriginFile, anaFileDestFile);
+  return resDep;
+};
 
+function mpWxmlDep$1(tmsConfig, module, isWatch) {
+  const stream = through.obj(function (file, enc, cb) {
+    // 依赖分析的文件
+    const anaFileOriginFile = file.history[0];
+    const anaFileRelativeModule = path$2.relative(resolve$3(module.from), anaFileOriginFile);
+    const anaFileDestFile = resolve$3(tmsConfig.outputDir, module.to, anaFileRelativeModule);
+
+    if (file.isBuffer()) {
+      let contents = String(file.contents);
+      const copyModules = new Map();
+      const parser = new htmlparser2.Parser({
+        onopentag(name, attributes) {
+          const nameFilter = ['import', 'include', 'wxs'];
+
+          if (nameFilter.indexOf(name) > -1 && attributes.src) {
+            const depOriginPath = path$2.join(path$2.dirname(anaFileOriginFile), attributes.src); // 处理后缀(源码引入依赖时，后缀不全的情况)
+
+            const {
+              ext,
+              file: depOriginFile,
+              extPath
+            } = extFile(name, depOriginPath);
+            Object.keys(tmsConfig.dependencies).forEach(includeName => {
+              if (attributes.src.indexOf(includeName) > -1) {
+                const includePath = tmsConfig.dependencies[includeName];
+
+                if (!fileInDir(includePath, depOriginFile)) {
+                  pluginError(new Error(`${anaFileOriginFile}引用路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`), isWatch);
+                  return;
+                } // eslint-disable-next-line
+
+
+                const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
+                const regRes = attributes.src.match(reg) || [];
+
+                if (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)) {
+                    copyModules.set(depDestFile, {
+                      depOriginFile,
+                      depDestFile,
+                      beforeDepPath: attributes.src,
+                      afterDepPath: path$2.relative(path$2.dirname(anaFileDestFile), depDestFile).replace(/\\/g, '/')
+                    });
+                  }
+                }
+              }
+            });
+          }
+        }
 
-function getCopyPlugin$2(defaultCopyConfig, modules, tmsConfig, env) {
-  const toPath = tmsConfig.webpack.outputDir;
+      });
+      parser.write(contents);
+      parser.end(); // console.log('wxml copyModules', copyModules);
+
+      copyModules.forEach(({
+        depOriginFile,
+        depDestFile,
+        beforeDepPath,
+        afterDepPath
+      }) => {
+        if (fs$3.existsSync(depOriginFile)) {
+          diffContentCopyFile(depOriginFile, depDestFile);
+          const reg = new RegExp(`['"]${beforeDepPath}["']`, 'g');
+          contents = contents.replace(reg, `"${afterDepPath}"`);
+        }
 
-  function generatorAppJson(tmsConfig, modules) {
-    try {
-      return buildOutputAppJson(tmsConfig, modules);
-    } catch (e) {
-      fail$4(`动态生成app.json出现错误${e} 请检查你的配置项`);
-      return {};
-    }
-  }
+        if (depOriginFile.endsWith('.wxml')) {
+          const defs = dfsFindWxmlDep(depOriginFile, depDestFile, isWatch); // console.log('wxml defs', defs);
+
+          [...defs.wxml, ...defs.wxs].forEach(([, item]) => {
+            diffContentCopyFile(item.depOriginFile, item.depDestFile);
+          });
+        }
 
-  const patterns = []; // 默认的一些配置拷贝文件 package.json、sitemap.json等
+        if (depOriginFile.endsWith('.wxs')) {
+          const defs = dfsFindCommonDep(depOriginFile, depDestFile, ['.wxs'], isWatch); // console.log('wxs defs', defs);
 
-  defaultCopyConfig.forEach(item => {
-    if (fs$2.existsSync(resolve$5(item))) {
-      patterns.push({
-        from: resolve$5(item),
-        to: resolve$5(`./${toPath}/${item}`),
-        transform: {
-          cache: true
+          defs.forEach(item => {
+            diffContentCopyFile(item.depOriginFile, item.depDestFile);
+          });
         }
       });
+      file.contents = Buffer.from(contents);
     }
-  }); // 拷贝模块的代码
-
-  modules.forEach(item => {
-    patterns.push({
-      from: resolve$5(item.path),
-      to: resolve$5(`./${toPath}/${item.root}`),
-      globOptions: {
-        ignore: ['**/*.js', '*.js', '**/*.ts', '*.ts']
-      },
-      transform: {
-        cache: true,
-        transformer: env === 'dev' ? (content, absoluteFrom) => {
-          // 监听module.config.json的修改, 自动生成编译后的app.json
-          if (absoluteFrom.indexOf('module.config.json') > -1) {
-            generatorAppJson(tmsConfig, modules);
-          }
 
-          return content;
-        } : content => content
-      }
-    });
+    this.push(file);
+    cb();
   });
+  return stream;
+}
 
-  if (env === 'dev') {
-    // 拷贝app.json时，自动生成编译后的app.json
-    const appJsonConfig = ['app.json'];
-    appJsonConfig.forEach(item => {
-      patterns.push({
-        from: resolve$5(item),
-        to: resolve$5(`./${toPath}/${item}`),
-        transform: {
-          cache: true,
-          transformer: () => {
-            const appJson = generatorAppJson(tmsConfig, modules);
-            return JSON.stringify(appJson, null, 2);
-          }
-        }
+var mpWxmlDep_1 = {
+  mpWxmlDep: mpWxmlDep$1,
+  dfsFindWxmlDep
+};
+
+/* eslint-disable no-param-reassign */
+const postcss$1 = require$$0__default$9;
+const fs$2 = require$$0__default$1;
+const path$1 = require$$3__default;
+const {
+  fail: fail$2
+} = log$2;
+var postcssFontBase64 = postcss$1.plugin('postcss-font-base64', options => {
+  options = { ...options,
+    ...{
+      match: {
+        Scrabble: ['fakefont']
+      },
+      format: ['eot', 'woff', 'woff2', 'ttf']
+    }
+  };
+  return function (css, result) {
+    css.walkAtRules('font-face', fontFace => {
+      const fileTypeRegex = getRegexStringForFileTypes(options.format);
+      fontFace.replaceValues(new RegExp(`url\\(["']?.+\\.${fileTypeRegex}["']?\\)`), attr => {
+        const fontRePath = attr.replace(/(url|'|"|\(|\)|\?#iefix)/g, '');
+        const fontAbPath = path$1.join(path$1.dirname(result.opts.from), fontRePath);
+        const res64 = base64Encode(fontAbPath);
+        const newUrlStr = 'url(data:'.concat(getMimeType(attr)).concat(';charset=utf-8;base64,').concat(res64).concat(')');
+        return res64 ? newUrlStr : attr;
       });
     });
-  }
 
-  return patterns;
-} // dev时，给webpack注入相应的事件
+    function getRegexStringForFileTypes(fileTypes) {
+      const regex = fileTypes.map(fileType => fileType === 'eot' ? fileType.concat('(\\?#iefix)?') : fileType).join('|');
+      return regex ? `(${regex})` : '';
+    } // helper functions
 
 
-const setupDevWebPackHooks$1 = (context, firstDone) => {
-  let tempFirstDone = true;
+    function getMimeType(attribute) {
+      const formats = {
+        '.woff': 'application/font-woff',
+        '.woff2': 'font/woff2',
+        '.ttf': 'application/font-sfnt',
+        '.eot': 'application/vnd.ms-fontobject',
+        '.otf': 'application/font-sfnt'
+      };
+      let match = '';
+      const extension = attribute.match(/\.[a-z]{3,4}/)[0];
 
-  const invalid = () => {
-    // eslint-disable-next-line
-    context.stats = undefined;
-  };
+      if (extension in formats) {
+        match = formats[extension];
+      }
+      return match;
+    }
 
-  const done = stats => {
-    // eslint-disable-next-line
-    context.stats = stats;
-    process.nextTick(() => {
-      const {
-        stats
-      } = context;
-      if (!stats) return;
-
-      if (tempFirstDone) {
-        tempFirstDone = false;
-        firstDone();
+    function base64Encode(file) {
+      if (fs$2.existsSync(file)) {
+        return readAndEncodeFile(file);
       }
-    });
-  };
 
-  const {
-    compiler
-  } = context;
-  compiler.hooks.watchRun.tap('miniprogram-dev', invalid);
-  compiler.hooks.invalid.tap('miniprogram-dev', invalid);
-  compiler.hooks.done.tap('miniprogram-dev', done);
-};
+      fail$2(`${file} does not exist.`);
+      return '';
+    }
 
-const stringified$1 = raw => ({
-  'process.env': Object.keys(raw).reduce((env, key) => {
-    // eslint-disable-next-line
-    env[key] = JSON.stringify(raw[key]);
-    return env;
-  }, {})
+    function readAndEncodeFile(file) {
+      const bitmap = fs$2.readFileSync(file);
+      return Buffer.from(bitmap).toString('base64');
+    }
+  };
 });
 
-var utils = {
-  getCopyPlugin: getCopyPlugin$2,
-  setupDevWebPackHooks: setupDevWebPackHooks$1,
-  getEntry: getEntry$2,
-  stringified: stringified$1,
-  getAlias: getAlias$1
-};
-
-const WebpackChain = require$$0__default$8;
-const webpack$2 = require$$0__default$9;
 const {
-  getEntry: getEntry$1,
-  stringified,
-  getAlias
-} = utils;
+  src: src$1,
+  dest,
+  lastRun
+} = require$$0__default$a;
+const px2rpx = require$$1__default$6;
+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 {
-  resolve: resolve$4
-} = widgets;
+  mpCommonDep
+} = mpCommonDep_1;
 const {
-  DEFAULT_WEBPACK_ENTRY: DEFAULT_WEBPACK_ENTRY$1,
-  DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR$2
-} = require$$3;
+  mpJsonDep
+} = mpJsonDep_1;
+const {
+  mpWxmlDep
+} = mpWxmlDep_1;
+const base64 = postcssFontBase64;
+const {
+  fail: fail$1
+} = log$2;
 
-var base = (tmsConfig, modules) => {
-  const {
-    envData = {},
-    webpack: tmsWebpack
-  } = tmsConfig;
-  let webpackConfig = new WebpackChain();
-  const alias = getAlias(modules);
-  const entry = getEntry$1(DEFAULT_WEBPACK_ENTRY$1, modules, tmsConfig, DEFAULT_MODULE_DIR$2);
-  webpackConfig.merge({
-    entry,
-    output: {
-      path: resolve$4(`./${tmsWebpack.outputDir}`),
-      libraryTarget: 'commonjs2',
-      filename: '[name]'
-    },
-    // TODO 有报错，先注释掉
-    // cache: {
-    //   type: 'filesystem',
-    //   cacheDirectory: resolve(`./${tmsConfig.webpack.outputDir}/node_modules/.cache`),
-    // },
-    resolve: {
-      extensions: ['.tsx', '.ts', '.js'],
-      alias: Object.assign(tmsWebpack.alias, alias)
-    },
-    devtool: tmsWebpack.sourceMap ? 'source-map' : false
-  });
-  webpackConfig.module.rule('ts-loader').test(/\.ts$/).use('ts-loader').loader(require.resolve('ts-loader')).options({
-    configFile: resolve$4('./tsconfig.json'),
-    // 只进行语法转换,不进行类型校验,提高构建速度
-    transpileOnly: true
-  }).end(); // webpackConfig.module
-  //   .rule('babel')
-  //   .test(/\.(js|mjs|jsx|ts|tsx)$/)
-  //   .pre()
-  // .exclude.add(/(node_modules|miniprogram_npm)/).end()
-  //   .use(require.resolve('babel-loader'))
-  //   .loader(require.resolve('babel-loader'));
-
-  webpackConfig.plugin('definePlugin').use(webpack$2.DefinePlugin, [stringified(envData)]).end(); // 执行tms.config.js自定义的webpackChain
-
-  if (tmsWebpack.webpackChain) {
-    webpackConfig = tmsWebpack.webpackChain(webpackConfig, {
-      modules
+const since = task => file => lastRun(task) > file.stat.ctime ? lastRun(task) : 0;
+
+var compile = function (tmsConfig, {
+  glob,
+  destPath,
+  srcOption,
+  module,
+  watchOption = {
+    events: ['change', 'add', 'unlink']
+  },
+  isWatch
+}) {
+  Object.keys(glob).forEach(globKey => {
+    const globValue = glob[globKey];
+
+    const task = () => src$1(globValue, { ...srcOption,
+      since: since(task)
     });
-  }
 
-  return webpackConfig;
-};
+    let srcPipe = task();
 
-const SingleEntryPlugin = require$$0__default$a;
-const {
-  DEFAULT_WEBPACK_ENTRY,
-  DEFAULT_MODULE_DIR: DEFAULT_MODULE_DIR$1
-} = require$$3;
-const {
-  getEntry
-} = utils;
+    if (isWatch) {
+      srcPipe = srcPipe.pipe(watch(globValue, watchOption));
+    }
 
-class EntryExtraPlugin {
-  constructor(options = {}) {
-    this.options = options;
-  }
+    switch (globKey) {
+      case 'js':
+        srcPipe.pipe(replaceEnv(/process\.env(\.(\w*))?/g, tmsConfig.envData)).pipe(mpCommonDep(tmsConfig, module, ['.js', '.ts', '.wxs', '.json'], isWatch)).pipe(dest(destPath)).on('error', err => {
+          fail$1(`js编译报错${err}`);
+        });
+        break;
+
+      case 'wxss':
+        srcPipe.pipe(mpCommonDep(tmsConfig, module, ['.wxss', '.less'], isWatch)).pipe(postcss([base64()])).on('error', err => {
+          fail$1(`postcss编译报错${err}`);
+        }).pipe(px2rpx({
+          designWidth: 375,
+          // 设计稿宽度，默认为750
+          precision: 2 // 小数最大精度，默认为6
+
+        })).pipe(dest(destPath));
+        break;
+
+      case 'json':
+        srcPipe.pipe(mpJsonDep(tmsConfig, module, ['.json'], ['.wxml', '.json', '.js', '.ts', '.wxss', '.less'], isWatch)).on('error', err => {
+          fail$1(`json编译报错${err}`);
+        }).pipe(dest(destPath));
+        break;
+
+      case 'wxml':
+        srcPipe.pipe(mpWxmlDep(tmsConfig, module, isWatch)).pipe(dest(destPath));
+        break;
+
+      case 'image':
+        srcPipe // .pipe(cache(image()))
+        // .on('error', (err) => {
+        //   fail(`image编译报错${err}`);
+        // })
+        .pipe(dest(destPath));
+        break;
+
+      case 'other':
+        srcPipe.pipe(dest(destPath));
+        break;
+    }
+  });
+};
 
-  applyEntry(compiler, entry) {
-    const {
-      context
-    } = compiler.options;
-    Object.keys(entry).forEach(key => {
-      new SingleEntryPlugin(context, entry[key], key).apply(compiler);
-    });
-  }
+(function (module) {
+  const watch = require$$3__default$1;
+  const {
+    resolve
+  } = widgets;
+  const {
+    buildOutputAppJson
+  } = buildAppJson;
+  const {
+    DEFAULT_COPY_CONFIG
+  } = require$$3;
+  const compile$1 = compile;
+
+  function excludeGlob(glob) {
+    const otherArr = new Set();
+    otherArr.add('!**/*.{ttf,otf,woff,eot}');
+    Object.keys(glob).forEach(globKey => {
+      if (typeof glob[globKey] === 'string') {
+        const data = glob[globKey].startsWith('!') ? glob[globKey] : `!${glob[globKey]}`;
+        otherArr.add(data);
+      }
 
-  apply(compiler) {
-    const {
-      tmsConfig = {},
-      modules = []
-    } = this.options;
-    compiler.hooks.watchRun.tap('EntryExtraPlugin', () => {
-      const entry = getEntry(DEFAULT_WEBPACK_ENTRY, modules, tmsConfig, DEFAULT_MODULE_DIR$1);
-      this.applyEntry(compiler, entry);
+      if (Array.isArray(glob[globKey])) {
+        glob[globKey].forEach(value => {
+          if (typeof value === 'string') {
+            const data = value.startsWith('!') ? value : `!${value}`;
+            otherArr.add(data);
+          }
+        });
+      }
     });
+    return Array.from(otherArr);
   }
 
-}
-
-var entryExtractPlugin = EntryExtraPlugin;
+  module.exports = async (tmsConfig, newModules, isWatch = true) => {
+    // 监听app.json
+    if (isWatch) {
+      watch(resolve('app.json'), {
+        ignoreInitial: false,
+        events: ['add', 'change']
+      }, () => {
+        buildOutputAppJson(tmsConfig, newModules, isWatch);
+      });
+    } else {
+      buildOutputAppJson(tmsConfig, newModules, isWatch);
+    } // 监听根目录的文件
 
-const webpackConfig$1 = base;
-const {
-  DEFAULT_COPY_CONFIG: DEFAULT_COPY_CONFIG$1
-} = require$$3;
-const {
-  getCopyPlugin: getCopyPlugin$1
-} = utils;
-
-var dev$2 = (...args) => {
-  const [tmsConfig, modules] = args;
-  const webpackDevConfig = webpackConfig$1(...args);
-  webpackDevConfig.devtool('source-map');
-  webpackDevConfig.mode('development');
-  const copyPluginParams = getCopyPlugin$1(DEFAULT_COPY_CONFIG$1, modules, tmsConfig, 'dev'); // console.log('copyPluginParams', copyPluginParams);
-
-  webpackDevConfig.plugin('copy-webpack-plugin').use(require$$3__default, [{
-    patterns: copyPluginParams
-  }]).end();
-  webpackDevConfig.plugin('ExtractPlugin').use(entryExtractPlugin, [{
-    tmsConfig,
-    modules
-  }]).end();
-  return webpackDevConfig;
-};
 
-const webpack$1 = require$$0__default$9;
-const webDevConfig = dev$2;
-const {
-  setupDevWebPackHooks
-} = utils;
-const {
-  fail: fail$3
-} = log$2;
+    compile$1(tmsConfig, {
+      glob: {
+        json: DEFAULT_COPY_CONFIG.map(item => resolve(item)),
+        wxss: ['app.less', 'app.wxss'].map(item => resolve(item)),
+        js: ['app.js', 'app.ts'].map(item => resolve(item))
+      },
+      module: {
+        from: '',
+        to: ''
+      },
+      destPath: resolve(tmsConfig.outputDir),
+      srcOption: {
+        allowEmpty: true
+      },
+      isWatch
+    }); // 监听模块的文件
+
+    for (let module of newModules) {
+      // 处理默认参数
+      module = { ...{
+          exclude: []
+        },
+        ...module
+      };
 
-var devServer = (...args) => {
-  const config = webDevConfig(...args);
-  const compiler = webpack$1(config.toConfig());
-  setupDevWebPackHooks({
-    compiler
-  }, () => {// TODO 判断open参数，打开微信开发者工具
-    // openDevtool(api.resolve(config.outputDir || 'dist'))
-  });
-  compiler.watch({
-    aggregateTimeout: 1000,
-    poll: undefined
-  }, (err, stats) => {
-    if (err) {
-      fail$3(err);
-      console.log('详细的错误信息:', err);
-    }
+      if (isWatch) {
+        // 监听模块配置文件
+        watch(`${resolve(module.path)}/**/module.config.json`, {
+          events: ['change']
+        }, () => {
+          buildOutputAppJson(tmsConfig, newModules, isWatch);
+        });
+      }
 
-    if (stats.hasErrors() || stats.hasWarnings()) {
-      console.log(stats.toString({
-        // 增加控制台颜色开关
-        colors: true
-      }));
+      const excludes = module.exclude.map(key => `!${resolve(key)}`);
+      const glob = {
+        js: [`${resolve(module.path)}/**/*.{js,ts,wxs}`, ...excludes],
+        json: [`${resolve(module.path)}/**/*.json`, ...excludes],
+        wxss: [`${resolve(module.path)}/**/*.{less,wxss}`, ...excludes],
+        wxml: [`${resolve(module.path)}/**/*.wxml`, ...excludes],
+        image: [`${resolve(module.path)}/**/*.{png,jpg,jpeg,gif,svg}`, ...excludes]
+      };
+      compile$1(tmsConfig, {
+        glob: { ...glob,
+          other: [`${resolve(module.path)}/**/*`, ...excludeGlob(glob)]
+        },
+        destPath: resolve(tmsConfig.outputDir, module.root),
+        module: {
+          from: module.path,
+          to: module.root
+        },
+        srcOption: {
+          allowEmpty: true
+        },
+        isWatch
+      });
+    } // 静态资源目录-拷贝
+
+
+    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: {
+            other: [from]
+          },
+          destPath: to,
+          module: item,
+          srcOption: {
+            allowEmpty: true
+          },
+          isWatch
+        });
+      }
     }
-  });
-  return compiler;
-};
+  };
+})(dev$3);
 
 const fs$1 = require$$0__default$1;
-const semver$1 = require$$1__default$4;
+const semver$1 = require$$1__default$7;
 const {
-  resolve: resolve$3
+  resolve: resolve$2
 } = widgets;
-const path$1 = require$$1__default$1;
+const path = require$$3__default;
+const shelljs$2 = require$$4__default;
 const {
-  fail: fail$2
-} = log$2;
-const shelljs$2 = require$$0__default$2;
+  handleError
+} = handleError_1;
 
 const getLatestVersion = npmName => {
   const data = shelljs$2.exec(`npm view ${npmName} version`);
@@ -1788,48 +2607,48 @@ 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
 
   const packageArr = [{
-    srcPackageDir: path$1.join(cwd, packageJsonName),
-    destNpmDir: resolve$3(outputDir, 'node_modules')
+    srcPackageDir: path.join(cwd, packageJsonName),
+    destNpmDir: resolve$2(outputDir, 'node_modules')
   }]; // 1.2模块的package.json
 
   modules.forEach(item => {
-    const srcPackageDir = path$1.join(cwd, item.path, 'package.json');
+    const srcPackageDir = path.join(cwd, item.path, 'package.json');
 
     if (fs$1.existsSync(srcPackageDir)) {
       packageArr.push({
         srcPackageDir,
-        destNpmDir: resolve$3(outputDir, item.root, 'node_modules')
+        destNpmDir: resolve$2(outputDir, item.root, 'node_modules')
       });
     }
   }); // 步骤2. 比较package.json的依赖与node_modules依赖的版本号
 
   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$2(`解析${packageJson}报错，请检查是否是正确的json配置项`);
-      process.exit(1);
+      handleError(`解析${item.srcPackageDir}报错，请检查是否是正确的json配置项`, isDev);
     }
 
     const dependenciesKeys = Object.keys(dependencies);
 
     for (const key of dependenciesKeys) {
-      const depPath = path$1.join(item.destNpmDir, key);
+      const depPath = path.join(item.destNpmDir, key);
 
       if (!fs$1.existsSync(depPath)) {
         return true;
       }
 
-      const depPackagePath = path$1.join(depPath, 'package.json');
+      const depPackagePath = path.join(depPath, 'package.json');
 
       if (fs$1.existsSync(depPackagePath)) {
         const packageData = require(depPackagePath);
@@ -1856,26 +2675,27 @@ var checkDependencies_1 = {
   checkDependencies: checkDependencies$1
 };
 
-const webpackServer = devServer;
+const gulpDev = dev$3.exports;
 const fs = require$$0__default$1;
 const {
-  resolve: resolve$2
+  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
 } = checkDependencies_1;
 const {
-  fail: fail$1
+  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;
@@ -1901,188 +2721,114 @@ 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;
     } // 判断源码目录是否有该模块
 
 
-    if (item.path && !fs.existsSync(resolve$2(item.path))) {
-      fail$1(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
+    if (item.path && !fs.existsSync(resolve$1(item.path))) {
+      fail(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
       process.exit(1);
     }
   } //  判断package.json的版本是否有新的版本
 
 
-  return checkDependencies(targetModules, resolve$2('./'), tmsConfig.webpack.outputDir);
-}
-
-async function dev$1(tmsConfig, targetModules, env) {
-  // tms.config.js的modules 合并 module.config.json的配置项
-  let newModules = tmsModulesMergeLocalModuleCfg(targetModules, tmsConfig.appName, DEFAULT_MODULE_DIR); // 判断是否进行init命令
+  return checkDependencies(targetModules, resolve$1('./'), tmsConfig.outputDir, isDev);
+} // 用户编译分包时，需要将dist中其他分包(主包不能删除)的内容删除，否则其他分包的内容混入到主包(导致主包的体积超2M)
 
-  if (isInit(tmsConfig, newModules, resolve$2('dist'))) {
-    // init函数会将 最新的tms.config.js的modules 合并 module.config.json的配置项 返回，不需要再做重复工作
-    const initData = await init$4(tmsConfig, targetModules);
-    newModules = initData.targetModules;
-  }
 
-  console.log('当前dev启动的有效模块', newModules.map(item => item.name));
-  webpackServer(tmsConfig, newModules, env);
+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);
+    }
+  });
 }
 
-var dev_1 = dev$1;
+async function dev$2(tmsConfig, targetModules, env) {
+  let newModules = targetModules;
+  const isDev = true; // 判断是否进行init命令
 
-const webpackConfig = base;
-const {
-  DEFAULT_COPY_CONFIG
-} = require$$3;
-const {
-  getCopyPlugin
-} = utils;
-
-var build$2 = (...args) => {
-  const [tmsConfig, modules] = args;
-  const webpackBuildConfig = webpackConfig(...args);
-  webpackBuildConfig.mode('production');
-  const copyPluginParams = getCopyPlugin(DEFAULT_COPY_CONFIG, modules, tmsConfig, 'build'); // console.log('copyPluginParams', copyPluginParams);
-
-  webpackBuildConfig.plugin('copy-webpack-plugin').use(require$$3__default, [{
-    patterns: copyPluginParams
-  }]).end();
-  return webpackBuildConfig;
-};
-
-const webpack = require$$0__default$9;
-const webBuildConfig = build$2;
-const {
-  createTask: createTask$2
-} = widgets;
-const {
-  fail
-} = log$2;
+  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;
+  }
 
-function compilerRun(compiler) {
-  return new Promise(resolve => {
-    compiler.run((err, stats) => {
-      resolve({
-        err,
-        stats
-      });
-    });
-  });
+  console.log('当前dev启动的有效模块', newModules.map(item => item.name).sort());
+  delOtherModule(tmsConfig, newModules);
+  gulpDev(tmsConfig, newModules, env);
 }
 
-var buildServer = async (...args) => {
-  const config = webBuildConfig(...args);
-  const compiler = webpack(config.toConfig());
-  const {
-    err,
-    stats
-  } = await createTask$2(compilerRun, '开始webpack打包编译', 'webpack打包编译完成')(compiler);
+var dev_1 = dev$2;
 
-  if (err) {
-    fail(err);
-    console.log('详细的错误信息:', err);
-  }
+const dev$1 = dev$3.exports;
 
-  if (stats.hasErrors() || stats.hasWarnings()) {
-    console.log(stats.toString({
-      // 增加控制台颜色开关
-      colors: true,
-      errorDetails: true
-    }));
-  }
-  return compiler;
+var build$2 = async (tmsConfig, newModules) => {
+  dev$1(tmsConfig, newModules, false);
 };
 
-const shelljs$1 = require$$0__default$2;
-const webpackBuildServer = buildServer;
+const shelljs = require$$4__default;
 const {
-  resolve: resolve$1
+  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$1.rm('-rf', resolve$1('dist'));
+  await shelljs.rm('-rf', resolve(tmsConfig.outputDir));
+  const isDev = false;
   const {
     targetModules: newModules
-  } = await init$3(tmsConfig, targetModules);
-  webpackBuildServer(tmsConfig, newModules, env);
+  } = await init$3(tmsConfig, targetModules, isDev);
+  gulpBuild(tmsConfig, newModules, env);
 }
 
 var build_1 = build$1;
 
-const shelljs = require$$0__default$2;
-const {
-  createTask: createTask$1
-} = widgets;
-const {
-  buildMpNpm
-} = mpCiUtils;
-const glob = require$$3__default$1;
-const path = require$$1__default$1;
-
-function npmInstall(contextDir) {
-  return new Promise((resolve, reject) => {
-    glob(`${contextDir}/**/package.json`, ['node_modules', 'miniprogram_npm'], (err, files) => {
-      if (err) {
-        reject(err);
-      }
-
-      files.forEach(file => {
-        const dir = path.dirname(file);
-        shelljs.cd(dir);
-        shelljs.exec('npx pnpm install --prod --registry http://mirrors.tencent.com/npm/', {
-          silent: false
-        });
-      });
-      resolve();
-    });
-  });
-}
-
-async function install$1(contextDir) {
-  // npm install
-  await createTask$1(npmInstall, '开始npm install', 'npm install完成')(contextDir); // 构建miniprograme_npm
-
-  await createTask$1(buildMpNpm, '开始构建miniprogram_npm', '构建miniprogram_npm 完成')({
-    appId: 'null',
-    projectPath: contextDir,
-    privateKey: 'null'
-  });
-}
-
-var install_1 = install$1;
-
-const init$2 = init$5;
+const init$2 = init_1;
 const dev = dev_1;
 const build = build_1;
 const install = install_1;
 const {
-  createTask,
-  resolve
+  createTask
 } = widgets;
 const {
   MODE
 } = require$$3;
 const {
   readTmsConfig,
+  readTmsPrivateCf,
   checkModules
 } = tkitUtils;
+const {
+  tmsModulesMergeLocalModuleCfg,
+  subModulesMergeDepModules
+} = tkitUtils;
 
-const handleModulesArg = cmd => {
-  // 主模块开发
-  if (cmd.module === MODE.main) {
-    return MODE.main;
-  } // 单模块 或 多模块开发
+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 (cmd.module) {
-    return [cmd.module, ...cmd.args];
+  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;
   } // 全量模块
 
 
@@ -2090,39 +2836,44 @@ const handleModulesArg = cmd => {
 };
 
 async function run(commandName, cmd) {
-  if (commandName === 'install') {
-    install(resolve('./'));
-    return;
-  }
+  // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
+  const tmsPrivateCg = readTmsPrivateCf(); // 处理module参数
 
-  const moduleArg = handleModulesArg(cmd);
+  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, newModules, env);
       return;
 
     case 'build':
-      build(tmsConfig, modules, env);
+      build(tmsConfig, newModules, env);
       return;
 
     default:
@@ -2139,22 +2890,54 @@ var entry = [{
     create_1(appName, cmd);
   }
 }, {
-  command: 'run <command-name>',
-  options: [['-m, --module [moduleName]', '模块名称'], ['-e, --env [env]', '环境变量']],
-  description: '运行模块',
-  action: (commandName, cmd) => {
-    run_1(commandName, cmd);
-  }
+  name: 'run',
+  type: 'child',
+  description: '项目开发使用的命令',
+  commands: [{
+    command: 'install',
+    description: '安装依赖',
+    options: [['-m, --module [moduleName]', '模块名称'], ['-e, --env [env]', '环境变量']],
+    action: cmd => {
+      run_1('install', cmd);
+    }
+  }, {
+    command: 'dev',
+    description: 'dev 打包编译',
+    options: [['-m, --module [moduleName]', '模块名称'], ['-e, --env [env]', '环境变量']],
+    action: cmd => {
+      run_1('dev', cmd);
+    }
+  }, {
+    command: 'build',
+    description: 'prod 打包编译',
+    options: [['-m, --module [moduleName]', '模块名称'], ['-e, --env [env]', '环境变量']],
+    action: cmd => {
+      run_1('build', cmd);
+    }
+  }, {
+    command: 'init',
+    description: '根据模块配置初始化项目(eg: 动态拷贝模块、下载依赖、生成app.json等)',
+    options: [['-m, --module [moduleName]', '模块名称'], ['-e, --env [env]', '环境变量']],
+    action: cmd => {
+      run_1('init', cmd);
+    }
+  }]
 }];
 
 var require$$6 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.5",
+	version: "0.0.6",
 	description: "tmskit",
 	main: "main.js",
 	bin: {
 		tmskit: "main.js"
 	},
+	files: [
+		"src",
+		"dist",
+		"main.js",
+		"package.json"
+	],
 	scripts: {
 		dev: "rollup -wc --environment TARGET:tmskit",
 		build: "rollup -c --environment TARGET:tmskit"
@@ -2180,37 +2963,46 @@ var require$$6 = {
 	dependencies: {
 		async: "^3.2.2",
 		chalk: "^4.1.0",
-		commander: "^6.2.1",
+		commander: "^8.3.0",
 		"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",
+		"gulp-image": "^5.1.0",
+		"gulp-postcss": "^9.0.1",
+		"gulp-px-to-rpx": "^1.0.7",
+		"gulp-watch": "^5.0.1",
+		htmlparser2: "^7.2.0",
 		inquirer: "^7.3.3",
 		leven: "3.1.0",
 		lodash: "^4.17.21",
 		metalsmith: "^2.3.0",
 		"miniprogram-ci": "1.4.13",
+		"object-assign": "^4.0.1",
 		ora: "^5.1.0",
+		"plugin-error": "^1.0.0",
+		postcss: "^8.4.6",
+		precinct: "^8.3.1",
 		"replace-ext": "^2.0.0",
 		shelljs: "^0.8.4",
-		"ts-loader": "^9.2.6",
-		webpack: "^5.64.0",
-		"webpack-chain": "^6.5.1"
+		"strip-comments": "^2.0.1",
+		through2: "^4.0.2",
+		"vinyl-sourcemaps-apply": "^0.2.0"
 	},
 	engines: {
-		node: "^12.17.0 || >= 14.0.0"
+		node: "^12.17.0 || >= 14.13.1"
 	},
 	jest: {
 		testEnvironment: "jest-environment-node"
 	}
 };
 
-const {
-  exec
-} = require$$0__default$2;
-const semver = require$$1__default$4;
+const semver = require$$1__default$7;
 const packageJson = require$$6;
-const chalk$1 = require$$0__default$3;
+const chalk$1 = require$$0__default$2;
 const {
   log: log$1
 } = widgets;
@@ -2240,17 +3032,13 @@ const checkNodeVersion = (wanted, id) => {
 function initCliContext() {
   // 执行操作前检查node版本
   // 旧版本node直接提示升级，退出脚本
-  checkNodeVersion(requiredVersion, packName); // 执行前配置正确的npm源
-
-  exec('npm config set registry https://mirrors.tencent.com/npm/ --global', {
-    silent: true
-  });
+  checkNodeVersion(requiredVersion, packName);
 }
 
 var init$1 = initCliContext;
 
-const chalk = require$$0__default$3;
-const program = require$$0__default;
+const chalk = require$$0__default$2;
+const commander = require$$0__default;
 const {
   log,
   suggestCommands
@@ -2261,16 +3049,30 @@ const {
 const commands = entry;
 const init = init$1;
 init();
-program.version(`${TMS_NAME} ${require$$6.version}`);
-commands.forEach(cmd => {
-  var _cmd$options;
-
-  const command = program.command(cmd.command);
-  cmd.usage && command.usage(cmd.usage);
-  cmd.description && command.description(cmd.description);
-  (_cmd$options = cmd.options) === null || _cmd$options === void 0 ? void 0 : _cmd$options.forEach(opt => command.option(...opt));
-  command.action(cmd.action);
-});
+const program = new commander.Command(TMS_NAME);
+program.version(`${TMS_NAME} ${require$$6.version}`, '-v, -V, --version');
+
+function registerCommand(program, commands) {
+  commands.forEach(cmd => {
+    if (cmd.type === 'child') {
+      const childProgram = new commander.Command(cmd.name);
+      cmd.usage && childProgram.usage(cmd.usage);
+      cmd.description && childProgram.description(cmd.description);
+      registerCommand(childProgram, cmd.commands);
+      program.addCommand(childProgram);
+    } else {
+      var _cmd$options;
+
+      const command = program.command(cmd.command);
+      cmd.usage && command.usage(cmd.usage);
+      cmd.description && command.description(cmd.description);
+      (_cmd$options = cmd.options) === null || _cmd$options === void 0 ? void 0 : _cmd$options.forEach(opt => command.option(...opt));
+      command.action(cmd.action);
+    }
+  });
+}
+
+registerCommand(program, commands);
 program.on('--help', () => {
   log();
   log(`  Run ${chalk.cyan(`${TMS_NAME}  <command> --help`)} for detailed usage of given command.`);
@@ -2291,6 +3093,6 @@ if (!process.argv.slice(2).length) {
 }
 
 program.parse(process.argv);
-var src = src$1;
+var src = src$2;
 
 module.exports = src;