enhance: Improve chunk naming during analyze and nohash

ntucker · Apr 14, 2021 · 7293214 · 7293214
1 parent ae464d8
commit 7293214
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
   "scripts": {
     "release": "lerna publish",
     "build": "lerna run build --stream",
-    "build:sizecompare": "yarn workspace anansi-example-typescript build --env nohash",
+    "build:sizecompare": "yarn workspace anansi-example-typescript build:clean && yarn workspace anansi-example-typescript build --env nohash",
     "prepare": "husky install && yarn lerna run build --ignore anansi-example-linaria --ignore anansi-example-typescript"
   },
   "devDependencies": {

diff --git a/packages/webpack-config-anansi/src/base/index.js b/packages/webpack-config-anansi/src/base/index.js
@@ -26,7 +26,7 @@ export default function makeBaseConfig({
   extraJsLoaders,
   linariaOptions,
   tsconfigPathsOptions,
-  env,
+  nohash,
   argv,
 }) {
   const babelLoader = generateBabelLoader({
@@ -60,8 +60,8 @@ export default function makeBaseConfig({
     output: {
       path: path.join(rootPath, buildDir),
       publicPath: WEBPACK_PUBLIC_HOST + WEBPACK_PUBLIC_PATH,
-      filename: env?.nohash ? '[name].js' : '[name]-[contenthash].js',
-      chunkFilename: env?.nohash ? '[name].chunk.js' : '[name]-[contenthash].chunk.js',
+      filename: nohash ? '[name].js' : '[name]-[contenthash].js',
+      chunkFilename: nohash ? '[name].chunk.js' : '[name]-[contenthash].chunk.js',
       globalObject: "(typeof self !== 'undefined' ? self : this)",
     },
     cache: {
@@ -81,9 +81,9 @@ export default function makeBaseConfig({
       }),
       new MiniCssExtractPlugin({
         filename:
-          mode !== 'production' | env?.nohash ? '[name].css' : '[name].[contenthash].css',
+          mode !== 'production' | nohash ? '[name].css' : '[name].[contenthash].css',
         chunkFilename:
-          mode !== 'production' | env?.nohash ? '[name].css' : '[name].[contenthash].css',
+          mode !== 'production' | nohash ? '[name].css' : '[name].[contenthash].css',
       }),
     ],
     module: {
@@ -142,7 +142,7 @@ export default function makeBaseConfig({
             {
               loader: require.resolve('file-loader'),
               options: {
-                name: env?.nohash
+                name: nohash
                   ? '[name].[ext]'
                   : mode === 'production'
                       ? '[name].[contenthash].[ext]'

diff --git a/packages/webpack-config-anansi/src/index.js b/packages/webpack-config-anansi/src/index.js
@@ -28,6 +28,7 @@ export function makeConfig(options) {
       extraJsLoaders: [],
       ...options,
       mode: argv?.mode || process.env.NODE_ENV,
+      nohash: env?.nohash ?? env?.analyze ?? process.env.WEBPACK_ANALYZE === 'true',
       argv,
       env,
     };

diff --git a/packages/webpack-config-anansi/src/prod.js b/packages/webpack-config-anansi/src/prod.js
@@ -26,6 +26,7 @@ export default function makeProdConfig(
     cssModulesOptions,
     fontPreload,
     svgoOptions,
+    nohash,
   },
 ) {
   const config = { ...baseConfig };
@@ -118,6 +119,9 @@ export default function makeProdConfig(
       name: 'webpack-runtime',
     },
   };
+  if (nohash) {
+    config.optimization.chunkIds = 'named';
+  }
   if (!env.readable) {
     config.optimization.minimizer = [
       new TerserPlugin({