@xarc/app-dev 10.0.8 → 10.0.12

package/lib/utils.js

@@ -3,15 +3,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDevAdminPortFromEnv = exports.isValidPort = exports.detectCSSModule = exports.saveXarcOptions = exports.loadXarcOptions = exports.jsonParser = exports.jsonStringifier = exports.createGitIgnoreDir = exports.getMyPkg = exports.checkUserBabelRc = exports.formUrl = exports.getOptArchetypeRequire = void 0;
 const tslib_1 = require("tslib");
-const read_pkg_up_1 = tslib_1.__importDefault(require("read-pkg-up"));
-const pkg_up_1 = tslib_1.__importDefault(require("pkg-up"));
-const mkdirp_1 = tslib_1.__importDefault(require("mkdirp"));
+const read_pkg_up_1 = (0, tslib_1.__importDefault)(require("read-pkg-up"));
+const pkg_up_1 = (0, tslib_1.__importDefault)(require("pkg-up"));
+const mkdirp_1 = (0, tslib_1.__importDefault)(require("mkdirp"));
 const logger_1 = require("./logger");
-const chalker_1 = tslib_1.__importDefault(require("chalker"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
-const url_1 = tslib_1.__importDefault(require("url"));
+const chalker_1 = (0, tslib_1.__importDefault)(require("chalker"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
+const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const url_1 = (0, tslib_1.__importDefault)(require("url"));
+const optional_require_1 = require("optional-require");
 exports.getOptArchetypeRequire = require("@xarc/webpack/lib/util/get-opt-require"); // eslint-disable-line
 /**
  * Form a url string from URL object
@@ -24,7 +25,7 @@ exports.getOptArchetypeRequire = require("@xarc/webpack/lib/util/get-opt-require
  *
  * @returns url string
  */
-const formUrl = ({ protocol = "http", host = "", port = "", path = "", search = "" }) => {
+const formUrl = ({ protocol = "http", host = "", port = "", path = "", search = "", }) => {
     const proto = protocol.toString().toLowerCase();
     const sp = port.toString();
     const host2 = host && port && !(sp === "80" && proto === "http") && !(sp === "443" && proto === "https")
@@ -141,25 +142,25 @@ function loadXarcOptions(dir = process.env.XARC_CWD || process.cwd(), showError
         return (cachedXarcOptions = JSON.parse(data, exports.jsonParser));
     }
     catch (err) {
-        // eslint-disable-next-line
+        const runner = (0, optional_require_1.optionalRequire)("@xarc/run") ? "xrun" : "clap";
         if (showError) {
-            console.error(chalker_1.default `
-<red>ERROR</>: Electrode xarc fail to load <cyan>.etmp/xarc-options.json</> in
-dev mode.  This means you are trying to use something not through
-xarc's development tasks.
+            // eslint-disable-next-line
+            console.error((0, chalker_1.default) `
+<red>ERROR</>: Electrode xarc fail to load <cyan>.etmp/xarc-options.json</> in dev mode.
 
 full path: ${filename}
 
-Please run "clap setup-dev" once to initialize the file
-<cyan>.etmp/xarc-options.json</> before doing your thing that loads
-xarc's development code.
+CAUSE: This means you are loading xarc's development code directly instead of through its task runner.
+
+<green>SOLUTION: Please run "${runner} setup-dev" once to initialize the file <cyan>.etmp/xarc-options.json</>
+    before loading xarc's development code.</>
 `);
             console.error(err.stack); // eslint-disable-line
         }
         return (cachedXarcOptions = {
             webpack: {},
             babel: {},
-            options: {}
+            options: {},
         });
     }
 }
@@ -233,7 +234,7 @@ function getDevAdminPortFromEnv(fallback) {
     const fromEnv = parseInt(process.env.XARC_ADMIN_PORT ||
         // deprecated but still check
         process.env.ELECTRODE_ADMIN_PORT);
-    return [fromEnv, fallback, 0].find(x => exports.isValidPort(x));
+    return [fromEnv, fallback, 0].find((x) => (0, exports.isValidPort)(x));
 }
 exports.getDevAdminPortFromEnv = getDevAdminPortFromEnv;
 //# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/lib/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/lib/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xarc/app-dev",
-  "version": "10.0.8",
+  "version": "10.0.12",
   "description": "Electrode X application development support",
   "main": "lib/index.js",
   "homepage": "http://www.electrode.io",
@@ -39,7 +39,7 @@
     "Joel Chen <xchen@walmartlabs.com>"
   ],
   "peerDependencies": {
-    "@xarc/app": "^10.0.8"
+    "@xarc/app": "^10.0.12"
   },
   "dependencies": {
     "@babel/cli": "^7.1.5",
@@ -57,8 +57,8 @@
     "@jchip/redbird": "^1.2.2",
     "@xarc/dev-base": "^0.1.0",
     "@xarc/run": "^1.0.5",
-    "@xarc/subapp": "^0.3.0",
-    "@xarc/webpack": "^11.0.5",
+    "@xarc/subapp": "^0.3.2",
+    "@xarc/webpack": "^11.0.9",
     "ansi-to-html": "^0.6.8",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-minify-dead-code-elimination": "^0.5.0",
@@ -81,7 +81,7 @@
     "mkdirp": "^1.0.4",
     "nix-clap": "^1.3.12",
     "nyc": "^15.1.0",
-    "optional-require": "^1.0.2",
+    "optional-require": "^1.1.6",
     "pkg-up": "^3.1.0",
     "prompts": "^2.3.2",
     "ps-get": "^1.1.0",
@@ -91,7 +91,7 @@
     "require-at": "^1.0.6",
     "semver": "^7.3.2",
     "serve-index-fs": "^1.10.1",
-    "subapp-util": "^1.1.2",
+    "subapp-util": "^1.1.3",
     "sudo-prompt": "^8.2.5",
     "tslib": "^2.1.0",
     "visual-logger": "^1.1.3",
@@ -111,7 +111,7 @@
     "@types/sinon-chai": "^3.2.5",
     "@typescript-eslint/eslint-plugin": "^4.11.0",
     "@typescript-eslint/parser": "^4.11.0",
-    "@xarc/app": "^10.0.8",
+    "@xarc/app": "^10.0.12",
     "@xarc/module-dev": "^3.0.2",
     "@xarc/run": "^1.0.4",
     "babel-eslint": "^10.1.0",

package/scripts/l10n/flatten-messages.js

@@ -41,7 +41,7 @@ function readFileAsJSON(filePath) {
 async function getAllDefaultMessages(messageFilesPathPattern) {
   const fileJsons = await xaa.map(await getFilePaths(messageFilesPathPattern), readFileAsJSON);
   return fileJsons.reduce((previousValue, defaultMessageDescriptors) => {
-    defaultMessageDescriptors.forEach(descriptor => {
+    defaultMessageDescriptors.forEach((descriptor) => {
       previousValue[descriptor.id] = descriptor;
     });
     return previousValue;
@@ -59,7 +59,7 @@ function flattenMessagesL10n() {
     .then(() => {
       if (isMain) process.exit(0);
     })
-    .catch(err => {
+    .catch((err) => {
       console.log("flatten messages failed", err);
       if (isMain) process.exit(1);
     });

package/scripts/map-isomorphic-cdn.js

@@ -29,7 +29,7 @@ function mapIsomorphicCdn(appDir) {
 
   if (paths.length > 1) {
     logger.error("CDN upload files has different base paths");
-    paths.forEach(p => {
+    paths.forEach((p) => {
       logger.info(` - "${p}"`);
     });
     exit(1);

package/scripts/merge-isomorphic-assets.js

@@ -12,8 +12,8 @@ function mergeIsomorphicAssets() {
   const filenames = filterScanDir.sync({
     dir: process.cwd(),
     includeRoot: true,
-    filterDir: dir => ["dist", "dll"].indexOf(dir) >= 0,
-    filter: (f, p, e) => e.noExt === "isomorphic-assets"
+    filterDir: (dir) => ["dist", "dll"].indexOf(dir) >= 0,
+    filter: (f, p, e) => e.noExt === "isomorphic-assets",
   });
 
   if (filenames.length > 1) {

package/src/config/babel/babelrc-client.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires, no-console, @typescript-eslint/ban-ts-comment */
 
-import makeOptionalRequire from "optional-require";
+import { makeOptionalRequire } from "optional-require";
 import { getPluginFrom, loadXarcOptions } from "./common";
 import _ from "lodash";
 
@@ -18,7 +18,7 @@ const {
   looseClassProps,
   hasMultiTargets,
   target: babelTarget,
-  envTargets = {}
+  envTargets = {},
 } = _.get(xOptions, "babel", {});
 
 const addFlowPlugin = Boolean(enableFlow && optFlow);
@@ -30,17 +30,17 @@ const basePlugins = [
     {
       compiler: {
         promises: true,
-        generators: false
+        generators: false,
       },
       runtimePattern: null,
-      useRuntimeModule: true
-    }
+      useRuntimeModule: true,
+    },
   ],
   // allow decorators on class and method
   // Note: This must go before @babel/plugin-proposal-class-properties
   (enableTypeScript || proposalDecorators) && [
     "@babel/plugin-proposal-decorators",
-    { legacy: legacyDecorators, ...proposalDecorators }
+    { legacy: legacyDecorators, ...proposalDecorators },
   ],
   //
   // allow class properties. loose option compile to assignment expression instead
@@ -49,7 +49,7 @@ const basePlugins = [
   //
   (enableTypeScript || transformClassProps) && [
     "@babel/plugin-proposal-class-properties",
-    { loose: looseClassProps, ...transformClassProps }
+    { loose: looseClassProps, ...transformClassProps },
   ],
   //
   // i18n has not been used at all and these are very outdated
@@ -73,8 +73,8 @@ const basePlugins = [
   "@babel/plugin-transform-runtime",
   addFlowPlugin && [
     "@babel/plugin-transform-flow-strip-types",
-    { requireDirective: flowRequireDirective, ...enableFlow }
-  ]
+    { requireDirective: flowRequireDirective, ...enableFlow },
+  ],
 ];
 
 const { BABEL_ENV, NODE_ENV, ENABLE_KARMA_COV } = process.env;
@@ -92,9 +92,9 @@ const plugins = basePlugins.concat(
     [
       "babel-plugin-transform-react-remove-prop-types",
       {
-        removeImport: true
-      }
-    ]
+        removeImport: true,
+      },
+    ],
   ],
   // css module support
   enableCssModule && [
@@ -106,20 +106,20 @@ const plugins = basePlugins.concat(
         filetypes: {
           ".scss": {
             syntax: "postcss-scss",
-            plugins: ["postcss-nested"]
+            plugins: ["postcss-nested"],
           },
           ".styl": {
-            syntax: "sugarss"
+            syntax: "sugarss",
           },
           ".less": {
-            syntax: "postcss-less"
-          }
-        }
-      }
-    ]
+            syntax: "postcss-less",
+          },
+        },
+      },
+    ],
   ],
   enableKarmaCov && [
-    getPluginFrom(["@xarc/opt-karma", "electrode-archetype-opt-karma"], "babel-plugin-istanbul")
+    getPluginFrom(["@xarc/opt-karma", "electrode-archetype-opt-karma"], "babel-plugin-istanbul"),
   ]
 );
 
@@ -149,14 +149,14 @@ const presets = [
       modules: "auto",
       loose: true,
       targets,
-      ...useBuiltIns
-    }
+      ...useBuiltIns,
+    },
   ],
   enableTypeScript && "@babel/preset-typescript",
-  "@babel/preset-react"
+  "@babel/preset-react",
 ];
 
 export = {
-  presets: presets.filter(x => x),
-  plugins: plugins.filter(x => x)
+  presets: presets.filter((x) => x),
+  plugins: plugins.filter((x) => x),
 };

package/src/config/babel/babelrc.ts

@@ -6,7 +6,7 @@
  * and this file will set preset-env targets accordingly.
  */
 import ck from "chalker";
-import makeOptionalRequire from "optional-require";
+import { makeOptionalRequire } from "optional-require";
 import _ from "lodash";
 import { getPluginFrom, loadXarcOptions, detectCSSModule } from "./common";
 
@@ -28,7 +28,7 @@ const {
   looseClassProps,
   hasMultiTargets,
   target: babelTarget,
-  envTargets = {}
+  envTargets = {},
 } = _.get(xOptions, "babel", {});
 
 const addFlowPlugin = Boolean(enableFlow && optFlow);
@@ -72,17 +72,17 @@ const getReactCssModulePlugin = (): any => {
         filetypes: {
           ".scss": {
             syntax: "postcss-scss",
-            plugins: ["postcss-nested"]
+            plugins: ["postcss-nested"],
           },
           ".styl": {
-            syntax: "sugarss"
+            syntax: "sugarss",
           },
           ".less": {
-            syntax: "postcss-less"
-          }
-        }
-      }
-    ]
+            syntax: "postcss-less",
+          },
+        },
+      },
+    ],
   ];
 };
 
@@ -94,17 +94,17 @@ const basePlugins = [
     {
       compiler: {
         promises: true,
-        generators: false
+        generators: false,
       },
       runtimePattern: null,
-      useRuntimeModule: true
-    }
+      useRuntimeModule: true,
+    },
   ],
   // allow decorators on class and method
   // Note: This must go before @babel/plugin-proposal-class-properties
   (enableTypeScript || proposalDecorators) && [
     "@babel/plugin-proposal-decorators",
-    { legacy: legacyDecorators, ...proposalDecorators }
+    { legacy: legacyDecorators, ...proposalDecorators },
   ],
   //
   // allow class properties. loose option compile to assignment expression instead
@@ -113,7 +113,7 @@ const basePlugins = [
   //
   (enableTypeScript || transformClassProps) && [
     "@babel/plugin-proposal-class-properties",
-    { loose: looseClassProps, ...transformClassProps }
+    { loose: looseClassProps, ...transformClassProps },
   ],
   //
   // i18n has not been used at all and these are very outdated
@@ -137,8 +137,8 @@ const basePlugins = [
   "@babel/plugin-transform-runtime",
   addFlowPlugin && [
     "@babel/plugin-transform-flow-strip-types",
-    { requireDirective: flowRequireDirective, ...enableFlow }
-  ]
+    { requireDirective: flowRequireDirective, ...enableFlow },
+  ],
 ];
 
 // @ts-ignore
@@ -150,16 +150,16 @@ const plugins = basePlugins.concat(
       [
         "babel-plugin-transform-react-remove-prop-types",
         {
-          removeImport: true
-        }
-      ]
+          removeImport: true,
+        },
+      ],
     ],
   // css module support
   // Note: this is needed for server side (node.js) also.
   getReactCssModulePlugin(),
   !isNodeTarget &&
     enableKarmaCov && [
-      getPluginFrom(["@xarc/opt-karma", "electrode-archetype-opt-karma"], "babel-plugin-istanbul")
+      getPluginFrom(["@xarc/opt-karma", "electrode-archetype-opt-karma"], "babel-plugin-istanbul"),
     ]
 );
 
@@ -177,7 +177,7 @@ const useBuiltIns =
   !isNodeTarget && hasMultiTargets
     ? {
         useBuiltIns: "entry",
-        corejs: require("core-js/package.json").version.split(".")[0] // eslint-disable-line
+        corejs: require("core-js/package.json").version.split(".")[0], // eslint-disable-line
       }
     : {};
 
@@ -204,14 +204,14 @@ const presets = [
       modules: "auto",
       loose: true,
       targets,
-      ...useBuiltIns
-    }
+      ...useBuiltIns,
+    },
   ],
   enableTypeScript && "@babel/preset-typescript",
-  "@babel/preset-react"
+  "@babel/preset-react",
 ];
 
 export = {
-  presets: presets.filter(x => x),
-  plugins: plugins.filter(x => x)
+  presets: presets.filter((x) => x),
+  plugins: plugins.filter((x) => x),
 };

package/src/config/jest/__mocks__/framework-mock.ts

@@ -1,11 +1,11 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 
-import makeOptionalRequire from "optional-require";
+import { makeOptionalRequire } from "optional-require";
 
 const optionalRequire = makeOptionalRequire(require);
 
-const Enzyme = optionalRequire("enzyme");
-const EnzymeAdapter = optionalRequire("enzyme-adapter-react-16");
+const Enzyme: any = optionalRequire("enzyme");
+const EnzymeAdapter: any = optionalRequire("enzyme-adapter-react-16");
 
 if (Enzyme && EnzymeAdapter) {
   // Setup enzyme's react adapter

package/src/config/karma/entry-xarc.js

@@ -52,7 +52,7 @@ chai.use(chaiShallowly);
 // Mocha (part of static include).
 window.mocha.setup({
   ui: "bdd",
-  bail: false
+  bail: false,
 });
 
 // --------------------------------------------------------------------------

package/src/config/karma/entry.js

@@ -52,7 +52,7 @@ chai.use(chaiShallowly);
 // Mocha (part of static include).
 window.mocha.setup({
   ui: "bdd",
-  bail: false
+  bail: false,
 });
 
 // --------------------------------------------------------------------------

package/src/config/karma/util/load-user-config.ts

@@ -1,4 +1,4 @@
-import makeOptionalRequire from "optional-require";
+import { makeOptionalRequire } from "optional-require";
 
 import Path from "path";
 import _ from "lodash";
@@ -13,7 +13,7 @@ const optionalRequire = makeOptionalRequire(require);
  */
 export function loadUserConfig(filename, config, settings) {
   const filePath = Path.resolve("archetype/config/karma", filename);
-  const userConfig = optionalRequire(filePath);
+  const userConfig: any = optionalRequire(filePath);
 
   if (userConfig) {
     assert(_.isFunction(userConfig), `${filePath} must export a function`);

package/src/config/mocha/setup.ts

@@ -1,4 +1,4 @@
-import makeOptionalRequire from "optional-require";
+import { makeOptionalRequire } from "optional-require";
 const optionalRequire = makeOptionalRequire(require);
 
 const Enzyme = optionalRequire("enzyme");
@@ -14,7 +14,7 @@ const chai = optionalRequire("chai");
  * @param addons
  */
 function chaiUse(addons) {
-  [].concat(addons).forEach(x => {
+  [].concat(addons).forEach((x) => {
     const AddonMod = x && optionalRequire(x);
     if (AddonMod) {
       chai.use(AddonMod);

package/src/config/options.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires, max-statements */
 
 import Path from "path";
-import makeOptionalRequire from "optional-require";
+import { makeOptionalRequire } from "optional-require";
 import * as utils from "../lib/utils"; // really import ESM into single var utils
 import _ from "lodash";
 import xenvConfig from "xenv-config";
@@ -20,7 +20,7 @@ const optionalRequire = makeOptionalRequire(require);
  */
 export function checkOptArchetypeInAppDep(dependencies, isDev = undefined) {
   const options = dependencies
-    .filter(x => x.startsWith("electrode-archetype-opt-") || x.startsWith("@xarc/opt-"))
+    .filter((x) => x.startsWith("electrode-archetype-opt-") || x.startsWith("@xarc/opt-"))
     .reduce((acc, name) => {
       //
       // In dev mode, when all dev deps are installed, we can safely load
@@ -41,7 +41,7 @@ export function checkOptArchetypeInAppDep(dependencies, isDev = undefined) {
           if (process.env._ELECTRODE_DEV_ || (process.env.NODE_ENV === "production" && !isDev)) {
             throw err;
           }
-        }
+        },
       });
 
       if (optPkg) {
@@ -64,7 +64,7 @@ export const getUserConfigOptions = (packageNames, devPackageNames) => {
     // Check for any optional archetype in application's devDependencies or dependencies
     //
     ...checkOptArchetypeInAppDep(devPackageNames, true).options,
-    ...checkOptArchetypeInAppDep(packageNames).options
+    ...checkOptArchetypeInAppDep(packageNames).options,
   };
 };
 
@@ -81,7 +81,7 @@ export function getDefaultArchetypeOptions() {
   //
   const appPkg = optionalRequire(Path.resolve("package.json")) || {
     dependencies: {},
-    devDependencies: {}
+    devDependencies: {},
   };
   const packageNames = Object.keys(appPkg.dependencies);
   const devPackageNames = Object.keys(appPkg.devDependencies);
@@ -96,7 +96,7 @@ export function getDefaultArchetypeOptions() {
     eTmpDir: ETMP_DIR,
     prodModulesDir: Path.join(PROD_DIR, "modules"),
     checkUserBabelRc: utils.checkUserBabelRc,
-    devArchetypeName: "@xarc/app-dev"
+    devArchetypeName: "@xarc/app-dev",
   };
 }
 
@@ -135,21 +135,21 @@ export function getDevArchetypeLegacy() {
       mocha: `${configDir}/mocha`,
       webpack: `${configDir}/webpack`,
       jest: `${configDir}/jest`,
-      ...userConfig.configPaths
+      ...userConfig.configPaths,
     },
     prodDir: PROD_DIR,
     eTmpDir: ETMP_DIR,
-    AppMode: makeAppMode(PROD_DIR, userConfig.reactLib)
+    AppMode: makeAppMode(PROD_DIR, userConfig.reactLib),
   };
 
   const topConfigSpec = {
-    devOpenBrowser: { env: "ELECTRODE_DEV_OPEN_BROWSER", default: false }
+    devOpenBrowser: { env: "ELECTRODE_DEV_OPEN_BROWSER", default: false },
   };
 
   const typeScriptOption =
     userConfig.typescript === false
       ? {
-          babel: { enableTypeScript: userConfig.typescript }
+          babel: { enableTypeScript: userConfig.typescript },
         }
       : {};
 
@@ -159,9 +159,7 @@ export function getDevArchetypeLegacy() {
   );
 
   archetypeConfig.babel.hasMultiTargets =
-    Object.keys(archetypeConfig.babel.envTargets)
-      .sort()
-      .join(",") !== "default,node";
+    Object.keys(archetypeConfig.babel.envTargets).sort().join(",") !== "default,node";
 
   let AppMode;
 
@@ -176,7 +174,7 @@ export function getDevArchetypeLegacy() {
       }
 
       return AppMode;
-    }
+    },
   });
 
   return archetypeConfig;

package/src/config/user-config.ts

@@ -2,7 +2,7 @@
 
 import Path from "path";
 import { merge } from "lodash";
-import makeOptionalRequire from "optional-require";
+import { makeOptionalRequire } from "optional-require";
 
 const optionalRequire = makeOptionalRequire(require);
 

package/src/lib/babel-run.ts

@@ -24,15 +24,19 @@ const xarcCwd = xarcOptions.cwd;
 try {
   // Try to load user's dev.js under src/server
   start = require(Path.resolve(xarcCwd, serverDir, "dev.js"));
-} catch (e) {
+} catch (err) {
+  if (err.code !== "MODULE_NOT_FOUND") {
+    throw err;
+  }
+
   // fallback to default action that loads babel-register and then requires
   // src/server, under which there should be an index.js file.
   require("@babel/register")({
     ignore: [util.getBabelExclude(xarcOptions)],
     extensions: [".js", ".jsx"]
       .concat(xarcOptions.babel.enableTypeScript && [".ts", ".tsx"])
-      .filter(x => x),
-    cache: true
+      .filter((x) => x),
+    cache: true,
   });
 
   const fullServerDir = Path.resolve(xarcCwd, serverDir);