Merge pull request #389 from webpack-contrib/support-webpack-5

Support Webpack 5

.babelrc

@@ -3,7 +3,7 @@
 {
   "presets": [
     ["@babel/preset-env", {
-      "targets": {"node": "6.14.4"}
+      "targets": {"node": "10.13.0"}
     }]
   ],
   "plugins": [

.npm-upgrade.json

@@ -1,8 +1,16 @@
 {
   "ignore": {
-    "terser-webpack-plugin": {
-      "versions": ">= 2",
-      "reason": "v2 requires at least Node v8.9.0"
+    "mobx": {
+      "versions": ">=6",
+      "reason": "v6 drops decorators"
+    },
+    "mobx-react": {
+      "versions": ">=7",
+      "reason": "v7 requires MobX v6"
+    },
+    "webpack-cli": {
+      "versions": ">=4",
+      "reason": "Current version of Webpack Dev Server doesn't work with v4"
     }
   }
 }

.travis.yml

@@ -4,10 +4,9 @@ branches:
   only:
     - master
 node_js:
-  - "6"
-  - "8"
   - "10"
   - "12"
+  - "14"
   - "node"
 addons:
   apt:

CHANGELOG.md

@@ -13,8 +13,21 @@ _Note: Gaps between patch versions are faulty, broken or test releases._
 ## UNRELEASED
 
 <!-- Add changelog entries for new changes under this section -->
+
+## 4.0.0
+
+ * **Breaking change**
+   * Dropped support for Node.js 6 and 8. Minimal required version now is v10.13.0
+
+ * **Improvement**
+   * Support for Webpack 5
+
  * **Bug Fix**
    * Prevent crashes when `openAnalyzer` was set to true in environments where there's no program to handle opening. ([#382](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/382) by [@wbobeirne](https://github.com/wbobeirne))
+
+ * **Internal**
+   * Updated dependencies
+   * Added support for multiple Webpack versions in tests
 
 ## 3.9.0
 

bin/install-test-webpack-versions.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+for dir in "$(dirname "$0")"/../test/webpack-versions/*; do (cd "$dir" && npm i); done

client/.eslintrc.json

@@ -15,6 +15,7 @@
   },
   "rules": {
     "react/jsx-key": "off",
-    "react/jsx-no-bind": "off"
+    "react/jsx-no-bind": "off",
+    "react/react-in-jsx-scope": "off"
   }
 }

client/components/Button.jsx

@@ -1,5 +1,3 @@
-/** @jsx h */
-import {h} from 'preact';
 import cls from 'classnames';
 import s from './Button.css';
 import PureComponent from '../lib/PureComponent';

client/components/Checkbox.jsx

@@ -1,5 +1,4 @@
-/** @jsx h */
-import {h, Component} from 'preact';
+import {Component} from 'preact';
 import cls from 'classnames';
 
 import s from './Checkbox.css';

client/components/CheckboxList.jsx

@@ -1,6 +1,3 @@
-/** @jsx h */
-import {h} from 'preact';
-
 import CheckboxListItem from './CheckboxListItem';
 import s from './CheckboxList.css';
 import PureComponent from '../lib/PureComponent';

client/components/CheckboxListItem.jsx

@@ -1,5 +1,4 @@
-/** @jsx h */
-import {h, Component} from 'preact';
+import {Component} from 'preact';
 
 import Checkbox from './Checkbox';
 import CheckboxList from './CheckboxList';
@@ -21,8 +20,8 @@ export default class CheckboxListItem extends Component {
   renderLabel() {
     const {children, item} = this.props;
 
-    if (children && children.length) {
-      return children[0](item);
+    if (children) {
+      return children(item);
     }
 
     return (item === CheckboxList.ALL_ITEM) ? 'All' : item.label;

client/components/ContextMenu.jsx

@@ -1,5 +1,3 @@
-/** @jsx h */
-import {h} from 'preact';
 import cls from 'classnames';
 import ContextMenuItem from './ContextMenuItem';
 import PureComponent from '../lib/PureComponent';

client/components/ContextMenuItem.jsx

@@ -1,5 +1,3 @@
-/** @jsx h */
-import {h} from 'preact';
 import cls from 'classnames';
 import s from './ContextMenuItem.css';
 

client/components/Icon.jsx

@@ -1,16 +1,17 @@
-/** @jsx h */
-import {h} from 'preact';
 import cls from 'classnames';
 import s from './Icon.css';
 import PureComponent from '../lib/PureComponent';
 
+import iconArrowRight from '../assets/icon-arrow-right.svg';
+import iconPin from '../assets/icon-pin.svg';
+
 const ICONS = {
   'arrow-right': {
-    src: require('../assets/icon-arrow-right.svg'),
+    src: iconArrowRight,
     size: [7, 13]
   },
   'pin': {
-    src: require('../assets/icon-pin.svg'),
+    src: iconPin,
     size: [12, 18]
   }
 };

client/components/ModuleItem.jsx

@@ -1,6 +1,4 @@
-/** @jsx h */
 import _ from 'lodash';
-import {h} from 'preact';
 import filesize from 'filesize';
 import cls from 'classnames';
 

client/components/ModulesList.jsx

@@ -1,5 +1,3 @@
-/** @jsx h */
-import {h} from 'preact';
 import cls from 'classnames';
 import s from './ModulesList.css';
 import ModuleItem from './ModuleItem';

client/components/ModulesTreemap.jsx

@@ -1,8 +1,7 @@
-/** @jsx h */
-import {h, Component} from 'preact';
+import {Component} from 'preact';
 import filesize from 'filesize';
 import {computed} from 'mobx';
-import {observer} from 'mobx-preact';
+import {observer} from 'mobx-react';
 
 import {isChunkParsed} from '../utils';
 import localStorage from '../localStorage';

client/components/Search.jsx

@@ -1,5 +1,3 @@
-/** @jsx h */
-import {h} from 'preact';
 import _ from 'lodash';
 
 import s from './Search.css';

client/components/Sidebar.jsx

@@ -1,5 +1,4 @@
-/** @jsx h */
-import {h, Component} from 'preact';
+import {Component} from 'preact';
 import cls from 'classnames';
 
 import s from './Sidebar.css';

client/components/Switcher.jsx

@@ -1,6 +1,3 @@
-/** @jsx h */
-import {h} from 'preact';
-
 import SwitcherItem from './SwitcherItem';
 import s from './Switcher.css';
 import PureComponent from '../lib/PureComponent';

client/components/SwitcherItem.jsx

@@ -1,6 +1,3 @@
-/** @jsx h */
-import {h} from 'preact';
-
 import Button from './Button';
 import PureComponent from '../lib/PureComponent';
 

client/components/Tooltip.jsx

@@ -1,5 +1,4 @@
-/** @jsx h */
-import {h, Component} from 'preact';
+import {Component} from 'preact';
 import cls from 'classnames';
 
 import s from './Tooltip.css';

client/components/Treemap.jsx

@@ -1,5 +1,4 @@
-/** @jsx h */
-import {h, Component} from 'preact';
+import {Component} from 'preact';
 import FoamTree from 'carrotsearch.foamtree';
 
 export default class Treemap extends Component {

client/lib/PureComponent.jsx

@@ -1,5 +1,4 @@
-/** @jsx h */
-import {h, Component} from 'preact';
+import {Component} from 'preact';
 
 export default class PureComponent extends Component {
   shouldComponentUpdate(nextProps, nextState) {

client/viewer.jsx

@@ -1,5 +1,4 @@
-/** @jsx h */
-import {h, render} from 'preact';
+import {render} from 'preact';
 
 import {store} from './store';
 import ModulesTreemap from './components/ModulesTreemap';