@tmsfe/tmskit 0.0.48 → 0.0.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.48",
+  "version": "0.0.52",
   "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": "2.1.14",
+    "miniprogram-ci": "1.8.25",
     "moment": "^2.29.2",
     "object-assign": "^4.0.1",
     "ora": "^5.4.1",

package/src/core/buildAppJson.js

@@ -10,6 +10,7 @@ const { resolve, filterField } = require('../utils/widgets');
 const { handleError } = require('./handleError');
 const { global } = require('../utils/global');
 const report = require('../core/report');
+const { handleAgentConfig, handleProjectConfigInclude } = require('./handleAgentConfig');
 
 
 /**
@@ -191,6 +192,10 @@ async function buildOutputAppJson(tmsConfig, modules) {
 
     // 处理appJson中重复||冲突的地方
     fixAppJson(appJson);
+    // 处理 agent 配置：根据是否包含 meta-services 分包来添加或删除
+    handleAgentConfig(appJson);
+    // 处理 project.config.json 中的 packOptions.include 配置
+    handleProjectConfigInclude(appJson, tmsConfig.outputDir);
     // 更新主包，需在subpackages处理完成后执行， pages/
     updateMainPackages(appJson, tmsConfig.mainPackages);
 

package/src/core/handleAgentConfig.js

@@ -0,0 +1,64 @@
+const { resolve } = require('../utils/widgets');
+const { info } = require('../utils/log');
+const fs = require('fs');
+
+/* eslint-disable no-param-reassign */
+/**
+ * 检查是否包含 meta-services 分包
+ * @param {Object} appJson app.json配置对象
+ * @returns {boolean}
+ */
+function hasMetaServicesSubpackage(appJson) {
+  return appJson.subpackages.some(s => s.root === 'modules/meta-services' || s.name === 'meta-services');
+}
+
+/**
+ * 处理 agent 配置：根据是否包含 meta-services 分包来添加或删除 agent 配置
+ * @param {Object} appJson app.json配置对象
+ */
+export function handleAgentConfig(appJson) {
+  const hasMetaServices = hasMetaServicesSubpackage(appJson);
+  console.log('🔍', hasMetaServices ? '包含' : '不包含', 'meta-services 分包');
+  if (hasMetaServices) {
+    if (!appJson.agent) {
+      try {
+        appJson.agent = require(resolve('./agentConfig.json'));
+        info('已从 agentConfig.json 加载 agent 配置');
+      } catch (error) {
+        info('未找到 agentConfig.json，删除 agent 配置');
+        delete appJson.agent;
+      }
+    }
+  } else if (appJson.agent) {
+    delete appJson.agent;
+    info('已移除 agent 配置');
+  }
+}
+
+/**
+ * 处理 project.config.json 中的 packOptions.include 配置
+ * @param {Object} appJson app.json配置对象
+ * @param {string} outputDir 输出目录
+ */
+export function handleProjectConfigInclude(appJson, outputDir) {
+  const projectConfigPath = resolve(outputDir, 'project.config.json');
+  if (!fs.existsSync(projectConfigPath)) return;
+
+  const projectConfig = require(projectConfigPath);
+  const hasMetaServices = hasMetaServicesSubpackage(appJson);
+
+  if (!projectConfig.packOptions) projectConfig.packOptions = {};
+  if (!projectConfig.packOptions.include) projectConfig.packOptions.include = [];
+
+  const existingIndex = projectConfig.packOptions.include.findIndex(item => item.type === 'folder' && item.value === 'modules/meta-services');
+
+  if (hasMetaServices && existingIndex === -1) {
+    projectConfig.packOptions.include.push({ type: 'folder', value: 'modules/meta-services' });
+    info('已添加 meta-services 到 project.config.json');
+  } else if (!hasMetaServices && existingIndex !== -1) {
+    projectConfig.packOptions.include.splice(existingIndex, 1);
+    info('已从 project.config.json 移除 meta-services');
+  }
+
+  fs.writeFileSync(projectConfigPath, JSON.stringify(projectConfig, null, 2));
+}