@nlabs/lex 1.32.0 → 1.32.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nlabs/lex",
-  "version": "1.32.0",
+  "version": "1.32.1",
   "description": "Lex",
   "license": "MIT",
   "bin": {
@@ -26,14 +26,14 @@
     "url": "https://github.com/nitrogenlabs/lex/issues"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "browserslist": [
     "last 5 version",
     "ie 11"
   ],
   "scripts": {
-    "build": "NODE_ENV=production && rm -rf dist && esbuild src/**/**.ts* src/**.ts* --platform=node --outdir=./dist --target=node14 --format=cjs",
+    "build": "NODE_ENV=production && rm -rf dist && esbuild src/**/**.ts* src/**.ts* --platform=node --outdir=./dist --sourcemap=inline --target=node14 --format=cjs",
     "clean": "rm -rf dist node_modules package-lock.json *.log coverage",
     "compile": "tsc -p tsconfig.build.json",
     "env": "LEX_CONFIG='{\"useTypescript\":true}'",
@@ -45,7 +45,6 @@
     "watch": "NODE_ENV=development rm -rf dist && yarn compile -w"
   },
   "dependencies": {
-    "@hot-loader/react-dom": "17.0.2",
     "@luckycatfactory/esbuild-graphql-loader": "^3.7.0",
     "@nlabs/gothamjs": "^0.8.2",
     "@nlabs/webpack-plugin-static-site": "^0.1.1",
@@ -53,20 +52,20 @@
     "acorn-dynamic-import": "^4.0.0",
     "assert": "^2.0.0",
     "boxen": "5.1.2",
-    "caniuse-lite": "1.0.30001305",
+    "caniuse-lite": "1.0.30001309",
     "chalk": "^4.1.2",
     "commander": "^8.2.0",
     "compare-versions": "^4.1.3",
     "compression-webpack-plugin": "^9.2.0",
     "config-webpack-plugin": "^1.1.0",
     "copy-webpack-plugin": "^10.2.4",
-    "core-js": "^3.21.0",
+    "core-js": "^3.21.1",
     "crypto-browserify": "^3.12.0",
-    "css-loader": "^6.6.0",
-    "cssnano": "^5.0.16",
+    "css-loader": "^6.7.1",
+    "cssnano": "^5.1.5",
     "dotenv-webpack": "^7.1.0",
     "download-npm-package": "^3.1.12",
-    "esbuild": "^0.14.18",
+    "esbuild": "^0.14.29",
     "esbuild-jest": "^0.5.0",
     "esbuild-loader": "^2.18.0",
     "execa": "5",
@@ -74,7 +73,7 @@
     "favicons-webpack-plugin": "^5.0.2",
     "file-loader": "^6.2.0",
     "find-file-up": "^2.0.1",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.0.1",
     "glob": "^7.2.0",
     "graphql": "^16.3.0",
     "graphql-tag": "^2.12.6",
@@ -82,35 +81,35 @@
     "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": "^27.5.1",
+    "jest-cli": "^27.5.1",
     "jest-transform-graphql": "^2.1.0",
     "json-d-ts": "^1.0.1",
     "latest-version": "5.1.0",
     "lodash": "^4.17.21",
-    "luxon": "^2.3.0",
+    "luxon": "^2.3.1",
     "net": "^1.0.2",
-    "npm-check-updates": "^12.2.1",
+    "npm-check-updates": "^12.5.4",
     "ora": "5.4.1",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
     "postcss-browser-reporter": "^0.6.0",
     "postcss-cli": "^9.1.0",
-    "postcss-custom-properties": "^12.1.4",
+    "postcss-custom-properties": "^12.1.5",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-for": "^2.1.1",
     "postcss-hash": "^3.0.0",
-    "postcss-import": "14.0.2",
+    "postcss-import": "14.1.0",
     "postcss-loader": "^6.2.1",
-    "postcss-nesting": "^10.1.2",
+    "postcss-nesting": "^10.1.3",
     "postcss-percentage": "^0.0.0",
-    "postcss-preset-env": "^7.3.0",
+    "postcss-preset-env": "^7.4.3",
     "postcss-simple-vars": "^6.0.3",
-    "postcss-svgo": "5.0.3",
+    "postcss-svgo": "5.1.0",
     "postcss-url": "10.1.3",
     "process": "^0.11.10",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "regenerator-runtime": "^0.13.9",
     "resolve": "^1.22.0",
     "rimraf": "^3.0.2",
@@ -125,10 +124,10 @@
     "svg-spritemap-webpack-plugin": "^4.4.0",
     "svgo": "2.8.0",
     "tls": "^0.0.1",
-    "typescript": "^4.5.5",
+    "typescript": "^4.6.3",
     "url-loader": "^4.1.1",
     "util": "^0.12.4",
-    "webpack": "5.68.0",
+    "webpack": "5.70.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0",
@@ -137,15 +136,15 @@
   },
   "devDependencies": {
     "@nlabs/execa-mock": "^1.31.0",
-    "@types/jest": "^27.4.0",
-    "@types/luxon": "^2.0.9",
-    "@types/node": "^17.0.14",
+    "@types/jest": "^27.4.1",
+    "@types/luxon": "^2.3.1",
+    "@types/node": "^17.0.23",
     "@types/ora": "^3.2.0",
-    "@types/react": "^17.0.38",
+    "@types/react": "^17.0.43",
     "@types/webpack": "^5.28.0",
-    "eslint": "^8.8.0",
-    "eslint-config-styleguidejs": "^1.5.4",
+    "eslint": "^8.12.0",
+    "eslint-config-styleguidejs": "^1.6.0",
     "lerna": "^4.0.0"
   },
-  "gitHead": "3b0984b831a687a1d274bb8ebf14f2cbb2a66c8a"
+  "gitHead": "2a250242052c4fee03e8abfd4a5920ebfb40b63c"
 }

