@tmsfe/tmskit 0.0.5-beta.4 → 0.0.5-beta.5

package/dist/index.cjs.js

@@ -83,7 +83,7 @@ const fs$e = require$$0__default$1;
 const shelljs$6 = require$$5__default;
 const download = require$$6__default;
 const chalk$3 = require$$0__default$2;
-const shelljsOptons = {
+const shelljsOptions = {
   slient: true
 }; // 获取当前目录
 
@@ -189,7 +189,7 @@ function downloadRepo(dest, downloadOptions = {
 
 function downloadRepoForGit$2(url, dest, branch) {
   const cwd = process.cwd();
-  return new Promise(resolve => {
+  return new Promise((resolve, reject) => {
     // 如果目标目录不存在
     if (fs$e.existsSync(dest)) {
       shelljs$6.rm('-rf', path$a.join(dest));
@@ -197,7 +197,12 @@ function downloadRepoForGit$2(url, dest, branch) {
 
     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();
   });
@@ -911,7 +916,7 @@ function buildOutputAppJson$1(tmsConfig, modules) {
   processAppJson(appJson); // 更新主包，需在subpackages处理完成后执行， pages/
 
   updateMainPackages(appJson, tmsConfig.mainPackages);
-  fs$a.writeFileSync(resolve$a(`${tmsConfig.gulp.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+  fs$a.writeFileSync(resolve$a(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
   return appJson;
 }
 
@@ -1063,19 +1068,17 @@ var defaultTmsConfig$1 = {
   // 模块配置信息
   modules: [],
   cloudDir: 'cloud',
-  gulp: {
-    // 第三方依赖代码需要拷贝到本项目的
-    dependencies: {},
+  // 第三方依赖代码需要拷贝到本项目的
+  dependencies: {},
 
-    /** 编译输出文件夹位置 */
-    outputDir: 'dist',
+  /** 编译输出文件夹位置 */
+  outputDir: 'dist',
 
-    /** 源码监听路径 */
-    sourceDir: './',
+  /** 源码监听路径 */
+  sourceDir: './',
 
-    /** 静态资源目录 */
-    static: []
-  }
+  /** 静态资源目录 */
+  static: []
 };
 
 const loadash = require$$0__default$5;
@@ -1455,7 +1458,7 @@ const {
 async function install$2(tmsConfig, modules, isCloud = true) {
   const newModules = tmsModulesMergeLocalModuleCfg$2(modules, tmsConfig.appName, DEFAULT_MODULE_DIR$2); // 小程序npm install
 
-  await createTask$2(mpNpmInstallAll, '小程序 开始npm install', '小程序npm install 完成')(newModules, resolve$7(tmsConfig.gulp.outputDir), `${CACHE_DIR}/node_modules`); // 构建miniprograme_npm
+  await createTask$2(mpNpmInstallAll, '小程序 开始npm install', '小程序npm install 完成')(newModules, resolve$7(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`); // 构建miniprograme_npm
 
   await createTask$2(buildMpNpm, '开始构建miniprograme_npm', '构建miniprograme_npm 完成')({
     appId: tmsConfig.appId,
@@ -1502,16 +1505,16 @@ const install$1 = install_1;
  */
 
 const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
-  const outputDir = resolve$6(tmsConfig.gulp.outputDir);
+  const outputDir = resolve$6(tmsConfig.outputDir);
   io.ensureDirExist(outputDir);
   defaultFiles.forEach(item => {
     if (fs$6.existsSync(resolve$6(item))) {
-      shelljs$3.cp('-rf', resolve$6(item), resolve$6(tmsConfig.gulp.outputDir, item));
+      shelljs$3.cp('-rf', resolve$6(item), resolve$6(tmsConfig.outputDir, item));
     }
   }); // 拷贝模块的package.json到编译输出目录
 
   targetModules.forEach(item => {
-    const outputModuleDir = resolve$6(`${tmsConfig.gulp.outputDir}/${item.root}`);
+    const outputModuleDir = resolve$6(`${tmsConfig.outputDir}/${item.root}`);
 
     if (!fs$6.existsSync(resolve$6(item.path))) {
       fail$5(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
@@ -1539,14 +1542,14 @@ async function task(tmsConfig, targetModules) {
   return newModules;
 }
 
-async function bootstrap(tmsConfig, targetModules) {
+async function init$5(tmsConfig, targetModules) {
   const newModules = await task(tmsConfig, targetModules);
   return {
     targetModules: newModules
   };
 }
 
-var init$5 = bootstrap;
+var init_1 = init$5;
 
 var dev$3 = {exports: {}};
 
@@ -1710,14 +1713,14 @@ function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
     // 依赖分析的文件
     const anaFileOriginFile = file.history[0];
     const anaFileRelativeModule = path$4.relative(resolve$5(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$5(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+    const anaFileDestFile = resolve$5(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
       const deps = cssFilter.indexOf(path$4.extname(file.path)) > -1 ? findCssImports(contents) : precinct(contents);
       const copyModules = new Map();
-      Object.keys(tmsConfig.gulp.dependencies).forEach(includeName => {
-        const includePath = tmsConfig.gulp.dependencies[includeName];
+      Object.keys(tmsConfig.dependencies).forEach(includeName => {
+        const includePath = tmsConfig.dependencies[includeName];
         deps.forEach(depItem => {
           if (depItem.indexOf(includeName) > -1) {
             // 被依赖文件的存在的绝对路径 (eg: /User/thirdparty/loadsh)
@@ -1739,7 +1742,7 @@ function mpCommonDep$1(tmsConfig, module, extensions = [], isWatch = true) {
             const regRes = depItem.match(reg) || [];
 
             if (regRes[2]) {
-              const depDestPath = resolve$5(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+              const depDestPath = resolve$5(tmsConfig.outputDir, module.to, includeName, regRes[2]);
               const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
 
               if (!copyModules.has(depDestFile)) {
@@ -1807,7 +1810,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
     // 当前分析的文件的路径
     const anaFileOriginFile = file.history[0];
     const anaFileRelativeModule = path$3.relative(resolve$4(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$4(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+    const anaFileDestFile = resolve$4(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       const copyModules = new Map();
@@ -1817,8 +1820,8 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
         contents = JSON.parse(contents);
 
         if (contents.usingComponents) {
-          Object.keys(tmsConfig.gulp.dependencies).forEach(includeName => {
-            const includePath = tmsConfig.gulp.dependencies[includeName];
+          Object.keys(tmsConfig.dependencies).forEach(includeName => {
+            const includePath = tmsConfig.dependencies[includeName];
             Object.keys(contents.usingComponents).forEach(componentKey => {
               const componentPath = contents.usingComponents[componentKey];
 
@@ -1842,7 +1845,7 @@ function mpJsonDep$1(tmsConfig, module, extensions = ['.json'], filesExt = ['.wx
                 const regRes = componentPath.match(reg) || [];
 
                 if (regRes[2]) {
-                  const depDestPath = resolve$4(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+                  const depDestPath = resolve$4(tmsConfig.outputDir, module.to, includeName, regRes[2]);
                   const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
 
                   if (!copyModules.has(depDestFile)) {
@@ -2033,7 +2036,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
     // 依赖分析的文件
     const anaFileOriginFile = file.history[0];
     const anaFileRelativeModule = path$2.relative(resolve$3(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve$3(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+    const anaFileDestFile = resolve$3(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
@@ -2050,9 +2053,9 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
               file: depOriginFile,
               extPath
             } = extFile(name, depOriginPath);
-            Object.keys(tmsConfig.gulp.dependencies).forEach(includeName => {
+            Object.keys(tmsConfig.dependencies).forEach(includeName => {
               if (attributes.src.indexOf(includeName) > -1) {
-                const includePath = tmsConfig.gulp.dependencies[includeName];
+                const includePath = tmsConfig.dependencies[includeName];
 
                 if (!fileInDir(includePath, depOriginFile)) {
                   pluginError(new Error(`${anaFileOriginFile}引用路径${depOriginFile}不在${includePath}不在文件夹内, 请检查应用路径`), isWatch);
@@ -2064,7 +2067,7 @@ function mpWxmlDep$1(tmsConfig, module, isWatch) {
                 const regRes = attributes.src.match(reg) || [];
 
                 if (regRes[2]) {
-                  const depDestPath = resolve$3(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+                  const depDestPath = resolve$3(tmsConfig.outputDir, module.to, includeName, regRes[2]);
                   const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath;
 
                   if (!copyModules.has(depDestFile)) {
@@ -2320,8 +2323,6 @@ var compile = function (tmsConfig, {
   }
 
   module.exports = async (tmsConfig, newModules, isWatch = true) => {
-    var _tmsConfig$gulp, _tmsConfig$gulp2;
-
     // 监听app.json
     if (isWatch) {
       watch(resolve('app.json'), {
@@ -2345,7 +2346,7 @@ var compile = function (tmsConfig, {
         from: '',
         to: ''
       },
-      destPath: resolve(tmsConfig.gulp.outputDir),
+      destPath: resolve(tmsConfig.outputDir),
       srcOption: {
         allowEmpty: true
       },
@@ -2381,7 +2382,7 @@ var compile = function (tmsConfig, {
         glob: { ...glob,
           other: [`${resolve(module.path)}/**/*`, ...excludeGlob(glob)]
         },
-        destPath: resolve(tmsConfig.gulp.outputDir, module.root),
+        destPath: resolve(tmsConfig.outputDir, module.root),
         module: {
           from: module.path,
           to: module.root
@@ -2394,10 +2395,8 @@ var compile = function (tmsConfig, {
     } // 监听copy模块
 
 
-    if (tmsConfig !== null && tmsConfig !== void 0 && (_tmsConfig$gulp = tmsConfig.gulp) !== null && _tmsConfig$gulp !== void 0 && _tmsConfig$gulp.static && (tmsConfig === null || tmsConfig === void 0 ? void 0 : (_tmsConfig$gulp2 = tmsConfig.gulp) === null || _tmsConfig$gulp2 === void 0 ? void 0 : _tmsConfig$gulp2.static.length) > 0) {
-      for (const item of (_tmsConfig$gulp3 = tmsConfig.gulp) === null || _tmsConfig$gulp3 === void 0 ? void 0 : _tmsConfig$gulp3.static) {
-        var _tmsConfig$gulp3;
-
+    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 glob = {
           js: `${item.from}/**/*.{js,ts,wxs}`,
           json: `${item.from}/**/*.json`,
@@ -2518,7 +2517,7 @@ const fs = require$$0__default$1;
 const {
   resolve: resolve$1
 } = widgets;
-const init$4 = init$5;
+const init$4 = init_1;
 const {
   DEFAULT_MODULE_DIR
 } = require$$3;
@@ -2573,7 +2572,7 @@ function isInit(tmsConfig, targetModules, contextDir) {
   } //  判断package.json的版本是否有新的版本
 
 
-  return checkDependencies(targetModules, resolve$1('./'), tmsConfig.gulp.outputDir);
+  return checkDependencies(targetModules, resolve$1('./'), tmsConfig.outputDir);
 }
 
 async function dev$2(tmsConfig, targetModules, env) {
@@ -2596,7 +2595,7 @@ const shelljs$1 = require$$5__default;
 const dev$1 = dev$3.exports;
 
 var build$2 = async (tmsConfig, newModules) => {
-  shelljs$1.rm('-rf', tmsConfig.gulp.outputDir);
+  shelljs$1.rm('-rf', tmsConfig.outputDir);
   dev$1(tmsConfig, newModules, false);
 };
 
@@ -2604,12 +2603,12 @@ const shelljs = require$$5__default;
 const {
   resolve
 } = widgets;
-const init$3 = init$5;
+const init$3 = init_1;
 const gulpBuild = build$2;
 
 async function build$1(tmsConfig, targetModules, env) {
   // 开始构建前，清理输出目录
-  await shelljs.rm('-rf', resolve(tmsConfig.gulp.outputDir));
+  await shelljs.rm('-rf', resolve(tmsConfig.outputDir));
   const {
     targetModules: newModules
   } = await init$3(tmsConfig, targetModules);
@@ -2618,7 +2617,7 @@ async function build$1(tmsConfig, targetModules, env) {
 
 var build_1 = build$1;
 
-const init$2 = init$5;
+const init$2 = init_1;
 const dev = dev_1;
 const build = build_1;
 const install = install_1;
@@ -2738,7 +2737,7 @@ var entry = [{
 
 var require$$6 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.5-beta.4",
+	version: "0.0.5-beta.5",
 	description: "tmskit",
 	main: "main.js",
 	bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.5-beta.4",
+  "version": "0.0.5-beta.5",
   "description": "tmskit",
   "main": "main.js",
   "bin": {

package/src/config/defaultTmsConfig.js

@@ -5,14 +5,12 @@ module.exports = {
   // 模块配置信息
   modules: [],
   cloudDir: 'cloud',
-  gulp: {
-    // 第三方依赖代码需要拷贝到本项目的
-    dependencies: {},
-    /** 编译输出文件夹位置 */
-    outputDir: 'dist',
-    /** 源码监听路径 */
-    sourceDir: './',
-    /** 静态资源目录 */
-    static: [],
-  },
+  // 第三方依赖代码需要拷贝到本项目的
+  dependencies: {},
+  /** 编译输出文件夹位置 */
+  outputDir: 'dist',
+  /** 源码监听路径 */
+  sourceDir: './',
+  /** 静态资源目录 */
+  static: [],
 };

package/src/gulp/build.js

@@ -2,7 +2,7 @@ const shelljs = require('shelljs');
 const dev = require('./dev');
 
 module.exports = async (tmsConfig, newModules) => {
-  shelljs.rm('-rf', tmsConfig.gulp.outputDir);
+  shelljs.rm('-rf', tmsConfig.outputDir);
 
   dev(tmsConfig, newModules, false);
 };

package/src/gulp/dev.js

@@ -41,7 +41,7 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
       js: ['app.js', 'app.ts'].map(item => resolve(item)),
     },
     module: { from: '', to: '' },
-    destPath: resolve(tmsConfig.gulp.outputDir),
+    destPath: resolve(tmsConfig.outputDir),
     srcOption: { allowEmpty: true },
     isWatch,
   });
@@ -75,7 +75,7 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
         ...glob,
         other: [`${resolve(module.path)}/**/*`, ...excludeGlob(glob)],
       },
-      destPath: resolve(tmsConfig.gulp.outputDir, module.root),
+      destPath: resolve(tmsConfig.outputDir, module.root),
       module: { from: module.path, to: module.root },
       srcOption: { allowEmpty: true },
       isWatch,
@@ -83,8 +83,8 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
   }
 
   // 监听copy模块
-  if (tmsConfig?.gulp?.static && tmsConfig?.gulp?.static.length > 0) {
-    for (const item of tmsConfig.gulp?.static) {
+  if (tmsConfig?.static && tmsConfig?.static.length > 0) {
+    for (const item of tmsConfig.static) {
       const glob = {
         js: `${item.from}/**/*.{js,ts,wxs}`,
         json: `${item.from}/**/*.json`,

package/src/gulp/plugins/mpCommonDep.js

@@ -60,15 +60,15 @@ function mpCommonDep(tmsConfig, module, extensions = [], isWatch = true) {
     // 依赖分析的文件
     const anaFileOriginFile = file.history[0];
     const anaFileRelativeModule = path.relative(resolve(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+    const anaFileDestFile = resolve(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
       const deps = cssFilter.indexOf(path.extname(file.path)) > -1 ? findCssImports(contents) : precinct(contents);
 
       const copyModules = new Map();
-      Object.keys(tmsConfig.gulp.dependencies).forEach((includeName) => {
-        const includePath = tmsConfig.gulp.dependencies[includeName];
+      Object.keys(tmsConfig.dependencies).forEach((includeName) => {
+        const includePath = tmsConfig.dependencies[includeName];
         deps.forEach((depItem) => {
           if (depItem.indexOf(includeName) > -1) {
             // 被依赖文件的存在的绝对路径 (eg: /User/thirdparty/loadsh)
@@ -88,7 +88,7 @@ function mpCommonDep(tmsConfig, module, extensions = [], isWatch = true) {
             const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
             const regRes = depItem.match(reg) || [];
             if (regRes[2]) {
-              const depDestPath = resolve(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+              const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);
               const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
               if (!copyModules.has(depDestFile)) {
                 copyModules.set(depDestFile, {

package/src/gulp/plugins/mpJsonDep.js

@@ -18,7 +18,7 @@ function mpJsonDep(
     // 当前分析的文件的路径
     const anaFileOriginFile = file.history[0];
     const anaFileRelativeModule = path.relative(resolve(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+    const anaFileDestFile = resolve(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       const copyModules = new Map();
@@ -26,8 +26,8 @@ function mpJsonDep(
       try {
         contents = JSON.parse(contents);
         if (contents.usingComponents) {
-          Object.keys(tmsConfig.gulp.dependencies).forEach((includeName) => {
-            const includePath = tmsConfig.gulp.dependencies[includeName];
+          Object.keys(tmsConfig.dependencies).forEach((includeName) => {
+            const includePath = tmsConfig.dependencies[includeName];
             Object.keys(contents.usingComponents).forEach((componentKey) => {
               const componentPath = contents.usingComponents[componentKey];
               if (componentPath.indexOf(includeName) > -1) {
@@ -48,7 +48,7 @@ function mpJsonDep(
                 const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
                 const regRes = componentPath.match(reg) || [];
                 if (regRes[2]) {
-                  const depDestPath = resolve(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+                  const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);
                   const depDestFile = depDestPath.endsWith(extAlias) ? depDestPath : depDestPath + extPath;
 
                   if (!copyModules.has(depDestFile)) {

package/src/gulp/plugins/mpWxmlDep.js

@@ -107,7 +107,7 @@ function mpWxmlDep(tmsConfig, module, isWatch) {
     // 依赖分析的文件
     const anaFileOriginFile = file.history[0];
     const anaFileRelativeModule = path.relative(resolve(module.from), anaFileOriginFile);
-    const anaFileDestFile = resolve(tmsConfig.gulp.outputDir, module.to, anaFileRelativeModule);
+    const anaFileDestFile = resolve(tmsConfig.outputDir, module.to, anaFileRelativeModule);
 
     if (file.isBuffer()) {
       let contents = String(file.contents);
@@ -120,9 +120,9 @@ function mpWxmlDep(tmsConfig, module, isWatch) {
             // 处理后缀(源码引入依赖时，后缀不全的情况)
             const { ext, file: depOriginFile, extPath } = extFile(name, depOriginPath);
 
-            Object.keys(tmsConfig.gulp.dependencies).forEach((includeName) => {
+            Object.keys(tmsConfig.dependencies).forEach((includeName) => {
               if (attributes.src.indexOf(includeName) > -1) {
-                const includePath = tmsConfig.gulp.dependencies[includeName];
+                const includePath = tmsConfig.dependencies[includeName];
 
                 if (!fileInDir(includePath, depOriginFile)) {
                   pluginError(
@@ -136,7 +136,7 @@ function mpWxmlDep(tmsConfig, module, isWatch) {
                 const reg = new RegExp(`^(\.\.\/)+.*\/${includeName}\/(.*)`);
                 const regRes = attributes.src.match(reg) || [];
                 if (regRes[2]) {
-                  const depDestPath = resolve(tmsConfig.gulp.outputDir, module.to, includeName, regRes[2]);
+                  const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);
                   const depDestFile = depDestPath.endsWith(ext) ? depDestPath : depDestPath + extPath;
                   if (!copyModules.has(depDestFile)) {
                     copyModules.set(depDestFile, {

package/src/index.js

@@ -37,7 +37,6 @@ function registerCommand(program, commands) {
 
 registerCommand(program, commands);
 
-
 program.on('--help', () => {
   log();
   log(`  Run ${chalk.cyan(`${TMS_NAME}  <command> --help`)} for detailed usage of given command.`);

package/src/scripts/run/build/index.js

@@ -5,7 +5,7 @@ const gulpBuild = require('../../../gulp/build');
 
 async function build(tmsConfig, targetModules, env) {
   // 开始构建前，清理输出目录
-  await shelljs.rm('-rf', resolve(tmsConfig.gulp.outputDir));
+  await shelljs.rm('-rf', resolve(tmsConfig.outputDir));
 
   const { targetModules: newModules } = await init(tmsConfig, targetModules);
 

package/src/scripts/run/dev/index.js

@@ -45,7 +45,7 @@ function isInit(tmsConfig, targetModules, contextDir) {
   }
 
   //  判断package.json的版本是否有新的版本
-  return checkDependencies(targetModules, resolve('./'), tmsConfig.gulp.outputDir);
+  return checkDependencies(targetModules, resolve('./'), tmsConfig.outputDir);
 }
 
 async function dev(tmsConfig, targetModules, env) {

package/src/scripts/run/init/index.js

@@ -17,17 +17,17 @@ const install = require('../install');
  * @returns
  */
 const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
-  const outputDir = resolve(tmsConfig.gulp.outputDir);
+  const outputDir = resolve(tmsConfig.outputDir);
   io.ensureDirExist(outputDir);
   defaultFiles.forEach((item) => {
     if (fs.existsSync(resolve(item))) {
-      shelljs.cp('-rf', resolve(item), resolve(tmsConfig.gulp.outputDir, item));
+      shelljs.cp('-rf', resolve(item), resolve(tmsConfig.outputDir, item));
     }
   });
 
   // 拷贝模块的package.json到编译输出目录
   targetModules.forEach((item) => {
-    const outputModuleDir = resolve(`${tmsConfig.gulp.outputDir}/${item.root}`);
+    const outputModuleDir = resolve(`${tmsConfig.outputDir}/${item.root}`);
     if (!fs.existsSync(resolve(item.path))) {
       fail(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
       process.exit(1);
@@ -69,7 +69,7 @@ async function task(tmsConfig, targetModules) {
 
   return newModules;
 }
-async function bootstrap(tmsConfig, targetModules) {
+async function init(tmsConfig, targetModules) {
   const newModules = await task(tmsConfig, targetModules);
 
   return {
@@ -77,4 +77,4 @@ async function bootstrap(tmsConfig, targetModules) {
   };
 }
 
-module.exports = bootstrap;
+module.exports = init;

package/src/scripts/run/install/index.js

@@ -11,7 +11,7 @@ async function install(tmsConfig, modules, isCloud = true) {
     mpNpmInstallAll,
     '小程序 开始npm install',
     '小程序npm install 完成',
-  )(newModules, resolve(tmsConfig.gulp.outputDir), `${CACHE_DIR}/node_modules`);
+  )(newModules, resolve(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`);
 
   // 构建miniprograme_npm
   await createTask(

package/src/utils/buildAppJson.js

@@ -189,7 +189,7 @@ function buildOutputAppJson(tmsConfig, modules) {
   // 更新主包，需在subpackages处理完成后执行， pages/
   updateMainPackages(appJson, tmsConfig.mainPackages, DEFAULT_MODULE_DIR);
 
-  fs.writeFileSync(resolve(`${tmsConfig.gulp.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+  fs.writeFileSync(resolve(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
 
   return appJson;
 }

package/src/utils/cloneModules.js

@@ -64,6 +64,7 @@ async function downLoadAndMoveModule(sourceDir, targetDir,  moduleInfo) {
   const globalInstance = getGlobalInstance();
   const moduleInCache = globalInstance.getModuleCache(httpRepoUrl, cloneBranch);
 
+
   try {
     if (!moduleInCache) {
       await downloadRepoForGit(httpRepoUrl, sourcePath, cloneBranch);

package/src/utils/widgets.js

@@ -7,7 +7,7 @@ const fs = require('fs');
 const shelljs = require('shelljs');
 const download = require('download-git-repo');
 const chalk = require('chalk');
-const shelljsOptons =  { slient: true };
+const shelljsOptions =  { slient: true };
 
 // 获取当前目录
 const cwd = process.cwd();
@@ -96,7 +96,7 @@ function downloadRepo(dest, downloadOptions = { repoUrl: '', gitUrl: '', branch:
 function downloadRepoForGit(url, dest, branch) {
   const cwd = process.cwd();
 
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     // 如果目标目录不存在
     if (fs.existsSync(dest)) {
       shelljs.rm('-rf', path.join(dest));
@@ -105,7 +105,10 @@ function downloadRepoForGit(url, dest, branch) {
     shelljs.mkdir('-p', dest);
     shelljs.cd(dest);
 
-    shelljs.exec(`git clone ${url} ${dest} --branch ${branch} --depth 1`, shelljsOptons);
+    const gitCloneRes = shelljs.exec(`git clone ${url} ${dest} --branch ${branch} --depth 1`, shelljsOptions);
+    if (gitCloneRes.code !== 0) {
+      reject(gitCloneRes.stderr);
+    }
 
     shelljs.cd(cwd);
     resolve();

package/src/webpack/base.js

@@ -1,65 +0,0 @@
-const WebpackChain = require('webpack-chain');
-const webpack = require('webpack');
-const { getEntry, stringified, getAlias } = require('./utils');
-const { resolve } = require('../utils/widgets');
-const { DEFAULT_WEBPACK_ENTRY, DEFAULT_MODULE_DIR } = require('../config/constant');
-
-module.exports = (tmsConfig, modules) => {
-  const { envData = {}, webpack: tmsWebpack } = tmsConfig;
-  let webpackConfig = new WebpackChain();
-
-  const alias = getAlias(modules);
-  const entry = getEntry(DEFAULT_WEBPACK_ENTRY, modules, tmsConfig, DEFAULT_MODULE_DIR);
-  webpackConfig.merge({
-    entry,
-    output: {
-      path: resolve(`./${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('./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.DefinePlugin, [stringified(envData)])
-    .end();
-
-  // 执行tms.config.js自定义的webpackChain
-  if (tmsWebpack.webpackChain) {
-    webpackConfig = tmsWebpack.webpackChain(webpackConfig, {
-      modules,
-    });
-  }
-
-  return webpackConfig;
-};

package/src/webpack/build.js

@@ -1,21 +0,0 @@
-const webpackConfig = require('./base');
-const { DEFAULT_COPY_CONFIG } = require('../config/constant');
-const { getCopyPlugin } = require('./utils');
-
-module.exports = (...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('copy-webpack-plugin'), [{
-      patterns: copyPluginParams,
-    }])
-    .end();
-
-  return webpackBuildConfig;
-};

package/src/webpack/buildServer.js

@@ -1,34 +0,0 @@
-const webpack = require('webpack');
-const webBuildConfig = require('./build');
-const { createTask } = require('../utils/widgets');
-const { fail } = require('../utils/log');
-
-function compilerRun(compiler) {
-  return new Promise((resolve) => {
-    compiler.run((err, stats) => {
-      resolve({ err, stats });
-    });
-  });
-}
-
-module.exports = async (...args) => {
-  const config = webBuildConfig(...args);
-  const compiler = webpack(config.toConfig());
-
-  const { err, stats } = await createTask(compilerRun, '开始webpack打包编译', 'webpack打包编译完成')(compiler);;
-
-  if (err) {
-    fail(err);
-    console.log('详细的错误信息:', err);
-  }
-
-  if (stats.hasErrors() || stats.hasWarnings()) {
-    console.log(stats.toString({
-      // 增加控制台颜色开关
-      colors: true,
-      errorDetails: true,
-    }));
-  };
-
-  return compiler;
-};

package/src/webpack/dev.js

@@ -1,31 +0,0 @@
-const webpackConfig = require('./base');
-const { DEFAULT_COPY_CONFIG } = require('../config/constant');
-const { getCopyPlugin } = require('./utils');
-
-module.exports = (...args) => {
-  const [tmsConfig, modules] = args;
-  const webpackDevConfig = webpackConfig(...args);
-
-  webpackDevConfig.devtool('source-map');
-
-  webpackDevConfig.mode('development');
-
-  const copyPluginParams = getCopyPlugin(DEFAULT_COPY_CONFIG, modules, tmsConfig, 'dev');
-  // console.log('copyPluginParams', copyPluginParams);
-  webpackDevConfig
-    .plugin('copy-webpack-plugin')
-    .use(require('copy-webpack-plugin'), [{
-      patterns: copyPluginParams,
-    }])
-    .end();
-
-  webpackDevConfig
-    .plugin('ExtractPlugin')
-    .use(require('./plugins/entryExtractPlugin'), [{
-      tmsConfig,
-      modules,
-    }])
-    .end();
-
-  return webpackDevConfig;
-};

package/src/webpack/devServer.js

@@ -1,37 +0,0 @@
-const webpack = require('webpack');
-const webDevConfig = require('./dev');
-const { setupDevWebPackHooks } = require('./utils');
-const { fail } = require('../utils/log');
-
-module.exports = (...args) => {
-  const config = webDevConfig(...args);
-  const compiler = webpack(config.toConfig());
-
-  setupDevWebPackHooks({
-    compiler,
-  }, () => {
-    // TODO 判断open参数，打开微信开发者工具
-    // openDevtool(api.resolve(config.outputDir || 'dist'))
-  });
-
-  compiler.watch(
-    {
-      aggregateTimeout: 1000,
-      poll: undefined,
-    },
-    (err, stats) => {
-      if (err) {
-        fail(err);
-        console.log('详细的错误信息:', err);
-      }
-      if (stats.hasErrors() || stats.hasWarnings()) {
-        console.log(stats.toString({
-          // 增加控制台颜色开关
-          colors: true,
-        }));
-      };
-    },
-  );
-
-  return compiler;
-};

package/src/webpack/plugins/entryExtractPlugin/index.js

@@ -1,28 +0,0 @@
-const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin');
-const { DEFAULT_WEBPACK_ENTRY, DEFAULT_MODULE_DIR } = require('../../../config/constant');
-const { getEntry } = require('../../utils');
-
-class EntryExtraPlugin {
-  constructor(options = {}) {
-    this.options = options;
-  }
-
-  applyEntry(compiler, entry) {
-    const { context } = compiler.options;
-
-    Object.keys(entry).forEach((key) => {
-      new SingleEntryPlugin(context, entry[key], key).apply(compiler);
-    });
-  }
-
-  apply(compiler) {
-    const { tmsConfig = {}, modules = [] } = this.options;
-
-    compiler.hooks.watchRun.tap('EntryExtraPlugin', () => {
-      const entry = getEntry(DEFAULT_WEBPACK_ENTRY, modules, tmsConfig, DEFAULT_MODULE_DIR);
-      this.applyEntry(compiler, entry);
-    });
-  }
-}
-
-module.exports = EntryExtraPlugin;

package/src/webpack/utils.js

@@ -1,244 +0,0 @@
-const path = require('path');
-const fs = require('fs');
-const { resolve } = require('../utils/widgets');
-const { buildOutputAppJson } = require('../utils/buildAppJson');
-const { tmsModulesMergeLocalModuleCfg } = require('../utils/tkitUtils');
-const { findAllPackageJson } = require('../utils/npmUtils');
-const { fail } = require('../utils/log');
-const replaceExt = require('replace-ext');
-
-const extensions = ['.ts', '.js'];
-function ext(entry, extensions) {
-  let newEntry = entry;
-  try {
-    const stat = fs.lstatSync(newEntry);
-    if (stat.isDirectory()) {
-      newEntry += (newEntry[newEntry.length - 1] === '/') ? 'index' : '/index';
-    }
-  } catch (e) {}
-
-  for (const ext of extensions) {
-    const file = replaceExt(newEntry, ext);
-    if (fs.existsSync(file)) {
-      return {
-        file,
-        ext,
-      };
-    }
-  }
-  return null;
-}
-
-// 获取所有的package.json里的依赖包Dir
-function getAlias(modules) {
-  const alias = {};
-  const allPackages = findAllPackageJson(modules, resolve('./dist'));
-  allPackages.forEach((packageFilePath) => {
-    const { dependencies } = require(packageFilePath);
-    Object.keys(dependencies).forEach((dependence) => {
-      alias[dependence] = path.join(path.dirname(packageFilePath), `./miniprogram_npm/${dependence}`);
-    });
-  });
-  return alias;
-}
-
-
-// 根据用户选择的modules，找到module.config.json的配置信息，找到所有的page
-function getPageEntry(modules, tmsConfig, moduleDir) {
-  const entry = {};
-  // tms.config.js的modules 合并 module.config.json的配置项
-  const newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName, moduleDir);
-  newModules.forEach(({ path: relativePath, pages, root }) => {
-    pages.forEach((page) => {
-      const pageJsonPath = `${resolve(relativePath, page)}.json`;
-      if (fs.existsSync(pageJsonPath)) {
-        const pageJsonContent = JSON.parse(fs.readFileSync(pageJsonPath, 'utf-8'));
-        const pageDir = path.dirname(pageJsonPath); // 该页面所在的目录
-        const extValue = ext(resolve(relativePath, page), extensions);
-        if (!extValue) {
-          fail(`当前${page}找不到入口.js或.ts文件`);
-          process.exit(1);
-        }
-        const entryKey = `${root}/${page}${extValue.ext}`;
-
-        Object.assign(
-          entry,
-          { [entryKey]: extValue.file },
-          getComponentEntry(pageJsonContent, pageDir, path.dirname(entryKey)),
-        );
-      }
-    });
-  });
-  return entry;
-}
-
-// 根据appJson，获取所有的page
-function getEntry(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),
-  };
-}
-
-// 根据pageJson，filePath，获取页面引入的所有component
-function getComponentEntry(pageJson, pagePath, pageKey) {
-  const componentEntry = {};
-  function task(json, dir, rootKey) {
-    if (!json.usingComponents) {
-      return;
-    }
-
-    const componentKeys = Object.keys(json.usingComponents);
-
-    // 如果存在依赖的组件
-    componentKeys.forEach((key) => {
-      if (json.usingComponents[key].startsWith('.')) {
-        // 拼出组件所在位置的绝对路径
-        const comValue = path.join(dir, json.usingComponents[key]);
-        const extValue = ext(comValue, extensions);
-        const comKey = path.resolve('/', rootKey, json.usingComponents[key]);
-        if (!extValue) {
-          fail(`当前page: ${pagePath} component: ${comValue}找不到入口.js或.ts文件`);
-          process.exit(1);
-        }
-
-        componentEntry[`${comKey.slice(1)}${extValue.ext}`] = extValue.file;
-        const comJsonPath = `${comValue}.json`;
-        if (fs.existsSync(comJsonPath)) {
-          const comJsonContent = JSON.parse(fs.readFileSync(comJsonPath, 'utf-8'));
-
-          const comDir = path.dirname(comJsonPath); // 该页面所在的目录
-          task(comJsonContent, comDir, path.dirname(comKey));
-        }
-      }
-    });
-  }
-
-  task(pageJson, pagePath, pageKey);
-
-  return componentEntry;
-}
-
-// 根据modules处理需要拷贝的模块，copy-webpack-plugin需要的参数
-function getCopyPlugin(defaultCopyConfig, modules, tmsConfig, env) {
-  const toPath = tmsConfig.webpack.outputDir;
-  function generatorAppJson(tmsConfig, modules) {
-    try {
-      return buildOutputAppJson(tmsConfig, modules);
-    } catch (e) {
-      fail(`动态生成app.json出现错误${e} 请检查你的配置项`);
-      return {};
-    }
-  }
-
-  const patterns = [];
-  // 默认的一些配置拷贝文件 package.json、sitemap.json等
-  defaultCopyConfig.forEach((item) => {
-    if (fs.existsSync(resolve(item))) {
-      patterns.push({
-        from: resolve(item),
-        to: resolve(`./${toPath}/${item}`),
-        transform: {
-          cache: true,
-        },
-      });
-    }
-  });
-
-  // 拷贝模块的代码
-  modules.forEach((item) => {
-    patterns.push({
-      from: resolve(item.path),
-      to: resolve(`./${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,
-      },
-    });
-  });
-
-  if (env === 'dev') {
-    // 拷贝app.json时，自动生成编译后的app.json
-    const appJsonConfig = ['app.json'];
-    appJsonConfig.forEach((item) => {
-      patterns.push({
-        from: resolve(item),
-        to: resolve(`./${toPath}/${item}`),
-        transform: {
-          cache: true,
-          transformer: () => {
-            const appJson = generatorAppJson(tmsConfig, modules);
-            return JSON.stringify(appJson, null, 2);
-          },
-        },
-      });
-    });
-  }
-
-  return patterns;
-}
-
-// dev时，给webpack注入相应的事件
-const setupDevWebPackHooks = (context, firstDone) => {
-  let tempFirstDone = true;
-
-  const invalid = () => {
-    // eslint-disable-next-line
-    context.stats = undefined;
-  };
-
-  const done = (stats) => {
-    // eslint-disable-next-line
-    context.stats = stats;
-
-    process.nextTick(() => {
-      const { stats } = context;
-      if (!stats) return;
-
-      if (tempFirstDone) {
-        tempFirstDone = false;
-        firstDone();
-      }
-    });
-  };
-  const { compiler } = context;
-
-  compiler.hooks.watchRun.tap('miniprogram-dev', invalid);
-  compiler.hooks.invalid.tap('miniprogram-dev', invalid);
-  compiler.hooks.done.tap('miniprogram-dev', done);
-};
-
-const stringified = raw => ({
-  'process.env': Object.keys(raw).reduce(
-    (env, key) => {
-      // eslint-disable-next-line
-      env[key] = JSON.stringify(raw[key]);
-      return env;
-    },
-    {},
-  ),
-});
-
-module.exports = {
-  getCopyPlugin,
-  setupDevWebPackHooks,
-  getEntry,
-  stringified,
-  getAlias,
-};