@teams-max/mwsp 2.0.2 → 2.0.4

package/es/cli/build.js

@@ -73,7 +73,7 @@ function _build() {
           env.MAX_SUB_APP = MAX_SUB_APP;
           env.RESOURCE_URL = RESOURCE_URL;
           _context.next = 32;
-          return exec('MAX', ['build'], {
+          return exec('max', ['build'], {
             env: env
           });
         case 32:

package/es/utils/defineConfig.js

@@ -6,15 +6,17 @@ var _require = require("./index"),
 function defineConfig(config) {
   var cfg = getCfg();
   var ASG_DIR = cfg.ASG_DIR;
-  var env = Object.create(process.env);
-  env.ASG_DIR = 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');
+  }
+  if (!nextAsgEnv) {
     logStep('The Asgard directory does not exist, using default config...');
     return config;
   }
   var iConfigFromPlugins = null;
   try {
-    iConfigFromPlugins = require(path.join(process.env.ASG_DIR, 'base', 'pluginConfig.js'));
+    iConfigFromPlugins = require(path.join(nextAsgEnv, 'base', 'pluginConfig.js'));
   } catch (error) {
     printErrorAndExit('The Asgard directory does not exist.', "Reason: ".concat(error.message));
     return;

package/es/utils/index.js

@@ -62,7 +62,7 @@ function getCfg() {
   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_BRAHCH = args.asg_branch || args.ASG_BRAHCH || '';
+  var ASG_BRANCH = args.asg_branch || args.ASG_BRANCH || '';
   var RESOURCE_URL = '';
   var SUB_APP = '';
   var archStr = 'unknown';
@@ -81,7 +81,7 @@ function getCfg() {
     },
     ASG_DIR: asgDir,
     JENKINS_BUILD: JENKINS_BUILD,
-    ASG_BRAHCH: ASG_BRAHCH,
+    ASG_BRANCH: ASG_BRANCH,
     APP_ENV: APP_ENV,
     RESOURCE_URL: RESOURCE_URL,
     SUB_APP: SUB_APP
@@ -108,12 +108,12 @@ function fetchRemoteRepository() {
 }
 function _fetchRemoteRepository() {
   _fetchRemoteRepository = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var cfg, infra, directory, ASG_BRAHCH, JENKINS_BUILD, remoteUrl, doesExist, proDevDeps, proDeps, maxDevDeps, maxDeps, _yield$inquirer$promp, syncUp, infraBranchsOutput, infraBranchArray, filteredBranches, defaultBrancheIdx, questions;
+    var cfg, infra, directory, ASG_BRANCH, JENKINS_BUILD, remoteUrl, doesExist, proDevDeps, proDeps, maxDevDeps, maxDeps, _yield$inquirer$promp, syncUp, infraBranchsOutput, infraBranchArray, filteredBranches, defaultBrancheIdx, questions;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           cfg = getCfg();
-          infra = cfg.infra, directory = cfg.ASG_DIR, ASG_BRAHCH = cfg.ASG_BRAHCH, JENKINS_BUILD = cfg.JENKINS_BUILD;
+          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) {
@@ -175,7 +175,7 @@ function _fetchRemoteRepository() {
           _context.next = 48;
           break;
         case 36:
-          if (!(JENKINS_BUILD && !ASG_BRAHCH)) {
+          if (!(JENKINS_BUILD && !ASG_BRANCH)) {
             _context.next = 41;
             break;
           }
@@ -202,7 +202,7 @@ function _fetchRemoteRepository() {
           }
           return _context.abrupt("return");
         case 48:
-          if (!(!doesExist && JENKINS_BUILD && !ASG_BRAHCH)) {
+          if (!(!doesExist && JENKINS_BUILD && !ASG_BRANCH)) {
             _context.next = 51;
             break;
           }
@@ -213,12 +213,12 @@ function _fetchRemoteRepository() {
           process.chdir(directory);
           _context.prev = 53;
           execa.sync('git', ['fetch', 'origin', '--prune']);
-          if (!(JENKINS_BUILD && ASG_BRAHCH)) {
+          if (!(JENKINS_BUILD && ASG_BRANCH)) {
             _context.next = 60;
             break;
           }
-          execa.sync('git', ['checkout', ASG_BRAHCH]);
-          logStep("Anto switched to branch:", ASG_BRAHCH);
+          execa.sync('git', ['checkout', ASG_BRANCH]);
+          logStep("Anto switched to branch:", ASG_BRANCH);
           _context.next = 70;
           break;
         case 60:

package/lib/cli/build.js

@@ -71,7 +71,7 @@ async function build() {
     env.MAX_APP_KEY = appKey;
     env.MAX_SUB_APP = MAX_SUB_APP;
     env.RESOURCE_URL = RESOURCE_URL;
-    await exec("MAX", ["build"], {
+    await exec("max", ["build"], {
       env
     });
   }

package/lib/utils/defineConfig.js

@@ -4,16 +4,18 @@ var { logStep, printErrorAndExit, getCfg } = require("./index");
 function defineConfig(config) {
   const cfg = getCfg();
   const { ASG_DIR } = cfg;
-  const env = Object.create(process.env);
-  env.ASG_DIR = ASG_DIR;
+  const nextAsgEnv = process.env.ASG_DIR || ASG_DIR;
   if (!process.env.ASG_DIR) {
+    logStep("Process ASG_DIR not set, and use scoped environment");
+  }
+  if (!nextAsgEnv) {
     logStep("The Asgard directory does not exist, using default config...");
     return config;
   }
   let iConfigFromPlugins = null;
   try {
     iConfigFromPlugins = require(path.join(
-      process.env.ASG_DIR,
+      nextAsgEnv,
       "base",
       "pluginConfig.js"
     ));

package/lib/utils/index.js

@@ -41,7 +41,7 @@ function getCfg() {
   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_BRAHCH = args.asg_branch || args.ASG_BRAHCH || "";
+  const ASG_BRANCH = args.asg_branch || args.ASG_BRANCH || "";
   let RESOURCE_URL = "";
   let SUB_APP = "";
   let archStr = "unknown";
@@ -60,7 +60,7 @@ function getCfg() {
     },
     ASG_DIR: asgDir,
     JENKINS_BUILD,
-    ASG_BRAHCH,
+    ASG_BRANCH,
     APP_ENV,
     RESOURCE_URL,
     SUB_APP
@@ -80,7 +80,7 @@ function checkDirectoryExistsSync(dirPath) {
 }
 async function fetchRemoteRepository() {
   const cfg = getCfg();
-  const { infra, ASG_DIR: directory, ASG_BRAHCH, JENKINS_BUILD } = cfg;
+  const { infra, ASG_DIR: directory, ASG_BRANCH, JENKINS_BUILD } = cfg;
   const remoteUrl = infra.url;
   const doesExist = checkDirectoryExistsSync(directory);
   if (!doesExist) {
@@ -112,7 +112,7 @@ async function fetchRemoteRepository() {
       !!maxDeps.length && await exec("pnpm", ["add", ...maxDeps]);
     }
     logStep("Installation completed.");
-  } else if (JENKINS_BUILD && !ASG_BRAHCH) {
+  } else if (JENKINS_BUILD && !ASG_BRANCH) {
     logStep("Jenkins build detected. Skipping sync up.");
     return;
   } else {
@@ -129,7 +129,7 @@ async function fetchRemoteRepository() {
         return;
     }
   }
-  if (!doesExist && JENKINS_BUILD && !ASG_BRAHCH) {
+  if (!doesExist && JENKINS_BUILD && !ASG_BRANCH) {
     printErrorAndExit(
       "Jenkins build detected. The branch parameter is missing!"
     );
@@ -139,9 +139,9 @@ async function fetchRemoteRepository() {
   process.chdir(directory);
   try {
     execa.sync("git", ["fetch", "origin", "--prune"]);
-    if (JENKINS_BUILD && ASG_BRAHCH) {
-      execa.sync("git", ["checkout", ASG_BRAHCH]);
-      logStep(`Anto switched to branch:`, ASG_BRAHCH);
+    if (JENKINS_BUILD && ASG_BRANCH) {
+      execa.sync("git", ["checkout", ASG_BRANCH]);
+      logStep(`Anto switched to branch:`, ASG_BRANCH);
     } else {
       const infraBranchsOutput = execa.sync("git", ["branch", "-r"]).stdout;
       const infraBranchArray = infraBranchsOutput.trim().split("\n");

package/package.json

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