@tmsfe/tmskit 0.0.41 → 0.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {
@@ -59,7 +59,7 @@
     "lodash": "^4.17.21",
     "metalsmith": "^2.3.0",
     "minimatch": "^5.1.0",
-    "miniprogram-ci": "1.8.25",
+    "miniprogram-ci": "2.1.14",
     "moment": "^2.29.2",
     "object-assign": "^4.0.1",
     "ora": "^5.4.1",

package/src/config/defaultTmsConfig.js

@@ -9,6 +9,8 @@ module.exports = {
   dependencies: {},
   /** 编译输出文件夹位置 */
   outputDir: 'dist',
+  /** 是否在编译前清空输出目录 */
+  cleanOutputDirBeforeCompile: true,
   /** 源码监听路径 */
   sourceDir: './',
   /** 静态资源目录 */

package/src/core/buildAppJson.js

@@ -71,27 +71,39 @@ const getAppJsonContent = (sourceAppJsonPath) => {
  */
 const fixAppJson = (appJson) => {
   const { subpackages } = appJson;
+  // 创建插件映射，用于检测插件配置冲突
   const pluginsMap = {};
+  // 记录app.json顶层的插件配置
   Object.keys(appJson.plugins || {}).forEach(key => pluginsMap[key] = ['app.json']);
+
+  // 处理每个分包的配置
   const subps = subpackages.map((subp) => {
+    // 需要从分包提取到app.json顶层的数组类型字段
     const arrOfFileType = ['requiredBackgroundModes', 'embeddedAppIdList'];
+    // 需要从分包提取到app.json顶层的对象类型字段
     const objOfFileType = ['preloadRule'];
+
+    // 遍历分包中的每个配置项
     Object.keys(subp).forEach((key) => {
+      // 处理插件配置，检查是否有重复配置的插件
       if (key === 'plugins') {
         Object.keys(subp.plugins).forEach((pk) => {
+          // 记录每个插件被哪些地方配置
           pluginsMap[pk]
             ? pluginsMap[pk].push(`分包${subp.name}`)
             : pluginsMap[pk] = [`分包${subp.name}`];
         });
       }
-      // 分包里数组类型字段，提到appjson最上层
+
+      // 处理数组类型字段(如requiredBackgroundModes)，合并到app.json顶层并去重
       if (arrOfFileType.indexOf(key) > -1) {
         const preVal = appJson[key];
         preVal
           ? appJson[key] = Array.from(new Set(preVal.slice(0).concat(subp[key])))
           : appJson[key] = subp[key].slice(0);
       }
-      // 分包里对象类型字段，提到appjson最上层
+
+      // 处理对象类型字段(如preloadRule)，合并到app.json顶层，已存在的键值不覆盖
       if (objOfFileType.indexOf(key) > -1) {
         const preloadRuleMap = appJson[key] || {};
         subp[key] && Object.keys(subp[key]).forEach((page) => {
@@ -102,9 +114,12 @@ const fixAppJson = (appJson) => {
         appJson[key] = preloadRuleMap;
       }
     });
+
+    // 从分包配置中移除已提取到顶层的字段以及一些构建相关的内部字段
     return filterField(subp, [...arrOfFileType, ...objOfFileType, 'dependencies', 'path']);
   });
-  // 如果plugins重复，则错误提示
+
+  // 检查插件配置冲突，如果同一个插件在多处配置则报错
   const pluginsErrMsg = Object.keys(pluginsMap).map((pk) => {
     if (pluginsMap[pk].length > 1) {
       return `${pluginsMap[pk].join(',')}重复配置plugin(${pk});`;
@@ -115,9 +130,45 @@ const fixAppJson = (appJson) => {
   if (pluginsErrMsg) {
     throw new Error(`plugins配置出现错误:${pluginsErrMsg}`);
   }
+
+  // 用处理后的分包配置更新app.json的subpackages字段
   appJson.subpackages = subps;
 };
 
+/**
+ * 合并分包配置，保留已有分包，添加新分包
+ * @param {Array} existingPackages 现有的分包配置
+ * @param {Array} newPackages 新的分包配置
+ * @returns {Array} 合并后的分包配置
+ */
+function mergeSubPackages(existingPackages, newPackages) {
+  // 创建结果数组和root到索引的映射
+  const resultPackages = [...existingPackages];
+  const rootMap = {};
+
+  // 建立现有分包的root映射
+  existingPackages.forEach((pkg, index) => {
+    if (pkg.root) {
+      rootMap[pkg.root] = index;
+    }
+  });
+
+  // 合并新分包
+  newPackages.forEach((newPkg) => {
+    if (!newPkg.root) return; // 忽略没有root的分包
+
+    if (rootMap[newPkg.root] !== undefined) {
+      // 如果已存在相同root的分包，则不覆盖保留原有配置
+      info(`保留已有分包配置, root: ${newPkg.root}, name: ${newPkg.name || '未命名'}`);
+    } else {
+      // 如果不存在，则添加新分包
+      resultPackages.push(newPkg);
+    }
+  });
+
+  return resultPackages;
+}
+
 /**
  * 动态生成编译后的app.json
  * @param {object} tmsConfig
@@ -129,13 +180,14 @@ async function buildOutputAppJson(tmsConfig, modules) {
     // 获取所有模块，合并模块依赖的模块
     const modulesConfig = getModulesConfig(modules, tmsConfig, false);
     // 获取所有的分包
-    const subPackages = getSubPackages(modulesConfig);
+    const newSubPackages = getSubPackages(modulesConfig);
     // 获取app.json的配置
     let appJson = getAppJsonContent(resolve('./app.json'));
 
-    // 更新app.json中的subpackages
-    appJson.subpackages = subPackages;
-    appJson.subpackages.sort((item1, item2) => item1.name.localeCompare(item2.name));
+    // 保留已有分包配置，合并新的分包配置
+    const existingSubpackages = appJson.subpackages || [];
+    appJson.subpackages = mergeSubPackages(existingSubpackages, newSubPackages);
+    appJson.subpackages.sort((item1, item2) => item1.root.localeCompare(item2.root));
 
     // 处理appJson中重复||冲突的地方
     fixAppJson(appJson);

package/src/core/mpCi.js

@@ -114,8 +114,22 @@ const uploadMp = async (params = {}) => {
   });
 };
 
+const getDevSourceMap = async (params = {}) => {
+  const { appId, projectPath, privateKey, robot, sourceMapSavePath } = params;
+  const project = await getMpCi({
+    appId,
+    projectPath,
+    privateKey,
+  });
+  return await ci.getDevSourceMap({
+    project,
+    robot,
+    sourceMapSavePath,
+  });
+};
 module.exports = {
   buildMpNpm,
   previewMp,
   uploadMp,
+  getDevSourceMap,
 };

package/src/entry.js

@@ -81,6 +81,15 @@ module.exports = [
           require('./scripts/run/index')('upload', cmdOptions);
         },
       },
+      {
+        command: 'sourcemap',
+        description: '获取sourcemap',
+        options: [
+        ],
+        action: (cmdOptions) => {
+          require('./scripts/run/index')('sourcemap', cmdOptions);
+        },
+      },
       {
         command: 'cloud-dev',
         description: '云函数开发',

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

@@ -8,7 +8,9 @@ const { global } = require('../../../utils/global');
 
 async function build(tmsConfig, targetModules) {
   // 开始构建前，清理输出目录
-  await shelljs.rm('-rf', resolve(tmsConfig.outputDir));
+  if (tmsConfig.cleanOutputDirBeforeCompile !== false) {
+    await shelljs.rm('-rf', resolve(tmsConfig.outputDir));
+  }
 
   const { modules: newModules } = await init(tmsConfig, targetModules);
   info('当前build有效模块', newModules.map(item => item.moduleName).sort());

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

@@ -31,7 +31,9 @@ function delOtherPackages(tmsConfig, targetSubPackages) {
 async function dev(tmsConfig, targetModules) {
   const { noCache } = global.getData('cmdOptions');
   if (noCache) {
-    shelljs.rm('-rf', resolve(tmsConfig.outputDir));
+    if (tmsConfig.cleanOutputDirBeforeCompile !== false) {
+      shelljs.rm('-rf', resolve(tmsConfig.outputDir));
+    }
     shelljs.rm('-rf', MODULE_CODE_DIR);
     shelljs.rm('-rf', NODE_MODULES_DIR);
   }

package/src/scripts/run/index.js

@@ -5,6 +5,7 @@ const build = require('./build/index');
 const install = require('./install/index');
 const preview = require('./preview/index');
 const upload = require('./upload/index');
+const sourcemap = require('./sourcemap/index');
 const cloudLink = require('./cloud/link');
 const cloudDev = require('./cloud/dev');
 const { fail, info } = require('../../utils/log');
@@ -121,6 +122,10 @@ function otherCommands(tmsConfig, commandName, cmdOptions) {
       upload(tmsConfig, cmdOptions);
       report('run:upload', { appName: tmsConfig.appName });
       return;
+    case 'sourcemap':
+      sourcemap(tmsConfig);
+      report('run:sourcemap', { appName: tmsConfig.appName });
+      return;
     default:
       return;
   }

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

@@ -0,0 +1,48 @@
+const mpCi = require('../../../core/mpCi');
+const { resolve, createTask } = require('../../../utils/widgets');
+const { handleError } = require('../../../core/handleError');
+const { info } = require('../../../utils/log');
+const { getDesc } = require('../preview/utils');
+const report = require('../../../core/report');
+
+const handleParams = (tmsConfig, cmdOptions) => {
+  const params = {
+    ...(tmsConfig.upload ? tmsConfig.upload : {}),
+    ...cmdOptions,
+  };
+
+  return {
+    sourceMapSavePath: './sourcemap.zip',
+    ...params,
+    appId: params.appId || tmsConfig.appId,
+    projectPath: resolve(tmsConfig.outputDir),
+    privateKey: params.privateKey || tmsConfig.privateKey,
+    robot: params.robot || 30,
+    desc: params.desc || getDesc(params.desc),
+  };
+};
+
+/**
+ * 获取sourcemap
+ * @param {object} tmsConfig
+ * @param {object} cmdOptions {version: '2022.28.5', desc: '', robot: 2, infoOutput: './a.txt' }
+ */
+async function sourcemap(tmsConfig, cmdOptions) {
+  try {
+    const params = handleParams(tmsConfig, cmdOptions);
+    report('sourcemap');
+
+    await createTask(
+      mpCi.getDevSourceMap,
+      '正在获取小程序代码sourcemap',
+      '获取小程序代码sourcemap完成',
+    )({
+      ...params,
+    });
+    info(`sourcemap文件已保存到${params.sourceMapSavePath}`);
+  } catch (e) {
+    console.log('详细错误:', e);
+    handleError(`获取sourcemap错误: ${e.message}`, true);
+  }
+}
+module.exports = sourcemap;