@elliemae/pui-cli 6.0.0-beta.22 → 6.0.0-beta.26

package/lib/cli-commands/test.js

@@ -1,6 +1,5 @@
 const { exit } = require('yargs');
 const { exec, logError, logSuccess } = require('./utils');
-// const { lintCSS, lintJS } = require('./lint');
 
 const { CI = false } = process.env;
 
@@ -21,18 +20,10 @@ async function handler(argv) {
   if (argv.r) commandOptions += ' --bail --findRelatedTests';
   if (argv.s) commandOptions += ' --silent';
   try {
-    // if (!CI) {
-    //   try {
-    //     await lintJS();
-    //     await lintCSS();
-    //     logSuccess('Linting completed');
-    //   } catch (err) {
-    //     logError('Linting failed');
-    //     exit(-1, err);
-    //     return -1;
-    //   }
-    // }
-    await exec('rimraf ./reports');
+    if (CI) {
+      await exec('rimraf ./reports');
+    }
+
     // eslint-disable-next-line jest/valid-title, jest/no-disabled-tests, jest/expect-expect
     await test(commandOptions);
     logSuccess('Unit test execution completed');

package/lib/pui-config/index.js

@@ -0,0 +1,18 @@
+const path = require('path');
+const fs = require('fs');
+const { merge } = require('lodash');
+
+const baseConfig = {
+  esBuild: {
+    target: 'es2020',
+  },
+};
+
+const getPUIConfig = () => {
+  const configPath = path.resolve(process.cwd(), './pui.config.js');
+  if (!fs.existsSync(configPath)) return baseConfig;
+  const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+  return merge(baseConfig, config);
+};
+
+exports.getPUIConfig = getPUIConfig;

package/lib/testing/jest.config.js

@@ -74,7 +74,7 @@ const jestConfig = {
   testRegex: '(app|lib).*/tests/.*\\.test\\.[jt]sx?$',
   snapshotSerializers: [],
   testResultsProcessor: 'jest-sonar-reporter',
-  resolver: 'ts-jest-resolver',
+  resolver: path.resolve(__dirname, './resolver.js'),
   transform: {
     '^.+\\.[jt]sx?$': [
       'esbuild-jest',
@@ -84,7 +84,7 @@ const jestConfig = {
     ],
   },
   transformIgnorePatterns: [
-    'node_modules/(?!(@elliemae/pui-cli/lib/testing/*)/)',
+    'node_modules/(?!(@elliemae/em-platform-document-viewer|@elliemae/pui-cli|@elliemae/pui-app-widgets|lodash-es|react-spring|react-select|react-dates|@babel/runtime)/)',
   ],
   globals: {
     APP_CONFIG: getAppConfig(),

package/lib/testing/resolver.js

@@ -0,0 +1,44 @@
+const resolutions = [
+  {
+    matcher: /\.jsx?$/i,
+    extensions: ['.tsx', '.ts'],
+  },
+  {
+    matcher: /\.mjs$/i,
+    extensions: ['.mts'],
+  },
+  {
+    matcher: /\.cjs$/i,
+    extensions: ['.cts'],
+  },
+];
+
+const importResolver = require('enhanced-resolve').create.sync({
+  conditionNames: ['import', 'node', 'default'],
+  extensions: ['.js', '.jsx', '.json', '.node', '.ts', '.tsx'],
+});
+const requireResolver = require('enhanced-resolve').create.sync({
+  conditionNames: ['require', 'node', 'default'],
+  extensions: ['.js', '.jsx', '.json', '.node', '.ts', '.tsx'],
+});
+
+module.exports = (request, options) => {
+  let resolver = requireResolver;
+  if (options.conditions?.includes('import')) {
+    resolver = importResolver;
+  }
+  const resolution = resolutions.find(({ matcher }) => matcher.test(request));
+  if (resolution) {
+    // eslint-disable-next-line no-restricted-syntax
+    for (const extension of resolution.extensions) {
+      try {
+        return resolver(
+          options.basedir,
+          request.replace(resolution.matcher, extension),
+        );
+        // eslint-disable-next-line no-empty
+      } catch {}
+    }
+  }
+  return resolver(options.basedir, request);
+};

package/lib/testing/setup-tests.js

@@ -8,6 +8,29 @@ import ResizeObserver from 'resize-observer-polyfill';
 import addMatchMedia from './mocks/matchMedia.js';
 import { logger } from './mocks/pui-diagnostics.js';
 
+// eslint-disable-next-line no-console
+const originalError = console.error;
+// eslint-disable-next-line no-console
+console.error = (...args) => {
+  const ignoreList = [
+    `Warning: Can't perform a React state update on an unmounted component`,
+    `Warning: Function components cannot be given refs`,
+    `Warning: Failed %s type:`,
+    `Warning: Invalid DOM property`,
+    `Warning: Each child in a list should have a unique`,
+    'Warning: Received `%s` for a non-boolean attribute',
+    'Warning: <%s /> is using incorrect casing.',
+    'Warning: The tag <%s> is unrecognized in this browser',
+  ];
+  if (
+    ignoreList.find(
+      (ignoreMsg) => !!args.find((arg) => arg.includes?.(ignoreMsg)),
+    )
+  )
+    return false;
+  return originalError(...args);
+};
+
 if (expect) expect.extend(jestAxe.toHaveNoViolations);
 jest.setTimeout(60000);
 

package/lib/transpile/esbuild.js

@@ -2,12 +2,13 @@ const esbuild = require('esbuild');
 const fg = require('fast-glob');
 const fs = require('fs');
 const path = require('path');
+const { getPUIConfig } = require('../pui-config');
 
-const ESBUILD_TARGET = 'es2020';
+const { esBuild } = getPUIConfig();
 
 const commonConfig = {
   bundle: false,
-  target: ESBUILD_TARGET,
+  target: esBuild.target,
   loader: { '.js': 'jsx' },
   mainFields: ['module', 'browser', 'main'],
   inject: [path.resolve(__dirname, './react-shim.js')],
@@ -33,30 +34,29 @@ const build = async ({ srcPath, commonJS }) => {
     `!${srcPath}/**/*.stories.{js,jsx,ts,tsx}`,
     `!${srcPath}/**/*.endpoint.{js,jsx,ts,tsx}`,
   ];
-  if (!commonJS) {
-    const outdir = `${distFolder}/es`;
-    const entryPoints = await fg(inputFiles);
+  if (commonJS) {
+    const outdir = `${distFolder}/cjs`;
+    const commonJSEntryPoints = await fg(inputFiles);
     await esbuild.build({
-      entryPoints,
+      entryPoints: commonJSEntryPoints,
       ...commonConfig,
       outdir,
-      format: 'esm',
+      format: 'cjs',
     });
     await copyFiles({ srcdir: srcPath, outdir });
   } else {
-    const outdir = `${distFolder}/cjs`;
-    const commonJSEntryPoints = await fg(
-      inputFiles.concat([`${srcPath}/**/*.cjs`]),
+    const outdir = `${distFolder}/es`;
+    const entryPoints = await fg(
+      inputFiles.concat([`!${srcPath}/**/cjs/**/*.{js,jsx,ts,tsx}`]),
     );
     await esbuild.build({
-      entryPoints: commonJSEntryPoints,
+      entryPoints,
       ...commonConfig,
       outdir,
-      format: 'cjs',
+      format: 'esm',
     });
     await copyFiles({ srcdir: srcPath, outdir });
   }
 };
 
 exports.esBuild = build;
-exports.ESBUILD_TARGET = ESBUILD_TARGET;

package/lib/webpack/webpack.base.babel.js

@@ -17,7 +17,8 @@ const {
   getAlias,
   getPaths,
 } = require('./helpers');
-const { ESBUILD_TARGET } = require('../transpile/esbuild');
+const { getPUIConfig } = require('../pui-config');
+const { esBuild } = getPUIConfig();
 
 const minicssLoader = {
   loader: MiniCssExtractPlugin.loader,
@@ -152,7 +153,7 @@ module.exports = (options) => ({
           loader: 'esbuild-loader',
           options: {
             loader: 'jsx',
-            target: ESBUILD_TARGET,
+            target: esBuild.target,
           },
         },
       },
@@ -166,7 +167,7 @@ module.exports = (options) => ({
           loader: 'esbuild-loader',
           options: {
             loader: 'tsx',
-            target: ESBUILD_TARGET,
+            target: esBuild.target,
           },
         },
       },
@@ -207,6 +208,7 @@ module.exports = (options) => ({
       {
         test: /\.svg$/i,
         issuer: /\.[jt]sx?$/,
+        resourceQuery: /^((?!url).)*$/,
         use: ['@svgr/webpack'],
       },
       {

package/lib/webpack/webpack.lib.base.babel.js

@@ -19,7 +19,8 @@ const {
   getAssetPath,
   getAlias,
 } = require('./helpers');
-const { ESBUILD_TARGET } = require('../transpile/esbuild');
+const { getPUIConfig } = require('../pui-config');
+const { esBuild } = getPUIConfig();
 
 const minicssLoader = {
   loader: MiniCssExtractPlugin.loader,
@@ -100,7 +101,7 @@ module.exports = (options) => ({
           loader: 'esbuild-loader',
           options: {
             loader: 'jsx',
-            target: ESBUILD_TARGET,
+            target: esBuild.target,
           },
         },
       },
@@ -114,7 +115,7 @@ module.exports = (options) => ({
           loader: 'esbuild-loader',
           options: {
             loader: 'tsx',
-            target: ESBUILD_TARGET,
+            target: esBuild.target,
           },
         },
       },
@@ -172,6 +173,7 @@ module.exports = (options) => ({
       {
         test: /\.svg$/i,
         issuer: /\.[jt]sx?$/,
+        resourceQuery: /^((?!url).)*$/,
         use: ['@svgr/webpack'],
       },
       {

package/lib/webpack/webpack.lib.prod.babel.js

@@ -4,7 +4,8 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const { ESBuildMinifyPlugin } = require('esbuild-loader');
 const { getLibraryName, getCompressionPlugins } = require('./helpers');
-const { ESBUILD_TARGET } = require('../transpile/esbuild');
+const { getPUIConfig } = require('../pui-config');
+const { esBuild } = getPUIConfig();
 
 const libraryName = getLibraryName();
 
@@ -23,7 +24,7 @@ module.exports = require('./webpack.lib.base.babel')({
     minimize: true,
     minimizer: [
       new ESBuildMinifyPlugin({
-        target: ESBUILD_TARGET,
+        target: esBuild.target,
         css: true,
       }),
     ],

package/lib/webpack/webpack.prod.babel.js

@@ -16,7 +16,8 @@ const {
   isGoogleTagManagerEnabled,
   getCompressionPlugins,
 } = require('./helpers');
-const { ESBUILD_TARGET } = require('../transpile/esbuild');
+const { getPUIConfig } = require('../pui-config');
+const { esBuild } = getPUIConfig();
 
 const getProdConfig = ({ latestVersion = true } = {}) => {
   const { buildPath, publicPath } = getPaths(latestVersion);
@@ -41,7 +42,7 @@ const getProdConfig = ({ latestVersion = true } = {}) => {
       moduleIds: 'deterministic',
       minimizer: [
         new ESBuildMinifyPlugin({
-          target: ESBUILD_TARGET,
+          target: esBuild.target,
           css: true,
         }),
       ],

package/lib/webpack/webpack.storybook.js

@@ -1,6 +1,7 @@
 const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
+const ResolveTypeScriptPlugin = require('resolve-typescript-plugin').default;
 const {
   getAppConfig,
   isApp,
@@ -45,7 +46,7 @@ const getAdditionalPlugins = () => [
 
 const getModuleRules = () => [
   {
-    test: /\.(js|ts|jsx|tsx)$/,
+    test: /\.[jt]sx?$/,
     enforce: 'pre',
     exclude: /node_modules/,
     resolve: {
@@ -68,6 +69,7 @@ const getModuleRules = () => [
   {
     test: /\.svg$/i,
     issuer: /\.[jt]sx?$/,
+    resourceQuery: /^((?!url).)*$/,
     use: ['@svgr/webpack'],
   },
 ];
@@ -87,6 +89,10 @@ exports.webpackFinal = async (config, { configType }) => {
   config.resolve.alias = { ...config.resolve.alias, ...getAlias() };
   config.resolve.fallback = { ...config.resolve.fallback, crypto: false };
   config.resolve.extensions.push('.svg');
+  config.resolve.plugins = [
+    ...(config.resolve.plugins || []),
+    new ResolveTypeScriptPlugin(),
+  ];
   config.externals = config.externals || {};
   config.externals['@elliemae/pui-user-monitoring'] = 'emuiUserMonitoring';
   config.externals['@elliemae/pui-app-loader'] = 'emuiAppLoader';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/pui-cli",
-  "version": "6.0.0-beta.22",
+  "version": "6.0.0-beta.26",
   "private": false,
   "description": "ICE MT UI Platform CLI",
   "sideEffects": false,
@@ -70,27 +70,27 @@
     "@semantic-release/changelog": "~6.0.1",
     "@semantic-release/exec": "~6.0.2",
     "@semantic-release/git": "~10.0.1",
-    "@storybook/addon-a11y": "~6.4.7",
-    "@storybook/addon-essentials": "~6.4.7",
+    "@storybook/addon-a11y": "~6.4.8",
+    "@storybook/addon-essentials": "~6.4.8",
     "@storybook/addon-events": "~6.2.9",
-    "@storybook/addon-interactions": "~6.4.7",
-    "@storybook/addon-links": "~6.4.7",
-    "@storybook/addon-storysource": "~6.4.7",
-    "@storybook/builder-webpack5": "~6.4.7",
-    "@storybook/manager-webpack5": "~6.4.7",
-    "@storybook/react": "~6.4.7",
-    "@storybook/theming": "~6.4.7",
+    "@storybook/addon-interactions": "~6.4.8",
+    "@storybook/addon-links": "~6.4.8",
+    "@storybook/addon-storysource": "~6.4.8",
+    "@storybook/builder-webpack5": "~6.4.8",
+    "@storybook/manager-webpack5": "~6.4.8",
+    "@storybook/react": "~6.4.8",
+    "@storybook/theming": "~6.4.8",
     "@stylelint/postcss-css-in-js": "~0.37.2",
-    "@svgr/webpack": "~6.1.0",
-    "@testing-library/jest-dom": "~5.16.0",
+    "@svgr/webpack": "~6.1.1",
+    "@testing-library/jest-dom": "~5.16.1",
     "@testing-library/react": "~12.1.2",
     "@testing-library/react-hooks": "~7.0.2",
     "@types/jest": "~27.0.3",
-    "@types/node": "~16.11.11",
+    "@types/node": "~16.11.12",
     "@types/rimraf": "~3.0.2",
     "@types/testing-library__jest-dom": "~5.14.2",
-    "@typescript-eslint/eslint-plugin": "~5.5.0",
-    "@typescript-eslint/parser": "~5.5.0",
+    "@typescript-eslint/eslint-plugin": "~5.6.0",
+    "@typescript-eslint/parser": "~5.6.0",
     "autoprefixer": "~10.4.0",
     "axe-core": "~4.3.5",
     "babel-loader": "~8.2.3",
@@ -125,11 +125,12 @@
     "dotenv": "~10.0.0",
     "dotenv-webpack": "~7.0.3",
     "duplicate-package-checker-webpack-plugin": "~3.0.0",
+    "enhanced-resolve": "~5.8.3",
     "esbuild": "~0.14.2",
     "esbuild-jest": "~0.5.0",
     "esbuild-loader": "~2.16.0",
     "esbuild-plugin-svgr": "~0.0.3",
-    "eslint": "~8.4.0",
+    "eslint": "~8.4.1",
     "eslint-config-airbnb": "~18.2.1",
     "eslint-config-airbnb-base": "~15.0.0",
     "eslint-config-airbnb-typescript": "~15.0.0",
@@ -148,7 +149,7 @@
     "eslint-plugin-prettier": "~4.0.0",
     "eslint-plugin-react": "~7.27.1",
     "eslint-plugin-react-hooks": "~4.3.0",
-    "eslint-plugin-redux-saga": "~1.2.1",
+    "eslint-plugin-redux-saga": "~1.2.2",
     "eslint-plugin-storybook": "~0.5.3",
     "eslint-plugin-testing-library": "~5.0.1",
     "eslint-plugin-wdio": "~7.4.2",
@@ -179,15 +180,16 @@
     "minimist": "~1.2.5",
     "moment": "~2.29.1",
     "moment-locales-webpack-plugin": "~1.2.0",
-    "msw": "~0.36.0",
+    "msw": "~0.36.2",
+    "node-gyp": "~8.4.1",
     "node-plop": "~0.30.0",
     "nodemon": "~2.0.15",
-    "npm-check-updates": "12.0.2",
+    "npm-check-updates": "12.0.3",
     "null-loader": "~4.0.1",
     "pino": "~7.5.1",
     "pino-pretty": "~7.2.0",
     "pinst": "~2.1.6",
-    "plop": "~3.0.2",
+    "plop": "~3.0.3",
     "postcss": "~8.4.4",
     "postcss-jsx": "~0.36.4",
     "postcss-html": "~1.3.0",
@@ -205,12 +207,13 @@
     "react-refresh": "~0.11.0",
     "react-test-renderer": "~17.0.2",
     "resize-observer-polyfill": "~1.5.1",
+    "resolve-typescript-plugin": "~1.1.1",
     "rimraf": "~3.0.2",
     "script-loader": "~0.7.2",
     "semantic-release": "~18.0.1",
     "shelljs": "~0.8.4",
-    "slackify-markdown": "~4.3.0",
-    "storybook-builder-vite": "~0.1.10",
+    "slackify-markdown": "~4.3.1",
+    "storybook-builder-vite": "~0.1.11",
     "storybook-addon-turbo-build": "~1.0.1",
     "storybook-react-router": "~1.0.8",
     "style-loader": "~3.3.1",
@@ -222,7 +225,6 @@
     "svg-url-loader": "~7.1.1",
     "svgo": "~2.8.0",
     "terser-webpack-plugin": "~5.2.5",
-    "ts-jest-resolver": "~2.0.0",
     "ts-node": "~10.4.0",
     "tsc-alias": "~1.4.2",
     "tsc-files": "~1.1.3",
@@ -233,8 +235,8 @@
     "update-notifier": "~5.1.0",
     "url-loader": "~4.1.1",
     "uuid": "~8.3.2",
-    "vite": "~2.6.14",
-    "webpack": "~5.64.4",
+    "vite": "~2.7.1",
+    "webpack": "~5.65.0",
     "webpack-bundle-analyzer": "~4.5.0",
     "webpack-cli": "~4.9.1",
     "webpack-dev-middleware": "~5.2.2",