@elliemae/pui-cli 6.0.0-beta.5 → 6.0.0-beta.50

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

@@ -3,14 +3,13 @@ const path = require('path');
 const webpack = require('webpack');
 const {
   optimize: { LimitChunkCountPlugin },
+  ProgressPlugin,
 } = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const PostcssPresetEnv = require('postcss-preset-env');
 const DuplicatePackageCheckerPlugin = require('duplicate-package-checker-webpack-plugin');
-const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
 const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
-const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 
 const {
   excludeNodeModulesExcept,
@@ -19,12 +18,10 @@ const {
   modulesToTranspile,
   getAssetPath,
   getAlias,
-  getMediaPath,
 } = require('./helpers');
-const { ESBUILD_TARGET } = require('../esbuild');
-const { isTypeScriptEnabled } = require('../typescript/util');
+const { getPUIConfig } = require('../pui-config');
+const { esBuild } = getPUIConfig();
 
-const devMode = process.env.NODE_ENV !== 'production';
 const minicssLoader = {
   loader: MiniCssExtractPlugin.loader,
   options: {},
@@ -42,7 +39,6 @@ const plugins = [
   new webpack.DefinePlugin({
     APP_CONFIG: getAppConfig(true),
   }),
-  new CaseSensitivePathsPlugin(),
   new CopyWebpackPlugin({
     patterns: [
       {
@@ -60,20 +56,10 @@ const plugins = [
   new LimitChunkCountPlugin({
     maxChunks: 1,
   }),
-  new MomentLocalesPlugin(),
+  new MomentLocalesPlugin({ localesToKeep: ['es-us'] }),
+  new ProgressPlugin(),
 ];
 
-if (isTypeScriptEnabled()) {
-  plugins.push(
-    new ForkTsCheckerWebpackPlugin({
-      async: devMode,
-      eslint: {
-        files: './lib/**/*.{ts,js,tsx,jsx}',
-      },
-    }),
-  );
-}
-
 module.exports = (options) => ({
   mode: options.mode,
   entry: [path.join(process.cwd(), 'lib/index')],
@@ -89,39 +75,21 @@ module.exports = (options) => ({
   module: {
     rules: [
       {
-        test: /\.(jpe?g|png|gif|svg|ico)$/,
-        use: [
-          'file-loader',
-          {
-            loader: 'image-webpack-loader',
-            options: {
-              gifsicle: {
-                enabled: false,
-              },
-            },
-          },
-        ],
-        enforce: 'pre',
-      },
-      {
-        test: /^(?!.*\.exec\.js$).*\.(js|ts|jsx|tsx)$/,
-        enforce: 'pre',
-        exclude: /node_modules/,
+        test: /^(?!.*\.exec\.js$).*\.jsx?$/, // Transform all .js and .jsx files with Babel
+        exclude: excludeNodeModulesExcept(modulesToTranspile),
         resolve: {
           fullySpecified: false,
         },
-        use: [
-          {
-            loader: 'webpack-strip-block',
-            options: {
-              start: 'TEST:START',
-              end: 'TEST:END',
-            },
+        use: {
+          loader: 'esbuild-loader',
+          options: {
+            loader: 'jsx',
+            target: esBuild.target,
           },
-        ],
+        },
       },
       {
-        test: /^(?!.*\.exec\.js$).*\.(js|ts|jsx|tsx)$/, // Transform all .js and .jsx files with Babel
+        test: /^(?!.*\.exec\.js$).*\.tsx?$/, // Transform all .js and .jsx files with Babel
         exclude: excludeNodeModulesExcept(modulesToTranspile),
         resolve: {
           fullySpecified: false,
@@ -129,8 +97,8 @@ module.exports = (options) => ({
         use: {
           loader: 'esbuild-loader',
           options: {
-            loader: 'jsx',
-            target: ESBUILD_TARGET,
+            loader: 'tsx',
+            target: esBuild.target,
           },
         },
       },
@@ -186,19 +154,10 @@ module.exports = (options) => ({
         type: 'asset/resource',
       },
       {
-        test: /\.svg$/,
-        exclude: excludeNodeModulesExcept(['@elliemae/*']),
-        use: [
-          {
-            loader: '@svgr/webpack',
-          },
-          {
-            loader: 'file-loader',
-            options: {
-              name: getMediaPath(),
-            },
-          },
-        ],
+        test: /\.svg$/i,
+        issuer: /\.[jt]sx?$/,
+        resourceQuery: /^((?!url).)*$/,
+        use: ['@svgr/webpack'],
       },
       {
         test: /\.(jpe?g|png|gif|ico)$/i,
@@ -219,15 +178,18 @@ module.exports = (options) => ({
         resourceQuery: /resource/,
         type: 'asset/resource',
       },
+      {
+        type: 'asset',
+        resourceQuery: /url/,
+      },
     ],
   },
   plugins: plugins.concat(options.plugins || []),
   resolve: {
     modules: ['node_modules', 'app', 'lib'],
-    extensions: ['.wasm', '.mjs', '.ts', '.tsx', '.js', '.jsx', '.json'],
+    extensions: ['.js', '.jsx', '.ts', '.tsx', '.json', '.wasm', '.mjs'],
     mainFields: ['browser', 'module', 'main'],
     alias: {
-      'lodash-es': 'lodash',
       ...getAlias(),
       ...((options.resolve || {}).alias || {}),
     },
@@ -238,6 +200,5 @@ module.exports = (options) => ({
     '@elliemae/pui-diagnostics': 'emuiDiagnostics',
   },
   devtool: options.devtool || 'eval-source-map',
-  target: 'web', // Make web variables accessible to webpack, e.g. window
   performance: options.performance || {},
 });

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

@@ -28,6 +28,7 @@ module.exports = require('./webpack.lib.base.babel')({
   // Add development plugins
   plugins: [
     new HtmlWebpackPlugin({
+      scriptLoading: 'module',
       inject: true, // Inject all files that are generated by webpack, e.g. bundle.js
       template: 'lib/index.pug',
       filename: 'index.html',
@@ -43,8 +44,6 @@ module.exports = require('./webpack.lib.base.babel')({
     }),
   ],
 
-  // Emit a source map for easier debugging
-  // See https://webpack.js.org/configuration/devtool/#devtool
   devtool: 'eval-source-map',
 
   performance: {

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

@@ -1,11 +1,11 @@
 const path = require('path');
-const CompressionPlugin = require('compression-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const { ESBuildMinifyPlugin } = require('esbuild-loader');
-const { getLibraryName } = require('./helpers');
-const { ESBUILD_TARGET } = require('../esbuild');
+const { getLibraryName, getCompressionPlugins } = require('./helpers');
+const { getPUIConfig } = require('../pui-config');
+const { esBuild } = getPUIConfig();
 
 const libraryName = getLibraryName();
 
@@ -24,7 +24,7 @@ module.exports = require('./webpack.lib.base.babel')({
     minimize: true,
     minimizer: [
       new ESBuildMinifyPlugin({
-        target: ESBUILD_TARGET,
+        target: esBuild.target,
         css: true,
       }),
     ],
@@ -39,6 +39,7 @@ module.exports = require('./webpack.lib.base.babel')({
   plugins: [
     // Minify and optimize the index.html
     new HtmlWebpackPlugin({
+      scriptLoading: 'module',
       template: 'lib/index.pug',
       filename: 'index.html',
       libraryName,
@@ -62,13 +63,7 @@ module.exports = require('./webpack.lib.base.babel')({
       chunkFilename: `css/${libraryName}.[contenthash].chunk.css`,
     }),
 
-    new CompressionPlugin({
-      filename: '[path][base].gz',
-      algorithm: 'gzip',
-      test: /\.js$|\.css$$/,
-      // we are compressing all files since in aws cloudfront edge lambda, we don't want to whitelist files that are not compressed due to below limits
-      minRatio: Number.MAX_SAFE_INTEGER,
-    }),
+    ...getCompressionPlugins(true),
 
     new BundleAnalyzerPlugin({
       analyzerMode: 'static',

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

@@ -2,10 +2,10 @@
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { GenerateSW } = require('workbox-webpack-plugin');
-const CompressionPlugin = require('compression-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const { ESBuildMinifyPlugin } = require('esbuild-loader');
+const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 
 const baseConfigFactory = require('./webpack.base.babel');
 const {
@@ -15,8 +15,10 @@ const {
   getPaths,
   getAppVersion,
   isGoogleTagManagerEnabled,
+  getCompressionPlugins,
 } = require('./helpers');
-const { ESBUILD_TARGET } = require('../esbuild');
+const { getPUIConfig } = require('../pui-config');
+const { esBuild } = getPUIConfig();
 
 const getProdConfig = ({ latestVersion = true } = {}) => {
   const { buildPath, publicPath } = getPaths(latestVersion);
@@ -41,7 +43,7 @@ const getProdConfig = ({ latestVersion = true } = {}) => {
       moduleIds: 'deterministic',
       minimizer: [
         new ESBuildMinifyPlugin({
-          target: ESBUILD_TARGET,
+          target: esBuild.target,
           css: true,
         }),
       ],
@@ -63,25 +65,12 @@ const getProdConfig = ({ latestVersion = true } = {}) => {
     },
 
     plugins: [
-      new MiniCssExtractPlugin({
-        filename: 'css/[name].[contenthash].css',
-        chunkFilename: 'css/[name].[contenthash].chunk.css',
-      }),
+      // new MiniCssExtractPlugin({
+      //   filename: 'css/[name].[contenthash].css',
+      //   chunkFilename: 'css/[name].[contenthash].chunk.css',
+      // }),
 
-      new CompressionPlugin({
-        filename: '[path][base].gz',
-        algorithm: 'gzip',
-        test: /\.js$|\.css$$/,
-        exclude: [
-          /\/adrum-ext/,
-          /\/emuiUserMonitoring/,
-          /\/emuiDiagnostics/,
-          /\/emuiAppLoader/,
-          /\/encwLoader/,
-        ],
-        // we are compressing all files since in aws cloudfront edge lambda, we don't want to whitelist files that are not compressed due to below limits
-        minRatio: Number.MAX_SAFE_INTEGER,
-      }),
+      ...getCompressionPlugins(),
 
       new BundleAnalyzerPlugin({
         analyzerMode: 'static',
@@ -114,6 +103,7 @@ const {
   encwLoaderScriptPath,
 } = getPaths();
 const htmlWebpackPlugin = new HtmlWebpackPlugin({
+  scriptLoading: 'module',
   filename: '../index.html',
   inject: !isAppLoaderEnabled(),
   template: !isAppLoaderEnabled()
@@ -155,6 +145,22 @@ const appVersionConfig = baseConfigFactory(
   getProdConfig({ latestVersion: false }),
 );
 
-module.exports = isVersionedApp
-  ? [latestVersionConfig, appVersionConfig]
-  : latestVersionConfig;
+const addSMPPlugin = (config) => {
+  const smpConfig = new SpeedMeasurePlugin({
+    disable: !process.env.MEASURE,
+  }).wrap(config);
+  // mini css extract plugin is not working fine with smp
+  smpConfig.plugins.push(
+    new MiniCssExtractPlugin({
+      filename: 'css/[name].[contenthash].css',
+      chunkFilename: 'css/[name].[contenthash].chunk.css',
+    }),
+  );
+  return smpConfig;
+};
+
+const config = isVersionedApp
+  ? [latestVersionConfig, appVersionConfig].map(addSMPPlugin)
+  : addSMPPlugin(latestVersionConfig);
+
+module.exports = config;

package/lib/webpack/webpack.storybook.js

@@ -1,20 +1,13 @@
-/* eslint-disable max-lines */
 const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const CompressionPlugin = require('compression-webpack-plugin');
-const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
+const ResolveTypeScriptPlugin = require('resolve-typescript-plugin').default;
 const {
   getAppConfig,
   isApp,
   getAlias,
-  excludeNodeModulesExcept,
-  modulesToTranspile,
-  resolveExtensions,
-  mainFields,
-  getMediaPath,
+  getCompressionPlugins,
 } = require('./helpers');
-const { ESBUILD_TARGET } = require('../esbuild');
 
 const IS_APP = isApp();
 const CWD = process.cwd();
@@ -51,116 +44,38 @@ const getAdditionalPlugins = () => [
   }),
 ];
 
-const compressionPlugin = new CompressionPlugin({
-  filename: '[path][base].gz',
-  algorithm: 'gzip',
-  test: /\.js$|\.css$$/,
-  // we are compressing all files since in aws cloudfront edge lambda, we don't want to whitelist files that are not compressed due to below limits
-  minRatio: Number.MAX_SAFE_INTEGER,
-});
-
-const getModulePreRules = () => [
-  {
-    test: /\.(jpe?g|png|gif|svg|ico)$/,
-    use: [
-      'file-loader',
-      {
-        loader: 'image-webpack-loader',
-        options: {
-          gifsicle: {
-            enabled: false,
-          },
-        },
-      },
-    ],
-    enforce: 'pre',
-  },
-  {
-    test: /\.(js|ts|jsx|tsx)$/,
-    enforce: 'pre',
-    exclude: /node_modules/,
-    resolve: {
-      fullySpecified: false,
-    },
-    use: [
-      {
-        loader: 'webpack-strip-block',
-        options: {
-          start: 'TEST:START',
-          end: 'TEST:END',
-        },
-      },
-    ],
-  },
-];
-
 const getModuleRules = () => [
   {
-    test: /\.(js|ts|jsx|tsx)$/,
-    exclude: excludeNodeModulesExcept(modulesToTranspile),
-    resolve: {
-      fullySpecified: false,
-    },
-    use: {
-      loader: 'esbuild-loader',
-      options: {
-        loader: 'jsx',
-        target: ESBUILD_TARGET,
-      },
-    },
-  },
-  {
-    test: /\.(woff|woff2)$/,
-    exclude: excludeNodeModulesExcept(['@elliemae/*']),
-    type: 'asset/resource',
-  },
-  {
-    test: /\.svg$/,
-    exclude: excludeNodeModulesExcept(['@elliemae/*']),
-    use: [
-      {
-        loader: '@svgr/webpack',
-      },
-      {
-        loader: 'file-loader',
-        options: {
-          name: getMediaPath(),
-        },
-      },
-    ],
-  },
-  {
-    test: /\.(jpe?g|png|gif|ico)$/i,
-    exclude: excludeNodeModulesExcept(['@elliemae/*']),
     type: 'asset',
+    resourceQuery: /url/,
   },
   {
-    test: /\.(mp4|webm)$/,
-    exclude: excludeNodeModulesExcept(['@elliemae/*']),
-    type: 'asset',
+    test: /\.svg$/i,
+    issuer: /\.[jt]sx?$/,
+    resourceQuery: /^((?!url).)*$/,
+    use: ['@svgr/webpack'],
   },
 ];
 
 exports.webpackFinal = async (config, { configType }) => {
   const isProd = configType === 'PRODUCTION';
-  // remove asset processing that comes with storybook webpack, we will use ours
-  config.module.rules = config.module.rules.filter(
-    ({ type }) => type !== 'asset/resource',
+  const fileLoaderRule = config.module.rules.find((rule) =>
+    rule.test?.test?.('.svg'),
   );
-  config.module.rules.push(...getModulePreRules());
-  config.module.rules.unshift(...getModuleRules(isProd));
-
+  fileLoaderRule.exclude = /\.svg$/i;
+  config.module.rules.unshift(...getModuleRules());
   config.plugins.push(...getAdditionalPlugins());
   if (isProd) {
-    config.plugins.push(compressionPlugin);
+    config.plugins = config.plugins.concat(getCompressionPlugins());
   }
 
   config.resolve.alias = { ...config.resolve.alias, ...getAlias() };
   config.resolve.fallback = { ...config.resolve.fallback, crypto: false };
-  config.resolve.plugins = (config.resolve.plugins || []).concat([
-    new TsconfigPathsPlugin({ extensions: resolveExtensions, mainFields }),
-  ]);
-
+  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';
@@ -170,7 +85,7 @@ exports.webpackFinal = async (config, { configType }) => {
 
 // storybook manager webpack
 exports.managerWebpack = async (config) => {
-  config.plugins.push(compressionPlugin);
+  config.plugins = config.plugins.concat(getCompressionPlugins());
   config.resolve.alias = { ...config.resolve.alias, ...getAlias() };
   return config;
 };