@tmsfe/tmskit 0.0.5-beta.4 → 0.0.6

package/package.json

@@ -1,12 +1,17 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.5-beta.4",
+  "version": "0.0.6",
   "description": "tmskit",
   "main": "main.js",
   "bin": {
     "tmskit": "main.js"
   },
-  "files": ["src", "dist", "main.js", "package.json"],
+  "files": [
+    "src",
+    "dist",
+    "main.js",
+    "package.json"
+  ],
   "scripts": {
     "dev": "rollup -wc --environment TARGET:tmskit",
     "build": "rollup -c --environment TARGET:tmskit"
@@ -36,6 +41,7 @@
     "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",

package/src/config/constant.js

@@ -21,6 +21,7 @@ const TMS_NAME = 'tmskit';
 // 脚手架的配置名称
 const TMS_CONFIG_FILENAME = 'tms.config.js';
 
+const TMS_PRIVATE_FILENAME = 'tms.private.config.js';
 
 // 模块代码的默认在modules子目录
 const DEFAULT_MODULE_DIR = 'modules';
@@ -38,7 +39,6 @@ const DEFAULT_COPY_CONFIG = ['package.json', 'sitemap.json'];
 
 // 开发模式
 const MODE = {
-  main: 'tkitmain',
   all: 'all',
   multi: 'multi',
 };
@@ -58,6 +58,7 @@ export {
   TEMPLATE_PATH,
   TMS_NAME,
   TMS_CONFIG_FILENAME,
+  TMS_PRIVATE_FILENAME,
   DEFAULT_MODULE_DIR,
   MODULE_CONFIG_FILENAME,
   DEFAULT_WEBPACK_ENTRY,

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

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

package/src/gulp/compile.js

@@ -2,9 +2,9 @@ const { src, dest, lastRun } = require('gulp');
 const px2rpx = require('gulp-px-to-rpx');
 const postcss = require('gulp-postcss');
 const watch = require('gulp-watch');
-const cache = require('gulp-cache');
-const image = require('gulp-image');
-const replaceEnv = require('./replaceEnv');
+// const cache = require('gulp-cache');
+// const image = require('gulp-image');
+const replaceEnv = require('./plugins/replaceEnv');
 const { mpCommonDep } = require('./plugins/mpCommonDep');
 const { mpJsonDep } = require('./plugins/mpJsonDep');
 const { mpWxmlDep } = require('./plugins/mpWxmlDep');
@@ -70,10 +70,10 @@ module.exports = function (
         break;
       case 'image':
         srcPipe
-          .pipe(cache(image()))
-          .on('error', (err) => {
-            fail(`image编译报错${err}`);
-          })
+          // .pipe(cache(image()))
+          // .on('error', (err) => {
+          //   fail(`image编译报错${err}`);
+          // })
           .pipe(dest(destPath));
         break;
       case 'other':

package/src/gulp/dev.js

@@ -27,10 +27,10 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
   // 监听app.json
   if (isWatch) {
     watch(resolve('app.json'), { ignoreInitial: false, events: ['add', 'change'] }, () => {
-      buildOutputAppJson(tmsConfig, newModules);
+      buildOutputAppJson(tmsConfig, newModules, isWatch);
     });
   } else {
-    buildOutputAppJson(tmsConfig, newModules);
+    buildOutputAppJson(tmsConfig, newModules, isWatch);
   }
 
   // 监听根目录的文件
@@ -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,
   });
@@ -57,7 +57,7 @@ module.exports = async (tmsConfig, newModules, isWatch = true) => {
     if (isWatch) {
       // 监听模块配置文件
       watch(`${resolve(module.path)}/**/module.config.json`, {  events: ['change'] }, () => {
-        buildOutputAppJson(tmsConfig, newModules);
+        buildOutputAppJson(tmsConfig, newModules, isWatch);
       });
     }
 
@@ -75,30 +75,24 @@ 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,
     });
   }
 