package/tsconfig.template.json

@@ -5,7 +5,7 @@
     "declaration": true,
     "esModuleInterop": true,
     "inlineSourceMap": true,
-    "jsx": "react",
+    "jsx": "react-jsx",
     "lib": [
       "es6",
       "es7",

package/webpack.config.js

@@ -19,7 +19,7 @@ const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer');
 const {merge} = require('webpack-merge');
 const {WebpackPluginServe} = require('webpack-plugin-serve');
 
-const {getNodePath, relativeFilePath} = require('./dist/utils');
+const {getNodePath, relativeFilePath} = require('./dist/utils/file');
 
 const {ProgressPlugin, ProvidePlugin} = webpack;
 const isProduction = process.env.NODE_ENV === 'production';
@@ -55,7 +55,10 @@ const isWeb = (preset || targetEnvironment) === 'web';
 if(isWeb) {
   plugins.push(
     new CompressionWebpackPlugin({algorithm: 'gzip'}),
-    new ProvidePlugin({process: 'process/browser'})
+    new ProvidePlugin({
+      process: 'process/browser',
+      React: path.resolve(__dirname, './node_modules/react')
+    })
   );
 }
 
@@ -71,6 +74,9 @@ const svgPaths = `${sourceFullPath}/icons/**/**.svg`;
 
 if(glob.sync(svgPaths, globOptions).length) {
   plugins.push(new SVGSpritemapPlugin(svgPaths, {
+    input: {
+      allowDuplicates: false
+    },
     output: {
       chunk: {keep: true},
       filename: './icons/icons.svg'
@@ -194,7 +200,10 @@ module.exports = (webpackEnv, webpackOptions) => {
           loader: esbuildLoaderPath,
           options: {
             loader: 'tsx',
-            target: targetEnvironment
+            target: targetEnvironment === 'node' ? 'node14' : 'es2016'
+          },
+          resolve: {
+            symlinks: true
           },
           test: /\.(ts|tsx|js)$/
         },
@@ -328,9 +337,6 @@ module.exports = (webpackEnv, webpackOptions) => {
         node_modules: true
       }
     },
-    // stats: {
-    //   warningsFilter: [/Failed to parse source map/]
-    // },
     target: isWeb ? 'web' : 'node'
   };
 
@@ -338,7 +344,6 @@ module.exports = (webpackEnv, webpackOptions) => {
   if(!isProduction) {
     webpackConfig.resolve.alias = {
       ...webpackConfig.resolve.alias,
-      'react-dom': relativeFilePath('node_modules/@hot-loader/react-dom', __dirname),
       webpack: webpackPath
     };
     webpackConfig.optimization = {minimize: false};
@@ -353,7 +358,14 @@ module.exports = (webpackEnv, webpackOptions) => {
           disableDotRule: true,
           htmlAcceptHeaders: ['text/html','*/*'],
           index: '/index.html',
+          logger: console.log.bind(console),
           rewrites: [
+            // wps
+            {
+              from: '/wps',
+              to: ({parsedUrl: {pathname}}) => pathname
+            },
+
             // Javascript files
             {
               from: /\.js/,
@@ -364,7 +376,7 @@ module.exports = (webpackEnv, webpackOptions) => {
               }
             },
 
-            // Other static files
+            // Static files
             {
               from: /\.[css,gif,ico,jpg,json,png,svg]/,
               to: ({parsedUrl: {pathname}}) => pathname
@@ -374,8 +386,15 @@ module.exports = (webpackEnv, webpackOptions) => {
         },
         hmr: false,
         log: {level: 'trace'},
+        middleware: (app) => app.use(async (ctx, next) => {
+          if(ctx.path.match(/^\/wps/)) {
+            const {accept, Accept, ...remainingHeaders} = ctx.request.header;
+            ctx.request.header = remainingHeaders;
+          }
+          await next();
+        }),
         open: process.env.WEBPACK_DEV_OPEN === 'true',
-        port: 7000,
+        port: 7001,
         progress: 'minimal',
         static: [outputFullPath],
         status: true
@@ -388,7 +407,7 @@ module.exports = (webpackEnv, webpackOptions) => {
 
     if(watch) {
       webpackConfig.bail = false;
-      webpackConfig.watch = true;
+      // webpackConfig.watch = true;
       webpackConfig.watchOptions = {
         aggregateTimeout: 500,
         ignored: ['node_modules/**', ...watchIgnorePaths]

package/dist/utils.js

@@ -1,312 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-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) && (copyDefault || key !== "default"))
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
-  }
-  return target;
-};
-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);
-};
-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,
-  copyFolderRecursiveSync: () => copyFolderRecursiveSync,
-  createSpinner: () => createSpinner,
-  cwd: () => cwd,
-  getFilenames: () => getFilenames,
-  getFilesByExt: () => getFilesByExt,
-  getNodePath: () => getNodePath,
-  getPackageJson: () => getPackageJson,
-  linkedModules: () => linkedModules,
-  log: () => log,
-  relativeFilePath: () => relativeFilePath,
-  removeConflictModules: () => removeConflictModules,
-  removeFiles: () => removeFiles,
-  removeModules: () => removeModules,
-  setPackageJson: () => setPackageJson,
-  updateTemplateName: () => updateTemplateName
-});
-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) {
-    let color;
-    switch (type) {
-      case "error":
-        color = import_chalk.default.red;
-        break;
-      case "note":
-        color = import_chalk.default.grey;
-        break;
-      case "success":
-        color = import_chalk.default.greenBright;
-        break;
-      case "warn":
-        color = import_chalk.default.yellow;
-        break;
-      default:
-        color = import_chalk.default.cyan;
-        break;
-    }
-    console.log(color(message));
-  }
-};
-const getFilenames = (props) => {
-  const { callback, cliName, name, quiet, type, useTypescript } = props;
-  let nameCaps;
-  const itemTypes = ["stores", "views"];
-  if (!name) {
-    if (itemTypes.includes(type)) {
-      log(`
-${cliName} Error: ${type} name is required. Please use 'lex -h' for options.`, "error", quiet);
-      return callback(1);
-    }
-  } else {
-    nameCaps = `${name.charAt(0).toUpperCase()}${name.substr(1)}`;
-  }
-  log(`${cliName} adding ${name} ${type}...`, "info", quiet);
-  let templatePath;
-  let templateExt;
-  let templateReact;
-  if (useTypescript) {
-    templatePath = "../../templates/typescript";
-    templateExt = ".ts";
-    templateReact = ".tsx";
-  } else {
-    templatePath = "../../templates/flow";
-    templateExt = ".js";
-    templateReact = ".js";
-  }
-  return {
-    nameCaps,
-    templateExt,
-    templatePath,
-    templateReact
-  };
-};
-const createSpinner = (quiet = false) => {
-  if (quiet) {
-    return {
-      fail: () => {
-      },
-      start: () => {
-      },
-      succeed: () => {
-      }
-    };
-  }
-  return (0, import_ora.default)({ color: "yellow" });
-};
-const copyFiles = async (files, typeName, spinner) => {
-  const { outputFullPath, sourceFullPath } = import_LexConfig.LexConfig.config;
-  const items = files.map((fileName) => ({
-    from: fileName,
-    to: import_path.default.resolve(outputFullPath, import_path.default.relative(sourceFullPath, fileName))
-  }));
-  try {
-    spinner.start(`Copying ${typeName} files...`);
-    await Promise.all(items.map(({ from, to }) => import_fs_extra.default.copy(from, to)));
-    spinner.succeed(`Successfully copied ${files.length} ${typeName} files!`);
-  } catch (error) {
-    spinner.fail(`Copying of ${typeName} files failed.`);
-    log(`Error: ${error.message}`, "error");
-    console.log(error);
-  }
-};
-const copyFileSync = (source, target) => {
-  let targetFile = target;
-  if (import_fs_extra.default.existsSync(target)) {
-    if (import_fs_extra.default.lstatSync(target).isDirectory()) {
-      targetFile = import_path.default.join(target, import_path.default.basename(source));
-    }
-  }
-  import_fs_extra.default.writeFileSync(targetFile, import_fs_extra.default.readFileSync(source));
-};
-const copyFolderRecursiveSync = (source, target) => {
-  let files = [];
-  const targetFolder = import_path.default.join(target, import_path.default.basename(source));
-  if (!import_fs_extra.default.existsSync(targetFolder)) {
-    import_fs_extra.default.mkdirSync(targetFolder);
-  }
-  if (import_fs_extra.default.lstatSync(source).isDirectory()) {
-    files = import_fs_extra.default.readdirSync(source);
-    files.forEach((file) => {
-      const curSource = import_path.default.join(source, file);
-      if (import_fs_extra.default.lstatSync(curSource).isDirectory()) {
-        copyFolderRecursiveSync(curSource, targetFolder);
-      } else {
-        copyFileSync(curSource, targetFolder);
-      }
-    });
-  }
-};
-const getPackageJson = (packagePath) => {
-  const formatPath = packagePath || `${process.cwd()}/package.json`;
-  const packageData = import_fs_extra.default.readFileSync(formatPath).toString();
-  return JSON.parse(packageData);
-};
-const getFilesByExt = (ext) => {
-  const { sourceFullPath } = import_LexConfig.LexConfig.config;
-  return import_glob.default.sync(`${sourceFullPath}/**/**${ext}`);
-};
-const removeConflictModules = (moduleList) => {
-  const updatedList = __spreadValues({}, moduleList);
-  Object.keys(updatedList).forEach((moduleName) => {
-    const regex = new RegExp("^(?!@types/).*(jest|webpack).*$", "gi");
-    if (regex.test(moduleName)) {
-      delete updatedList[moduleName];
-    }
-  });
-  return updatedList;
-};
-const removeFiles = (fileName, isRelative = false) => new Promise((resolve, reject) => {
-  const filePath = isRelative ? import_path.default.resolve(cwd, fileName) : fileName;
-  (0, import_rimraf.default)(filePath, (error) => {
-    if (error) {
-      return reject(error);
-    }
-    return resolve(null);
-  });
-});
-const removeModules = () => new Promise(async (resolve, reject) => {
-  try {
-    await removeFiles("./node_modules", true);
-    await removeFiles("./yarn.lock", true);
-    await removeFiles("./package-lock.json", true);
-    resolve(null);
-  } catch (error) {
-    reject(error);
-  }
-});
-const setPackageJson = (json, packagePath) => {
-  if (!json) {
-    return;
-  }
-  const formatPath = packagePath || `${process.cwd()}/package.json`;
-  import_fs_extra.default.writeFileSync(formatPath, JSON.stringify(json, null, 2));
-};
-const linkedModules = (startPath) => {
-  const workingPath = startPath || process.cwd();
-  let modulePath;
-  let prefix;
-  if (workingPath.includes("@")) {
-    prefix = `@${workingPath.split("@").pop()}`;
-    modulePath = workingPath;
-  } else {
-    modulePath = import_path.default.join(workingPath, "node_modules");
-  }
-  const foundPaths = import_glob.default.sync(`${modulePath}/*`);
-  return foundPaths.reduce((list, foundPath) => {
-    try {
-      const stats = import_fs_extra.default.lstatSync(foundPath);
-      if (stats.isDirectory()) {
-        const deepList = linkedModules(foundPath);
-        list.push(...deepList);
-      } else if (stats.isSymbolicLink()) {
-        const moduleNames = [prefix, import_path.default.basename(foundPath)].filter((item) => !(0, import_isEmpty.default)(item));
-        list.push({ name: `${moduleNames.join("/")}`, path: foundPath });
-      }
-      return list;
-    } catch (fsError) {
-      throw fsError;
-    }
-  }, []);
-};
-const checkLinkedModules = () => {
-  const linked = linkedModules();
-  if (linked.length) {
-    const msgModule = linked.length > 1 ? "Modules" : "Module";
-    const linkedMsg = linked.reduce((msg, linkedModule) => `${msg}
- * ${linkedModule.name}`, `Linked ${msgModule}:`);
-    log((0, import_boxen.default)(linkedMsg, { dimBorder: true, padding: 1 }), "warn");
-  }
-};
-const relativeFilePath = (filename, nodePath = "./", backUp = 0) => {
-  const nestDepth = 10;
-  if (backUp) {
-    const filePath = import_find_file_up.default.sync(filename, nodePath, nestDepth);
-    const previousPath = Array(backUp).fill(null).map(() => "../").join("");
-    return import_path.default.resolve(filePath, previousPath);
-  }
-  return import_find_file_up.default.sync(filename, nodePath, nestDepth);
-};
-const getNodePath = (moduleName) => {
-  const modulePath = `node_modules/${moduleName}`;
-  const repoPath = import_find_file_up.default.sync(modulePath, __dirname);
-  if (repoPath && import_fs_extra.default.existsSync(repoPath)) {
-    return repoPath;
-  }
-  const localPath = import_find_file_up.default.sync(modulePath, "./", 10) || `./${modulePath}`;
-  return localPath;
-};
-const updateTemplateName = (filePath, replace, replaceCaps) => {
-  let data = import_fs_extra.default.readFileSync(filePath, "utf8");
-  data = data.replace(/sample/g, replace);
-  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,
-  copyFileSync,
-  copyFiles,
-  copyFolderRecursiveSync,
-  createSpinner,
-  cwd,
-  getFilenames,
-  getFilesByExt,
-  getNodePath,
-  getPackageJson,
-  linkedModules,
-  log,
-  relativeFilePath,
-  removeConflictModules,
-  removeFiles,
-  removeModules,
-  setPackageJson,
-  updateTemplateName
-});