@elliemae/pui-cli 6.0.0-beta.14 → 6.0.0-beta.15

package/lib/server/index.js

@@ -60,12 +60,20 @@ const customHost = argv.host || process.env.HOST;
 const host = customHost || null; // Let http.Server use its default IPv6/4 host
 const prettyHost = customHost || 'localhost';
 
-// use the gzipped bundle
-app.get('*.js', (req, res, next) => {
-  req.url += '.gz';
-  res.set('Content-Encoding', 'gzip');
+const serveCompressedAssets = (req, res, next) => {
+  if (req.header('Accept-Encoding').includes('br')) {
+    req.url += '.br';
+    res.set('Content-Encoding', 'br');
+  } else {
+    req.url += '.gz';
+    res.set('Content-Encoding', 'gzip');
+  }
   next();
-});
+};
+
+// use the compressed bundle
+app.get('*.js', serveCompressedAssets);
+app.get('*.css', serveCompressedAssets);
 
 // Start your app.
 app.listen(port, host, async (err) => {

package/lib/webpack/helpers.js

@@ -2,6 +2,8 @@
 const path = require('path');
 const fs = require('fs');
 const _ = require('lodash');
+const CompressionPlugin = require('compression-webpack-plugin');
+const zlib = require('zlib');
 
 let pathSep = path.sep;
 if (pathSep === '\\')
@@ -184,6 +186,38 @@ const isGoogleTagManagerEnabled = () => {
   return !!appConfig?.googleTagManager;
 };
 
+const getCompressionPlugins = () => {
+  const commonConfig = {
+    test: /\.(js|css|html|svg)$/,
+    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,
+  };
+  return [
+    new CompressionPlugin({
+      filename: '[path][base].gz',
+      algorithm: 'gzip',
+      ...commonConfig,
+    }),
+    new CompressionPlugin({
+      filename: '[path][base].br',
+      algorithm: 'brotliCompress',
+      ...commonConfig,
+      compressionOptions: {
+        params: {
+          [zlib.constants.BROTLI_PARAM_QUALITY]: 11,
+        },
+      },
+    }),
+  ];
+};
+
 exports.excludeNodeModulesExcept = excludeNodeModulesExcept;
 exports.getLibraryName = getLibraryName;
 exports.getAppConfig = getAppConfig;
@@ -208,3 +242,4 @@ exports.resolveExtensions = [
 ];
 exports.mainFields = ['browser', 'module', 'main'];
 exports.isGoogleTagManagerEnabled = isGoogleTagManagerEnabled;
+exports.getCompressionPlugins = getCompressionPlugins;

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

@@ -1,10 +1,9 @@
 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 { getLibraryName, getCompressionPlugins } = require('./helpers');
 const { ESBUILD_TARGET } = require('../esbuild');
 
 const libraryName = getLibraryName();
@@ -62,13 +61,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(),
 
     new BundleAnalyzerPlugin({
       analyzerMode: 'static',

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

@@ -2,7 +2,6 @@
 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');
@@ -15,6 +14,7 @@ const {
   getPaths,
   getAppVersion,
   isGoogleTagManagerEnabled,
+  getCompressionPlugins,
 } = require('./helpers');
 const { ESBUILD_TARGET } = require('../esbuild');
 
@@ -68,20 +68,7 @@ const getProdConfig = ({ latestVersion = true } = {}) => {
         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',

package/lib/webpack/webpack.storybook.js

@@ -1,13 +1,11 @@
-/* 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 {
   getAppConfig,
   isApp,
   getAlias,
-  excludeNodeModulesExcept,
+  getCompressionPlugins,
 } = require('./helpers');
 
 const IS_APP = isApp();
@@ -45,30 +43,7 @@ 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',
@@ -88,45 +63,12 @@ const getModulePreRules = () => [
   },
 ];
 
-const getModuleRules = () => [
-  {
-    test: /\.(woff|woff2)$/,
-    exclude: excludeNodeModulesExcept(['@elliemae/*']),
-    type: 'asset/resource',
-  },
-  {
-    type: 'asset',
-    resourceQuery: /url/, // *.svg?react
-  },
-  {
-    test: /\.svg$/i,
-    issuer: /\.[jt]sx?$/,
-    use: ['@svgr/webpack'],
-  },
-  {
-    test: /\.(jpe?g|png|gif|ico)$/i,
-    exclude: excludeNodeModulesExcept(['@elliemae/*']),
-    type: 'asset',
-  },
-  {
-    test: /\.(mp4|webm)$/,
-    exclude: excludeNodeModulesExcept(['@elliemae/*']),
-    type: 'asset',
-  },
-];
-
 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',
-  );
   config.module.rules.push(...getModulePreRules());
-  config.module.rules.unshift(...getModuleRules(isProd));
-
   config.plugins.push(...getAdditionalPlugins());
   if (isProd) {
-    config.plugins.push(compressionPlugin);
+    config.plugins = config.plugins.concat(getCompressionPlugins());
   }
 
   config.resolve.alias = { ...config.resolve.alias, ...getAlias() };
@@ -141,7 +83,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;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/pui-cli",
-  "version": "6.0.0-beta.14",
+  "version": "6.0.0-beta.15",
   "private": false,
   "description": "EllieMae Platform UI CLI",
   "sideEffects": false,
@@ -148,7 +148,7 @@
     "eslint-plugin-react": "~7.27.1",
     "eslint-plugin-react-hooks": "~4.3.0",
     "eslint-plugin-redux-saga": "~1.2.1",
-    "eslint-plugin-storybook": "~0.5.1",
+    "eslint-plugin-storybook": "~0.5.2",
     "eslint-plugin-testing-library": "~5.0.1",
     "eslint-plugin-wdio": "~7.4.2",
     "execa": "~5.1.1",