[fix] need to always regen xarc options if called by user (#1761)

packages/xarc-app-dev/src/config/archetype.ts

@@ -14,54 +14,62 @@ let cachedArchetype = null;
  * @param user - user options
  * @returns options - final options with defaults and env applied
  */
-module.exports = function getDevOptions(user: XarcOptions = {}) {
-  //checking for cwd from xclap or from env
-  const cwd = user.cwd || process.env.XARC_CWD || process.cwd();
-  process.env.XARC_CWD = cwd;
-
-  if (cachedArchetype) {
-    // if cached is already runnig
+module.exports = function getDevOptions(userOptions: XarcOptions = null) {
+  if (!userOptions && cachedArchetype) {
+    // if cached is already running
     cachedArchetype._fromCache = true;
     // maintained for backwards compatibility
     return cachedArchetype;
   }
 
   // first get legacy configs
   const legacy = getDevArchetypeLegacy();
+
   // try to read xarc-options.json if it exist and merge it into legacy
-  const xarcOptions = {
-    ...loadXarcOptions(cwd, false),
-    // don't want these from saved options because the calculated ones in
-    // legacy is most up to date.  otherwise an outdated saved options
-    // will break everything if dependencies were updated
-    dir: undefined,
-    devDir: undefined,
-    config: undefined,
-    cwd: undefined // we know what this is already
-  };
+  const xarcOptions = userOptions
+    ? {}
+    : {
+        ...loadXarcOptions(process.env.XARC_CWD || process.cwd(), false),
+        // don't want these from saved options because the calculated ones in
+        // legacy is most up to date.  otherwise an outdated saved options
+        // will break everything if dependencies were updated
+        dir: undefined,
+        devDir: undefined,
+        config: undefined,
+        cwd: undefined // we know what this is already
+      };
+
+  userOptions = _.merge({}, xarcOptions, userOptions);
+
+  //checking for cwd from xclap or from env
+  const cwd = userOptions.cwd || process.env.XARC_CWD || process.cwd();
+  process.env.XARC_CWD = cwd;
 
-  user = _.merge({}, xarcOptions, user);
   const proxy = getEnvProxy();
 
   // proxy config was not set in legacy, so add to top level here
   _.merge(legacy, proxy);
 
   // merge user.webpackOptions into legacy.webpack
-  _.merge(legacy.webpack, user.webpackOptions);
+  _.merge(legacy.webpack, userOptions.webpackOptions);
   // merge user.babelOptions into legacy.babel
-  _.merge(legacy.babel, user.babelOptions);
+  _.merge(legacy.babel, userOptions.babelOptions);
   // merge user.addOnFeatures into legacy.options
-  _.merge(legacy.options, user.addOnFeatures);
+  _.merge(legacy.options, userOptions.addOnFeatures);
   // merge the rest into top level
   _.merge(legacy, {
-    ...user,
+    ...userOptions,
     cwd,
     webpackOptions: undefined,
     babelOptions: undefined,
     addOnFeatures: undefined
   });
 
-  saveXarcOptions(legacy);
+  // if user's options exist, it means this is invoked by user passing in options
+  // the first time, so save it.
+  if (userOptions) {
+    saveXarcOptions(legacy);
+  }
 
   cachedArchetype = legacy;
 

packages/xarc-app-dev/src/config/env-app.ts

@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 export {};
 
-let cachedEnvApp = null;
-
 module.exports = function getAppEnv() {
   const xenvConfig = require("xenv-config");
   const { merge } = require("lodash");
@@ -17,6 +15,6 @@ module.exports = function getAppEnv() {
       post: x => x || 0
     }
   };
-  cachedEnvApp = cachedEnvApp || xenvConfig(appConfigSpec, {}, { merge });
-  return cachedEnvApp;
+
+  return xenvConfig(appConfigSpec, {}, { merge });
 };

packages/xarc-app-dev/src/config/env-babel.ts

@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 export {};
 
-let cachedEnvBabel = null;
-
 module.exports = function getEnvBabel() {
   const xenvConfig = require("xenv-config");
   const { merge } = require("lodash");
@@ -42,6 +40,6 @@ module.exports = function getEnvBabel() {
       default: {}
     }
   };
-  cachedEnvBabel = cachedEnvBabel || xenvConfig(babelConfigSpec, userConfig.babel, { merge });
-  return cachedEnvBabel;
+
+  return xenvConfig(babelConfigSpec, userConfig.babel, { merge });
 };

packages/xarc-app-dev/src/config/env-karma.ts

@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 export {};
 
-let cachedEnvKarma = null;
-
 module.exports = function getEnvKarma() {
   const xenvConfig = require("xenv-config");
   const { merge } = require("lodash");
@@ -11,6 +9,5 @@ module.exports = function getEnvKarma() {
   const karmaConfigSpec = {
     browser: { env: "KARMA_BROWSER", default: "chrome" }
   };
-  cachedEnvKarma = cachedEnvKarma || xenvConfig(karmaConfigSpec, userConfig.karma, { merge });
-  return cachedEnvKarma;
+  return xenvConfig(karmaConfigSpec, userConfig.karma, { merge });
 };

packages/xarc-app-dev/src/config/env-proxy.ts

@@ -3,8 +3,6 @@ export {};
 
 const { merge } = require("lodash");
 
-let cachedEnvProxy = null;
-
 module.exports = function getEnvProxy() {
   const xenvConfig = require("xenv-config");
 
@@ -21,6 +19,5 @@ module.exports = function getEnvProxy() {
     },
     elevated: { env: ["ELECTRODE_DEV_ELEVATED"], default: false }
   };
-  cachedEnvProxy = cachedEnvProxy || xenvConfig(proxyConfigSpec, {}, { merge });
-  return cachedEnvProxy;
+  return xenvConfig(proxyConfigSpec, {}, { merge });
 };

packages/xarc-app-dev/src/config/env-webpack.ts

@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 export {};
 
-let cachedWebpackConfig = null;
-
 module.exports = function getEnvWebpack() {
   const xenvConfig = require("xenv-config");
   const userConfig = require("./user-config")();
@@ -50,7 +48,6 @@ module.exports = function getEnvWebpack() {
     loadDlls: { env: "ELECTRODE_LOAD_DLLS", type: "json", default: {} },
     minify: { env: "WEBPACK_MINIFY", default: true }
   };
-  cachedWebpackConfig =
-    cachedWebpackConfig || xenvConfig(webpackConfigSpec, userConfig.webpack, { merge });
-  return cachedWebpackConfig;
+
+  return xenvConfig(webpackConfigSpec, userConfig.webpack, { merge });
 };

packages/xarc-app-dev/src/config/get-dev-proxy.ts

@@ -4,15 +4,8 @@ export {};
 const Path = require("path");
 const Fs = require("fs");
 
-let cachedProxy = null;
-import { loadXarcOptions } from "../lib/utils";
-
 module.exports = function createDevProxy() {
-  const xarcOptions = loadXarcOptions();
-  const xarcCwd = xarcOptions.cwd;
-  if (cachedProxy) {
-    return cachedProxy;
-  }
+  const xarcCwd = process.env.XARC_CWD || process.cwd();
 
   const envWebpack = require("./env-webpack")();
   const envApp = require("./env-app")();
@@ -131,7 +124,7 @@ module.exports = function createDevProxy() {
     reporter: `${devPath}/reporter`
   };
 
-  cachedProxy = cachedProxy || {
+  return {
     settings,
     devServer: useDevProxy
       ? // when using dev proxy, all routes and assets are unified at the same protocol/host/port
@@ -147,6 +140,4 @@ module.exports = function createDevProxy() {
     controlPaths,
     searchSSLCerts
   };
-
-  return cachedProxy;
 };