-  // 监听copy模块
-  if (tmsConfig?.gulp?.static && tmsConfig?.gulp?.static.length > 0) {
-    for (const item of tmsConfig.gulp?.static) {
-      const glob = {
-        js: `${item.from}/**/*.{js,ts,wxs}`,
-        json: `${item.from}/**/*.json`,
-        wxss: `${item.from}/**/*.{less,wxss}`,
-        wxml: `${item.from}/**/*.wxml`,
-        image: `${item.from}/**/*.{png,jpg,jpeg,gif,svg}`,
-      };
+  // 静态资源目录-拷贝
+  if (tmsConfig?.static && tmsConfig?.static.length > 0) {
+    for (const item of tmsConfig.static) {
+      const from = item?.from.startsWith('/') ? item.from : resolve(item.from);
+      const to = item?.to.startsWith('/') ? item.to : resolve(item.to);
 
       compile(tmsConfig, {
         glob: {
-          ...glob,
-          other: [`${item.from}/**/*`, ...excludeGlob(glob)],
+          other: [from],
         },
-        destPath: item.to,
+        destPath: to,
         module: item,
         srcOption: { allowEmpty: true },
         isWatch,

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,14 +88,14 @@ 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, {
                   depOriginFile,
                   depDestFile,
                   beforeDepPath: depItem,
-                  afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath),
+                  afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/'),
                 });
               }
             }
@@ -116,7 +116,7 @@ function mpCommonDep(tmsConfig, module, extensions = [], isWatch = true) {
         // console.log('mpCommonDep defs', defs);
       });
 
-      file.contents = new Buffer(contents);
+      file.contents = Buffer.from(contents);
     }
     this.push(file);
     cb();

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)) {
@@ -57,7 +57,7 @@ function mpJsonDep(
                       depOriginExt: extAlias,
                       depDestFile,
                       beforeDepPath: componentPath,
-                      afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath),
+                      afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestPath).replace(/\\/g, '/'),
                     });
                   }
                 }
@@ -93,7 +93,7 @@ function mpJsonDep(
         contents = contents.replace(reg, `"${afterDepPath}"`);
       });
       contents = typeof contents === 'object' ? JSON.stringify(contents, null, 2) : contents;
-      file.contents = new Buffer(contents);
+      file.contents = Buffer.from(contents);
     }
 
     this.push(file);

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,14 +136,14 @@ 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, {
                       depOriginFile,
                       depDestFile,
                       beforeDepPath: attributes.src,
-                      afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestFile),
+                      afterDepPath: path.relative(path.dirname(anaFileDestFile), depDestFile).replace(/\\/g, '/'),
                     });
                   }
                 }
@@ -178,7 +178,7 @@ function mpWxmlDep(tmsConfig, module, isWatch) {
         }
       });
 
-      file.contents = new Buffer(contents);
+      file.contents = Buffer.from(contents);
     }
 
     this.push(file);

package/src/gulp/plugins/postcss-font-base64.js

@@ -66,7 +66,7 @@ module.exports = postcss.plugin('postcss-font-base64', (options) => {
 
     function readAndEncodeFile(file) {
       const bitmap = fs.readFileSync(file);
-      return new Buffer(bitmap).toString('base64');
+      return Buffer.from(bitmap).toString('base64');
     }
   };
 });

package/src/gulp/{replaceEnv.js → plugins/replaceEnv.js}

@@ -16,7 +16,7 @@ function replaceEnv(reg = /process\.env(\.(\w*))?/g, envData) {
       }
 
       // eslint-disable-next-line
-      file.contents = new Buffer(contents);
+      file.contents = Buffer.from(contents);
     }
 
     this.push(file);

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,9 +5,10 @@ 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);
+  const isDev = false;
+  const { targetModules: newModules } = await init(tmsConfig, targetModules, isDev);
 
   gulpBuild(tmsConfig, newModules, env);
 }

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

@@ -2,12 +2,14 @@ const gulpDev = require('../../../gulp/dev');
 const fs = require('fs');
 const { resolve } = require('../../../utils/widgets');
 const init = require('../init/index');
-const { DEFAULT_MODULE_DIR } = require('../../../config/constant');
+const { MODULE_CONFIG_FILENAME } = require('../../../config/constant');
 const { tmsModulesMergeLocalModuleCfg } = require('../../../utils/tkitUtils');
 const { checkDependencies } = require('../../../utils/checkDependencies');
 const { fail } = require('../../../utils/log');
+const shelljs = require('shelljs');
+// const io = require('../../../utils/io');
 
