Merge branch 'master' into dave-custom-compression-support-aka-brotli

Author: dcsaszar

.babelrc

@@ -7,6 +7,7 @@
     }]
   ],
   "plugins": [
-    ["@babel/plugin-proposal-class-properties", {"loose": true}]
+    ["@babel/plugin-proposal-class-properties", {"loose": true}],
+    ["@babel/plugin-proposal-private-methods", {"loose": true}]
   ]
 }

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
 
@@ -29,10 +29,8 @@ jobs:
       - name: Build sources
         run: npm run build
 
-      - name: Run tests with xvfb available
-        uses: GabrielBB/xvfb-action@v1
-        with:
-          run: npm run test
+      - name: Run tests
+        run: npm run test
 
   lint:
     runs-on: ubuntu-latest
@@ -41,7 +39,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: '14.x'
 

.npm-upgrade.json

@@ -13,4 +13,4 @@
       "reason": "Current version of Webpack Dev Server doesn't work with v4"
     }
   }
-}
+}

CHANGELOG.md

@@ -12,6 +12,33 @@ _Note: Gaps between patch versions are faulty, broken or test releases._
 
 ## UNRELEASED
 
+## 4.6.1
+
+* **Bug Fix**
+  * fix outputting different URL in cli mode ([#524](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/524) by [@southorange1228](https://github.com/southorange1228))
+
+## 4.6.0
+
+* **New Feature** 
+  * Support outputting different URL in server mode ([#520](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/520) by [@southorange1228](https://github.com/southorange1228))
+  * Use deterministic chunk colors (#[501](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/501) by [@CreativeTechGuy](https://github.com/CreativeTechGuy))
+
+## 4.5.0
+
+ * **Improvement**
+   * Stop publishing src folder to npm ([#478](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/478) by [@wood1986](https://github.com/wood1986))
+
+* **Internal**
+  * Update some dependencies ([#448](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/448))
+  * Replace nightmare with Puppeteer ([#469](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/469) by [@valscion](https://github.com/valscion))
+  * Replace Mocha with Jest ([#470](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/470) by [@valscion](https://github.com/valscion))
+
+## 4.4.2
+
+ * **Bug Fix**
+   * Fix failure with `compiler.outputFileSystem.constructor` being `undefined` ([#447](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/447) by [@kedarv](https://github.com/kedarv) and [@alexander-akait](https://github.com/alexander-akait))
+     * **NOTE:** This fix doesn't have added test coverage so the fix might break in future versions unless test coverage is added later.
+
 ## 4.4.1
 
  * **Bug Fix**

README.md

@@ -1,6 +1,5 @@
 [![npm][npm]][npm-url]
 [![node][node]][node-url]
-[![deps][deps]][deps-url]
 [![tests][tests]][tests-url]
 [![downloads][downloads]][downloads-url]
 
@@ -59,6 +58,7 @@ new BundleAnalyzerPlugin(options?: object)
 |**`analyzerMode`**|One of: `server`, `static`, `json`, `disabled`|Default: `server`. In `server` mode analyzer will start HTTP server to show bundle report. In `static` mode single HTML file with bundle report will be generated. In `json` mode single JSON file with bundle report will be generated. In `disabled` mode you can use this plugin to just generate Webpack Stats JSON file by setting `generateStatsFile` to `true`. |
 |**`analyzerHost`**|`{String}`|Default: `127.0.0.1`. Host that will be used in `server` mode to start HTTP server.|
 |**`analyzerPort`**|`{Number}` or `auto`|Default: `8888`. Port that will be used in `server` mode to start HTTP server.|
+|**`analyzerUrl`**|`{Function}` called with `{ listenHost: string, listenHost: string, boundAddress: server.address}`. [server.address comes from Node.js](https://nodejs.org/api/net.html#serveraddress)| Default: `http://${listenHost}:${boundAddress.port}`. The URL printed to console with server mode.|
 |**`reportFilename`**|`{String}`|Default: `report.html`. Path to bundle report file that will be generated in `static` mode. It can be either an absolute path or a path relative to a bundle output directory (which is output.path in webpack config).|
 |**`reportTitle`**|`{String\|function}`|Default: function that returns pretty printed current date and time. Content of the HTML `title` element; or a function of the form `() => string` that provides the content.|
 |**`defaultSizes`**|One of: `stat`, `parsed`, `gzip`, `brotli`|Default: `parsed`. Module sizes to show in report by default. [Size definitions](#size-definitions) section describes what these values mean.|
@@ -180,8 +180,8 @@ The Chunk Context Menu can be opened by right-clicking or `Ctrl`-clicking on a s
 
 It happens when `webpack-bundle-analyzer` analyzes files that don't actually exist in your file system, for example when you work with `webpack-dev-server` that keeps all the files in RAM. If you use `webpack-bundle-analyzer` as a plugin you won't get any errors, however if you run it via CLI you get the error message in terminal:
 ```
-Couldn't parse bundle asset "your_bundle_name.bundle.js".
-Analyzer will use module sizes from stats file.
+Error parsing bundle asset "your_bundle_name.bundle.js": no such file
+No bundles were parsed. Analyzer will show only original module sizes from stats file.
 ```
 To get more information about it you can read [issue #147](https://github.com/webpack-contrib/webpack-bundle-analyzer/issues/147).
 
@@ -217,9 +217,6 @@ To get more information about it you can read [issue #147](https://github.com/we
 [node]: https://img.shields.io/node/v/webpack-bundle-analyzer.svg
 [node-url]: https://nodejs.org
 
-[deps]: https://david-dm.org/webpack-contrib/webpack-bundle-analyzer.svg
-[deps-url]: https://david-dm.org/webpack-contrib/webpack-bundle-analyzer
-
 [tests]: http://img.shields.io/travis/webpack-contrib/webpack-bundle-analyzer.svg
 [tests-url]: https://travis-ci.org/webpack-contrib/webpack-bundle-analyzer
 

client/components/Treemap.jsx

@@ -7,6 +7,7 @@ export default class Treemap extends Component {
     super(props);
     this.treemap = null;
     this.zoomOutDisabled = false;
+    this.findChunkNamePartIndex();
   }
 
   componentDidMount() {
@@ -16,6 +17,7 @@ export default class Treemap extends Component {
 
   componentWillReceiveProps(nextProps) {
     if (nextProps.data !== this.props.data) {
+      this.findChunkNamePartIndex();
       this.treemap.set({
         dataObject: this.getTreemapDataObject(nextProps.data)
       });
@@ -76,6 +78,19 @@ export default class Treemap extends Component {
         vars.titleBarShown = false;
       },
       groupColorDecorator(options, properties, variables) {
+        const root = component.getGroupRoot(properties.group);
+        const chunkName = component.getChunkNamePart(root.label);
+        const hash = /[^0-9]/u.test(chunkName)
+          ? hashCode(chunkName)
+          : (parseInt(chunkName) / 1000) * 360;
+        variables.groupColor = {
+          model: 'hsla',
+          h: Math.round(Math.abs(hash) % 360),
+          s: 60,
+          l: 50,
+          a: 0.9
+        };
+
         const {highlightGroups} = component.props;
         const module = properties.group;
 
@@ -136,6 +151,14 @@ export default class Treemap extends Component {
     });
   }
 
+  getGroupRoot(group) {
+    let nextParent;
+    while (!group.isAsset && (nextParent = this.treemap.get('hierarchy', group).parent)) {
+      group = nextParent;
+    }
+    return group;
+  }
+
   zoomToGroup(group) {
     this.zoomOutDisabled = false;
 
@@ -164,9 +187,62 @@ export default class Treemap extends Component {
     if (props.onResize) {
       props.onResize();
     }
+  };
+
+  /**
+   * Finds patterns across all chunk names to identify the unique "name" part.
+   */
+  findChunkNamePartIndex() {
+    const splitChunkNames = this.props.data.map((chunk) => chunk.label.split(/[^a-z0-9]/iu));
+    const longestSplitName = Math.max(...splitChunkNames.map((parts) => parts.length));
+    const namePart = {
+      index: 0,
+      votes: 0
+    };
+    for (let i = longestSplitName - 1; i >= 0; i--) {
+      const identifierVotes = {
+        name: 0,
+        hash: 0,
+        ext: 0
+      };
+      let lastChunkPart = '';
+      for (const splitChunkName of splitChunkNames) {
+        const part = splitChunkName[i];
+        if (part === undefined || part === '') {
+          continue;
+        }
+        if (part === lastChunkPart) {
+          identifierVotes.ext++;
+        } else if (/[a-z]/u.test(part) && /[0-9]/u.test(part) && part.length === lastChunkPart.length) {
+          identifierVotes.hash++;
+        } else if (/^[a-z]+$/iu.test(part) || /^[0-9]+$/u.test(part)) {
+          identifierVotes.name++;
+        }
+        lastChunkPart = part;
+      }
+      if (identifierVotes.name >= namePart.votes) {
+        namePart.index = i;
+        namePart.votes = identifierVotes.name;
+      }
+    }
+    this.chunkNamePartIndex = namePart.index;
+  }
+
+  getChunkNamePart(chunkLabel) {
+    return chunkLabel.split(/[^a-z0-9]/iu)[this.chunkNamePartIndex] || chunkLabel;
   }
 }
 
 function preventDefault(event) {
   event.preventDefault();
 }
+
+function hashCode(str) {
+  let hash = 0;
+  for (let i = 0; i < str.length; i++) {
+    const code = str.charCodeAt(i);
+    hash = (hash << 5) - hash + code;
+    hash = hash & hash;
+  }
+  return hash;
+}

jest.config.js

@@ -0,0 +1,20 @@
+// Jest configuration
+// Reference: https://jestjs.io/docs/configuration
+
+module.exports = {
+  testMatch: [
+    '**/test/*.js'
+  ],
+  testPathIgnorePatterns: [
+    '<rootDir>/test/helpers.js'
+  ],
+  setupFilesAfterEnv: [
+    '<rootDir>/test/helpers.js'
+  ],
+  watchPathIgnorePatterns: [
+    // Ignore the output generated by plugin tests
+    // when watching for changes to avoid the test
+    // runner continuously re-running tests
+    '<rootDir>/test/output'
+  ]
+};