@teams-max/mwsp 2.0.12 → 3.0.0

package/es/utils/defineConfig.js

@@ -5,7 +5,8 @@ var _require = require("./index"),
   getCfg = _require.getCfg;
 function defineConfig(config) {
   var cfg = getCfg();
-  var ASG_DIR = cfg.ASG_DIR;
+  var infra = cfg.infra,
+    ASG_DIR = cfg.ASG_DIR;
   var nextAsgEnv = process.env.ASG_DIR || ASG_DIR;
   if (!process.env.ASG_DIR) {
     logStep('Process ASG_DIR not set, and use scoped environment');
@@ -14,11 +15,12 @@ function defineConfig(config) {
     logStep('The Asgard directory does not exist, using default config...');
     return config;
   }
+  var archDir = infra.arch === 'PRO' ? 'pro' : 'max';
   var iConfigFromPlugins = null;
   try {
-    iConfigFromPlugins = require(path.join(nextAsgEnv, 'base', 'pluginConfig.js'));
+    iConfigFromPlugins = require(path.join(nextAsgEnv, archDir, 'base', 'pluginConfig.js'));
   } catch (error) {
-    printErrorAndExit('The Asgard directory does not exist.', "Reason: ".concat(error.message));
+    printErrorAndExit("Failed to load ".concat(archDir, "/base/pluginConfig.js"), "Reason: ".concat(error.message));
     return;
   }
   logStep('The Asgard directory exists, using config from plugins...');

package/es/utils/index.js

@@ -69,30 +69,42 @@ function pickDependencies(dependencies, isDev) {
   });
 }
 
-//获取需要集成包的依赖
+// 安装可选集成模块依赖（切换分支后按需调用）
+// 项目 package.json 声明 "integration": ["snx-editor"] 才会执行
+// 路径：{ASG_DIR}/{arch}/base/integrationDeps.js，PRO 端无此文件时静默跳过
 function addIntegrateDeps(_x2) {
   return _addIntegrateDeps.apply(this, arguments);
-} //安装Asgard的依赖
+} // 安装基座必装依赖（首次 clone 后调用）
+// 路径：{ASG_DIR}/{arch}/base/dependencies.js
 function _addIntegrateDeps() {
   _addIntegrateDeps = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(cfg) {
-    var infra, ASG_DIR, pkgs, integration, dependencies, devDependencies, asgDependencies, asgDeps, asgDevDeps;
+    var infra, ASG_DIR, archDir, pkgs, integration, asgDependencies, dependencies, devDependencies, asgDeps, asgDevDeps;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           infra = cfg.infra, ASG_DIR = cfg.ASG_DIR;
+          archDir = infra.arch === 'PRO' ? 'pro' : 'max';
           pkgs = require(join(cwd, 'package.json'));
           integration = pkgs.integration || [];
           if (integration.length) {
-            _context.next = 6;
+            _context.next = 7;
             break;
           }
           logStep('No integration packages are required.');
           return _context.abrupt("return");
-        case 6:
-          dependencies = {};
-          devDependencies = {};
+        case 7:
+          asgDependencies = {};
           _context.prev = 8;
-          asgDependencies = require(join(ASG_DIR, 'base', 'integrationDeps.js')) || {};
+          asgDependencies = require(join(ASG_DIR, archDir, 'base', 'integrationDeps.js')) || {};
+          _context.next = 16;
+          break;
+        case 12:
+          _context.prev = 12;
+          _context.t0 = _context["catch"](8);
+          // integrationDeps.js 不存在时（如 PRO 端）静默跳过，不中断流程
+          logStep('No integrationDeps.js found, skipping integration deps.');
+          return _context.abrupt("return");
+        case 16:
           dependencies = integration.reduce(function (acc, item) {
             var _asgDependencies$item;
             return _objectSpread(_objectSpread({}, acc), ((_asgDependencies$item = asgDependencies[item]) === null || _asgDependencies$item === void 0 ? void 0 : _asgDependencies$item.dependencies) || {});
@@ -101,17 +113,9 @@ function _addIntegrateDeps() {
             var _asgDependencies$item2;
             return _objectSpread(_objectSpread({}, acc), ((_asgDependencies$item2 = asgDependencies[item]) === null || _asgDependencies$item2 === void 0 ? void 0 : _asgDependencies$item2.devDependencies) || {});
           }, {});
-          _context.next = 18;
-          break;
-        case 14:
-          _context.prev = 14;
-          _context.t0 = _context["catch"](8);
-          printErrorAndExit('The Asgard directory does not exist.', "Reason: ".concat(_context.t0.message));
-          return _context.abrupt("return");
-        case 18:
           asgDeps = pickDependencies(dependencies);
           asgDevDeps = pickDependencies(devDependencies, true);
-          if (!((infra == null ? void 0 : infra.arch) === 'PRO')) {
+          if (!((infra === null || infra === void 0 ? void 0 : infra.arch) === 'PRO')) {
             _context.next = 31;
             break;
           }
@@ -134,7 +138,7 @@ function _addIntegrateDeps() {
           _context.next = 40;
           break;
         case 31:
-          if (!((infra == null ? void 0 : infra.arch) === 'MAX')) {
+          if (!((infra === null || infra === void 0 ? void 0 : infra.arch) === 'MAX')) {
             _context.next = 40;
             break;
           }
@@ -157,7 +161,7 @@ function _addIntegrateDeps() {
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[8, 14]]);
+    }, _callee, null, [[8, 12]]);
   }));
   return _addIntegrateDeps.apply(this, arguments);
 }