-function isInit(tmsConfig, targetModules, contextDir) {
+function isInit(tmsConfig, targetModules, contextDir, isDev) {
   // 判断是否存在dist目录
   if (!fs.existsSync(contextDir)) {
     return true;
@@ -33,8 +35,8 @@ function isInit(tmsConfig, targetModules, contextDir) {
     if (!item.root) {
       return true;
     }
-    // 判断编译目录是否有该模块
-    if (!fs.existsSync(`${contextDir}/${item.root}`)) {
+    // 判断dist目录是否有该模块
+    if (!fs.existsSync(`${contextDir}/${item.root}/${MODULE_CONFIG_FILENAME}`)) {
       return true;
     }
     // 判断源码目录是否有该模块
@@ -45,21 +47,36 @@ function isInit(tmsConfig, targetModules, contextDir) {
   }
 
   //  判断package.json的版本是否有新的版本
-  return checkDependencies(targetModules, resolve('./'), tmsConfig.gulp.outputDir);
+  return checkDependencies(targetModules, resolve('./'), tmsConfig.outputDir, isDev);
+}
+
+// 用户编译分包时，需要将dist中其他分包(主包不能删除)的内容删除，否则其他分包的内容混入到主包(导致主包的体积超2M)
+function delOtherModule(tmsConfig, targetModules) {
+  const modules = tmsModulesMergeLocalModuleCfg(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(`dist/${item.root}`);
+      shelljs.rm('-rf', `${moduleRootDir}/*`, { silent: true });
+      // 解决微信开发者工具（dist/app.json: ["subpackages"][0]["root"] 字段需为 目录）错误 - 提前创建该目录
+      // io.ensureDirExist(moduleRootDir);
+    }
+  });
 }
 
 async function dev(tmsConfig, targetModules, env) {
-  // tms.config.js的modules 合并 module.config.json的配置项
-  let newModules = tmsModulesMergeLocalModuleCfg(targetModules, tmsConfig.appName, DEFAULT_MODULE_DIR);
+  let newModules = targetModules;
+  const isDev = true;
 
   // 判断是否进行init命令
-  if (isInit(tmsConfig, newModules, resolve('dist'))) {
-    // init函数会将 最新的tms.config.js的modules 合并 module.config.json的配置项 返回，不需要再做重复工作
-    const initData = await init(tmsConfig, targetModules);
+  if (isInit(tmsConfig, targetModules, resolve('dist'), isDev)) {
+    // init函数 下载第三方代码后，会将最新的tms.config.js的modules 合并 module.config.json的配置项返回
+    const initData = await init(tmsConfig, newModules, isDev);
     newModules = initData.targetModules;
   }
 
-  console.log('当前dev启动的有效模块', newModules.map(item => item.name));
+  console.log('当前dev启动的有效模块', newModules.map(item => item.name).sort());
+  delOtherModule(tmsConfig, newModules);
   gulpDev(tmsConfig, newModules, env);
 }
 

package/src/scripts/run/index.js

@@ -4,56 +4,61 @@ const build = require('./build/index');
 const install = require('./install/index');
 const { createTask } = require('../../utils/widgets');
 const { MODE } = require('../../config/constant');
-const { readTmsConfig, checkModules } = require('../../utils/tkitUtils');
+const { readTmsConfig, readTmsPrivateCf, checkModules } = require('../../utils/tkitUtils');
+const { tmsModulesMergeLocalModuleCfg, subModulesMergeDepModules } = require('../../utils/tkitUtils');
 
-const handleModulesArg = (cmd) => {
-  // 主模块开发
-  if (cmd.module === MODE.main) {
-    return MODE.main;
-  }
-  // 单模块 或 多模块开发
-  const { argv } = process;
-  const reset = argv.indexOf('-m') > -1 ? argv.slice(argv.indexOf('-m') + 1) : [];
+const handleModulesArg = (cmd, tmsPrivateCg) => {
+  // 单模块或多模块开发-用户通过脚手架参数指定的模块
   if (cmd.module) {
+    const { argv } = process;
+    const reset = argv.indexOf('-m') > -1 ? argv.slice(argv.indexOf('-m') + 1) : [];
     return [
       cmd.module,
       ...reset,
     ];
   }
+  // 单模块或多模块开发-用户在tms.private.js指定的模块
+  if (tmsPrivateCg?.modules && tmsPrivateCg?.modules.length > 0) {
+    return tmsPrivateCg?.modules;
+  }
   // 全量模块
   return MODE.all;
 };
 
 async function run(commandName, cmd) {
-  const moduleArg = handleModulesArg(cmd);
-  const { env } = cmd;
-
+  // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
+  const tmsPrivateCg = readTmsPrivateCf();
+  // 处理module参数
+  const moduleArg = handleModulesArg(cmd, tmsPrivateCg);
+  const { env = tmsPrivateCg?.env } = cmd;
   const tmsConfig = await createTask(readTmsConfig, '开始读取脚手架的配置项', '读取脚手架的配置项完成')(env);
 
   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])]);;
+    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(tmsConfig, modules, env);
+      init(tmsConfig, newModules, env);
       return;
     case 'dev':
-      dev(tmsConfig, modules, env);
+      dev(tmsConfig, newModules, env);
       return;
     case 'install':
-      install(tmsConfig, modules, env);
+      install(tmsConfig, newModules, env);
       return;
     case 'build':
-      build(tmsConfig, modules, env);
+      build(tmsConfig, newModules, env);
       return;
     default:
       return;

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

@@ -3,9 +3,9 @@ const fs = require('fs');
 const io = require('../../../utils/io');
 const { resolve, createTask } = require('../../../utils/widgets');
 const { buildOutputAppJson } = require('../../../utils/buildAppJson');
-const {  MODULE_CODE_DIR, DEFAULT_COPY_CONFIG, DEFAULT_MODULE_DIR } = require('../../../config/constant');
+const {  MODULE_CODE_DIR, DEFAULT_COPY_CONFIG } = require('../../../config/constant');
 const { cloneModules } = require('../../../utils/cloneModules');
-const { tmsModulesMergeLocalModuleCfg } = require('../../../utils/tkitUtils');
+const { tmsModulesMergeLocalModuleCfg, subModulesMergeDepModules } = require('../../../utils/tkitUtils');
 const { fail } = require('../../../utils/log');
 const install = require('../install');
 
@@ -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);
@@ -38,17 +38,18 @@ const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
   });
 };
 
