@tmsfe/tmskit 0.0.16 → 0.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.16",
+  "version": "0.0.19",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {
@@ -64,7 +64,7 @@
     "lodash": "^4.17.21",
     "metalsmith": "^2.3.0",
     "miniprogram-ci": "1.4.13",
-    "moment": "^2.29.1",
+    "moment": "^2.29.2",
     "object-assign": "^4.0.1",
     "ora": "^5.1.0",
     "plugin-error": "^1.0.0",

package/src/compile/dev.js

@@ -1,8 +1,9 @@
 const path = require('path');
 const fs = require('fs');
 const ora = require('ora');
+const chalk = require('chalk');
 const { parallel, series } = require('gulp');
-const { resolve, mergeMap } = require('../utils/widgets');
+const { resolve, mergeMap, filterField } = require('../utils/widgets');
 const { buildOutputAppJson } = require('../core/buildAppJson');
 const { DEFAULT_COPY_CONFIG } = require('../config/constant');
 const compile = require('./compile');
@@ -37,17 +38,6 @@ function adaptPath(pathDir) {
 }
 module.exports = async (tmsConfig, newModules, isDev = true) => {
   const compileTasksMap = new Map();
-  // 监听app.json
-  if (isDev) {
-    watch(
-      [resolve('app.json')],
-      { ignoreInitial: false, events: watchEvents },
-      () => buildOutputAppJson(tmsConfig, newModules, isDev),
-      { from: resolve(), to: resolve(tmsConfig.outputDir) },
-    );
-  } else {
-    buildOutputAppJson(tmsConfig, newModules, isDev);
-  }
 
   // 监听根目录的文件
   mergeMap(compileTasksMap, compile(tmsConfig, {
@@ -148,15 +138,29 @@ module.exports = async (tmsConfig, newModules, isDev = true) => {
   }
   async function end(cb) {
     if (isDev) {
+      // 监听app.json
+      watch(
+        [resolve('app.json')],
+        { ignoreInitial: false, events: watchEvents },
+        () => buildOutputAppJson(tmsConfig, newModules, isDev),
+        { from: resolve(), to: resolve(tmsConfig.outputDir) },
+      );
+      // 监听其他文件
       compileTasksMap.forEach(({ taskFn, module }, globValue) => {
         watch(globValue, { ignoreInitial: true, events: watchEvents }, taskFn, module);
       });
+    } else {
+      buildOutputAppJson(tmsConfig, newModules, isDev);
     }
     eTime = new Date().getTime() - sTime;
     if (typeof tmsConfig?.hooks?.afterCompile === 'function') {
-      await tmsConfig?.hooks?.afterCompile({ isDev, tmsConfig, modules: newModules });
+      await tmsConfig?.hooks?.afterCompile({
+        isDev,
+        tmsConfig: filterField(tmsConfig, ['gitAccount']),
+        modules: newModules,
+      });
     }
-    spinner.succeed(`首次编译完成, 耗时${eTime / 1000}s, 微信开发者工具打开项目即可预览。`);
+    spinner.succeed(chalk.green(`首次编译完成, 耗时${eTime / 1000}s, 微信开发者工具打开项目即可预览。`));
     spinner.stop();
     cb();
   }
@@ -165,5 +169,6 @@ module.exports = async (tmsConfig, newModules, isDev = true) => {
   compileTasksMap.forEach(({ taskFn }) => {
     compileTasks.push(taskFn);
   });
+  // 一次性完成编译任务（编译完成后再添加watch任务-封装到end函数里面）
   series(start, parallel(...compileTasks), end)();
 };

package/src/compile/plugins/mpJsonDep.js

@@ -49,7 +49,7 @@ function mpJsonDep(
                 }
 
                 // eslint-disable-next-line
-                const reg = new RegExp(`^(\./\.\.\/)+.*\/${includeName}\/(.*)`);
+                const reg = new RegExp(`^(\./|\.\.\/)+.*\/${includeName}\/(.*)`);
                 const regRes = componentPath.match(reg) || [];
                 if (regRes[2]) {
                   const depDestPath = resolve(tmsConfig.outputDir, module.to, includeName, regRes[2]);

package/src/config/constant.js

@@ -7,6 +7,9 @@ const HOME_DIR = os.homedir();
 // 所有文件的缓存目录
 const CACHE_DIR = path.resolve(HOME_DIR, '.tmskit');
 
+// 缓存文件
+const  CACHE_FILE = 'cache_file.json';
+
 // 脚手架模板代码所在目录
 const TEMPLATE_DIR = path.resolve(CACHE_DIR, 'template');
 
@@ -14,7 +17,7 @@ const TEMPLATE_DIR = path.resolve(CACHE_DIR, 'template');
 const MODULE_CODE_DIR = path.resolve(CACHE_DIR, 'modules_code');
 
 // 脚手架模板代码的具体路径
-const TEMPLATE_PATH = path.resolve(TEMPLATE_DIR, 'tools/tms-cli-template');
+const TEMPLATE_PATH = path.resolve(TEMPLATE_DIR, 'tools/tmskit-template');
 
 // 脚手架的名称
 const TMS_NAME = 'tmskit';
@@ -47,11 +50,12 @@ const ENV = {
 };
 
 const  TEMPLATE_TKIT_DIR = '_tmskit';
-const MODULE_CONFIG_INVALID_KEY = ['entranceDeclare', 'entryPagePath'];
+
 
 export {
   HOME_DIR,
   CACHE_DIR,
+  CACHE_FILE,
   TEMPLATE_DIR,
   TEMPLATE_PATH,
   TMS_NAME,
@@ -64,6 +68,5 @@ export {
   MODULE_CODE_DIR,
   ENV,
   TEMPLATE_TKIT_DIR,
-  MODULE_CONFIG_INVALID_KEY,
   DEFAULT_CLOUD_MODULE_DIR,
 };

package/src/config/defaultTmsConfig.js

@@ -3,7 +3,7 @@ module.exports = {
   // 全局的环境配置项
   envData: {},
   // 模块配置信息
-  modules: [],
+  modules: {},
   cloudDir: 'cloud',
   // 第三方依赖代码需要拷贝到本项目的
   dependencies: {},

package/src/core/buildAppJson.js

@@ -1,12 +1,14 @@
 /**
  * 生成编译后的app.json
  */
+/* eslint-disable no-param-reassign */
 const fs = require('fs');
-const { MODULE_CONFIG_FILENAME, MODULE_CONFIG_INVALID_KEY } = require('../config/constant');
-const { getModuleConfig, getValidModules } = require('./tmsMpconfig');
+const { MODULE_CONFIG_FILENAME } = require('../config/constant');
+const { getModuleConfig } = require('./tmsMpconfig');
 const { fail } = require('../utils/log');
-const { resolve, isObject } = require('../utils/widgets');
+const { resolve, isObject, filterField } = require('../utils/widgets');
 const { handleError } = require('./handleError');
+const { global } = require('../utils/global');
 
 /**
  * 更新appJson里面的主包配置
@@ -36,7 +38,6 @@ function updateMainPackages(appJson, mainPackages = []) {
 
   // 去掉 subpackages 中的主包配置
   const foundMainPackageNames = foundMainPackages.map(item => item.name);
-  // eslint-disable-next-line
   appJson.subpackages = appJson.subpackages.filter(subpackage => !foundMainPackageNames.includes(subpackage.name));
 
   return appJson;
@@ -55,24 +56,20 @@ const getAppJsonContent = (sourceAppJsonPath) => {
   // 加入默认值
   appJson.subpackages = [];
   appJson.pages = [];
-  // appJson.plugins = {};
-  delete appJson.entranceDeclare;
   return appJson;
 };
 /**
  * 更新app.json中的subpackages
  * @param {Object} appJson
- * @param {Object} modulesConfig
+ * @param {Object} modulesConfigs
  */
-const updateSubpackages = (appJson, modulesConfig) => {
+const updateSubpackages = (appJson, modulesConfigs) => {
   // eslint-disable-next-line
-  for (const name in modulesConfig) {
-    const moduleInfo = isObject(modulesConfig[name]) ? [modulesConfig[name]] : modulesConfig[name];
-    // 过滤 pages 为空的情况
-    const validModules = getValidModules(moduleInfo);
-    // eslint-disable-next-line
-    appJson.subpackages = appJson.subpackages.concat(validModules);
+  for (const modulePath in modulesConfigs) {
+    const moduleInfo = isObject(modulesConfigs[modulePath]) ? [modulesConfigs[modulePath]] : modulesConfigs[modulePath];
+    appJson.subpackages = appJson.subpackages.concat(moduleInfo);
   }
+  appJson.subpackages.sort((item1, item2) => item1.name.localeCompare(item2.name));
 };
 
 /**
@@ -84,40 +81,35 @@ const fixAppJson = (appJson) => {
   const pluginsMap = {};
   Object.keys(appJson.plugins || {}).forEach(key => pluginsMap[key] = ['app.json']);
   const subps = subpackages.map((subp) => {
-    const invalidKeys = [];
+    const arrOfFileType = ['requiredBackgroundModes', 'embeddedAppIdList'];
+    const objOfFileType = ['preloadRule'];
     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}`];
+          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最上层处理
+      // 分包里数组类型字段，提到appjson最上层
+      if (arrOfFileType.indexOf(key) > -1) {
         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;
+        preVal
+          ? appJson[key] = Array.from(new Set(preVal.slice(0).concat(subp[key])))
+          : appJson[key] = subp[key].slice(0);
+      }
+      // 分包里对象类型字段，提到appjson最上层
+      if (objOfFileType.indexOf(key) > -1) {
+        const preloadRuleMap = appJson[key] || {};
+        subp[key] && Object.keys(subp[key]).forEach((page) => {
+          if (!preloadRuleMap[page]) {
+            preloadRuleMap[page] = subp[key][page];
+          }
+        });
+        appJson[key] = preloadRuleMap;
       }
     });
-    if (invalidKeys.length) {
-      fail(`不支持分包${subp?.name}配置${invalidKeys.join(',')}\n`);
-    }
-    // eslint-disable-next-line
-    invalidKeys.concat(['requiredBackgroundModes', 'embeddedAppIdList']).forEach(k => delete subp[k]);
-    return subp;
+    return filterField(subp, [...arrOfFileType, ...objOfFileType, 'dependencies']);
   });
   // 如果plugins重复，则错误提示
   const pluginsErrMsg = Object.keys(pluginsMap).map((pk) => {
@@ -128,9 +120,8 @@ const fixAppJson = (appJson) => {
   })
     .reduce((pre, cur) => pre + cur, '');
   if (pluginsErrMsg) {
-    fail(`plugins配置出现错误:${pluginsErrMsg}`);
+    throw new Error(`plugins配置出现错误:${pluginsErrMsg}`);
   }
-  // eslint-disable-next-line
   appJson.subpackages = subps;
 };
 
@@ -143,21 +134,26 @@ const fixAppJson = (appJson) => {
 function buildOutputAppJson(tmsConfig, modules) {
   try {
     // 获取当前 modules 下的所有子模块的配置内容
-    const modulesConfig = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME);
+    const modulesConfigs = getModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME);
     // 获取app.json的配置
     const appJson = getAppJsonContent(resolve('./app.json'));
     // 更新app.json中的subpackages
-    updateSubpackages(appJson, modulesConfig);
+    updateSubpackages(appJson, modulesConfigs);
     // 处理appJson中重复||冲突的地方
     fixAppJson(appJson);
     // 更新主包，需在subpackages处理完成后执行， pages/
     updateMainPackages(appJson, tmsConfig.mainPackages);
 
     fs.writeFileSync(resolve(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+
     if (typeof tmsConfig?.hooks?.updateAppJson === 'function') {
-      tmsConfig?.hooks?.updateAppJson(appJson);
+      tmsConfig?.hooks?.updateAppJson({
+        tmsConfig: filterField(tmsConfig, ['gitAccount']),
+        modules,
+        appJson,
+        isDev: global.getData('isDev'),
+      });
     }
-
     return appJson;
   } catch (e) {
     handleError(`生成app.json出现错误: ${e}`);

package/src/core/cache.js

@@ -0,0 +1,36 @@
+const fs = require('fs');
+const path = require('path');
+const { CACHE_FILE, CACHE_DIR } = require('../config/constant');
+const { ensureDirExist } = require('../utils/io');
+
+function getCache(projectDir, type) {
+  const filePath = `${CACHE_DIR}/${CACHE_FILE}`;
+  if (!fs.existsSync(filePath)) {
+    return null;
+  }
+  const content = require(filePath);
+  return content?.[projectDir]?.[type];
+}
+
+
+function setCache(projectDir, type = 'miniprogram_npm', data) {
+  const filePath = `${CACHE_DIR}/${CACHE_FILE}`;
+  if (!fs.existsSync(filePath)) {
+    const dir = path.dirname(filePath);
+    ensureDirExist(dir);
+    fs.writeFileSync(filePath, '{}');
+  }
+  const content = require(filePath);
+  if (!content[projectDir]) {
+    content[projectDir] = {};
+  }
+  content[projectDir] = {
+    [type]: data,
+  };
+  fs.writeFileSync(filePath, JSON.stringify(content, null, 2));
+}
+
+module.exports = {
+  setCache,
+  getCache,
+};

package/src/core/checkDependencies.js

@@ -17,7 +17,7 @@ const getLatestVersion = (npmName) => {
  * @param {*} outputDir  待检查node_modules存放的目录 （eg: dist/node_modules）
  * @returns
  */
-const checkDependencies = (modules, cwd, outputDir) => {
+const isDependenciesUpdate = (modules, cwd, outputDir) => {
   // 步骤1. 收集package.json
   const packageJsonName = 'package.json';  // 查找文件名
   // 1.1根目录的package.json
@@ -73,5 +73,5 @@ const checkDependencies = (modules, cwd, outputDir) => {
 };
 
 module.exports = {
-  checkDependencies,
+  isDependenciesUpdate,
 };

package/src/core/cloneModules.js

@@ -18,11 +18,11 @@ const { global } = require('../utils/global');
  */
 function replaceGitUrlAccount(httpRepoUrl, moduleName) {
   // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
-  const tmsPrivateCf = global.getData('tmsPrivateCf');
+  const tmsConfig = global.getData('tmsConfig');
 
   let gitUrl = httpRepoUrl;
-  const { username = '', pass = '' } = tmsPrivateCf?.gitAccout?.[moduleName]
-    || tmsPrivateCf?.gitAccount?.[moduleName]
+  const { username = '', pass = '' } = tmsConfig?.gitAccout?.[moduleName]
+    || tmsConfig?.gitAccount?.[moduleName]
     || {};
 
   const urlPrefixReg = /http(s)?:\/\//;

package/src/core/npm.js

@@ -99,7 +99,7 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
 
 
 // 遍历安装指定目录下所有项目的npm依赖
-const mpNpmInstallAll = async (modules, contextDir, cacheDir) => {
+const npmInstallAll = async (modules, contextDir, cacheDir) => {
   const cwd = process.cwd();
   const packageJsonFiles = await findAllPackageJson(modules, contextDir);
 
@@ -124,6 +124,7 @@ const mpNpmInstallAll = async (modules, contextDir, cacheDir) => {
 
   await Promise.all(arrPromises);
   shell.cd(cwd);
+  return packageJsonFiles;
 };
 
 /**
@@ -215,7 +216,7 @@ function cloudNpmInstall(contextDir) {
 
 module.exports = {
   cloudNpmInstall,
-  mpNpmInstallAll,
+  npmInstallAll,
   findAllPackageJson,
 };
 

package/src/core/tmsMpconfig.js

@@ -7,7 +7,6 @@ const { TMS_CONFIG_FILENAME, MODULE_CONFIG_FILENAME, TMS_PRIVATE_FILENAME } = re
 const { resolve, isObject, isArray } = require('../utils/widgets');
 const defaultTmsConfig = require('../config/defaultTmsConfig');
 const { fail } = require('../utils/log');
-const path = require('path');
 
 /**
  * 读取tms.config.js
@@ -23,35 +22,11 @@ const readTmsConfig = function (env) {
   const tmsConfig = tmsConfigFn({
     env,
   });
-  // 合并默认值
-  loadash.mergeWith(tmsConfig, defaultTmsConfig);
 
-  // modules兼容处理
-  tmsConfig.modules = convertModules(tmsConfig.modules);
-  return tmsConfig;
+  // 合并默认值
+  return loadash.mergeWith(defaultTmsConfig, tmsConfig);
 };
 
-// convertModules 处理默认值
-const convertModules = (modules) => {
-  const newModules = [];
-  modules.forEach((module) => {
-    const newModule = {};
-    if (typeof module === 'string') {
-      // 路径字符串
-      Object.assign(newModule, {
-        name: path.basename(module),
-        path: module,
-      });
-    } else if (typeof module === 'object') {
-      Object.assign(newModule, module);
-      if (module.name === undefined) {
-        newModule.name = path.basename(module.path);
-      }
-    }
-    newModules.push(newModule);
-  });
-  return newModules;
-};
 
 /**
  * 读取tms.private.config.js
@@ -62,12 +37,7 @@ const readTmsPrivateCf = function () {
   if (fs.existsSync(tmsPrivatePath)) {
     tmsPrivateCf = require(tmsPrivatePath);
   }
-  // 处理modules字段
-  if (tmsPrivateCf.modules instanceof Array) {
-    Object.assign(tmsPrivateCf.modules, {
-      include: tmsPrivateCf.modules,
-    });
-  }
+
   return tmsPrivateCf;
 };
 
@@ -80,11 +50,10 @@ const readTmsPrivateCf = function () {
 const checkModules = function (tmsConfig, modules, isQuit = false) {
   const targetModules = [];
   modules.forEach((moduleName) => {
-    const module = tmsConfig.modules.find(module => module.name === moduleName);
+    const module = tmsConfig.modules.all.find(module => module.name === moduleName);
     module && targetModules.push(module);
   });
 
-
   if (targetModules.length === 0) {
     fail(`你启动的模块无效${modules.join(',')}无效，请检查tms.config.json>modules>${modules.join(',')}
     >name字段与module.config.json的name字段是否一致`);
@@ -93,40 +62,33 @@ const checkModules = function (tmsConfig, modules, isQuit = false) {
   return targetModules;
 };
 
-/**
- * 过滤页面为空的分包
- * @param {Array} moduleCfg 模块配置内容
- * @returns pages不为空的分包
- */
-const getValidModules = (moduleCfg) => {
-  // 过滤 pages 为空的情况
-  const validModules = moduleCfg.filter(item => item.pages.length > 0);
-  return validModules;
-};
-
 /**
  * 适配处理module.config.json的字段
  * @param { object } fileContent module.config.json的内容
  * @param { string } appName 小程序的名称
  */
 function adaptMpCgContent(fileContent, appName) {
-  const content = fileContent.contents ? JSON.parse(fileContent.contents.toString()) : JSON.parse(fileContent);
+  const handleContent = function (appName, current) {
+    let res = current;
+    if (appName && current.mpConfig && current.mpConfig[appName]) {
+      res = { ...current, ...current.mpConfig[appName] };
+    }
+
+    delete res.mpConfig;
+    delete res.isSubpackages;
+    return res;
+  };
+
+  let content = JSON.parse(fileContent);
 
   if (isArray(content)) {
     let i = content.length - 1;
     while (i >= 0) {
-      let current = content[i];
-
-      if (appName && current.mpConfig && current.mpConfig[appName]) {
-        current = { ...current, ...current.mpConfig[appName] };
-      }
-
-      delete current.mpConfig;
-      delete current.isSubpackages;
-
-      content[i] = current;
+      content[i] = handleContent(appName, content[i]);
       i--; // eslint-disable-line
     }
+  } else {
+    content = handleContent(appName, content);
   }
   return content;
 }
@@ -168,7 +130,7 @@ const tmsModulesMergeLocalModuleCfg = (modules, appName) => {
         let moduleConfigContent = fs.readFileSync(moduleConfigPath, 'utf-8');
         moduleConfigContent = adaptMpCgContent(moduleConfigContent, appName);
         const moduleContentArr = isObject(moduleConfigContent) ? [moduleConfigContent] : moduleConfigContent;
-        getValidModules(moduleContentArr).forEach(({ name }, moduleContentArrIndex) => {
+        moduleContentArr.forEach(({ name }, moduleContentArrIndex) => {
           if (name === moduleName) {
             findModule = true;
             newModules.push({
@@ -178,7 +140,7 @@ const tmsModulesMergeLocalModuleCfg = (modules, appName) => {
           }
         });
         if (!findModule) {
-          fail(`启动模块${moduleName}在${moduleConfigPath}没有找到或pages为空，请检查配置`);
+          fail(`启动模块${moduleName}在${moduleConfigPath}没有找到，请检查配置`);
           process.exit(1);
         }
       } catch (e) {
@@ -232,7 +194,6 @@ module.exports = {
   readTmsConfig,
   readTmsPrivateCf,
   getModuleConfig,
-  getValidModules,
   checkModules,
   tmsModulesMergeLocalModuleCfg,
   subModulesMergeDepModules,

package/src/entry.js

@@ -34,6 +34,17 @@ module.exports = [
           require('./scripts/run/index')('dev', cmd);
         },
       },
+      {
+        command: 'cloud',
+        description: '云函数开发',
+        options: [
+          ['-m, --module [moduleName]', '模块名称'],
+          ['-e, --env [env]', '环境变量'],
+        ],
+        action: (cmd) => {
+          require('./scripts/run/index')('cloud', cmd);
+        },
+      },
       {
         command: 'build',
         description: 'prod 打包编译',

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

@@ -1,5 +1,5 @@
 const shelljs = require('shelljs');
-const { resolve } = require('../../../utils/widgets');
+const { resolve, filterField } = require('../../../utils/widgets');
 const init = require('../init/index');
 const compileBuild = require('../../../compile/build');
 
@@ -9,6 +9,12 @@ async function build(tmsConfig, targetModules, env) {
 
   const { targetModules: newModules } = await init(tmsConfig, targetModules);
 
+  if (typeof tmsConfig?.hooks?.beforeCompile === 'function') {
+    await tmsConfig?.hooks?.beforeCompile({
+      isDev: false,
+      tmsConfig: filterField(tmsConfig, ['gitAccount']),
+      modules: newModules });
+  };
   compileBuild(tmsConfig, newModules, env);
 }
 

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

@@ -0,0 +1,12 @@
+const { symLink } = require('../../../core/symbolicLink');
+const { handleError } = require('../../../core/handleError');
+const { succeed } = require('../../../utils/log');
+
+module.exports = async (tmsConfig) => {
+  try {
+    await symLink(tmsConfig);
+    succeed('云函数创建软链成功');
+  } catch (e) {
+    handleError(`创建软链错误: ${e}`);
+  }
+};

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

@@ -1,6 +1,6 @@
 const shelljs = require('shelljs');
 const compileDev = require('../../../compile/dev');
-const { resolve } = require('../../../utils/widgets');
+const { resolve, filterField } = require('../../../utils/widgets');
 const init = require('../init/index');
 const { tmsModulesMergeLocalModuleCfg } = require('../../../core/tmsMpconfig');
 const { info } = require('../../../utils/log');
@@ -10,11 +10,11 @@ const { CACHE_DIR } = require('../../../config/constant');
 
 // 用户编译分包时，需要将dist中其他分包(主包不能删除)的内容删除，否则其他分包的内容混入到主包(导致主包的体积超2M)
 function delOtherModule(tmsConfig, targetModules) {
-  const modules = tmsModulesMergeLocalModuleCfg(tmsConfig.modules, tmsConfig.appName);
+  const modules = tmsModulesMergeLocalModuleCfg(tmsConfig.modules.all, 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}`);
+      const moduleRootDir = resolve(`${tmsConfig.outputDir}/${item.root}`);
       shelljs.rm('-rf', `${moduleRootDir}/*`, { silent: true });
       // 解决微信开发者工具（dist/app.json: ["subpackages"][0]["root"] 字段需为 目录）错误 - 提前创建该目录
       // io.ensureDirExist(moduleRootDir);
@@ -36,7 +36,11 @@ async function dev(tmsConfig, targetModules, env) {
 
   info('当前dev启动的有效模块', newModules.map(item => item.name).sort());
   if (typeof tmsConfig?.hooks?.beforeCompile === 'function') {
-    await tmsConfig?.hooks?.beforeCompile({ isDev: true, tmsConfig, modules: newModules });
+    await tmsConfig?.hooks?.beforeCompile({
+      isDev: true,
+      tmsConfig: filterField(tmsConfig, ['gitAccount']),
+      modules: newModules,
+    });
   };
   delOtherModule(tmsConfig, newModules);
   compileDev(tmsConfig, newModules, env);