@elliemae/pui-cli 6.4.0 → 6.5.3

package/lib/lint/lint-staged.config.js

@@ -1,6 +1,7 @@
 const path = require('path');
 
 module.exports = {
+  '*.{js,ts,jsx,tsx,md,mdx,html,css,json}': ['prettier --write'],
   '*.{ts,tsx}': [
     `node ${path.resolve(
       __dirname,
@@ -12,5 +13,4 @@ module.exports = {
     'npm run test:staged',
     'npm run gendoc',
   ],
-  '*.{js,ts,jsx,tsx,md,mdx,html,css,json}': ['prettier --write'],
 };

package/lib/monorepo/utils.js

@@ -0,0 +1,15 @@
+const path = require('path');
+const { sync: findUp } = require('find-up');
+
+const WORKSPACE_DIR_ENV_VAR = 'NPM_CONFIG_WORKSPACE_DIR';
+const WORKSPACE_MANIFEST_FILENAME = 'pnpm-workspace.yaml';
+
+exports.findPnpmWorkspaceDir = (cwd) => {
+  const workspaceManifestDirEnvVar =
+    process.env[WORKSPACE_DIR_ENV_VAR] ??
+    process.env[WORKSPACE_DIR_ENV_VAR.toLowerCase()];
+  const workspaceManifestLocation = workspaceManifestDirEnvVar
+    ? path.join(workspaceManifestDirEnvVar, 'pnpm-workspace.yaml')
+    : findUp([WORKSPACE_MANIFEST_FILENAME, 'pnpm-workspace.yml'], { cwd });
+  return workspaceManifestLocation && path.dirname(workspaceManifestLocation);
+};

package/lib/webpack/helpers.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const _ = require('lodash');
 const CompressionPlugin = require('compression-webpack-plugin');
 const zlib = require('zlib');
+const { findPnpmWorkspaceDir } = require('../monorepo/utils');
 
 let pathSep = path.sep;
 if (pathSep === '\\')
@@ -66,8 +67,9 @@ const mapToFolder = (dependencies, folder) =>
     {},
   );
 
-const getAlias = () =>
-  mapToFolder(
+const getAlias = () => {
+  const monorepoRoot = findPnpmWorkspaceDir(process.cwd()) || '';
+  return mapToFolder(
     [
       '@babel/runtime',
       'react',
@@ -85,8 +87,9 @@ const getAlias = () =>
       '@elliemae/pui-app-sdk$',
       '@elliemae/pui-theme$',
     ],
-    './node_modules',
+    path.join(monorepoRoot, './node_modules'),
   );
+};
 
 const modulesToTranspile = [
   '@elliemae/pui-*',

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

@@ -10,6 +10,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const PostcssPresetEnv = require('postcss-preset-env');
 const DuplicatePackageCheckerPlugin = require('duplicate-package-checker-webpack-plugin');
 const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
+const ResolveTypeScriptPlugin = require('resolve-typescript-plugin');
 const browserslistToEsbuild = require('browserslist-to-esbuild');
 
 const {
@@ -30,28 +31,35 @@ const minicssLoader = {
 const finalCSSLoader = (mode) =>
   mode !== 'production' ? { loader: 'style-loader' } : minicssLoader;
 
+const copyPluginPatterns = filterByFilePresence([
+  {
+    from: 'lib/app.config.json',
+    to: 'app.config.json',
+    noErrorOnMissing: true,
+  },
+  {
+    from: 'public',
+    noErrorOnMissing: true,
+  },
+]);
+
 const plugins = [
   new EnvironmentPlugin({
-    NODE_ENV: 'development',
     ASSET_PATH: '/',
     CI: 'false',
   }),
   new DefinePlugin({
     APP_CONFIG: getAppConfig(true),
   }),
-  new CopyWebpackPlugin({
-    patterns: filterByFilePresence([
-      {
-        from: 'lib/app.config.json',
-        to: 'app.config.json',
-        noErrorOnMissing: true,
-      },
-      {
-        from: 'lib/public',
-        noErrorOnMissing: true,
-      },
-    ]),
-  }),
+  /* eslint-disable indent */
+  ...(copyPluginPatterns.length > 0
+    ? [
+        new CopyWebpackPlugin({
+          patterns: copyPluginPatterns,
+        }),
+      ]
+    : []),
+  /* eslint-enable indent */
   new DuplicatePackageCheckerPlugin(),
   new LimitChunkCountPlugin({
     maxChunks: 1,
@@ -102,25 +110,6 @@ module.exports = (options) => ({
           },
         },
       },
-      {
-        test: /\.exec\.js$/,
-        exclude: /node_modules/,
-        use: [
-          {
-            loader: 'imports-loader',
-            options: {
-              wrapper: {
-                thisArg: 'window',
-                args: {
-                  module: false,
-                  exports: false,
-                  define: false,
-                },
-              },
-            },
-          },
-        ],
-      },
       {
         test: /\.css$/,
         exclude: excludeNodeModulesExcept(modulesToTranspile),
@@ -191,12 +180,13 @@ module.exports = (options) => ({
   plugins: plugins.concat(options.plugins || []),
   resolve: {
     modules: ['node_modules', 'app', 'lib'],
-    extensions: ['.js', '.jsx', '.ts', '.tsx', '.json', '.wasm', '.mjs'],
+    extensions: ['.ts', '.tsx', '.js', '.jsx', '.json', '.wasm', '.mjs'],
     mainFields: ['browser', 'module', 'main'],
     alias: {
       ...getAlias(),
       ...((options.resolve || {}).alias || {}),
     },
+    plugins: [new ResolveTypeScriptPlugin({})],
   },
   externals: {
     '@elliemae/pui-user-monitoring': 'emuiUserMonitoring',

package/lib/webpack/webpack.lib.dev.babel.js

@@ -8,7 +8,6 @@ const libraryName = getLibraryName();
 module.exports = require('./webpack.lib.base.babel')({
   mode: 'development',
 
-  // Don't use hashes in dev mode for better performance
   output: {
     filename: `js/${libraryName}.js`,
     chunkFilename: `js/${libraryName}.chunk.js`,
@@ -25,7 +24,6 @@ module.exports = require('./webpack.lib.base.babel')({
     alias: {},
   },
 
-  // Add development plugins
   plugins: [
     new HtmlWebpackPlugin({
       scriptLoading: 'module',

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

@@ -11,7 +11,6 @@ const libraryName = getLibraryName();
 module.exports = require('./webpack.lib.base.babel')({
   mode: 'production',
 
-  // Utilize long-term caching by adding content hashes (not compilation hashes) to compiled assets
   output: {
     filename: `js/${libraryName}.[chunkhash].js`,
     chunkFilename: `js/${libraryName}.[chunkhash].chunk.js`,
@@ -36,7 +35,6 @@ module.exports = require('./webpack.lib.base.babel')({
   },
 
   plugins: [
-    // Minify and optimize the index.html
     new HtmlWebpackPlugin({
       scriptLoading: 'module',
       template: 'lib/index.pug',

package/lib/webpack/webpack.storybook.js

@@ -1,7 +1,7 @@
-const webpack = require('webpack');
+const { DefinePlugin, EnvironmentPlugin } = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const ResolveTypeScriptPlugin = require('resolve-typescript-plugin').default;
+const ResolveTypeScriptPlugin = require('resolve-typescript-plugin');
 const {
   getAppConfig,
   isApp,
@@ -13,10 +13,10 @@ const IS_APP = isApp();
 const CWD = process.cwd();
 
 const getAdditionalPlugins = () => [
-  new webpack.DefinePlugin({
+  new DefinePlugin({
     APP_CONFIG: getAppConfig(),
   }),
-  new webpack.EnvironmentPlugin({
+  new EnvironmentPlugin({
     IS_APP,
     CWD,
   }),
@@ -37,7 +37,7 @@ const getAdditionalPlugins = () => [
         noErrorOnMissing: true,
       },
       {
-        from: 'app/public',
+        from: 'public',
         noErrorOnMissing: true,
       },
     ],
@@ -74,7 +74,7 @@ exports.webpackFinal = async (config, { configType }) => {
   config.resolve.extensions.push('.svg');
   config.resolve.plugins = [
     ...(config.resolve.plugins || []),
-    new ResolveTypeScriptPlugin(),
+    new ResolveTypeScriptPlugin({}),
   ];
   config.externals = config.externals || {};
   config.externals['@elliemae/pui-user-monitoring'] = 'emuiUserMonitoring';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/pui-cli",
-  "version": "6.4.0",
+  "version": "6.5.3",
   "private": false,
   "description": "ICE MT UI Platform CLI",
   "sideEffects": false,
@@ -145,7 +145,7 @@
     "eslint-plugin-eslint-comments": "~3.2.0",
     "eslint-plugin-import": "~2.25.4",
     "eslint-plugin-jest": "~26.1.0",
-    "eslint-plugin-jsdoc": "~37.8.2",
+    "eslint-plugin-jsdoc": "~37.9.0",
     "eslint-plugin-jsx-a11y": "~6.5.1",
     "eslint-plugin-mdx": "~1.16.0",
     "eslint-plugin-prettier": "~4.0.0",
@@ -158,9 +158,10 @@
     "execa": "~5.1.1",
     "express": "~4.17.2",
     "express-pino-logger": "~7.0.0",
-    "express-static-gzip": "~2.1.3",
+    "express-static-gzip": "~2.1.4",
     "favicons": "~6.2.2",
     "favicons-webpack-plugin": "~5.0.2",
+    "find-up": "~5.0.0",
     "happy-dom": "~2.31.1",
     "helmet-csp": "~3.4.0",
     "html-webpack-plugin": "~5.5.0",
@@ -221,12 +222,12 @@
     "swc-loader": "~0.1.15",
     "terser-webpack-plugin": "~5.3.1",
     "ts-node": "~10.5.0",
-    "tsc-alias": "~1.5.0",
+    "tsc-alias": "~1.6.0",
     "typescript": "~4.5.5",
     "update-notifier": "~5.1.0",
     "url-loader": "~4.1.1",
     "uuid": "~8.3.2",
-    "vite": "~2.8.0",
+    "vite": "~2.8.1",
     "vitest": "~0.3.2",
     "webpack": "~5.65.0",
     "webpack-bundle-analyzer": "~4.5.0",