-async function task(tmsConfig, targetModules) {
+async function task(tmsConfig, targetModules, isDev) {
   // 下载和移动代码
   await createTask(
     cloneModules,
     '开始下载模块代码完成',
     '下载模块代码码完成',
-  )(MODULE_CODE_DIR, resolve('./'), targetModules);
+  )(MODULE_CODE_DIR, resolve('./'), targetModules, isDev);
 
   // tms.config.js的modules 合并 module.config.json的配置项
-  const newModules = tmsModulesMergeLocalModuleCfg(targetModules, tmsConfig.appName, DEFAULT_MODULE_DIR);
-  console.log('当前init的有效模块', newModules.map(item => item.name));
+  let newModules = tmsModulesMergeLocalModuleCfg(targetModules, tmsConfig.appName);
+  // A分包依赖了B分包的代码， merge B分包进行编译；
+  newModules = subModulesMergeDepModules(tmsConfig, newModules);
 
   // 拷贝相关配置文件到输出目录
   await createTask(
@@ -65,16 +66,22 @@ async function task(tmsConfig, targetModules) {
     buildOutputAppJson,
     '开始生成编译后的app.json',
     '生成编译后的app.json完成',
-  )(tmsConfig, newModules);
+  )(tmsConfig, newModules, isDev);
 
   return newModules;
 }
-async function bootstrap(tmsConfig, targetModules) {
-  const newModules = await task(tmsConfig, targetModules);
+async function init(tmsConfig, targetModules, isDev) {
+  try {
+    const newModules = await task(tmsConfig, targetModules, isDev);
 
-  return {
-    targetModules: newModules,
-  };
+    return {
+      targetModules: newModules,
+    };
+  } catch (error) {
+    const errMsg = typeof error === 'object' ? error.message : error;
+    fail(`init流程出现错误${errMsg}`);
+    process.exit(1);
+  }
 }
 
-module.exports = bootstrap;
+module.exports = init;

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

@@ -1,17 +1,15 @@
 const { createTask, resolve } = require('../../../utils/widgets');
 const { buildMpNpm } = require('../../../utils/mpCiUtils');
-const { CACHE_DIR, DEFAULT_MODULE_DIR } = require('../../../config/constant');
+const { CACHE_DIR } = require('../../../config/constant');
 const { cloudNpmInstall, mpNpmInstallAll } = require('../../../utils/npmUtils');
-const { tmsModulesMergeLocalModuleCfg } = require('../../../utils/tkitUtils');
 
-async function install(tmsConfig, modules, isCloud = true) {
-  const newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName, DEFAULT_MODULE_DIR);
+async function install(tmsConfig, modules, isCloud = false) {
   // 小程序npm install
   await createTask(
     mpNpmInstallAll,
     '小程序 开始npm install',
     '小程序npm install 完成',
-  )(newModules, resolve(tmsConfig.gulp.outputDir), `${CACHE_DIR}/node_modules`);
+  )(modules, resolve(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`);
 
   // 构建miniprograme_npm
   await createTask(