@@ -166,74 +170,75 @@ function addAsgDependencies(_x3) {
 } //获取允许的环境变量参数
 function _addAsgDependencies() {
   _addAsgDependencies = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(cfg) {
-    var infra, ASG_DIR, dependencies, devDependencies, asgDependencies, asgDeps, asgDevDeps;
+    var infra, ASG_DIR, archDir, dependencies, devDependencies, asgDependencies, asgDeps, asgDevDeps;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           infra = cfg.infra, ASG_DIR = cfg.ASG_DIR;
+          archDir = infra.arch === 'PRO' ? 'pro' : 'max';
           dependencies = {};
           devDependencies = {};
-          _context2.prev = 3;
-          asgDependencies = require(join(ASG_DIR, 'base', 'dependencies.js')) || {};
+          _context2.prev = 4;
+          asgDependencies = require(join(ASG_DIR, archDir, 'base', 'dependencies.js')) || {};
           dependencies = asgDependencies.dependencies || {};
           devDependencies = asgDependencies.devDependencies || {};
-          _context2.next = 13;
+          _context2.next = 14;
           break;
-        case 9:
-          _context2.prev = 9;
-          _context2.t0 = _context2["catch"](3);
-          printErrorAndExit('The Asgard directory does not exist.', "Reason: ".concat(_context2.t0.message));
+        case 10:
+          _context2.prev = 10;
+          _context2.t0 = _context2["catch"](4);
+          printErrorAndExit("Failed to load ".concat(archDir, "/base/dependencies.js"), "Reason: ".concat(_context2.t0.message));
           return _context2.abrupt("return");
-        case 13:
+        case 14:
           asgDeps = pickDependencies(dependencies);
           asgDevDeps = pickDependencies(devDependencies, true);
           if (!((infra === null || infra === void 0 ? void 0 : infra.arch) === 'PRO')) {
-            _context2.next = 26;
+            _context2.next = 27;
             break;
           }
           _context2.t1 = !!asgDeps.length;
           if (!_context2.t1) {
-            _context2.next = 20;
+            _context2.next = 21;
             break;
           }
-          _context2.next = 20;
+          _context2.next = 21;
           return exec('yarn', ['add'].concat(_toConsumableArray(asgDeps)));
-        case 20:
+        case 21:
           _context2.t2 = !!asgDevDeps.length;
           if (!_context2.t2) {
-            _context2.next = 24;
+            _context2.next = 25;
             break;
           }
-          _context2.next = 24;
+          _context2.next = 25;
           return exec('yarn', ['add'].concat(_toConsumableArray(asgDevDeps), ['-D']));
-        case 24:
-          _context2.next = 35;
+        case 25:
+          _context2.next = 36;
           break;
-        case 26:
+        case 27:
           if (!((infra === null || infra === void 0 ? void 0 : infra.arch) === 'MAX')) {
-            _context2.next = 35;
+            _context2.next = 36;
             break;
           }
           _context2.t3 = !!asgDeps.length;
           if (!_context2.t3) {
-            _context2.next = 31;
+            _context2.next = 32;
             break;
           }
-          _context2.next = 31;
+          _context2.next = 32;
           return exec('pnpm', ['add'].concat(_toConsumableArray(asgDeps)));
-        case 31:
+        case 32:
           _context2.t4 = !!asgDevDeps.length;
           if (!_context2.t4) {
-            _context2.next = 35;
+            _context2.next = 36;
             break;
           }
-          _context2.next = 35;
+          _context2.next = 36;
           return exec('pnpm', ['add'].concat(_toConsumableArray(asgDevDeps), ['-D']));
-        case 35:
+        case 36:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[3, 9]]);
+    }, _callee2, null, [[4, 10]]);
   }));
   return _addAsgDependencies.apply(this, arguments);
 }
