@teams-max/mwsp 2.0.7 → 2.0.8

package/es/utils/index.js

@@ -4,6 +4,11 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -63,80 +68,173 @@ function pickDependencies(dependencies, isDev) {
     return "".concat(key, "@").concat(value);
   });
 }
-//安装Asgard的依赖
-function addAsgDependencies(_x2) {
+
+//获取需要集成包的依赖
+function addIntegrateDeps(_x2) {
+  return _addIntegrateDeps.apply(this, arguments);
+} //安装Asgard的依赖
+function _addIntegrateDeps() {
+  _addIntegrateDeps = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(cfg) {
+    var infra, ASG_DIR, pkgs, integration, dependencies, devDependencies, asgDependencies, 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;
+          pkgs = require(join(cwd, 'package.json'));
+          integration = pkgs.integration || [];
+          if (integration.length) {
+            _context.next = 6;
+            break;
+          }
+          logStep("No integration packages are required.");
+          return _context.abrupt("return");
+        case 6:
+          ;
+          dependencies = {};
+          devDependencies = {};
+          _context.prev = 9;
+          asgDependencies = require(join(ASG_DIR, 'base', 'integrationDeps.js')) || {};
+          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) || {});
+          }, {});
+          devDependencies = integration.reduce(function (acc, item) {
+            var _asgDependencies$item2;
+            return _objectSpread(_objectSpread({}, acc), ((_asgDependencies$item2 = asgDependencies[item]) === null || _asgDependencies$item2 === void 0 ? void 0 : _asgDependencies$item2.devDependencies) || {});
+          }, {});
+          _context.next = 19;
+          break;
+        case 15:
+          _context.prev = 15;
+          _context.t0 = _context["catch"](9);
+          printErrorAndExit('The Asgard directory does not exist.', "Reason: ".concat(_context.t0.message));
+          return _context.abrupt("return");
+        case 19:
+          asgDeps = pickDependencies(dependencies);
+          asgDevDeps = pickDependencies(devDependencies, true);
+          if (!((infra == null ? void 0 : infra.arch) === "PRO")) {
+            _context.next = 32;
+            break;
+          }
+          _context.t1 = !!asgDeps.length;
+          if (!_context.t1) {
+            _context.next = 26;
+            break;
+          }
+          _context.next = 26;
+          return exec("yarn", ["add"].concat(_toConsumableArray(asgDeps)));
+        case 26:
+          _context.t2 = !!asgDevDeps.length;
+          if (!_context.t2) {
+            _context.next = 30;
+            break;
+          }
+          _context.next = 30;
+          return exec("yarn", ["add"].concat(_toConsumableArray(asgDevDeps), ["-D"]));
+        case 30:
+          _context.next = 41;
+          break;
+        case 32:
+          if (!((infra == null ? void 0 : infra.arch) === "MAX")) {
+            _context.next = 41;
+            break;
+          }
+          _context.t3 = !!asgDeps.length;
+          if (!_context.t3) {
+            _context.next = 37;
+            break;
+          }
+          _context.next = 37;
+          return exec("pnpm", ["add"].concat(_toConsumableArray(asgDeps)));
+        case 37:
+          _context.t4 = !!asgDevDeps.length;
+          if (!_context.t4) {
+            _context.next = 41;
+            break;
+          }
+          _context.next = 41;
+          return exec("pnpm", ["add"].concat(_toConsumableArray(asgDevDeps), ["-D"]));
+        case 41:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[9, 15]]);
+  }));
+  return _addIntegrateDeps.apply(this, arguments);
+}
+function addAsgDependencies(_x3) {
   return _addAsgDependencies.apply(this, arguments);
 }
 function _addAsgDependencies() {
-  _addAsgDependencies = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(cfg) {
-    var infra, ASG_DIR, dependencies, devDependencies, asgDeps, asgDevDeps;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  _addAsgDependencies = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(cfg) {
+    var infra, ASG_DIR, 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;
           dependencies = {};
           devDependencies = {};
-          _context.prev = 3;
+          _context2.prev = 3;
           asgDependencies = require(join(ASG_DIR, 'base', 'dependencies.js')) || {};
           dependencies = asgDependencies.dependencies || {};
           devDependencies = asgDependencies.devDependencies || {};
-          _context.next = 13;
+          _context2.next = 13;
           break;
         case 9:
-          _context.prev = 9;
-          _context.t0 = _context["catch"](3);
-          printErrorAndExit('The Asgard directory does not exist.', "Reason: ".concat(_context.t0.message));
-          return _context.abrupt("return");
+          _context2.prev = 9;
+          _context2.t0 = _context2["catch"](3);
+          printErrorAndExit('The Asgard directory does not exist.', "Reason: ".concat(_context2.t0.message));
+          return _context2.abrupt("return");
         case 13:
           asgDeps = pickDependencies(dependencies);
           asgDevDeps = pickDependencies(devDependencies, true);
           if (!((infra === null || infra === void 0 ? void 0 : infra.arch) === 'PRO')) {
-            _context.next = 26;
+            _context2.next = 26;
             break;
           }
-          _context.t1 = !!asgDeps.length;
-          if (!_context.t1) {
-            _context.next = 20;
+          _context2.t1 = !!asgDeps.length;
+          if (!_context2.t1) {
+            _context2.next = 20;
             break;
           }
-          _context.next = 20;
+          _context2.next = 20;
           return exec('yarn', ['add'].concat(_toConsumableArray(asgDeps)));
         case 20:
-          _context.t2 = !!asgDevDeps.length;
-          if (!_context.t2) {
-            _context.next = 24;
+          _context2.t2 = !!asgDevDeps.length;
+          if (!_context2.t2) {
+            _context2.next = 24;
             break;
           }
-          _context.next = 24;
+          _context2.next = 24;
           return exec('yarn', ['add'].concat(_toConsumableArray(asgDevDeps), ['-D']));
         case 24:
-          _context.next = 35;
+          _context2.next = 35;
           break;
         case 26:
           if (!((infra === null || infra === void 0 ? void 0 : infra.arch) === 'MAX')) {
-            _context.next = 35;
+            _context2.next = 35;
             break;
           }
-          _context.t3 = !!asgDeps.length;
-          if (!_context.t3) {
-            _context.next = 31;
+          _context2.t3 = !!asgDeps.length;
+          if (!_context2.t3) {
+            _context2.next = 31;
             break;
           }
-          _context.next = 31;
+          _context2.next = 31;
           return exec('pnpm', ['add'].concat(_toConsumableArray(asgDeps)));
         case 31:
-          _context.t4 = !!asgDevDeps.length;
-          if (!_context.t4) {
-            _context.next = 35;
+          _context2.t4 = !!asgDevDeps.length;
+          if (!_context2.t4) {
+            _context2.next = 35;
             break;
           }
-          _context.next = 35;
+          _context2.next = 35;
           return exec('pnpm', ['add'].concat(_toConsumableArray(asgDevDeps), ['-D']));
         case 35:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee, null, [[3, 9]]);
+    }, _callee2, null, [[3, 9]]);
   }));
   return _addAsgDependencies.apply(this, arguments);
 }
