@tmsfe/tmskit 0.0.19 → 0.0.20

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

@@ -5,7 +5,7 @@ const { resolve, createTask } = require('../../../utils/widgets');
 const { buildOutputAppJson } = require('../../../core/buildAppJson');
 const { MODULE_CODE_DIR, DEFAULT_COPY_CONFIG } = require('../../../config/constant');
 const { cloneModules } = require('../../../core/cloneModules');
-const { tmsModulesMergeLocalModuleCfg, subModulesMergeDepModules } = require('../../../core/tmsMpconfig');
+const { getModulesByMergeDepModules, getSubPackages } = require('../../../core/tmsMpconfig');
 const { fail, info } = require('../../../utils/log');
 const install = require('../install');
 
@@ -53,12 +53,12 @@ async function task(tmsConfig, targetModules) {
     '下载模块代码码完成',
   )(MODULE_CODE_DIR, resolve('./'), targetModules);
 
-  // tms.config.js的modules 合并 module.config.json的配置项
-  let newModules = tmsModulesMergeLocalModuleCfg(targetModules, tmsConfig.appName);
-  // A分包依赖了B分包的代码， merge B分包进行编译；
-  newModules = subModulesMergeDepModules(tmsConfig, newModules);
+  // 获取所有模块，合并模块依赖的模块
+  const newModules = getModulesByMergeDepModules(tmsConfig, targetModules, true);
+  // 获取所有的分包
+  const newSubPackages = getSubPackages(newModules);
 
-  checkConfig(newModules);
+  checkConfig(newSubPackages);
 
   // 拷贝相关配置文件到输出目录
   await createTask(
@@ -68,7 +68,7 @@ async function task(tmsConfig, targetModules) {
   )(tmsConfig, DEFAULT_COPY_CONFIG);
 
   // install
-  await install(tmsConfig, newModules);
+  await install(tmsConfig, newSubPackages);
 
 
   // 动态生成编译后的app.json;
@@ -78,15 +78,16 @@ async function task(tmsConfig, targetModules) {
     '生成编译后的app.json完成',
   )(tmsConfig, newModules);
 
-  return newModules;
+  return {
+    modules: newModules,
+    subPackages: newSubPackages,
+  };
 }
 async function init(tmsConfig, targetModules) {
   try {
-    const newModules = await task(tmsConfig, targetModules);
+    const taskRes = await task(tmsConfig, targetModules);
 
-    return {
-      targetModules: newModules,
-    };
+    return taskRes;
   } catch (error) {
     const errMsg = typeof error === 'object' ? error.message : error;
     fail(`初始化流程出现错误${errMsg}`);

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

@@ -11,7 +11,7 @@ const { fail, info } = require('../../../utils/log');
 const { fileMd5 } = require('../../../utils/md5');
 const { isDependenciesUpdate } = require('../../../core/checkDependencies');
 
-async function install(tmsConfig, modules, env, useCache = true) {
+async function install(tmsConfig, modules, useCache = true) {
   const cwd = process.cwd();
   const npmInstallRes = await createTask(
     npmInstall,
@@ -121,8 +121,9 @@ async function getMNPMd5(cwd) {
   shelljs.cd(cwd);
   if (fs.existsSync('miniprogram_npm')) {
     shelljs.exec('tar -cvf ./miniprogram_npm.tar.gz ./miniprogram_npm',  { cwd, ...shellJsOption });
-    const md5Value = await fileMd5('./miniprogram_npm.tar.gz');
-    shelljs.rm('-rf', path.join(cwd, './miniprogram_npm.tar.gz'));
+    const tarDir = path.join(cwd, './miniprogram_npm.tar.gz');
+    const md5Value = await fileMd5(tarDir);
+    shelljs.rm('-rf', tarDir);
     return md5Value;
   }
   return '';