@@ -255,6 +260,34 @@ function getAllowEnvParams() {
   });
   return filteredParams;
 }
+/**
+ * 检测当前项目的架构类型，按优先级依次判断：
+ * 1. package.json infra.arch 显式声明（'PRO' | 'MAX'）—— 最高优先级
+ * 2. npm_config_user_agent 运行时环境变量 —— 反映实际调用的包管理器
+ *    pnpm → MAX，yarn → PRO
+ * 3. 锁文件兜底（pnpm-lock.yaml → MAX，yarn.lock → PRO）
+ */
+function detectArch(infra) {
+  var explicitArch = (infra.arch || '').toUpperCase();
+  if (explicitArch === 'PRO' || explicitArch === 'MAX') {
+    return explicitArch;
+  }
+  var userAgent = process.env.npm_config_user_agent || '';
+  if (userAgent.startsWith('pnpm/')) {
+    return 'MAX';
+  }
+  if (userAgent.startsWith('yarn/')) {
+    return 'PRO';
+  }
+  // 兜底：通过锁文件判断（应对直接执行 node 脚本等不经包管理器的场景）
+  if (fs.existsSync(join(cwd, 'pnpm-lock.yaml'))) {
+    return 'MAX';
+  }
+  if (fs.existsSync(join(cwd, 'yarn.lock'))) {
+    return 'PRO';
+  }
+  return 'unknown';
+}
 function getCfg() {
   var args = yParser(process.argv.slice(2));
   var JENKINS_BUILD = args.jenkinsBuild || args.JENKINSBUILD || args.jenkins_build || args.JENKINS_BUILD;
@@ -276,14 +309,12 @@ function getCfg() {
   var ASG_BRANCH = args.asg_branch || args.ASG_BRANCH || '';
   var RESOURCE_URL = '';
   var SUB_APP = '';
-  var archStr = 'unknown';
-  if (projectUrl.includes('teams-pro')) {
-    archStr = 'PRO';
-  } else if (projectUrl.includes('teams-max')) {
-    archStr = 'MAX';
+  var archStr = detectArch(infra);
+  if (archStr === 'MAX') {
     RESOURCE_URL = args.versionUrl || args.RESOURCE_URL || '';
     SUB_APP = args.subApp || args.SUB_APP || '';
   }
+  logStep("Detected arch: ".concat(archStr));
   return {
     appKey: appKey,
     subAppKey: subAppKey,
@@ -333,7 +364,7 @@ function _fetchRemoteRepository() {
             break;
           }
           logStep('Cloning the repository from GitHub...');
-          execa.sync('git', ['clone', '-b', 'feature-asg', remoteUrl, directory]);
+          execa.sync('git', ['clone', '-b', 'feature-asg-one', remoteUrl, directory]);
           logStep('Cloning completed.');
           logStep('Installing dependencies...');
           _context3.next = 11;
@@ -407,10 +438,10 @@ function _fetchRemoteRepository() {
           }).filter(function (b) {
             return !(b.startsWith('origin/HEA') || b.startsWith('origin/app-') || b.startsWith('app-'));
           });
-          defaultBrancheIdx = filteredBranches.indexOf('origin/feature-asg');
+          defaultBrancheIdx = filteredBranches.indexOf('origin/feature-asg-one');
           if (defaultBrancheIdx !== -1) {
             filteredBranches.splice(defaultBrancheIdx, 1);
-            filteredBranches.unshift('origin/feature-asg');
+            filteredBranches.unshift('origin/feature-asg-one');
           }
           // 若过滤后分支列表为空，则给出提示并退出
           if (filteredBranches.length === 0) {

package/lib/utils/defineConfig.js

@@ -3,7 +3,7 @@ var path = require("path");
 var { logStep, printErrorAndExit, getCfg } = require("./index");
 function defineConfig(config) {
   const cfg = getCfg();
-  const { ASG_DIR } = cfg;
+  const { infra, ASG_DIR } = cfg;
   const nextAsgEnv = process.env.ASG_DIR || ASG_DIR;
   if (!process.env.ASG_DIR) {
     logStep("Process ASG_DIR not set, and use scoped environment");
@@ -12,16 +12,18 @@ function defineConfig(config) {
     logStep("The Asgard directory does not exist, using default config...");
     return config;
   }
+  const archDir = infra.arch === "PRO" ? "pro" : "max";
   let iConfigFromPlugins = null;
   try {
     iConfigFromPlugins = require(path.join(
       nextAsgEnv,
+      archDir,
       "base",
       "pluginConfig.js"
     ));
   } catch (error) {
     printErrorAndExit(
-      "The Asgard directory does not exist.",
+      `Failed to load ${archDir}/base/pluginConfig.js`,
       `Reason: ${error.message}`
     );
     return;

package/lib/utils/index.js

@@ -37,43 +37,34 @@ function pickDependencies(dependencies, isDev) {
 }
 async function addIntegrateDeps(cfg) {
   const { infra, ASG_DIR } = cfg;
+  const archDir = infra.arch === "PRO" ? "pro" : "max";
   const pkgs = require(join(cwd, "package.json"));
   const integration = pkgs.integration || [];
   if (!integration.length) {
     logStep("No integration packages are required.");
     return;
   }
-  let dependencies = {};
-  let devDependencies = {};
+  let asgDependencies = {};
   try {
-    const asgDependencies = require(join(ASG_DIR, "base", "integrationDeps.js")) || {};
-    dependencies = integration.reduce(
-      (acc, item) => {
-        var _a;
-        return {
-          ...acc,
-          ...((_a = asgDependencies[item]) == null ? void 0 : _a.dependencies) || {}
-        };
-      },
-      {}
-    );
-    devDependencies = integration.reduce(
-      (acc, item) => {
-        var _a;
-        return {
-          ...acc,
-          ...((_a = asgDependencies[item]) == null ? void 0 : _a.devDependencies) || {}
-        };
-      },
-      {}
-    );
+    asgDependencies = require(join(ASG_DIR, archDir, "base", "integrationDeps.js")) || {};
   } catch (error) {
-    printErrorAndExit(
-      "The Asgard directory does not exist.",
-      `Reason: ${error.message}`
-    );
+    logStep("No integrationDeps.js found, skipping integration deps.");
     return;
   }
+  const dependencies = integration.reduce(
+    (acc, item) => {
+      var _a;
+      return { ...acc, ...((_a = asgDependencies[item]) == null ? void 0 : _a.dependencies) || {} };
+    },
+    {}
+  );
+  const devDependencies = integration.reduce(
+    (acc, item) => {
+      var _a;
+      return { ...acc, ...((_a = asgDependencies[item]) == null ? void 0 : _a.devDependencies) || {} };
+    },
+    {}
+  );
   const asgDeps = pickDependencies(dependencies);
   const asgDevDeps = pickDependencies(devDependencies, true);
   if ((infra == null ? void 0 : infra.arch) === "PRO") {
@@ -86,15 +77,16 @@ async function addIntegrateDeps(cfg) {
 }
 async function addAsgDependencies(cfg) {
   const { infra, ASG_DIR } = cfg;
+  const archDir = infra.arch === "PRO" ? "pro" : "max";
   let dependencies = {};
   let devDependencies = {};
   try {
-    const asgDependencies = require(join(ASG_DIR, "base", "dependencies.js")) || {};
+    const asgDependencies = require(join(ASG_DIR, archDir, "base", "dependencies.js")) || {};
     dependencies = asgDependencies.dependencies || {};
     devDependencies = asgDependencies.devDependencies || {};
   } catch (error) {
     printErrorAndExit(
-      "The Asgard directory does not exist.",
+      `Failed to load ${archDir}/base/dependencies.js`,
       `Reason: ${error.message}`
     );
     return;
@@ -126,6 +118,26 @@ function getAllowEnvParams() {
   });
   return filteredParams;
 }
+function detectArch(infra) {
+  const explicitArch = (infra.arch || "").toUpperCase();
+  if (explicitArch === "PRO" || explicitArch === "MAX") {
+    return explicitArch;
+  }
+  const userAgent = process.env.npm_config_user_agent || "";
+  if (userAgent.startsWith("pnpm/")) {
+    return "MAX";
+  }
+  if (userAgent.startsWith("yarn/")) {
+    return "PRO";
+  }
+  if (fs.existsSync(join(cwd, "pnpm-lock.yaml"))) {
+    return "MAX";
+  }
+  if (fs.existsSync(join(cwd, "yarn.lock"))) {
+    return "PRO";
+  }
+  return "unknown";
+}
 function getCfg() {
   const args = yParser(process.argv.slice(2));
   const JENKINS_BUILD = args.jenkinsBuild || args.JENKINSBUILD || args.jenkins_build || args.JENKINS_BUILD;
@@ -144,14 +156,12 @@ function getCfg() {
   const ASG_BRANCH = args.asg_branch || args.ASG_BRANCH || "";
   let RESOURCE_URL = "";
   let SUB_APP = "";
-  let archStr = "unknown";
-  if (projectUrl.includes("teams-pro")) {
-    archStr = "PRO";
-  } else if (projectUrl.includes("teams-max")) {
-    archStr = "MAX";
+  const archStr = detectArch(infra);
+  if (archStr === "MAX") {
     RESOURCE_URL = args.versionUrl || args.RESOURCE_URL || "";
     SUB_APP = args.subApp || args.SUB_APP || "";
   }
+  logStep(`Detected arch: ${archStr}`);
   return {
     appKey,
     subAppKey,
@@ -186,7 +196,7 @@ async function fetchRemoteRepository() {
   const doesExist = checkDirectoryExistsSync(directory);
   if (!doesExist) {
     logStep("Cloning the repository from GitHub...");
-    execa.sync("git", ["clone", "-b", "feature-asg", remoteUrl, directory]);
+    execa.sync("git", ["clone", "-b", "feature-asg-one", remoteUrl, directory]);
     logStep("Cloning completed.");
     logStep("Installing dependencies...");
     await addAsgDependencies(cfg);
@@ -236,10 +246,12 @@ async function fetchRemoteRepository() {
       const filteredBranches = infraBranchArray.map((b) => b.trim()).filter(
         (b) => !(b.startsWith("origin/HEA") || b.startsWith("origin/app-") || b.startsWith("app-"))
       );
-      const defaultBrancheIdx = filteredBranches.indexOf("origin/feature-asg");
+      const defaultBrancheIdx = filteredBranches.indexOf(
+        "origin/feature-asg-one"
+      );
       if (defaultBrancheIdx !== -1) {
         filteredBranches.splice(defaultBrancheIdx, 1);
-        filteredBranches.unshift("origin/feature-asg");
+        filteredBranches.unshift("origin/feature-asg-one");
       }
       if (filteredBranches.length === 0) {
         printErrorAndExit("No branches available for selection.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teams-max/mwsp",
-  "version": "2.0.12",
+  "version": "3.0.0",
   "description": "@teams-max/mwsp",
   "homepage": "https://gitlab.daikuan.qihoo.net/efficacy-fe/teams-max/-/tree/master/packages/mwsp",
   "repository": {