webpack-bundle-analyzer 4.9.0 → 4.9.1

package/CHANGELOG.md

@@ -12,6 +12,15 @@ _Note: Gaps between patch versions are faulty, broken or test releases._
 
 ## UNRELEASED
 
+## 4.9.1
+
+* **Internal**
+  * Replace some lodash usages with JavaScript native API ([#505](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/505)) by [@sukkaw](https://github.com/sukkaw).
+  * Make module much slimmer ([#609](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/609)) by [@sukkaw](https://github.com/sukkaw).
+
+* **Bug Fix**
+  * fix `analyzerMode: 'server'` on certain machines ([#611](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/611) by [@panbenson](https://github.com/panbenson))
+
 ## 4.9.0
 
 * **Improvement**

package/lib/BundleAnalyzerPlugin.js

@@ -6,7 +6,7 @@ const path = require('path');
 
 const {
   bold
-} = require('chalk');
+} = require('picocolors');
 
 const Logger = require('./Logger');
 

package/lib/analyzer.js

@@ -4,7 +4,13 @@ const fs = require('fs');
 
 const path = require('path');
 
-const _ = require('lodash');
+const pullAll = require('lodash.pullall');
+
+const invokeMap = require('lodash.invokemap');
+
+const uniqBy = require('lodash.uniqby');
+
+const flatten = require('lodash.flatten');
 
 const gzipSize = require('gzip-size');
 
@@ -38,7 +44,7 @@ function getViewerData(bundleStats, bundleDir, opts) {
   } = opts || {};
   const isAssetIncluded = createAssetsFilter(excludeAssets); // Sometimes all the information is located in `children` array (e.g. problem in #10)
 
-  if (_.isEmpty(bundleStats.assets) && !_.isEmpty(bundleStats.children)) {
+  if ((bundleStats.assets == null || bundleStats.assets.length === 0) && bundleStats.children && bundleStats.children.length > 0) {
     const {
       children
     } = bundleStats;
@@ -51,7 +57,7 @@ function getViewerData(bundleStats, bundleDir, opts) {
         bundleStats.assets.push(asset);
       });
     }
-  } else if (!_.isEmpty(bundleStats.children)) {
+  } else if (bundleStats.children && bundleStats.children.length > 0) {
     // Sometimes if there are additional child chunks produced add them as child assets
     bundleStats.children.forEach(child => {
       child.assets.forEach(asset => {
@@ -71,7 +77,7 @@ function getViewerData(bundleStats, bundleDir, opts) {
 
 
     asset.name = asset.name.replace(FILENAME_QUERY_REGEXP, '');
-    return FILENAME_EXTENSIONS.test(asset.name) && !_.isEmpty(asset.chunks) && isAssetIncluded(asset.name);
+    return FILENAME_EXTENSIONS.test(asset.name) && asset.chunks.length > 0 && isAssetIncluded(asset.name);
   }); // Trying to parse bundle assets and get real module sizes if `bundleDir` is provided
 
   let bundlesSources = null;
@@ -93,11 +99,14 @@ function getViewerData(bundleStats, bundleDir, opts) {
         continue;
       }
 
-      bundlesSources[statAsset.name] = _.pick(bundleInfo, 'src', 'runtimeSrc');
+      bundlesSources[statAsset.name] = {
+        src: bundleInfo.src,
+        runtimeSrc: bundleInfo.runtimeSrc
+      };
       Object.assign(parsedModules, bundleInfo.modules);
     }
 
-    if (_.isEmpty(bundlesSources)) {
+    if (Object.keys(bundlesSources).length === 0) {
       bundlesSources = null;
       parsedModules = null;
       logger.warn('\nNo bundles were parsed. Analyzer will show only original module sizes from stats file.\n');
@@ -108,10 +117,10 @@ function getViewerData(bundleStats, bundleDir, opts) {
     // If asset is a childAsset, then calculate appropriate bundle modules by looking through stats.children
     const assetBundles = statAsset.isChild ? getChildAssetBundles(bundleStats, statAsset.name) : bundleStats;
     const modules = assetBundles ? getBundleModules(assetBundles) : [];
-
-    const asset = result[statAsset.name] = _.pick(statAsset, 'size');
-
-    const assetSources = bundlesSources && _.has(bundlesSources, statAsset.name) ? bundlesSources[statAsset.name] : null;
+    const asset = result[statAsset.name] = {
+      size: statAsset.size
+    };
+    const assetSources = bundlesSources && Object.prototype.hasOwnProperty.call(bundlesSources, statAsset.name) ? bundlesSources[statAsset.name] : null;
 
     if (assetSources) {
       asset.parsedSize = Buffer.byteLength(assetSources.src);
@@ -142,8 +151,7 @@ function getViewerData(bundleStats, bundleDir, opts) {
           unparsedEntryModules[0].parsedSrc = assetSources.runtimeSrc;
         } else {
           // If there are multiple entry points we move all of them under synthetic concatenated module.
-          _.pullAll(assetModules, unparsedEntryModules);
-
+          pullAll(assetModules, unparsedEntryModules);
           assetModules.unshift({
             identifier: './entry modules',
             name: './entry modules',
@@ -173,7 +181,7 @@ function getViewerData(bundleStats, bundleDir, opts) {
       statSize: asset.tree.size || asset.size,
       parsedSize: asset.parsedSize,
       gzipSize: asset.gzipSize,
-      groups: _.invokeMap(asset.tree.children, 'toChartData'),
+      groups: invokeMap(asset.tree.children, 'toChartData'),
       isInitialByEntrypoint: (_chunkToInitialByEntr = chunkToInitialByEntrypoint[filename]) !== null && _chunkToInitialByEntr !== void 0 ? _chunkToInitialByEntr : {}
     };
   });
@@ -186,12 +194,14 @@ function readStatsFromFile(filename) {
 }
 
 function getChildAssetBundles(bundleStats, assetName) {
-  return (bundleStats.children || []).find(c => _(c.assetsByChunkName).values().flatten().includes(assetName));
+  return flatten((bundleStats.children || []).find(c => Object.values(c.assetsByChunkName))).includes(assetName);
 }
 
 function getBundleModules(bundleStats) {
-  return _(bundleStats.chunks).map('modules').concat(bundleStats.modules).compact().flatten().uniqBy('id') // Filtering out Webpack's runtime modules as they don't have ids and can't be parsed (introduced in Webpack 5)
-  .reject(isRuntimeModule).value();
+  var _bundleStats$chunks;
+
+  return uniqBy(flatten((((_bundleStats$chunks = bundleStats.chunks) === null || _bundleStats$chunks === void 0 ? void 0 : _bundleStats$chunks.map(chunk => chunk.modules)) || []).concat(bundleStats.modules).filter(Boolean)), 'id' // Filtering out Webpack's runtime modules as they don't have ids and can't be parsed (introduced in Webpack 5)
+  ).filter(m => !isRuntimeModule(m));
 }
 
 function assetHasModule(statAsset, statModule) {

package/lib/bin/analyzer.js

@@ -10,7 +10,7 @@ const commander = require('commander');
 
 const {
   magenta
-} = require('chalk');
+} = require('picocolors');
 
 const analyzer = require('../analyzer');
 

package/lib/parseUtils.js

@@ -2,8 +2,6 @@
 
 const fs = require('fs');
 
-const _ = require('lodash');
-
 const acorn = require('acorn');
 
 const walk = require('acorn-walk');
@@ -116,12 +114,12 @@ function parseBundle(bundlePath) {
     }
 
   });
-  let modules;
+  const modules = {};
 
   if (walkState.locations) {
-    modules = _.mapValues(walkState.locations, loc => content.slice(loc.start, loc.end));
-  } else {
-    modules = {};
+    Object.entries(walkState.locations).forEach(([id, loc]) => {
+      modules[id] = content.slice(loc.start, loc.end);
+    });
   }
 
   return {

package/lib/template.js

@@ -5,7 +5,7 @@ const path = require('path');
 
 const fs = require('fs');
 
-const _ = require('lodash');
+const escape = require('lodash.escape');
 
 const projectRoot = path.resolve(__dirname, '..');
 const assetsRoot = path.join(projectRoot, 'public');
@@ -34,10 +34,10 @@ function html(strings, ...values) {
 
 function getScript(filename, mode) {
   if (mode === 'static') {
-    return `<!-- ${_.escape(filename)} -->
+    return `<!-- ${escape(filename)} -->
 <script>${getAssetContent(filename)}</script>`;
   } else {
-    return `<script src="${_.escape(filename)}"></script>`;
+    return `<script src="${escape(filename)}"></script>`;
   }
 }
 
@@ -54,7 +54,7 @@ function renderViewer({
   <head>
     <meta charset="UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <title>${_.escape(title)}</title>
+    <title>${escape(title)}</title>
     <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABrVBMVEUAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////+O1foceMD///+J0/qK1Pr7/v8Xdr/9///W8P4UdL7L7P0Scr2r4Pyj3vwad8D5/f/2/f+55f3E6f34+/2H0/ojfMKpzOd0rNgQcb3F3O/j9f7c8v6g3Pz0/P/w+v/q+P7n9v6T1/uQ1vuE0vqLut/y+v+Z2fvt+f+15Pzv9fuc2/vR7v2V2Pvd6/bg9P7I6/285/2y4/yp3/zp8vk8i8kqgMT7/P31+fyv4vxGkcz6/P6/6P3j7vfS5PNnpNUxhcbO7f7F6v3O4vHK3/DA2u631Ouy0eqXweKJud5wqthfoNMMbLvY8f73+v2dxeR8sNtTmdDx9/zX6PSjyeaCtd1YnNGX2PuQveCGt95Nls42h8dLlM3F4vBtAAAAM3RSTlMAAyOx0/sKBvik8opWGBMOAe3l1snDm2E9LSb06eHcu5JpHbarfHZCN9CBb08zzkdNS0kYaptYAAAFV0lEQVRYw92X51/aYBDHHS2O2qqttVbrqNq9m+TJIAYIShBkWwqIiCgoWvfeq7Z2/s29hyQNyUcR7LveGwVyXy6XH8/9rqxglLfUPLxVduUor3h0rfp2TYvpivk37929TkG037hffoX0+peVtZQc1589rigVUdXS/ABSAyEmGIO/1XfvldSK8vs3OqB6u3m0nxmIrvgB0dj7rr7Y9IbuF68hnfFaiHA/sxqm0wciIG43P60qKv9WXWc1RXGh/mFESFABTSBi0sNAKzqet17eCtOb3kZIDwxEEU0oAIJGYxNBDhBND29e0rtXXbcpuPmED9IhEAAQ/AXEaF8EPmnrrKsv0LvWR3fg5sWDNAFZOgAgaKvZDogHNU9MFwnnYROkc56RD5CjAbQX9Ow4g7upCsvYu55aSI/Nj0H1akgKQEUM94dwK65hYRmFU9MIcH/fqJYOZYcnuJSU/waKDgTOEVaVKhwrTRP5XzgSpAITYzom7UvkhFX5VutmxeNnWDjjswTKTyfgluNDGbUpWissXhF3s7mlSml+czWkg3D0l1nNjGNjz3myOQOa1KM/jOS6ebdbAVTCi4gljHSFrviza7tOgRWcS0MOUX9zdNgag5w7rRqA44Lzw0hr1WqES36dFliSJFlh2rXIae3FFcDDgKdxrUIDePr8jGcSClV1u7A9xeN0ModY/pHMxmR1EzRh8TJiwqsHmKW0l4FCEZI+jHio+JdPPE9qwQtTRxku2D8sIeRL2LnxWSllANCQGOIiqVHAz2ye2JR0DcH+HoxDkaADLjgxjKQ+AwCX/g0+DNgdG0ukYCONAe+dbc2IAc6fwt1ARoDSezNHxV2Cmzwv3O6lDMV55edBGwGK9n1+x2F8EDfAGCxug8MhpsMEcTEAWf3rx2vZhe/LAmtIn/6apE6PN0ULKgywD9mmdxbmFl3OvD5AS5fW5zLbv/YHmcsBTjf/afDz3MaZTVCfAP9z6/Bw6ycv8EUBWJIn9zYcoAWWlW9+OzO3vkTy8H+RANLmdrpOuYWdZYEXpo+TlCJrW5EARb7fF+bWdqf3hhyZI1nWJQHgznErZhbjoEsWqi8dQNoE294aldzFurwSABL2XXMf9+H1VQGke9exw5P/AnA5Pv5ngMul7LOvO922iwACu8WkCwLCafvM4CeWPxfA8lNHcWZSoi8EwMAIciKX2Z4SWCMAa3snCZ/G4EA8D6CMLNFsGQhkkz/gQNEBbPCbWsxGUpYVu3z8IyNAknwJkfPMEhLyrdi5RTyUVACkw4GSFRNWJNEW+fgPGwHD8/JxnRuLabN4CGNRkAE23na2+VmEAUmrYymSGjMAYqH84YUIyzgzs3XC7gNgH36Vcc4zKY9o9fgPBXUAiHHwVboBHGLiX6Zcjp1f2wu4tvzZKo0ecPnDtQYDQvJXaBeNzce45Fp28ZQLrEZVuFqgBwOalArKXnW1UzlnSusQKJqKYNuz4tOnI6sZG4zanpemv+7ySU2jbA9h6uhcgpfy6G2PahirDZ6zvq6zDduMVFTKvzw8wgyEdelwY9in3XkEPs3osJuwRQ4qTkfzifndg9Gfc4pdsu82+tTnHZTBa2EAMrqr2t43pguc8tNm7JQVQ2S0ukj2d22dhXYP0/veWtwKrCkNoNimAN5+Xr/oLrxswKbVJjteWrX7eR63o4j9q0GxnaBdWgGA5VStpanIjQmEhV0/nVt5VOFUvix6awJhPcAaTEShgrG+iGyvb5a0Ndb1YGHFPEwoqAinoaykaID1o1pdPNu7XsnCKQ3R+hwWIIhGvORcJUBYXe3Xa3vq/mF/N9V13ugufMkfXn+KHsRD0B8AAAAASUVORK5CYII=" type="image/x-icon" />
 
     <script>

package/lib/tree/BaseFolder.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _lodash = _interopRequireDefault(require("lodash"));
+var _lodash = _interopRequireDefault(require("lodash.invokemap"));
 
 var _Node = _interopRequireDefault(require("./Node"));
 
@@ -18,7 +18,7 @@ class BaseFolder extends _Node.default {
   }
 
   get src() {
-    if (!_lodash.default.has(this, '_src')) {
+    if (!Object.prototype.hasOwnProperty.call(this, '_src')) {
       this._src = this.walk((node, src) => src += node.src || '', '', false);
     }
 
@@ -26,7 +26,7 @@ class BaseFolder extends _Node.default {
   }
 
   get size() {
-    if (!_lodash.default.has(this, '_size')) {
+    if (!Object.prototype.hasOwnProperty.call(this, '_size')) {
       this._size = this.walk((node, size) => size + node.size, 0, false);
     }
 
@@ -117,7 +117,7 @@ class BaseFolder extends _Node.default {
       label: this.name,
       path: this.path,
       statSize: this.size,
-      groups: _lodash.default.invokeMap(this.children, 'toChartData')
+      groups: (0, _lodash.default)(this.children, 'toChartData')
     };
   }
 

package/lib/tree/ConcatenatedModule.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _lodash = _interopRequireDefault(require("lodash"));
+var _lodash = _interopRequireDefault(require("lodash.invokemap"));
 
 var _Module = _interopRequireDefault(require("./Module"));
 
@@ -56,7 +56,7 @@ class ConcatenatedModule extends _Module.default {
       return;
     }
 
-    const [folders, fileName] = [pathParts.slice(0, -1), _lodash.default.last(pathParts)];
+    const [folders, fileName] = [pathParts.slice(0, -1), pathParts[pathParts.length - 1]];
     let currentFolder = this;
     folders.forEach(folderName => {
       let childFolder = currentFolder.getChild(folderName);
@@ -88,13 +88,13 @@ class ConcatenatedModule extends _Module.default {
   }
 
   mergeNestedFolders() {
-    _lodash.default.invokeMap(this.children, 'mergeNestedFolders');
+    (0, _lodash.default)(this.children, 'mergeNestedFolders');
   }
 
   toChartData() {
     return { ...super.toChartData(),
       concatenated: true,
-      groups: _lodash.default.invokeMap(this.children, 'toChartData')
+      groups: (0, _lodash.default)(this.children, 'toChartData')
     };
   }
 

package/lib/tree/Folder.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _gzipSize = _interopRequireDefault(require("gzip-size"));
 
 var _Module = _interopRequireDefault(require("./Module"));
@@ -25,7 +23,7 @@ class Folder extends _BaseFolder.default {
   }
 
   get gzipSize() {
-    if (!_lodash.default.has(this, '_gzipSize')) {
+    if (!Object.prototype.hasOwnProperty.call(this, '_gzipSize')) {
       this._gzipSize = this.src ? _gzipSize.default.sync(this.src) : 0;
     }
 
@@ -39,7 +37,7 @@ class Folder extends _BaseFolder.default {
       return;
     }
 
-    const [folders, fileName] = [pathParts.slice(0, -1), _lodash.default.last(pathParts)];
+    const [folders, fileName] = [pathParts.slice(0, -1), pathParts[pathParts.length - 1]];
     let currentFolder = this;
     folders.forEach(folderName => {
       let childNode = currentFolder.getChild(folderName);

package/lib/tree/Module.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _gzipSize = _interopRequireDefault(require("gzip-size"));
 
 var _Node = _interopRequireDefault(require("./Node"));
@@ -49,7 +47,7 @@ class Module extends _Node.default {
   }
 
   getGzipSize() {
-    if (!_lodash.default.has(this, '_gzipSize')) {
+    if (!('_gzipSize' in this)) {
       this._gzipSize = this.src ? _gzipSize.default.sync(this.src) : undefined;
     }
 

package/lib/tree/utils.js

@@ -4,11 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getModulePathParts = getModulePathParts;
-
-var _lodash = _interopRequireDefault(require("lodash"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const MULTI_MODULE_REGEXP = /^multi /u;
 
 function getModulePathParts(moduleData) {
@@ -16,11 +11,11 @@ function getModulePathParts(moduleData) {
     return [moduleData.identifier];
   }
 
-  const parsedPath = _lodash.default // Removing loaders from module path: they're joined by `!` and the last part is a raw module path
-  .last(moduleData.name.split('!')) // Splitting module path into parts
+  const loaders = moduleData.name.split('!'); // Removing loaders from module path: they're joined by `!` and the last part is a raw module path
+
+  const parsedPath = loaders[loaders.length - 1] // Splitting module path into parts
   .split('/') // Removing first `.`
   .slice(1) // Replacing `~` with `node_modules`
   .map(part => part === '~' ? 'node_modules' : part);
-
   return parsedPath.length ? parsedPath : null;
 }

package/lib/utils.js

@@ -5,15 +5,13 @@ const {
   types
 } = require('util');
 
-const _ = require('lodash');
-
 const opener = require('opener');
 
 const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 exports.createAssetsFilter = createAssetsFilter;
 
 function createAssetsFilter(excludePatterns) {
-  const excludeFunctions = _(excludePatterns).castArray().compact().map(pattern => {
+  const excludeFunctions = (Array.isArray(excludePatterns) ? excludePatterns : [excludePatterns]).filter(Boolean).map(pattern => {
     if (typeof pattern === 'string') {
       pattern = new RegExp(pattern, 'u');
     }
@@ -29,7 +27,7 @@ function createAssetsFilter(excludePatterns) {
     }
 
     return pattern;
-  }).value();
+  });
 
   if (excludeFunctions.length) {
     return asset => excludeFunctions.every(fn => fn(asset) !== true);

package/lib/viewer.js

@@ -10,11 +10,13 @@ const WebSocket = require('ws');
 
 const sirv = require('sirv');
 
-const _ = require('lodash');
+const {
+  isPlainObject
+} = require('is-plain-object');
 
 const {
   bold
-} = require('chalk');
+} = require('picocolors');
 
 const Logger = require('./Logger');
 
@@ -203,7 +205,7 @@ function getChartData(analyzerOpts, ...args) {
     chartData = null;
   }
 
-  if (_.isPlainObject(chartData) && _.isEmpty(chartData)) {
+  if (isPlainObject(chartData) && Object.keys(chartData).length === 0) {
     logger.error("Could't find any javascript bundles in provided stats file");
     chartData = null;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-bundle-analyzer",
-  "version": "4.9.0",
+  "version": "4.9.1",
   "description": "Webpack plugin and CLI utility that represents bundle content as convenient interactive zoomable treemap",
   "author": "Yury Grunin <grunin.ya@ya.ru>",
   "license": "MIT",
@@ -35,12 +35,19 @@
     "@discoveryjs/json-ext": "0.5.7",
     "acorn": "^8.0.4",
     "acorn-walk": "^8.0.0",
-    "chalk": "^4.1.0",
     "commander": "^7.2.0",
+    "escape-string-regexp": "^4.0.0",
     "gzip-size": "^6.0.0",
-    "lodash": "^4.17.20",
+    "is-plain-object": "^5.0.0",
+    "lodash.debounce": "^4.0.8",
+    "lodash.escape": "^4.0.1",
+    "lodash.flatten": "^4.4.0",
+    "lodash.invokemap": "^4.6.0",
+    "lodash.pullall": "^4.2.0",
+    "lodash.uniqby": "^4.7.0",
     "opener": "^1.5.2",
-    "sirv": "^1.0.7",
+    "picocolors": "^1.0.0",
+    "sirv": "^2.0.3",
     "ws": "^7.3.1"
   },
   "devDependencies": {
@@ -72,6 +79,9 @@
     "gulp": "4.0.2",
     "gulp-babel": "8.0.0",
     "jest": "27.2.2",
+    "lodash.memoize": "^4.1.2",
+    "lodash.merge": "^4.6.2",
+    "lodash.partial": "^4.2.1",
     "mobx": "5.15.7",
     "mobx-react": "6.3.1",
     "postcss": "8.3.0",