@nlabs/lex 1.28.0 → 1.31.0

package/dist/lex.js

@@ -1,26 +1,8 @@
 #!/usr/bin/env node
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
-  }
-  return target;
-};
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
-var import_commander = __toModule(require("commander"));
-var import_commands = __toModule(require("./commands"));
+var import_commander = require("commander");
+var import_commands = require("./commands");
 const packageConfig = require("../package.json");
-import_commander.program.command("build").option("-c, --config <path>", "Custom Webpack configuration file path (ie. webpack.config.js).").option("-l, --lexConfig <path>", "Lex configuration file path (lex.config.js).").option("-m, --mode <type>", 'Webpack mode ("production" or "development"). Default: "development".', /^(development|production)$/i, "development").option("-q, --quiet", "No Lex notifications printed in the console.").option("-r, --remove", "Removes all files from the output directory before compiling.").option("-s, --static", "Creates static HTML files when building app.").option("-t, --typescript", "Transpile as Typescript.").option("-v, --variables <name>", `Environment variables to set in "process.env". (ie. "{NODE_ENV: 'production'}").`).option("-w, --watch", "Watch for changes.").option("--sourcePath <path>", "Source path").option("--outputPath <path>", "Output path").option("--outputChunkFilename <filename>", "The output filename for additional chunks.").option("--outputFilename <filename>", 'The output filename of the bundle. Default: "[name].js".').option("--outputJsonpFunction <func>", 'The name of the JSONP function used for chunk loading. Default: "webpackJsonp".').option("--outputLibrary <library>", "Expose the exports of the entry point as library.").option("--outputLibraryTarget <target>", 'The type for exposing the exports of the entry point as library. Default: "var".').option("--outputPathinfo <hasInfo>", "The output filename for additional chunks. Default: false").option("--outputPublicPath <path>", 'The public path for the assets. Default: "/"').option("--outputSourceMapFilename <filename>", 'The output filename for the SourceMap. Default: "[name].map"').option("--buildDelimiter <delimiter>", 'Display custom text after build output. Default: "=== Build done ==="').action((cmd) => (0, import_commands.build)(cmd, process.exit).then(() => {
+import_commander.program.command("build").option("-c, --config <path>", "Custom Webpack configuration file path (ie. webpack.config.js).").option("-l, --lexConfig <path>", "Lex configuration file path (lex.config.js).").option("-m, --mode <type>", 'Webpack mode ("production" or "development"). Default: "development".', /^(development|production)$/i, "development").option("-q, --quiet", "No Lex notifications printed in the console.").option("-r, --remove", "Removes all files from the output directory before compiling.").option("-s, --static", "Creates static HTML files when building app.").option("-t, --typescript", "Transpile as Typescript.").option("-v, --variables <name>", `Environment variables to set in "process.env". (ie. "{NODE_ENV: 'production'}").`).option("-w, --watch", "Watch for changes.").option("--bundler <name>", 'Bundler to use ("webpack" or "esbuild"). Default: "webpack".', /^(webpack|esbuild)$/i, "webpack").option("--sourcePath <path>", "Source path").option("--outputPath <path>", "Output path").option("--outputChunkFilename <filename>", "The output filename for additional chunks.").option("--outputFilename <filename>", 'The output filename of the bundle. Default: "[name].js".').option("--outputJsonpFunction <func>", 'The name of the JSONP function used for chunk loading. Default: "webpackJsonp".').option("--outputLibrary <library>", "Expose the exports of the entry point as library.").option("--outputLibraryTarget <target>", 'The type for exposing the exports of the entry point as library. Default: "var".').option("--outputPathinfo <hasInfo>", "The output filename for additional chunks. Default: false").option("--outputPublicPath <path>", 'The public path for the assets. Default: "/"').option("--outputSourceMapFilename <filename>", 'The output filename for the SourceMap. Default: "[name].map"').option("--buildDelimiter <delimiter>", 'Display custom text after build output. Default: "=== Build done ==="').action((cmd) => (0, import_commands.build)(cmd, process.exit).then(() => {
 }));
 import_commander.program.command("clean").option("-q, --quiet", "No Lex notifications printed in the console.").option("-s, --snapshots", 'Remove all "__snapshots__" directories.').action((cmd) => (0, import_commands.clean)(cmd, process.exit).then(() => {
 }));

package/dist/utils.js

@@ -20,22 +20,27 @@ var __spreadValues = (a, b) => {
 };
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __export = (target, all) => {
-  __markAsModule(target);
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __reExport = (target, module2, desc) => {
+var __reExport = (target, module2, copyDefault, desc) => {
   if (module2 && typeof module2 === "object" || typeof module2 === "function") {
     for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
+      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
         __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
   }
   return target;
 };
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+var __toESM = (module2, isNodeMode) => {
+  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
 };
-__export(exports, {
+var __toCommonJS = /* @__PURE__ */ ((cache) => {
+  return (module2, temp) => {
+    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
+  };
+})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+var utils_exports = {};
+__export(utils_exports, {
   checkLinkedModules: () => checkLinkedModules,
   copyFileSync: () => copyFileSync,
   copyFiles: () => copyFiles,
@@ -55,16 +60,16 @@ __export(exports, {
   setPackageJson: () => setPackageJson,
   updateTemplateName: () => updateTemplateName
 });
-var import_boxen = __toModule(require("boxen"));
-var import_chalk = __toModule(require("chalk"));
-var import_find_file_up = __toModule(require("find-file-up"));
-var import_fs_extra = __toModule(require("fs-extra"));
-var import_glob = __toModule(require("glob"));
-var import_isEmpty = __toModule(require("lodash/isEmpty"));
-var import_ora = __toModule(require("ora"));
-var import_path = __toModule(require("path"));
-var import_rimraf = __toModule(require("rimraf"));
-var import_LexConfig = __toModule(require("./LexConfig"));
+var import_boxen = __toESM(require("boxen"));
+var import_chalk = __toESM(require("chalk"));
+var import_find_file_up = __toESM(require("find-file-up"));
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_glob = __toESM(require("glob"));
+var import_isEmpty = __toESM(require("lodash/isEmpty"));
+var import_ora = __toESM(require("ora"));
+var import_path = __toESM(require("path"));
+var import_rimraf = __toESM(require("rimraf"));
+var import_LexConfig = require("./LexConfig");
 const cwd = process.cwd();
 const log = (message, type = "info", quiet = false) => {
   if (!quiet) {
@@ -283,6 +288,7 @@ const updateTemplateName = (filePath, replace, replaceCaps) => {
   data = data.replace(/Sample/g, replaceCaps);
   import_fs_extra.default.writeFileSync(filePath, data, "utf8");
 };
+module.exports = __toCommonJS(utils_exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkLinkedModules,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nlabs/lex",
-  "version": "1.28.0",
+  "version": "1.31.0",
   "description": "Lex",
   "license": "MIT",
   "bin": {
@@ -45,99 +45,104 @@
     "watch": "NODE_ENV=development rm -rf dist && yarn compile -w"
   },
   "dependencies": {
-    "@hot-loader/react-dom": "17.0.1",
+    "@hot-loader/react-dom": "17.0.2",
     "@nlabs/gothamjs": "^0.8.2",
     "@nlabs/webpack-plugin-static-site": "^0.1.1",
-    "acorn": "^8.5.0",
+    "acorn": "^8.7.0",
     "acorn-dynamic-import": "^4.0.0",
-    "boxen": "^5.0.1",
-    "caniuse-lite": "1.0.30001256",
+    "assert": "^2.0.0",
+    "boxen": "5.1.2",
+    "caniuse-lite": "1.0.30001305",
     "chalk": "^4.1.2",
     "commander": "^8.2.0",
-    "compare-versions": "^3.6.0",
-    "compression-webpack-plugin": "^8.0.1",
+    "compare-versions": "^4.1.3",
+    "compression-webpack-plugin": "^9.2.0",
     "config-webpack-plugin": "^1.1.0",
-    "copy-webpack-plugin": "^9.0.1",
-    "core-js": "^3.17.3",
+    "copy-webpack-plugin": "^10.2.4",
+    "core-js": "^3.21.0",
     "crypto-browserify": "^3.12.0",
-    "css-loader": "^6.2.0",
-    "cssnano": "^5.0.8",
-    "dotenv-webpack": "^7.0.3",
+    "css-loader": "^6.6.0",
+    "cssnano": "^5.0.16",
+    "dotenv-webpack": "^7.1.0",
     "download-npm-package": "^3.1.12",
     "esbuild-jest": "^0.5.0",
-    "esbuild-loader": "^2.15.1",
-    "execa": "^5.1.1",
-    "exports-loader": "^3.0.0",
+    "esbuild-loader": "^2.18.0",
+    "execa": "5",
+    "exports-loader": "^3.1.0",
     "favicons-webpack-plugin": "^5.0.2",
     "file-loader": "^6.2.0",
     "find-file-up": "^2.0.1",
     "fs-extra": "^10.0.0",
-    "glob": "^7.1.6",
-    "graphql-tag": "^2.12.5",
-    "html-loader": "^2.1.2",
-    "html-webpack-plugin": "^5.3.2",
-    "imports-loader": "^3.0.0",
-    "jest": "^27.1.1",
-    "jest-cli": "^27.1.1",
+    "glob": "^7.2.0",
+    "graphql-tag": "^2.12.6",
+    "html-loader": "^3.1.0",
+    "html-webpack-plugin": "^5.5.0",
+    "https-browserify": "^1.0.0",
+    "imports-loader": "^3.1.1",
+    "jest": "^27.4.7",
+    "jest-cli": "^27.4.7",
     "jest-transform-graphql": "^2.1.0",
     "json-d-ts": "^1.0.1",
-    "latest-version": "6.0.0",
+    "latest-version": "5.1.0",
     "lodash": "^4.17.21",
-    "luxon": "^2.0.2",
-    "npm-check-updates": "^11.8.5",
-    "obsolete-webpack-plugin": "^0.5.6",
-    "ora": "6.0.0",
+    "luxon": "^2.3.0",
+    "net": "^1.0.2",
+    "npm-check-updates": "^12.2.1",
+    "ora": "5.4.1",
+    "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
     "postcss-browser-reporter": "^0.6.0",
-    "postcss-cli": "^8.3.1",
-    "postcss-custom-properties": "^11.0.0",
+    "postcss-cli": "^9.1.0",
+    "postcss-custom-properties": "^12.1.4",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-for": "^2.1.1",
     "postcss-hash": "^3.0.0",
     "postcss-import": "14.0.2",
-    "postcss-loader": "^6.1.1",
-    "postcss-nesting": "^8.0.1",
+    "postcss-loader": "^6.2.1",
+    "postcss-nesting": "^10.1.2",
     "postcss-percentage": "^0.0.0",
-    "postcss-preset-env": "^6.7.0",
+    "postcss-preset-env": "^7.3.0",
     "postcss-simple-vars": "^6.0.3",
-    "postcss-svgo": "5.0.2",
+    "postcss-svgo": "5.0.3",
     "postcss-url": "10.1.3",
     "process": "^0.11.10",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "regenerator-runtime": "^0.13.9",
-    "resolve": "^1.20.0",
+    "resolve": "^1.22.0",
     "rimraf": "^3.0.2",
     "semver": "^7.3.5",
-    "source-map-loader": "^3.0.0",
-    "source-map-support": "^0.5.20",
+    "source-map-loader": "^3.0.1",
+    "source-map-support": "^0.5.21",
     "speed-measure-webpack-plugin": "^1.5.0",
     "static-site-generator-webpack-plugin": "^3.4.2",
     "stream-browserify": "^3.0.0",
-    "style-loader": "^3.2.1",
-    "svg-spritemap-webpack-plugin": "^4.3.2",
-    "svgo": "2.5.0",
-    "typescript": "^4.4.2",
+    "stream-http": "^3.2.0",
+    "style-loader": "^3.3.1",
+    "svg-spritemap-webpack-plugin": "^4.4.0",
+    "svgo": "2.8.0",
+    "tls": "^0.0.1",
+    "typescript": "^4.5.5",
     "url-loader": "^4.1.1",
     "util": "^0.12.4",
-    "webpack": "5.52.1",
-    "webpack-bundle-analyzer": "^4.4.1",
-    "webpack-cli": "^4.8.0",
+    "webpack": "5.68.0",
+    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0",
     "webpack-nano": "^1.1.1",
-    "webpack-plugin-serve": "^1.5.0"
+    "webpack-plugin-serve": "^1.6.0"
   },
   "devDependencies": {
-    "@nlabs/execa-mock": "^1.28.0",
-    "@types/jest": "^27.0.1",
-    "@types/luxon": "^2.0.3",
-    "@types/node": "^16.9.1",
+    "@nlabs/execa-mock": "^1.31.0",
+    "@types/jest": "^27.4.0",
+    "@types/luxon": "^2.0.9",
+    "@types/node": "^17.0.14",
     "@types/ora": "^3.2.0",
-    "@types/react": "^17.0.20",
+    "@types/react": "^17.0.38",
     "@types/webpack": "^5.28.0",
-    "eslint": "^7.32.0",
-    "eslint-config-styleguidejs": "^1.5.3",
+    "eslint": "^8.8.0",
+    "eslint-config-styleguidejs": "^1.5.4",
     "lerna": "^4.0.0"
   },
-  "gitHead": "1106f4dda8f36125d13d67204996dbc557361e86"
+  "gitHead": "4f93d9421e7f03819a61e71c6e51af5597dbf4ce"
 }

package/webpack.config.js

@@ -12,7 +12,6 @@ const fs = require('fs');
 const glob = require('glob');
 const HtmlWebPackPlugin = require('html-webpack-plugin');
 const isEmpty = require('lodash/isEmpty');
-const ObsoletePlugin = require('obsolete-webpack-plugin');
 const path = require('path');
 const SVGSpritemapPlugin = require('svg-spritemap-webpack-plugin');
 const webpack = require('webpack');
@@ -23,8 +22,7 @@ const {WebpackPluginServe} = require('webpack-plugin-serve');
 const {getNodePath, relativeFilePath} = require('./dist/utils');
 
 const {ProgressPlugin, ProvidePlugin} = webpack;
-const environment = process.env.NODE_ENV || 'development';
-const isProduction = environment === 'production';
+const isProduction = process.env.NODE_ENV === 'production';
 const lexConfig = JSON.parse(process.env.LEX_CONFIG) || {};
 
 const {
@@ -36,7 +34,7 @@ const {
   libraryName,
   libraryTarget,
   preset,
-  targetEnvironment,
+  targetEnvironment = 'es2015',
   webpack: webpackCustom
 } = lexConfig;
 
@@ -49,27 +47,18 @@ const plugins = [
     dependencies: true,
     percentBy: null
   }),
-  new ProvidePlugin({process: 'process/browser'}),
-  new DotenvPlugin({path: path.resolve(process.cwd(), '.env'), systemvars: true}),
-  new CompressionWebpackPlugin({algorithm: 'gzip'}),
-  new ObsoletePlugin({
-    name: 'obsolete',
-    promptOnNonTargetBrowser: true,
-    template: `
-      <div style="background-color: rgb(32, 41, 69); opacity: 0.8; height: 100%; width: 100%; margin: 0; padding: 0; position: absolute; text-align: center; left: 0; right: 0; bottom: 0; top: 0;">
-        <div style="color: white; font-size: 20px; margin-top: 10%">
-          Your browser is not supported.<br/><br/>
-          Please use a recent
-          <a href="https://www.microsoft.com/en-us/edge" style="color:white">Edge</a>,
-          <a href="https://www.mozilla.org/en-US/firefox/new/" style="color:white">Firefox</a>,
-          <a href="https://www.google.com/chrome/" style="color:white">Chrome</a> or
-          Safari.
-        </div>
-      </div>
-    `
-  })
+  new DotenvPlugin({path: path.resolve(process.cwd(), '.env'), systemvars: false})
 ];
 
+const isWeb = (preset || targetEnvironment) === 'web';
+
+if(isWeb) {
+  plugins.push(
+    new CompressionWebpackPlugin({algorithm: 'gzip'}),
+    new ProvidePlugin({process: 'process/browser'})
+  );
+}
+
 // Add svg files
 const globOptions = {
   cwd: sourceFullPath,
@@ -131,7 +120,7 @@ let outputFilename = outputFile;
 
 if(outputFile) {
   outputFilename = outputFile;
-} else if(outputHash || isProduction) {
+} else if(outputHash || (isWeb && isProduction)) {
   outputFilename = '[name].[hash].js';
 } else {
   outputFilename = '[name].js';
@@ -154,6 +143,7 @@ const aliasPaths = {
   '@nlabs/arkhamjs': relativeFilePath('node_modules/@nlabs/arkhamjs', process.cwd()),
   '@nlabs/arkhamjs-utils-react': relativeFilePath('node_modules/@nlabs/arkhamjs-utils-react', process.cwd()),
   'core-js': getNodePath('core-js'),
+  process: relativeFilePath('node_modules/process', process.cwd()),
   react: relativeFilePath('node_modules/react', process.cwd()),
   'react-dom': relativeFilePath('node_modules/react-dom', process.cwd()),
   'regenerator-runtime': getNodePath('regenerator-runtime')
@@ -173,12 +163,12 @@ module.exports = (webpackEnv, webpackOptions) => {
   const webpackConfig = {
     bail: true,
     cache: !isProduction,
-    devtool: isProduction ? 'cheap-module-source-map' : 'eval-cheap-module-source-map',
+    devtool: isProduction ? 'inline-cheap-module-source-map' : 'eval-cheap-module-source-map',
     entry: {
       index: `${sourceFullPath}/${lexConfig.entryJs}`
     },
     ignoreWarnings: [/Failed to parse source map/],
-    mode: environment,
+    mode: isProduction ? 'production' : 'development',
     module: {
       rules: [
         {
@@ -204,7 +194,7 @@ module.exports = (webpackEnv, webpackOptions) => {
           loader: esbuildLoaderPath,
           options: {
             loader: 'tsx',
-            target: 'es2015'
+            target: targetEnvironment
           },
           test: /\.(ts|tsx|js)$/
         },
@@ -288,11 +278,11 @@ module.exports = (webpackEnv, webpackOptions) => {
         }
       ]
     },
-    optimization: !isProduction || libraryName ? {} : {
+    optimization: (isProduction && isWeb) ? {
       minimizer: [
         new ESBuildMinifyPlugin({
           css: true,
-          target: 'es2015'
+          target: targetEnvironment
         })
       ],
       runtimeChunk: 'single',
@@ -307,7 +297,7 @@ module.exports = (webpackEnv, webpackOptions) => {
         }
       },
       usedExports: true
-    },
+    } : {},
     output: {
       filename: outputFilename,
       library: libraryName,
@@ -321,7 +311,12 @@ module.exports = (webpackEnv, webpackOptions) => {
       alias,
       extensions: ['*', '.mjs', '.js', '.ts', '.tsx', '.jsx', '.json', '.gql', '.graphql'],
       fallback: {
+        assert: require.resolve('assert/'),
         crypto: require.resolve('crypto-browserify'),
+        fs: require.resolve('fs-extra'),
+        http: require.resolve('stream-http'),
+        https: require.resolve('https-browserify'),
+        os: require.resolve('os-browserify/browser'),
         path: require.resolve('path-browserify'),
         process: require.resolve('process/browser'),
         stream: require.resolve('stream-browserify'),
@@ -336,7 +331,7 @@ module.exports = (webpackEnv, webpackOptions) => {
     // stats: {
     //   warningsFilter: [/Failed to parse source map/]
     // },
-    target: preset || targetEnvironment
+    target: isWeb ? 'web' : 'node'
   };
 
   // Add development plugins