@@ -196,42 +294,42 @@ function fetchRemoteRepository() {
   return _fetchRemoteRepository.apply(this, arguments);
 }
 function _fetchRemoteRepository() {
-  _fetchRemoteRepository = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+  _fetchRemoteRepository = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
     var cfg, infra, directory, ASG_BRANCH, JENKINS_BUILD, remoteUrl, doesExist, _yield$inquirer$promp, syncUp, infraBranchsOutput, infraBranchArray, filteredBranches, defaultBrancheIdx, questions;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           cfg = getCfg();
           infra = cfg.infra, directory = cfg.ASG_DIR, ASG_BRANCH = cfg.ASG_BRANCH, JENKINS_BUILD = cfg.JENKINS_BUILD;
           remoteUrl = infra.url;
           doesExist = checkDirectoryExistsSync(directory);
           if (doesExist) {
-            _context2.next = 14;
+            _context3.next = 14;
             break;
           }
           logStep('Cloning the repository from GitHub...');
           execa.sync('git', ['clone', '-b', 'feature-asg', remoteUrl, directory]);
           logStep('Cloning completed.');
           logStep('Installing dependencies...');
-          _context2.next = 11;
+          _context3.next = 11;
           return addAsgDependencies(cfg);
         case 11:
           logStep('Installation completed.');
-          _context2.next = 26;
+          _context3.next = 26;
           break;
         case 14:
           if (!(JENKINS_BUILD && !ASG_BRANCH)) {
-            _context2.next = 19;
+            _context3.next = 19;
             break;
           }
           logStep('Jenkins build detected. Skipping sync up.');
-          return _context2.abrupt("return");
+          return _context3.abrupt("return");
         case 19:
           if (JENKINS_BUILD) {
-            _context2.next = 26;
+            _context3.next = 26;
             break;
           }
-          _context2.next = 22;
+          _context3.next = 22;
           return inquirer.prompt([{
             type: 'confirm',
             name: 'syncUp',
@@ -239,32 +337,32 @@ function _fetchRemoteRepository() {
             default: 'Y'
           }]);
         case 22:
-          _yield$inquirer$promp = _context2.sent;
+          _yield$inquirer$promp = _context3.sent;
           syncUp = _yield$inquirer$promp.syncUp;
           if (syncUp) {
-            _context2.next = 26;
+            _context3.next = 26;
             break;
           }
-          return _context2.abrupt("return");
+          return _context3.abrupt("return");
         case 26:
           if (!(!doesExist && JENKINS_BUILD && !ASG_BRANCH)) {
-            _context2.next = 29;
+            _context3.next = 29;
             break;
           }
           printErrorAndExit('Jenkins build detected. The branch parameter is missing!');
-          return _context2.abrupt("return");
+          return _context3.abrupt("return");
         case 29:
           logStep('Synchronizing with the remote repository...');
           process.chdir(directory);
-          _context2.prev = 31;
+          _context3.prev = 31;
           execa.sync('git', ['fetch', 'origin', '--prune']);
           if (!(JENKINS_BUILD && ASG_BRANCH)) {
-            _context2.next = 38;
+            _context3.next = 38;
             break;
           }
           execa.sync('git', ['checkout', ASG_BRANCH]);
           logStep("Anto switched to branch:", ASG_BRANCH);
-          _context2.next = 48;
+          _context3.next = 59;
           break;
         case 38:
           // 获取远程分支列表
@@ -286,7 +384,7 @@ function _fetchRemoteRepository() {
           }
 
           // 提示用户选择分支
-          _context2.next = 46;
+          _context3.next = 46;
           return inquirer.prompt([{
             type: 'list',
             name: 'branch',
@@ -300,29 +398,36 @@ function _fetchRemoteRepository() {
             }
           }]);
         case 46:
-          questions = _context2.sent;
-          // 切换分支，增加错误处理
-          try {
-            execa.sync('git', ['checkout', '-q', questions.branch]);
-            logStep("Switched to branch:", questions.branch);
-          } catch (error) {
-            printErrorAndExit("Failed to switch to branch '".concat(questions.branch, "'. Reason: ").concat(error.message));
-          }
-        case 48:
-          _context2.next = 53;
+          questions = _context3.sent;
+          _context3.prev = 47;
+          execa.sync('git', ['checkout', '-q', questions.branch]);
+          logStep("Switched to branch:", questions.branch);
+          logStep('Installing dependencies...');
+          _context3.next = 53;
+          return addIntegrateDeps(cfg);
+        case 53:
+          logStep('Installation completed.');
+          _context3.next = 59;
+          break;
+        case 56:
+          _context3.prev = 56;
+          _context3.t0 = _context3["catch"](47);
+          printErrorAndExit("Failed to switch to branch '".concat(questions.branch, "'. Reason: ").concat(_context3.t0.message));
+        case 59:
+          _context3.next = 64;
           break;
-        case 50:
-          _context2.prev = 50;
-          _context2.t0 = _context2["catch"](31);
+        case 61:
+          _context3.prev = 61;
+          _context3.t1 = _context3["catch"](31);
           // 获取分支列表时的错误处理
-          printErrorAndExit("An error occurred while fetching remote branches: ".concat(_context2.t0.message));
-        case 53:
+          printErrorAndExit("An error occurred while fetching remote branches: ".concat(_context3.t1.message));
+        case 64:
           process.chdir(cwd);
-        case 54:
+        case 65:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[31, 50]]);
+    }, _callee3, null, [[31, 61], [47, 56]]);
   }));
   return _fetchRemoteRepository.apply(this, arguments);
 }

