@elliemae/pui-cli 6.5.0 → 6.5.4

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/testing/jest.config.js

@@ -1,9 +1,8 @@
 const path = require('path');
+const normalizePath = require('normalize-path');
 const { getAppConfig, getAssetPath } = require('../webpack/helpers');
 const swcrcConfig = require('../transpile/swcrc.config.js');
-
-const name = '@elliemae/pui-cli';
-const rootDir = path.join('<rootDir>', 'node_modules', name);
+const { findPnpmWorkspaceDir } = require('../monorepo/utils');
 
 let isReactModule = true;
 try {
@@ -15,19 +14,16 @@ try {
   isReactModule = false;
 }
 
-const getRootDir = () => {
-  try {
-    // eslint-disable-next-line global-require
-    const { name: consumerName } = require(path.join(
-      process.cwd(),
-      'package.json',
-    ));
-    return consumerName === name ? '<rootDir>' : rootDir;
-  } catch (ex) {
-    // eslint-disable-next-line no-console
-    console.log(ex);
-    return '<rootDir>';
-  }
+const getMockFilePath = (fileName) =>
+  normalizePath(path.resolve(__dirname, './mocks', fileName));
+
+const getNodeModulesPath = (fileName) => {
+  const monorepoRoot = findPnpmWorkspaceDir(process.cwd());
+  return normalizePath(
+    monorepoRoot
+      ? path.join(monorepoRoot, 'node_modules', fileName)
+      : `<rootDir>/node_modules/${fileName}`,
+  );
 };
 
 const jestConfig = {
@@ -59,23 +55,25 @@ const jestConfig = {
   coverageReporters: ['lcov', 'html', 'text-summary'],
   moduleDirectories: ['node_modules', 'app', 'lib'],
   moduleNameMapper: {
-    '.*\\webpack-hmr(.[t|j]s)?$': `${getRootDir()}/lib/testing/mocks/webpack-hmr.js`,
-    '.*\\.(css|scss)$': `${getRootDir()}/lib/testing/mocks/cssModule.js`,
-    '.*\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|ico)$': `${getRootDir()}/lib/testing/mocks/image.js`,
-    '.*\\.svg$': `${getRootDir()}/lib/testing/mocks/svg.js`,
-    '.*\\.(html)$': `${getRootDir()}/lib/testing/mocks/html.js`,
-    '^lodash-es$': 'lodash',
-    '@elliemae/pui-user-monitoring': `${getRootDir()}/lib/testing/mocks/pui-user-monitoring.js`,
-    '@elliemae/pui-app-loader': `${getRootDir()}/lib/testing/mocks/pui-app-loader.js`,
-    '@elliemae/pui-diagnostics': `${getRootDir()}/lib/testing/mocks/pui-diagnostics.js`,
-    'react-spring/web': '<rootDir>/node_modules/react-spring/web.cjs.js',
-    'react-spring/renderprops':
-      '<rootDir>/node_modules/react-spring/renderprops.cjs.js',
-    'styled-components':
-      '<rootDir>/node_modules/styled-components/dist/styled-components.cjs.js',
+    '.*\\webpack-hmr(.[t|j]s)?$': getMockFilePath('webpack-hmr.js'),
+    '.*\\.(css|scss)$': getMockFilePath('cssModule.js'),
+    '.*\\.(jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|ico)$':
+      getMockFilePath('image.js'),
+    '.*\\.svg$': getMockFilePath('svg.js'),
+    '.*\\.(html)$': getMockFilePath('html.js'),
+    '@elliemae/pui-user-monitoring': getMockFilePath('pui-user-monitoring.js'),
+    '@elliemae/pui-app-loader': getMockFilePath('webpack-hmr.js'),
+    '@elliemae/pui-diagnostics': getMockFilePath('pui-app-loader.js'),
+    'react-spring/web': getNodeModulesPath('react-spring/web.cjs.js'),
+    'react-spring/renderprops': getNodeModulesPath(
+      'react-spring/renderprops.cjs.js',
+    ),
+    'styled-components': getNodeModulesPath(
+      'styled-components/dist/styled-components.cjs.js',
+    ),
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
-  setupFilesAfterEnv: [`${getRootDir()}/lib/testing/setup-tests.js`],
+  setupFilesAfterEnv: [path.resolve(__dirname, './setup-tests.js')],
   setupFiles: ['raf/polyfill', 'whatwg-fetch'],
   testRegex: '(app|lib).*/tests/.*\\.test\\.[jt]sx?$',
   snapshotSerializers: [],
@@ -97,7 +95,7 @@ const jestConfig = {
 
 if (isReactModule && jestConfig.setupFilesAfterEnv)
   jestConfig.setupFilesAfterEnv.push(
-    `${getRootDir()}/lib/testing/setup-react-env.js`,
+    path.resolve(__dirname, './setup-react-env.js'),
   );
 
 exports.jestConfig = jestConfig;

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

@@ -1,10 +1,6 @@
 /* eslint-disable max-lines */
 const path = require('path');
-const {
-  EnvironmentPlugin,
-  DefinePlugin,
-  NormalModuleReplacementPlugin,
-} = require('webpack');
+const { EnvironmentPlugin, DefinePlugin } = require('webpack');
 const {
   optimize: { LimitChunkCountPlugin },
   ProgressPlugin,
@@ -14,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 {
@@ -68,9 +65,6 @@ const plugins = [
     maxChunks: 1,
   }),
   new MomentLocalesPlugin({ localesToKeep: ['es-us'] }),
-  new NormalModuleReplacementPlugin(/\.js$/, function (resource) {
-    resource.request = resource.request.replace('.js', '');
-  }),
   new ProgressPlugin(),
 ];
 
@@ -192,6 +186,7 @@ module.exports = (options) => ({
       ...getAlias(),
       ...((options.resolve || {}).alias || {}),
     },
+    plugins: [new ResolveTypeScriptPlugin({})],
   },
   externals: {
     '@elliemae/pui-user-monitoring': 'emuiUserMonitoring',

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.5.0",
+  "version": "6.5.4",
   "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",
@@ -161,6 +161,7 @@
     "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",
@@ -184,6 +185,7 @@
     "node-gyp": "~8.4.1",
     "node-plop": "~0.30.0",
     "nodemon": "~2.0.15",
+    "normalize-path": "~3.0.0",
     "npm-check-updates": "12.3.0",
     "null-loader": "~4.0.1",
     "pino": "~7.6.5",