webpack-bundle-analyzer 3.7.0 → 3.8.0

package/CHANGELOG.md

@@ -14,6 +14,17 @@ _Note: Gaps between patch versions are faulty, broken or test releases._
 
 <!-- Add changelog entries for new changes under this section -->
 
+## 3.8.0
+
+ * **Improvement**
+   * Added support for exports.modules when webpack target = node ([#345](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/345) by [@Spikef](https://github.com/Spikef))
+
+ * **New Feature**
+   * Support [WebWorkerChunkTemplatePlugin](https://github.com/webpack/webpack/blob/c9d4ff7b054fc581c96ce0e53432d44f9dd8ca72/lib/webworker/WebWorkerChunkTemplatePlugin.js) ([#353](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/353) by [@Gongreg](https://github.com/Gongreg))
+
+ * **Bug Fix**
+   * Support any custom `globalObject` option in Webpack Config. ([#352](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/352) by [@Gongreg](https://github.com/Gongreg))
+
 ## 3.7.0
 
  * **New Feature**

package/lib/parseUtils.js

@@ -25,6 +25,20 @@ function parseBundle(bundlePath) {
     locations: null
   };
   walk.recursive(ast, walkState, {
+    AssignmentExpression(node, state) {
+      if (state.locations) return; // Modules are stored in exports.modules:
+      // exports.modules = {};
+
+      const {
+        left,
+        right
+      } = node;
+
+      if (left && left.object && left.object.name === 'exports' && left.property && left.property.name === 'modules' && isModulesHash(right)) {
+        state.locations = getModulesLocations(right);
+      }
+    },
+
     CallExpression(node, state, c) {
       if (state.locations) return;
       const args = node.arguments; // Main chunk with webpack loader.
@@ -50,6 +64,14 @@ function parseBundle(bundlePath) {
       if (isAsyncChunkPushExpression(node)) {
         state.locations = getModulesLocations(args[0].elements[1]);
         return;
+      } // Webpack v4 WebWorkerChunkTemplatePlugin
+      // globalObject.chunkCallbackName([<chunks>],<modules>, ...);
+      // Both globalObject and chunkCallbackName can be changed through the config, so we can't check them.
+
+
+      if (isAsyncWebWorkerChunkExpression(node)) {
+        state.locations = getModulesLocations(args[1]);
+        return;
       } // Walking into arguments because some of plugins (e.g. `DedupePlugin`) or some Webpack
       // features (e.g. `umd` library output) can wrap modules list into additional IIFE.
 
@@ -129,15 +151,22 @@ function isAsyncChunkPushExpression(node) {
     callee,
     arguments: args
   } = node;
-  return callee.type === 'MemberExpression' && callee.property.name === 'push' && callee.object.type === 'AssignmentExpression' && callee.object.left.object && (callee.object.left.object.name === 'window' || // `self` is a common output.globalObject value used to support both workers and browsers
-  callee.object.left.object.name === 'self' || // Webpack 4 uses `this` instead of `window`
-  callee.object.left.object.type === 'ThisExpression') && args.length === 1 && args[0].type === 'ArrayExpression' && mayBeAsyncChunkArguments(args[0].elements) && isModulesList(args[0].elements[1]);
+  return callee.type === 'MemberExpression' && callee.property.name === 'push' && callee.object.type === 'AssignmentExpression' && args.length === 1 && args[0].type === 'ArrayExpression' && mayBeAsyncChunkArguments(args[0].elements) && isModulesList(args[0].elements[1]);
 }
 
 function mayBeAsyncChunkArguments(args) {
   return args.length >= 2 && isChunkIds(args[0]);
 }
 
+function isAsyncWebWorkerChunkExpression(node) {
+  const {
+    callee,
+    type,
+    arguments: args
+  } = node;
+  return type === 'CallExpression' && callee.type === 'MemberExpression' && args.length === 2 && isChunkIds(args[0]) && isModulesList(args[1]);
+}
+
 function getModulesLocations(node) {
   if (node.type === 'ObjectExpression') {
     // Modules hash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-bundle-analyzer",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "Webpack plugin and CLI utility that represents bundle content as convenient interactive zoomable treemap",
   "author": "Yury Grunin <grunin.ya@ya.ru>",
   "license": "MIT",

package/src/parseUtils.js

@@ -25,6 +25,22 @@ function parseBundle(bundlePath) {
     ast,
     walkState,
     {
+      AssignmentExpression(node, state) {
+        if (state.locations) return;
+
+        // Modules are stored in exports.modules:
+        // exports.modules = {};
+        const {left, right} = node;
+
+        if (
+          left &&
+          left.object && left.object.name === 'exports' &&
+          left.property && left.property.name === 'modules' &&
+          isModulesHash(right)
+        ) {
+          state.locations = getModulesLocations(right);
+        }
+      },
       CallExpression(node, state, c) {
         if (state.locations) return;
 
@@ -63,6 +79,15 @@ function parseBundle(bundlePath) {
           return;
         }
 
+        // Webpack v4 WebWorkerChunkTemplatePlugin
+        // globalObject.chunkCallbackName([<chunks>],<modules>, ...);
+        // Both globalObject and chunkCallbackName can be changed through the config, so we can't check them.
+        if (isAsyncWebWorkerChunkExpression(node)) {
+          state.locations = getModulesLocations(args[1]);
+          return;
+        }
+
+
         // Walking into arguments because some of plugins (e.g. `DedupePlugin`) or some Webpack
         // features (e.g. `umd` library output) can wrap modules list into additional IIFE.
         _.each(args, arg => c(arg, state));
@@ -182,14 +207,6 @@ function isAsyncChunkPushExpression(node) {
     callee.type === 'MemberExpression' &&
     callee.property.name === 'push' &&
     callee.object.type === 'AssignmentExpression' &&
-    callee.object.left.object &&
-    (
-      callee.object.left.object.name === 'window' ||
-      // `self` is a common output.globalObject value used to support both workers and browsers
-      callee.object.left.object.name === 'self' ||
-      // Webpack 4 uses `this` instead of `window`
-      callee.object.left.object.type === 'ThisExpression'
-    ) &&
     args.length === 1 &&
     args[0].type === 'ArrayExpression' &&
     mayBeAsyncChunkArguments(args[0].elements) &&
@@ -204,6 +221,18 @@ function mayBeAsyncChunkArguments(args) {
   );
 }
 
+function isAsyncWebWorkerChunkExpression(node) {
+  const {callee, type, arguments: args} = node;
+
+  return (
+    type === 'CallExpression' &&
+    callee.type === 'MemberExpression' &&
+    args.length === 2 &&
+    isChunkIds(args[0]) &&
+    isModulesList(args[1])
+  );
+}
+
 function getModulesLocations(node) {
   if (node.type === 'ObjectExpression') {
     // Modules hash