@teams-max/mwsp 2.0.8 → 2.0.10

package/es/cli/build.js

@@ -15,13 +15,13 @@ export default function build() {
 }
 function _build() {
   _build = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var cfg, infra, ASG_DIR, appKey, APP_ENV, JENKINS_BUILD, MAX_SUB_APP, RESOURCE_URL, environment, questions, env;
+    var cfg, infra, ASG_DIR, appKey, subAppKey, APP_ENV, JENKINS_BUILD, MAX_SUB_APP, RESOURCE_URL, environment, questions, env;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           // 配置检测 （package.json）
           cfg = getCfg();
-          infra = cfg.infra, ASG_DIR = cfg.ASG_DIR, appKey = cfg.appKey, APP_ENV = cfg.APP_ENV, JENKINS_BUILD = cfg.JENKINS_BUILD, MAX_SUB_APP = cfg.MAX_SUB_APP, RESOURCE_URL = cfg.RESOURCE_URL;
+          infra = cfg.infra, ASG_DIR = cfg.ASG_DIR, appKey = cfg.appKey, subAppKey = cfg.subAppKey, APP_ENV = cfg.APP_ENV, JENKINS_BUILD = cfg.JENKINS_BUILD, MAX_SUB_APP = cfg.MAX_SUB_APP, RESOURCE_URL = cfg.RESOURCE_URL;
           _context.next = 4;
           return fetchRemoteRepository();
         case 4:
@@ -47,41 +47,43 @@ function _build() {
           env.ASG_DIR = ASG_DIR;
           logStep("Build ".concat(appKey), "ENV:".concat(environment));
           if (!((infra === null || infra === void 0 ? void 0 : infra.arch) === 'PRO')) {
-            _context.next = 23;
+            _context.next = 24;
             break;
           }
           env.VUE_APP_ENV = environment;
           env.VUE_APP_TYPE = 'pro';
           env.VUE_JENKINS_BUILD = JENKINS_BUILD;
           env.VUE_APP_KEY = appKey;
-          _context.next = 21;
+          env.VUE_SUB_APP_KEY = subAppKey;
+          _context.next = 22;
           return exec('vue-cli-service', ['build'], {
             env: env
           });
-        case 21:
-          _context.next = 32;
+        case 22:
+          _context.next = 34;
           break;
-        case 23:
+        case 24:
           if (!((infra === null || infra === void 0 ? void 0 : infra.arch) === 'MAX')) {
-            _context.next = 32;
+            _context.next = 34;
             break;
           }
           env.MAX_APP_ENV = environment;
           env.MAX_APP_TYPE = 'max';
           env.MAX_JENKINS_BUILD = JENKINS_BUILD;
           env.MAX_APP_KEY = appKey;
+          env.MAX_SUB_APP_KEY = subAppKey;
           env.MAX_SUB_APP = MAX_SUB_APP;
           env.RESOURCE_URL = RESOURCE_URL;
-          _context.next = 32;
+          _context.next = 34;
           return exec('max', ['build'], {
             env: env
           });
-        case 32:
-          _context.next = 34;
+        case 34:
+          _context.next = 36;
           return exec('find', ['./dist', '-type', 'f', '-name', '*.map', '-exec', 'rm', '-f', '{}', '+'], {
             env: env
           });
-        case 34:
+        case 36:
         case "end":
           return _context.stop();
       }

package/es/cli/start.js

@@ -16,22 +16,24 @@ export default function start() {
 // });
 function _start() {
   _start = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var cfg, infra, appKey, ASG_DIR, env;
+    var cfg, infra, appKey, subAppKey, ASG_DIR, env;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           // 配置检测 （package.json）
           cfg = getCfg();
-          infra = cfg.infra, appKey = cfg.appKey, ASG_DIR = cfg.ASG_DIR;
+          infra = cfg.infra, appKey = cfg.appKey, subAppKey = cfg.subAppKey, ASG_DIR = cfg.ASG_DIR;
           env = Object.create(process.env); // Do this as the first thing so that any code reading it knows the right env.
           if ((infra === null || infra === void 0 ? void 0 : infra.arch) === 'PRO') {
             env.VUE_APP_TYPE = 'pro';
             env.VUE_APP_ENV = 'development';
             env.VUE_APP_KEY = appKey;
+            env.VUE_SUB_APP_KEY = subAppKey;
           } else if ((infra === null || infra === void 0 ? void 0 : infra.arch) === 'MAX') {
             env.MAX_APP_TYPE = 'max';
             env.MAX_APP_ENV = 'development';
             env.MAX_APP_KEY = appKey;
+            env.MAX_SUB_APP_KEY = subAppKey;
           }
           env.BABEL_ENV = 'development';
           env.ASG_DIR = ASG_DIR;

package/es/utils/index.js

@@ -86,13 +86,12 @@ function _addIntegrateDeps() {
             _context.next = 6;
             break;
           }
-          logStep("No integration packages are required.");
+          logStep('No integration packages are required.');
           return _context.abrupt("return");
         case 6:
-          ;
           dependencies = {};
           devDependencies = {};
-          _context.prev = 9;
+          _context.prev = 8;
           asgDependencies = require(join(ASG_DIR, 'base', 'integrationDeps.js')) || {};
           dependencies = integration.reduce(function (acc, item) {
             var _asgDependencies$item;
@@ -102,63 +101,63 @@ 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 = 19;
+          _context.next = 18;
           break;
-        case 15:
-          _context.prev = 15;
-          _context.t0 = _context["catch"](9);
+        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 19:
+        case 18:
           asgDeps = pickDependencies(dependencies);
           asgDevDeps = pickDependencies(devDependencies, true);
-          if (!((infra == null ? void 0 : infra.arch) === "PRO")) {
-            _context.next = 32;
+          if (!((infra == null ? void 0 : infra.arch) === 'PRO')) {
+            _context.next = 31;
             break;
           }
           _context.t1 = !!asgDeps.length;
           if (!_context.t1) {
-            _context.next = 26;
+            _context.next = 25;
             break;
           }
-          _context.next = 26;
-          return exec("yarn", ["add"].concat(_toConsumableArray(asgDeps)));
-        case 26:
+          _context.next = 25;
+          return exec('yarn', ['add'].concat(_toConsumableArray(asgDeps)));
+        case 25:
           _context.t2 = !!asgDevDeps.length;
           if (!_context.t2) {
-            _context.next = 30;
+            _context.next = 29;
             break;
           }
-          _context.next = 30;
-          return exec("yarn", ["add"].concat(_toConsumableArray(asgDevDeps), ["-D"]));
-        case 30:
-          _context.next = 41;
+          _context.next = 29;
+          return exec('yarn', ['add'].concat(_toConsumableArray(asgDevDeps), ['-D']));
+        case 29:
+          _context.next = 40;
           break;
-        case 32:
-          if (!((infra == null ? void 0 : infra.arch) === "MAX")) {
-            _context.next = 41;
+        case 31:
+          if (!((infra == null ? void 0 : infra.arch) === 'MAX')) {
+            _context.next = 40;
             break;
           }
           _context.t3 = !!asgDeps.length;
           if (!_context.t3) {
-            _context.next = 37;
+            _context.next = 36;
             break;
           }
-          _context.next = 37;
-          return exec("pnpm", ["add"].concat(_toConsumableArray(asgDeps)));
-        case 37:
+          _context.next = 36;
+          return exec('pnpm', ['add'].concat(_toConsumableArray(asgDeps)));
+        case 36:
           _context.t4 = !!asgDevDeps.length;
           if (!_context.t4) {
-            _context.next = 41;
+            _context.next = 40;
             break;
           }
-          _context.next = 41;
-          return exec("pnpm", ["add"].concat(_toConsumableArray(asgDevDeps), ["-D"]));
-        case 41:
+          _context.next = 40;
+          return exec('pnpm', ['add'].concat(_toConsumableArray(asgDevDeps), ['-D']));
+        case 40:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[9, 15]]);
+    }, _callee, null, [[8, 14]]);
   }));
   return _addIntegrateDeps.apply(this, arguments);
 }