package/lib/utils/index.js

@@ -35,12 +35,56 @@ function pickDependencies(dependencies, isDev) {
   );
   return dependenciesList.map(([key, value]) => `${key}@${value}`);
 }
+async function addIntegrateDeps(cfg) {
+  const { infra, ASG_DIR } = cfg;
+  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 = {};
+  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) || {}
+      };
+    }, {});
+  } catch (error) {
+    printErrorAndExit(
+      "The Asgard directory does not exist.",
+      `Reason: ${error.message}`
+    );
+    return;
+  }
+  const asgDeps = pickDependencies(dependencies);
+  const asgDevDeps = pickDependencies(devDependencies, true);
+  if ((infra == null ? void 0 : infra.arch) === "PRO") {
+    !!asgDeps.length && await exec("yarn", ["add", ...asgDeps]);
+    !!asgDevDeps.length && await exec("yarn", ["add", ...asgDevDeps, "-D"]);
+  } else if ((infra == null ? void 0 : infra.arch) === "MAX") {
+    !!asgDeps.length && await exec("pnpm", ["add", ...asgDeps]);
+    !!asgDevDeps.length && await exec("pnpm", ["add", ...asgDevDeps, "-D"]);
+  }
+}
 async function addAsgDependencies(cfg) {
   const { infra, ASG_DIR } = cfg;
   let dependencies = {};
   let devDependencies = {};
   try {
-    asgDependencies = require(join(ASG_DIR, "base", "dependencies.js")) || {};
+    const asgDependencies = require(join(ASG_DIR, "base", "dependencies.js")) || {};
     dependencies = asgDependencies.dependencies || {};
     devDependencies = asgDependencies.devDependencies || {};
   } catch (error) {
@@ -179,6 +223,9 @@ async function fetchRemoteRepository() {
       try {
         execa.sync("git", ["checkout", "-q", questions.branch]);
         logStep(`Switched to branch:`, questions.branch);
+        logStep("Installing dependencies...");
+        await addIntegrateDeps(cfg);
+        logStep("Installation completed.");
       } catch (error) {
         printErrorAndExit(
           `Failed to switch to branch '${questions.branch}'. Reason: ${error.message}`

package/package.json

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