@@ -239,31 +238,39 @@ function _addAsgDependencies() {
   return _addAsgDependencies.apply(this, arguments);
 }
 function getCfg() {
+  var args = yParser(process.argv.slice(2));
+  var JENKINS_BUILD = args.jenkinsBuild || args.JENKINSBUILD || args.jenkins_build || args.JENKINS_BUILD;
   var pkgs = require(join(cwd, 'package.json'));
   var _pkgs$infra = pkgs.infra,
     infra = _pkgs$infra === void 0 ? {} : _pkgs$infra,
-    appKey = pkgs.appKey;
-  if (!(infra !== null && infra !== void 0 && infra.url) || !appKey) {
+    appKey = pkgs.appKey,
+    subAppKey = pkgs.subAppKey;
+  var projectUrl = '';
+  if (JENKINS_BUILD) {
+    projectUrl = infra.ssh || infra.url;
+  } else {
+    projectUrl = infra.http || infra.url;
+  }
+  if (!projectUrl || !appKey) {
     printErrorAndExit('Please check the infra and appKey in package.json.');
   }
-  var args = yParser(process.argv.slice(2));
-  var JENKINS_BUILD = args.jenkinsBuild || args.JENKINSBUILD || args.jenkins_build || args.JENKINS_BUILD;
   var APP_ENV = args.env || args.ENV || '';
   var ASG_BRANCH = args.asg_branch || args.ASG_BRANCH || '';
   var RESOURCE_URL = '';
   var SUB_APP = '';
   var archStr = 'unknown';
-  if (infra.url.includes('teams-pro')) {
+  if (projectUrl.includes('teams-pro')) {
     archStr = 'PRO';
-  } else if (infra.url.includes('teams-max')) {
+  } else if (projectUrl.includes('teams-max')) {
     archStr = 'MAX';
     RESOURCE_URL = args.versionUrl || args.RESOURCE_URL || '';
     SUB_APP = args.subApp || args.SUB_APP || '';
   }
   return {
     appKey: appKey,
+    subAppKey: subAppKey,
     infra: {
-      url: infra.url,
+      url: projectUrl,
       arch: archStr
     },
     ASG_DIR: asgDir,
@@ -295,7 +302,7 @@ function fetchRemoteRepository() {
 }
 function _fetchRemoteRepository() {
   _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;
+    var cfg, infra, directory, ASG_BRANCH, JENKINS_BUILD, remoteUrl, doesExist, timer, _yield$Promise$race, syncUp, infraBranchsOutput, infraBranchArray, filteredBranches, defaultBrancheIdx, questions;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -330,15 +337,24 @@ function _fetchRemoteRepository() {
             break;
           }
           _context3.next = 22;
-          return inquirer.prompt([{
+          return Promise.race([inquirer.prompt([{
             type: 'confirm',
             name: 'syncUp',
-            message: '同步远端仓库',
+            message: '同步远端仓库(5s后跳过同步)',
             default: 'Y'
-          }]);
+          }]).then(function (answer) {
+            timer && clearTimeout(timer);
+            return answer;
+          }), new Promise(function (resolve) {
+            timer = setTimeout(function () {
+              return resolve({
+                syncUp: false
+              });
+            }, 5e3);
+          })]);
         case 22:
-          _yield$inquirer$promp = _context3.sent;
-          syncUp = _yield$inquirer$promp.syncUp;
+          _yield$Promise$race = _context3.sent;
+          syncUp = _yield$Promise$race.syncUp;
           if (syncUp) {
             _context3.next = 26;
             break;

package/lib/cli/build.js

@@ -33,6 +33,7 @@ async function build() {
     infra,
     ASG_DIR,
     appKey,
+    subAppKey,
     APP_ENV,
     JENKINS_BUILD,
     MAX_SUB_APP,
@@ -61,6 +62,7 @@ async function build() {
     env.VUE_APP_TYPE = "pro";
     env.VUE_JENKINS_BUILD = JENKINS_BUILD;
     env.VUE_APP_KEY = appKey;
+    env.VUE_SUB_APP_KEY = subAppKey;
     await exec("vue-cli-service", ["build"], {
       env
     });
@@ -69,6 +71,7 @@ async function build() {
     env.MAX_APP_TYPE = "max";
     env.MAX_JENKINS_BUILD = JENKINS_BUILD;
     env.MAX_APP_KEY = appKey;
+    env.MAX_SUB_APP_KEY = subAppKey;
     env.MAX_SUB_APP = MAX_SUB_APP;
     env.RESOURCE_URL = RESOURCE_URL;
     await exec("max", ["build"], {

package/lib/cli/start.js

@@ -26,16 +26,18 @@ var exec = require("../utils/exec");
 var { getCfg, fetchRemoteRepository } = require("../utils");
 async function start() {
   const cfg = getCfg();
-  const { infra, appKey, ASG_DIR } = cfg;
+  const { infra, appKey, subAppKey, ASG_DIR } = cfg;
   const env = Object.create(process.env);
   if ((infra == null ? void 0 : infra.arch) === "PRO") {
     env.VUE_APP_TYPE = "pro";
     env.VUE_APP_ENV = "development";
     env.VUE_APP_KEY = appKey;
+    env.VUE_SUB_APP_KEY = subAppKey;
   } else if ((infra == null ? void 0 : infra.arch) === "MAX") {
     env.MAX_APP_TYPE = "max";
     env.MAX_APP_ENV = "development";
     env.MAX_APP_KEY = appKey;
+    env.MAX_SUB_APP_KEY = subAppKey;
   }
   env.BABEL_ENV = "development";
   env.ASG_DIR = ASG_DIR;

package/lib/utils/index.js

@@ -43,25 +43,30 @@ async function addIntegrateDeps(cfg) {
     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) || {}
-      };
-    }, {});
+    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.",
@@ -105,29 +110,36 @@ async function addAsgDependencies(cfg) {
   }
 }
 function getCfg() {
+  const args = yParser(process.argv.slice(2));
+  const JENKINS_BUILD = args.jenkinsBuild || args.JENKINSBUILD || args.jenkins_build || args.JENKINS_BUILD;
   const pkgs = require(join(cwd, "package.json"));
-  const { infra = {}, appKey } = pkgs;
-  if (!(infra == null ? void 0 : infra.url) || !appKey) {
+  const { infra = {}, appKey, subAppKey } = pkgs;
+  let projectUrl = "";
+  if (JENKINS_BUILD) {
+    projectUrl = infra.ssh || infra.url;
+  } else {
+    projectUrl = infra.http || infra.url;
+  }
+  if (!projectUrl || !appKey) {
     printErrorAndExit("Please check the infra and appKey in package.json.");
   }
-  const args = yParser(process.argv.slice(2));
-  const JENKINS_BUILD = args.jenkinsBuild || args.JENKINSBUILD || args.jenkins_build || args.JENKINS_BUILD;
   const APP_ENV = args.env || args.ENV || "";
   const ASG_BRANCH = args.asg_branch || args.ASG_BRANCH || "";
   let RESOURCE_URL = "";
   let SUB_APP = "";
   let archStr = "unknown";
-  if (infra.url.includes("teams-pro")) {
+  if (projectUrl.includes("teams-pro")) {
     archStr = "PRO";
-  } else if (infra.url.includes("teams-max")) {
+  } else if (projectUrl.includes("teams-max")) {
     archStr = "MAX";
     RESOURCE_URL = args.versionUrl || args.RESOURCE_URL || "";
     SUB_APP = args.subApp || args.SUB_APP || "";
   }
   return {
     appKey,
+    subAppKey,
     infra: {
-      url: infra.url,
+      url: projectUrl,
       arch: archStr
     },
     ASG_DIR: asgDir,
@@ -167,13 +179,22 @@ async function fetchRemoteRepository() {
     return;
   } else {
     if (!JENKINS_BUILD) {
-      const { syncUp } = await inquirer.prompt([
-        {
-          type: "confirm",
-          name: "syncUp",
-          message: "\u540C\u6B65\u8FDC\u7AEF\u4ED3\u5E93",
-          default: "Y"
-        }
+      let timer;
+      const { syncUp } = await Promise.race([
+        inquirer.prompt([
+          {
+            type: "confirm",
+            name: "syncUp",
+            message: "\u540C\u6B65\u8FDC\u7AEF\u4ED3\u5E93(5s\u540E\u8DF3\u8FC7\u540C\u6B65)",
+            default: "Y"
+          }
+        ]).then((answer) => {
+          timer && clearTimeout(timer);
+          return answer;
+        }),
+        new Promise((resolve) => {
+          timer = setTimeout(() => resolve({ syncUp: false }), 5e3);
+        })
       ]);
       if (!syncUp)
         return;

package/package.json

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