diff --git a/.editorconfig b/.editorconfig
index 45137161298..2bd8cf9e86d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,10 +8,6 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 max_line_length = 80
 
-[.prettierrc]
-indent_style = space
-indent_size = 2
-
 [*.{yml,yaml,json}]
 indent_style = space
 indent_size = 2
diff --git a/.eslintrc.js b/.eslintrc.js
index a70d08eb0fb..79cee6b118f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,7 +1,11 @@
 module.exports = {
 	root: true,
 	plugins: ["prettier", "node", "jest"],
-	extends: ["eslint:recommended", "plugin:node/recommended", "plugin:prettier/recommended"],
+	extends: [
+		"eslint:recommended",
+		"plugin:node/recommended",
+		"plugin:prettier/recommended"
+	],
 	env: {
 		node: true,
 		es6: true
@@ -16,10 +20,10 @@ module.exports = {
 		"no-template-curly-in-string": "error",
 		"no-caller": "error",
 		"no-control-regex": "off",
-		"yoda": "error",
-		"eqeqeq": "error",
+		yoda: "error",
+		eqeqeq: "error",
 		"global-require": "off",
-		"brace-style": "error",
+		"brace-style": "off",
 		"eol-last": "error",
 		"no-extra-bind": "warn",
 		"no-process-exit": "warn",
@@ -27,22 +31,26 @@ module.exports = {
 		"no-unused-vars": ["error", { args: "none" }],
 		"no-unsafe-negation": "error",
 		"no-loop-func": "warn",
-		"indent": "off",
+		indent: "off",
 		"no-console": "off",
-		"valid-jsdoc": ["error", {
-			"prefer": {
-				"return": "returns",
-				"memberof": "DONTUSE",
-				"class": "DONTUSE",
-				"inheritdoc": "DONTUSE",
-				"description": "DONTUSE",
-				"readonly": "DONTUSE"
-			},
-			"preferType": {
-				"*": "any"
-			},
-			"requireReturnType": true
-		}],
+		"valid-jsdoc": [
+			"error",
+			{
+				prefer: {
+					return: "returns",
+					prop: "property",
+					memberof: "DONTUSE",
+					class: "DONTUSE",
+					inheritdoc: "DONTUSE",
+					description: "DONTUSE",
+					readonly: "DONTUSE"
+				},
+				preferType: {
+					"*": "any"
+				},
+				requireReturnType: true
+			}
+		],
 		"node/no-unsupported-features": "error",
 		"node/no-deprecated-api": "error",
 		"node/no-missing-import": "error",
@@ -59,7 +67,7 @@ module.exports = {
 				browser: true
 			},
 			globals: {
-				Promise: false,
+				Promise: false
 			},
 			parserOptions: {
 				ecmaVersion: 5
@@ -69,6 +77,9 @@ module.exports = {
 			files: ["test/**/*.js"],
 			env: {
 				"jest/globals": true
+			},
+			globals: {
+				nsObj: false
 			}
 		}
 	]
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 657747d6289..437637672bb 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -1,39 +1,39 @@
----
-name: Bug report
-about: Create a report to help us improve
----
-
-<!-- Please don't delete this template because we'll close your issue -->
-<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
-
-# Bug report
-
-<!-- Please ask questions on StackOverflow or the webpack Gitter. -->
-<!-- https://stackoverflow.com/questions/ask?tags=webpack -->
-<!-- https://gitter.im/webpack/webpack -->
-<!-- Issues which contain questions or support requests will be closed. -->
-
-**What is the current behavior?**
-
-
-**If the current behavior is a bug, please provide the steps to reproduce.**
-
-
-<!-- A great way to do this is to provide your configuration via a GitHub repository -->
-<!-- The most helpful is a minimal reproduction with instructions on how to reproduce -->
-<!-- Repositories with too many files or large `webpack.config.js` files are not suitable -->
-<!-- Please only add small code snippets directly into this issue -->
-<!-- https://gist.github.com is a good place for longer code snippets -->
-<!-- If your issue is caused by a plugin or loader, please create an issue on the loader/plugin repository instead -->
-
-**What is the expected behavior?**
-
-
-<!-- "It should work" is not a helpful explanation -->
-<!-- Explain exactly how it should behave -->
-
-**Other relevant information:**
-webpack version:  
-Node.js version: 
-Operating System: 
-Additional tools:
+---
+name: Bug report
+about: Create a report to help us improve
+---
+
+<!-- Please don't delete this template because we'll close your issue -->
+<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
+
+# Bug report
+
+<!-- Please ask questions on StackOverflow or the webpack Gitter. -->
+<!-- https://stackoverflow.com/questions/ask?tags=webpack -->
+<!-- https://gitter.im/webpack/webpack -->
+<!-- Issues which contain questions or support requests will be closed. -->
+
+**What is the current behavior?**
+
+
+**If the current behavior is a bug, please provide the steps to reproduce.**
+
+
+<!-- A great way to do this is to provide your configuration via a GitHub repository -->
+<!-- The most helpful is a minimal reproduction with instructions on how to reproduce -->
+<!-- Repositories with too many files or large `webpack.config.js` files are not suitable -->
+<!-- Please only add small code snippets directly into this issue -->
+<!-- https://gist.github.com is a good place for longer code snippets -->
+<!-- If your issue is caused by a plugin or loader, please create an issue on the loader/plugin repository instead -->
+
+**What is the expected behavior?**
+
+
+<!-- "It should work" is not a helpful explanation -->
+<!-- Explain exactly how it should behave -->
+
+**Other relevant information:**
+webpack version:  
+Node.js version: 
+Operating System: 
+Additional tools:
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
index e23f20d97cf..1b69aa08fd4 100644
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -1,27 +1,27 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-
-<!-- Please don't delete this template or we'll close your issue -->
-
-## Feature request
-
-<!-- Issues which contain questions or support requests will be closed. -->
-<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
-<!-- Check if this feature need to be implemented in a plugin or loader instead -->
-<!-- If yes: file the issue on the plugin/loader repo -->
-<!-- Features related to the development server should be filed on this repo instead -->
-
-**What is the expected behavior?**
-
-
-**What is motivation or use case for adding/changing the behavior?**
-
-
-**How should this be implemented in your opinion?**
-
-
-**Are you willing to work on this yourself?**
-yes
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+<!-- Please don't delete this template or we'll close your issue -->
+
+## Feature request
+
+<!-- Issues which contain questions or support requests will be closed. -->
+<!-- Before creating an issue please make sure you are using the latest version of webpack. -->
+<!-- Check if this feature need to be implemented in a plugin or loader instead -->
+<!-- If yes: file the issue on the plugin/loader repo -->
+<!-- Features related to the development server should be filed on this repo instead -->
+
+**What is the expected behavior?**
+
+
+**What is motivation or use case for adding/changing the behavior?**
+
+
+**How should this be implemented in your opinion?**
+
+
+**Are you willing to work on this yourself?**
+yes
diff --git a/.github/ISSUE_TEMPLATE/Other.md b/.github/ISSUE_TEMPLATE/Other.md
index 5e5b62bd605..033e88fcad4 100644
--- a/.github/ISSUE_TEMPLATE/Other.md
+++ b/.github/ISSUE_TEMPLATE/Other.md
@@ -1,9 +1,9 @@
----
-name: Other
-about: Something else
-
----
-
-<!-- Bug reports and Feature requests must use other templates, or will be closed -->
-<!-- Please ask questions on StackOverflow or the webpack Gitter (https://gitter.im/webpack/webpack). -->
-<!-- Issues which contain questions or support requests will be closed. -->
+---
+name: Other
+about: Something else
+
+---
+
+<!-- Bug reports and Feature requests must use other templates, or will be closed -->
+<!-- Please ask questions on StackOverflow or the webpack Gitter (https://gitter.im/webpack/webpack). -->
+<!-- Issues which contain questions or support requests will be closed. -->
diff --git a/.prettierignore b/.prettierignore
index c99674c1822..bdf38e4bc19 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,15 +1,8 @@
-# Ignore all paths.
-**/*.*
-
-# Enable prettier for the following paths.
-!setup/**/*.js
-!lib/**/*.js
-!bin/*.js
-!hot/*.js
-!buildin/*.js
-!benchmark/**/*.js
+# Ignore test fixtures
+test
 !test/*.js
 !test/**/webpack.config.js
+
+# Ignore example fixtures
+examples
 !examples/**/webpack.config.js
-!schemas/**/*.js
-!declarations.d.ts
diff --git a/.prettierrc.js b/.prettierrc.js
index 03b9da1bac3..cc7e3b51355 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,5 +1,13 @@
 module.exports = {
 	printWidth: 80,
 	useTabs: true,
-	tabWidth: 2
+	tabWidth: 2,
+	overrides: [
+		{
+			files: "*.json",
+			options: {
+				useTabs: false
+			}
+		}
+	]
 };
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3364e380801..da3b43b7186 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@ work is not in vain.
 
 ## Issues
 
-Most of the time, if webpack is not working correctly for you it is a simple configuration issue.
+Most of the time, if webpack is not working correctly for you, it is a simple configuration issue.
 
 If you are still having difficulty after looking over your configuration carefully, please post
 a question to [StackOverflow with the webpack tag](http://stackoverflow.com/tags/webpack). Questions
@@ -35,11 +35,11 @@ If you have created your own loader/plugin please include it on the relevant doc
 
 ## Submitting Changes
 
-After getting some feedback, push to your fork and submit a pull request. We
+After getting some feedbacks, push to your fork and submit a pull request. We
 may suggest some changes or improvements or alternatives, but for small changes
 your pull request should be accepted quickly.
 
-Some things that will increase the chance that your pull request is accepted:
+Something that will increase the chance that your pull request is accepted:
 
 * [Write tests](./test/README.md)
 * Follow the existing coding style
diff --git a/README.md b/README.md
index cb5e32d94ad..344ca1fa9ad 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,14 @@
 [![deps][deps]][deps-url]
 [![tests][tests]][tests-url]
 [![builds][builds]][builds-url]
+[![builds2][builds2]][builds2-url]
 [![coverage][cover]][cover-url]
 [![licenses][licenses]][licenses-url]
 
   <br>
+  <a href="https://dependabot.com/compatibility-score.html?dependency-name=webpack&package-manager=npm_and_yarn&new-version=latest">
+    <img src="https://api.dependabot.com/badges/compatibility_score?dependency-name=webpack&package-manager=npm_and_yarn&version-scheme=semver&target-version=latest">
+  </a>
 	<a href="https://npmcharts.com/compare/webpack?minimal=true">
 		<img src="https://img.shields.io/npm/dm/webpack.svg">
 	</a>
@@ -55,8 +59,6 @@ yarn add webpack --dev
 
 <h2 align="center">Introduction</h2>
 
-> This README reflects webpack v2.x and v3.x. The webpack v1.x documentation has been deprecated and deleted.
-
 webpack is a bundler for modules. The main purpose is to bundle JavaScript
 files for usage in a browser, yet it is also capable of transforming, bundling,
 or packaging just about any resource or asset.
@@ -89,16 +91,19 @@ within webpack itself use this plugin interface. This makes webpack very
 
 |Name|Status|Install Size|Description|
 |:--:|:----:|:----------:|:----------|
-|[extract-text-webpack-plugin][extract]|![extract-npm]|![extract-size]|Extracts Text (CSS) from your bundles into a separate file (app.bundle.css)|
+|[mini-css-extract-plugin][mini-css]|![mini-css-npm]|![mini-css-size]|Extracts CSS into separate files. It creates a CSS file per JS file which contains CSS.|
 |[compression-webpack-plugin][compression]|![compression-npm]|![compression-size]|Prepares compressed versions of assets to serve them with Content-Encoding|
 |[i18n-webpack-plugin][i18n]|![i18n-npm]|![i18n-size]|Adds i18n support to your bundles|
 |[html-webpack-plugin][html-plugin]|![html-plugin-npm]|![html-plugin-size]| Simplifies creation of HTML files (`index.html`) to serve your bundles|
-
+|[extract-text-webpack-plugin][extract]|![extract-npm]|![extract-size]|Extract text from a bundle, or bundles, into a separate file|
 
 [common-npm]: https://img.shields.io/npm/v/webpack.svg
 [extract]: https://github.com/webpack/extract-text-webpack-plugin
 [extract-npm]: https://img.shields.io/npm/v/extract-text-webpack-plugin.svg
 [extract-size]: https://packagephobia.now.sh/badge?p=extract-text-webpack-plugin
+[mini-css]: https://github.com/webpack-contrib/mini-css-extract-plugin
+[mini-css-npm]: https://img.shields.io/npm/v/mini-css-extract-plugin.svg
+[mini-css-size]: https://packagephobia.now.sh/badge?p=mini-css-extract-plugin
 [component]: https://github.com/webpack/component-webpack-plugin
 [component-npm]: https://img.shields.io/npm/v/component-webpack-plugin.svg
 [component-size]: https://packagephobia.now.sh/badge?p=component-webpack-plugin
@@ -217,7 +222,7 @@ or are automatically applied via regex from your webpack configuration.
 |<a href="https://github.com/webpack/style-loader">`<style>`</a>|![style-npm]|![style-size]|Add exports of a module as style to DOM|
 |<a href="https://github.com/webpack/css-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/css-3.svg"></a>|![css-npm]|![css-size]|Loads CSS file with resolved imports and returns CSS code|
 |<a href="https://github.com/webpack/less-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/less-63.svg"></a>|![less-npm]|![less-size]|Loads and compiles a LESS file|
-|<a href="https://github.com/jtangelder/sass-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/sass-1.svg"></a>|![sass-npm]|![sass-size]|Loads and compiles a SASS/SCSS file|
+|<a href="https://github.com/jtangelder/sass-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/sass-1.svg"></a>|![sass-npm]|![sass-size]|Loads and compiles a Sass/SCSS file|
 |<a href="https://github.com/shama/stylus-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/stylus.svg"></a>|![stylus-npm]|![stylus-size]|Loads and compiles a Stylus file|
 |<a href="https://github.com/postcss/postcss-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/postcss.svg"></a>|![postcss-npm]|![postcss-size]|Loads and transforms a CSS/SSS file using [PostCSS](http://postcss.org)|
 
@@ -748,6 +753,9 @@ src="https://static.monei.net/monei-logo.svg" height="30" alt="MONEI"></a>
 [builds-url]: https://ci.appveyor.com/project/sokra/webpack/branch/master
 [builds]: https://ci.appveyor.com/api/projects/status/github/webpack/webpack?svg=true
 
+[builds2]: https://dev.azure.com/webpack/webpack/_apis/build/status/webpack.webpack
+[builds2-url]: https://dev.azure.com/webpack/webpack/_build/latest?definitionId=3
+
 [licenses-url]: https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fwebpack%2Fwebpack?ref=badge_shield
 [licenses]: https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fwebpack%2Fwebpack.svg?type=shield
 
diff --git a/_SETUP.md b/_SETUP.md
index 8c080252e5b..ce57ab77540 100644
--- a/_SETUP.md
+++ b/_SETUP.md
@@ -27,7 +27,7 @@ yarn link webpack
 yarn test
 ```
 
-### To run only intergration tests use
+### To run only integration tests use
 
 ```bash
 yarn test:integration
@@ -51,6 +51,12 @@ or in watch mode
 yarn test:unit --watch
 ```
 
+### To update Jest snapshots use
+
+```bash
+yarn test:update-snapshots
+```
+
 ### To run code formatter (prettier) run
 
 ```bash
diff --git a/appveyor.yml b/appveyor.yml
index bd61e1135c5..94ecae79a7d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,21 +13,8 @@ cache:
   - "..\\.yarn-cache"
   - ".jest-cache"
 
-# what combinations to test
-environment:
-  matrix:
-    - nodejs_version: 10
-      job_part: unit
-      jest: --maxWorkers=2 --cacheDirectory .jest-cache
-    - nodejs_version: 10
-      job_part: integration
-      jest: --maxWorkers=2 --cacheDirectory .jest-cache
-    - nodejs_version: 6
-      job_part: integration
-      jest: --maxWorkers=2 --cacheDirectory .jest-cache
-
 install:
-  - ps: Install-Product node $env:nodejs_version x64
+  - ps: Install-Product node 10 x64
   - yarn --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache
   - yarn link --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache || yarn link --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache
   - yarn link webpack --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache
@@ -40,8 +27,8 @@ matrix:
 test_script:
   - node --version
   - yarn --version
-  - cmd: set JEST=%jest%
-  - cmd: yarn appveyor:%job_part%
+  - cmd: set JEST=--maxWorkers=2 --cacheDirectory .jest-cache
+  - cmd: yarn appveyor:integration
   - cmd: yarn istanbul report --report lcovonly
   - cmd: yarn unlink webpack
   - cmd: yarn global add codecov && codecov -F %job_part% --disable=gcov
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 00000000000..cc862765cff
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,192 @@
+jobs:
+  - job: basic
+    pool:
+      vmImage: ubuntu-16.04
+    steps:
+      - task: NodeTool@0
+        displayName: "Install Node.js"
+        inputs:
+          versionSpec: "^10.10.0"
+      - script: |
+          curl -o- -L https://yarnpkg.com/install.sh | bash
+        displayName: "Install Yarn"
+      - script: |
+          set -e
+          export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+          node -v
+          yarn -v
+        displayName: "Print versions"
+      - script: |
+          set -e
+          export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+          yarn --frozen-lockfile
+          yarn link --frozen-lockfile || true
+          yarn link webpack --frozen-lockfile
+        displayName: "Install dependencies"
+      - script: |
+          set -e
+          export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+          yarn test:basic --ci
+          yarn test:unit --ci
+        displayName: "Run basic tests"
+  - job: lint
+    pool:
+      vmImage: ubuntu-16.04
+    steps:
+      - task: NodeTool@0
+        displayName: "Install Node.js"
+        inputs:
+          versionSpec: "^10.10.0"
+      - script: |
+          curl -o- -L https://yarnpkg.com/install.sh | bash
+        displayName: "Install Yarn"
+      - script: |
+          set -e
+          export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+          node -v
+          yarn -v
+        displayName: "Print versions"
+      - script: |
+          set -e
+          export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+          yarn --frozen-lockfile
+          yarn link --frozen-lockfile || true
+          yarn link webpack --frozen-lockfile
+        displayName: "Install dependencies"
+      - script: |
+          set -e
+          export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+          yarn lint
+        displayName: "Run linting"
+  - job: linux
+    dependsOn:
+      - basic
+      - lint
+    pool:
+      vmImage: ubuntu-16.04
+    strategy:
+      maxParallel: 3
+      matrix:
+        node-10:
+          node_version: ^10.10.0
+        node-8:
+          node_version: ^8.12.0
+        node-6:
+          node_version: ^6.14.4
+    steps:
+      - task: NodeTool@0
+        displayName: "Install Node.js"
+        inputs:
+          versionSpec: $(node_version)
+      - script: |
+          curl -o- -L https://yarnpkg.com/install.sh | bash
+        displayName: "Install Yarn"
+      - script: |
+          set -e
+          export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+          node -v
+          yarn -v
+        displayName: "Print versions"
+      - script: |
+          set -e
+          export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+          yarn --frozen-lockfile
+          yarn link --frozen-lockfile || true
+          yarn link webpack --frozen-lockfile
+        displayName: "Install dependencies"
+      - script: |
+          set -e
+          export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+          yarn cover:init
+          yarn cover:integration "test/(?!TestCases)" --ci --maxWorkers=2
+          mv coverage/coverage-final.json coverage/coverage-final-1.json
+          yarn cover:integration "test/TestCasesD" --ci --maxWorkers=2
+          mv coverage/coverage-final.json coverage/coverage-final-2.json
+          yarn cover:integration "test/TestCases(?!D)" --ci --maxWorkers=2
+          mv coverage/coverage-final.json coverage/coverage-final-3.json
+        displayName: "Run tests with coverage"
+  - job: macos
+    dependsOn:
+      - basic
+      - lint
+    pool:
+      vmImage: "macOS 10.13"
+    strategy:
+      maxParallel: 3
+      matrix:
+        node-10:
+          node_version: ^10.10.0
+        node-8:
+          node_version: ^8.12.0
+        node-6:
+          node_version: ^6.14.4
+    steps:
+      - task: NodeTool@0
+        displayName: "Install Node.js"
+        inputs:
+          versionSpec: $(node_version)
+      - script: |
+          curl -o- -L https://yarnpkg.com/install.sh | bash
+        displayName: "Install Yarn"
+      - script: |
+          set -e
+          export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+          node -v
+          yarn -v
+        displayName: "Print versions"
+      - script: |
+          set -e
+          export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+          yarn --frozen-lockfile
+          yarn link --frozen-lockfile || true
+          yarn link webpack --frozen-lockfile
+        displayName: "Install dependencies"
+      - script: |
+          set -e
+          export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
+          yarn cover:init
+          yarn cover:integration "test/(?!TestCases)" --ci
+          mv coverage/coverage-final.json coverage/coverage-final-1.json
+          yarn cover:integration "test/TestCasesD" --ci
+          mv coverage/coverage-final.json coverage/coverage-final-2.json
+          yarn cover:integration "test/TestCases(?!D)" --ci
+          mv coverage/coverage-final.json coverage/coverage-final-3.json
+        displayName: "Run tests with coverage"
+  - job: windows
+    dependsOn:
+      - basic
+      - lint
+    pool:
+      vmImage: vs2017-win2016
+    strategy:
+      maxParallel: 3
+      matrix:
+        node-10:
+          node_version: ^10.10.0
+        node-8:
+          node_version: ^8.12.0
+        node-6:
+          node_version: ^6.14.4
+    steps:
+      - task: NodeTool@0
+        displayName: "Install Node.js"
+        inputs:
+          versionSpec: $(node_version)
+      - script: |
+          npm install --global yarn
+        displayName: "Install Yarn"
+      - script: |
+          set -e
+          node -v
+          yarn -v
+        displayName: "Print versions"
+      - script: |
+          set -e
+          yarn --frozen-lockfile
+          yarn link --frozen-lockfile || true
+          yarn link webpack --frozen-lockfile
+        displayName: "Install dependencies"
+      - script: |
+          set -e
+          yarn cover:init && yarn cover:integration "test/(?!TestCases)" --ci --maxWorkers=2 && move coverage\\coverage-final.json coverage\\coverage-final-1.json && yarn cover:integration "test/TestCasesD" --ci --maxWorkers=2 && move coverage\\coverage-final.json coverage\\coverage-final-2.json && yarn cover:integration "test/TestCases(?!D)" --ci --maxWorkers=2 && move coverage\\coverage-final.json coverage\\coverage-final-3.json
+        displayName: "Run tests with coverage"
diff --git a/bin/webpack.js b/bin/webpack.js
index 389bc9527e7..a7209749183 100755
--- a/bin/webpack.js
+++ b/bin/webpack.js
@@ -47,8 +47,10 @@ const isInstalled = packageName => {
  * @typedef {Object} CliOption
  * @property {string} name display name
  * @property {string} package npm package name
+ * @property {string} binName name of the executable file
  * @property {string} alias shortcut for choice
  * @property {boolean} installed currently installed?
+ * @property {boolean} recommended is recommended
  * @property {string} url homepage
  * @property {string} description description
  */
@@ -58,16 +60,20 @@ const CLIs = [
 	{
 		name: "webpack-cli",
 		package: "webpack-cli",
+		binName: "webpack-cli",
 		alias: "cli",
 		installed: isInstalled("webpack-cli"),
+		recommended: true,
 		url: "https://github.com/webpack/webpack-cli",
 		description: "The original webpack full-featured CLI."
 	},
 	{
 		name: "webpack-command",
 		package: "webpack-command",
+		binName: "webpack-command",
 		alias: "command",
 		installed: isInstalled("webpack-command"),
+		recommended: false,
 		url: "https://github.com/webpack-contrib/webpack-command",
 		description: "A lightweight, opinionated webpack CLI."
 	}
@@ -84,7 +90,9 @@ if (installedClis.length === 0) {
 		"One CLI for webpack must be installed. These are recommended choices, delivered as separate packages:";
 
 	for (const item of CLIs) {
-		notify += `\n - ${item.name} (${item.url})\n   ${item.description}`;
+		if (item.recommended) {
+			notify += `\n - ${item.name} (${item.url})\n   ${item.description}`;
+		}
 	}
 
 	console.error(notify);
@@ -100,9 +108,7 @@ if (installedClis.length === 0) {
 		)}".`
 	);
 
-	let question = `Which one do you like to install (${CLIs.map(
-		item => item.name
-	).join("/")}):\n`;
+	let question = `Do you want to install 'webpack-cli' (yes/no): `;
 
 	const questionInterface = readLine.createInterface({
 		input: process.stdin,
@@ -111,35 +117,22 @@ if (installedClis.length === 0) {
 	questionInterface.question(question, answer => {
 		questionInterface.close();
 
-		const normalizedAnswer = answer.toLowerCase();
-		const selectedPackage = CLIs.find(item => {
-			return item.name === normalizedAnswer || item.alias === normalizedAnswer;
-		});
+		const normalizedAnswer = answer.toLowerCase().startsWith("y");
 
 		if (!normalizedAnswer) {
 			console.error(
-				"One CLI needs to be installed alongside webpack to use the CLI."
-			);
-			process.exitCode = 1;
-
-			return;
-		} else if (!selectedPackage) {
-			console.error(
-				"No matching choice.\n" +
-					"One CLI needs to be installed alongside webpack to use the CLI.\n" +
-					"Try to installing your CLI of choice manually."
+				"You need to install 'webpack-cli' to use webpack via CLI.\n" +
+					"You can also install the CLI manually."
 			);
 			process.exitCode = 1;
 
 			return;
 		}
 
-		const packageName = selectedPackage.package;
+		const packageName = "webpack-cli";
 
 		console.log(
-			`Installing '${
-				selectedPackage.name
-			}' (running '${packageManager} ${installOptions.join(
+			`Installing '${packageName}' (running '${packageManager} ${installOptions.join(
 				" "
 			)} ${packageName}')...`
 		);
@@ -154,7 +147,15 @@ if (installedClis.length === 0) {
 			});
 	});
 } else if (installedClis.length === 1) {
-	require(installedClis[0].package); // eslint-disable-line
+	const path = require("path");
+	const pkgPath = require.resolve(`${installedClis[0].package}/package.json`);
+	// eslint-disable-next-line node/no-missing-require
+	const pkg = require(pkgPath);
+	// eslint-disable-next-line node/no-missing-require
+	require(path.resolve(
+		path.dirname(pkgPath),
+		pkg.bin[installedClis[0].binName]
+	));
 } else {
 	console.warn(
 		`You have installed ${installedClis
@@ -163,4 +164,5 @@ if (installedClis.length === 0) {
 				" and "
 			)} together. To work with the "webpack" command you need only one CLI package, please remove one of them or use them directly via their binary.`
 	);
+	process.exitCode = 1;
 }
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 769cc72528b..00000000000
--- a/circle.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-machine:
-  environment:
-    NO_WATCH_TESTS: 1
-
-machine:
-  environment:
-    PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
-
-dependencies:
-  pre:
-    - case $CIRCLE_NODE_INDEX in 0) NODE_VERSION=6 ;; 1) NODE_VERSION=8 ;; esac; nvm install $NODE_VERSION && nvm alias default $NODE_VERSION
-  override:
-    - yarn
-    - yarn link || true && yarn link webpack
-  cache_directories:
-    - ~/.cache/yarn
-
-test:
-  override:
-    - node -v
-    - yarn --version
-    - yarn run circleci:lint
-    - yarn run circleci:test
diff --git a/declarations.d.ts b/declarations.d.ts
index bc10fcdd5e9..250601bc942 100644
--- a/declarations.d.ts
+++ b/declarations.d.ts
@@ -7,6 +7,99 @@ declare namespace NodeJS {
 	}
 }
 
+declare module "neo-async" {
+	export interface Dictionary<T> {
+		[key: string]: T;
+	}
+	export type IterableCollection<T> = T[] | IterableIterator<T> | Dictionary<T>;
+
+	export interface ErrorCallback<T> {
+		(err?: T): void;
+	}
+	export interface AsyncBooleanResultCallback<E> {
+		(err?: E, truthValue?: boolean): void;
+	}
+	export interface AsyncResultCallback<T, E> {
+		(err?: E, result?: T): void;
+	}
+	export interface AsyncResultArrayCallback<T, E> {
+		(err?: E, results?: Array<T | undefined>): void;
+	}
+	export interface AsyncResultObjectCallback<T, E> {
+		(err: E | undefined, results: Dictionary<T | undefined>): void;
+	}
+
+	export interface AsyncFunction<T, E> {
+		(callback: (err?: E, result?: T) => void): void;
+	}
+	export interface AsyncFunctionEx<T, E> {
+		(callback: (err?: E, ...results: T[]) => void): void;
+	}
+	export interface AsyncIterator<T, E> {
+		(item: T, callback: ErrorCallback<E>): void;
+	}
+	export interface AsyncForEachOfIterator<T, E> {
+		(item: T, key: number | string, callback: ErrorCallback<E>): void;
+	}
+	export interface AsyncResultIterator<T, R, E> {
+		(item: T, callback: AsyncResultCallback<R, E>): void;
+	}
+	export interface AsyncMemoIterator<T, R, E> {
+		(memo: R | undefined, item: T, callback: AsyncResultCallback<R, E>): void;
+	}
+	export interface AsyncBooleanIterator<T, E> {
+		(item: T, callback: AsyncBooleanResultCallback<E>): void;
+	}
+
+	export interface AsyncWorker<T, E> {
+		(task: T, callback: ErrorCallback<E>): void;
+	}
+	export interface AsyncVoidFunction<E> {
+		(callback: ErrorCallback<E>): void;
+	}
+
+	export type AsyncAutoTasks<R extends Dictionary<any>, E> = {
+		[K in keyof R]: AsyncAutoTask<R[K], R, E>
+	};
+	export type AsyncAutoTask<R1, R extends Dictionary<any>, E> =
+		| AsyncAutoTaskFunctionWithoutDependencies<R1, E>
+		| (keyof R | AsyncAutoTaskFunction<R1, R, E>)[];
+	export interface AsyncAutoTaskFunctionWithoutDependencies<R1, E> {
+		(cb: AsyncResultCallback<R1, E> | ErrorCallback<E>): void;
+	}
+	export interface AsyncAutoTaskFunction<R1, R extends Dictionary<any>, E> {
+		(results: R, cb: AsyncResultCallback<R1, E> | ErrorCallback<E>): void;
+	}
+
+	export function each<T, E>(
+		arr: IterableCollection<T>,
+		iterator: AsyncIterator<T, E>,
+		callback?: ErrorCallback<E>
+	): void;
+
+	export function map<T, R, E>(
+		arr: T[] | IterableIterator<T>,
+		iterator: AsyncResultIterator<T, R, E>,
+		callback?: AsyncResultArrayCallback<R, E>
+	): void;
+	export function map<T, R, E>(
+		arr: Dictionary<T>,
+		iterator: AsyncResultIterator<T, R, E>,
+		callback?: AsyncResultArrayCallback<R, E>
+	): void;
+
+	export function parallel<T, E>(
+		tasks: Array<AsyncFunction<T, E>>,
+		callback?: AsyncResultArrayCallback<T, E>
+	): void;
+	export function parallel<T, E>(
+		tasks: Dictionary<AsyncFunction<T, E>>,
+		callback?: AsyncResultObjectCallback<T, E>
+	): void;
+
+	export const forEach: typeof each;
+}
+
 // There are no typings for @webassemblyjs/ast
 declare module "@webassemblyjs/ast" {
 	export function traverse(
@@ -17,7 +110,7 @@ declare module "@webassemblyjs/ast" {
 			Start?: (p: NodePath<Start>) => void;
 			Global?: (p: NodePath<Global>) => void;
 		}
-	);
+	): void;
 	export class NodePath<T> {
 		node: T;
 	}
@@ -28,14 +121,15 @@ declare module "@webassemblyjs/ast" {
 	export class Start extends Node {
 		index: Identifier;
 	}
+	export class ModuleImportDescription {
+		type: string;
+		valtype?: string;
+		id?: Identifier;
+		signature?: Signature;
+	}
 	export class ModuleImport extends Node {
 		module: string;
-		descr: {
-			type: string;
-			valtype?: string;
-			id?: Identifier;
-			signature?: Signature;
-		};
+		descr: ModuleImportDescription;
 		name: string;
 	}
 	export class ModuleExport extends Node {
@@ -126,6 +220,15 @@ declare module "@webassemblyjs/ast" {
 	export function isFuncImportDescr(n: Node): boolean;
 }
 
+// This "hack" is needed because typescript doesn't support recursive type definitions
+// It's referenced from "ruleSet-conditions" in schemas/WebpackOptions.json
+interface RuleSetConditionsRecursive
+	extends Array<import("./declarations/WebpackOptions").RuleSetCondition> {}
+interface RuleSetConditionsAbsoluteRecursive
+	extends Array<
+			import("./declarations/WebpackOptions").RuleSetConditionAbsolute
+		> {}
+
 /**
  * Global variable declarations
  * @todo Once this issue is resolved, remove these globals and add JSDoc onsite instead
diff --git a/declarations/WebpackOptions.d.ts b/declarations/WebpackOptions.d.ts
new file mode 100644
index 00000000000..62e17fcc12d
--- /dev/null
+++ b/declarations/WebpackOptions.d.ts
@@ -0,0 +1,1388 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "Entry".
+ */
+export type Entry = EntryDynamic | EntryStatic;
+/**
+ * A Function returning an entry object, an entry string, an entry array or a promise to these things.
+ *
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "EntryDynamic".
+ */
+export type EntryDynamic = (() => EntryStatic | Promise<EntryStatic>);
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "EntryStatic".
+ */
+export type EntryStatic = EntryObject | EntryItem;
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "NonEmptyArrayOfUniqueStringValues".
+ */
+export type NonEmptyArrayOfUniqueStringValues = string[];
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "EntryItem".
+ */
+export type EntryItem = string | NonEmptyArrayOfUniqueStringValues;
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "Externals".
+ */
+export type Externals =
+	| ((
+			context: string,
+			request: string,
+			callback: (err?: Error, result?: string) => void
+	  ) => void)
+	| ExternalItem
+	| (
+			| ((
+					context: string,
+					request: string,
+					callback: (err?: Error, result?: string) => void
+			  ) => void)
+			| ExternalItem)[];
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "ExternalItem".
+ */
+export type ExternalItem =
+	| string
+	| {
+			/**
+			 * The dependency used for the external
+			 */
+			[k: string]:
+				| string
+				| {
+						[k: string]: any;
+				  }
+				| ArrayOfStringValues
+				| boolean;
+	  }
+	| RegExp;
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "ArrayOfStringValues".
+ */
+export type ArrayOfStringValues = string[];
+/**
+ * One or multiple rule conditions
+ *
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "RuleSetConditionOrConditions".
+ */
+export type RuleSetConditionOrConditions = RuleSetCondition | RuleSetConditions;
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "RuleSetCondition".
+ */
+export type RuleSetCondition =
+	| RegExp
+	| string
+	| ((value: string) => boolean)
+	| RuleSetConditions
+	| {
+			/**
+			 * Logical AND
+			 */
+			and?: RuleSetConditions;
+			/**
+			 * Exclude all modules matching any of these conditions
+			 */
+			exclude?: RuleSetConditionOrConditions;
+			/**
+			 * Exclude all modules matching not any of these conditions
+			 */
+			include?: RuleSetConditionOrConditions;
+			/**
+			 * Logical NOT
+			 */
+			not?: RuleSetConditions;
+			/**
+			 * Logical OR
+			 */
+			or?: RuleSetConditions;
+			/**
+			 * Exclude all modules matching any of these conditions
+			 */
+			test?: RuleSetConditionOrConditions;
+	  };
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "RuleSetConditions".
+ */
+export type RuleSetConditions = RuleSetConditionsRecursive;
+/**
+ * One or multiple rule conditions
+ *
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "RuleSetConditionOrConditionsAbsolute".
+ */
+export type RuleSetConditionOrConditionsAbsolute =
+	| RuleSetConditionAbsolute
+	| RuleSetConditionsAbsolute;
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "RuleSetConditionAbsolute".
+ */
+export type RuleSetConditionAbsolute =
+	| RegExp
+	| string
+	| ((value: string) => boolean)
+	| RuleSetConditionsAbsolute
+	| {
+			/**
+			 * Logical AND
+			 */
+			and?: RuleSetConditionsAbsolute;
+			/**
+			 * Exclude all modules matching any of these conditions
+			 */
+			exclude?: RuleSetConditionOrConditionsAbsolute;
+			/**
+			 * Exclude all modules matching not any of these conditions
+			 */
+			include?: RuleSetConditionOrConditionsAbsolute;
+			/**
+			 * Logical NOT
+			 */
+			not?: RuleSetConditionsAbsolute;
+			/**
+			 * Logical OR
+			 */
+			or?: RuleSetConditionsAbsolute;
+			/**
+			 * Exclude all modules matching any of these conditions
+			 */
+			test?: RuleSetConditionOrConditionsAbsolute;
+	  };
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "RuleSetConditionsAbsolute".
+ */
+export type RuleSetConditionsAbsolute = RuleSetConditionsAbsoluteRecursive;
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "RuleSetLoader".
+ */
+export type RuleSetLoader = string;
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "RuleSetUse".
+ */
+export type RuleSetUse = RuleSetUseItem | Function | RuleSetUseItem[];
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "RuleSetUseItem".
+ */
+export type RuleSetUseItem =
+	| RuleSetLoader
+	| Function
+	| {
+			/**
+			 * Unique loader identifier
+			 */
+			ident?: string;
+			/**
+			 * Loader name
+			 */
+			loader?: RuleSetLoader;
+			/**
+			 * Loader options
+			 */
+			options?: RuleSetQuery;
+			/**
+			 * Loader query
+			 */
+			query?: RuleSetQuery;
+	  };
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "RuleSetQuery".
+ */
+export type RuleSetQuery =
+	| {
+			[k: string]: any;
+	  }
+	| string;
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "ArrayOfStringOrStringArrayValues".
+ */
+export type ArrayOfStringOrStringArrayValues = (string | string[])[];
+/**
+ * Function acting as plugin
+ *
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "WebpackPluginFunction".
+ */
+export type WebpackPluginFunction = (
+	compiler: import("../lib/Compiler")
+) => void;
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "RuleSetRules".
+ */
+export type RuleSetRules = RuleSetRule[];
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "FilterTypes".
+ */
+export type FilterTypes = FilterItemTypes | FilterItemTypes[];
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "FilterItemTypes".
+ */
+export type FilterItemTypes = RegExp | string | Function;
+
+export interface WebpackOptions {
+	/**
+	 * Set the value of `require.amd` and `define.amd`.
+	 */
+	amd?: {
+		[k: string]: any;
+	};
+	/**
+	 * Report the first error as a hard error instead of tolerating it.
+	 */
+	bail?: boolean;
+	/**
+	 * Cache generated modules and chunks to improve performance for multiple incremental builds.
+	 */
+	cache?:
+		| boolean
+		| {
+				[k: string]: any;
+		  };
+	/**
+	 * The base directory (absolute path!) for resolving the `entry` option. If `output.pathinfo` is set, the included pathinfo is shortened to this directory.
+	 */
+	context?: string;
+	/**
+	 * References to other configurations to depend on.
+	 */
+	dependencies?: string[];
+	/**
+	 * Options for the webpack-dev-server
+	 */
+	devServer?: {
+		[k: string]: any;
+	};
+	/**
+	 * A developer tool to enhance debugging.
+	 */
+	devtool?: string | false;
+	/**
+	 * The entry point(s) of the compilation.
+	 */
+	entry?: Entry;
+	/**
+	 * Specify dependencies that shouldn't be resolved by webpack, but should become dependencies of the resulting bundle. The kind of the dependency depends on `output.libraryTarget`.
+	 */
+	externals?: Externals;
+	/**
+	 * Custom values available in the loader context.
+	 */
+	loader?: {
+		[k: string]: any;
+	};
+	/**
+	 * Enable production optimizations or development hints.
+	 */
+	mode?: "development" | "production" | "none";
+	/**
+	 * Options affecting the normal modules (`NormalModuleFactory`).
+	 */
+	module?: ModuleOptions;
+	/**
+	 * Name of the configuration. Used when loading multiple configurations.
+	 */
+	name?: string;
+	/**
+	 * Include polyfills or mocks for various node stuff.
+	 */
+	node?: false | NodeOptions;
+	/**
+	 * Enables/Disables integrated optimizations
+	 */
+	optimization?: OptimizationOptions;
+	/**
+	 * Options affecting the output of the compilation. `output` options tell webpack how to write the compiled files to disk.
+	 */
+	output?: OutputOptions;
+	/**
+	 * The number of parallel processed modules in the compilation.
+	 */
+	parallelism?: number;
+	/**
+	 * Configuration for web performance recommendations.
+	 */
+	performance?: false | PerformanceOptions;
+	/**
+	 * Add additional plugins to the compiler.
+	 */
+	plugins?: (WebpackPluginInstance | WebpackPluginFunction)[];
+	/**
+	 * Capture timing information for each module.
+	 */
+	profile?: boolean;
+	/**
+	 * Store compiler state to a json file.
+	 */
+	recordsInputPath?: string;
+	/**
+	 * Load compiler state from a json file.
+	 */
+	recordsOutputPath?: string;
+	/**
+	 * Store/Load compiler state from/to a json file. This will result in persistent ids of modules and chunks. An absolute path is expected. `recordsPath` is used for `recordsInputPath` and `recordsOutputPath` if they left undefined.
+	 */
+	recordsPath?: string;
+	/**
+	 * Options for the resolver
+	 */
+	resolve?: ResolveOptions;
+	/**
+	 * Options for the resolver when resolving loaders
+	 */
+	resolveLoader?: ResolveOptions;
+	/**
+	 * Options for webpack-serve
+	 */
+	serve?: {
+		[k: string]: any;
+	};
+	/**
+	 * Used by the webpack CLI program to pass stats options.
+	 */
+	stats?:
+		| StatsOptions
+		| boolean
+		| ("none" | "errors-only" | "minimal" | "normal" | "detailed" | "verbose");
+	/**
+	 * Environment to build for
+	 */
+	target?:
+		| (
+				| "web"
+				| "webworker"
+				| "node"
+				| "async-node"
+				| "node-webkit"
+				| "electron-main"
+				| "electron-renderer")
+		| ((compiler: import("../lib/Compiler")) => void);
+	/**
+	 * Enter watch mode, which rebuilds on file change.
+	 */
+	watch?: boolean;
+	/**
+	 * Options for the watcher
+	 */
+	watchOptions?: {
+		/**
+		 * Delay the rebuilt after the first change. Value is a time in ms.
+		 */
+		aggregateTimeout?: number;
+		/**
+		 * Ignore some files from watching
+		 */
+		ignored?: {
+			[k: string]: any;
+		};
+		/**
+		 * Enable polling mode for watching
+		 */
+		poll?: boolean | number;
+		/**
+		 * Stop watching when stdin stream has ended
+		 */
+		stdin?: boolean;
+	};
+}
+/**
+ * Multiple entry bundles are created. The key is the chunk name. The value can be a string or an array.
+ *
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "EntryObject".
+ */
+export interface EntryObject {
+	/**
+	 * An entry point with name
+	 */
+	[k: string]: string | NonEmptyArrayOfUniqueStringValues;
+}
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "ModuleOptions".
+ */
+export interface ModuleOptions {
+	/**
+	 * An array of rules applied by default for modules.
+	 */
+	defaultRules?: RuleSetRules;
+	/**
+	 * Enable warnings for full dynamic dependencies
+	 */
+	exprContextCritical?: boolean;
+	/**
+	 * Enable recursive directory lookup for full dynamic dependencies
+	 */
+	exprContextRecursive?: boolean;
+	/**
+	 * Sets the default regular expression for full dynamic dependencies
+	 */
+	exprContextRegExp?: boolean | RegExp;
+	/**
+	 * Set the default request for full dynamic dependencies
+	 */
+	exprContextRequest?: string;
+	/**
+	 * Don't parse files matching. It's matched against the full resolved request.
+	 */
+	noParse?: RegExp[] | RegExp | Function | string[] | string;
+	/**
+	 * An array of rules applied for modules.
+	 */
+	rules?: RuleSetRules;
+	/**
+	 * Emit errors instead of warnings when imported names don't exist in imported module
+	 */
+	strictExportPresence?: boolean;
+	/**
+	 * Handle the this context correctly according to the spec for namespace objects
+	 */
+	strictThisContextOnImports?: boolean;
+	/**
+	 * Enable warnings when using the require function in a not statically analyse-able way
+	 */
+	unknownContextCritical?: boolean;
+	/**
+	 * Enable recursive directory lookup when using the require function in a not statically analyse-able way
+	 */
+	unknownContextRecursive?: boolean;
+	/**
+	 * Sets the regular expression when using the require function in a not statically analyse-able way
+	 */
+	unknownContextRegExp?: boolean | RegExp;
+	/**
+	 * Sets the request when using the require function in a not statically analyse-able way
+	 */
+	unknownContextRequest?: string;
+	/**
+	 * Cache the resolving of module requests
+	 */
+	unsafeCache?: boolean | Function;
+	/**
+	 * Enable warnings for partial dynamic dependencies
+	 */
+	wrappedContextCritical?: boolean;
+	/**
+	 * Enable recursive directory lookup for partial dynamic dependencies
+	 */
+	wrappedContextRecursive?: boolean;
+	/**
+	 * Set the inner regular expression for partial dynamic dependencies
+	 */
+	wrappedContextRegExp?: RegExp;
+}
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "RuleSetRule".
+ */
+export interface RuleSetRule {
+	/**
+	 * Match the child compiler name
+	 */
+	compiler?: RuleSetConditionOrConditions;
+	/**
+	 * Enforce this rule as pre or post step
+	 */
+	enforce?: "pre" | "post";
+	/**
+	 * Shortcut for resource.exclude
+	 */
+	exclude?: RuleSetConditionOrConditionsAbsolute;
+	/**
+	 * Shortcut for resource.include
+	 */
+	include?: RuleSetConditionOrConditionsAbsolute;
+	/**
+	 * Match the issuer of the module (The module pointing to this module)
+	 */
+	issuer?: RuleSetConditionOrConditionsAbsolute;
+	/**
+	 * Shortcut for use.loader
+	 */
+	loader?: RuleSetLoader | RuleSetUse;
+	/**
+	 * Shortcut for use.loader
+	 */
+	loaders?: RuleSetUse;
+	/**
+	 * Only execute the first matching rule in this array
+	 */
+	oneOf?: RuleSetRules;
+	/**
+	 * Shortcut for use.options
+	 */
+	options?: RuleSetQuery;
+	/**
+	 * Options for parsing
+	 */
+	parser?: {
+		[k: string]: any;
+	};
+	/**
+	 * Shortcut for use.query
+	 */
+	query?: RuleSetQuery;
+	/**
+	 * Options for the resolver
+	 */
+	resolve?: ResolveOptions;
+	/**
+	 * Match the resource path of the module
+	 */
+	resource?: RuleSetConditionOrConditionsAbsolute;
+	/**
+	 * Match the resource query of the module
+	 */
+	resourceQuery?: RuleSetConditionOrConditions;
+	/**
+	 * Match and execute these rules when this rule is matched
+	 */
+	rules?: RuleSetRules;
+	/**
+	 * Flags a module as with or without side effects
+	 */
+	sideEffects?: boolean;
+	/**
+	 * Shortcut for resource.test
+	 */
+	test?: RuleSetConditionOrConditionsAbsolute;
+	/**
+	 * Module type to use for the module
+	 */
+	type?:
+		| "javascript/auto"
+		| "javascript/dynamic"
+		| "javascript/esm"
+		| "json"
+		| "webassembly/experimental";
+	/**
+	 * Modifiers applied to the module when rule is matched
+	 */
+	use?: RuleSetUse;
+}
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "ResolveOptions".
+ */
+export interface ResolveOptions {
+	/**
+	 * Redirect module requests
+	 */
+	alias?:
+		| {
+				/**
+				 * New request
+				 */
+				[k: string]: string;
+		  }
+		| {
+				/**
+				 * New request
+				 */
+				alias?: string;
+				/**
+				 * Request to be redirected
+				 */
+				name?: string;
+				/**
+				 * Redirect only exact matching request
+				 */
+				onlyModule?: boolean;
+		  }[];
+	/**
+	 * Fields in the description file (package.json) which are used to redirect requests inside the module
+	 */
+	aliasFields?: ArrayOfStringOrStringArrayValues;
+	/**
+	 * Predicate function to decide which requests should be cached
+	 */
+	cachePredicate?: Function;
+	/**
+	 * Include the context information in the cache identifier when caching
+	 */
+	cacheWithContext?: boolean;
+	/**
+	 * Enable concord resolving extras
+	 */
+	concord?: boolean;
+	/**
+	 * Filenames used to find a description file
+	 */
+	descriptionFiles?: ArrayOfStringValues;
+	/**
+	 * Enforce using one of the extensions from the extensions option
+	 */
+	enforceExtension?: boolean;
+	/**
+	 * Enforce using one of the module extensions from the moduleExtensions option
+	 */
+	enforceModuleExtension?: boolean;
+	/**
+	 * Extensions added to the request when trying to find the file
+	 */
+	extensions?: ArrayOfStringValues;
+	/**
+	 * Filesystem for the resolver
+	 */
+	fileSystem?: {
+		[k: string]: any;
+	};
+	/**
+	 * Field names from the description file (package.json) which are used to find the default entry point
+	 */
+	mainFields?: ArrayOfStringOrStringArrayValues;
+	/**
+	 * Filenames used to find the default entry point if there is no description file or main field
+	 */
+	mainFiles?: ArrayOfStringValues;
+	/**
+	 * Extensions added to the module request when trying to find the module
+	 */
+	moduleExtensions?: ArrayOfStringValues;
+	/**
+	 * Folder names or directory paths where to find modules
+	 */
+	modules?: ArrayOfStringValues;
+	/**
+	 * Plugins for the resolver
+	 */
+	plugins?: (WebpackPluginInstance | WebpackPluginFunction)[];
+	/**
+	 * Custom resolver
+	 */
+	resolver?: {
+		[k: string]: any;
+	};
+	/**
+	 * Enable resolving symlinks to the original location
+	 */
+	symlinks?: boolean;
+	/**
+	 * Enable caching of successfully resolved requests
+	 */
+	unsafeCache?:
+		| boolean
+		| {
+				[k: string]: any;
+		  };
+	/**
+	 * Use synchronous filesystem calls for the resolver
+	 */
+	useSyncFileSystemCalls?: boolean;
+}
+/**
+ * Plugin instance
+ *
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "WebpackPluginInstance".
+ */
+export interface WebpackPluginInstance {
+	/**
+	 * The run point of the plugin, required method.
+	 */
+	apply: (compiler: import("../lib/Compiler")) => void;
+	[k: string]: any;
+}
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "NodeOptions".
+ */
+export interface NodeOptions {
+	/**
+	 * Include a polyfill for the 'Buffer' variable
+	 */
+	Buffer?: false | true | "mock";
+	/**
+	 * Include a polyfill for the '__dirname' variable
+	 */
+	__dirname?: false | true | "mock";
+	/**
+	 * Include a polyfill for the '__filename' variable
+	 */
+	__filename?: false | true | "mock";
+	/**
+	 * Include a polyfill for the 'console' variable
+	 */
+	console?: false | true | "mock";
+	/**
+	 * Include a polyfill for the 'global' variable
+	 */
+	global?: boolean;
+	/**
+	 * Include a polyfill for the 'process' variable
+	 */
+	process?: false | true | "mock";
+	/**
+	 * Include a polyfill for the node.js module
+	 */
+	[k: string]: false | true | "mock" | "empty";
+}
+/**
+ * Enables/Disables integrated optimizations
+ *
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "OptimizationOptions".
+ */
+export interface OptimizationOptions {
+	/**
+	 * Check for incompatible wasm types when importing/exporting from/to ESM
+	 */
+	checkWasmTypes?: boolean;
+	/**
+	 * Define the algorithm to choose chunk ids (named: readable ids for better debugging, size: numeric ids focused on minimal initial download size, total-size: numeric ids focused on minimal total download size, false: no algorithm used, as custom one can be provided via plugin)
+	 */
+	chunkIds?: "natural" | "named" | "size" | "total-size" | false;
+	/**
+	 * Concatenate modules when possible to generate less modules, more efficient code and enable more optimizations by the minimizer
+	 */
+	concatenateModules?: boolean;
+	/**
+	 * Also flag chunks as loaded which contain a subset of the modules
+	 */
+	flagIncludedChunks?: boolean;
+	/**
+	 * Use hashed module id instead module identifiers for better long term caching (deprecated, used moduleIds: hashed instead)
+	 */
+	hashedModuleIds?: boolean;
+	/**
+	 * Reduce size of WASM by changing imports to shorter strings.
+	 */
+	mangleWasmImports?: boolean;
+	/**
+	 * Merge chunks which contain the same modules
+	 */
+	mergeDuplicateChunks?: boolean;
+	/**
+	 * Enable minimizing the output. Uses optimization.minimizer.
+	 */
+	minimize?: boolean;
+	/**
+	 * Minimizer(s) to use for minimizing the output
+	 */
+	minimizer?: (WebpackPluginInstance | WebpackPluginFunction)[];
+	/**
+	 * Define the algorithm to choose module ids (natural: numeric ids in order of usage, named: readable ids for better debugging, hashed: short hashes as ids for better long term caching, size: numeric ids focused on minimal initial download size, total-size: numeric ids focused on minimal total download size, false: no algorithm used, as custom one can be provided via plugin)
+	 */
+	moduleIds?: "natural" | "named" | "hashed" | "size" | "total-size" | false;
+	/**
+	 * Use readable chunk identifiers for better debugging (deprecated, used chunkIds: named instead)
+	 */
+	namedChunks?: boolean;
+	/**
+	 * Use readable module identifiers for better debugging (deprecated, used moduleIds: named instead)
+	 */
+	namedModules?: boolean;
+	/**
+	 * Avoid emitting assets when errors occur
+	 */
+	noEmitOnErrors?: boolean;
+	/**
+	 * Set process.env.NODE_ENV to a specific value
+	 */
+	nodeEnv?: false | string;
+	/**
+	 * Figure out a order of modules which results in the smallest initial bundle
+	 */
+	occurrenceOrder?: boolean;
+	/**
+	 * Generate records with relative paths to be able to move the context folder
+	 */
+	portableRecords?: boolean;
+	/**
+	 * Figure out which exports are provided by modules to generate more efficient code
+	 */
+	providedExports?: boolean;
+	/**
+	 * Removes modules from chunks when these modules are already included in all parents
+	 */
+	removeAvailableModules?: boolean;
+	/**
+	 * Remove chunks which are empty
+	 */
+	removeEmptyChunks?: boolean;
+	/**
+	 * Create an additional chunk which contains only the webpack runtime and chunk hash maps
+	 */
+	runtimeChunk?:
+		| boolean
+		| ("single" | "multiple")
+		| {
+				/**
+				 * The name or name factory for the runtime chunks
+				 */
+				name?: string | Function;
+		  };
+	/**
+	 * Skip over modules which are flagged to contain no side effects when exports are not used
+	 */
+	sideEffects?: boolean;
+	/**
+	 * Optimize duplication and caching by splitting chunks by shared modules and cache group
+	 */
+	splitChunks?: false | OptimizationSplitChunksOptions;
+	/**
+	 * Figure out which exports are used by modules to mangle export names, omit unused exports and generate more efficient code
+	 */
+	usedExports?: boolean;
+}
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "OptimizationSplitChunksOptions".
+ */
+export interface OptimizationSplitChunksOptions {
+	/**
+	 * Sets the name delimiter for created chunks
+	 */
+	automaticNameDelimiter?: string;
+	/**
+	 * Assign modules to a cache group (modules from different cache groups are tried to keep in separate chunks)
+	 */
+	cacheGroups?: {
+		/**
+		 * Configuration for a cache group
+		 */
+		[k: string]:
+			| false
+			| Function
+			| string
+			| RegExp
+			| {
+					/**
+					 * Sets the name delimiter for created chunks
+					 */
+					automaticNameDelimiter?: string;
+					/**
+					 * Sets the name prefix for created chunks
+					 */
+					automaticNamePrefix?: string;
+					/**
+					 * Select chunks for determining cache group content (defaults to "initial", "initial" and "all" requires adding these chunks to the HTML)
+					 */
+					chunks?: ("initial" | "async" | "all") | Function;
+					/**
+					 * Ignore minimum size, minimum chunks and maximum requests and always create chunks for this cache group
+					 */
+					enforce?: boolean;
+					/**
+					 * Sets the template for the filename for created chunks (Only works for initial chunks)
+					 */
+					filename?: string;
+					/**
+					 * Maximum number of requests which are accepted for on-demand loading
+					 */
+					maxAsyncRequests?: number;
+					/**
+					 * Maximum number of initial chunks which are accepted for an entry point
+					 */
+					maxInitialRequests?: number;
+					/**
+					 * Maximal size hint for the created chunks
+					 */
+					maxSize?: number;
+					/**
+					 * Minimum number of times a module has to be duplicated until it's considered for splitting
+					 */
+					minChunks?: number;
+					/**
+					 * Minimal size for the created chunk
+					 */
+					minSize?: number;
+					/**
+					 * Give chunks for this cache group a name (chunks with equal name are merged)
+					 */
+					name?: boolean | Function | string;
+					/**
+					 * Priority of this cache group
+					 */
+					priority?: number;
+					/**
+					 * Try to reuse existing chunk (with name) when it has matching modules
+					 */
+					reuseExistingChunk?: boolean;
+					/**
+					 * Assign modules to a cache group
+					 */
+					test?: Function | string | RegExp;
+			  };
+	};
+	/**
+	 * Select chunks for determining shared modules (defaults to "async", "initial" and "all" requires adding these chunks to the HTML)
+	 */
+	chunks?: ("initial" | "async" | "all") | Function;
+	/**
+	 * Options for modules not selected by any other cache group
+	 */
+	fallbackCacheGroup?: {
+		/**
+		 * Sets the name delimiter for created chunks
+		 */
+		automaticNameDelimiter?: string;
+		/**
+		 * Maximal size hint for the created chunks
+		 */
+		maxSize?: number;
+		/**
+		 * Minimal size for the created chunk
+		 */
+		minSize?: number;
+	};
+	/**
+	 * Sets the template for the filename for created chunks (Only works for initial chunks)
+	 */
+	filename?: string;
+	/**
+	 * Prevents exposing path info when creating names for parts splitted by maxSize
+	 */
+	hidePathInfo?: boolean;
+	/**
+	 * Maximum number of requests which are accepted for on-demand loading
+	 */
+	maxAsyncRequests?: number;
+	/**
+	 * Maximum number of initial chunks which are accepted for an entry point
+	 */
+	maxInitialRequests?: number;
+	/**
+	 * Maximal size hint for the created chunks
+	 */
+	maxSize?: number;
+	/**
+	 * Minimum number of times a module has to be duplicated until it's considered for splitting
+	 */
+	minChunks?: number;
+	/**
+	 * Minimal size for the created chunks
+	 */
+	minSize?: number;
+	/**
+	 * Give chunks created a name (chunks with equal name are merged)
+	 */
+	name?: boolean | Function | string;
+}
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "OutputOptions".
+ */
+export interface OutputOptions {
+	/**
+	 * Add a comment in the UMD wrapper.
+	 */
+	auxiliaryComment?:
+		| string
+		| {
+				/**
+				 * Set comment for `amd` section in UMD
+				 */
+				amd?: string;
+				/**
+				 * Set comment for `commonjs` (exports) section in UMD
+				 */
+				commonjs?: string;
+				/**
+				 * Set comment for `commonjs2` (module.exports) section in UMD
+				 */
+				commonjs2?: string;
+				/**
+				 * Set comment for `root` (global variable) section in UMD
+				 */
+				root?: string;
+		  };
+	/**
+	 * The callback function name used by webpack for loading of chunks in WebWorkers.
+	 */
+	chunkCallbackName?: string;
+	/**
+	 * The filename of non-entry chunks as relative path inside the `output.path` directory.
+	 */
+	chunkFilename?: string;
+	/**
+	 * Number of milliseconds before chunk request expires
+	 */
+	chunkLoadTimeout?: number;
+	/**
+	 * This option enables cross-origin loading of chunks.
+	 */
+	crossOriginLoading?: false | "anonymous" | "use-credentials";
+	/**
+	 * Similar to `output.devtoolModuleFilenameTemplate`, but used in the case of duplicate module identifiers.
+	 */
+	devtoolFallbackModuleFilenameTemplate?: string | Function;
+	/**
+	 * Enable line to line mapped mode for all/specified modules. Line to line mapped mode uses a simple SourceMap where each line of the generated source is mapped to the same line of the original source. It’s a performance optimization. Only use it if your performance need to be better and you are sure that input lines match which generated lines.
+	 */
+	devtoolLineToLine?:
+		| boolean
+		| {
+				[k: string]: any;
+		  };
+	/**
+	 * Filename template string of function for the sources array in a generated SourceMap.
+	 */
+	devtoolModuleFilenameTemplate?: string | Function;
+	/**
+	 * Module namespace to use when interpolating filename template string for the sources array in a generated SourceMap. Defaults to `output.library` if not set. It's useful for avoiding runtime collisions in sourcemaps from multiple webpack projects built as libraries.
+	 */
+	devtoolNamespace?: string;
+	/**
+	 * Specifies the name of each output file on disk. You must **not** specify an absolute path here! The `output.path` option determines the location on disk the files are written to, filename is used solely for naming the individual files.
+	 */
+	filename?: string | Function;
+	/**
+	 * An expression which is used to address the global object/scope in runtime code
+	 */
+	globalObject?: string;
+	/**
+	 * Digest type used for the hash
+	 */
+	hashDigest?: string;
+	/**
+	 * Number of chars which are used for the hash
+	 */
+	hashDigestLength?: number;
+	/**
+	 * Algorithm used for generation the hash (see node.js crypto package)
+	 */
+	hashFunction?: string | (new () => import("../lib/util/createHash").Hash);
+	/**
+	 * Any string which is added to the hash to salt it
+	 */
+	hashSalt?: string;
+	/**
+	 * The filename of the Hot Update Chunks. They are inside the output.path directory.
+	 */
+	hotUpdateChunkFilename?: string | Function;
+	/**
+	 * The JSONP function used by webpack for async loading of hot update chunks.
+	 */
+	hotUpdateFunction?: string;
+	/**
+	 * The filename of the Hot Update Main File. It is inside the `output.path` directory.
+	 */
+	hotUpdateMainFilename?: string | Function;
+	/**
+	 * The JSONP function used by webpack for async loading of chunks.
+	 */
+	jsonpFunction?: string;
+	/**
+	 * This option enables loading async chunks via a custom script type, such as script type="module"
+	 */
+	jsonpScriptType?: false | "text/javascript" | "module";
+	/**
+	 * If set, export the bundle as library. `output.library` is the name.
+	 */
+	library?: string | string[] | LibraryCustomUmdObject;
+	/**
+	 * Specify which export should be exposed as library
+	 */
+	libraryExport?: string | ArrayOfStringValues;
+	/**
+	 * Type of library
+	 */
+	libraryTarget?:
+		| "var"
+		| "assign"
+		| "this"
+		| "window"
+		| "self"
+		| "global"
+		| "commonjs"
+		| "commonjs2"
+		| "commonjs-module"
+		| "amd"
+		| "amd-require"
+		| "umd"
+		| "umd2"
+		| "jsonp";
+	/**
+	 * The output directory as **absolute path** (required).
+	 */
+	path?: string;
+	/**
+	 * Include comments with information about the modules.
+	 */
+	pathinfo?: boolean;
+	/**
+	 * The `publicPath` specifies the public URL address of the output files when referenced in a browser.
+	 */
+	publicPath?: string | Function;
+	/**
+	 * The filename of the SourceMaps for the JavaScript files. They are inside the `output.path` directory.
+	 */
+	sourceMapFilename?: string;
+	/**
+	 * Prefixes every line of the source in the bundle with this string.
+	 */
+	sourcePrefix?: string;
+	/**
+	 * Handles exceptions in module loading correctly at a performance cost.
+	 */
+	strictModuleExceptionHandling?: boolean;
+	/**
+	 * If `output.libraryTarget` is set to umd and `output.library` is set, setting this to true will name the AMD module.
+	 */
+	umdNamedDefine?: boolean;
+	/**
+	 * The filename of WebAssembly modules as relative path inside the `output.path` directory.
+	 */
+	webassemblyModuleFilename?: string;
+}
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "LibraryCustomUmdObject".
+ */
+export interface LibraryCustomUmdObject {
+	/**
+	 * Name of the exposed AMD library in the UMD
+	 */
+	amd?: string;
+	/**
+	 * Name of the exposed commonjs export in the UMD
+	 */
+	commonjs?: string;
+	/**
+	 * Name of the property exposed globally by a UMD library
+	 */
+	root?: string | ArrayOfStringValues;
+}
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "PerformanceOptions".
+ */
+export interface PerformanceOptions {
+	/**
+	 * Filter function to select assets that are checked
+	 */
+	assetFilter?: Function;
+	/**
+	 * Sets the format of the hints: warnings, errors or nothing at all
+	 */
+	hints?: false | "warning" | "error";
+	/**
+	 * Filesize limit (in bytes) when exceeded, that webpack will provide performance hints
+	 */
+	maxAssetSize?: number;
+	/**
+	 * Total size of an entry point (in bytes)
+	 */
+	maxEntrypointSize?: number;
+}
+/**
+ * This interface was referenced by `WebpackOptions`'s JSON-Schema
+ * via the `definition` "StatsOptions".
+ */
+export interface StatsOptions {
+	/**
+	 * fallback value for stats options when an option is not defined (has precedence over local webpack defaults)
+	 */
+	all?: boolean;
+	/**
+	 * add assets information
+	 */
+	assets?: boolean;
+	/**
+	 * sort the assets by that field
+	 */
+	assetsSort?: string;
+	/**
+	 * add built at time information
+	 */
+	builtAt?: boolean;
+	/**
+	 * add also information about cached (not built) modules
+	 */
+	cached?: boolean;
+	/**
+	 * Show cached assets (setting this to `false` only shows emitted files)
+	 */
+	cachedAssets?: boolean;
+	/**
+	 * add children information
+	 */
+	children?: boolean;
+	/**
+	 * Display all chunk groups with the corresponding bundles
+	 */
+	chunkGroups?: boolean;
+	/**
+	 * add built modules information to chunk information
+	 */
+	chunkModules?: boolean;
+	/**
+	 * add the origins of chunks and chunk merging info
+	 */
+	chunkOrigins?: boolean;
+	/**
+	 * add chunk information
+	 */
+	chunks?: boolean;
+	/**
+	 * sort the chunks by that field
+	 */
+	chunksSort?: string;
+	/**
+	 * Enables/Disables colorful output
+	 */
+	colors?:
+		| boolean
+		| {
+				/**
+				 * Custom color for bold text
+				 */
+				bold?: string;
+				/**
+				 * Custom color for cyan text
+				 */
+				cyan?: string;
+				/**
+				 * Custom color for green text
+				 */
+				green?: string;
+				/**
+				 * Custom color for magenta text
+				 */
+				magenta?: string;
+				/**
+				 * Custom color for red text
+				 */
+				red?: string;
+				/**
+				 * Custom color for yellow text
+				 */
+				yellow?: string;
+		  };
+	/**
+	 * context directory for request shortening
+	 */
+	context?: string;
+	/**
+	 * add module depth in module graph
+	 */
+	depth?: boolean;
+	/**
+	 * Display the entry points with the corresponding bundles
+	 */
+	entrypoints?: boolean;
+	/**
+	 * add --env information
+	 */
+	env?: boolean;
+	/**
+	 * add details to errors (like resolving log)
+	 */
+	errorDetails?: boolean;
+	/**
+	 * add errors
+	 */
+	errors?: boolean;
+	/**
+	 * Please use excludeModules instead.
+	 */
+	exclude?: FilterTypes | boolean;
+	/**
+	 * Suppress assets that match the specified filters. Filters can be Strings, RegExps or Functions
+	 */
+	excludeAssets?: FilterTypes;
+	/**
+	 * Suppress modules that match the specified filters. Filters can be Strings, RegExps, Booleans or Functions
+	 */
+	excludeModules?: FilterTypes | boolean;
+	/**
+	 * add the hash of the compilation
+	 */
+	hash?: boolean;
+	/**
+	 * Set the maximum number of modules to be shown
+	 */
+	maxModules?: number;
+	/**
+	 * add information about assets inside modules
+	 */
+	moduleAssets?: boolean;
+	/**
+	 * add dependencies and origin of warnings/errors
+	 */
+	moduleTrace?: boolean;
+	/**
+	 * add built modules information
+	 */
+	modules?: boolean;
+	/**
+	 * sort the modules by that field
+	 */
+	modulesSort?: string;
+	/**
+	 * add information about modules nested in other modules (like with module concatenation)
+	 */
+	nestedModules?: boolean;
+	/**
+	 * show reasons why optimization bailed out for modules
+	 */
+	optimizationBailout?: boolean;
+	/**
+	 * Add output path information
+	 */
+	outputPath?: boolean;
+	/**
+	 * add performance hint flags
+	 */
+	performance?: boolean;
+	/**
+	 * show exports provided by modules
+	 */
+	providedExports?: boolean;
+	/**
+	 * Add public path information
+	 */
+	publicPath?: boolean;
+	/**
+	 * add information about the reasons why modules are included
+	 */
+	reasons?: boolean;
+	/**
+	 * add the source code of modules
+	 */
+	source?: boolean;
+	/**
+	 * add timing information
+	 */
+	timings?: boolean;
+	/**
+	 * show exports used by modules
+	 */
+	usedExports?: boolean;
+	/**
+	 * add webpack version information
+	 */
+	version?: boolean;
+	/**
+	 * add warnings
+	 */
+	warnings?: boolean;
+	/**
+	 * Suppress warnings that match the specified filters. Filters can be Strings, RegExps or Functions
+	 */
+	warningsFilter?: FilterTypes;
+}
diff --git a/declarations/plugins/BannerPlugin.d.ts b/declarations/plugins/BannerPlugin.d.ts
new file mode 100644
index 00000000000..4b3810596e4
--- /dev/null
+++ b/declarations/plugins/BannerPlugin.d.ts
@@ -0,0 +1,51 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+export type BannerPluginArgument =
+	| BannerPluginOptions
+	| BannerFunction
+	| string;
+/**
+ * The banner as function, it will be wrapped in a comment
+ */
+export type BannerFunction = (
+	data: {
+		hash: string;
+		chunk: import("../../lib/Chunk");
+		filename: string;
+		basename: string;
+		query: string;
+	}
+) => string;
+export type Rules = Rule[] | Rule;
+export type Rule = RegExp | string;
+
+export interface BannerPluginOptions {
+	/**
+	 * Specifies the banner
+	 */
+	banner: BannerFunction | string;
+	/**
+	 * If true, the banner will only be added to the entry chunks
+	 */
+	entryOnly?: boolean;
+	/**
+	 * Exclude all modules matching any of these conditions
+	 */
+	exclude?: Rules;
+	/**
+	 * Include all modules matching any of these conditions
+	 */
+	include?: Rules;
+	/**
+	 * If true, banner will not be wrapped in a comment
+	 */
+	raw?: boolean;
+	/**
+	 * Include all modules that pass test assertion
+	 */
+	test?: Rules;
+}
diff --git a/declarations/plugins/DllPlugin.d.ts b/declarations/plugins/DllPlugin.d.ts
new file mode 100644
index 00000000000..f7264c2dab3
--- /dev/null
+++ b/declarations/plugins/DllPlugin.d.ts
@@ -0,0 +1,28 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+export interface DllPluginOptions {
+	/**
+	 * Context of requests in the manifest file (defaults to the webpack context)
+	 */
+	context?: string;
+	/**
+	 * If true, only entry points will be exposed
+	 */
+	entryOnly?: boolean;
+	/**
+	 * Name of the exposed dll function (external name, use value of 'output.library')
+	 */
+	name?: string;
+	/**
+	 * Absolute path to the manifest json file (output)
+	 */
+	path: string;
+	/**
+	 * Type of the dll bundle (external type, use value of 'output.libraryTarget')
+	 */
+	type?: string;
+}
diff --git a/declarations/plugins/DllReferencePlugin.d.ts b/declarations/plugins/DllReferencePlugin.d.ts
new file mode 100644
index 00000000000..73dfa522a2f
--- /dev/null
+++ b/declarations/plugins/DllReferencePlugin.d.ts
@@ -0,0 +1,126 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+export type DllReferencePluginOptions =
+	| {
+			/**
+			 * (absolute path) context of requests in the manifest (or content property)
+			 */
+			context?: string;
+			/**
+			 * Extensions used to resolve modules in the dll bundle (only used when using 'scope')
+			 */
+			extensions?: string[];
+			/**
+			 * An object containing content and name or a string to the absolute path of the JSON manifest to be loaded upon compilation
+			 */
+			manifest: DllReferencePluginOptionsManifest | string;
+			/**
+			 * The name where the dll is exposed (external name, defaults to manifest.name)
+			 */
+			name?: string;
+			/**
+			 * Prefix which is used for accessing the content of the dll
+			 */
+			scope?: string;
+			/**
+			 * How the dll is exposed (libraryTarget, defaults to manifest.type)
+			 */
+			sourceType?: DllReferencePluginOptionsSourceType;
+			/**
+			 * The way how the export of the dll bundle is used
+			 */
+			type?: "require" | "object";
+	  }
+	| {
+			/**
+			 * The mappings from request to module info
+			 */
+			content: DllReferencePluginOptionsContent;
+			/**
+			 * (absolute path) context of requests in the manifest (or content property)
+			 */
+			context?: string;
+			/**
+			 * Extensions used to resolve modules in the dll bundle (only used when using 'scope')
+			 */
+			extensions?: string[];
+			/**
+			 * The name where the dll is exposed (external name)
+			 */
+			name: string;
+			/**
+			 * Prefix which is used for accessing the content of the dll
+			 */
+			scope?: string;
+			/**
+			 * How the dll is exposed (libraryTarget)
+			 */
+			sourceType?: DllReferencePluginOptionsSourceType;
+			/**
+			 * The way how the export of the dll bundle is used
+			 */
+			type?: "require" | "object";
+	  };
+/**
+ * The type how the dll is exposed (external type)
+ */
+export type DllReferencePluginOptionsSourceType =
+	| "var"
+	| "assign"
+	| "this"
+	| "window"
+	| "global"
+	| "commonjs"
+	| "commonjs2"
+	| "commonjs-module"
+	| "amd"
+	| "amd-require"
+	| "umd"
+	| "umd2"
+	| "jsonp";
+
+/**
+ * An object containing content, name and type
+ */
+export interface DllReferencePluginOptionsManifest {
+	/**
+	 * The mappings from request to module info
+	 */
+	content: DllReferencePluginOptionsContent;
+	/**
+	 * The name where the dll is exposed (external name)
+	 */
+	name?: string;
+	/**
+	 * The type how the dll is exposed (external type)
+	 */
+	type?: DllReferencePluginOptionsSourceType;
+}
+/**
+ * The mappings from request to module info
+ */
+export interface DllReferencePluginOptionsContent {
+	/**
+	 * Module info
+	 */
+	[k: string]: {
+		/**
+		 * Meta information about the module
+		 */
+		buildMeta?: {
+			[k: string]: any;
+		};
+		/**
+		 * Information about the provided exports of the module
+		 */
+		exports?: true | string[];
+		/**
+		 * Module ID
+		 */
+		id: number | string;
+	};
+}
diff --git a/declarations/plugins/HashedModuleIdsPlugin.d.ts b/declarations/plugins/HashedModuleIdsPlugin.d.ts
new file mode 100644
index 00000000000..571ab60a4c9
--- /dev/null
+++ b/declarations/plugins/HashedModuleIdsPlugin.d.ts
@@ -0,0 +1,24 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+export interface HashedModuleIdsPluginOptions {
+	/**
+	 * The context directory for creating names.
+	 */
+	context?: string;
+	/**
+	 * The encoding to use when generating the hash, defaults to 'base64'. All encodings from Node.JS' hash.digest are supported.
+	 */
+	hashDigest?: "hex" | "latin1" | "base64";
+	/**
+	 * The prefix length of the hash digest to use, defaults to 4.
+	 */
+	hashDigestLength?: number;
+	/**
+	 * The hashing algorithm to use, defaults to 'md5'. All functions from Node.JS' crypto.createHash are supported.
+	 */
+	hashFunction?: string;
+}
diff --git a/declarations/plugins/IgnorePlugin.d.ts b/declarations/plugins/IgnorePlugin.d.ts
new file mode 100644
index 00000000000..01ac08139fb
--- /dev/null
+++ b/declarations/plugins/IgnorePlugin.d.ts
@@ -0,0 +1,27 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+export type IgnorePluginOptions =
+	| {
+			/**
+			 * A RegExp to test the context (directory) against
+			 */
+			contextRegExp?: RegExp;
+			/**
+			 * A RegExp to test the request against
+			 */
+			resourceRegExp?: RegExp;
+	  }
+	| {
+			/**
+			 * A filter function for context
+			 */
+			checkContext?: ((context: string) => boolean);
+			/**
+			 * A filter function for resource
+			 */
+			checkResource?: ((resource: string) => boolean);
+	  };
diff --git a/declarations/plugins/LoaderOptionsPlugin.d.ts b/declarations/plugins/LoaderOptionsPlugin.d.ts
new file mode 100644
index 00000000000..cb48ecc287e
--- /dev/null
+++ b/declarations/plugins/LoaderOptionsPlugin.d.ts
@@ -0,0 +1,27 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+export interface LoaderOptionsPluginOptions {
+	/**
+	 * Whether loaders should be in debug mode or not. debug will be removed as of webpack 3
+	 */
+	debug?: boolean;
+	/**
+	 * Where loaders can be switched to minimize mode
+	 */
+	minimize?: boolean;
+	/**
+	 * A configuration object that can be used to configure older loaders
+	 */
+	options?: {
+		/**
+		 * The context that can be used to configure older loaders
+		 */
+		context?: string;
+		[k: string]: any;
+	};
+	[k: string]: any;
+}
diff --git a/declarations/plugins/SourceMapDevToolPlugin.d.ts b/declarations/plugins/SourceMapDevToolPlugin.d.ts
new file mode 100644
index 00000000000..76421b508e5
--- /dev/null
+++ b/declarations/plugins/SourceMapDevToolPlugin.d.ts
@@ -0,0 +1,94 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+/**
+ * This interface was referenced by `SourceMapDevToolPluginOptions`'s JSON-Schema
+ * via the `definition` "rules".
+ */
+export type Rules = Rule[] | Rule;
+/**
+ * This interface was referenced by `SourceMapDevToolPluginOptions`'s JSON-Schema
+ * via the `definition` "rule".
+ */
+export type Rule = RegExp | string;
+
+export interface SourceMapDevToolPluginOptions {
+	/**
+	 * Appends the given value to the original asset. Usually the #sourceMappingURL comment. [url] is replaced with a URL to the source map file. false disables the appending
+	 */
+	append?: (false | null) | string;
+	/**
+	 * Indicates whether column mappings should be used (defaults to true)
+	 */
+	columns?: boolean;
+	/**
+	 * Exclude modules that match the given value from source map generation
+	 */
+	exclude?: Rules;
+	/**
+	 * Generator string or function to create identifiers of modules for the 'sources' array in the SourceMap used only if 'moduleFilenameTemplate' would result in a conflict
+	 */
+	fallbackModuleFilenameTemplate?: Function | string;
+	/**
+	 * Path prefix to which the [file] placeholder is relative to
+	 */
+	fileContext?: string;
+	/**
+	 * Defines the output filename of the SourceMap (will be inlined if no value is provided)
+	 */
+	filename?: (false | null) | string;
+	/**
+	 * Include source maps for module paths that match the given value
+	 */
+	include?: Rules;
+	/**
+	 * (deprecated) try to map original files line to line to generated files
+	 */
+	lineToLine?:
+		| boolean
+		| {
+				/**
+				 * Exclude modules that match the given value from source map generation
+				 */
+				exclude?: Rules;
+				/**
+				 * Include source maps for module paths that match the given value
+				 */
+				include?: Rules;
+				/**
+				 * Include source maps for modules based on their extension (defaults to .js and .css)
+				 */
+				test?: Rules;
+		  };
+	/**
+	 * Indicates whether SourceMaps from loaders should be used (defaults to true)
+	 */
+	module?: boolean;
+	/**
+	 * Generator string or function to create identifiers of modules for the 'sources' array in the SourceMap
+	 */
+	moduleFilenameTemplate?: Function | string;
+	/**
+	 * Namespace prefix to allow multiple webpack roots in the devtools
+	 */
+	namespace?: string;
+	/**
+	 * Omit the 'sourceContents' array from the SourceMap
+	 */
+	noSources?: boolean;
+	/**
+	 * Provide a custom public path for the SourceMapping comment
+	 */
+	publicPath?: string;
+	/**
+	 * Provide a custom value for the 'sourceRoot' property in the SourceMap
+	 */
+	sourceRoot?: string;
+	/**
+	 * Include source maps for modules based on their extension (defaults to .js and .css)
+	 */
+	test?: Rules;
+}
diff --git a/declarations/plugins/WatchIgnorePlugin.d.ts b/declarations/plugins/WatchIgnorePlugin.d.ts
new file mode 100644
index 00000000000..05c857503ee
--- /dev/null
+++ b/declarations/plugins/WatchIgnorePlugin.d.ts
@@ -0,0 +1,10 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+/**
+ * A list of RegExps or absolute paths to directories or files that should be ignored
+ */
+export type WatchIgnorePluginOptions = (string | RegExp)[];
diff --git a/declarations/plugins/debug/ProfilingPlugin.d.ts b/declarations/plugins/debug/ProfilingPlugin.d.ts
new file mode 100644
index 00000000000..d3cd664ad75
--- /dev/null
+++ b/declarations/plugins/debug/ProfilingPlugin.d.ts
@@ -0,0 +1,12 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+export interface ProfilingPluginOptions {
+	/**
+	 * Path to the output file e.g. `profiling/events.json`. Defaults to `events.json`.
+	 */
+	outputPath?: string;
+}
diff --git a/declarations/plugins/optimize/AggressiveSplittingPlugin.d.ts b/declarations/plugins/optimize/AggressiveSplittingPlugin.d.ts
new file mode 100644
index 00000000000..9f5360c4937
--- /dev/null
+++ b/declarations/plugins/optimize/AggressiveSplittingPlugin.d.ts
@@ -0,0 +1,24 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+export interface AggressiveSplittingPluginOptions {
+	/**
+	 * Default: 0
+	 */
+	chunkOverhead?: number;
+	/**
+	 * Default: 1
+	 */
+	entryChunkMultiplicator?: number;
+	/**
+	 * Byte, maxsize of per file. Default: 51200
+	 */
+	maxSize?: number;
+	/**
+	 * Byte, split point. Default: 30720
+	 */
+	minSize?: number;
+}
diff --git a/declarations/plugins/optimize/LimitChunkCountPlugin.d.ts b/declarations/plugins/optimize/LimitChunkCountPlugin.d.ts
new file mode 100644
index 00000000000..8cd59ed6eec
--- /dev/null
+++ b/declarations/plugins/optimize/LimitChunkCountPlugin.d.ts
@@ -0,0 +1,16 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+export interface LimitChunkCountPluginOptions {
+	/**
+	 * Limit the maximum number of chunks using a value greater greater than or equal to 1
+	 */
+	maxChunks?: number;
+	/**
+	 * Set a minimum chunk size
+	 */
+	minChunkSize?: number;
+}
diff --git a/declarations/plugins/optimize/MinChunkSizePlugin.d.ts b/declarations/plugins/optimize/MinChunkSizePlugin.d.ts
new file mode 100644
index 00000000000..61d20fd9ca2
--- /dev/null
+++ b/declarations/plugins/optimize/MinChunkSizePlugin.d.ts
@@ -0,0 +1,12 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+export interface MinChunkSizePluginOptions {
+	/**
+	 * Minimum number of characters
+	 */
+	minChunkSize: number;
+}
diff --git a/declarations/plugins/optimize/OccurrenceOrderChunkIdsPlugin.d.ts b/declarations/plugins/optimize/OccurrenceOrderChunkIdsPlugin.d.ts
new file mode 100644
index 00000000000..0396f5547be
--- /dev/null
+++ b/declarations/plugins/optimize/OccurrenceOrderChunkIdsPlugin.d.ts
@@ -0,0 +1,12 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+export interface OccurrenceOrderChunkIdsPluginOptions {
+	/**
+	 * Prioritise initial size over total size
+	 */
+	prioritiseInitial?: boolean;
+}
diff --git a/declarations/plugins/optimize/OccurrenceOrderModuleIdsPlugin.d.ts b/declarations/plugins/optimize/OccurrenceOrderModuleIdsPlugin.d.ts
new file mode 100644
index 00000000000..c29e0e9567e
--- /dev/null
+++ b/declarations/plugins/optimize/OccurrenceOrderModuleIdsPlugin.d.ts
@@ -0,0 +1,12 @@
+/**
+ * This file was automatically generated.
+ * DO NOT MODIFY BY HAND.
+ * Run `yarn special-lint-fix` to update
+ */
+
+export interface OccurrenceOrderModuleIdsPluginOptions {
+	/**
+	 * Prioritise initial size over total size
+	 */
+	prioritiseInitial?: boolean;
+}
diff --git a/examples/README.md b/examples/README.md
index 6407710e237..28483211b7a 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -15,12 +15,6 @@
 
 [code-splitting-specify-chunk-name](code-splitting-specify-chunk-name)
 
-[move-to-parent](move-to-parent)
-
-[multiple-commons-chunks](multiple-commons-chunks)
-
-[multiple-entry-points-commons-chunk-css-bundle](multiple-entry-points-commons-chunk-css-bundle)
-
 [named-chunks](named-chunks) example demonstrating merging of chunks with named chunks
 
 [two-explicit-vendor-chunks](two-explicit-vendor-chunks)
@@ -49,11 +43,6 @@
 ## CommonJS
 [commonjs](commonjs) example demonstrating a very simple program
 
-## Css Bundle
-[css-bundle](css-bundle)
-
-[multiple-entry-points-commons-chunk-css-bundle](multiple-entry-points-commons-chunk-css-bundle)
-
 ## DLL
 [dll](dll)
 
diff --git a/examples/aggressive-merging/README.md b/examples/aggressive-merging/README.md
index 02c4c142264..b95462ce562 100644
--- a/examples/aggressive-merging/README.md
+++ b/examples/aggressive-merging/README.md
@@ -60,94 +60,94 @@ module.exports = {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
           Asset       Size  Chunks             Chunk Names
-     0.chunk.js   5.98 KiB       0  [emitted]  
-     1.chunk.js  405 bytes       1  [emitted]  
-pageC.bundle.js   7.32 KiB       2  [emitted]  pageC
-pageB.bundle.js   7.32 KiB       3  [emitted]  pageB
-pageA.bundle.js   7.32 KiB       4  [emitted]  pageA
+     0.chunk.js   5.96 KiB       0  [emitted]  
+pageA.bundle.js   8.33 KiB       1  [emitted]  pageA
+pageB.bundle.js   8.33 KiB       2  [emitted]  pageB
+pageC.bundle.js   8.33 KiB       3  [emitted]  pageC
+     4.chunk.js  405 bytes       4  [emitted]  
 Entrypoint pageA = pageA.bundle.js
 Entrypoint pageB = pageB.bundle.js
 Entrypoint pageC = pageC.bundle.js
-chunk    {0} 0.chunk.js 5.46 KiB <{3}> <{4}> [rendered]
+chunk    {0} 0.chunk.js 5.45 KiB <{1}> <{2}> [rendered]
+    > ./common [3] ./pageA.js 1:0-3:2
     > ./common [4] ./pageB.js 1:0-3:2
-    > ./common [5] ./pageA.js 1:0-3:2
- [0] ./b.js 21 bytes {0} {1} [built]
-     cjs require ./b [3] ./pageC.js 2:17-31
+ [0] ./a.js 21 bytes {0} {4} [built]
+     cjs require ./a [3] ./pageA.js 2:8-22
+     amd require ./a [5] ./pageC.js 1:0-3:2
+ [1] ./b.js 21 bytes {0} {4} [built]
      cjs require ./b [4] ./pageB.js 2:8-22
- [1] ./a.js 21 bytes {0} {1} [built]
-     amd require ./a [3] ./pageC.js 1:0-3:2
-     cjs require ./a [5] ./pageA.js 2:8-22
- [2] ./common.js 5.42 KiB {0} [built]
+     cjs require ./b [5] ./pageC.js 2:17-31
+ [2] ./common.js 5.41 KiB {0} [built]
+     amd require ./common [3] ./pageA.js 1:0-3:2
      amd require ./common [4] ./pageB.js 1:0-3:2
-     amd require ./common [5] ./pageA.js 1:0-3:2
-chunk    {1} 1.chunk.js 42 bytes <{2}> [rendered]
-    > ./a [3] ./pageC.js 1:0-3:2
- [0] ./b.js 21 bytes {0} {1} [built]
-     cjs require ./b [3] ./pageC.js 2:17-31
-     cjs require ./b [4] ./pageB.js 2:8-22
- [1] ./a.js 21 bytes {0} {1} [built]
-     amd require ./a [3] ./pageC.js 1:0-3:2
-     cjs require ./a [5] ./pageA.js 2:8-22
-chunk    {2} pageC.bundle.js (pageC) 70 bytes >{1}< [entry] [rendered]
-    > ./pageC pageC
- [3] ./pageC.js 70 bytes {2} [built]
-     single entry ./pageC  pageC
-chunk    {3} pageB.bundle.js (pageB) 71 bytes >{0}< [entry] [rendered]
-    > ./pageB pageB
- [4] ./pageB.js 71 bytes {3} [built]
-     single entry ./pageB  pageB
-chunk    {4} pageA.bundle.js (pageA) 71 bytes >{0}< [entry] [rendered]
+chunk    {1} pageA.bundle.js (pageA) 69 bytes >{0}< [entry] [rendered]
     > ./pageA pageA
- [5] ./pageA.js 71 bytes {4} [built]
+ [3] ./pageA.js 69 bytes {1} [built]
      single entry ./pageA  pageA
+chunk    {2} pageB.bundle.js (pageB) 69 bytes >{0}< [entry] [rendered]
+    > ./pageB pageB
+ [4] ./pageB.js 69 bytes {2} [built]
+     single entry ./pageB  pageB
+chunk    {3} pageC.bundle.js (pageC) 68 bytes >{4}< [entry] [rendered]
+    > ./pageC pageC
+ [5] ./pageC.js 68 bytes {3} [built]
+     single entry ./pageC  pageC
+chunk    {4} 4.chunk.js 42 bytes <{3}> [rendered]
+    > ./a [5] ./pageC.js 1:0-3:2
+ [0] ./a.js 21 bytes {0} {4} [built]
+     cjs require ./a [3] ./pageA.js 2:8-22
+     amd require ./a [5] ./pageC.js 1:0-3:2
+ [1] ./b.js 21 bytes {0} {4} [built]
+     cjs require ./b [4] ./pageB.js 2:8-22
+     cjs require ./b [5] ./pageC.js 2:17-31
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
           Asset       Size  Chunks             Chunk Names
-     0.chunk.js  173 bytes    0, 1  [emitted]  
-     1.chunk.js  118 bytes       1  [emitted]  
-pageC.bundle.js    1.7 KiB       2  [emitted]  pageC
-pageB.bundle.js   1.69 KiB       3  [emitted]  pageB
-pageA.bundle.js   1.69 KiB       4  [emitted]  pageA
+     0.chunk.js  173 bytes    0, 4  [emitted]  
+pageA.bundle.js   2.06 KiB       1  [emitted]  pageA
+pageB.bundle.js   2.06 KiB       2  [emitted]  pageB
+pageC.bundle.js   2.08 KiB       3  [emitted]  pageC
+     4.chunk.js  118 bytes       4  [emitted]  
 Entrypoint pageA = pageA.bundle.js
 Entrypoint pageB = pageB.bundle.js
 Entrypoint pageC = pageC.bundle.js
-chunk    {0} 0.chunk.js 5.46 KiB <{3}> <{4}> [rendered]
+chunk    {0} 0.chunk.js 5.45 KiB <{1}> <{2}> [rendered]
+    > ./common [3] ./pageA.js 1:0-3:2
     > ./common [4] ./pageB.js 1:0-3:2
-    > ./common [5] ./pageA.js 1:0-3:2
- [0] ./b.js 21 bytes {0} {1} [built]
-     cjs require ./b [3] ./pageC.js 2:17-31
+ [0] ./a.js 21 bytes {0} {4} [built]
+     cjs require ./a [3] ./pageA.js 2:8-22
+     amd require ./a [5] ./pageC.js 1:0-3:2
+ [1] ./b.js 21 bytes {0} {4} [built]
      cjs require ./b [4] ./pageB.js 2:8-22
- [1] ./a.js 21 bytes {0} {1} [built]
-     amd require ./a [3] ./pageC.js 1:0-3:2
-     cjs require ./a [5] ./pageA.js 2:8-22
- [2] ./common.js 5.42 KiB {0} [built]
+     cjs require ./b [5] ./pageC.js 2:17-31
+ [2] ./common.js 5.41 KiB {0} [built]
+     amd require ./common [3] ./pageA.js 1:0-3:2
      amd require ./common [4] ./pageB.js 1:0-3:2
-     amd require ./common [5] ./pageA.js 1:0-3:2
-chunk    {1} 1.chunk.js 42 bytes <{2}> [rendered]
-    > ./a [3] ./pageC.js 1:0-3:2
- [0] ./b.js 21 bytes {0} {1} [built]
-     cjs require ./b [3] ./pageC.js 2:17-31
-     cjs require ./b [4] ./pageB.js 2:8-22
- [1] ./a.js 21 bytes {0} {1} [built]
-     amd require ./a [3] ./pageC.js 1:0-3:2
-     cjs require ./a [5] ./pageA.js 2:8-22
-chunk    {2} pageC.bundle.js (pageC) 70 bytes >{1}< [entry] [rendered]
-    > ./pageC pageC
- [3] ./pageC.js 70 bytes {2} [built]
-     single entry ./pageC  pageC
-chunk    {3} pageB.bundle.js (pageB) 71 bytes >{0}< [entry] [rendered]
-    > ./pageB pageB
- [4] ./pageB.js 71 bytes {3} [built]
-     single entry ./pageB  pageB
-chunk    {4} pageA.bundle.js (pageA) 71 bytes >{0}< [entry] [rendered]
+chunk    {1} pageA.bundle.js (pageA) 69 bytes >{0}< [entry] [rendered]
     > ./pageA pageA
- [5] ./pageA.js 71 bytes {4} [built]
+ [3] ./pageA.js 69 bytes {1} [built]
      single entry ./pageA  pageA
+chunk    {2} pageB.bundle.js (pageB) 69 bytes >{0}< [entry] [rendered]
+    > ./pageB pageB
+ [4] ./pageB.js 69 bytes {2} [built]
+     single entry ./pageB  pageB
+chunk    {3} pageC.bundle.js (pageC) 68 bytes >{4}< [entry] [rendered]
+    > ./pageC pageC
+ [5] ./pageC.js 68 bytes {3} [built]
+     single entry ./pageC  pageC
+chunk    {4} 4.chunk.js 42 bytes <{3}> [rendered]
+    > ./a [5] ./pageC.js 1:0-3:2
+ [0] ./a.js 21 bytes {0} {4} [built]
+     cjs require ./a [3] ./pageA.js 2:8-22
+     amd require ./a [5] ./pageC.js 1:0-3:2
+ [1] ./b.js 21 bytes {0} {4} [built]
+     cjs require ./b [4] ./pageB.js 2:8-22
+     cjs require ./b [5] ./pageC.js 2:17-31
 ```
diff --git a/examples/chunkhash/README.md b/examples/chunkhash/README.md
index e02b81676dc..7c7bc6b8c0f 100644
--- a/examples/chunkhash/README.md
+++ b/examples/chunkhash/README.md
@@ -45,7 +45,7 @@ module.exports = {
 
 <!-- inlined minimized file "runtime~main.[chunkhash].js" -->
 <script>
-!function(e){function r(r){for(var n,i,a=r[0],c=r[1],s=r[2],p=0,f=[];p<a.length;p++)i=a[p],o[i]&&f.push(o[i][0]),o[i]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(l&&l(r);f.length;)f.shift()();return u.push.apply(u,s||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var c=t[a];0!==o[c]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={2:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.e=function(e){var r=[],t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise(function(r,n){t=o[e]=[r,n]});r.push(t[2]=n);var u=document.getElementsByTagName("head")[0],a=document.createElement("script");a.charset="utf-8",a.timeout=120,i.nc&&a.setAttribute("nonce",i.nc),a.src=function(e){return i.p+""+({}[e]||e)+".[chunkhash].js"}(e);var c=setTimeout(function(){s({type:"timeout",target:a})},12e4);function s(r){a.onerror=a.onload=null,clearTimeout(c);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),u=r&&r.target&&r.target.src,i=new Error("Loading chunk "+e+" failed.\n("+n+": "+u+")");i.type=n,i.request=u,t[1](i)}o[e]=void 0}}a.onerror=a.onload=s,u.appendChild(a)}return Promise.all(r)},i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},i.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="dist/",i.oe=function(e){throw console.error(e),e};var a=window.webpackJsonp=window.webpackJsonp||[],c=a.push.bind(a);a.push=r,a=a.slice();for(var s=0;s<a.length;s++)r(a[s]);var l=c;t()}([]);
+!function(e){function t(t){for(var n,i,a=t[0],c=t[1],l=t[2],p=0,s=[];p<a.length;p++)i=a[p],o[i]&&s.push(o[i][0]),o[i]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(t);s.length;)s.shift()();return u.push.apply(u,l||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,a=1;a<r.length;a++){var c=r[a];0!==o[c]&&(n=!1)}n&&(u.splice(t--,1),e=i(i.s=r[0]))}return e}var n={},o={3:0},u=[];function i(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,i),r.l=!0,r.exports}i.e=function(e){var t=[],r=o[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise(function(t,n){r=o[e]=[t,n]});t.push(r[2]=n);var u,a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.charset="utf-8",c.timeout=120,i.nc&&c.setAttribute("nonce",i.nc),c.src=function(e){return i.p+""+({}[e]||e)+".[chunkhash].js"}(e),u=function(t){c.onerror=c.onload=null,clearTimeout(l);var r=o[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),u=t&&t.target&&t.target.src,i=new Error("Loading chunk "+e+" failed.\n("+n+": "+u+")");i.type=n,i.request=u,r[1](i)}o[e]=void 0}};var l=setTimeout(function(){u({type:"timeout",target:c})},12e4);c.onerror=c.onload=u,a.appendChild(c)}return Promise.all(t)},i.m=e,i.c=n,i.d=function(e,t,r){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(i.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)i.d(r,n,function(t){return e[t]}.bind(null,n));return r},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="dist/",i.oe=function(e){throw console.error(e),e};var a=window.webpackJsonp=window.webpackJsonp||[],c=a.push.bind(a);a.push=t,a=a.slice();for(var l=0;l<a.length;l++)t(a[l]);var f=c;r()}([]);
 </script>
 
 <script src="dist/main.[chunkhash].js"></script>
@@ -65,6 +65,7 @@ module.exports = {
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/ 		var executeModules = data[2];
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -81,6 +82,7 @@ module.exports = {
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -115,7 +117,7 @@ module.exports = {
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		3: 0
+/******/ 		0: 0
 /******/ 	};
 /******/
 /******/ 	var deferredModules = [];
@@ -173,19 +175,16 @@ module.exports = {
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -202,6 +201,10 @@ module.exports = {
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -217,19 +220,34 @@ module.exports = {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -271,7 +289,7 @@ module.exports = {
 # dist/main.[chunkhash].js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */
 /*!********************!*\
   !*** ./example.js ***!
@@ -280,12 +298,12 @@ module.exports = {
 /***/ (function(module, exports, __webpack_require__) {
 
 // some module
-__webpack_require__.e(/*! import() */ 1).then(function() { var module = __webpack_require__(/*! ./async1 */ 1); return typeof module === "object" && module && module.__esModule ? module : Object.assign({/* fake namespace object */}, typeof module === "object" && module, { "default": module }); });
-__webpack_require__.e(/*! import() */ 2).then(function() { var module = __webpack_require__(/*! ./async2 */ 2); return typeof module === "object" && module && module.__esModule ? module : Object.assign({/* fake namespace object */}, typeof module === "object" && module, { "default": module }); });
+__webpack_require__.e(/*! import() */ 2).then(__webpack_require__.t.bind(null, /*! ./async1 */ 1, 7));
+__webpack_require__.e(/*! import() */ 3).then(__webpack_require__.t.bind(null, /*! ./async2 */ 2, 7));
 
 
 /***/ })
-],[[0,3]]]);
+],[[0,0]]]);
 ```
 
 # Info
@@ -294,52 +312,52 @@ __webpack_require__.e(/*! import() */ 2).then(function() { var module = __webpac
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
                     Asset       Size  Chunks             Chunk Names
-        main.[chunkhash].js  877 bytes       0  [emitted]  main
-           1.[chunkhash].js  270 bytes       1  [emitted]  
-           2.[chunkhash].js  264 bytes       2  [emitted]  
-runtime~main.[chunkhash].js   7.75 KiB       3  [emitted]  runtime~main
+runtime~main.[chunkhash].js   8.77 KiB       0  [emitted]  runtime~main
+        main.[chunkhash].js  485 bytes       1  [emitted]  main
+           2.[chunkhash].js  269 bytes       2  [emitted]  
+           3.[chunkhash].js  263 bytes       3  [emitted]  
 Entrypoint main = runtime~main.[chunkhash].js main.[chunkhash].js
-chunk    {0} main.[chunkhash].js (main) 55 bytes ={3}= >{1}< >{2}< [initial] [rendered]
+chunk    {0} runtime~main.[chunkhash].js (runtime~main) 0 bytes ={1}= >{2}< >{3}< [entry] [rendered]
     > ./example main
- [0] ./example.js 55 bytes {0} [built]
+chunk    {1} main.[chunkhash].js (main) 55 bytes ={0}= >{2}< >{3}< [initial] [rendered]
+    > ./example main
+ [0] ./example.js 55 bytes {1} [built]
      single entry ./example  main
-chunk    {1} 1.[chunkhash].js 29 bytes <{0}> <{3}> [rendered]
+chunk    {2} 2.[chunkhash].js 28 bytes <{0}> <{1}> [rendered]
     > ./async1 [0] ./example.js 2:0-18
- [1] ./async1.js 29 bytes {1} [built]
+ [1] ./async1.js 28 bytes {2} [built]
      import() ./async1 [0] ./example.js 2:0-18
-chunk    {2} 2.[chunkhash].js 29 bytes <{0}> <{3}> [rendered]
+chunk    {3} 3.[chunkhash].js 28 bytes <{0}> <{1}> [rendered]
     > ./async2 [0] ./example.js 3:0-18
- [2] ./async2.js 29 bytes {2} [built]
+ [2] ./async2.js 28 bytes {3} [built]
      import() ./async2 [0] ./example.js 3:0-18
-chunk    {3} runtime~main.[chunkhash].js (runtime~main) 0 bytes ={0}= >{1}< >{2}< [entry] [rendered]
-    > ./example main
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
                     Asset       Size  Chunks             Chunk Names
-           0.[chunkhash].js   77 bytes       0  [emitted]  
-           1.[chunkhash].js   78 bytes       1  [emitted]  
-runtime~main.[chunkhash].js   1.79 KiB       2  [emitted]  runtime~main
-        main.[chunkhash].js  349 bytes       3  [emitted]  main
+        main.[chunkhash].js  149 bytes       0  [emitted]  main
+           1.[chunkhash].js   77 bytes       1  [emitted]  
+           2.[chunkhash].js   78 bytes       2  [emitted]  
+runtime~main.[chunkhash].js   2.17 KiB       3  [emitted]  runtime~main
 Entrypoint main = runtime~main.[chunkhash].js main.[chunkhash].js
-chunk    {0} 0.[chunkhash].js 29 bytes <{2}> <{3}> [rendered]
-    > ./async2 [0] ./example.js 3:0-18
- [1] ./async2.js 29 bytes {0} [built]
-     import() ./async2 [0] ./example.js 3:0-18
-chunk    {1} 1.[chunkhash].js 29 bytes <{2}> <{3}> [rendered]
+chunk    {0} main.[chunkhash].js (main) 55 bytes ={3}= >{1}< >{2}< [initial] [rendered]
+    > ./example main
+ [0] ./example.js 55 bytes {0} [built]
+     single entry ./example  main
+chunk    {1} 1.[chunkhash].js 28 bytes <{0}> <{3}> [rendered]
     > ./async1 [0] ./example.js 2:0-18
- [2] ./async1.js 29 bytes {1} [built]
+ [1] ./async1.js 28 bytes {1} [built]
      import() ./async1 [0] ./example.js 2:0-18
-chunk    {2} runtime~main.[chunkhash].js (runtime~main) 0 bytes ={3}= >{0}< >{1}< [entry] [rendered]
-    > ./example main
-chunk    {3} main.[chunkhash].js (main) 55 bytes ={2}= >{0}< >{1}< [initial] [rendered]
+chunk    {2} 2.[chunkhash].js 28 bytes <{0}> <{3}> [rendered]
+    > ./async2 [0] ./example.js 3:0-18
+ [2] ./async2.js 28 bytes {2} [built]
+     import() ./async2 [0] ./example.js 3:0-18
+chunk    {3} runtime~main.[chunkhash].js (runtime~main) 0 bytes ={0}= >{1}< >{2}< [entry] [rendered]
     > ./example main
- [0] ./example.js 55 bytes {3} [built]
-     single entry ./example  main
 ```
diff --git a/examples/code-splitted-require.context-amd/README.md b/examples/code-splitted-require.context-amd/README.md
index 07a7855e2d8..a356e372278 100644
--- a/examples/code-splitted-require.context-amd/README.md
+++ b/examples/code-splitted-require.context-amd/README.md
@@ -25,6 +25,7 @@ getTemplate("b", function(b) {
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -41,6 +42,7 @@ getTemplate("b", function(b) {
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -55,7 +57,7 @@ getTemplate("b", function(b) {
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		1: 0
+/******/ 		0: 0
 /******/ 	};
 /******/
 /******/
@@ -113,19 +115,16 @@ getTemplate("b", function(b) {
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -142,6 +141,10 @@ getTemplate("b", function(b) {
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -157,19 +160,34 @@ getTemplate("b", function(b) {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -214,7 +232,7 @@ getTemplate("b", function(b) {
 /***/ (function(module, exports, __webpack_require__) {
 
 function getTemplate(templateName, callback) {
-	__webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = [__webpack_require__(1)("./"+templateName)]; (function(tmpl) {
+	__webpack_require__.e(/*! AMD require */ 1).then(function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = [__webpack_require__(1)("./"+templateName)]; (function(tmpl) {
 		callback(tmpl());
 	}).apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);}).catch(__webpack_require__.oe);
 }
@@ -229,10 +247,10 @@ getTemplate("b", function(b) {
 /******/ ]);
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */,
 /* 1 */
 /*!**************************************************!*\
@@ -242,19 +260,18 @@ getTemplate("b", function(b) {
 /***/ (function(module, exports, __webpack_require__) {
 
 var map = {
-	"./a": 4,
-	"./a.js": 4,
+	"./a": 2,
+	"./a.js": 2,
 	"./b": 3,
 	"./b.js": 3,
-	"./c": 2,
-	"./c.js": 2
+	"./c": 4,
+	"./c.js": 4
 };
 
 
 function webpackContext(req) {
 	var id = webpackContextResolve(req);
-	var module = __webpack_require__(id);
-	return module;
+	return __webpack_require__(id);
 }
 function webpackContextResolve(req) {
 	var id = map[req];
@@ -275,13 +292,13 @@ webpackContext.id = 1;
 /***/ }),
 /* 2 */
 /*!*****************************************!*\
-  !*** ../require.context/templates/c.js ***!
+  !*** ../require.context/templates/a.js ***!
   \*****************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
 module.exports = function() {
-	return "This text was generated by template C";
+	return "This text was generated by template A";
 }
 
 /***/ }),
@@ -299,13 +316,13 @@ module.exports = function() {
 /***/ }),
 /* 4 */
 /*!*****************************************!*\
-  !*** ../require.context/templates/a.js ***!
+  !*** ../require.context/templates/c.js ***!
   \*****************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
 module.exports = function() {
-	return "This text was generated by template A";
+	return "This text was generated by template C";
 }
 
 /***/ })
@@ -318,54 +335,54 @@ module.exports = function() {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset      Size  Chunks             Chunk Names
-0.output.js  1.86 KiB       0  [emitted]  
-  output.js  7.46 KiB       1  [emitted]  main
+  output.js  8.47 KiB       0  [emitted]  main
+1.output.js  1.83 KiB       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 463 bytes <{1}> [rendered]
+chunk    {0} output.js (main) 251 bytes >{1}< [entry] [rendered]
+    > .\example.js main
+ [0] ./example.js 251 bytes {0} [built]
+     single entry .\example.js  main
+chunk    {1} 1.output.js 457 bytes <{0}> [rendered]
     > [0] ./example.js 2:1-4:3
- [1] ../require.context/templates sync ^\.\/.*$ 217 bytes {0} [built]
+ [1] ../require.context/templates sync ^\.\/.*$ 217 bytes {1} [built]
      amd require context ../require.context/templates [0] ./example.js 2:1-4:3
- [2] ../require.context/templates/c.js 82 bytes {0} [optional] [built]
-     context element ./c.js [1] ../require.context/templates sync ^\.\/.*$ ./c.js
-     context element ./c [1] ../require.context/templates sync ^\.\/.*$ ./c
- [3] ../require.context/templates/b.js 82 bytes {0} [optional] [built]
-     context element ./b.js [1] ../require.context/templates sync ^\.\/.*$ ./b.js
-     context element ./b [1] ../require.context/templates sync ^\.\/.*$ ./b
- [4] ../require.context/templates/a.js 82 bytes {0} [optional] [built]
-     context element ./a.js [1] ../require.context/templates sync ^\.\/.*$ ./a.js
+ [2] ../require.context/templates/a.js 80 bytes {1} [optional] [built]
      context element ./a [1] ../require.context/templates sync ^\.\/.*$ ./a
-chunk    {1} output.js (main) 261 bytes >{0}< [entry] [rendered]
-    > .\example.js main
- [0] ./example.js 261 bytes {1} [built]
-     single entry .\example.js  main
+     context element ./a.js [1] ../require.context/templates sync ^\.\/.*$ ./a.js
+ [3] ../require.context/templates/b.js 80 bytes {1} [optional] [built]
+     context element ./b [1] ../require.context/templates sync ^\.\/.*$ ./b
+     context element ./b.js [1] ../require.context/templates sync ^\.\/.*$ ./b.js
+ [4] ../require.context/templates/c.js 80 bytes {1} [optional] [built]
+     context element ./c [1] ../require.context/templates sync ^\.\/.*$ ./c
+     context element ./c.js [1] ../require.context/templates sync ^\.\/.*$ ./c.js
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  627 bytes       0  [emitted]  
-  output.js   1.78 KiB       1  [emitted]  main
+  output.js   2.15 KiB       0  [emitted]  main
+1.output.js  626 bytes       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 463 bytes <{1}> [rendered]
+chunk    {0} output.js (main) 251 bytes >{1}< [entry] [rendered]
+    > .\example.js main
+ [0] ./example.js 251 bytes {0} [built]
+     single entry .\example.js  main
+chunk    {1} 1.output.js 457 bytes <{0}> [rendered]
     > [0] ./example.js 2:1-4:3
- [1] ../require.context/templates sync ^\.\/.*$ 217 bytes {0} [built]
+ [1] ../require.context/templates sync ^\.\/.*$ 217 bytes {1} [built]
      amd require context ../require.context/templates [0] ./example.js 2:1-4:3
- [2] ../require.context/templates/c.js 82 bytes {0} [optional] [built]
-     context element ./c.js [1] ../require.context/templates sync ^\.\/.*$ ./c.js
-     context element ./c [1] ../require.context/templates sync ^\.\/.*$ ./c
- [3] ../require.context/templates/b.js 82 bytes {0} [optional] [built]
-     context element ./b.js [1] ../require.context/templates sync ^\.\/.*$ ./b.js
-     context element ./b [1] ../require.context/templates sync ^\.\/.*$ ./b
- [4] ../require.context/templates/a.js 82 bytes {0} [optional] [built]
-     context element ./a.js [1] ../require.context/templates sync ^\.\/.*$ ./a.js
+ [2] ../require.context/templates/a.js 80 bytes {1} [optional] [built]
      context element ./a [1] ../require.context/templates sync ^\.\/.*$ ./a
-chunk    {1} output.js (main) 261 bytes >{0}< [entry] [rendered]
-    > .\example.js main
- [0] ./example.js 261 bytes {1} [built]
-     single entry .\example.js  main
+     context element ./a.js [1] ../require.context/templates sync ^\.\/.*$ ./a.js
+ [3] ../require.context/templates/b.js 80 bytes {1} [optional] [built]
+     context element ./b [1] ../require.context/templates sync ^\.\/.*$ ./b
+     context element ./b.js [1] ../require.context/templates sync ^\.\/.*$ ./b.js
+ [4] ../require.context/templates/c.js 80 bytes {1} [optional] [built]
+     context element ./c [1] ../require.context/templates sync ^\.\/.*$ ./c
+     context element ./c.js [1] ../require.context/templates sync ^\.\/.*$ ./c.js
 ```
diff --git a/examples/code-splitted-require.context-amd/template.md b/examples/code-splitted-require.context-amd/template.md
index 0b7b60cfd4f..0166325bfc6 100644
--- a/examples/code-splitted-require.context-amd/template.md
+++ b/examples/code-splitted-require.context-amd/template.md
@@ -10,10 +10,10 @@
 {{dist/output.js}}
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-{{dist/0.output.js}}
+{{dist/1.output.js}}
 ```
 
 # Info
diff --git a/examples/code-splitted-require.context/README.md b/examples/code-splitted-require.context/README.md
index c1251d65308..035eac7a3cd 100644
--- a/examples/code-splitted-require.context/README.md
+++ b/examples/code-splitted-require.context/README.md
@@ -25,6 +25,7 @@ getTemplate("b", function(b) {
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -41,6 +42,7 @@ getTemplate("b", function(b) {
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -55,7 +57,7 @@ getTemplate("b", function(b) {
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		1: 0
+/******/ 		0: 0
 /******/ 	};
 /******/
 /******/
@@ -113,19 +115,16 @@ getTemplate("b", function(b) {
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -142,6 +141,10 @@ getTemplate("b", function(b) {
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -157,19 +160,34 @@ getTemplate("b", function(b) {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -214,7 +232,7 @@ getTemplate("b", function(b) {
 /***/ (function(module, exports, __webpack_require__) {
 
 function getTemplate(templateName, callback) {
-	__webpack_require__.e(/*! require.ensure */ 0).then((function(require) {
+	__webpack_require__.e(/*! require.ensure */ 1).then((function(require) {
 		callback(__webpack_require__(1)("./"+templateName)());
 	}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 }
@@ -229,10 +247,10 @@ getTemplate("b", function(b) {
 /******/ ]);
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */,
 /* 1 */
 /*!**************************************************!*\
@@ -242,19 +260,18 @@ getTemplate("b", function(b) {
 /***/ (function(module, exports, __webpack_require__) {
 
 var map = {
-	"./a": 4,
-	"./a.js": 4,
+	"./a": 2,
+	"./a.js": 2,
 	"./b": 3,
 	"./b.js": 3,
-	"./c": 2,
-	"./c.js": 2
+	"./c": 4,
+	"./c.js": 4
 };
 
 
 function webpackContext(req) {
 	var id = webpackContextResolve(req);
-	var module = __webpack_require__(id);
-	return module;
+	return __webpack_require__(id);
 }
 function webpackContextResolve(req) {
 	var id = map[req];
@@ -275,13 +292,13 @@ webpackContext.id = 1;
 /***/ }),
 /* 2 */
 /*!*****************************************!*\
-  !*** ../require.context/templates/c.js ***!
+  !*** ../require.context/templates/a.js ***!
   \*****************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
 module.exports = function() {
-	return "This text was generated by template C";
+	return "This text was generated by template A";
 }
 
 /***/ }),
@@ -299,13 +316,13 @@ module.exports = function() {
 /***/ }),
 /* 4 */
 /*!*****************************************!*\
-  !*** ../require.context/templates/a.js ***!
+  !*** ../require.context/templates/c.js ***!
   \*****************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
 module.exports = function() {
-	return "This text was generated by template A";
+	return "This text was generated by template C";
 }
 
 /***/ })
@@ -318,54 +335,54 @@ module.exports = function() {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset      Size  Chunks             Chunk Names
-0.output.js  1.86 KiB       0  [emitted]  
-  output.js   7.4 KiB       1  [emitted]  main
+  output.js   8.4 KiB       0  [emitted]  main
+1.output.js  1.83 KiB       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 463 bytes <{1}> [rendered]
+chunk    {0} output.js (main) 266 bytes >{1}< [entry] [rendered]
+    > .\example.js main
+ [0] ./example.js 266 bytes {0} [built]
+     single entry .\example.js  main
+chunk    {1} 1.output.js 457 bytes <{0}> [rendered]
     > [0] ./example.js 2:1-4:3
- [1] ../require.context/templates sync ^\.\/.*$ 217 bytes {0} [built]
+ [1] ../require.context/templates sync ^\.\/.*$ 217 bytes {1} [built]
      cjs require context ../require.context/templates [0] ./example.js 3:11-64
- [2] ../require.context/templates/c.js 82 bytes {0} [optional] [built]
-     context element ./c.js [1] ../require.context/templates sync ^\.\/.*$ ./c.js
-     context element ./c [1] ../require.context/templates sync ^\.\/.*$ ./c
- [3] ../require.context/templates/b.js 82 bytes {0} [optional] [built]
-     context element ./b.js [1] ../require.context/templates sync ^\.\/.*$ ./b.js
-     context element ./b [1] ../require.context/templates sync ^\.\/.*$ ./b
- [4] ../require.context/templates/a.js 82 bytes {0} [optional] [built]
-     context element ./a.js [1] ../require.context/templates sync ^\.\/.*$ ./a.js
+ [2] ../require.context/templates/a.js 80 bytes {1} [optional] [built]
      context element ./a [1] ../require.context/templates sync ^\.\/.*$ ./a
-chunk    {1} output.js (main) 276 bytes >{0}< [entry] [rendered]
-    > .\example.js main
- [0] ./example.js 276 bytes {1} [built]
-     single entry .\example.js  main
+     context element ./a.js [1] ../require.context/templates sync ^\.\/.*$ ./a.js
+ [3] ../require.context/templates/b.js 80 bytes {1} [optional] [built]
+     context element ./b [1] ../require.context/templates sync ^\.\/.*$ ./b
+     context element ./b.js [1] ../require.context/templates sync ^\.\/.*$ ./b.js
+ [4] ../require.context/templates/c.js 80 bytes {1} [optional] [built]
+     context element ./c [1] ../require.context/templates sync ^\.\/.*$ ./c
+     context element ./c.js [1] ../require.context/templates sync ^\.\/.*$ ./c.js
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  627 bytes       0  [emitted]  
-  output.js   1.75 KiB       1  [emitted]  main
+  output.js   2.13 KiB       0  [emitted]  main
+1.output.js  626 bytes       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 463 bytes <{1}> [rendered]
+chunk    {0} output.js (main) 266 bytes >{1}< [entry] [rendered]
+    > .\example.js main
+ [0] ./example.js 266 bytes {0} [built]
+     single entry .\example.js  main
+chunk    {1} 1.output.js 457 bytes <{0}> [rendered]
     > [0] ./example.js 2:1-4:3
- [1] ../require.context/templates sync ^\.\/.*$ 217 bytes {0} [built]
+ [1] ../require.context/templates sync ^\.\/.*$ 217 bytes {1} [built]
      cjs require context ../require.context/templates [0] ./example.js 3:11-64
- [2] ../require.context/templates/c.js 82 bytes {0} [optional] [built]
-     context element ./c.js [1] ../require.context/templates sync ^\.\/.*$ ./c.js
-     context element ./c [1] ../require.context/templates sync ^\.\/.*$ ./c
- [3] ../require.context/templates/b.js 82 bytes {0} [optional] [built]
-     context element ./b.js [1] ../require.context/templates sync ^\.\/.*$ ./b.js
-     context element ./b [1] ../require.context/templates sync ^\.\/.*$ ./b
- [4] ../require.context/templates/a.js 82 bytes {0} [optional] [built]
-     context element ./a.js [1] ../require.context/templates sync ^\.\/.*$ ./a.js
+ [2] ../require.context/templates/a.js 80 bytes {1} [optional] [built]
      context element ./a [1] ../require.context/templates sync ^\.\/.*$ ./a
-chunk    {1} output.js (main) 276 bytes >{0}< [entry] [rendered]
-    > .\example.js main
- [0] ./example.js 276 bytes {1} [built]
-     single entry .\example.js  main
+     context element ./a.js [1] ../require.context/templates sync ^\.\/.*$ ./a.js
+ [3] ../require.context/templates/b.js 80 bytes {1} [optional] [built]
+     context element ./b [1] ../require.context/templates sync ^\.\/.*$ ./b
+     context element ./b.js [1] ../require.context/templates sync ^\.\/.*$ ./b.js
+ [4] ../require.context/templates/c.js 80 bytes {1} [optional] [built]
+     context element ./c [1] ../require.context/templates sync ^\.\/.*$ ./c
+     context element ./c.js [1] ../require.context/templates sync ^\.\/.*$ ./c.js
 ```
diff --git a/examples/code-splitted-require.context/template.md b/examples/code-splitted-require.context/template.md
index 0b7b60cfd4f..0166325bfc6 100644
--- a/examples/code-splitted-require.context/template.md
+++ b/examples/code-splitted-require.context/template.md
@@ -10,10 +10,10 @@
 {{dist/output.js}}
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-{{dist/0.output.js}}
+{{dist/1.output.js}}
 ```
 
 # Info
diff --git a/examples/code-splitting-bundle-loader/README.md b/examples/code-splitting-bundle-loader/README.md
index a59a581ea7c..752f4058d7e 100644
--- a/examples/code-splitting-bundle-loader/README.md
+++ b/examples/code-splitting-bundle-loader/README.md
@@ -28,6 +28,7 @@ module.exports = "It works";
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -44,6 +45,7 @@ module.exports = "It works";
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -58,7 +60,7 @@ module.exports = "It works";
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		1: 0
+/******/ 		0: 0
 /******/ 	};
 /******/
 /******/
@@ -116,19 +118,16 @@ module.exports = "It works";
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -145,6 +144,10 @@ module.exports = "It works";
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -160,19 +163,34 @@ module.exports = "It works";
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -200,7 +218,7 @@ module.exports = "It works";
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1);
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
 /******/ })
 /************************************************************************/
 ```
@@ -210,6 +228,19 @@ module.exports = "It works";
 ``` javascript
 /******/ ([
 /* 0 */
+/*!********************!*\
+  !*** ./example.js ***!
+  \********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(/*! bundle-loader!./file.js */ 1)(function(fileJsExports) {
+	console.log(fileJsExports);
+});
+
+
+/***/ }),
+/* 1 */
 /*!******************************************************!*\
   !*** (webpack)/node_modules/bundle-loader!./file.js ***!
   \******************************************************/
@@ -222,7 +253,7 @@ module.exports = function(cb) {
 	if(cbs) cbs.push(cb);
 	else cb(data);
 }
-__webpack_require__.e(/*! require.ensure */ 0).then((function(require) {
+__webpack_require__.e(/*! require.ensure */ 1).then((function(require) {
 	data = __webpack_require__(/*! !./file.js */ 2);
 	var callbacks = cbs;
 	cbs = null;
@@ -231,27 +262,14 @@ __webpack_require__.e(/*! require.ensure */ 0).then((function(require) {
 	}
 }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 
-/***/ }),
-/* 1 */
-/*!********************!*\
-  !*** ./example.js ***!
-  \********************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-__webpack_require__(/*! bundle-loader!./file.js */ 0)(function(fileJsExports) {
-	console.log(fileJsExports);
-});
-
-
 /***/ })
 /******/ ]);
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],{
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],{
 
 /***/ 2:
 /*!*****************!*\
@@ -273,40 +291,40 @@ module.exports = "It works";
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  257 bytes       0  [emitted]  
-  output.js   7.82 KiB       1  [emitted]  main
+  output.js   8.84 KiB       0  [emitted]  main
+1.output.js  257 bytes       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 28 bytes <{1}> [rendered]
-    > [0] (webpack)/node_modules/bundle-loader!./file.js 7:0-14:2
- [2] ./file.js 28 bytes {0} [built]
-     cjs require !!./file.js [0] (webpack)/node_modules/bundle-loader!./file.js 8:8-30
-chunk    {1} output.js (main) 378 bytes >{0}< [entry] [rendered]
+chunk    {0} output.js (main) 375 bytes >{1}< [entry] [rendered]
     > .\example.js main
- [0] (webpack)/node_modules/bundle-loader!./file.js 281 bytes {1} [built]
-     cjs require bundle-loader!./file.js [1] ./example.js 1:0-34
- [1] ./example.js 97 bytes {1} [built]
+ [0] ./example.js 94 bytes {0} [built]
      single entry .\example.js  main
+ [1] (webpack)/node_modules/bundle-loader!./file.js 281 bytes {0} [built]
+     cjs require bundle-loader!./file.js [0] ./example.js 1:0-34
+chunk    {1} 1.output.js 28 bytes <{0}> [rendered]
+    > [1] (webpack)/node_modules/bundle-loader!./file.js 7:0-14:2
+ [2] ./file.js 28 bytes {1} [built]
+     cjs require !!./file.js [1] (webpack)/node_modules/bundle-loader!./file.js 8:8-30
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset      Size  Chunks             Chunk Names
-0.output.js  98 bytes       0  [emitted]  
-  output.js  1.81 KiB       1  [emitted]  main
+  output.js  2.19 KiB       0  [emitted]  main
+1.output.js  98 bytes       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 28 bytes <{1}> [rendered]
-    > [0] (webpack)/node_modules/bundle-loader!./file.js 7:0-14:2
- [2] ./file.js 28 bytes {0} [built]
-     cjs require !!./file.js [0] (webpack)/node_modules/bundle-loader!./file.js 8:8-30
-chunk    {1} output.js (main) 378 bytes >{0}< [entry] [rendered]
+chunk    {0} output.js (main) 375 bytes >{1}< [entry] [rendered]
     > .\example.js main
- [0] (webpack)/node_modules/bundle-loader!./file.js 281 bytes {1} [built]
-     cjs require bundle-loader!./file.js [1] ./example.js 1:0-34
- [1] ./example.js 97 bytes {1} [built]
+ [0] ./example.js 94 bytes {0} [built]
      single entry .\example.js  main
+ [1] (webpack)/node_modules/bundle-loader!./file.js 281 bytes {0} [built]
+     cjs require bundle-loader!./file.js [0] ./example.js 1:0-34
+chunk    {1} 1.output.js 28 bytes <{0}> [rendered]
+    > [1] (webpack)/node_modules/bundle-loader!./file.js 7:0-14:2
+ [2] ./file.js 28 bytes {1} [built]
+     cjs require !!./file.js [1] (webpack)/node_modules/bundle-loader!./file.js 8:8-30
 ```
diff --git a/examples/code-splitting-bundle-loader/template.md b/examples/code-splitting-bundle-loader/template.md
index f7c26e8b154..fe41f8dd4bc 100644
--- a/examples/code-splitting-bundle-loader/template.md
+++ b/examples/code-splitting-bundle-loader/template.md
@@ -21,10 +21,10 @@ The bundle loader is used to create a wrapper module for `file.js` that loads th
 {{dist/output.js}}
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-{{dist/0.output.js}}
+{{dist/1.output.js}}
 ```
 
 # Info
diff --git a/examples/code-splitting-harmony/README.md b/examples/code-splitting-harmony/README.md
index c3e9e9d4c8d..3f982512b1f 100644
--- a/examples/code-splitting-harmony/README.md
+++ b/examples/code-splitting-harmony/README.md
@@ -36,6 +36,7 @@ Promise.all([loadC("1"), loadC("2")]).then(function(arr) {
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -52,6 +53,7 @@ Promise.all([loadC("1"), loadC("2")]).then(function(arr) {
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -66,7 +68,7 @@ Promise.all([loadC("1"), loadC("2")]).then(function(arr) {
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		3: 0
+/******/ 		2: 0
 /******/ 	};
 /******/
 /******/
@@ -124,19 +126,16 @@ Promise.all([loadC("1"), loadC("2")]).then(function(arr) {
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -153,6 +152,10 @@ Promise.all([loadC("1"), loadC("2")]).then(function(arr) {
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -168,19 +171,34 @@ Promise.all([loadC("1"), loadC("2")]).then(function(arr) {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -208,7 +226,7 @@ Promise.all([loadC("1"), loadC("2")]).then(function(arr) {
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 4);
+/******/ 	return __webpack_require__(__webpack_require__.s = 2);
 /******/ })
 /************************************************************************/
 ```
@@ -220,6 +238,43 @@ Promise.all([loadC("1"), loadC("2")]).then(function(arr) {
 /* 0 */,
 /* 1 */,
 /* 2 */
+/*!********************!*\
+  !*** ./example.js ***!
+  \********************/
+/*! no exports provided */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var a__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! a */ 3);
+/* harmony import */ var a__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(a__WEBPACK_IMPORTED_MODULE_0__);
+
+
+__webpack_require__.e(/*! import() */ 3).then(__webpack_require__.t.bind(null, /*! b */ 5, 7)).then(function(b) {
+	console.log("b loaded", b);
+})
+
+function loadC(name) {
+	return __webpack_require__(4)("./" + name);
+}
+
+Promise.all([loadC("1"), loadC("2")]).then(function(arr) {
+	console.log("c/1 and c/2 loaded", arr);
+});
+
+
+/***/ }),
+/* 3 */
+/*!***************************!*\
+  !*** ./node_modules/a.js ***!
+  \***************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+// module a
+
+/***/ }),
+/* 4 */
 /*!*******************************************************!*\
   !*** ./node_modules/c lazy ^\.\/.*$ namespace object ***!
   \*******************************************************/
@@ -228,20 +283,20 @@ Promise.all([loadC("1"), loadC("2")]).then(function(arr) {
 
 var map = {
 	"./1": [
-		1,
-		1
+		0,
+		0
 	],
 	"./1.js": [
-		1,
-		1
-	],
-	"./2": [
 		0,
 		0
 	],
+	"./2": [
+		1,
+		1
+	],
 	"./2.js": [
-		0,
-		0
+		1,
+		1
 	]
 };
 function webpackAsyncContext(req) {
@@ -254,53 +309,16 @@ function webpackAsyncContext(req) {
 		});
 	}
 	return __webpack_require__.e(ids[1]).then(function() {
-		var module = __webpack_require__(ids[0]);
-		return (typeof module === "object" && module && module.__esModule ? module : Object.assign({/* fake namespace object */}, typeof module === "object" && module, { "default": module }));
+		var id = ids[0];
+		return __webpack_require__.t(id, 7);
 	});
 }
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
 	return Object.keys(map);
 };
-webpackAsyncContext.id = 2;
+webpackAsyncContext.id = 4;
 module.exports = webpackAsyncContext;
 
-/***/ }),
-/* 3 */
-/*!***************************!*\
-  !*** ./node_modules/a.js ***!
-  \***************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-// module a
-
-/***/ }),
-/* 4 */
-/*!********************!*\
-  !*** ./example.js ***!
-  \********************/
-/*! no exports provided */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var a__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! a */ 3);
-/* harmony import */ var a__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(a__WEBPACK_IMPORTED_MODULE_0__);
-
-
-__webpack_require__.e(/*! import() */ 2).then(function() { var module = __webpack_require__(/*! b */ 5); return typeof module === "object" && module && module.__esModule ? module : Object.assign({/* fake namespace object */}, typeof module === "object" && module, { "default": module }); }).then(function(b) {
-	console.log("b loaded", b);
-})
-
-function loadC(name) {
-	return __webpack_require__(2)("./" + name);
-}
-
-Promise.all([loadC("1"), loadC("2")]).then(function(arr) {
-	console.log("c/1 and c/2 loaded", arr);
-});
-
-
 /***/ })
 /******/ ]);
 ```
@@ -312,62 +330,62 @@ Promise.all([loadC("1"), loadC("2")]).then(function(arr) {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
 0.output.js  275 bytes       0  [emitted]  
 1.output.js  284 bytes       1  [emitted]  
-2.output.js  270 bytes       2  [emitted]  
-  output.js   9.11 KiB       3  [emitted]  main
+  output.js   9.76 KiB       2  [emitted]  main
+3.output.js  270 bytes       3  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 13 bytes <{3}> [rendered]
-    > ./2 [2] ./node_modules/c lazy ^\.\/.*$ namespace object ./2
-    > ./2.js [2] ./node_modules/c lazy ^\.\/.*$ namespace object ./2.js
-    1 module
-chunk    {1} 1.output.js 13 bytes <{3}> [rendered]
-    > ./1 [2] ./node_modules/c lazy ^\.\/.*$ namespace object ./1
-    > ./1.js [2] ./node_modules/c lazy ^\.\/.*$ namespace object ./1.js
+chunk    {0} 0.output.js 13 bytes <{2}> [rendered]
+    > ./1 [4] ./node_modules/c lazy ^\.\/.*$ namespace object ./1
+    > ./1.js [4] ./node_modules/c lazy ^\.\/.*$ namespace object ./1.js
     1 module
-chunk    {2} 2.output.js 11 bytes <{3}> [rendered]
-    > b [4] ./example.js 3:0-11
+chunk    {1} 1.output.js 13 bytes <{2}> [rendered]
+    > ./2 [4] ./node_modules/c lazy ^\.\/.*$ namespace object ./2
+    > ./2.js [4] ./node_modules/c lazy ^\.\/.*$ namespace object ./2.js
     1 module
-chunk    {3} output.js (main) 427 bytes >{0}< >{1}< >{2}< [entry] [rendered]
+chunk    {2} output.js (main) 414 bytes >{0}< >{1}< >{3}< [entry] [rendered]
     > .\example.js main
- [2] ./node_modules/c lazy ^\.\/.*$ namespace object 160 bytes {3} [built]
-     import() context lazy c [4] ./example.js 8:8-27
- [4] ./example.js 256 bytes {3} [built]
+ [2] ./example.js 243 bytes {2} [built]
      [no exports]
      single entry .\example.js  main
+ [4] ./node_modules/c lazy ^\.\/.*$ namespace object 160 bytes {2} [built]
+     import() context lazy c [2] ./example.js 8:8-27
      + 1 hidden module
+chunk    {3} 3.output.js 11 bytes <{2}> [rendered]
+    > b [2] ./example.js 3:0-11
+    1 module
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset      Size  Chunks             Chunk Names
 0.output.js  76 bytes       0  [emitted]  
 1.output.js  77 bytes       1  [emitted]  
-2.output.js  78 bytes       2  [emitted]  
-  output.js  2.35 KiB       3  [emitted]  main
+  output.js  2.55 KiB       2  [emitted]  main
+3.output.js  78 bytes       3  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 13 bytes <{3}> [rendered]
-    > ./2 [2] ./node_modules/c lazy ^\.\/.*$ namespace object ./2
-    > ./2.js [2] ./node_modules/c lazy ^\.\/.*$ namespace object ./2.js
-    1 module
-chunk    {1} 1.output.js 13 bytes <{3}> [rendered]
-    > ./1 [2] ./node_modules/c lazy ^\.\/.*$ namespace object ./1
-    > ./1.js [2] ./node_modules/c lazy ^\.\/.*$ namespace object ./1.js
+chunk    {0} 0.output.js 13 bytes <{2}> [rendered]
+    > ./1 [4] ./node_modules/c lazy ^\.\/.*$ namespace object ./1
+    > ./1.js [4] ./node_modules/c lazy ^\.\/.*$ namespace object ./1.js
     1 module
-chunk    {2} 2.output.js 11 bytes <{3}> [rendered]
-    > b [4] ./example.js 3:0-11
+chunk    {1} 1.output.js 13 bytes <{2}> [rendered]
+    > ./2 [4] ./node_modules/c lazy ^\.\/.*$ namespace object ./2
+    > ./2.js [4] ./node_modules/c lazy ^\.\/.*$ namespace object ./2.js
     1 module
-chunk    {3} output.js (main) 427 bytes >{0}< >{1}< >{2}< [entry] [rendered]
+chunk    {2} output.js (main) 414 bytes >{0}< >{1}< >{3}< [entry] [rendered]
     > .\example.js main
- [2] ./node_modules/c lazy ^\.\/.*$ namespace object 160 bytes {3} [built]
-     import() context lazy c [4] ./example.js 8:8-27
- [4] ./example.js 256 bytes {3} [built]
+ [2] ./example.js 243 bytes {2} [built]
      [no exports]
      single entry .\example.js  main
+ [4] ./node_modules/c lazy ^\.\/.*$ namespace object 160 bytes {2} [built]
+     import() context lazy c [2] ./example.js 8:8-27
      + 1 hidden module
+chunk    {3} 3.output.js 11 bytes <{2}> [rendered]
+    > b [2] ./example.js 3:0-11
+    1 module
 ```
diff --git a/examples/code-splitting-native-import-context-filter/README.md b/examples/code-splitting-native-import-context-filter/README.md
index 86f2a9e9164..7ad0578ef9d 100644
--- a/examples/code-splitting-native-import-context-filter/README.md
+++ b/examples/code-splitting-native-import-context-filter/README.md
@@ -54,6 +54,7 @@ export default foo;
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -70,6 +71,7 @@ export default foo;
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -142,19 +144,16 @@ export default foo;
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -171,6 +170,10 @@ export default foo;
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -186,19 +189,34 @@ export default foo;
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -226,7 +244,7 @@ export default foo;
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 4);
+/******/ 	return __webpack_require__(__webpack_require__.s = 3);
 /******/ })
 /************************************************************************/
 ```
@@ -239,6 +257,33 @@ export default foo;
 /* 1 */,
 /* 2 */,
 /* 3 */
+/*!********************!*\
+  !*** ./example.js ***!
+  \********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+async function getTemplate(templateName) {
+	try {
+		let template = await __webpack_require__(4)(`./${templateName}`);
+		console.log(template);
+	} catch(err) {
+		console.error(err);
+		return new Error(err);
+	}
+}
+
+getTemplate("foo");
+getTemplate("bar");
+getTemplate("baz");
+getTemplate("foo.noimport");
+getTemplate("bar.noimport");
+getTemplate("baz.noimport");
+
+
+
+/***/ }),
+/* 4 */
 /*!******************************************************************************************!*\
   !*** ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ***!
   \******************************************************************************************/
@@ -247,12 +292,12 @@ export default foo;
 
 var map = {
 	"./bar": [
-		2,
-		2
+		0,
+		0
 	],
 	"./bar.js": [
-		2,
-		2
+		0,
+		0
 	],
 	"./baz": [
 		1,
@@ -263,12 +308,12 @@ var map = {
 		1
 	],
 	"./foo": [
-		0,
-		0
+		2,
+		2
 	],
 	"./foo.js": [
-		0,
-		0
+		2,
+		2
 	]
 };
 function webpackAsyncContext(req) {
@@ -281,43 +326,16 @@ function webpackAsyncContext(req) {
 		});
 	}
 	return __webpack_require__.e(ids[1]).then(function() {
-		var module = __webpack_require__(ids[0]);
-		return module;
+		var id = ids[0];
+		return __webpack_require__(id);
 	});
 }
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
 	return Object.keys(map);
 };
-webpackAsyncContext.id = 3;
+webpackAsyncContext.id = 4;
 module.exports = webpackAsyncContext;
 
-/***/ }),
-/* 4 */
-/*!********************!*\
-  !*** ./example.js ***!
-  \********************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-async function getTemplate(templateName) {
-	try {
-		let template = await __webpack_require__(3)(`./${templateName}`);
-		console.log(template);
-	} catch(err) {
-		console.error(err);
-		return new Error(err);
-	}
-}
-
-getTemplate("foo");
-getTemplate("bar");
-getTemplate("baz");
-getTemplate("foo.noimport");
-getTemplate("bar.noimport");
-getTemplate("baz.noimport");
-
-
-
 /***/ })
 /******/ ]);
 ```
@@ -328,78 +346,78 @@ getTemplate("baz.noimport");
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
 0.output.js  433 bytes       0  [emitted]  
 1.output.js  442 bytes       1  [emitted]  
 2.output.js  436 bytes       2  [emitted]  
-  output.js   8.47 KiB       3  [emitted]  main
+  output.js   9.48 KiB       3  [emitted]  main
 Entrypoint main = output.js
 chunk    {0} 0.output.js 38 bytes <{3}> [rendered]
-    > ./foo [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo
-    > ./foo.js [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo.js
- [0] ./templates/foo.js 38 bytes {0} [optional] [built]
+    > ./bar [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar
+    > ./bar.js [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar.js
+ [0] ./templates/bar.js 38 bytes {0} [optional] [built]
      [exports: default]
-     context element ./foo.js [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo.js
-     context element ./foo [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo
+     context element ./bar [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar
+     context element ./bar.js [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar.js
 chunk    {1} 1.output.js 38 bytes <{3}> [rendered]
-    > ./baz [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz
-    > ./baz.js [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz.js
+    > ./baz [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz
+    > ./baz.js [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz.js
  [1] ./templates/baz.js 38 bytes {1} [optional] [built]
      [exports: default]
-     context element ./baz.js [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz.js
-     context element ./baz [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz
+     context element ./baz [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz
+     context element ./baz.js [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz.js
 chunk    {2} 2.output.js 38 bytes <{3}> [rendered]
-    > ./bar [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar
-    > ./bar.js [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar.js
- [2] ./templates/bar.js 38 bytes {2} [optional] [built]
+    > ./foo [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo
+    > ./foo.js [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo.js
+ [2] ./templates/foo.js 38 bytes {2} [optional] [built]
      [exports: default]
-     context element ./bar.js [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar.js
-     context element ./bar [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar
+     context element ./foo [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo
+     context element ./foo.js [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo.js
 chunk    {3} output.js (main) 597 bytes >{0}< >{1}< >{2}< [entry] [rendered]
     > .\example.js main
- [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object 160 bytes {3} [optional] [built]
-     import() context lazy ./templates [4] ./example.js 3:23-7:3
- [4] ./example.js 437 bytes {3} [built]
+ [3] ./example.js 437 bytes {3} [built]
      single entry .\example.js  main
+ [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object 160 bytes {3} [optional] [built]
+     import() context lazy ./templates [3] ./example.js 3:23-7:3
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
 0.output.js  113 bytes       0  [emitted]  
 1.output.js  114 bytes       1  [emitted]  
 2.output.js  115 bytes       2  [emitted]  
-  output.js   2.16 KiB       3  [emitted]  main
+  output.js   2.54 KiB       3  [emitted]  main
 Entrypoint main = output.js
 chunk    {0} 0.output.js 38 bytes <{3}> [rendered]
-    > ./foo [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo
-    > ./foo.js [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo.js
- [0] ./templates/foo.js 38 bytes {0} [optional] [built]
+    > ./bar [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar
+    > ./bar.js [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar.js
+ [0] ./templates/bar.js 38 bytes {0} [optional] [built]
      [exports: default]
-     context element ./foo.js [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo.js
-     context element ./foo [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo
+     context element ./bar [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar
+     context element ./bar.js [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar.js
 chunk    {1} 1.output.js 38 bytes <{3}> [rendered]
-    > ./baz [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz
-    > ./baz.js [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz.js
+    > ./baz [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz
+    > ./baz.js [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz.js
  [1] ./templates/baz.js 38 bytes {1} [optional] [built]
      [exports: default]
-     context element ./baz.js [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz.js
-     context element ./baz [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz
+     context element ./baz [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz
+     context element ./baz.js [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./baz.js
 chunk    {2} 2.output.js 38 bytes <{3}> [rendered]
-    > ./bar [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar
-    > ./bar.js [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar.js
- [2] ./templates/bar.js 38 bytes {2} [optional] [built]
+    > ./foo [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo
+    > ./foo.js [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo.js
+ [2] ./templates/foo.js 38 bytes {2} [optional] [built]
      [exports: default]
-     context element ./bar.js [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar.js
-     context element ./bar [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./bar
+     context element ./foo [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo
+     context element ./foo.js [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object ./foo.js
 chunk    {3} output.js (main) 597 bytes >{0}< >{1}< >{2}< [entry] [rendered]
     > .\example.js main
- [3] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object 160 bytes {3} [optional] [built]
-     import() context lazy ./templates [4] ./example.js 3:23-7:3
- [4] ./example.js 437 bytes {3} [built]
+ [3] ./example.js 437 bytes {3} [built]
      single entry .\example.js  main
+ [4] ./templates lazy ^\.\/.*$ include: \.js$ exclude: \.noimport\.js$ namespace object 160 bytes {3} [optional] [built]
+     import() context lazy ./templates [3] ./example.js 3:23-7:3
 ```
diff --git a/examples/code-splitting-native-import-context/README.md b/examples/code-splitting-native-import-context/README.md
index f751eb9b227..3cb4973c9eb 100644
--- a/examples/code-splitting-native-import-context/README.md
+++ b/examples/code-splitting-native-import-context/README.md
@@ -43,6 +43,7 @@ export default foo;
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -59,6 +60,7 @@ export default foo;
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -131,19 +133,16 @@ export default foo;
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -160,6 +159,10 @@ export default foo;
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -175,19 +178,34 @@ export default foo;
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -215,7 +233,7 @@ export default foo;
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 4);
+/******/ 	return __webpack_require__(__webpack_require__.s = 3);
 /******/ })
 /************************************************************************/
 ```
@@ -228,6 +246,31 @@ export default foo;
 /* 1 */,
 /* 2 */,
 /* 3 */
+/*!********************!*\
+  !*** ./example.js ***!
+  \********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+async function getTemplate(templateName) {
+	try {
+		let template = await __webpack_require__(4)(`./${templateName}`);
+		console.log(template);
+	} catch(err) {
+		console.error("template error");
+		return new Error(err);
+	}
+}
+
+getTemplate("foo");
+getTemplate("bar");
+getTemplate("baz");
+
+
+
+
+/***/ }),
+/* 4 */
 /*!**************************************************!*\
   !*** ./templates lazy ^\.\/.*$ namespace object ***!
   \**************************************************/
@@ -236,12 +279,12 @@ export default foo;
 
 var map = {
 	"./bar": [
-		2,
-		2
+		0,
+		0
 	],
 	"./bar.js": [
-		2,
-		2
+		0,
+		0
 	],
 	"./baz": [
 		1,
@@ -252,12 +295,12 @@ var map = {
 		1
 	],
 	"./foo": [
-		0,
-		0
+		2,
+		2
 	],
 	"./foo.js": [
-		0,
-		0
+		2,
+		2
 	]
 };
 function webpackAsyncContext(req) {
@@ -270,41 +313,16 @@ function webpackAsyncContext(req) {
 		});
 	}
 	return __webpack_require__.e(ids[1]).then(function() {
-		var module = __webpack_require__(ids[0]);
-		return module;
+		var id = ids[0];
+		return __webpack_require__(id);
 	});
 }
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
 	return Object.keys(map);
 };
-webpackAsyncContext.id = 3;
+webpackAsyncContext.id = 4;
 module.exports = webpackAsyncContext;
 
-/***/ }),
-/* 4 */
-/*!********************!*\
-  !*** ./example.js ***!
-  \********************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-async function getTemplate(templateName) {
-	try {
-		let template = await __webpack_require__(3)(`./${templateName}`);
-		console.log(template);
-	} catch(err) {
-		console.error("template error");
-		return new Error(err);
-	}
-}
-
-getTemplate("foo");
-getTemplate("bar");
-getTemplate("baz");
-
-
-
-
 /***/ })
 /******/ ]);
 ```
@@ -315,78 +333,78 @@ getTemplate("baz");
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  436 bytes       0  [emitted]  
-1.output.js  445 bytes       1  [emitted]  
-2.output.js  439 bytes       2  [emitted]  
-  output.js    8.3 KiB       3  [emitted]  main
+0.output.js  433 bytes       0  [emitted]  
+1.output.js  442 bytes       1  [emitted]  
+2.output.js  436 bytes       2  [emitted]  
+  output.js   9.29 KiB       3  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} 0.output.js 41 bytes <{3}> [rendered]
-    > ./foo [3] ./templates lazy ^\.\/.*$ namespace object ./foo
-    > ./foo.js [3] ./templates lazy ^\.\/.*$ namespace object ./foo.js
- [0] ./templates/foo.js 41 bytes {0} [optional] [built]
+chunk    {0} 0.output.js 38 bytes <{3}> [rendered]
+    > ./bar [4] ./templates lazy ^\.\/.*$ namespace object ./bar
+    > ./bar.js [4] ./templates lazy ^\.\/.*$ namespace object ./bar.js
+ [0] ./templates/bar.js 38 bytes {0} [optional] [built]
      [exports: default]
-     context element ./foo.js [3] ./templates lazy ^\.\/.*$ namespace object ./foo.js
-     context element ./foo [3] ./templates lazy ^\.\/.*$ namespace object ./foo
-chunk    {1} 1.output.js 41 bytes <{3}> [rendered]
-    > ./baz [3] ./templates lazy ^\.\/.*$ namespace object ./baz
-    > ./baz.js [3] ./templates lazy ^\.\/.*$ namespace object ./baz.js
- [1] ./templates/baz.js 41 bytes {1} [optional] [built]
+     context element ./bar [4] ./templates lazy ^\.\/.*$ namespace object ./bar
+     context element ./bar.js [4] ./templates lazy ^\.\/.*$ namespace object ./bar.js
+chunk    {1} 1.output.js 38 bytes <{3}> [rendered]
+    > ./baz [4] ./templates lazy ^\.\/.*$ namespace object ./baz
+    > ./baz.js [4] ./templates lazy ^\.\/.*$ namespace object ./baz.js
+ [1] ./templates/baz.js 38 bytes {1} [optional] [built]
      [exports: default]
-     context element ./baz.js [3] ./templates lazy ^\.\/.*$ namespace object ./baz.js
-     context element ./baz [3] ./templates lazy ^\.\/.*$ namespace object ./baz
-chunk    {2} 2.output.js 41 bytes <{3}> [rendered]
-    > ./bar [3] ./templates lazy ^\.\/.*$ namespace object ./bar
-    > ./bar.js [3] ./templates lazy ^\.\/.*$ namespace object ./bar.js
- [2] ./templates/bar.js 41 bytes {2} [optional] [built]
+     context element ./baz [4] ./templates lazy ^\.\/.*$ namespace object ./baz
+     context element ./baz.js [4] ./templates lazy ^\.\/.*$ namespace object ./baz.js
+chunk    {2} 2.output.js 38 bytes <{3}> [rendered]
+    > ./foo [4] ./templates lazy ^\.\/.*$ namespace object ./foo
+    > ./foo.js [4] ./templates lazy ^\.\/.*$ namespace object ./foo.js
+ [2] ./templates/foo.js 38 bytes {2} [optional] [built]
      [exports: default]
-     context element ./bar.js [3] ./templates lazy ^\.\/.*$ namespace object ./bar.js
-     context element ./bar [3] ./templates lazy ^\.\/.*$ namespace object ./bar
-chunk    {3} output.js (main) 456 bytes >{0}< >{1}< >{2}< [entry] [rendered]
+     context element ./foo [4] ./templates lazy ^\.\/.*$ namespace object ./foo
+     context element ./foo.js [4] ./templates lazy ^\.\/.*$ namespace object ./foo.js
+chunk    {3} output.js (main) 441 bytes >{0}< >{1}< >{2}< [entry] [rendered]
     > .\example.js main
- [3] ./templates lazy ^\.\/.*$ namespace object 160 bytes {3} [optional] [built]
-     import() context lazy ./templates [4] ./example.js 3:23-60
- [4] ./example.js 296 bytes {3} [built]
+ [3] ./example.js 281 bytes {3} [built]
      single entry .\example.js  main
+ [4] ./templates lazy ^\.\/.*$ namespace object 160 bytes {3} [optional] [built]
+     import() context lazy ./templates [3] ./example.js 3:23-60
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
 0.output.js  113 bytes       0  [emitted]  
 1.output.js  114 bytes       1  [emitted]  
 2.output.js  115 bytes       2  [emitted]  
-  output.js   2.12 KiB       3  [emitted]  main
+  output.js    2.5 KiB       3  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} 0.output.js 41 bytes <{3}> [rendered]
-    > ./foo [3] ./templates lazy ^\.\/.*$ namespace object ./foo
-    > ./foo.js [3] ./templates lazy ^\.\/.*$ namespace object ./foo.js
- [0] ./templates/foo.js 41 bytes {0} [optional] [built]
+chunk    {0} 0.output.js 38 bytes <{3}> [rendered]
+    > ./bar [4] ./templates lazy ^\.\/.*$ namespace object ./bar
+    > ./bar.js [4] ./templates lazy ^\.\/.*$ namespace object ./bar.js
+ [0] ./templates/bar.js 38 bytes {0} [optional] [built]
      [exports: default]
-     context element ./foo.js [3] ./templates lazy ^\.\/.*$ namespace object ./foo.js
-     context element ./foo [3] ./templates lazy ^\.\/.*$ namespace object ./foo
-chunk    {1} 1.output.js 41 bytes <{3}> [rendered]
-    > ./baz [3] ./templates lazy ^\.\/.*$ namespace object ./baz
-    > ./baz.js [3] ./templates lazy ^\.\/.*$ namespace object ./baz.js
- [1] ./templates/baz.js 41 bytes {1} [optional] [built]
+     context element ./bar [4] ./templates lazy ^\.\/.*$ namespace object ./bar
+     context element ./bar.js [4] ./templates lazy ^\.\/.*$ namespace object ./bar.js
+chunk    {1} 1.output.js 38 bytes <{3}> [rendered]
+    > ./baz [4] ./templates lazy ^\.\/.*$ namespace object ./baz
+    > ./baz.js [4] ./templates lazy ^\.\/.*$ namespace object ./baz.js
+ [1] ./templates/baz.js 38 bytes {1} [optional] [built]
      [exports: default]
-     context element ./baz.js [3] ./templates lazy ^\.\/.*$ namespace object ./baz.js
-     context element ./baz [3] ./templates lazy ^\.\/.*$ namespace object ./baz
-chunk    {2} 2.output.js 41 bytes <{3}> [rendered]
-    > ./bar [3] ./templates lazy ^\.\/.*$ namespace object ./bar
-    > ./bar.js [3] ./templates lazy ^\.\/.*$ namespace object ./bar.js
- [2] ./templates/bar.js 41 bytes {2} [optional] [built]
+     context element ./baz [4] ./templates lazy ^\.\/.*$ namespace object ./baz
+     context element ./baz.js [4] ./templates lazy ^\.\/.*$ namespace object ./baz.js
+chunk    {2} 2.output.js 38 bytes <{3}> [rendered]
+    > ./foo [4] ./templates lazy ^\.\/.*$ namespace object ./foo
+    > ./foo.js [4] ./templates lazy ^\.\/.*$ namespace object ./foo.js
+ [2] ./templates/foo.js 38 bytes {2} [optional] [built]
      [exports: default]
-     context element ./bar.js [3] ./templates lazy ^\.\/.*$ namespace object ./bar.js
-     context element ./bar [3] ./templates lazy ^\.\/.*$ namespace object ./bar
-chunk    {3} output.js (main) 456 bytes >{0}< >{1}< >{2}< [entry] [rendered]
+     context element ./foo [4] ./templates lazy ^\.\/.*$ namespace object ./foo
+     context element ./foo.js [4] ./templates lazy ^\.\/.*$ namespace object ./foo.js
+chunk    {3} output.js (main) 441 bytes >{0}< >{1}< >{2}< [entry] [rendered]
     > .\example.js main
- [3] ./templates lazy ^\.\/.*$ namespace object 160 bytes {3} [optional] [built]
-     import() context lazy ./templates [4] ./example.js 3:23-60
- [4] ./example.js 296 bytes {3} [built]
+ [3] ./example.js 281 bytes {3} [built]
      single entry .\example.js  main
+ [4] ./templates lazy ^\.\/.*$ namespace object 160 bytes {3} [optional] [built]
+     import() context lazy ./templates [3] ./example.js 3:23-60
 ```
diff --git a/examples/code-splitting-specify-chunk-name/README.md b/examples/code-splitting-specify-chunk-name/README.md
index 16638fad95a..1a70962da31 100644
--- a/examples/code-splitting-specify-chunk-name/README.md
+++ b/examples/code-splitting-specify-chunk-name/README.md
@@ -43,6 +43,7 @@ export default foo;
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -59,6 +60,7 @@ export default foo;
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -131,19 +133,16 @@ export default foo;
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -160,6 +159,10 @@ export default foo;
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -175,19 +178,34 @@ export default foo;
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -215,7 +233,7 @@ export default foo;
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 4);
+/******/ 	return __webpack_require__(__webpack_require__.s = 3);
 /******/ })
 /************************************************************************/
 ```
@@ -228,6 +246,31 @@ export default foo;
 /* 1 */,
 /* 2 */,
 /* 3 */
+/*!********************!*\
+  !*** ./example.js ***!
+  \********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__.e(/*! import() | chunk-foo */ 0).then(__webpack_require__.bind(null, /*! ./templates/foo */ 0)).then(function(foo) {
+	console.log('foo:', foo);
+})
+
+__webpack_require__.e(/*! require.ensure | chunk-foo1 */ 0).then((function(require) {
+	var foo = __webpack_require__(/*! ./templates/foo */ 0);
+	console.log('foo:', foo);
+}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
+
+var createContextVar = "r";
+__webpack_require__(4)("./ba" + createContextVar).then(function(bar) {
+	console.log('bar:', bar);
+})
+
+
+
+
+/***/ }),
+/* 4 */
 /*!****************************************************!*\
   !*** ./templates lazy ^\.\/ba.*$ namespace object ***!
   \****************************************************/
@@ -236,20 +279,20 @@ export default foo;
 
 var map = {
 	"./bar": [
-		2,
+		1,
 		1
 	],
 	"./bar.js": [
-		2,
+		1,
 		1
 	],
 	"./baz": [
-		1,
-		0
+		2,
+		2
 	],
 	"./baz.js": [
-		1,
-		0
+		2,
+		2
 	]
 };
 function webpackAsyncContext(req) {
@@ -262,41 +305,16 @@ function webpackAsyncContext(req) {
 		});
 	}
 	return __webpack_require__.e(ids[1]).then(function() {
-		var module = __webpack_require__(ids[0]);
-		return module;
+		var id = ids[0];
+		return __webpack_require__(id);
 	});
 }
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
 	return Object.keys(map);
 };
-webpackAsyncContext.id = 3;
+webpackAsyncContext.id = 4;
 module.exports = webpackAsyncContext;
 
-/***/ }),
-/* 4 */
-/*!********************!*\
-  !*** ./example.js ***!
-  \********************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-__webpack_require__.e(/*! import() | chunk-foo */ 2).then(__webpack_require__.bind(null, /*! ./templates/foo */ 0)).then(function(foo) {
-	console.log('foo:', foo);
-})
-
-__webpack_require__.e(/*! require.ensure | chunk-foo1 */ 2).then((function(require) {
-	var foo = __webpack_require__(/*! ./templates/foo */ 0);
-	console.log('foo:', foo);
-}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
-
-var createContextVar = "r";
-__webpack_require__(3)("./ba" + createContextVar).then(function(bar) {
-	console.log('bar:', bar);
-})
-
-
-
-
 /***/ })
 /******/ ]);
 ```
@@ -307,78 +325,78 @@ __webpack_require__(3)("./ba" + createContextVar).then(function(bar) {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  445 bytes       0  [emitted]  chunk-bar-baz2
-1.output.js  439 bytes       1  [emitted]  chunk-bar-baz0
-2.output.js  436 bytes       2  [emitted]  chunk-foo
-  output.js    8.5 KiB       3  [emitted]  main
+0.output.js  433 bytes       0  [emitted]  chunk-foo
+1.output.js  442 bytes       1  [emitted]  chunk-bar-baz0
+2.output.js  436 bytes       2  [emitted]  chunk-bar-baz2
+  output.js   9.49 KiB       3  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} 0.output.js (chunk-bar-baz2) 41 bytes <{3}> [rendered]
-    > ./baz [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz
-    > ./baz.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz.js
- [1] ./templates/baz.js 41 bytes {0} [optional] [built]
+chunk    {0} 0.output.js (chunk-foo) 38 bytes <{3}> [rendered]
+    > ./templates/foo [3] ./example.js 1:0-62
+    > [3] ./example.js 5:0-8:16
+ [0] ./templates/foo.js 38 bytes {0} [built]
      [exports: default]
-     context element ./baz.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz.js
-     context element ./baz [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz
-chunk    {1} 1.output.js (chunk-bar-baz0) 41 bytes <{3}> [rendered]
-    > ./bar [3] ./templates lazy ^\.\/ba.*$ namespace object ./bar
-    > ./bar.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./bar.js
- [2] ./templates/bar.js 41 bytes {1} [optional] [built]
+     import() ./templates/foo [3] ./example.js 1:0-62
+     cjs require ./templates/foo [3] ./example.js 6:11-37
+chunk    {1} 1.output.js (chunk-bar-baz0) 38 bytes <{3}> [rendered]
+    > ./bar [4] ./templates lazy ^\.\/ba.*$ namespace object ./bar
+    > ./bar.js [4] ./templates lazy ^\.\/ba.*$ namespace object ./bar.js
+ [1] ./templates/bar.js 38 bytes {1} [optional] [built]
      [exports: default]
-     context element ./bar.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./bar.js
-     context element ./bar [3] ./templates lazy ^\.\/ba.*$ namespace object ./bar
-chunk    {2} 2.output.js (chunk-foo) 41 bytes <{3}> [rendered]
-    > ./templates/foo [4] ./example.js 1:0-62
-    > [4] ./example.js 5:0-8:16
- [0] ./templates/foo.js 41 bytes {2} [built]
+     context element ./bar [4] ./templates lazy ^\.\/ba.*$ namespace object ./bar
+     context element ./bar.js [4] ./templates lazy ^\.\/ba.*$ namespace object ./bar.js
+chunk    {2} 2.output.js (chunk-bar-baz2) 38 bytes <{3}> [rendered]
+    > ./baz [4] ./templates lazy ^\.\/ba.*$ namespace object ./baz
+    > ./baz.js [4] ./templates lazy ^\.\/ba.*$ namespace object ./baz.js
+ [2] ./templates/baz.js 38 bytes {2} [optional] [built]
      [exports: default]
-     import() ./templates/foo [4] ./example.js 1:0-62
-     cjs require ./templates/foo [4] ./example.js 6:11-37
-chunk    {3} output.js (main) 580 bytes >{0}< >{1}< >{2}< [entry] [rendered]
+     context element ./baz [4] ./templates lazy ^\.\/ba.*$ namespace object ./baz
+     context element ./baz.js [4] ./templates lazy ^\.\/ba.*$ namespace object ./baz.js
+chunk    {3} output.js (main) 565 bytes >{0}< >{1}< >{2}< [entry] [rendered]
     > .\example.js main
- [3] ./templates lazy ^\.\/ba.*$ namespace object 160 bytes {3} [built]
-     import() context lazy ./templates [4] ./example.js 11:0-84
- [4] ./example.js 420 bytes {3} [built]
+ [3] ./example.js 405 bytes {3} [built]
      single entry .\example.js  main
+ [4] ./templates lazy ^\.\/ba.*$ namespace object 160 bytes {3} [built]
+     import() context lazy ./templates [3] ./example.js 11:0-84
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  114 bytes       0  [emitted]  chunk-bar-baz2
-1.output.js  115 bytes       1  [emitted]  chunk-bar-baz0
-2.output.js  113 bytes       2  [emitted]  chunk-foo
-  output.js   2.14 KiB       3  [emitted]  main
+0.output.js  113 bytes       0  [emitted]  chunk-foo
+1.output.js  114 bytes       1  [emitted]  chunk-bar-baz0
+2.output.js  115 bytes       2  [emitted]  chunk-bar-baz2
+  output.js   2.52 KiB       3  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} 0.output.js (chunk-bar-baz2) 41 bytes <{3}> [rendered]
-    > ./baz [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz
-    > ./baz.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz.js
- [1] ./templates/baz.js 41 bytes {0} [optional] [built]
+chunk    {0} 0.output.js (chunk-foo) 38 bytes <{3}> [rendered]
+    > ./templates/foo [3] ./example.js 1:0-62
+    > [3] ./example.js 5:0-8:16
+ [0] ./templates/foo.js 38 bytes {0} [built]
      [exports: default]
-     context element ./baz.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz.js
-     context element ./baz [3] ./templates lazy ^\.\/ba.*$ namespace object ./baz
-chunk    {1} 1.output.js (chunk-bar-baz0) 41 bytes <{3}> [rendered]
-    > ./bar [3] ./templates lazy ^\.\/ba.*$ namespace object ./bar
-    > ./bar.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./bar.js
- [2] ./templates/bar.js 41 bytes {1} [optional] [built]
+     import() ./templates/foo [3] ./example.js 1:0-62
+     cjs require ./templates/foo [3] ./example.js 6:11-37
+chunk    {1} 1.output.js (chunk-bar-baz0) 38 bytes <{3}> [rendered]
+    > ./bar [4] ./templates lazy ^\.\/ba.*$ namespace object ./bar
+    > ./bar.js [4] ./templates lazy ^\.\/ba.*$ namespace object ./bar.js
+ [1] ./templates/bar.js 38 bytes {1} [optional] [built]
      [exports: default]
-     context element ./bar.js [3] ./templates lazy ^\.\/ba.*$ namespace object ./bar.js
-     context element ./bar [3] ./templates lazy ^\.\/ba.*$ namespace object ./bar
-chunk    {2} 2.output.js (chunk-foo) 41 bytes <{3}> [rendered]
-    > ./templates/foo [4] ./example.js 1:0-62
-    > [4] ./example.js 5:0-8:16
- [0] ./templates/foo.js 41 bytes {2} [built]
+     context element ./bar [4] ./templates lazy ^\.\/ba.*$ namespace object ./bar
+     context element ./bar.js [4] ./templates lazy ^\.\/ba.*$ namespace object ./bar.js
+chunk    {2} 2.output.js (chunk-bar-baz2) 38 bytes <{3}> [rendered]
+    > ./baz [4] ./templates lazy ^\.\/ba.*$ namespace object ./baz
+    > ./baz.js [4] ./templates lazy ^\.\/ba.*$ namespace object ./baz.js
+ [2] ./templates/baz.js 38 bytes {2} [optional] [built]
      [exports: default]
-     import() ./templates/foo [4] ./example.js 1:0-62
-     cjs require ./templates/foo [4] ./example.js 6:11-37
-chunk    {3} output.js (main) 580 bytes >{0}< >{1}< >{2}< [entry] [rendered]
+     context element ./baz [4] ./templates lazy ^\.\/ba.*$ namespace object ./baz
+     context element ./baz.js [4] ./templates lazy ^\.\/ba.*$ namespace object ./baz.js
+chunk    {3} output.js (main) 565 bytes >{0}< >{1}< >{2}< [entry] [rendered]
     > .\example.js main
- [3] ./templates lazy ^\.\/ba.*$ namespace object 160 bytes {3} [built]
-     import() context lazy ./templates [4] ./example.js 11:0-84
- [4] ./example.js 420 bytes {3} [built]
+ [3] ./example.js 405 bytes {3} [built]
      single entry .\example.js  main
+ [4] ./templates lazy ^\.\/ba.*$ namespace object 160 bytes {3} [built]
+     import() context lazy ./templates [3] ./example.js 11:0-84
 ```
diff --git a/examples/code-splitting/README.md b/examples/code-splitting/README.md
index c6dd1964083..16294e6242b 100644
--- a/examples/code-splitting/README.md
+++ b/examples/code-splitting/README.md
@@ -18,7 +18,7 @@ You can see that webpack outputs two files/chunks:
   * the entry point `example.js`
   * module `a`
   * module `b`
-* `1.js` is an additional chunk (on demand loaded) and contains
+* `1.output.js` is an additional chunk (on demand loaded) and contains
   * module `c`
   * module `d`
 
@@ -47,6 +47,7 @@ require.ensure(["c"], function(require) {
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -63,6 +64,7 @@ require.ensure(["c"], function(require) {
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -77,7 +79,7 @@ require.ensure(["c"], function(require) {
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		1: 0
+/******/ 		0: 0
 /******/ 	};
 /******/
 /******/
@@ -135,19 +137,16 @@ require.ensure(["c"], function(require) {
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -164,6 +163,10 @@ require.ensure(["c"], function(require) {
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -179,19 +182,34 @@ require.ensure(["c"], function(require) {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -219,7 +237,7 @@ require.ensure(["c"], function(require) {
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 2);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1);
 /******/ })
 /************************************************************************/
 ```
@@ -239,58 +257,58 @@ require.ensure(["c"], function(require) {
 
 /***/ }),
 /* 1 */
-/*!***************************!*\
-  !*** ./node_modules/a.js ***!
-  \***************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-// module a
-
-/***/ }),
-/* 2 */
 /*!********************!*\
   !*** ./example.js ***!
   \********************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-var a = __webpack_require__(/*! a */ 1);
+var a = __webpack_require__(/*! a */ 2);
 var b = __webpack_require__(/*! b */ 0);
-__webpack_require__.e(/*! require.ensure */ 0).then((function(require) {
+__webpack_require__.e(/*! require.ensure */ 1).then((function(require) {
     __webpack_require__(/*! b */ 0).xyz();
-    var d = __webpack_require__(/*! d */ 3);
+    var d = __webpack_require__(/*! d */ 4);
 }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 
+/***/ }),
+/* 2 */
+/*!***************************!*\
+  !*** ./node_modules/a.js ***!
+  \***************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+// module a
+
 /***/ })
 /******/ ]);
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */,
 /* 1 */,
 /* 2 */,
 /* 3 */
 /*!***************************!*\
-  !*** ./node_modules/d.js ***!
+  !*** ./node_modules/c.js ***!
   \***************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-// module d
+// module c
 
 /***/ }),
 /* 4 */
 /*!***************************!*\
-  !*** ./node_modules/c.js ***!
+  !*** ./node_modules/d.js ***!
   \***************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-// module c
+// module d
 
 /***/ })
 ]]);
@@ -299,7 +317,7 @@ __webpack_require__.e(/*! require.ensure */ 0).then((function(require) {
 Minimized
 
 ``` javascript
-(window.webpackJsonp=window.webpackJsonp||[]).push([[0],[,,,function(n,o){},function(n,o){}]]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[1],[,,,function(n,o){},function(n,o){}]]);
 ```
 
 # Info
@@ -308,36 +326,36 @@ Minimized
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  490 bytes       0  [emitted]  
-  output.js   7.73 KiB       1  [emitted]  main
+  output.js   8.75 KiB       0  [emitted]  main
+1.output.js  490 bytes       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 22 bytes <{1}> [rendered]
-    > [2] ./example.js 3:0-6:2
-    2 modules
-chunk    {1} output.js (main) 166 bytes >{0}< [entry] [rendered]
+chunk    {0} output.js (main) 161 bytes >{1}< [entry] [rendered]
     > .\example.js main
- [2] ./example.js 144 bytes {1} [built]
+ [1] ./example.js 139 bytes {0} [built]
      single entry .\example.js  main
      + 2 hidden modules
+chunk    {1} 1.output.js 22 bytes <{0}> [rendered]
+    > [1] ./example.js 3:0-6:2
+    2 modules
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset      Size  Chunks             Chunk Names
-0.output.js  95 bytes       0  [emitted]  
-  output.js  1.71 KiB       1  [emitted]  main
+  output.js  2.08 KiB       0  [emitted]  main
+1.output.js  95 bytes       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 22 bytes <{1}> [rendered]
-    > [2] ./example.js 3:0-6:2
-    2 modules
-chunk    {1} output.js (main) 166 bytes >{0}< [entry] [rendered]
+chunk    {0} output.js (main) 161 bytes >{1}< [entry] [rendered]
     > .\example.js main
- [2] ./example.js 144 bytes {1} [built]
+ [1] ./example.js 139 bytes {0} [built]
      single entry .\example.js  main
      + 2 hidden modules
+chunk    {1} 1.output.js 22 bytes <{0}> [rendered]
+    > [1] ./example.js 3:0-6:2
+    2 modules
 ```
diff --git a/examples/code-splitting/template.md b/examples/code-splitting/template.md
index 7c21f7ae5f4..8e32dc5c49d 100644
--- a/examples/code-splitting/template.md
+++ b/examples/code-splitting/template.md
@@ -18,7 +18,7 @@ You can see that webpack outputs two files/chunks:
   * the entry point `example.js`
   * module `a`
   * module `b`
-* `1.js` is an additional chunk (on demand loaded) and contains
+* `1.output.js` is an additional chunk (on demand loaded) and contains
   * module `c`
   * module `d`
 
@@ -37,16 +37,16 @@ You can see that chunks are loaded via JSONP. The additional chunks are pretty s
 {{dist/output.js}}
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-{{dist/0.output.js}}
+{{dist/1.output.js}}
 ```
 
 Minimized
 
 ``` javascript
-{{production:dist/0.output.js}}
+{{production:dist/1.output.js}}
 ```
 
 # Info
diff --git a/examples/coffee-script/README.md b/examples/coffee-script/README.md
index 3f9c31fa5af..6a2d3a41e3c 100644
--- a/examples/coffee-script/README.md
+++ b/examples/coffee-script/README.md
@@ -66,19 +66,34 @@ module.exports = 42
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -153,9 +168,9 @@ module.exports = 42;
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
     Asset      Size  Chunks             Chunk Names
-output.js  3.35 KiB       0  [emitted]  main
+output.js  4.31 KiB       0  [emitted]  main
 Entrypoint main = output.js
 chunk    {0} output.js (main) 206 bytes [entry] [rendered]
     > .\example.js main
@@ -172,17 +187,17 @@ chunk    {0} output.js (main) 206 bytes [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-    Asset       Size  Chunks             Chunk Names
-output.js  708 bytes       0  [emitted]  main
+Version: webpack 4.20.1
+    Asset      Size  Chunks             Chunk Names
+output.js  1.07 KiB       0  [emitted]  main
 Entrypoint main = output.js
 chunk    {0} output.js (main) 206 bytes [entry] [rendered]
     > .\example.js main
  [0] ./cup2.coffee 57 bytes {0} [built]
-     cjs require ./cup2.coffee [1] ./cup1.coffee 4:12-36
-     cjs require ./cup2 [1] ./cup1.coffee 5:9-26
- [1] ./cup1.coffee 118 bytes {0} [built]
-     cjs require ./cup1 [2] ./example.js 1:12-29
- [2] ./example.js 31 bytes {0} [built]
+     cjs require ./cup2.coffee [2] ./cup1.coffee 4:12-36
+     cjs require ./cup2 [2] ./cup1.coffee 5:9-26
+ [1] ./example.js 31 bytes {0} [built]
      single entry .\example.js  main
+ [2] ./cup1.coffee 118 bytes {0} [built]
+     cjs require ./cup1 [1] ./example.js 1:12-29
 ```
\ No newline at end of file
diff --git a/examples/common-chunk-and-vendor-chunk/README.md b/examples/common-chunk-and-vendor-chunk/README.md
index f6d5e46aa9c..6ac8ca63ff1 100644
--- a/examples/common-chunk-and-vendor-chunk/README.md
+++ b/examples/common-chunk-and-vendor-chunk/README.md
@@ -72,7 +72,7 @@ module.exports = {
 # dist/vendor.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[3],{
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],{
 
 /***/ 1:
 /*!*********************************!*\
@@ -102,7 +102,7 @@ module.exports = "vendor2";
 # dist/commons~pageA~pageB~pageC.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[4],{
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[2],{
 
 /***/ 3:
 /*!*********************!*\
@@ -121,7 +121,7 @@ module.exports = "utility2";
 # dist/commons~pageB~pageC.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[5],{
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[4],{
 
 /***/ 6:
 /*!*********************!*\
@@ -148,6 +148,7 @@ module.exports = "utility3";
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/ 		var executeModules = data[2];
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -164,6 +165,7 @@ module.exports = "utility3";
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -237,19 +239,34 @@ module.exports = "utility3";
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -274,7 +291,7 @@ module.exports = "utility3";
 /******/
 /******/
 /******/ 	// add entry module to deferred list
-/******/ 	deferredModules.push([0,3,4]);
+/******/ 	deferredModules.push([0,1,2]);
 /******/ 	// run deferred modules when ready
 /******/ 	return checkDeferredModules();
 /******/ })
@@ -323,6 +340,7 @@ module.exports = "utility1";
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/ 		var executeModules = data[2];
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -339,6 +357,7 @@ module.exports = "utility1";
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -373,7 +392,7 @@ module.exports = "utility1";
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		1: 0
+/******/ 		3: 0
 /******/ 	};
 /******/
 /******/ 	var deferredModules = [];
@@ -412,19 +431,34 @@ module.exports = "utility1";
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -449,7 +483,7 @@ module.exports = "utility1";
 /******/
 /******/
 /******/ 	// add entry module to deferred list
-/******/ 	deferredModules.push([4,3,4,5]);
+/******/ 	deferredModules.push([4,1,2,4]);
 /******/ 	// run deferred modules when ready
 /******/ 	return checkDeferredModules();
 /******/ })
@@ -484,6 +518,7 @@ module.exports = "pageB";
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/ 		var executeModules = data[2];
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -500,6 +535,7 @@ module.exports = "pageB";
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -534,7 +570,7 @@ module.exports = "pageB";
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		2: 0
+/******/ 		5: 0
 /******/ 	};
 /******/
 /******/ 	var deferredModules = [];
@@ -573,19 +609,34 @@ module.exports = "pageB";
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -610,7 +661,7 @@ module.exports = "pageB";
 /******/
 /******/
 /******/ 	// add entry module to deferred list
-/******/ 	deferredModules.push([7,4,5]);
+/******/ 	deferredModules.push([7,2,4]);
 /******/ 	// run deferred modules when ready
 /******/ 	return checkDeferredModules();
 /******/ })
@@ -640,63 +691,63 @@ module.exports = "pageC";
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
                        Asset       Size  Chunks             Chunk Names
-                    pageA.js   5.72 KiB       0  [emitted]  pageA
-                    pageB.js   5.52 KiB       1  [emitted]  pageB
-                    pageC.js   5.47 KiB       2  [emitted]  pageC
-                   vendor.js  536 bytes       3  [emitted]  vendor
-commons~pageA~pageB~pageC.js  269 bytes       4  [emitted]  commons~pageA~pageB~pageC
-      commons~pageB~pageC.js  269 bytes       5  [emitted]  commons~pageB~pageC
+                    pageA.js    6.7 KiB       0  [emitted]  pageA
+                   vendor.js  536 bytes       1  [emitted]  vendor
+commons~pageA~pageB~pageC.js  269 bytes       2  [emitted]  commons~pageA~pageB~pageC
+                    pageB.js    6.5 KiB       3  [emitted]  pageB
+      commons~pageB~pageC.js  269 bytes       4  [emitted]  commons~pageB~pageC
+                    pageC.js   6.45 KiB       5  [emitted]  pageC
 Entrypoint pageA = vendor.js commons~pageA~pageB~pageC.js pageA.js
 Entrypoint pageB = vendor.js commons~pageA~pageB~pageC.js commons~pageB~pageC.js pageB.js
 Entrypoint pageC = commons~pageA~pageB~pageC.js commons~pageB~pageC.js pageC.js
-chunk    {0} pageA.js (pageA) 165 bytes ={3}= ={4}= [entry] [rendered]
+chunk    {0} pageA.js (pageA) 165 bytes ={1}= ={2}= [entry] [rendered]
     > ./pageA pageA
  [0] ./pageA.js 137 bytes {0} [built]
      single entry ./pageA  pageA
  [2] ./utility1.js 28 bytes {0} [built]
      cjs require ./utility1 [0] ./pageA.js 2:15-36
-chunk    {1} pageB.js (pageB) 137 bytes ={3}= ={4}= ={5}= [entry] [rendered]
-    > ./pageB pageB
- [4] ./pageB.js 137 bytes {1} [built]
-     single entry ./pageB  pageB
-chunk    {2} pageC.js (pageC) 105 bytes ={4}= ={5}= [entry] [rendered]
-    > ./pageC pageC
- [7] ./pageC.js 105 bytes {2} [built]
-     single entry ./pageC  pageC
-chunk    {3} vendor.js (vendor) 54 bytes ={0}= ={1}= ={4}= ={5}= [initial] [rendered] split chunk (cache group: vendor) (name: vendor)
+chunk    {1} vendor.js (vendor) 54 bytes ={0}= ={2}= ={3}= ={4}= [initial] [rendered] split chunk (cache group: vendor) (name: vendor)
     > ./pageA pageA
     > ./pageB pageB
     2 modules
-chunk    {4} commons~pageA~pageB~pageC.js (commons~pageA~pageB~pageC) 28 bytes ={0}= ={1}= ={2}= ={3}= ={5}= [initial] [rendered] split chunk (cache group: commons) (name: commons~pageA~pageB~pageC)
+chunk    {2} commons~pageA~pageB~pageC.js (commons~pageA~pageB~pageC) 28 bytes ={0}= ={1}= ={3}= ={4}= ={5}= [initial] [rendered] split chunk (cache group: commons) (name: commons~pageA~pageB~pageC)
     > ./pageA pageA
     > ./pageB pageB
     > ./pageC pageC
- [3] ./utility2.js 28 bytes {4} [built]
+ [3] ./utility2.js 28 bytes {2} [built]
      cjs require ./utility2 [0] ./pageA.js 3:15-36
      cjs require ./utility2 [4] ./pageB.js 2:15-36
      cjs require ./utility2 [7] ./pageC.js 1:15-36
-chunk    {5} commons~pageB~pageC.js (commons~pageB~pageC) 28 bytes ={1}= ={2}= ={3}= ={4}= [initial] [rendered] split chunk (cache group: commons) (name: commons~pageB~pageC)
+chunk    {3} pageB.js (pageB) 137 bytes ={1}= ={2}= ={4}= [entry] [rendered]
+    > ./pageB pageB
+ [4] ./pageB.js 137 bytes {3} [built]
+     single entry ./pageB  pageB
+chunk    {4} commons~pageB~pageC.js (commons~pageB~pageC) 28 bytes ={1}= ={2}= ={3}= ={5}= [initial] [rendered] split chunk (cache group: commons) (name: commons~pageB~pageC)
     > ./pageB pageB
     > ./pageC pageC
- [6] ./utility3.js 28 bytes {5} [built]
+ [6] ./utility3.js 28 bytes {4} [built]
      cjs require ./utility3 [4] ./pageB.js 3:15-36
      cjs require ./utility3 [7] ./pageC.js 2:15-36
+chunk    {5} pageC.js (pageC) 102 bytes ={2}= ={4}= [entry] [rendered]
+    > ./pageC pageC
+ [7] ./pageC.js 102 bytes {5} [built]
+     single entry ./pageC  pageC
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
                        Asset       Size  Chunks             Chunk Names
 commons~pageA~pageB~pageC.js   96 bytes       0  [emitted]  commons~pageA~pageB~pageC
-      commons~pageB~pageC.js   97 bytes       1  [emitted]  commons~pageB~pageC
-                   vendor.js  134 bytes       2  [emitted]  vendor
-                    pageC.js    1.1 KiB       3  [emitted]  pageC
-                    pageB.js   1.11 KiB       4  [emitted]  pageB
-                    pageA.js   1.15 KiB       5  [emitted]  pageA
+                   vendor.js  134 bytes       1  [emitted]  vendor
+      commons~pageB~pageC.js   97 bytes       2  [emitted]  commons~pageB~pageC
+                    pageA.js   1.52 KiB       3  [emitted]  pageA
+                    pageB.js   1.49 KiB       4  [emitted]  pageB
+                    pageC.js   1.48 KiB       5  [emitted]  pageC
 Entrypoint pageA = vendor.js commons~pageA~pageB~pageC.js pageA.js
 Entrypoint pageB = vendor.js commons~pageA~pageB~pageC.js commons~pageB~pageC.js pageB.js
 Entrypoint pageC = commons~pageA~pageB~pageC.js commons~pageB~pageC.js pageC.js
@@ -705,31 +756,31 @@ chunk    {0} commons~pageA~pageB~pageC.js (commons~pageA~pageB~pageC) 28 bytes =
     > ./pageB pageB
     > ./pageC pageC
  [0] ./utility2.js 28 bytes {0} [built]
-     cjs require ./utility2 [2] ./pageC.js 1:15-36
-     cjs require ./utility2 [4] ./pageB.js 2:15-36
-     cjs require ./utility2 [7] ./pageA.js 3:15-36
-chunk    {1} commons~pageB~pageC.js (commons~pageB~pageC) 28 bytes ={0}= ={2}= ={3}= ={4}= [initial] [rendered] split chunk (cache group: commons) (name: commons~pageB~pageC)
-    > ./pageB pageB
-    > ./pageC pageC
- [1] ./utility3.js 28 bytes {1} [built]
-     cjs require ./utility3 [2] ./pageC.js 2:15-36
-     cjs require ./utility3 [4] ./pageB.js 3:15-36
-chunk    {2} vendor.js (vendor) 54 bytes ={0}= ={1}= ={4}= ={5}= [initial] [rendered] split chunk (cache group: vendor) (name: vendor)
+     cjs require ./utility2 [2] ./pageA.js 3:15-36
+     cjs require ./utility2 [5] ./pageB.js 2:15-36
+     cjs require ./utility2 [7] ./pageC.js 1:15-36
+chunk    {1} vendor.js (vendor) 54 bytes ={0}= ={2}= ={3}= ={4}= [initial] [rendered] split chunk (cache group: vendor) (name: vendor)
     > ./pageA pageA
     > ./pageB pageB
     2 modules
-chunk    {3} pageC.js (pageC) 105 bytes ={0}= ={1}= [entry] [rendered]
+chunk    {2} commons~pageB~pageC.js (commons~pageB~pageC) 28 bytes ={0}= ={1}= ={4}= ={5}= [initial] [rendered] split chunk (cache group: commons) (name: commons~pageB~pageC)
+    > ./pageB pageB
     > ./pageC pageC
- [2] ./pageC.js 105 bytes {3} [built]
-     single entry ./pageC  pageC
+ [1] ./utility3.js 28 bytes {2} [built]
+     cjs require ./utility3 [5] ./pageB.js 3:15-36
+     cjs require ./utility3 [7] ./pageC.js 2:15-36
+chunk    {3} pageA.js (pageA) 165 bytes ={0}= ={1}= [entry] [rendered]
+    > ./pageA pageA
+ [2] ./pageA.js 137 bytes {3} [built]
+     single entry ./pageA  pageA
+ [4] ./utility1.js 28 bytes {3} [built]
+     cjs require ./utility1 [2] ./pageA.js 2:15-36
 chunk    {4} pageB.js (pageB) 137 bytes ={0}= ={1}= ={2}= [entry] [rendered]
     > ./pageB pageB
- [4] ./pageB.js 137 bytes {4} [built]
+ [5] ./pageB.js 137 bytes {4} [built]
      single entry ./pageB  pageB
-chunk    {5} pageA.js (pageA) 165 bytes ={0}= ={2}= [entry] [rendered]
-    > ./pageA pageA
- [5] ./utility1.js 28 bytes {5} [built]
-     cjs require ./utility1 [7] ./pageA.js 2:15-36
- [7] ./pageA.js 137 bytes {5} [built]
-     single entry ./pageA  pageA
+chunk    {5} pageC.js (pageC) 102 bytes ={0}= ={2}= [entry] [rendered]
+    > ./pageC pageC
+ [7] ./pageC.js 102 bytes {5} [built]
+     single entry ./pageC  pageC
 ```
diff --git a/examples/common-chunk-grandchildren/README.md b/examples/common-chunk-grandchildren/README.md
index 9ce9e748da9..3c8916108a8 100644
--- a/examples/common-chunk-grandchildren/README.md
+++ b/examples/common-chunk-grandchildren/README.md
@@ -115,6 +115,7 @@ module.exports = {
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -131,6 +132,7 @@ module.exports = {
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -145,7 +147,7 @@ module.exports = {
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		4: 0
+/******/ 		1: 0
 /******/ 	};
 /******/
 /******/
@@ -203,19 +205,16 @@ module.exports = {
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -232,6 +231,10 @@ module.exports = {
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -247,19 +250,34 @@ module.exports = {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -287,7 +305,7 @@ module.exports = {
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1);
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
 /******/ })
 /************************************************************************/
 ```
@@ -297,6 +315,17 @@ module.exports = {
 ``` javascript
 /******/ ([
 /* 0 */
+/*!**************************!*\
+  !*** multi ./example.js ***!
+  \**************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(/*! ./example.js */1);
+
+
+/***/ }),
+/* 1 */
 /*!********************!*\
   !*** ./example.js ***!
   \********************/
@@ -306,11 +335,11 @@ module.exports = {
 var main = function() {
 	console.log("Main class");
 	Promise.all(/*! require.ensure */[__webpack_require__.e(0), __webpack_require__.e(2)]).then((() => {
-		const page = __webpack_require__(/*! ./pageA */ 3);
+		const page = __webpack_require__(/*! ./pageA */ 2);
 		page();
 	}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
-	__webpack_require__.e(/*! require.ensure */ 1).then((() => {
-		const page = __webpack_require__(/*! ./pageB */ 2);
+	__webpack_require__.e(/*! require.ensure */ 3).then((() => {
+		const page = __webpack_require__(/*! ./pageB */ 3);
 		page();
 	}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
@@ -318,17 +347,6 @@ var main = function() {
 main();
 
 
-/***/ }),
-/* 1 */
-/*!**************************!*\
-  !*** multi ./example.js ***!
-  \**************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(/*! ./example.js */0);
-
-
 /***/ })
 /******/ ]);
 ```
@@ -355,24 +373,23 @@ module.exports = function() {
 }]);
 ```
 
-# dist/1.output.js
+# dist/2.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],{
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[2],{
 
 /***/ 2:
 /*!******************!*\
-  !*** ./pageB.js ***!
+  !*** ./pageA.js ***!
   \******************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
+var reusableComponent = __webpack_require__(/*! ./reusableComponent */ 4);
+
 module.exports = function() {
-	console.log("Page B");
-	Promise.all(/*! require.ensure */[__webpack_require__.e(0), __webpack_require__.e(3)]).then((()=>{
-		const page = __webpack_require__(/*! ./pageC */ 5);
-		page();
-	}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
+	console.log("Page A");
+	reusableComponent();
 };
 
 
@@ -381,23 +398,24 @@ module.exports = function() {
 }]);
 ```
 
-# dist/2.output.js
+# dist/3.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[2],{
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[3],{
 
 /***/ 3:
 /*!******************!*\
-  !*** ./pageA.js ***!
+  !*** ./pageB.js ***!
   \******************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-var reusableComponent = __webpack_require__(/*! ./reusableComponent */ 4);
-
 module.exports = function() {
-	console.log("Page A");
-	reusableComponent();
+	console.log("Page B");
+	Promise.all(/*! require.ensure */[__webpack_require__.e(0), __webpack_require__.e(4)]).then((()=>{
+		const page = __webpack_require__(/*! ./pageC */ 5);
+		page();
+	}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 
 
@@ -406,10 +424,10 @@ module.exports = function() {
 }]);
 ```
 
-# dist/3.output.js
+# dist/4.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[3],{
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[4],{
 
 /***/ 5:
 /*!******************!*\
@@ -437,74 +455,74 @@ module.exports = function() {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  340 bytes       0  [emitted]  
-1.output.js  549 bytes       1  [emitted]  
-2.output.js  414 bytes       2  [emitted]  
-3.output.js  414 bytes       3  [emitted]  
-  output.js   7.79 KiB       4  [emitted]  main
+0.output.js  337 bytes       0  [emitted]  
+  output.js    8.8 KiB       1  [emitted]  main
+2.output.js  408 bytes       2  [emitted]  
+3.output.js  542 bytes       3  [emitted]  
+4.output.js  408 bytes       4  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 72 bytes <{1}> <{4}> ={2}= ={3}= [rendered] split chunk (cache group: default)
-    > [0] ./example.js 3:1-6:3
-    > [2] ./pageB.js 3:1-6:3
- [4] ./reusableComponent.js 72 bytes {0} [built]
-     cjs require ./reusableComponent [3] ./pageA.js 1:24-54
+chunk    {0} 0.output.js 69 bytes <{1}> <{3}> ={2}= ={4}= [rendered] split chunk (cache group: default)
+    > [1] ./example.js 3:1-6:3
+    > [3] ./pageB.js 3:1-6:3
+ [4] ./reusableComponent.js 69 bytes {0} [built]
+     cjs require ./reusableComponent [2] ./pageA.js 1:24-54
      cjs require ./reusableComponent [5] ./pageC.js 1:24-54
-chunk    {1} 1.output.js 140 bytes <{4}> >{0}< >{3}< [rendered]
-    > [0] ./example.js 7:1-10:3
- [2] ./pageB.js 140 bytes {1} [built]
-     cjs require ./pageB [0] ./example.js 8:15-33
-chunk    {2} 2.output.js 142 bytes <{4}> ={0}= [rendered]
-    > [0] ./example.js 3:1-6:3
- [3] ./pageA.js 142 bytes {2} [built]
-     cjs require ./pageA [0] ./example.js 4:15-33
-chunk    {3} 3.output.js 142 bytes <{1}> ={0}= [rendered]
-    > [2] ./pageB.js 3:1-6:3
- [5] ./pageC.js 142 bytes {3} [built]
-     cjs require ./pageC [2] ./pageB.js 4:15-33
-chunk    {4} output.js (main) 261 bytes >{0}< >{1}< >{2}< [entry] [rendered]
+chunk    {1} output.js (main) 248 bytes >{0}< >{2}< >{3}< [entry] [rendered]
     > main
- [0] ./example.js 233 bytes {4} [built]
-     single entry ./example.js [1] multi ./example.js main:100000
- [1] multi ./example.js 28 bytes {4} [built]
+ [0] multi ./example.js 28 bytes {1} [built]
      multi entry 
+ [1] ./example.js 220 bytes {1} [built]
+     single entry ./example.js [0] multi ./example.js main[0]
+chunk    {2} 2.output.js 136 bytes <{1}> ={0}= [rendered]
+    > [1] ./example.js 3:1-6:3
+ [2] ./pageA.js 136 bytes {2} [built]
+     cjs require ./pageA [1] ./example.js 4:15-33
+chunk    {3} 3.output.js 133 bytes <{1}> >{0}< >{4}< [rendered]
+    > [1] ./example.js 7:1-10:3
+ [3] ./pageB.js 133 bytes {3} [built]
+     cjs require ./pageB [1] ./example.js 8:15-33
+chunk    {4} 4.output.js 136 bytes <{3}> ={0}= [rendered]
+    > [3] ./pageB.js 3:1-6:3
+ [5] ./pageC.js 136 bytes {4} [built]
+     cjs require ./pageC [3] ./pageB.js 4:15-33
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
 0.output.js  133 bytes       0  [emitted]  
-1.output.js  198 bytes       1  [emitted]  
+  output.js   2.16 KiB       1  [emitted]  main
 2.output.js  138 bytes       2  [emitted]  
-3.output.js  138 bytes       3  [emitted]  
-  output.js   1.78 KiB       4  [emitted]  main
+3.output.js  198 bytes       3  [emitted]  
+4.output.js  138 bytes       4  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 72 bytes <{1}> <{4}> ={2}= ={3}= [rendered] split chunk (cache group: default)
-    > [0] ./example.js 3:1-6:3
-    > [2] ./pageB.js 3:1-6:3
- [4] ./reusableComponent.js 72 bytes {0} [built]
-     cjs require ./reusableComponent [3] ./pageA.js 1:24-54
+chunk    {0} 0.output.js 69 bytes <{1}> <{3}> ={2}= ={4}= [rendered] split chunk (cache group: default)
+    > [1] ./example.js 3:1-6:3
+    > [3] ./pageB.js 3:1-6:3
+ [4] ./reusableComponent.js 69 bytes {0} [built]
+     cjs require ./reusableComponent [2] ./pageA.js 1:24-54
      cjs require ./reusableComponent [5] ./pageC.js 1:24-54
-chunk    {1} 1.output.js 140 bytes <{4}> >{0}< >{3}< [rendered]
-    > [0] ./example.js 7:1-10:3
- [2] ./pageB.js 140 bytes {1} [built]
-     cjs require ./pageB [0] ./example.js 8:15-33
-chunk    {2} 2.output.js 142 bytes <{4}> ={0}= [rendered]
-    > [0] ./example.js 3:1-6:3
- [3] ./pageA.js 142 bytes {2} [built]
-     cjs require ./pageA [0] ./example.js 4:15-33
-chunk    {3} 3.output.js 142 bytes <{1}> ={0}= [rendered]
-    > [2] ./pageB.js 3:1-6:3
- [5] ./pageC.js 142 bytes {3} [built]
-     cjs require ./pageC [2] ./pageB.js 4:15-33
-chunk    {4} output.js (main) 261 bytes >{0}< >{1}< >{2}< [entry] [rendered]
+chunk    {1} output.js (main) 248 bytes >{0}< >{2}< >{3}< [entry] [rendered]
     > main
- [0] ./example.js 233 bytes {4} [built]
-     single entry ./example.js [1] multi ./example.js main:100000
- [1] multi ./example.js 28 bytes {4} [built]
+ [0] multi ./example.js 28 bytes {1} [built]
      multi entry 
+ [1] ./example.js 220 bytes {1} [built]
+     single entry ./example.js [0] multi ./example.js main[0]
+chunk    {2} 2.output.js 136 bytes <{1}> ={0}= [rendered]
+    > [1] ./example.js 3:1-6:3
+ [2] ./pageA.js 136 bytes {2} [built]
+     cjs require ./pageA [1] ./example.js 4:15-33
+chunk    {3} 3.output.js 133 bytes <{1}> >{0}< >{4}< [rendered]
+    > [1] ./example.js 7:1-10:3
+ [3] ./pageB.js 133 bytes {3} [built]
+     cjs require ./pageB [1] ./example.js 8:15-33
+chunk    {4} 4.output.js 136 bytes <{3}> ={0}= [rendered]
+    > [3] ./pageB.js 3:1-6:3
+ [5] ./pageC.js 136 bytes {4} [built]
+     cjs require ./pageC [3] ./pageB.js 4:15-33
 ```
diff --git a/examples/common-chunk-grandchildren/template.md b/examples/common-chunk-grandchildren/template.md
index aa0aaeae9d2..60d126f864f 100644
--- a/examples/common-chunk-grandchildren/template.md
+++ b/examples/common-chunk-grandchildren/template.md
@@ -68,12 +68,6 @@ You can see that webpack outputs five files/chunks:
 {{dist/0.output.js}}
 ```
 
-# dist/1.output.js
-
-``` javascript
-{{dist/1.output.js}}
-```
-
 # dist/2.output.js
 
 ``` javascript
@@ -86,6 +80,12 @@ You can see that webpack outputs five files/chunks:
 {{dist/3.output.js}}
 ```
 
+# dist/4.output.js
+
+``` javascript
+{{dist/4.output.js}}
+```
+
 # Info
 
 ## Unoptimized
diff --git a/examples/commonjs/README.md b/examples/commonjs/README.md
index fb85a0b1c08..3f509a93b1c 100644
--- a/examples/commonjs/README.md
+++ b/examples/commonjs/README.md
@@ -9,15 +9,15 @@ You can also see the info messages webpack prints to console (for both normal an
 # example.js
 
 ``` javascript
-var inc = require('./increment').increment;
-var a = 1;
+const inc = require('./increment').increment;
+const a = 1;
 inc(a); // 2
 ```
 
 # increment.js
 
 ``` javascript
-var add = require('./math').add;
+const add = require('./math').add;
 exports.increment = function(val) {
     return add(val, 1);
 };
@@ -78,19 +78,34 @@ exports.add = function() {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -124,10 +139,11 @@ exports.add = function() {
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-var inc = __webpack_require__(/*! ./increment */ 1).increment;
-var a = 1;
+const inc = __webpack_require__(/*! ./increment */ 1).increment;
+const a = 1;
 inc(a); // 2
 
+
 /***/ }),
 /* 1 */
 /*!**********************!*\
@@ -136,11 +152,12 @@ inc(a); // 2
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-var add = __webpack_require__(/*! ./math */ 2).add;
+const add = __webpack_require__(/*! ./math */ 2).add;
 exports.increment = function(val) {
     return add(val, 1);
 };
 
+
 /***/ }),
 /* 2 */
 /*!*****************!*\
@@ -167,34 +184,34 @@ exports.add = function() {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-    Asset      Size  Chunks             Chunk Names
-output.js  3.44 KiB       0  [emitted]  main
+Version: webpack 4.20.1
+    Asset     Size  Chunks             Chunk Names
+output.js  4.4 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 329 bytes [entry] [rendered]
+chunk    {0} output.js (main) 326 bytes [entry] [rendered]
     > .\example.js main
- [0] ./example.js 69 bytes {0} [built]
+ [0] ./example.js 72 bytes {0} [built]
      single entry .\example.js  main
  [1] ./increment.js 98 bytes {0} [built]
-     cjs require ./increment [0] ./example.js 1:10-32
- [2] ./math.js 162 bytes {0} [built]
-     cjs require ./math [1] ./increment.js 1:10-27
+     cjs require ./increment [0] ./example.js 1:12-34
+ [2] ./math.js 156 bytes {0} [built]
+     cjs require ./math [1] ./increment.js 1:12-29
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-    Asset       Size  Chunks             Chunk Names
-output.js  740 bytes       0  [emitted]  main
+Version: webpack 4.20.1
+    Asset     Size  Chunks             Chunk Names
+output.js  1.1 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 329 bytes [entry] [rendered]
+chunk    {0} output.js (main) 326 bytes [entry] [rendered]
     > .\example.js main
- [0] ./math.js 162 bytes {0} [built]
-     cjs require ./math [1] ./increment.js 1:10-27
- [1] ./increment.js 98 bytes {0} [built]
-     cjs require ./increment [2] ./example.js 1:10-32
- [2] ./example.js 69 bytes {0} [built]
+ [0] ./example.js 72 bytes {0} [built]
      single entry .\example.js  main
+ [1] ./increment.js 98 bytes {0} [built]
+     cjs require ./increment [0] ./example.js 1:12-34
+ [2] ./math.js 156 bytes {0} [built]
+     cjs require ./math [1] ./increment.js 1:12-29
 ```
\ No newline at end of file
diff --git a/examples/commonjs/example.js b/examples/commonjs/example.js
index 5b87a398285..d56b3cb0040 100644
--- a/examples/commonjs/example.js
+++ b/examples/commonjs/example.js
@@ -1,3 +1,3 @@
-var inc = require('./increment').increment;
-var a = 1;
-inc(a); // 2
\ No newline at end of file
+const inc = require('./increment').increment;
+const a = 1;
+inc(a); // 2
diff --git a/examples/commonjs/increment.js b/examples/commonjs/increment.js
index df19980e68a..5b6497cade5 100644
--- a/examples/commonjs/increment.js
+++ b/examples/commonjs/increment.js
@@ -1,4 +1,4 @@
-var add = require('./math').add;
+const add = require('./math').add;
 exports.increment = function(val) {
     return add(val, 1);
-};
\ No newline at end of file
+};
diff --git a/examples/dll-app-and-vendor/0-vendor/README.md b/examples/dll-app-and-vendor/0-vendor/README.md
index 0db675ca871..e747d388dd6 100644
--- a/examples/dll-app-and-vendor/0-vendor/README.md
+++ b/examples/dll-app-and-vendor/0-vendor/README.md
@@ -4,7 +4,7 @@ It's built separately from the app part. The vendors dll is only built when the
 
 The DllPlugin in combination with the `output.library` option exposes the internal require function as global variable in the target environment.
 
-A manifest is creates which includes mappings from module names to internal ids.
+A manifest is created which includes mappings from module names to internal ids.
 
 ### webpack.config.js
 
@@ -41,7 +41,7 @@ export function square(n) {
 # dist/vendor.js
 
 ``` javascript
-var vendor_lib_f3fbcfb4ec389ba5bbf0 =
+var vendor_lib_a132d30959ef28c3f004 =
 ```
 <details><summary><code>/******/ (function(modules) { /* webpackBootstrap */ })</code></summary>
 
@@ -84,19 +84,34 @@ var vendor_lib_f3fbcfb4ec389ba5bbf0 =
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -157,7 +172,7 @@ function square(n) {
 # dist/vendor-manifest.json
 
 ``` javascript
-{"name":"vendor_lib_f3fbcfb4ec389ba5bbf0","content":{"../node_modules/example-vendor.js":{"id":1,"buildMeta":{"exportsType":"namespace","providedExports":["square"]}}}}
+{"name":"vendor_lib_a132d30959ef28c3f004","content":{"../node_modules/example-vendor.js":{"id":1,"buildMeta":{"exportsType":"namespace","providedExports":["square"]}}}}
 ```
 
 # Info
@@ -166,15 +181,15 @@ function square(n) {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
     Asset      Size  Chunks             Chunk Names
-vendor.js  3.32 KiB       0  [emitted]  main
+vendor.js  4.28 KiB       0  [emitted]  main
 Entrypoint main = vendor.js
-chunk    {0} vendor.js (main) 60 bytes [entry] [rendered]
+chunk    {0} vendor.js (main) 57 bytes [entry] [rendered]
     > main
  [0] dll main 12 bytes {0} [built]
      dll entry 
-     
+      DllPlugin
      + 1 hidden module
 ```
 
@@ -182,15 +197,15 @@ chunk    {0} vendor.js (main) 60 bytes [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-    Asset       Size  Chunks             Chunk Names
-vendor.js  704 bytes       0  [emitted]  main
+Version: webpack 4.20.1
+    Asset      Size  Chunks             Chunk Names
+vendor.js  1.06 KiB       0  [emitted]  main
 Entrypoint main = vendor.js
-chunk    {0} vendor.js (main) 60 bytes [entry] [rendered]
+chunk    {0} vendor.js (main) 57 bytes [entry] [rendered]
     > main
- [1] dll main 12 bytes {0} [built]
+ [0] dll main 12 bytes {0} [built]
      dll entry 
-     
+      DllPlugin
      + 1 hidden module
 ```
 
diff --git a/examples/dll-app-and-vendor/0-vendor/template.md b/examples/dll-app-and-vendor/0-vendor/template.md
index 662ea88e909..358db39d4c7 100644
--- a/examples/dll-app-and-vendor/0-vendor/template.md
+++ b/examples/dll-app-and-vendor/0-vendor/template.md
@@ -4,7 +4,7 @@ It's built separately from the app part. The vendors dll is only built when the
 
 The DllPlugin in combination with the `output.library` option exposes the internal require function as global variable in the target environment.
 
-A manifest is creates which includes mappings from module names to internal ids.
+A manifest is created which includes mappings from module names to internal ids.
 
 ### webpack.config.js
 
diff --git a/examples/dll-app-and-vendor/1-app/README.md b/examples/dll-app-and-vendor/1-app/README.md
index d8b1e628fe2..8e688b7699a 100644
--- a/examples/dll-app-and-vendor/1-app/README.md
+++ b/examples/dll-app-and-vendor/1-app/README.md
@@ -89,19 +89,34 @@ console.log(new square(7));
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -147,22 +162,22 @@ console.log(new example_vendor__WEBPACK_IMPORTED_MODULE_0__["square"](7));
 /***/ }),
 /* 1 */
 /*!******************************************************************************************************!*\
-  !*** delegated ../node_modules/example-vendor.js from dll-reference vendor_lib_f3fbcfb4ec389ba5bbf0 ***!
+  !*** delegated ../node_modules/example-vendor.js from dll-reference vendor_lib_a132d30959ef28c3f004 ***!
   \******************************************************************************************************/
 /*! exports provided: square */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = (__webpack_require__(/*! dll-reference vendor_lib_f3fbcfb4ec389ba5bbf0 */ 2))(1);
+module.exports = (__webpack_require__(/*! dll-reference vendor_lib_a132d30959ef28c3f004 */ 2))(1);
 
 /***/ }),
 /* 2 */
 /*!**************************************************!*\
-  !*** external "vendor_lib_f3fbcfb4ec389ba5bbf0" ***!
+  !*** external "vendor_lib_a132d30959ef28c3f004" ***!
   \**************************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-module.exports = vendor_lib_f3fbcfb4ec389ba5bbf0;
+module.exports = vendor_lib_a132d30959ef28c3f004;
 
 /***/ })
 /******/ ]);
@@ -174,44 +189,44 @@ module.exports = vendor_lib_f3fbcfb4ec389ba5bbf0;
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
- Asset     Size  Chunks             Chunk Names
-app.js  3.9 KiB       0  [emitted]  main
+Version: webpack 4.20.1
+ Asset      Size  Chunks             Chunk Names
+app.js  4.86 KiB       0  [emitted]  main
 Entrypoint main = app.js
-chunk    {0} app.js (main) 182 bytes [entry] [rendered]
+chunk    {0} app.js (main) 178 bytes [entry] [rendered]
     > ./example-app main
- [0] ./example-app.js 98 bytes {0} [built]
+ [0] ./example-app.js 94 bytes {0} [built]
      [no exports]
      single entry ./example-app  main
- [1] delegated ../node_modules/example-vendor.js from dll-reference vendor_lib_f3fbcfb4ec389ba5bbf0 42 bytes {0} [built]
+ [1] delegated ../node_modules/example-vendor.js from dll-reference vendor_lib_a132d30959ef28c3f004 42 bytes {0} [built]
      [exports: square]
      harmony side effect evaluation example-vendor [0] ./example-app.js 1:0-40
      harmony import specifier example-vendor [0] ./example-app.js 3:12-18
      harmony import specifier example-vendor [0] ./example-app.js 4:16-22
- [2] external "vendor_lib_f3fbcfb4ec389ba5bbf0" 42 bytes {0} [built]
-     delegated source dll-reference vendor_lib_f3fbcfb4ec389ba5bbf0 [1] delegated ../node_modules/example-vendor.js from dll-reference vendor_lib_f3fbcfb4ec389ba5bbf0
+ [2] external "vendor_lib_a132d30959ef28c3f004" 42 bytes {0} [built]
+     delegated source dll-reference vendor_lib_a132d30959ef28c3f004 [1] delegated ../node_modules/example-vendor.js from dll-reference vendor_lib_a132d30959ef28c3f004
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
- Asset       Size  Chunks             Chunk Names
-app.js  736 bytes       0  [emitted]  main
+Version: webpack 4.20.1
+ Asset      Size  Chunks             Chunk Names
+app.js  1.09 KiB       0  [emitted]  main
 Entrypoint main = app.js
-chunk    {0} app.js (main) 182 bytes [entry] [rendered]
+chunk    {0} app.js (main) 178 bytes [entry] [rendered]
     > ./example-app main
- [0] delegated ../node_modules/example-vendor.js from dll-reference vendor_lib_f3fbcfb4ec389ba5bbf0 42 bytes {0} [built]
+ [0] delegated ../node_modules/example-vendor.js from dll-reference vendor_lib_a132d30959ef28c3f004 42 bytes {0} [built]
      [exports: square]
-     harmony side effect evaluation example-vendor [2] ./example-app.js 1:0-40
-     harmony import specifier example-vendor [2] ./example-app.js 3:12-18
-     harmony import specifier example-vendor [2] ./example-app.js 4:16-22
- [1] external "vendor_lib_f3fbcfb4ec389ba5bbf0" 42 bytes {0} [built]
-     delegated source dll-reference vendor_lib_f3fbcfb4ec389ba5bbf0 [0] delegated ../node_modules/example-vendor.js from dll-reference vendor_lib_f3fbcfb4ec389ba5bbf0
- [2] ./example-app.js 98 bytes {0} [built]
+     harmony side effect evaluation example-vendor [1] ./example-app.js 1:0-40
+     harmony import specifier example-vendor [1] ./example-app.js 3:12-18
+     harmony import specifier example-vendor [1] ./example-app.js 4:16-22
+ [1] ./example-app.js 94 bytes {0} [built]
      [no exports]
      single entry ./example-app  main
+ [2] external "vendor_lib_a132d30959ef28c3f004" 42 bytes {0} [built]
+     delegated source dll-reference vendor_lib_a132d30959ef28c3f004 [0] delegated ../node_modules/example-vendor.js from dll-reference vendor_lib_a132d30959ef28c3f004
 ```
 
 <!-- @TODO:
diff --git a/examples/dll-entry-only/README.md b/examples/dll-entry-only/README.md
index 6a9f0b50d0a..c79c8ab3a0e 100644
--- a/examples/dll-entry-only/README.md
+++ b/examples/dll-entry-only/README.md
@@ -64,7 +64,7 @@ module.exports = {
 # dist/dll.js
 
 ``` javascript
-var dll_3392692e94d8b928900f =
+var dll_3eea518f6d09aac41ec7 =
 ```
 <details><summary><code>/******/ (function(modules) { /* webpackBootstrap */ })</code></summary>
 
@@ -107,19 +107,34 @@ var dll_3392692e94d8b928900f =
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -195,9 +210,9 @@ var a = "a";
 var cjs = __webpack_require__(1);
 
 // CONCATENATED MODULE: ./example.js
-/* concated harmony reexport */__webpack_require__.d(__webpack_exports__, "a", function() { return a; });
-/* concated harmony reexport */__webpack_require__.d(__webpack_exports__, "b", function() { return b; });
-/* concated harmony reexport */__webpack_require__.d(__webpack_exports__, "c", function() { return cjs["c"]; });
+/* concated harmony reexport a */__webpack_require__.d(__webpack_exports__, "a", function() { return a; });
+/* concated harmony reexport b */__webpack_require__.d(__webpack_exports__, "b", function() { return b; });
+/* concated harmony reexport c */__webpack_require__.d(__webpack_exports__, "c", function() { return cjs["c"]; });
 
 
 
@@ -209,7 +224,7 @@ var cjs = __webpack_require__(1);
 # dist/dll-manifest.json
 
 ``` javascript
-{"name":"dll_3392692e94d8b928900f","content":{"./example.js":{"id":2,"buildMeta":{"exportsType":"namespace","providedExports":["a","b","c"]}}}}
+{"name":"dll_3eea518f6d09aac41ec7","content":{"./example.js":{"id":2,"buildMeta":{"exportsType":"namespace","providedExports":["a","b","c"]}}}}
 ```
 
 # Info
@@ -218,9 +233,9 @@ var cjs = __webpack_require__(1);
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.3
+Version: webpack 4.20.1
  Asset      Size  Chunks             Chunk Names
-dll.js  4.01 KiB       0  [emitted]  dll
+dll.js  4.98 KiB       0  [emitted]  dll
 Entrypoint dll = dll.js
 chunk    {0} dll.js (dll) 216 bytes [entry] [rendered]
     > dll
@@ -231,10 +246,10 @@ chunk    {0} dll.js (dll) 216 bytes [entry] [rendered]
      harmony export imported specifier ./cjs [2] ./example.js + 2 modules 2:0-26
  [2] ./example.js + 2 modules 162 bytes {0} [built]
      [exports: a, b, c]
-     single entry ./example [0] dll dll dll:0
+     single entry ./example [0] dll dll dll[0]
      | ./example.js 55 bytes [built]
      |     [exports: a, b, c]
-     |     single entry ./example [0] dll dll dll:0
+     |     single entry ./example [0] dll dll dll[0]
      | ./a.js 53 bytes [built]
      |     [exports: a, b]
      |     harmony side effect evaluation ./a  ./example.js 1:0-27
@@ -250,22 +265,24 @@ chunk    {0} dll.js (dll) 216 bytes [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.3
- Asset       Size  Chunks             Chunk Names
-dll.js  791 bytes       0  [emitted]  dll
+Version: webpack 4.20.1
+ Asset      Size  Chunks             Chunk Names
+dll.js  1.15 KiB       0  [emitted]  dll
 Entrypoint dll = dll.js
 chunk    {0} dll.js (dll) 216 bytes [entry] [rendered]
     > dll
  [0] ./cjs.js 42 bytes {0} [built]
      [only some exports used: c]
-     harmony side effect evaluation ./cjs [1] ./example.js + 2 modules 2:0-26
-     harmony export imported specifier ./cjs [1] ./example.js + 2 modules 2:0-26
- [1] ./example.js + 2 modules 162 bytes {0} [built]
+     harmony side effect evaluation ./cjs [2] ./example.js + 2 modules 2:0-26
+     harmony export imported specifier ./cjs [2] ./example.js + 2 modules 2:0-26
+ [1] dll dll 12 bytes {0} [built]
+     dll entry 
+ [2] ./example.js + 2 modules 162 bytes {0} [built]
      [exports: a, b, c]
-     single entry ./example [2] dll dll dll:0
+     single entry ./example [1] dll dll dll[0]
      | ./example.js 55 bytes [built]
      |     [exports: a, b, c]
-     |     single entry ./example [2] dll dll dll:0
+     |     single entry ./example [1] dll dll dll[0]
      | ./a.js 53 bytes [built]
      |     [exports: a, b]
      |     [all exports used]
@@ -277,6 +294,4 @@ chunk    {0} dll.js (dll) 216 bytes [entry] [rendered]
      |     [all exports used]
      |     harmony side effect evaluation ./b  ./a.js 3:0-20
      |     harmony export imported specifier ./b  ./a.js 3:0-20
- [2] dll dll 12 bytes {0} [built]
-     dll entry 
 ```
diff --git a/examples/dll-user/README.md b/examples/dll-user/README.md
index 62270471a0a..f585ef6752a 100644
--- a/examples/dll-user/README.md
+++ b/examples/dll-user/README.md
@@ -81,19 +81,34 @@ console.log(require("module"));
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -140,82 +155,82 @@ console.log(__webpack_require__(/*! module */ 8));
 /***/ }),
 /* 1 */
 /*!**************************************************************************!*\
-  !*** delegated ./alpha.js from dll-reference alpha_9acca21e0d34e518784e ***!
+  !*** delegated ./alpha.js from dll-reference alpha_d61ee01b5c383d26e2c0 ***!
   \**************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = (__webpack_require__(/*! dll-reference alpha_9acca21e0d34e518784e */ 2))(1);
+module.exports = (__webpack_require__(/*! dll-reference alpha_d61ee01b5c383d26e2c0 */ 2))(1);
 
 /***/ }),
 /* 2 */
 /*!*********************************************!*\
-  !*** external "alpha_9acca21e0d34e518784e" ***!
+  !*** external "alpha_d61ee01b5c383d26e2c0" ***!
   \*********************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-module.exports = alpha_9acca21e0d34e518784e;
+module.exports = alpha_d61ee01b5c383d26e2c0;
 
 /***/ }),
 /* 3 */
 /*!**********************************************************************!*\
-  !*** delegated ./a.js from dll-reference alpha_9acca21e0d34e518784e ***!
+  !*** delegated ./a.js from dll-reference alpha_d61ee01b5c383d26e2c0 ***!
   \**********************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = (__webpack_require__(/*! dll-reference alpha_9acca21e0d34e518784e */ 2))(2);
+module.exports = (__webpack_require__(/*! dll-reference alpha_d61ee01b5c383d26e2c0 */ 2))(2);
 
 /***/ }),
 /* 4 */
 /*!************************************************************************!*\
-  !*** delegated ./beta.js from dll-reference beta_9acca21e0d34e518784e ***!
+  !*** delegated ./beta.js from dll-reference beta_d61ee01b5c383d26e2c0 ***!
   \************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = (__webpack_require__(/*! dll-reference beta_9acca21e0d34e518784e */ 5))(5);
+module.exports = (__webpack_require__(/*! dll-reference beta_d61ee01b5c383d26e2c0 */ 5))(5);
 
 /***/ }),
 /* 5 */
 /*!********************************************!*\
-  !*** external "beta_9acca21e0d34e518784e" ***!
+  !*** external "beta_d61ee01b5c383d26e2c0" ***!
   \********************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-module.exports = beta_9acca21e0d34e518784e;
+module.exports = beta_d61ee01b5c383d26e2c0;
 
 /***/ }),
 /* 6 */
 /*!*********************************************************************!*\
-  !*** delegated ./b.js from dll-reference beta_9acca21e0d34e518784e ***!
+  !*** delegated ./b.js from dll-reference beta_d61ee01b5c383d26e2c0 ***!
   \*********************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = (__webpack_require__(/*! dll-reference beta_9acca21e0d34e518784e */ 5))(6);
+module.exports = (__webpack_require__(/*! dll-reference beta_d61ee01b5c383d26e2c0 */ 5))(6);
 
 /***/ }),
 /* 7 */
 /*!**********************************************************************!*\
-  !*** delegated ./c.jsx from dll-reference beta_9acca21e0d34e518784e ***!
+  !*** delegated ./c.jsx from dll-reference beta_d61ee01b5c383d26e2c0 ***!
   \**********************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = (__webpack_require__(/*! dll-reference beta_9acca21e0d34e518784e */ 5))(7);
+module.exports = (__webpack_require__(/*! dll-reference beta_d61ee01b5c383d26e2c0 */ 5))(7);
 
 /***/ }),
 /* 8 */
 /*!*****************************************************************************************!*\
-  !*** delegated ../node_modules/module.js from dll-reference alpha_9acca21e0d34e518784e ***!
+  !*** delegated ../node_modules/module.js from dll-reference alpha_d61ee01b5c383d26e2c0 ***!
   \*****************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = (__webpack_require__(/*! dll-reference alpha_9acca21e0d34e518784e */ 2))(3);
+module.exports = (__webpack_require__(/*! dll-reference alpha_d61ee01b5c383d26e2c0 */ 2))(3);
 
 /***/ })
 /******/ ]);
@@ -227,33 +242,33 @@ module.exports = (__webpack_require__(/*! dll-reference alpha_9acca21e0d34e51878
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
     Asset      Size  Chunks             Chunk Names
-output.js  6.19 KiB       0  [emitted]  main
+output.js  7.14 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 549 bytes [entry] [rendered]
+chunk    {0} output.js (main) 541 bytes [entry] [rendered]
     > .\example.js main
- [0] ./example.js 213 bytes {0} [built]
+ [0] ./example.js 205 bytes {0} [built]
      single entry .\example.js  main
- [1] delegated ./alpha.js from dll-reference alpha_9acca21e0d34e518784e 42 bytes {0} [built]
+ [1] delegated ./alpha.js from dll-reference alpha_d61ee01b5c383d26e2c0 42 bytes {0} [built]
      cjs require ../dll/alpha [0] ./example.js 1:12-35
- [2] external "alpha_9acca21e0d34e518784e" 42 bytes {0} [built]
-     delegated source dll-reference alpha_9acca21e0d34e518784e [1] delegated ./alpha.js from dll-reference alpha_9acca21e0d34e518784e
-     delegated source dll-reference alpha_9acca21e0d34e518784e [3] delegated ./a.js from dll-reference alpha_9acca21e0d34e518784e
-     delegated source dll-reference alpha_9acca21e0d34e518784e [8] delegated ../node_modules/module.js from dll-reference alpha_9acca21e0d34e518784e
- [3] delegated ./a.js from dll-reference alpha_9acca21e0d34e518784e 42 bytes {0} [built]
+ [2] external "alpha_d61ee01b5c383d26e2c0" 42 bytes {0} [built]
+     delegated source dll-reference alpha_d61ee01b5c383d26e2c0 [1] delegated ./alpha.js from dll-reference alpha_d61ee01b5c383d26e2c0
+     delegated source dll-reference alpha_d61ee01b5c383d26e2c0 [3] delegated ./a.js from dll-reference alpha_d61ee01b5c383d26e2c0
+     delegated source dll-reference alpha_d61ee01b5c383d26e2c0 [8] delegated ../node_modules/module.js from dll-reference alpha_d61ee01b5c383d26e2c0
+ [3] delegated ./a.js from dll-reference alpha_d61ee01b5c383d26e2c0 42 bytes {0} [built]
      cjs require ../dll/a [0] ./example.js 2:12-31
- [4] delegated ./beta.js from dll-reference beta_9acca21e0d34e518784e 42 bytes {0} [built]
+ [4] delegated ./beta.js from dll-reference beta_d61ee01b5c383d26e2c0 42 bytes {0} [built]
      cjs require beta/beta [0] ./example.js 4:12-32
- [5] external "beta_9acca21e0d34e518784e" 42 bytes {0} [built]
-     delegated source dll-reference beta_9acca21e0d34e518784e [4] delegated ./beta.js from dll-reference beta_9acca21e0d34e518784e
-     delegated source dll-reference beta_9acca21e0d34e518784e [6] delegated ./b.js from dll-reference beta_9acca21e0d34e518784e
-     delegated source dll-reference beta_9acca21e0d34e518784e [7] delegated ./c.jsx from dll-reference beta_9acca21e0d34e518784e
- [6] delegated ./b.js from dll-reference beta_9acca21e0d34e518784e 42 bytes {0} [built]
+ [5] external "beta_d61ee01b5c383d26e2c0" 42 bytes {0} [built]
+     delegated source dll-reference beta_d61ee01b5c383d26e2c0 [4] delegated ./beta.js from dll-reference beta_d61ee01b5c383d26e2c0
+     delegated source dll-reference beta_d61ee01b5c383d26e2c0 [6] delegated ./b.js from dll-reference beta_d61ee01b5c383d26e2c0
+     delegated source dll-reference beta_d61ee01b5c383d26e2c0 [7] delegated ./c.jsx from dll-reference beta_d61ee01b5c383d26e2c0
+ [6] delegated ./b.js from dll-reference beta_d61ee01b5c383d26e2c0 42 bytes {0} [built]
      cjs require beta/b [0] ./example.js 5:12-29
- [7] delegated ./c.jsx from dll-reference beta_9acca21e0d34e518784e 42 bytes {0} [built]
+ [7] delegated ./c.jsx from dll-reference beta_d61ee01b5c383d26e2c0 42 bytes {0} [built]
      cjs require beta/c [0] ./example.js 6:12-29
- [8] delegated ../node_modules/module.js from dll-reference alpha_9acca21e0d34e518784e 42 bytes {0} [built]
+ [8] delegated ../node_modules/module.js from dll-reference alpha_d61ee01b5c383d26e2c0 42 bytes {0} [built]
      cjs require module [0] ./example.js 8:12-29
 ```
 
@@ -261,32 +276,32 @@ chunk    {0} output.js (main) 549 bytes [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-    Asset       Size  Chunks             Chunk Names
-output.js  972 bytes       0  [emitted]  main
+Version: webpack 4.20.1
+    Asset      Size  Chunks             Chunk Names
+output.js  1.33 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 549 bytes [entry] [rendered]
+chunk    {0} output.js (main) 541 bytes [entry] [rendered]
     > .\example.js main
- [0] external "beta_9acca21e0d34e518784e" 42 bytes {0} [built]
-     delegated source dll-reference beta_9acca21e0d34e518784e [3] delegated ./c.jsx from dll-reference beta_9acca21e0d34e518784e
-     delegated source dll-reference beta_9acca21e0d34e518784e [4] delegated ./b.js from dll-reference beta_9acca21e0d34e518784e
-     delegated source dll-reference beta_9acca21e0d34e518784e [5] delegated ./beta.js from dll-reference beta_9acca21e0d34e518784e
- [1] external "alpha_9acca21e0d34e518784e" 42 bytes {0} [built]
-     delegated source dll-reference alpha_9acca21e0d34e518784e [2] delegated ../node_modules/module.js from dll-reference alpha_9acca21e0d34e518784e
-     delegated source dll-reference alpha_9acca21e0d34e518784e [6] delegated ./a.js from dll-reference alpha_9acca21e0d34e518784e
-     delegated source dll-reference alpha_9acca21e0d34e518784e [7] delegated ./alpha.js from dll-reference alpha_9acca21e0d34e518784e
- [2] delegated ../node_modules/module.js from dll-reference alpha_9acca21e0d34e518784e 42 bytes {0} [built]
-     cjs require module [8] ./example.js 8:12-29
- [3] delegated ./c.jsx from dll-reference beta_9acca21e0d34e518784e 42 bytes {0} [built]
-     cjs require beta/c [8] ./example.js 6:12-29
- [4] delegated ./b.js from dll-reference beta_9acca21e0d34e518784e 42 bytes {0} [built]
-     cjs require beta/b [8] ./example.js 5:12-29
- [5] delegated ./beta.js from dll-reference beta_9acca21e0d34e518784e 42 bytes {0} [built]
-     cjs require beta/beta [8] ./example.js 4:12-32
- [6] delegated ./a.js from dll-reference alpha_9acca21e0d34e518784e 42 bytes {0} [built]
-     cjs require ../dll/a [8] ./example.js 2:12-31
- [7] delegated ./alpha.js from dll-reference alpha_9acca21e0d34e518784e 42 bytes {0} [built]
-     cjs require ../dll/alpha [8] ./example.js 1:12-35
- [8] ./example.js 213 bytes {0} [built]
+ [0] external "alpha_d61ee01b5c383d26e2c0" 42 bytes {0} [built]
+     delegated source dll-reference alpha_d61ee01b5c383d26e2c0 [3] delegated ./alpha.js from dll-reference alpha_d61ee01b5c383d26e2c0
+     delegated source dll-reference alpha_d61ee01b5c383d26e2c0 [4] delegated ./a.js from dll-reference alpha_d61ee01b5c383d26e2c0
+     delegated source dll-reference alpha_d61ee01b5c383d26e2c0 [8] delegated ../node_modules/module.js from dll-reference alpha_d61ee01b5c383d26e2c0
+ [1] external "beta_d61ee01b5c383d26e2c0" 42 bytes {0} [built]
+     delegated source dll-reference beta_d61ee01b5c383d26e2c0 [5] delegated ./beta.js from dll-reference beta_d61ee01b5c383d26e2c0
+     delegated source dll-reference beta_d61ee01b5c383d26e2c0 [6] delegated ./b.js from dll-reference beta_d61ee01b5c383d26e2c0
+     delegated source dll-reference beta_d61ee01b5c383d26e2c0 [7] delegated ./c.jsx from dll-reference beta_d61ee01b5c383d26e2c0
+ [2] ./example.js 205 bytes {0} [built]
      single entry .\example.js  main
+ [3] delegated ./alpha.js from dll-reference alpha_d61ee01b5c383d26e2c0 42 bytes {0} [built]
+     cjs require ../dll/alpha [2] ./example.js 1:12-35
+ [4] delegated ./a.js from dll-reference alpha_d61ee01b5c383d26e2c0 42 bytes {0} [built]
+     cjs require ../dll/a [2] ./example.js 2:12-31
+ [5] delegated ./beta.js from dll-reference beta_d61ee01b5c383d26e2c0 42 bytes {0} [built]
+     cjs require beta/beta [2] ./example.js 4:12-32
+ [6] delegated ./b.js from dll-reference beta_d61ee01b5c383d26e2c0 42 bytes {0} [built]
+     cjs require beta/b [2] ./example.js 5:12-29
+ [7] delegated ./c.jsx from dll-reference beta_d61ee01b5c383d26e2c0 42 bytes {0} [built]
+     cjs require beta/c [2] ./example.js 6:12-29
+ [8] delegated ../node_modules/module.js from dll-reference alpha_d61ee01b5c383d26e2c0 42 bytes {0} [built]
+     cjs require module [2] ./example.js 8:12-29
 ```
diff --git a/examples/dll/README.md b/examples/dll/README.md
index 323df8ff8cf..64e8a18b209 100644
--- a/examples/dll/README.md
+++ b/examples/dll/README.md
@@ -36,7 +36,7 @@ module.exports = {
 # dist/MyDll.alpha.js
 
 ``` javascript
-var alpha_9acca21e0d34e518784e =
+var alpha_d61ee01b5c383d26e2c0 =
 ```
 <details><summary><code>/******/ (function(modules) { /* webpackBootstrap */ })</code></summary>
 
@@ -79,19 +79,34 @@ var alpha_9acca21e0d34e518784e =
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -168,7 +183,7 @@ module.exports = "module";
 # dist/alpha-manifest.json
 
 ``` javascript
-{"name":"alpha_9acca21e0d34e518784e","content":{"./alpha.js":{"id":1,"buildMeta":{"providedExports":true}},"./a.js":{"id":2,"buildMeta":{"providedExports":true}},"../node_modules/module.js":{"id":3,"buildMeta":{"providedExports":true}}}}
+{"name":"alpha_d61ee01b5c383d26e2c0","content":{"./alpha.js":{"id":1,"buildMeta":{"providedExports":true}},"./a.js":{"id":2,"buildMeta":{"providedExports":true}},"../node_modules/module.js":{"id":3,"buildMeta":{"providedExports":true}}}}
 ```
 
 # Info
@@ -177,74 +192,74 @@ module.exports = "module";
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
          Asset      Size  Chunks             Chunk Names
-MyDll.alpha.js  3.46 KiB       0  [emitted]  alpha
- MyDll.beta.js  3.43 KiB       1  [emitted]  beta
+MyDll.alpha.js  4.42 KiB       0  [emitted]  alpha
+ MyDll.beta.js   4.4 KiB       1  [emitted]  beta
 Entrypoint alpha = MyDll.alpha.js
 Entrypoint beta = MyDll.beta.js
 chunk    {0} MyDll.alpha.js (alpha) 84 bytes [entry] [rendered]
     > alpha
  [0] dll alpha 12 bytes {0} [built]
      dll entry 
-     
+      DllPlugin
  [1] ./alpha.js 25 bytes {0} [built]
-     
-     single entry ./alpha [0] dll alpha alpha:0
+     single entry ./alpha [0] dll alpha alpha[0]
+      DllPlugin
  [2] ./a.js 21 bytes {0} [built]
-     
-     single entry ./a [0] dll alpha alpha:1
+     single entry ./a [0] dll alpha alpha[1]
+      DllPlugin
      + 1 hidden module
 chunk    {1} MyDll.beta.js (beta) 80 bytes [entry] [rendered]
     > beta
  [4] dll beta 12 bytes {1} [built]
      dll entry 
-     
+      DllPlugin
  [5] ./beta.js 24 bytes {1} [built]
-     
-     single entry ./beta [4] dll beta beta:0
+     single entry ./beta [4] dll beta beta[0]
+      DllPlugin
  [6] ./b.js 21 bytes {1} [built]
-     
-     single entry ./b [4] dll beta beta:1
+     single entry ./b [4] dll beta beta[1]
+      DllPlugin
  [7] ./c.jsx 23 bytes {1} [built]
-     
-     single entry ./c [4] dll beta beta:2
+     single entry ./c [4] dll beta beta[2]
+      DllPlugin
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-         Asset       Size  Chunks             Chunk Names
- MyDll.beta.js  691 bytes       0  [emitted]  beta
-MyDll.alpha.js  700 bytes       1  [emitted]  alpha
+Version: webpack 4.20.1
+         Asset      Size  Chunks             Chunk Names
+MyDll.alpha.js  1.06 KiB       0  [emitted]  alpha
+ MyDll.beta.js  1.05 KiB       1  [emitted]  beta
 Entrypoint alpha = MyDll.alpha.js
 Entrypoint beta = MyDll.beta.js
-chunk    {0} MyDll.beta.js (beta) 80 bytes [entry] [rendered]
-    > beta
- [0] ./c.jsx 23 bytes {0} [built]
-     
-     single entry ./c [3] dll beta beta:2
- [1] ./b.js 21 bytes {0} [built]
-     
-     single entry ./b [3] dll beta beta:1
- [2] ./beta.js 24 bytes {0} [built]
-     
-     single entry ./beta [3] dll beta beta:0
- [3] dll beta 12 bytes {0} [built]
-     dll entry 
-     
-chunk    {1} MyDll.alpha.js (alpha) 84 bytes [entry] [rendered]
+chunk    {0} MyDll.alpha.js (alpha) 84 bytes [entry] [rendered]
     > alpha
- [5] ./a.js 21 bytes {1} [built]
-     
-     single entry ./a [7] dll alpha alpha:1
- [6] ./alpha.js 25 bytes {1} [built]
-     
-     single entry ./alpha [7] dll alpha alpha:0
- [7] dll alpha 12 bytes {1} [built]
+ [0] dll alpha 12 bytes {0} [built]
      dll entry 
-     
+      DllPlugin
+ [1] ./alpha.js 25 bytes {0} [built]
+     single entry ./alpha [0] dll alpha alpha[0]
+      DllPlugin
+ [2] ./a.js 21 bytes {0} [built]
+     single entry ./a [0] dll alpha alpha[1]
+      DllPlugin
      + 1 hidden module
+chunk    {1} MyDll.beta.js (beta) 80 bytes [entry] [rendered]
+    > beta
+ [4] dll beta 12 bytes {1} [built]
+     dll entry 
+      DllPlugin
+ [5] ./beta.js 24 bytes {1} [built]
+     single entry ./beta [4] dll beta beta[0]
+      DllPlugin
+ [6] ./b.js 21 bytes {1} [built]
+     single entry ./b [4] dll beta beta[1]
+      DllPlugin
+ [7] ./c.jsx 23 bytes {1} [built]
+     single entry ./c [4] dll beta beta[2]
+      DllPlugin
 ```
diff --git a/examples/explicit-vendor-chunk/README.md b/examples/explicit-vendor-chunk/README.md
index c7ce6c4be08..8a6f8c9be71 100644
--- a/examples/explicit-vendor-chunk/README.md
+++ b/examples/explicit-vendor-chunk/README.md
@@ -46,7 +46,7 @@ module.exports = [
 # dist/vendor.js
 
 ``` javascript
-var vendor_13ad3c1449410cfed1ed =
+var vendor_d9f5eab93a0e9010218f =
 ```
 <details><summary><code>/******/ (function(modules) { /* webpackBootstrap */ })</code></summary>
 
@@ -89,19 +89,34 @@ var vendor_13ad3c1449410cfed1ed =
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -205,19 +220,34 @@ module.exports = "Vendor2";
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -252,22 +282,22 @@ module.exports = "pageA";
 /***/ }),
 /* 1 */
 /*!****************************************************************************!*\
-  !*** delegated ./vendor.js from dll-reference vendor_13ad3c1449410cfed1ed ***!
+  !*** delegated ./vendor.js from dll-reference vendor_d9f5eab93a0e9010218f ***!
   \****************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = (__webpack_require__(/*! dll-reference vendor_13ad3c1449410cfed1ed */ 2))(1);
+module.exports = (__webpack_require__(/*! dll-reference vendor_d9f5eab93a0e9010218f */ 2))(1);
 
 /***/ }),
 /* 2 */
 /*!**********************************************!*\
-  !*** external "vendor_13ad3c1449410cfed1ed" ***!
+  !*** external "vendor_d9f5eab93a0e9010218f" ***!
   \**********************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-module.exports = vendor_13ad3c1449410cfed1ed;
+module.exports = vendor_d9f5eab93a0e9010218f;
 
 /***/ })
 /******/ ]);
@@ -279,49 +309,49 @@ module.exports = vendor_13ad3c1449410cfed1ed;
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
 Child vendor:
     Hash: 0a1b2c3d4e5f6a7b8c9d
-        Asset      Size  Chunks             Chunk Names
-    vendor.js  3.24 KiB       0  [emitted]  main
+        Asset     Size  Chunks             Chunk Names
+    vendor.js  4.2 KiB       0  [emitted]  main
     Entrypoint main = vendor.js
     chunk    {0} vendor.js (main) 65 bytes [entry] [rendered]
         > main
      [0] dll main 12 bytes {0} [built]
          dll entry 
-         
+          DllPlugin
      [1] ./vendor.js 26 bytes {0} [built]
-         
-         single entry ./vendor [0] dll main main:0
+         single entry ./vendor [0] dll main main[0]
+          DllPlugin
      [2] ./vendor2.js 27 bytes {0} [built]
-         
-         single entry ./vendor2 [0] dll main main:1
+         single entry ./vendor2 [0] dll main main[1]
+          DllPlugin
 Child app:
     Hash: 0a1b2c3d4e5f6a7b8c9d
        Asset      Size  Chunks             Chunk Names
-    pageA.js  3.53 KiB       0  [emitted]  pageA
-    pageB.js  3.55 KiB       1  [emitted]  pageB
-    pageC.js  2.74 KiB       2  [emitted]  pageC
+    pageA.js  4.49 KiB       0  [emitted]  pageA
+    pageB.js  4.51 KiB       1  [emitted]  pageB
+    pageC.js  3.71 KiB       2  [emitted]  pageC
     Entrypoint pageA = pageA.js
     Entrypoint pageB = pageB.js
     Entrypoint pageC = pageC.js
-    chunk    {0} pageA.js (pageA) 144 bytes [entry] [rendered]
+    chunk    {0} pageA.js (pageA) 143 bytes [entry] [rendered]
         > ./pageA pageA
-     [0] ./pageA.js 60 bytes {0} [built]
+     [0] ./pageA.js 59 bytes {0} [built]
          single entry ./pageA  pageA
-     [1] delegated ./vendor.js from dll-reference vendor_13ad3c1449410cfed1ed 42 bytes {0} [built]
+     [1] delegated ./vendor.js from dll-reference vendor_d9f5eab93a0e9010218f 42 bytes {0} [built]
          cjs require ./vendor [0] ./pageA.js 1:12-31
-     [2] external "vendor_13ad3c1449410cfed1ed" 42 bytes {0} {1} [built]
-         delegated source dll-reference vendor_13ad3c1449410cfed1ed [1] delegated ./vendor.js from dll-reference vendor_13ad3c1449410cfed1ed
-         delegated source dll-reference vendor_13ad3c1449410cfed1ed [4] delegated ./vendor2.js from dll-reference vendor_13ad3c1449410cfed1ed
-    chunk    {1} pageB.js (pageB) 145 bytes [entry] [rendered]
+     [2] external "vendor_d9f5eab93a0e9010218f" 42 bytes {0} {1} [built]
+         delegated source dll-reference vendor_d9f5eab93a0e9010218f [1] delegated ./vendor.js from dll-reference vendor_d9f5eab93a0e9010218f
+         delegated source dll-reference vendor_d9f5eab93a0e9010218f [4] delegated ./vendor2.js from dll-reference vendor_d9f5eab93a0e9010218f
+    chunk    {1} pageB.js (pageB) 144 bytes [entry] [rendered]
         > ./pageB pageB
-     [2] external "vendor_13ad3c1449410cfed1ed" 42 bytes {0} {1} [built]
-         delegated source dll-reference vendor_13ad3c1449410cfed1ed [1] delegated ./vendor.js from dll-reference vendor_13ad3c1449410cfed1ed
-         delegated source dll-reference vendor_13ad3c1449410cfed1ed [4] delegated ./vendor2.js from dll-reference vendor_13ad3c1449410cfed1ed
-     [3] ./pageB.js 61 bytes {1} [built]
+     [2] external "vendor_d9f5eab93a0e9010218f" 42 bytes {0} {1} [built]
+         delegated source dll-reference vendor_d9f5eab93a0e9010218f [1] delegated ./vendor.js from dll-reference vendor_d9f5eab93a0e9010218f
+         delegated source dll-reference vendor_d9f5eab93a0e9010218f [4] delegated ./vendor2.js from dll-reference vendor_d9f5eab93a0e9010218f
+     [3] ./pageB.js 60 bytes {1} [built]
          single entry ./pageB  pageB
-     [4] delegated ./vendor2.js from dll-reference vendor_13ad3c1449410cfed1ed 42 bytes {1} [built]
+     [4] delegated ./vendor2.js from dll-reference vendor_d9f5eab93a0e9010218f 42 bytes {1} [built]
          cjs require ./vendor2 [3] ./pageB.js 1:12-32
     chunk    {2} pageC.js (pageC) 25 bytes [entry] [rendered]
         > ./pageC pageC
@@ -333,52 +363,52 @@ Child app:
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
 Child vendor:
     Hash: 0a1b2c3d4e5f6a7b8c9d
-        Asset       Size  Chunks             Chunk Names
-    vendor.js  670 bytes       0  [emitted]  main
+        Asset      Size  Chunks             Chunk Names
+    vendor.js  1.03 KiB       0  [emitted]  main
     Entrypoint main = vendor.js
     chunk    {0} vendor.js (main) 65 bytes [entry] [rendered]
         > main
-     [0] ./vendor2.js 27 bytes {0} [built]
-         
-         single entry ./vendor2 [2] dll main main:1
-     [1] ./vendor.js 26 bytes {0} [built]
-         
-         single entry ./vendor [2] dll main main:0
-     [2] dll main 12 bytes {0} [built]
+     [0] dll main 12 bytes {0} [built]
          dll entry 
-         
+          DllPlugin
+     [1] ./vendor.js 26 bytes {0} [built]
+         single entry ./vendor [0] dll main main[0]
+          DllPlugin
+     [2] ./vendor2.js 27 bytes {0} [built]
+         single entry ./vendor2 [0] dll main main[1]
+          DllPlugin
 Child app:
     Hash: 0a1b2c3d4e5f6a7b8c9d
        Asset       Size  Chunks             Chunk Names
-    pageC.js  568 bytes       0  [emitted]  pageC
-    pageB.js  676 bytes       1  [emitted]  pageB
-    pageA.js  678 bytes       2  [emitted]  pageA
+    pageA.js   1.04 KiB       0  [emitted]  pageA
+    pageB.js   1.04 KiB       1  [emitted]  pageB
+    pageC.js  954 bytes       2  [emitted]  pageC
     Entrypoint pageA = pageA.js
     Entrypoint pageB = pageB.js
     Entrypoint pageC = pageC.js
-    chunk    {0} pageC.js (pageC) 25 bytes [entry] [rendered]
-        > ./pageC pageC
-     [1] ./pageC.js 25 bytes {0} [built]
-         single entry ./pageC  pageC
-    chunk    {1} pageB.js (pageB) 145 bytes [entry] [rendered]
-        > ./pageB pageB
-     [0] external "vendor_33c22a944ddd30a49a4f" 42 bytes {1} {2} [built]
-         delegated source dll-reference vendor_33c22a944ddd30a49a4f [2] delegated ./vendor2.js from dll-reference vendor_33c22a944ddd30a49a4f
-         delegated source dll-reference vendor_33c22a944ddd30a49a4f [4] delegated ./vendor.js from dll-reference vendor_33c22a944ddd30a49a4f
-     [2] delegated ./vendor2.js from dll-reference vendor_33c22a944ddd30a49a4f 42 bytes {1} [built]
-         cjs require ./vendor2 [3] ./pageB.js 1:12-32
-     [3] ./pageB.js 61 bytes {1} [built]
-         single entry ./pageB  pageB
-    chunk    {2} pageA.js (pageA) 144 bytes [entry] [rendered]
+    chunk    {0} pageA.js (pageA) 143 bytes [entry] [rendered]
         > ./pageA pageA
-     [0] external "vendor_33c22a944ddd30a49a4f" 42 bytes {1} {2} [built]
-         delegated source dll-reference vendor_33c22a944ddd30a49a4f [2] delegated ./vendor2.js from dll-reference vendor_33c22a944ddd30a49a4f
-         delegated source dll-reference vendor_33c22a944ddd30a49a4f [4] delegated ./vendor.js from dll-reference vendor_33c22a944ddd30a49a4f
-     [4] delegated ./vendor.js from dll-reference vendor_33c22a944ddd30a49a4f 42 bytes {2} [built]
-         cjs require ./vendor [5] ./pageA.js 1:12-31
-     [5] ./pageA.js 60 bytes {2} [built]
+     [0] external "vendor_d9f5eab93a0e9010218f" 42 bytes {0} {1} [built]
+         delegated source dll-reference vendor_d9f5eab93a0e9010218f [2] delegated ./vendor.js from dll-reference vendor_d9f5eab93a0e9010218f
+         delegated source dll-reference vendor_d9f5eab93a0e9010218f [4] delegated ./vendor2.js from dll-reference vendor_d9f5eab93a0e9010218f
+     [1] ./pageA.js 59 bytes {0} [built]
          single entry ./pageA  pageA
+     [2] delegated ./vendor.js from dll-reference vendor_d9f5eab93a0e9010218f 42 bytes {0} [built]
+         cjs require ./vendor [1] ./pageA.js 1:12-31
+    chunk    {1} pageB.js (pageB) 144 bytes [entry] [rendered]
+        > ./pageB pageB
+     [0] external "vendor_d9f5eab93a0e9010218f" 42 bytes {0} {1} [built]
+         delegated source dll-reference vendor_d9f5eab93a0e9010218f [2] delegated ./vendor.js from dll-reference vendor_d9f5eab93a0e9010218f
+         delegated source dll-reference vendor_d9f5eab93a0e9010218f [4] delegated ./vendor2.js from dll-reference vendor_d9f5eab93a0e9010218f
+     [3] ./pageB.js 60 bytes {1} [built]
+         single entry ./pageB  pageB
+     [4] delegated ./vendor2.js from dll-reference vendor_d9f5eab93a0e9010218f 42 bytes {1} [built]
+         cjs require ./vendor2 [3] ./pageB.js 1:12-32
+    chunk    {2} pageC.js (pageC) 25 bytes [entry] [rendered]
+        > ./pageC pageC
+     [5] ./pageC.js 25 bytes {2} [built]
+         single entry ./pageC  pageC
 ```
diff --git a/examples/externals/README.md b/examples/externals/README.md
index e152f488929..de9e0eceac2 100644
--- a/examples/externals/README.md
+++ b/examples/externals/README.md
@@ -101,19 +101,34 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -183,13 +198,13 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__2__;
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
     Asset      Size  Chunks             Chunk Names
-output.js  4.17 KiB       0  [emitted]  main
+output.js  5.13 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 197 bytes [entry] [rendered]
+chunk    {0} output.js (main) 194 bytes [entry] [rendered]
     > .\example.js main
- [0] ./example.js 113 bytes {0} [built]
+ [0] ./example.js 110 bytes {0} [built]
      single entry .\example.js  main
  [1] external "add" 42 bytes {0} [built]
      cjs require add [0] ./example.js 1:10-24
@@ -201,16 +216,16 @@ chunk    {0} output.js (main) 197 bytes [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-    Asset      Size  Chunks             Chunk Names
-output.js  1.02 KiB       0  [emitted]  main
+Version: webpack 4.20.1
+    Asset     Size  Chunks             Chunk Names
+output.js  1.4 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 197 bytes [entry] [rendered]
+chunk    {0} output.js (main) 194 bytes [entry] [rendered]
     > .\example.js main
- [0] external {"root":"subtract","commonjs2":"./subtract","commonjs":["./math","subtract"],"amd":"subtract"} 42 bytes {0} [built]
-     cjs require subtract [2] ./example.js 2:15-34
- [1] external "add" 42 bytes {0} [built]
-     cjs require add [2] ./example.js 1:10-24
- [2] ./example.js 113 bytes {0} [built]
+ [0] ./example.js 110 bytes {0} [built]
      single entry .\example.js  main
+ [1] external "add" 42 bytes {0} [built]
+     cjs require add [0] ./example.js 1:10-24
+ [2] external {"root":"subtract","commonjs2":"./subtract","commonjs":["./math","subtract"],"amd":"subtract"} 42 bytes {0} [built]
+     cjs require subtract [0] ./example.js 2:15-34
 ```
\ No newline at end of file
diff --git a/examples/extra-async-chunk-advanced/README.md b/examples/extra-async-chunk-advanced/README.md
index 61e33f15408..31c5be2c181 100644
--- a/examples/extra-async-chunk-advanced/README.md
+++ b/examples/extra-async-chunk-advanced/README.md
@@ -46,6 +46,7 @@ module.exports = {
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -62,6 +63,7 @@ module.exports = {
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -76,7 +78,7 @@ module.exports = {
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		7: 0
+/******/ 		2: 0
 /******/ 	};
 /******/
 /******/
@@ -134,19 +136,16 @@ module.exports = {
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -163,6 +162,10 @@ module.exports = {
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -178,19 +181,34 @@ module.exports = {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -235,20 +253,20 @@ module.exports = {
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-Promise.all(/*! AMD require */[__webpack_require__.e(1), __webpack_require__.e(0), __webpack_require__.e(4)]).then(function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = [__webpack_require__(/*! ./a */ 1), __webpack_require__(/*! ./b */ 0), __webpack_require__(/*! ./c */ 7)]; (function(a, b, c) {}).apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);}).catch(__webpack_require__.oe);
+Promise.all(/*! AMD require */[__webpack_require__.e(0), __webpack_require__.e(1), __webpack_require__.e(3)]).then(function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = [__webpack_require__(/*! ./a */ 0), __webpack_require__(/*! ./b */ 1), __webpack_require__(/*! ./c */ 3)]; (function(a, b, c) {}).apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);}).catch(__webpack_require__.oe);
 
-Promise.all(/*! require.ensure */[__webpack_require__.e(1), __webpack_require__.e(0), __webpack_require__.e(3)]).then((function(require) {
-	__webpack_require__(/*! ./b */ 0);
-	__webpack_require__(/*! ./d */ 6);
+Promise.all(/*! require.ensure */[__webpack_require__.e(0), __webpack_require__.e(1), __webpack_require__.e(4)]).then((function(require) {
+	__webpack_require__(/*! ./b */ 1);
+	__webpack_require__(/*! ./d */ 4);
 }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 
-Promise.all(/*! require.ensure */[__webpack_require__.e(0), __webpack_require__.e(2)]).then((function(require) {
-	__webpack_require__(/*! ./a */ 1);
-	Promise.all(/*! require.ensure */[__webpack_require__.e(1), __webpack_require__.e(6)]).then((function(require) {
-		__webpack_require__(/*! ./f */ 4);
+Promise.all(/*! require.ensure */[__webpack_require__.e(1), __webpack_require__.e(5)]).then((function(require) {
+	__webpack_require__(/*! ./a */ 0);
+	Promise.all(/*! require.ensure */[__webpack_require__.e(0), __webpack_require__.e(6)]).then((function(require) {
+		__webpack_require__(/*! ./f */ 6);
 	}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
-	Promise.all(/*! require.ensure */[__webpack_require__.e(1), __webpack_require__.e(5)]).then((function(require) {
-		__webpack_require__(/*! ./g */ 3);
+	Promise.all(/*! require.ensure */[__webpack_require__.e(0), __webpack_require__.e(7)]).then((function(require) {
+		__webpack_require__(/*! ./g */ 7);
 	}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 
@@ -264,118 +282,118 @@ Promise.all(/*! require.ensure */[__webpack_require__.e(0), __webpack_require__.
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
 0.output.js  247 bytes       0  [emitted]  
 1.output.js  238 bytes       1  [emitted]  
-2.output.js  241 bytes       2  [emitted]  
+  output.js   9.34 KiB       2  [emitted]  main
 3.output.js  241 bytes       3  [emitted]  
 4.output.js  241 bytes       4  [emitted]  
 5.output.js  241 bytes       5  [emitted]  
 6.output.js  241 bytes       6  [emitted]  
-  output.js   8.34 KiB       7  [emitted]  main
+7.output.js  241 bytes       7  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 21 bytes <{7}> ={1}= ={2}= ={3}= ={4}= >{1}< >{5}< >{6}< [rendered] split chunk (cache group: default)
-    > ./a ./b ./c [2] ./example.js 1:0-52
-    > [2] ./example.js 3:0-6:2
-    > [2] ./example.js 8:0-16:2
- [1] ./a.js 21 bytes {0} [built]
-     amd require ./a [2] ./example.js 1:0-52
-     require.ensure item ./a [2] ./example.js 3:0-6:2
-     require.ensure item ./a [2] ./example.js 8:0-16:2
-     cjs require ./a [2] ./example.js 9:1-15
-chunk    {1} 1.output.js 21 bytes <{0}> <{2}> <{7}> ={0}= ={3}= ={4}= ={5}= ={6}= [rendered] split chunk (cache group: default)
+chunk    {0} 0.output.js 21 bytes <{1}> <{2}> <{5}> ={1}= ={3}= ={4}= ={6}= ={7}= [rendered] split chunk (cache group: default)
     > [2] ./example.js 10:1-12:3
     > [2] ./example.js 13:1-15:3
     > ./a ./b ./c [2] ./example.js 1:0-52
     > [2] ./example.js 3:0-6:2
- [0] ./b.js 21 bytes {1} [built]
+ [1] ./b.js 21 bytes {0} [built]
      amd require ./b [2] ./example.js 1:0-52
      cjs require ./b [2] ./example.js 4:1-15
      require.ensure item ./b [2] ./example.js 10:1-12:3
      require.ensure item ./b [2] ./example.js 13:1-15:3
-chunk    {2} 2.output.js 21 bytes <{7}> ={0}= >{1}< >{5}< >{6}< [rendered]
-    > [2] ./example.js 8:0-16:2
- [5] ./e.js 21 bytes {2} [built]
-     require.ensure item ./e [2] ./example.js 8:0-16:2
-chunk    {3} 3.output.js 21 bytes <{7}> ={0}= ={1}= [rendered]
+chunk    {1} 1.output.js 21 bytes <{2}> ={0}= ={3}= ={4}= ={5}= >{0}< >{6}< >{7}< [rendered] split chunk (cache group: default)
+    > ./a ./b ./c [2] ./example.js 1:0-52
     > [2] ./example.js 3:0-6:2
- [6] ./d.js 21 bytes {3} [built]
-     cjs require ./d [2] ./example.js 5:1-15
-chunk    {4} 4.output.js 21 bytes <{7}> ={0}= ={1}= [rendered]
+    > [2] ./example.js 8:0-16:2
+ [0] ./a.js 21 bytes {1} [built]
+     amd require ./a [2] ./example.js 1:0-52
+     require.ensure item ./a [2] ./example.js 3:0-6:2
+     require.ensure item ./a [2] ./example.js 8:0-16:2
+     cjs require ./a [2] ./example.js 9:1-15
+chunk    {2} output.js (main) 346 bytes >{0}< >{1}< >{3}< >{4}< >{5}< [entry] [rendered]
+    > .\example.js main
+ [2] ./example.js 346 bytes {2} [built]
+     single entry .\example.js  main
+chunk    {3} 3.output.js 21 bytes <{2}> ={0}= ={1}= [rendered]
     > ./a ./b ./c [2] ./example.js 1:0-52
- [7] ./c.js 21 bytes {4} [built]
+ [3] ./c.js 21 bytes {3} [built]
      amd require ./c [2] ./example.js 1:0-52
-chunk    {5} 5.output.js 21 bytes <{0}> <{2}> ={1}= [rendered]
-    > [2] ./example.js 13:1-15:3
- [3] ./g.js 21 bytes {5} [built]
-     cjs require ./g [2] ./example.js 14:2-16
-chunk    {6} 6.output.js 21 bytes <{0}> <{2}> ={1}= [rendered]
+chunk    {4} 4.output.js 21 bytes <{2}> ={0}= ={1}= [rendered]
+    > [2] ./example.js 3:0-6:2
+ [4] ./d.js 21 bytes {4} [built]
+     cjs require ./d [2] ./example.js 5:1-15
+chunk    {5} 5.output.js 21 bytes <{2}> ={1}= >{0}< >{6}< >{7}< [rendered]
+    > [2] ./example.js 8:0-16:2
+ [5] ./e.js 21 bytes {5} [built]
+     require.ensure item ./e [2] ./example.js 8:0-16:2
+chunk    {6} 6.output.js 21 bytes <{1}> <{5}> ={0}= [rendered]
     > [2] ./example.js 10:1-12:3
- [4] ./f.js 21 bytes {6} [built]
+ [6] ./f.js 21 bytes {6} [built]
      cjs require ./f [2] ./example.js 11:2-16
-chunk    {7} output.js (main) 362 bytes >{0}< >{1}< >{2}< >{3}< >{4}< [entry] [rendered]
-    > .\example.js main
- [2] ./example.js 362 bytes {7} [built]
-     single entry .\example.js  main
+chunk    {7} 7.output.js 21 bytes <{1}> <{5}> ={0}= [rendered]
+    > [2] ./example.js 13:1-15:3
+ [7] ./g.js 21 bytes {7} [built]
+     cjs require ./g [2] ./example.js 14:2-16
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset      Size  Chunks             Chunk Names
 0.output.js  90 bytes       0  [emitted]  
 1.output.js  89 bytes       1  [emitted]  
-2.output.js  91 bytes       2  [emitted]  
+  output.js  2.42 KiB       2  [emitted]  main
 3.output.js  91 bytes       3  [emitted]  
 4.output.js  91 bytes       4  [emitted]  
 5.output.js  91 bytes       5  [emitted]  
 6.output.js  91 bytes       6  [emitted]  
-  output.js  2.04 KiB       7  [emitted]  main
+7.output.js  91 bytes       7  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 21 bytes <{7}> ={1}= ={2}= ={3}= ={4}= >{1}< >{5}< >{6}< [rendered] split chunk (cache group: default)
-    > ./a ./b ./c [2] ./example.js 1:0-52
-    > [2] ./example.js 3:0-6:2
-    > [2] ./example.js 8:0-16:2
- [1] ./a.js 21 bytes {0} [built]
-     amd require ./a [2] ./example.js 1:0-52
-     require.ensure item ./a [2] ./example.js 3:0-6:2
-     require.ensure item ./a [2] ./example.js 8:0-16:2
-     cjs require ./a [2] ./example.js 9:1-15
-chunk    {1} 1.output.js 21 bytes <{0}> <{2}> <{7}> ={0}= ={3}= ={4}= ={5}= ={6}= [rendered] split chunk (cache group: default)
+chunk    {0} 0.output.js 21 bytes <{1}> <{2}> <{5}> ={1}= ={3}= ={4}= ={6}= ={7}= [rendered] split chunk (cache group: default)
     > [2] ./example.js 10:1-12:3
     > [2] ./example.js 13:1-15:3
     > ./a ./b ./c [2] ./example.js 1:0-52
     > [2] ./example.js 3:0-6:2
- [0] ./b.js 21 bytes {1} [built]
+ [1] ./b.js 21 bytes {0} [built]
      amd require ./b [2] ./example.js 1:0-52
      cjs require ./b [2] ./example.js 4:1-15
      require.ensure item ./b [2] ./example.js 10:1-12:3
      require.ensure item ./b [2] ./example.js 13:1-15:3
-chunk    {2} 2.output.js 21 bytes <{7}> ={0}= >{1}< >{5}< >{6}< [rendered]
-    > [2] ./example.js 8:0-16:2
- [5] ./e.js 21 bytes {2} [built]
-     require.ensure item ./e [2] ./example.js 8:0-16:2
-chunk    {3} 3.output.js 21 bytes <{7}> ={0}= ={1}= [rendered]
+chunk    {1} 1.output.js 21 bytes <{2}> ={0}= ={3}= ={4}= ={5}= >{0}< >{6}< >{7}< [rendered] split chunk (cache group: default)
+    > ./a ./b ./c [2] ./example.js 1:0-52
     > [2] ./example.js 3:0-6:2
- [6] ./d.js 21 bytes {3} [built]
-     cjs require ./d [2] ./example.js 5:1-15
-chunk    {4} 4.output.js 21 bytes <{7}> ={0}= ={1}= [rendered]
+    > [2] ./example.js 8:0-16:2
+ [0] ./a.js 21 bytes {1} [built]
+     amd require ./a [2] ./example.js 1:0-52
+     require.ensure item ./a [2] ./example.js 3:0-6:2
+     require.ensure item ./a [2] ./example.js 8:0-16:2
+     cjs require ./a [2] ./example.js 9:1-15
+chunk    {2} output.js (main) 346 bytes >{0}< >{1}< >{3}< >{4}< >{5}< [entry] [rendered]
+    > .\example.js main
+ [2] ./example.js 346 bytes {2} [built]
+     single entry .\example.js  main
+chunk    {3} 3.output.js 21 bytes <{2}> ={0}= ={1}= [rendered]
     > ./a ./b ./c [2] ./example.js 1:0-52
- [7] ./c.js 21 bytes {4} [built]
+ [3] ./c.js 21 bytes {3} [built]
      amd require ./c [2] ./example.js 1:0-52
-chunk    {5} 5.output.js 21 bytes <{0}> <{2}> ={1}= [rendered]
-    > [2] ./example.js 13:1-15:3
- [3] ./g.js 21 bytes {5} [built]
-     cjs require ./g [2] ./example.js 14:2-16
-chunk    {6} 6.output.js 21 bytes <{0}> <{2}> ={1}= [rendered]
+chunk    {4} 4.output.js 21 bytes <{2}> ={0}= ={1}= [rendered]
+    > [2] ./example.js 3:0-6:2
+ [4] ./d.js 21 bytes {4} [built]
+     cjs require ./d [2] ./example.js 5:1-15
+chunk    {5} 5.output.js 21 bytes <{2}> ={1}= >{0}< >{6}< >{7}< [rendered]
+    > [2] ./example.js 8:0-16:2
+ [5] ./e.js 21 bytes {5} [built]
+     require.ensure item ./e [2] ./example.js 8:0-16:2
+chunk    {6} 6.output.js 21 bytes <{1}> <{5}> ={0}= [rendered]
     > [2] ./example.js 10:1-12:3
- [4] ./f.js 21 bytes {6} [built]
+ [6] ./f.js 21 bytes {6} [built]
      cjs require ./f [2] ./example.js 11:2-16
-chunk    {7} output.js (main) 362 bytes >{0}< >{1}< >{2}< >{3}< >{4}< [entry] [rendered]
-    > .\example.js main
- [2] ./example.js 362 bytes {7} [built]
-     single entry .\example.js  main
+chunk    {7} 7.output.js 21 bytes <{1}> <{5}> ={0}= [rendered]
+    > [2] ./example.js 13:1-15:3
+ [7] ./g.js 21 bytes {7} [built]
+     cjs require ./g [2] ./example.js 14:2-16
 ```
diff --git a/examples/extra-async-chunk/README.md b/examples/extra-async-chunk/README.md
index 6c4bf29e7d8..ea36c4b2c26 100644
--- a/examples/extra-async-chunk/README.md
+++ b/examples/extra-async-chunk/README.md
@@ -56,6 +56,7 @@ require.ensure(["./a"], function(require) {
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -72,6 +73,7 @@ require.ensure(["./a"], function(require) {
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -86,7 +88,7 @@ require.ensure(["./a"], function(require) {
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		3: 0
+/******/ 		1: 0
 /******/ 	};
 /******/
 /******/
@@ -144,19 +146,16 @@ require.ensure(["./a"], function(require) {
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -173,6 +172,10 @@ require.ensure(["./a"], function(require) {
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -188,19 +191,34 @@ require.ensure(["./a"], function(require) {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -246,12 +264,12 @@ require.ensure(["./a"], function(require) {
 /***/ (function(module, exports, __webpack_require__) {
 
 // a chunks with a, b, c
-Promise.all(/*! AMD require */[__webpack_require__.e(0), __webpack_require__.e(2)]).then(function() {[__webpack_require__(/*! ./a */ 1), __webpack_require__(/*! ./b */ 0), __webpack_require__(/*! ./c */ 4)];}).catch(__webpack_require__.oe);
+Promise.all(/*! AMD require */[__webpack_require__.e(0), __webpack_require__.e(2)]).then(function() {[__webpack_require__(/*! ./a */ 0), __webpack_require__(/*! ./b */ 1), __webpack_require__(/*! ./c */ 3)];}).catch(__webpack_require__.oe);
 
 // a chunk with a, b, d
-Promise.all(/*! require.ensure */[__webpack_require__.e(0), __webpack_require__.e(1)]).then((function(require) {
-	__webpack_require__(/*! ./b */ 0);
-	__webpack_require__(/*! ./d */ 3);
+Promise.all(/*! require.ensure */[__webpack_require__.e(0), __webpack_require__.e(3)]).then((function(require) {
+	__webpack_require__(/*! ./b */ 1);
+	__webpack_require__(/*! ./d */ 4);
 }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 
 
@@ -266,59 +284,59 @@ Promise.all(/*! require.ensure */[__webpack_require__.e(0), __webpack_require__.
 (window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
 /* 0 */
 /*!**************!*\
-  !*** ./b.js ***!
+  !*** ./a.js ***!
   \**************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-module.exports = "b";
+module.exports = "a";
 
 /***/ }),
 /* 1 */
 /*!**************!*\
-  !*** ./a.js ***!
+  !*** ./b.js ***!
   \**************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-module.exports = "a";
+module.exports = "b";
 
 /***/ })
 ]]);
 ```
 
-# dist/1.output.js
+# dist/2.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],{
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[2],{
 
 /***/ 3:
 /*!**************!*\
-  !*** ./d.js ***!
+  !*** ./c.js ***!
   \**************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-module.exports = "d";
+module.exports = "c";
 
 /***/ })
 
 }]);
 ```
 
-# dist/2.output.js
+# dist/3.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[2],{
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[3],{
 
 /***/ 4:
 /*!**************!*\
-  !*** ./c.js ***!
+  !*** ./d.js ***!
   \**************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-module.exports = "c";
+module.exports = "d";
 
 /***/ })
 
@@ -331,66 +349,66 @@ module.exports = "c";
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
 0.output.js  405 bytes       0  [emitted]  
-1.output.js  241 bytes       1  [emitted]  
+  output.js   8.59 KiB       1  [emitted]  main
 2.output.js  241 bytes       2  [emitted]  
-  output.js   7.58 KiB       3  [emitted]  main
+3.output.js  241 bytes       3  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 42 bytes <{3}> ={1}= ={2}= [rendered] split chunk (cache group: default)
+chunk    {0} 0.output.js 42 bytes <{1}> ={2}= ={3}= [rendered] split chunk (cache group: default)
     > ./a ./b ./c [2] ./example.js 2:0-30
     > [2] ./example.js 5:0-8:2
- [0] ./b.js 21 bytes {0} [built]
-     amd require ./b [2] ./example.js 2:0-30
-     cjs require ./b [2] ./example.js 6:1-15
- [1] ./a.js 21 bytes {0} [built]
+ [0] ./a.js 21 bytes {0} [built]
      amd require ./a [2] ./example.js 2:0-30
      require.ensure item ./a [2] ./example.js 5:0-8:2
-chunk    {1} 1.output.js 21 bytes <{3}> ={0}= [rendered]
-    > [2] ./example.js 5:0-8:2
- [3] ./d.js 21 bytes {1} [built]
-     cjs require ./d [2] ./example.js 7:1-15
-chunk    {2} 2.output.js 21 bytes <{3}> ={0}= [rendered]
-    > ./a ./b ./c [2] ./example.js 2:0-30
- [4] ./c.js 21 bytes {2} [built]
-     amd require ./c [2] ./example.js 2:0-30
-chunk    {3} output.js (main) 164 bytes >{0}< >{1}< >{2}< [entry] [rendered]
+ [1] ./b.js 21 bytes {0} [built]
+     amd require ./b [2] ./example.js 2:0-30
+     cjs require ./b [2] ./example.js 6:1-15
+chunk    {1} output.js (main) 164 bytes >{0}< >{2}< >{3}< [entry] [rendered]
     > .\example.js main
- [2] ./example.js 164 bytes {3} [built]
+ [2] ./example.js 164 bytes {1} [built]
      single entry .\example.js  main
+chunk    {2} 2.output.js 21 bytes <{1}> ={0}= [rendered]
+    > ./a ./b ./c [2] ./example.js 2:0-30
+ [3] ./c.js 21 bytes {2} [built]
+     amd require ./c [2] ./example.js 2:0-30
+chunk    {3} 3.output.js 21 bytes <{1}> ={0}= [rendered]
+    > [2] ./example.js 5:0-8:2
+ [4] ./d.js 21 bytes {3} [built]
+     cjs require ./d [2] ./example.js 7:1-15
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
 0.output.js  118 bytes       0  [emitted]  
-1.output.js   91 bytes       1  [emitted]  
+  output.js   2.13 KiB       1  [emitted]  main
 2.output.js   91 bytes       2  [emitted]  
-  output.js   1.75 KiB       3  [emitted]  main
+3.output.js   91 bytes       3  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 42 bytes <{3}> ={1}= ={2}= [rendered] split chunk (cache group: default)
+chunk    {0} 0.output.js 42 bytes <{1}> ={2}= ={3}= [rendered] split chunk (cache group: default)
     > ./a ./b ./c [2] ./example.js 2:0-30
     > [2] ./example.js 5:0-8:2
- [0] ./b.js 21 bytes {0} [built]
-     amd require ./b [2] ./example.js 2:0-30
-     cjs require ./b [2] ./example.js 6:1-15
- [1] ./a.js 21 bytes {0} [built]
+ [0] ./a.js 21 bytes {0} [built]
      amd require ./a [2] ./example.js 2:0-30
      require.ensure item ./a [2] ./example.js 5:0-8:2
-chunk    {1} 1.output.js 21 bytes <{3}> ={0}= [rendered]
-    > [2] ./example.js 5:0-8:2
- [3] ./d.js 21 bytes {1} [built]
-     cjs require ./d [2] ./example.js 7:1-15
-chunk    {2} 2.output.js 21 bytes <{3}> ={0}= [rendered]
-    > ./a ./b ./c [2] ./example.js 2:0-30
- [4] ./c.js 21 bytes {2} [built]
-     amd require ./c [2] ./example.js 2:0-30
-chunk    {3} output.js (main) 164 bytes >{0}< >{1}< >{2}< [entry] [rendered]
+ [1] ./b.js 21 bytes {0} [built]
+     amd require ./b [2] ./example.js 2:0-30
+     cjs require ./b [2] ./example.js 6:1-15
+chunk    {1} output.js (main) 164 bytes >{0}< >{2}< >{3}< [entry] [rendered]
     > .\example.js main
- [2] ./example.js 164 bytes {3} [built]
+ [2] ./example.js 164 bytes {1} [built]
      single entry .\example.js  main
+chunk    {2} 2.output.js 21 bytes <{1}> ={0}= [rendered]
+    > ./a ./b ./c [2] ./example.js 2:0-30
+ [3] ./c.js 21 bytes {2} [built]
+     amd require ./c [2] ./example.js 2:0-30
+chunk    {3} 3.output.js 21 bytes <{1}> ={0}= [rendered]
+    > [2] ./example.js 5:0-8:2
+ [4] ./d.js 21 bytes {3} [built]
+     cjs require ./d [2] ./example.js 7:1-15
 ```
diff --git a/examples/extra-async-chunk/template.md b/examples/extra-async-chunk/template.md
index 3e60643c088..7c614404cf6 100644
--- a/examples/extra-async-chunk/template.md
+++ b/examples/extra-async-chunk/template.md
@@ -50,16 +50,16 @@ Pretty useful for a router in a SPA.
 {{dist/0.output.js}}
 ```
 
-# dist/1.output.js
+# dist/2.output.js
 
 ``` javascript
-{{dist/1.output.js}}
+{{dist/2.output.js}}
 ```
 
-# dist/2.output.js
+# dist/3.output.js
 
 ``` javascript
-{{dist/2.output.js}}
+{{dist/3.output.js}}
 ```
 
 # Info
diff --git a/examples/harmony-interop/README.md b/examples/harmony-interop/README.md
index 8b8bd04f84c..15bba3e47e7 100644
--- a/examples/harmony-interop/README.md
+++ b/examples/harmony-interop/README.md
@@ -107,19 +107,34 @@ export var named = "named";
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -260,13 +275,13 @@ var named = "named";
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
     Asset      Size  Chunks             Chunk Names
-output.js  6.12 KiB       0  [emitted]  main
+output.js  7.05 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 1.16 KiB [entry] [rendered]
+chunk    {0} output.js (main) 1.13 KiB [entry] [rendered]
     > .\example.js main
- [0] ./example.js 389 bytes {0} [built]
+ [0] ./example.js 373 bytes {0} [built]
      [no exports]
      single entry .\example.js  main
  [1] ./fs.js 257 bytes {0} [built]
@@ -278,12 +293,12 @@ chunk    {0} output.js (main) 1.16 KiB [entry] [rendered]
      harmony import specifier ./fs [0] ./example.js 9:0-12
      harmony side effect evaluation ./fs [2] ./reexport-commonjs.js 2:0-21
      harmony export imported specifier ./fs [2] ./reexport-commonjs.js 2:0-21
- [2] ./reexport-commonjs.js 308 bytes {0} [built]
+ [2] ./reexport-commonjs.js 301 bytes {0} [built]
      harmony side effect evaluation ./reexport-commonjs [0] ./example.js 12:0-60
      harmony import specifier ./reexport-commonjs [0] ./example.js 13:0-9
- [3] ./example2.js 159 bytes {0} [built]
+ [3] ./example2.js 152 bytes {0} [built]
      harmony side effect evaluation ./example2 [0] ./example.js 16:0-20
- [4] ./harmony.js 78 bytes {0} [built]
+ [4] ./harmony.js 75 bytes {0} [built]
      [exports: default, named]
      cjs require ./harmony [3] ./example2.js 4:13-33
 ```
@@ -292,33 +307,33 @@ chunk    {0} output.js (main) 1.16 KiB [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-    Asset       Size  Chunks             Chunk Names
-output.js  993 bytes       0  [emitted]  main
+Version: webpack 4.20.1
+    Asset      Size  Chunks             Chunk Names
+output.js  1.35 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 1.16 KiB [entry] [rendered]
+chunk    {0} output.js (main) 1.13 KiB [entry] [rendered]
     > .\example.js main
  [0] ./fs.js 257 bytes {0} [built]
      [only some exports used: default, readFile]
      harmony side effect evaluation ./fs [1] ./reexport-commonjs.js 2:0-21
      harmony export imported specifier ./fs [1] ./reexport-commonjs.js 2:0-21
-     harmony side effect evaluation ./fs [4] ./example.js 4:0-22
-     harmony side effect evaluation ./fs [4] ./example.js 5:0-32
-     harmony side effect evaluation ./fs [4] ./example.js 6:0-28
-     harmony import specifier ./fs [4] ./example.js 7:0-2
-     harmony import specifier ./fs [4] ./example.js 8:0-8
-     harmony import specifier ./fs [4] ./example.js 9:0-12
- [1] ./reexport-commonjs.js 308 bytes {0} [built]
+     harmony side effect evaluation ./fs [2] ./example.js 4:0-22
+     harmony side effect evaluation ./fs [2] ./example.js 5:0-32
+     harmony side effect evaluation ./fs [2] ./example.js 6:0-28
+     harmony import specifier ./fs [2] ./example.js 7:0-2
+     harmony import specifier ./fs [2] ./example.js 8:0-8
+     harmony import specifier ./fs [2] ./example.js 9:0-12
+ [1] ./reexport-commonjs.js 301 bytes {0} [built]
      [only some exports used: readFile]
-     harmony side effect evaluation ./reexport-commonjs [4] ./example.js 12:0-60
-     harmony import specifier ./reexport-commonjs [4] ./example.js 13:0-9
- [2] ./harmony.js 78 bytes {0} [built]
-     [exports: default, named]
-     cjs require ./harmony [3] ./example2.js 4:13-33
- [3] ./example2.js 159 bytes {0} [built]
-     [no exports used]
-     harmony side effect evaluation ./example2 [4] ./example.js 16:0-20
- [4] ./example.js 389 bytes {0} [built]
+     harmony side effect evaluation ./reexport-commonjs [2] ./example.js 12:0-60
+     harmony import specifier ./reexport-commonjs [2] ./example.js 13:0-9
+ [2] ./example.js 373 bytes {0} [built]
      [no exports]
      single entry .\example.js  main
+ [3] ./example2.js 152 bytes {0} [built]
+     [no exports used]
+     harmony side effect evaluation ./example2 [2] ./example.js 16:0-20
+ [4] ./harmony.js 75 bytes {0} [built]
+     [exports: default, named]
+     cjs require ./harmony [3] ./example2.js 4:13-33
 ```
\ No newline at end of file
diff --git a/examples/harmony-library/README.md b/examples/harmony-library/README.md
index dc2cf295993..a33aa2c0228 100644
--- a/examples/harmony-library/README.md
+++ b/examples/harmony-library/README.md
@@ -69,19 +69,34 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -137,13 +152,13 @@ function increment() {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
            Asset      Size  Chunks             Chunk Names
-MyLibrary.umd.js  3.56 KiB       0  [emitted]  main
+MyLibrary.umd.js  4.52 KiB       0  [emitted]  main
 Entrypoint main = MyLibrary.umd.js
-chunk    {0} MyLibrary.umd.js (main) 97 bytes [entry] [rendered]
+chunk    {0} MyLibrary.umd.js (main) 92 bytes [entry] [rendered]
     > ./example main
- [0] ./example.js 97 bytes {0} [built]
+ [0] ./example.js 92 bytes {0} [built]
      [exports: value, increment, default]
      single entry ./example  main
 ```
@@ -152,13 +167,13 @@ chunk    {0} MyLibrary.umd.js (main) 97 bytes [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-           Asset       Size  Chunks             Chunk Names
-MyLibrary.umd.js  926 bytes       0  [emitted]  main
+Version: webpack 4.20.1
+           Asset      Size  Chunks             Chunk Names
+MyLibrary.umd.js  1.28 KiB       0  [emitted]  main
 Entrypoint main = MyLibrary.umd.js
-chunk    {0} MyLibrary.umd.js (main) 97 bytes [entry] [rendered]
+chunk    {0} MyLibrary.umd.js (main) 92 bytes [entry] [rendered]
     > ./example main
- [0] ./example.js 97 bytes {0} [built]
+ [0] ./example.js 92 bytes {0} [built]
      [exports: value, increment, default]
      single entry ./example  main
 ```
diff --git a/examples/harmony-unused/README.md b/examples/harmony-unused/README.md
index e483e471ef2..9c9cbc528a8 100644
--- a/examples/harmony-unused/README.md
+++ b/examples/harmony-unused/README.md
@@ -90,19 +90,34 @@ export { add as reexportedAdd, multiply as reexportedMultiply } from "./math";
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -231,7 +246,7 @@ function c() { console.log("c"); }
 # dist/output.js
 
 ``` javascript
-!function(t){var n={};function r(e){if(n[e])return n[e].exports;var u=n[e]={i:e,l:!1,exports:{}};return t[e].call(u.exports,u,u.exports,r),u.l=!0,u.exports}r.m=t,r.c=n,r.d=function(t,n,e){r.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:e})},r.r=function(t){Object.defineProperty(t,"__esModule",{value:!0})},r.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return r.d(n,"a",n),n},r.o=function(t,n){return Object.prototype.hasOwnProperty.call(t,n)},r.p="dist/",r(r.s=3)}([function(t,n,r){"use strict";function e(){for(var t=0,n=0,r=arguments,e=r.length;n<e;)t+=r[n++];return t}function u(){for(var t=1,n=0,r=arguments,e=r.length;n<e;)t*=r[n++];return t}r.d(n,"a",function(){return e}),r.d(n,"b",function(){return u})},function(t,n,r){"use strict"},function(t,n,r){"use strict";r(1);var e=r(0);r.d(n,"a",function(){return e.b})},function(t,n,r){"use strict";r.r(n);var e=r(0),u=r(2);Object(e.a)(1,2),u.a(1,2)}]);
+!function(t){var e={};function n(r){if(e[r])return e[r].exports;var u=e[r]={i:r,l:!1,exports:{}};return t[r].call(u.exports,u,u.exports,n),u.l=!0,u.exports}n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var u in t)n.d(r,u,function(e){return t[e]}.bind(null,u));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="dist/",n(n.s=3)}([function(t,e,n){"use strict";function r(){for(var t=0,e=0,n=arguments,r=n.length;e<r;)t+=n[e++];return t}function u(){for(var t=1,e=0,n=arguments,r=n.length;e<r;)t*=n[e++];return t}n.d(e,"a",function(){return r}),n.d(e,"b",function(){return u})},function(t,e,n){"use strict"},function(t,e,n){"use strict";n(1);var r=n(0);n.d(e,"a",function(){return r.b})},function(t,e,n){"use strict";n.r(e);var r=n(0),u=n(2);Object(r.a)(1,2),u.a(1,2)}]);
 ```
 
 # Info
@@ -240,27 +255,27 @@ function c() { console.log("c"); }
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
     Asset      Size  Chunks             Chunk Names
-output.js  5.93 KiB       0  [emitted]  main
+output.js  6.87 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 726 bytes [entry] [rendered]
+chunk    {0} output.js (main) 698 bytes [entry] [rendered]
     > .\example.js main
- [0] ./example.js 119 bytes {0} [built]
+ [0] ./example.js 114 bytes {0} [built]
      [no exports]
      single entry .\example.js  main
- [1] ./math.js 366 bytes {0} [built]
+ [1] ./math.js 347 bytes {0} [built]
      [exports: add, multiply, list]
      harmony side effect evaluation ./math [0] ./example.js 1:0-29
      harmony import specifier ./math [0] ./example.js 4:0-3
      harmony side effect evaluation ./math [2] ./library.js 2:0-78
      harmony export imported specifier ./math [2] ./library.js 2:0-78
      harmony export imported specifier ./math [2] ./library.js 2:0-78
- [2] ./library.js 112 bytes {0} [built]
+ [2] ./library.js 111 bytes {0} [built]
      [exports: a, b, c, reexportedAdd, reexportedMultiply]
      harmony side effect evaluation ./library [0] ./example.js 2:0-37
      harmony import specifier ./library [0] ./example.js 5:0-26
- [3] ./abc.js 129 bytes {0} [built]
+ [3] ./abc.js 126 bytes {0} [built]
      [exports: a, b, c]
      harmony side effect evaluation ./abc [2] ./library.js 1:0-32
      harmony export imported specifier ./abc [2] ./library.js 1:0-32
@@ -272,13 +287,13 @@ chunk    {0} output.js (main) 726 bytes [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-    Asset       Size  Chunks             Chunk Names
-output.js  971 bytes       0  [emitted]  main
+Version: webpack 4.20.1
+    Asset      Size  Chunks             Chunk Names
+output.js  1.32 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 726 bytes [entry] [rendered]
+chunk    {0} output.js (main) 698 bytes [entry] [rendered]
     > .\example.js main
- [0] ./math.js 366 bytes {0} [built]
+ [0] ./math.js 347 bytes {0} [built]
      [exports: add, multiply, list]
      [only some exports used: add, multiply]
      harmony side effect evaluation ./math [2] ./library.js 2:0-78
@@ -286,19 +301,19 @@ chunk    {0} output.js (main) 726 bytes [entry] [rendered]
      harmony export imported specifier ./math [2] ./library.js 2:0-78
      harmony side effect evaluation ./math [3] ./example.js 1:0-29
      harmony import specifier ./math [3] ./example.js 4:0-3
- [1] ./abc.js 129 bytes {0} [built]
+ [1] ./abc.js 126 bytes {0} [built]
      [exports: a, b, c]
      [no exports used]
      harmony side effect evaluation ./abc [2] ./library.js 1:0-32
      harmony export imported specifier ./abc [2] ./library.js 1:0-32
      harmony export imported specifier ./abc [2] ./library.js 1:0-32
      harmony export imported specifier ./abc [2] ./library.js 1:0-32
- [2] ./library.js 112 bytes {0} [built]
+ [2] ./library.js 111 bytes {0} [built]
      [exports: a, b, c, reexportedAdd, reexportedMultiply]
      [only some exports used: reexportedMultiply]
      harmony side effect evaluation ./library [3] ./example.js 2:0-37
      harmony import specifier ./library [3] ./example.js 5:0-26
- [3] ./example.js 119 bytes {0} [built]
+ [3] ./example.js 114 bytes {0} [built]
      [no exports]
      single entry .\example.js  main
 ```
diff --git a/examples/harmony/README.md b/examples/harmony/README.md
index 9eb518992a8..9a65f7eaf47 100644
--- a/examples/harmony/README.md
+++ b/examples/harmony/README.md
@@ -32,6 +32,7 @@ export function increment(val) {
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -48,6 +49,7 @@ export function increment(val) {
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -62,7 +64,7 @@ export function increment(val) {
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		1: 0
+/******/ 		0: 0
 /******/ 	};
 /******/
 /******/
@@ -120,19 +122,16 @@ export function increment(val) {
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -149,6 +148,10 @@ export function increment(val) {
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -164,19 +167,34 @@ export function increment(val) {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -214,6 +232,24 @@ export function increment(val) {
 ``` javascript
 /******/ ([
 /* 0 */
+/*!**********************!*\
+  !*** ./increment.js ***!
+  \**********************/
+/*! exports provided: increment */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "increment", function() { return increment; });
+/* harmony import */ var _math__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./math */ 1);
+
+function increment(val) {
+    return Object(_math__WEBPACK_IMPORTED_MODULE_0__["add"])(val, 1);
+};
+
+
+/***/ }),
+/* 1 */
 /*!*****************!*\
   !*** ./math.js ***!
   \*****************/
@@ -232,24 +268,6 @@ function add() {
 }
 
 
-/***/ }),
-/* 1 */
-/*!**********************!*\
-  !*** ./increment.js ***!
-  \**********************/
-/*! exports provided: increment */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "increment", function() { return increment; });
-/* harmony import */ var _math__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./math */ 0);
-
-function increment(val) {
-    return Object(_math__WEBPACK_IMPORTED_MODULE_0__["add"])(val, 1);
-};
-
-
 /***/ }),
 /* 2 */
 /*!********************!*\
@@ -260,13 +278,13 @@ function increment(val) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _increment__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./increment */ 1);
+/* harmony import */ var _increment__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./increment */ 0);
 
 var a = 1;
 Object(_increment__WEBPACK_IMPORTED_MODULE_0__["increment"])(a); // 2
 
 // async loading
-__webpack_require__.e(/*! import() */ 0).then(__webpack_require__.bind(null, /*! ./async-loaded */ 3)).then(function(asyncLoaded) {
+__webpack_require__.e(/*! import() */ 1).then(__webpack_require__.bind(null, /*! ./async-loaded */ 3)).then(function(asyncLoaded) {
 	console.log(asyncLoaded);
 });
 
@@ -281,61 +299,61 @@ __webpack_require__.e(/*! import() */ 0).then(__webpack_require__.bind(null, /*!
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  479 bytes       0  [emitted]  
-  output.js   8.54 KiB       1  [emitted]  main
+  output.js   9.53 KiB       0  [emitted]  main
+1.output.js  478 bytes       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 25 bytes <{1}> [rendered]
-    > ./async-loaded [2] ./example.js 6:0-24
- [3] ./async-loaded.js 25 bytes {0} [built]
-     [exports: answer]
-     import() ./async-loaded [2] ./example.js 6:0-24
-chunk    {1} output.js (main) 419 bytes >{0}< [entry] [rendered]
+chunk    {0} output.js (main) 400 bytes >{1}< [entry] [rendered]
     > .\example.js main
- [0] ./math.js 142 bytes {1} [built]
-     [exports: add]
-     harmony side effect evaluation ./math [1] ./increment.js 1:0-29
-     harmony import specifier ./math [1] ./increment.js 3:11-14
- [1] ./increment.js 94 bytes {1} [built]
+ [0] ./increment.js 90 bytes {0} [built]
      [exports: increment]
      harmony side effect evaluation ./increment [2] ./example.js 1:0-47
      harmony import specifier ./increment [2] ./example.js 3:0-3
- [2] ./example.js 183 bytes {1} [built]
+ [1] ./math.js 135 bytes {0} [built]
+     [exports: add]
+     harmony side effect evaluation ./math [0] ./increment.js 1:0-29
+     harmony import specifier ./math [0] ./increment.js 3:11-14
+ [2] ./example.js 175 bytes {0} [built]
      [no exports]
      single entry .\example.js  main
+chunk    {1} 1.output.js 24 bytes <{0}> [rendered]
+    > ./async-loaded [2] ./example.js 6:0-24
+ [3] ./async-loaded.js 24 bytes {1} [built]
+     [exports: answer]
+     import() ./async-loaded [2] ./example.js 6:0-24
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  144 bytes       0  [emitted]  
-  output.js   1.75 KiB       1  [emitted]  main
+  output.js   2.15 KiB       0  [emitted]  main
+1.output.js  144 bytes       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 25 bytes <{1}> [rendered]
-    > ./async-loaded [] 6:0-24
- [1] ./async-loaded.js 25 bytes {0} [built]
-     [exports: answer]
-     import() ./async-loaded  ./example.js 6:0-24
-chunk    {1} output.js (main) 419 bytes >{0}< [entry] [rendered]
+chunk    {0} output.js (main) 400 bytes >{1}< [entry] [rendered]
     > .\example.js main
- [0] ./example.js + 2 modules 419 bytes {1} [built]
+ [0] ./example.js + 2 modules 400 bytes {0} [built]
      [no exports]
      single entry .\example.js  main
-     | ./example.js 183 bytes [built]
+     | ./example.js 175 bytes [built]
      |     [no exports]
      |     single entry .\example.js  main
-     | ./increment.js 94 bytes [built]
+     | ./increment.js 90 bytes [built]
      |     [exports: increment]
      |     [all exports used]
      |     harmony side effect evaluation ./increment  ./example.js 1:0-47
      |     harmony import specifier ./increment  ./example.js 3:0-3
-     | ./math.js 142 bytes [built]
+     | ./math.js 135 bytes [built]
      |     [exports: add]
      |     [all exports used]
      |     harmony side effect evaluation ./math  ./increment.js 1:0-29
      |     harmony import specifier ./math  ./increment.js 3:11-14
+chunk    {1} 1.output.js 24 bytes <{0}> [rendered]
+    > ./async-loaded [] 6:0-24
+ [1] ./async-loaded.js 24 bytes {1} [built]
+     [exports: answer]
+     import() ./async-loaded  ./example.js 6:0-24
 ```
\ No newline at end of file
diff --git a/examples/hybrid-routing/README.md b/examples/hybrid-routing/README.md
index c529e057f59..38aa9b3b436 100644
--- a/examples/hybrid-routing/README.md
+++ b/examples/hybrid-routing/README.md
@@ -141,12 +141,12 @@ window.onLinkToPage = function onLinkToPage(name) { // name is "a" or "b"
 
 var map = {
 	"./aPage": [
-		3,
-		1
-	],
-	"./bPage": [
 		1,
 		0
+	],
+	"./bPage": [
+		3,
+		1
 	]
 };
 function webpackAsyncContext(req) {
@@ -159,8 +159,8 @@ function webpackAsyncContext(req) {
 		});
 	}
 	return __webpack_require__.e(ids[1]).then(function() {
-		var module = __webpack_require__(ids[0]);
-		return (typeof module === "object" && module && module.__esModule ? module : Object.assign({/* fake namespace object */}, typeof module === "object" && module, { "default": module }));
+		var id = ids[0];
+		return __webpack_require__.t(id, 7);
 	});
 }
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
@@ -184,6 +184,7 @@ module.exports = webpackAsyncContext;
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/ 		var executeModules = data[2];
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -200,6 +201,7 @@ module.exports = webpackAsyncContext;
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -234,14 +236,14 @@ module.exports = webpackAsyncContext;
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		4: 0
+/******/ 		3: 0
 /******/ 	};
 /******/
 /******/ 	var deferredModules = [];
 /******/
 /******/ 	// script path function
 /******/ 	function jsonpScriptSrc(chunkId) {
-/******/ 		return __webpack_require__.p + "" + ({"0":"bPage"}[chunkId]||chunkId) + ".chunk.js"
+/******/ 		return __webpack_require__.p + "" + ({"1":"bPage"}[chunkId]||chunkId) + ".chunk.js"
 /******/ 	}
 /******/
 /******/ 	// The require function
@@ -292,19 +294,16 @@ module.exports = webpackAsyncContext;
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -321,6 +320,10 @@ module.exports = webpackAsyncContext;
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -336,19 +339,34 @@ module.exports = webpackAsyncContext;
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -376,7 +394,7 @@ module.exports = webpackAsyncContext;
 /******/
 /******/
 /******/ 	// add entry module to deferred list
-/******/ 	deferredModules.push([8,2,1]);
+/******/ 	deferredModules.push([4,2,0]);
 /******/ 	// run deferred modules when ready
 /******/ 	return checkDeferredModules();
 /******/ })
@@ -388,29 +406,29 @@ module.exports = webpackAsyncContext;
 ``` javascript
 /******/ ({
 
-/***/ 7:
-/*!*******************!*\
-  !*** ./aEntry.js ***!
-  \*******************/
+/***/ 4:
+/*!*******************************!*\
+  !*** multi ./aEntry ./router ***!
+  \*******************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-// Just show the page "a"
-var render = __webpack_require__(/*! ./render */ 0);
-render(__webpack_require__(/*! ./aPage */ 3));
+__webpack_require__(/*! ./aEntry */5);
+module.exports = __webpack_require__(/*! ./router */2);
+
 
 /***/ }),
 
-/***/ 8:
-/*!*******************************!*\
-  !*** multi ./aEntry ./router ***!
-  \*******************************/
+/***/ 5:
+/*!*******************!*\
+  !*** ./aEntry.js ***!
+  \*******************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! ./aEntry */7);
-module.exports = __webpack_require__(/*! ./router */2);
-
+// Just show the page "a"
+var render = __webpack_require__(/*! ./render */ 0);
+render(__webpack_require__(/*! ./aPage */ 1));
 
 /***/ })
 
@@ -420,9 +438,9 @@ module.exports = __webpack_require__(/*! ./router */2);
 # dist/aPage.chunk.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],{
-
-/***/ 3:
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+/* 0 */,
+/* 1 */
 /*!******************!*\
   !*** ./aPage.js ***!
   \******************/
@@ -434,8 +452,7 @@ module.exports = function() {
 };
 
 /***/ })
-
-}]);
+]]);
 ```
 
 # Info
@@ -444,104 +461,104 @@ module.exports = function() {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
                Asset       Size  Chunks             Chunk Names
-      bPage.chunk.js  299 bytes       0  [emitted]  bPage
-      aPage.chunk.js  293 bytes       1  [emitted]  aPage
-pageA~pageB.chunk.js   2.19 KiB       2  [emitted]  pageA~pageB
-     pageB.bundle.js   8.46 KiB       3  [emitted]  pageB
-     pageA.bundle.js   8.46 KiB       4  [emitted]  pageA
+      aPage.chunk.js  297 bytes       0  [emitted]  aPage
+      bPage.chunk.js  291 bytes       1  [emitted]  bPage
+pageA~pageB.chunk.js   2.02 KiB       2  [emitted]  pageA~pageB
+     pageA.bundle.js   9.48 KiB       3  [emitted]  pageA
+     pageB.bundle.js   9.48 KiB       4  [emitted]  pageB
 Entrypoint pageA = pageA~pageB.chunk.js aPage.chunk.js pageA.bundle.js
 Entrypoint pageB = pageA~pageB.chunk.js bPage.chunk.js pageB.bundle.js
-chunk    {0} bPage.chunk.js (bPage) 61 bytes <{1}> <{2}> <{4}> ={2}= ={3}= >{1}< [initial] [rendered] reused as split chunk (cache group: default)
-    > pageB
-    > ./bPage [6] . lazy ^\.\/.*Page$ namespace object ./bPage
-    > ./bPage [6] . lazy ^\.\/.*Page$ namespace object ./bPage
- [1] ./bPage.js 61 bytes {0} [built]
-     cjs require ./bPage [4] ./bEntry.js 3:7-25
-     context element ./bPage [6] . lazy ^\.\/.*Page$ namespace object ./bPage
-chunk    {1} aPage.chunk.js (aPage) 61 bytes <{0}> <{2}> <{3}> ={2}= ={4}= >{0}< [initial] [rendered] reused as split chunk (cache group: default)
+chunk    {0} aPage.chunk.js (aPage) 59 bytes <{1}> <{2}> <{4}> ={2}= ={3}= >{1}< [initial] [rendered] reused as split chunk (cache group: default)
     > pageA
     > ./aPage [6] . lazy ^\.\/.*Page$ namespace object ./aPage
     > ./aPage [6] . lazy ^\.\/.*Page$ namespace object ./aPage
- [3] ./aPage.js 61 bytes {1} [built]
+ [1] ./aPage.js 59 bytes {0} [built]
+     cjs require ./aPage [5] ./aEntry.js 3:7-25
      context element ./aPage [6] . lazy ^\.\/.*Page$ namespace object ./aPage
-     cjs require ./aPage [7] ./aEntry.js 3:7-25
-chunk    {2} pageA~pageB.chunk.js (pageA~pageB) 952 bytes ={0}= ={1}= ={3}= ={4}= >{0}< >{1}< [initial] [rendered] split chunk (cache group: default) (name: pageA~pageB)
+chunk    {1} bPage.chunk.js (bPage) 59 bytes <{0}> <{2}> <{3}> ={2}= ={4}= >{0}< [initial] [rendered] reused as split chunk (cache group: default)
+    > pageB
+    > ./bPage [6] . lazy ^\.\/.*Page$ namespace object ./bPage
+    > ./bPage [6] . lazy ^\.\/.*Page$ namespace object ./bPage
+ [3] ./bPage.js 59 bytes {1} [built]
+     context element ./bPage [6] . lazy ^\.\/.*Page$ namespace object ./bPage
+     cjs require ./bPage [8] ./bEntry.js 3:7-25
+chunk    {2} pageA~pageB.chunk.js (pageA~pageB) 950 bytes ={0}= ={1}= ={3}= ={4}= >{0}< >{1}< [initial] [rendered] split chunk (cache group: default) (name: pageA~pageB)
     > pageA
     > pageB
- [0] ./render.js 60 bytes {2} [built]
+ [0] ./render.js 58 bytes {2} [built]
      cjs require ./render [2] ./router.js 1:13-32
-     cjs require ./render [4] ./bEntry.js 2:13-32
-     cjs require ./render [7] ./aEntry.js 2:13-32
+     cjs require ./render [5] ./aEntry.js 2:13-32
+     cjs require ./render [8] ./bEntry.js 2:13-32
  [2] ./router.js 732 bytes {2} [built]
-     single entry ./router [5] multi ./bEntry ./router pageB:100001
-     single entry ./router [8] multi ./aEntry ./router pageA:100001
+     single entry ./router [4] multi ./aEntry ./router pageA[1]
+     single entry ./router [7] multi ./bEntry ./router pageB[1]
  [6] . lazy ^\.\/.*Page$ namespace object 160 bytes {2} [built]
      import() context lazy . [2] ./router.js 15:1-59
-chunk    {3} pageB.bundle.js (pageB) 129 bytes ={0}= ={2}= >{1}< [entry] [rendered]
-    > pageB
- [4] ./bEntry.js 89 bytes {3} [built]
-     single entry ./bEntry [5] multi ./bEntry ./router pageB:100000
- [5] multi ./bEntry ./router 40 bytes {3} [built]
-     multi entry 
-chunk    {4} pageA.bundle.js (pageA) 129 bytes ={1}= ={2}= >{0}< [entry] [rendered]
+chunk    {3} pageA.bundle.js (pageA) 127 bytes ={0}= ={2}= >{1}< [entry] [rendered]
     > pageA
- [7] ./aEntry.js 89 bytes {4} [built]
-     single entry ./aEntry [8] multi ./aEntry ./router pageA:100000
- [8] multi ./aEntry ./router 40 bytes {4} [built]
+ [4] multi ./aEntry ./router 40 bytes {3} [built]
+     multi entry 
+ [5] ./aEntry.js 87 bytes {3} [built]
+     single entry ./aEntry [4] multi ./aEntry ./router pageA[0]
+chunk    {4} pageB.bundle.js (pageB) 127 bytes ={1}= ={2}= >{0}< [entry] [rendered]
+    > pageB
+ [7] multi ./bEntry ./router 40 bytes {4} [built]
      multi entry 
+ [8] ./bEntry.js 87 bytes {4} [built]
+     single entry ./bEntry [7] multi ./bEntry ./router pageB[0]
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
                Asset       Size  Chunks             Chunk Names
-      bPage.chunk.js  122 bytes       0  [emitted]  bPage
-      aPage.chunk.js  123 bytes       1  [emitted]  aPage
-pageA~pageB.chunk.js  629 bytes       2  [emitted]  pageA~pageB
-     pageB.bundle.js   1.87 KiB       3  [emitted]  pageB
-     pageA.bundle.js   1.87 KiB       4  [emitted]  pageA
+      aPage.chunk.js  122 bytes       0  [emitted]  aPage
+      bPage.chunk.js  123 bytes       1  [emitted]  bPage
+pageA~pageB.chunk.js  545 bytes       2  [emitted]  pageA~pageB
+     pageA.bundle.js   2.25 KiB       3  [emitted]  pageA
+     pageB.bundle.js   2.25 KiB       4  [emitted]  pageB
 Entrypoint pageA = pageA~pageB.chunk.js aPage.chunk.js pageA.bundle.js
 Entrypoint pageB = pageA~pageB.chunk.js bPage.chunk.js pageB.bundle.js
-chunk    {0} bPage.chunk.js (bPage) 61 bytes <{1}> <{2}> <{4}> ={2}= ={3}= >{1}< [initial] [rendered] reused as split chunk (cache group: default)
-    > pageB
-    > ./bPage [6] . lazy ^\.\/.*Page$ namespace object ./bPage
-    > ./bPage [6] . lazy ^\.\/.*Page$ namespace object ./bPage
- [1] ./bPage.js 61 bytes {0} [built]
-     cjs require ./bPage [4] ./bEntry.js 3:7-25
-     context element ./bPage [6] . lazy ^\.\/.*Page$ namespace object ./bPage
-chunk    {1} aPage.chunk.js (aPage) 61 bytes <{0}> <{2}> <{3}> ={2}= ={4}= >{0}< [initial] [rendered] reused as split chunk (cache group: default)
+chunk    {0} aPage.chunk.js (aPage) 59 bytes <{1}> <{2}> <{4}> ={2}= ={3}= >{1}< [initial] [rendered] reused as split chunk (cache group: default)
     > pageA
     > ./aPage [6] . lazy ^\.\/.*Page$ namespace object ./aPage
     > ./aPage [6] . lazy ^\.\/.*Page$ namespace object ./aPage
- [3] ./aPage.js 61 bytes {1} [built]
+ [1] ./aPage.js 59 bytes {0} [built]
+     cjs require ./aPage [5] ./aEntry.js 3:7-25
      context element ./aPage [6] . lazy ^\.\/.*Page$ namespace object ./aPage
-     cjs require ./aPage [7] ./aEntry.js 3:7-25
-chunk    {2} pageA~pageB.chunk.js (pageA~pageB) 952 bytes ={0}= ={1}= ={3}= ={4}= >{0}< >{1}< [initial] [rendered] split chunk (cache group: default) (name: pageA~pageB)
+chunk    {1} bPage.chunk.js (bPage) 59 bytes <{0}> <{2}> <{3}> ={2}= ={4}= >{0}< [initial] [rendered] reused as split chunk (cache group: default)
+    > pageB
+    > ./bPage [6] . lazy ^\.\/.*Page$ namespace object ./bPage
+    > ./bPage [6] . lazy ^\.\/.*Page$ namespace object ./bPage
+ [3] ./bPage.js 59 bytes {1} [built]
+     context element ./bPage [6] . lazy ^\.\/.*Page$ namespace object ./bPage
+     cjs require ./bPage [8] ./bEntry.js 3:7-25
+chunk    {2} pageA~pageB.chunk.js (pageA~pageB) 950 bytes ={0}= ={1}= ={3}= ={4}= >{0}< >{1}< [initial] [rendered] split chunk (cache group: default) (name: pageA~pageB)
     > pageA
     > pageB
- [0] ./render.js 60 bytes {2} [built]
+ [0] ./render.js 58 bytes {2} [built]
      cjs require ./render [2] ./router.js 1:13-32
-     cjs require ./render [4] ./bEntry.js 2:13-32
-     cjs require ./render [7] ./aEntry.js 2:13-32
+     cjs require ./render [5] ./aEntry.js 2:13-32
+     cjs require ./render [8] ./bEntry.js 2:13-32
  [2] ./router.js 732 bytes {2} [built]
-     single entry ./router [5] multi ./bEntry ./router pageB:100001
-     single entry ./router [8] multi ./aEntry ./router pageA:100001
+     single entry ./router [4] multi ./aEntry ./router pageA[1]
+     single entry ./router [7] multi ./bEntry ./router pageB[1]
  [6] . lazy ^\.\/.*Page$ namespace object 160 bytes {2} [built]
      import() context lazy . [2] ./router.js 15:1-59
-chunk    {3} pageB.bundle.js (pageB) 129 bytes ={0}= ={2}= >{1}< [entry] [rendered]
-    > pageB
- [4] ./bEntry.js 89 bytes {3} [built]
-     single entry ./bEntry [5] multi ./bEntry ./router pageB:100000
- [5] multi ./bEntry ./router 40 bytes {3} [built]
-     multi entry 
-chunk    {4} pageA.bundle.js (pageA) 129 bytes ={1}= ={2}= >{0}< [entry] [rendered]
+chunk    {3} pageA.bundle.js (pageA) 127 bytes ={0}= ={2}= >{1}< [entry] [rendered]
     > pageA
- [7] ./aEntry.js 89 bytes {4} [built]
-     single entry ./aEntry [8] multi ./aEntry ./router pageA:100000
- [8] multi ./aEntry ./router 40 bytes {4} [built]
+ [4] multi ./aEntry ./router 40 bytes {3} [built]
+     multi entry 
+ [5] ./aEntry.js 87 bytes {3} [built]
+     single entry ./aEntry [4] multi ./aEntry ./router pageA[0]
+chunk    {4} pageB.bundle.js (pageB) 127 bytes ={1}= ={2}= >{0}< [entry] [rendered]
+    > pageB
+ [7] multi ./bEntry ./router 40 bytes {4} [built]
      multi entry 
+ [8] ./bEntry.js 87 bytes {4} [built]
+     single entry ./bEntry [7] multi ./bEntry ./router pageB[0]
 ```
diff --git a/examples/i18n/README.md b/examples/i18n/README.md
index 5750f329637..412786b3529 100644
--- a/examples/i18n/README.md
+++ b/examples/i18n/README.md
@@ -86,19 +86,34 @@ module.exports = Object.keys(languages).map(function(language) {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -180,19 +195,34 @@ console.log("Missing Text");
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -234,24 +264,24 @@ console.log("Missing Text");
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
 Child en:
     Hash: 0a1b2c3d4e5f6a7b8c9d
-           Asset     Size  Chunks             Chunk Names
-    en.output.js  2.8 KiB       0  [emitted]  main
+           Asset      Size  Chunks             Chunk Names
+    en.output.js  3.76 KiB       0  [emitted]  main
     Entrypoint main = en.output.js
-    chunk    {0} en.output.js (main) 65 bytes [entry] [rendered]
+    chunk    {0} en.output.js (main) 64 bytes [entry] [rendered]
         > ./example main
-     [0] ./example.js 65 bytes {0} [built]
+     [0] ./example.js 64 bytes {0} [built]
          single entry ./example  main
 Child de:
     Hash: 0a1b2c3d4e5f6a7b8c9d
-           Asset     Size  Chunks             Chunk Names
-    de.output.js  2.8 KiB       0  [emitted]  main
+           Asset      Size  Chunks             Chunk Names
+    de.output.js  3.76 KiB       0  [emitted]  main
     Entrypoint main = de.output.js
-    chunk    {0} de.output.js (main) 65 bytes [entry] [rendered]
+    chunk    {0} de.output.js (main) 64 bytes [entry] [rendered]
         > ./example main
-     [0] ./example.js 65 bytes {0} [built] [1 warning]
+     [0] ./example.js 64 bytes {0} [built] [1 warning]
          single entry ./example  main
     
     WARNING in ./example.js
@@ -262,24 +292,24 @@ Child de:
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
 Child en:
     Hash: 0a1b2c3d4e5f6a7b8c9d
            Asset       Size  Chunks             Chunk Names
-    en.output.js  606 bytes       0  [emitted]  main
+    en.output.js  991 bytes       0  [emitted]  main
     Entrypoint main = en.output.js
-    chunk    {0} en.output.js (main) 65 bytes [entry] [rendered]
+    chunk    {0} en.output.js (main) 64 bytes [entry] [rendered]
         > ./example main
-     [0] ./example.js 65 bytes {0} [built]
+     [0] ./example.js 64 bytes {0} [built]
          single entry ./example  main
 Child de:
     Hash: 0a1b2c3d4e5f6a7b8c9d
            Asset       Size  Chunks             Chunk Names
-    de.output.js  605 bytes       0  [emitted]  main
+    de.output.js  990 bytes       0  [emitted]  main
     Entrypoint main = de.output.js
-    chunk    {0} de.output.js (main) 65 bytes [entry] [rendered]
+    chunk    {0} de.output.js (main) 64 bytes [entry] [rendered]
         > ./example main
-     [0] ./example.js 65 bytes {0} [built] [1 warning]
+     [0] ./example.js 64 bytes {0} [built] [1 warning]
          single entry ./example  main
     
     WARNING in ./example.js
diff --git a/examples/loader/README.md b/examples/loader/README.md
index fc815949728..df9a62fe18e 100644
--- a/examples/loader/README.md
+++ b/examples/loader/README.md
@@ -74,19 +74,34 @@ module.exports = function(content) {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -152,7 +167,7 @@ exports = module.exports = __webpack_require__(/*! ../../node_modules/css-loader
 
 
 // module
-exports.push([module.i, ".some-class {\r\n\tcolor: hotpink;\r\n}\r\n", ""]);
+exports.push([module.i, ".some-class {\n\tcolor: hotpink;\n}\n", ""]);
 
 // exports
 
@@ -263,19 +278,19 @@ Prints in node.js (`enhanced-require example.js`) and in browser:
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-    Asset     Size  Chunks             Chunk Names
-output.js  6.2 KiB       0  [emitted]  main
+Version: webpack 4.20.1
+    Asset      Size  Chunks             Chunk Names
+output.js  7.15 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 2.65 KiB [entry] [rendered]
+chunk    {0} output.js (main) 2.64 KiB [entry] [rendered]
     > .\example.js main
- [0] ./example.js 210 bytes {0} [built]
+ [0] ./example.js 204 bytes {0} [built]
      single entry .\example.js  main
  [1] ./loader.js!./file.js 41 bytes {0} [built]
      cjs require ./loader!./file [0] ./example.js 2:12-38
- [2] (webpack)/node_modules/css-loader!./test.css 205 bytes {0} [built]
-     cjs require !css-loader!./test.css [0] ./example.js 6:12-45
+ [2] (webpack)/node_modules/css-loader!./test.css 199 bytes {0} [built]
      cjs require ./test.css [0] ./example.js 5:12-33
+     cjs require !css-loader!./test.css [0] ./example.js 6:12-45
      + 1 hidden module
 ```
 
@@ -283,18 +298,18 @@ chunk    {0} output.js (main) 2.65 KiB [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
     Asset      Size  Chunks             Chunk Names
-output.js  1.51 KiB       0  [emitted]  main
+output.js  1.89 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 2.65 KiB [entry] [rendered]
+chunk    {0} output.js (main) 2.64 KiB [entry] [rendered]
     > .\example.js main
- [0] (webpack)/node_modules/css-loader!./test.css 205 bytes {0} [built]
-     cjs require !css-loader!./test.css [3] ./example.js 6:12-45
-     cjs require ./test.css [3] ./example.js 5:12-33
- [2] ./loader.js!./file.js 41 bytes {0} [built]
-     cjs require ./loader!./file [3] ./example.js 2:12-38
- [3] ./example.js 210 bytes {0} [built]
+ [0] (webpack)/node_modules/css-loader!./test.css 199 bytes {0} [built]
+     cjs require ./test.css [1] ./example.js 5:12-33
+     cjs require !css-loader!./test.css [1] ./example.js 6:12-45
+ [1] ./example.js 204 bytes {0} [built]
      single entry .\example.js  main
+ [2] ./loader.js!./file.js 41 bytes {0} [built]
+     cjs require ./loader!./file [1] ./example.js 2:12-38
      + 1 hidden module
 ```
diff --git a/examples/many-pages/README.md b/examples/many-pages/README.md
index 00d976fbc20..2c60fe4b727 100644
--- a/examples/many-pages/README.md
+++ b/examples/many-pages/README.md
@@ -1,6 +1,6 @@
 # Info
 
-This example illustrates webpack's algorthim for automatic deduplication using `optimization.splitChunks`.
+This example illustrates webpack's algorithm for automatic deduplication using `optimization.splitChunks`.
 
 This example application contains 7 pages, each of them importing 1-3 modules from the `node_modules` folder (vendor libs) and 0-3 modules from the `stuff` folder (application modules). In reallity an application is probably more complex, but the same mechanisms apply.
 
@@ -41,7 +41,7 @@ module.exports = {
 			chunks: "all",
 			maxInitialRequests: 20, // for HTTP2
 			maxAsyncRequests: 20, // for HTTP2
-			minSize: 40 // for example only: choosen to match 2 modules
+			minSize: 40 // for example only: chosen to match 2 modules
 			// omit minSize in real use case to use the default of 30kb
 		}
 	}
@@ -52,22 +52,22 @@ module.exports = {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.3
+Version: webpack 4.20.1
                              Asset       Size  Chunks             Chunk Names
-                          pageG.js   1.15 KiB       7  [emitted]  pageG
+                          pageD.js   1.55 KiB       7  [emitted]  pageD
 vendors~pageD~pageE~pageF~pageG.js  119 bytes       0  [emitted]  vendors~pageD~pageE~pageF~pageG
-      vendors~pageD~pageE~pageF.js  178 bytes       2  [emitted]  vendors~pageD~pageE~pageF
-      vendors~pageA~pageB~pageC.js  180 bytes       3  [emitted]  vendors~pageA~pageB~pageC
-                  vendors~pageC.js  121 bytes       4  [emitted]  vendors~pageC
-                  vendors~pageB.js  121 bytes       5  [emitted]  vendors~pageB
-                  vendors~pageA.js  121 bytes       6  [emitted]  vendors~pageA
-              pageA~pageD~pageF.js  156 bytes       1  [emitted]  pageA~pageD~pageF
-                          pageF.js   1.18 KiB       8  [emitted]  pageF
-                          pageE.js   1.17 KiB       9  [emitted]  pageE
-                          pageD.js   1.18 KiB      10  [emitted]  pageD
-                          pageC.js   1.27 KiB      11  [emitted]  pageC
-                          pageB.js   1.27 KiB      12  [emitted]  pageB
-                          pageA.js   1.18 KiB      13  [emitted]  pageA
+      vendors~pageD~pageE~pageF.js  180 bytes       2  [emitted]  vendors~pageD~pageE~pageF
+              pageA~pageD~pageF.js  156 bytes       3  [emitted]  pageA~pageD~pageF
+                          pageA.js   1.55 KiB       4  [emitted]  pageA
+                          pageB.js   1.65 KiB       5  [emitted]  pageB
+                          pageC.js   1.65 KiB       6  [emitted]  pageC
+      vendors~pageA~pageB~pageC.js  178 bytes       1  [emitted]  vendors~pageA~pageB~pageC
+                          pageE.js   1.54 KiB       8  [emitted]  pageE
+                          pageF.js   1.55 KiB       9  [emitted]  pageF
+                          pageG.js   1.53 KiB      10  [emitted]  pageG
+                  vendors~pageA.js  122 bytes      11  [emitted]  vendors~pageA
+                  vendors~pageB.js  122 bytes      12  [emitted]  vendors~pageB
+                  vendors~pageC.js  122 bytes      13  [emitted]  vendors~pageC
 Entrypoint pageA = vendors~pageA~pageB~pageC.js vendors~pageA.js pageA~pageD~pageF.js pageA.js
 Entrypoint pageB = vendors~pageA~pageB~pageC.js vendors~pageB.js pageB.js
 Entrypoint pageC = vendors~pageA~pageB~pageC.js vendors~pageC.js pageC.js
@@ -75,67 +75,67 @@ Entrypoint pageD = vendors~pageD~pageE~pageF~pageG.js vendors~pageD~pageE~pageF.
 Entrypoint pageE = vendors~pageD~pageE~pageF~pageG.js vendors~pageD~pageE~pageF.js pageE.js
 Entrypoint pageF = vendors~pageD~pageE~pageF~pageG.js vendors~pageD~pageE~pageF.js pageA~pageD~pageF.js pageF.js
 Entrypoint pageG = vendors~pageD~pageE~pageF~pageG.js pageG.js
-chunk    {0} vendors~pageD~pageE~pageF~pageG.js (vendors~pageD~pageE~pageF~pageG) 43 bytes ={1}= ={10}= ={2}= ={7}= ={8}= ={9}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~pageD~pageE~pageF~pageG)
+chunk    {0} vendors~pageD~pageE~pageF~pageG.js (vendors~pageD~pageE~pageF~pageG) 43 bytes ={2}= ={3}= ={7}= ={8}= ={9}= ={10}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~pageD~pageE~pageF~pageG)
     > ./pages/d pageD
     > ./pages/e pageE
     > ./pages/f pageF
     > ./pages/g pageG
     1 module
-chunk    {1} pageA~pageD~pageF.js (pageA~pageD~pageF) 62 bytes ={0}= ={10}= ={13}= ={2}= ={3}= ={6}= ={8}= [initial] [rendered] split chunk (cache group: default) (name: pageA~pageD~pageF)
+chunk    {1} vendors~pageA~pageB~pageC.js (vendors~pageA~pageB~pageC) 86 bytes ={3}= ={4}= ={5}= ={6}= ={11}= ={12}= ={13}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~pageA~pageB~pageC)
     > ./pages/a pageA
-    > ./pages/d pageD
-    > ./pages/f pageF
- [6] ./stuff/s3.js 31 bytes {1} [built]
- [7] ./stuff/s2.js 31 bytes {1} [built]
-chunk    {2} vendors~pageD~pageE~pageF.js (vendors~pageD~pageE~pageF) 86 bytes ={0}= ={1}= ={10}= ={8}= ={9}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~pageD~pageE~pageF)
+    > ./pages/b pageB
+    > ./pages/c pageC
+    2 modules
+chunk    {2} vendors~pageD~pageE~pageF.js (vendors~pageD~pageE~pageF) 86 bytes ={0}= ={3}= ={7}= ={8}= ={9}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~pageD~pageE~pageF)
     > ./pages/d pageD
     > ./pages/e pageE
     > ./pages/f pageF
     2 modules
-chunk    {3} vendors~pageA~pageB~pageC.js (vendors~pageA~pageB~pageC) 86 bytes ={1}= ={11}= ={12}= ={13}= ={4}= ={5}= ={6}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~pageA~pageB~pageC)
+chunk    {3} pageA~pageD~pageF.js (pageA~pageD~pageF) 62 bytes ={0}= ={1}= ={2}= ={4}= ={7}= ={9}= ={11}= [initial] [rendered] split chunk (cache group: default) (name: pageA~pageD~pageF)
+    > ./pages/a pageA
+    > ./pages/d pageD
+    > ./pages/f pageF
+ [4] ./stuff/s2.js 31 bytes {3} [built]
+ [5] ./stuff/s3.js 31 bytes {3} [built]
+chunk    {4} pageA.js (pageA) 137 bytes ={1}= ={3}= ={11}= [entry] [rendered]
     > ./pages/a pageA
+  [6] ./stuff/s4.js 31 bytes {4} {6} [built]
+ [10] ./pages/a.js 106 bytes {4} [built]
+chunk    {5} pageB.js (pageB) 199 bytes ={1}= ={12}= [entry] [rendered]
     > ./pages/b pageB
+  [0] ./stuff/s1.js 31 bytes {5} {7} {9} {10} [built]
+  [7] ./stuff/s7.js 31 bytes {5} {8} [built]
+ [12] ./pages/b.js 106 bytes {5} [built]
+ [14] ./stuff/s8.js 31 bytes {5} [built]
+chunk    {6} pageC.js (pageC) 199 bytes ={1}= ={13}= [entry] [rendered]
     > ./pages/c pageC
-    2 modules
-chunk    {4} vendors~pageC.js (vendors~pageC) 43 bytes ={11}= ={3}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~pageC)
-    > ./pages/c pageC
+  [6] ./stuff/s4.js 31 bytes {4} {6} [built]
+ [15] ./pages/c.js 106 bytes {6} [built]
+ [17] ./stuff/s5.js 31 bytes {6} [built]
+ [18] ./stuff/s6.js 31 bytes {6} [built]
+chunk    {7} pageD.js (pageD) 137 bytes ={0}= ={2}= ={3}= [entry] [rendered]
+    > ./pages/d pageD
+  [0] ./stuff/s1.js 31 bytes {5} {7} {9} {10} [built]
+ [19] ./pages/d.js 106 bytes {7} [built]
+chunk    {8} pageE.js (pageE) 93 bytes ={0}= ={2}= [entry] [rendered]
+    > ./pages/e pageE
+  [7] ./stuff/s7.js 31 bytes {5} {8} [built]
+ [20] ./pages/e.js 62 bytes {8} [built]
+chunk    {9} pageF.js (pageF) 137 bytes ={0}= ={2}= ={3}= [entry] [rendered]
+    > ./pages/f pageF
+  [0] ./stuff/s1.js 31 bytes {5} {7} {9} {10} [built]
+ [21] ./pages/f.js 106 bytes {9} [built]
+chunk   {10} pageG.js (pageG) 67 bytes ={0}= [entry] [rendered]
+    > ./pages/g pageG
+  [0] ./stuff/s1.js 31 bytes {5} {7} {9} {10} [built]
+ [22] ./pages/g.js 36 bytes {10} [built]
+chunk   {11} vendors~pageA.js (vendors~pageA) 43 bytes ={1}= ={3}= ={4}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~pageA)
+    > ./pages/a pageA
     1 module
-chunk    {5} vendors~pageB.js (vendors~pageB) 43 bytes ={12}= ={3}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~pageB)
+chunk   {12} vendors~pageB.js (vendors~pageB) 43 bytes ={1}= ={5}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~pageB)
     > ./pages/b pageB
     1 module
-chunk    {6} vendors~pageA.js (vendors~pageA) 43 bytes ={1}= ={13}= ={3}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~pageA)
-    > ./pages/a pageA
-    1 module
-chunk    {7} pageG.js (pageG) 70 bytes ={0}= [entry] [rendered]
-    > ./pages/g pageG
-  [0] ./stuff/s1.js 31 bytes {7} {8} {10} {12} [built]
- [10] ./pages/g.js 39 bytes {7} [built]
-chunk    {8} pageF.js (pageF) 144 bytes ={0}= ={1}= ={2}= [entry] [rendered]
-    > ./pages/f pageF
-  [0] ./stuff/s1.js 31 bytes {7} {8} {10} {12} [built]
- [11] ./pages/f.js 113 bytes {8} [built]
-chunk    {9} pageE.js (pageE) 98 bytes ={0}= ={2}= [entry] [rendered]
-    > ./pages/e pageE
-  [4] ./stuff/s7.js 31 bytes {9} {12} [built]
- [12] ./pages/e.js 67 bytes {9} [built]
-chunk   {10} pageD.js (pageD) 144 bytes ={0}= ={1}= ={2}= [entry] [rendered]
-    > ./pages/d pageD
-  [0] ./stuff/s1.js 31 bytes {7} {8} {10} {12} [built]
- [13] ./pages/d.js 113 bytes {10} [built]
-chunk   {11} pageC.js (pageC) 206 bytes ={3}= ={4}= [entry] [rendered]
+chunk   {13} vendors~pageC.js (vendors~pageC) 43 bytes ={1}= ={6}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~pageC)
     > ./pages/c pageC
-  [5] ./stuff/s4.js 31 bytes {11} {13} [built]
- [14] ./stuff/s6.js 31 bytes {11} [built]
- [15] ./stuff/s5.js 31 bytes {11} [built]
- [17] ./pages/c.js 113 bytes {11} [built]
-chunk   {12} pageB.js (pageB) 206 bytes ={3}= ={5}= [entry] [rendered]
-    > ./pages/b pageB
-  [0] ./stuff/s1.js 31 bytes {7} {8} {10} {12} [built]
-  [4] ./stuff/s7.js 31 bytes {9} {12} [built]
- [18] ./stuff/s8.js 31 bytes {12} [built]
- [20] ./pages/b.js 113 bytes {12} [built]
-chunk   {13} pageA.js (pageA) 144 bytes ={1}= ={3}= ={6}= [entry] [rendered]
-    > ./pages/a pageA
-  [5] ./stuff/s4.js 31 bytes {11} {13} [built]
- [22] ./pages/a.js 113 bytes {13} [built]
+    1 module
 ```
\ No newline at end of file
diff --git a/examples/many-pages/template.md b/examples/many-pages/template.md
index 7bbc7b0dd44..b4633cf6dfb 100644
--- a/examples/many-pages/template.md
+++ b/examples/many-pages/template.md
@@ -1,6 +1,6 @@
 # Info
 
-This example illustrates webpack's algorthim for automatic deduplication using `optimization.splitChunks`.
+This example illustrates webpack's algorithm for automatic deduplication using `optimization.splitChunks`.
 
 This example application contains 7 pages, each of them importing 1-3 modules from the `node_modules` folder (vendor libs) and 0-3 modules from the `stuff` folder (application modules). In reallity an application is probably more complex, but the same mechanisms apply.
 
diff --git a/examples/many-pages/webpack.config.js b/examples/many-pages/webpack.config.js
index f47598f6309..b5ce749f624 100644
--- a/examples/many-pages/webpack.config.js
+++ b/examples/many-pages/webpack.config.js
@@ -14,7 +14,7 @@ module.exports = {
 			chunks: "all",
 			maxInitialRequests: 20, // for HTTP2
 			maxAsyncRequests: 20, // for HTTP2
-			minSize: 40 // for example only: choosen to match 2 modules
+			minSize: 40 // for example only: chosen to match 2 modules
 			// omit minSize in real use case to use the default of 30kb
 		}
 	}
diff --git a/examples/mixed/README.md b/examples/mixed/README.md
index 56defcdc409..ae0b6acb49c 100644
--- a/examples/mixed/README.md
+++ b/examples/mixed/README.md
@@ -65,6 +65,7 @@ require(
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -81,6 +82,7 @@ require(
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -95,7 +97,7 @@ require(
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		1: 0
+/******/ 		0: 0
 /******/ 	};
 /******/
 /******/
@@ -153,19 +155,16 @@ require(
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -182,6 +181,10 @@ require(
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -197,19 +200,34 @@ require(
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -247,6 +265,23 @@ require(
 ``` javascript
 /******/ ([
 /* 0 */
+/*!*********************!*\
+  !*** ./commonjs.js ***!
+  \*********************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+// CommonJs Module Format
+module.exports = 123;
+
+// but you can use amd style requires
+Promise.resolve(/*! AMD require */).then(function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = [__webpack_require__(/*! ./amd */ 1), __webpack_require__(/*! ./harmony */ 2)]; (function(amd1, harmony) {
+		var amd2 = __webpack_require__(/*! ./amd */ 1);
+		var harmony2 = __webpack_require__(/*! ./harmony */ 2);
+	}).apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);}).catch(__webpack_require__.oe);
+
+/***/ }),
+/* 1 */
 /*!****************!*\
   !*** ./amd.js ***!
   \****************/
@@ -254,32 +289,15 @@ require(
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// AMD Module Format
-!(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(/*! ./commonjs */ 1), __webpack_require__(/*! ./harmony */ 2)], __WEBPACK_AMD_DEFINE_RESULT__ = (function(commonjs1, harmony1) {
+!(__WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__(/*! ./commonjs */ 0), __webpack_require__(/*! ./harmony */ 2)], __WEBPACK_AMD_DEFINE_RESULT__ = (function(commonjs1, harmony1) {
 		// but you can use CommonJs-style requires:
-		var commonjs2 = __webpack_require__(/*! ./commonjs */ 1);
+		var commonjs2 = __webpack_require__(/*! ./commonjs */ 0);
 		var harmony2 = __webpack_require__(/*! ./harmony */ 2);
 		// Do something...
 		return 456;
 	}).apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
 				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
 
-/***/ }),
-/* 1 */
-/*!*********************!*\
-  !*** ./commonjs.js ***!
-  \*********************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-// CommonJs Module Format
-module.exports = 123;
-
-// but you can use amd style requires
-Promise.resolve(/*! AMD require */).then(function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = [__webpack_require__(/*! ./amd */ 0), __webpack_require__(/*! ./harmony */ 2)]; (function(amd1, harmony) {
-		var amd2 = __webpack_require__(/*! ./amd */ 0);
-		var harmony2 = __webpack_require__(/*! ./harmony */ 2);
-	}).apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);}).catch(__webpack_require__.oe);
-
 /***/ }),
 /* 2 */
 /*!********************!*\
@@ -290,9 +308,9 @@ Promise.resolve(/*! AMD require */).then(function() { var __WEBPACK_AMD_REQUIRE_
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _commonjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./commonjs */ 1);
+/* harmony import */ var _commonjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./commonjs */ 0);
 /* harmony import */ var _commonjs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_commonjs__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _amd__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./amd */ 0);
+/* harmony import */ var _amd__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./amd */ 1);
 /* harmony import */ var _amd__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_amd__WEBPACK_IMPORTED_MODULE_1__);
 // ES6 Modules
 
@@ -310,15 +328,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 // CommonJs-style requires
-var commonjs1 = __webpack_require__(/*! ./commonjs */ 1);
-var amd1 = __webpack_require__(/*! ./amd */ 0);
+var commonjs1 = __webpack_require__(/*! ./commonjs */ 0);
+var amd1 = __webpack_require__(/*! ./amd */ 1);
 var harmony1 = __webpack_require__(/*! ./harmony */ 2);
 
 // AMD-style requires (with all webpack features)
-__webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = [
-	__webpack_require__(/*! ./commonjs */ 1), __webpack_require__(/*! ./amd */ 0),
+__webpack_require__.e(/*! AMD require */ 1).then(function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = [
+	__webpack_require__(/*! ./commonjs */ 0), __webpack_require__(/*! ./amd */ 1),
 	__webpack_require__(4)("./"+amd1+".js"),
-	Math.random() < 0.5 ? __webpack_require__(/*! ./commonjs */ 1) : __webpack_require__(/*! ./amd */ 0)]; (function(commonjs2, amd2, template, randModule) {
+	Math.random() < 0.5 ? __webpack_require__(/*! ./commonjs */ 0) : __webpack_require__(/*! ./amd */ 1)]; (function(commonjs2, amd2, template, randModule) {
 		// Do something with it...
 	}).apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);}).catch(__webpack_require__.oe);
 
@@ -327,10 +345,10 @@ __webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_
 /******/ ]);
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */,
 /* 1 */,
 /* 2 */,
@@ -343,16 +361,15 @@ __webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_
 /***/ (function(module, exports, __webpack_require__) {
 
 var map = {
-	"./a.js": 7,
+	"./a.js": 5,
 	"./b.js": 6,
-	"./c.js": 5
+	"./c.js": 7
 };
 
 
 function webpackContext(req) {
 	var id = webpackContextResolve(req);
-	var module = __webpack_require__(id);
-	return module;
+	return __webpack_require__(id);
 }
 function webpackContextResolve(req) {
 	var id = map[req];
@@ -373,13 +390,13 @@ webpackContext.id = 4;
 /***/ }),
 /* 5 */
 /*!*****************************************!*\
-  !*** ../require.context/templates/c.js ***!
+  !*** ../require.context/templates/a.js ***!
   \*****************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
 module.exports = function() {
-	return "This text was generated by template C";
+	return "This text was generated by template A";
 }
 
 /***/ }),
@@ -397,13 +414,13 @@ module.exports = function() {
 /***/ }),
 /* 7 */
 /*!*****************************************!*\
-  !*** ../require.context/templates/a.js ***!
+  !*** ../require.context/templates/c.js ***!
   \*****************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
 module.exports = function() {
-	return "This text was generated by template A";
+	return "This text was generated by template C";
 }
 
 /***/ })
@@ -416,90 +433,90 @@ module.exports = function() {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset      Size  Chunks             Chunk Names
-0.output.js  1.87 KiB       0  [emitted]  
-  output.js    10 KiB       1  [emitted]  main
+  output.js    11 KiB       0  [emitted]  main
+1.output.js  1.84 KiB       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 439 bytes <{1}> [rendered]
-    > [3] ./example.js 7:0-14:1
- [4] ../require.context/templates sync ^\.\/.*\.js$ 193 bytes {0} [built]
-     amd require context ../require.context/templates [3] ./example.js 7:0-14:1
- [5] ../require.context/templates/c.js 82 bytes {0} [optional] [built]
-     context element ./c.js [4] ../require.context/templates sync ^\.\/.*\.js$ ./c.js
- [6] ../require.context/templates/b.js 82 bytes {0} [optional] [built]
-     context element ./b.js [4] ../require.context/templates sync ^\.\/.*\.js$ ./b.js
- [7] ../require.context/templates/a.js 82 bytes {0} [optional] [built]
-     context element ./a.js [4] ../require.context/templates sync ^\.\/.*\.js$ ./a.js
-chunk    {1} output.js (main) 1.03 KiB >{0}< [entry] [rendered]
+chunk    {0} output.js (main) 1010 bytes >{1}< [entry] [rendered]
     > .\example.js main
- [0] ./amd.js 309 bytes {1} [built]
-     amd require ./amd [1] ./commonjs.js 5:0-11:1
-     cjs require ./amd [1] ./commonjs.js 8:13-29
-     harmony side effect evaluation ./amd [2] ./harmony.js 3:0-24
-     cjs require ./amd [3] ./example.js 3:11-27
-     amd require ./amd [3] ./example.js 7:0-14:1
-     amd require ./amd [3] ./example.js 7:0-14:1
- [1] ./commonjs.js 233 bytes {1} [built]
-     amd require ./commonjs [0] ./amd.js 2:0-12:1
-     cjs require ./commonjs [0] ./amd.js 7:18-39
+ [0] ./commonjs.js 223 bytes {0} [built]
+     amd require ./commonjs [1] ./amd.js 2:0-12:1
+     cjs require ./commonjs [1] ./amd.js 7:18-39
      harmony side effect evaluation ./commonjs [2] ./harmony.js 2:0-34
      cjs require ./commonjs [3] ./example.js 2:16-37
      amd require ./commonjs [3] ./example.js 7:0-14:1
      amd require ./commonjs [3] ./example.js 7:0-14:1
- [2] ./harmony.js 101 bytes {1} [built]
+ [1] ./amd.js 298 bytes {0} [built]
+     amd require ./amd [0] ./commonjs.js 5:0-11:1
+     cjs require ./amd [0] ./commonjs.js 8:13-29
+     harmony side effect evaluation ./amd [2] ./harmony.js 3:0-24
+     cjs require ./amd [3] ./example.js 3:11-27
+     amd require ./amd [3] ./example.js 7:0-14:1
+     amd require ./amd [3] ./example.js 7:0-14:1
+ [2] ./harmony.js 96 bytes {0} [built]
      [exports: default]
-     amd require ./harmony [0] ./amd.js 2:0-12:1
-     cjs require ./harmony [0] ./amd.js 8:17-37
-     amd require ./harmony [1] ./commonjs.js 5:0-11:1
-     cjs require ./harmony [1] ./commonjs.js 9:17-37
+     amd require ./harmony [0] ./commonjs.js 5:0-11:1
+     cjs require ./harmony [0] ./commonjs.js 9:17-37
+     amd require ./harmony [1] ./amd.js 2:0-12:1
+     cjs require ./harmony [1] ./amd.js 8:17-37
      cjs require ./harmony [3] ./example.js 4:15-35
- [3] ./example.js 410 bytes {1} [built]
+ [3] ./example.js 396 bytes {0} [built]
      single entry .\example.js  main
+chunk    {1} 1.output.js 433 bytes <{0}> [rendered]
+    > [3] ./example.js 7:0-14:1
+ [4] ../require.context/templates sync ^\.\/.*\.js$ 193 bytes {1} [built]
+     amd require context ../require.context/templates [3] ./example.js 7:0-14:1
+ [5] ../require.context/templates/a.js 80 bytes {1} [optional] [built]
+     context element ./a.js [4] ../require.context/templates sync ^\.\/.*\.js$ ./a.js
+ [6] ../require.context/templates/b.js 80 bytes {1} [optional] [built]
+     context element ./b.js [4] ../require.context/templates sync ^\.\/.*\.js$ ./b.js
+ [7] ../require.context/templates/c.js 80 bytes {1} [optional] [built]
+     context element ./c.js [4] ../require.context/templates sync ^\.\/.*\.js$ ./c.js
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  606 bytes       0  [emitted]  
-  output.js   2.06 KiB       1  [emitted]  main
+  output.js   2.44 KiB       0  [emitted]  main
+1.output.js  605 bytes       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 439 bytes <{1}> [rendered]
-    > [3] ./example.js 7:0-14:1
- [4] ../require.context/templates sync ^\.\/.*\.js$ 193 bytes {0} [built]
-     amd require context ../require.context/templates [3] ./example.js 7:0-14:1
- [5] ../require.context/templates/c.js 82 bytes {0} [optional] [built]
-     context element ./c.js [4] ../require.context/templates sync ^\.\/.*\.js$ ./c.js
- [6] ../require.context/templates/b.js 82 bytes {0} [optional] [built]
-     context element ./b.js [4] ../require.context/templates sync ^\.\/.*\.js$ ./b.js
- [7] ../require.context/templates/a.js 82 bytes {0} [optional] [built]
-     context element ./a.js [4] ../require.context/templates sync ^\.\/.*\.js$ ./a.js
-chunk    {1} output.js (main) 1.03 KiB >{0}< [entry] [rendered]
+chunk    {0} output.js (main) 1010 bytes >{1}< [entry] [rendered]
     > .\example.js main
- [0] ./amd.js 309 bytes {1} [built]
-     amd require ./amd [1] ./commonjs.js 5:0-11:1
-     cjs require ./amd [1] ./commonjs.js 8:13-29
-     harmony side effect evaluation ./amd [2] ./harmony.js 3:0-24
-     cjs require ./amd [3] ./example.js 3:11-27
-     amd require ./amd [3] ./example.js 7:0-14:1
-     amd require ./amd [3] ./example.js 7:0-14:1
- [1] ./commonjs.js 233 bytes {1} [built]
-     amd require ./commonjs [0] ./amd.js 2:0-12:1
-     cjs require ./commonjs [0] ./amd.js 7:18-39
+ [0] ./commonjs.js 223 bytes {0} [built]
+     amd require ./commonjs [1] ./amd.js 2:0-12:1
+     cjs require ./commonjs [1] ./amd.js 7:18-39
      harmony side effect evaluation ./commonjs [2] ./harmony.js 2:0-34
      cjs require ./commonjs [3] ./example.js 2:16-37
      amd require ./commonjs [3] ./example.js 7:0-14:1
      amd require ./commonjs [3] ./example.js 7:0-14:1
- [2] ./harmony.js 101 bytes {1} [built]
+ [1] ./amd.js 298 bytes {0} [built]
+     amd require ./amd [0] ./commonjs.js 5:0-11:1
+     cjs require ./amd [0] ./commonjs.js 8:13-29
+     harmony side effect evaluation ./amd [2] ./harmony.js 3:0-24
+     cjs require ./amd [3] ./example.js 3:11-27
+     amd require ./amd [3] ./example.js 7:0-14:1
+     amd require ./amd [3] ./example.js 7:0-14:1
+ [2] ./harmony.js 96 bytes {0} [built]
      [exports: default]
-     amd require ./harmony [0] ./amd.js 2:0-12:1
-     cjs require ./harmony [0] ./amd.js 8:17-37
-     amd require ./harmony [1] ./commonjs.js 5:0-11:1
-     cjs require ./harmony [1] ./commonjs.js 9:17-37
+     amd require ./harmony [0] ./commonjs.js 5:0-11:1
+     cjs require ./harmony [0] ./commonjs.js 9:17-37
+     amd require ./harmony [1] ./amd.js 2:0-12:1
+     cjs require ./harmony [1] ./amd.js 8:17-37
      cjs require ./harmony [3] ./example.js 4:15-35
- [3] ./example.js 410 bytes {1} [built]
+ [3] ./example.js 396 bytes {0} [built]
      single entry .\example.js  main
+chunk    {1} 1.output.js 433 bytes <{0}> [rendered]
+    > [3] ./example.js 7:0-14:1
+ [4] ../require.context/templates sync ^\.\/.*\.js$ 193 bytes {1} [built]
+     amd require context ../require.context/templates [3] ./example.js 7:0-14:1
+ [5] ../require.context/templates/a.js 80 bytes {1} [optional] [built]
+     context element ./a.js [4] ../require.context/templates sync ^\.\/.*\.js$ ./a.js
+ [6] ../require.context/templates/b.js 80 bytes {1} [optional] [built]
+     context element ./b.js [4] ../require.context/templates sync ^\.\/.*\.js$ ./b.js
+ [7] ../require.context/templates/c.js 80 bytes {1} [optional] [built]
+     context element ./c.js [4] ../require.context/templates sync ^\.\/.*\.js$ ./c.js
 ```
diff --git a/examples/mixed/template.md b/examples/mixed/template.md
index aba51a1fa21..b479855ec85 100644
--- a/examples/mixed/template.md
+++ b/examples/mixed/template.md
@@ -26,10 +26,10 @@ You see that everything is working nicely together.
 {{dist/output.js}}
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-{{dist/0.output.js}}
+{{dist/1.output.js}}
 ```
 
 # Info
diff --git a/examples/multi-compiler/README.md b/examples/multi-compiler/README.md
index 1a84eb892fd..6d62405808e 100644
--- a/examples/multi-compiler/README.md
+++ b/examples/multi-compiler/README.md
@@ -89,19 +89,34 @@ module.exports = [
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -183,19 +198,34 @@ console.log("Running " + "desktop" + " build");
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -249,26 +279,26 @@ console.log("Running " + "mobile" + " build");
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
 Child mobile:
     Hash: 0a1b2c3d4e5f6a7b8c9d
-        Asset      Size  Chunks             Chunk Names
-    mobile.js  3.04 KiB       0  [emitted]  main
+        Asset   Size  Chunks             Chunk Names
+    mobile.js  4 KiB       0  [emitted]  main
     Entrypoint main = mobile.js
-    chunk    {0} mobile.js (main) 117 bytes [entry] [rendered]
+    chunk    {0} mobile.js (main) 114 bytes [entry] [rendered]
         > ./example main
-     [0] ./example.js 97 bytes {0} [built]
+     [0] ./example.js 94 bytes {0} [built]
          single entry ./example  main
      [1] ./mobile-stuff.js 20 bytes {0} [built]
          cjs require ./mobile-stuff [0] ./example.js 2:1-26
 Child desktop:
     Hash: 0a1b2c3d4e5f6a7b8c9d
-         Asset     Size  Chunks             Chunk Names
-    desktop.js  2.8 KiB       0  [emitted]  main
+         Asset      Size  Chunks             Chunk Names
+    desktop.js  3.76 KiB       0  [emitted]  main
     Entrypoint main = desktop.js
-    chunk    {0} desktop.js (main) 97 bytes [entry] [rendered]
+    chunk    {0} desktop.js (main) 94 bytes [entry] [rendered]
         > ./example main
-     [0] ./example.js 97 bytes {0} [built]
+     [0] ./example.js 94 bytes {0} [built]
          single entry ./example  main
 ```
 
@@ -276,25 +306,25 @@ Child desktop:
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
 Child mobile:
     Hash: 0a1b2c3d4e5f6a7b8c9d
         Asset       Size  Chunks             Chunk Names
-    mobile.js  608 bytes       0  [emitted]  main
+    mobile.js  993 bytes       0  [emitted]  main
     Entrypoint main = mobile.js
-    chunk    {0} mobile.js (main) 117 bytes [entry] [rendered]
+    chunk    {0} mobile.js (main) 114 bytes [entry] [rendered]
         > ./example main
-     [0] ./mobile-stuff.js 20 bytes {0} [built]
-         cjs require ./mobile-stuff [1] ./example.js 2:1-26
-     [1] ./example.js 97 bytes {0} [built]
+     [0] ./example.js 94 bytes {0} [built]
          single entry ./example  main
+     [1] ./mobile-stuff.js 20 bytes {0} [built]
+         cjs require ./mobile-stuff [0] ./example.js 2:1-26
 Child desktop:
     Hash: 0a1b2c3d4e5f6a7b8c9d
          Asset       Size  Chunks             Chunk Names
-    desktop.js  588 bytes       0  [emitted]  main
+    desktop.js  973 bytes       0  [emitted]  main
     Entrypoint main = desktop.js
-    chunk    {0} desktop.js (main) 97 bytes [entry] [rendered]
+    chunk    {0} desktop.js (main) 94 bytes [entry] [rendered]
         > ./example main
-     [0] ./example.js 97 bytes {0} [built]
+     [0] ./example.js 94 bytes {0} [built]
          single entry ./example  main
 ```
\ No newline at end of file
diff --git a/examples/multi-part-library/README.md b/examples/multi-part-library/README.md
index 9570e6dfb24..6e180b96af0 100644
--- a/examples/multi-part-library/README.md
+++ b/examples/multi-part-library/README.md
@@ -86,19 +86,34 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -190,19 +205,34 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -245,10 +275,10 @@ module.exports = "beta";
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
              Asset      Size  Chunks             Chunk Names
-MyLibrary.alpha.js  3.16 KiB       0  [emitted]  alpha
- MyLibrary.beta.js  3.16 KiB       1  [emitted]  beta
+MyLibrary.alpha.js  4.12 KiB       0  [emitted]  alpha
+ MyLibrary.beta.js  4.12 KiB       1  [emitted]  beta
 Entrypoint alpha = MyLibrary.alpha.js
 Entrypoint beta = MyLibrary.beta.js
 chunk    {0} MyLibrary.alpha.js (alpha) 25 bytes [entry] [rendered]
@@ -265,18 +295,18 @@ chunk    {1} MyLibrary.beta.js (beta) 24 bytes [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-             Asset       Size  Chunks             Chunk Names
- MyLibrary.beta.js  828 bytes       0  [emitted]  beta
-MyLibrary.alpha.js  832 bytes       1  [emitted]  alpha
+Version: webpack 4.20.1
+             Asset      Size  Chunks             Chunk Names
+MyLibrary.alpha.js  1.19 KiB       0  [emitted]  alpha
+ MyLibrary.beta.js  1.19 KiB       1  [emitted]  beta
 Entrypoint alpha = MyLibrary.alpha.js
 Entrypoint beta = MyLibrary.beta.js
-chunk    {0} MyLibrary.beta.js (beta) 24 bytes [entry] [rendered]
-    > ./beta beta
- [0] ./beta.js 24 bytes {0} [built]
-     single entry ./beta  beta
-chunk    {1} MyLibrary.alpha.js (alpha) 25 bytes [entry] [rendered]
+chunk    {0} MyLibrary.alpha.js (alpha) 25 bytes [entry] [rendered]
     > ./alpha alpha
- [1] ./alpha.js 25 bytes {1} [built]
+ [0] ./alpha.js 25 bytes {0} [built]
      single entry ./alpha  alpha
+chunk    {1} MyLibrary.beta.js (beta) 24 bytes [entry] [rendered]
+    > ./beta beta
+ [1] ./beta.js 24 bytes {1} [built]
+     single entry ./beta  beta
 ```
diff --git a/examples/multiple-entry-points/README.md b/examples/multiple-entry-points/README.md
index a3c2f0b930d..dc0666d4094 100644
--- a/examples/multiple-entry-points/README.md
+++ b/examples/multiple-entry-points/README.md
@@ -88,8 +88,7 @@ module.exports = {
 
 ``` javascript
 (window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
-/* 0 */,
-/* 1 */
+/* 0 */
 /*!*******************!*\
   !*** ./common.js ***!
   \*******************/
@@ -113,6 +112,7 @@ module.exports = "Common";
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/ 		var executeModules = data[2];
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -129,6 +129,7 @@ module.exports = "Common";
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -163,7 +164,7 @@ module.exports = "Common";
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		3: 0
+/******/ 		2: 0
 /******/ 	};
 /******/
 /******/ 	var deferredModules = [];
@@ -221,19 +222,16 @@ module.exports = "Common";
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -250,6 +248,10 @@ module.exports = "Common";
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -265,19 +267,34 @@ module.exports = "Common";
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -305,7 +322,7 @@ module.exports = "Common";
 /******/
 /******/
 /******/ 	// add entry module to deferred list
-/******/ 	deferredModules.push([3,1]);
+/******/ 	deferredModules.push([2,1]);
 /******/ 	// run deferred modules when ready
 /******/ 	return checkDeferredModules();
 /******/ })
@@ -317,15 +334,15 @@ module.exports = "Common";
 ``` javascript
 /******/ ({
 
-/***/ 3:
+/***/ 2:
 /*!******************!*\
   !*** ./pageA.js ***!
   \******************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-var common = __webpack_require__(/*! ./common */ 1);
-__webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = [__webpack_require__(/*! ./shared */ 0)]; (function(shared) {
+var common = __webpack_require__(/*! ./common */ 0);
+__webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = [__webpack_require__(/*! ./shared */ 1)]; (function(shared) {
 	shared("This is page A");
 }).apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);}).catch(__webpack_require__.oe);
 
@@ -343,6 +360,7 @@ __webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/ 		var executeModules = data[2];
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -359,6 +377,7 @@ __webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -393,7 +412,7 @@ __webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		2: 0
+/******/ 		3: 0
 /******/ 	};
 /******/
 /******/ 	var deferredModules = [];
@@ -451,19 +470,16 @@ __webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -480,6 +496,10 @@ __webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -495,19 +515,34 @@ __webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -535,23 +570,23 @@ __webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_
 /******/
 /******/
 /******/ 	// add entry module to deferred list
-/******/ 	deferredModules.push([2,1]);
+/******/ 	deferredModules.push([3,1]);
 /******/ 	// run deferred modules when ready
 /******/ 	return checkDeferredModules();
 /******/ })
 /************************************************************************/
 /******/ ({
 
-/***/ 2:
+/***/ 3:
 /*!******************!*\
   !*** ./pageB.js ***!
   \******************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-var common = __webpack_require__(/*! ./common */ 1);
+var common = __webpack_require__(/*! ./common */ 0);
 __webpack_require__.e(/*! require.ensure */ 0).then((function(require) {
-	var shared = __webpack_require__(/*! ./shared */ 0);
+	var shared = __webpack_require__(/*! ./shared */ 1);
 	shared("This is page B");
 }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 
@@ -564,14 +599,15 @@ __webpack_require__.e(/*! require.ensure */ 0).then((function(require) {
 
 ``` javascript
 (window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
-/* 0 */
+/* 0 */,
+/* 1 */
 /*!*******************!*\
   !*** ./shared.js ***!
   \*******************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-var common = __webpack_require__(/*! ./common */ 1);
+var common = __webpack_require__(/*! ./common */ 0);
 module.exports = function(msg) {
 	console.log(msg);
 };
@@ -586,70 +622,70 @@ module.exports = function(msg) {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
      Asset       Size  Chunks             Chunk Names
-      0.js  363 bytes       0  [emitted]  
-commons.js  267 bytes       1  [emitted]  commons
-  pageB.js   8.28 KiB       2  [emitted]  pageB
-  pageA.js   8.32 KiB       3  [emitted]  pageA
+      0.js  369 bytes       0  [emitted]  
+commons.js  258 bytes       1  [emitted]  commons
+  pageA.js   9.34 KiB       2  [emitted]  pageA
+  pageB.js   9.29 KiB       3  [emitted]  pageB
 Entrypoint pageA = commons.js pageA.js
 Entrypoint pageB = commons.js pageB.js
-chunk    {0} 0.js 91 bytes <{1}> <{2}> <{3}> [rendered]
-    > [2] ./pageB.js 2:0-5:2
-    > ./shared [3] ./pageA.js 2:0-4:2
- [0] ./shared.js 91 bytes {0} [built]
-     require.ensure item ./shared [2] ./pageB.js 2:0-5:2
-     cjs require ./shared [2] ./pageB.js 3:14-33
-     amd require ./shared [3] ./pageA.js 2:0-4:2
+chunk    {0} 0.js 88 bytes <{1}> <{2}> <{3}> [rendered]
+    > ./shared [2] ./pageA.js 2:0-4:2
+    > [3] ./pageB.js 2:0-5:2
+ [1] ./shared.js 88 bytes {0} [built]
+     amd require ./shared [2] ./pageA.js 2:0-4:2
+     require.ensure item ./shared [3] ./pageB.js 2:0-5:2
+     cjs require ./shared [3] ./pageB.js 3:14-33
 chunk    {1} commons.js (commons) 26 bytes ={2}= ={3}= >{0}< [initial] [rendered] split chunk (cache group: commons) (name: commons)
     > ./pageA pageA
     > ./pageB pageB
- [1] ./common.js 26 bytes {1} [built]
-     cjs require ./common [0] ./shared.js 1:13-32
-     cjs require ./common [2] ./pageB.js 1:13-32
-     cjs require ./common [3] ./pageA.js 1:13-32
-chunk    {2} pageB.js (pageB) 152 bytes ={1}= >{0}< [entry] [rendered]
-    > ./pageB pageB
- [2] ./pageB.js 152 bytes {2} [built]
-     single entry ./pageB  pageB
-chunk    {3} pageA.js (pageA) 108 bytes ={1}= >{0}< [entry] [rendered]
+ [0] ./common.js 26 bytes {1} [built]
+     cjs require ./common [1] ./shared.js 1:13-32
+     cjs require ./common [2] ./pageA.js 1:13-32
+     cjs require ./common [3] ./pageB.js 1:13-32
+chunk    {2} pageA.js (pageA) 105 bytes ={1}= >{0}< [entry] [rendered]
     > ./pageA pageA
- [3] ./pageA.js 108 bytes {3} [built]
+ [2] ./pageA.js 105 bytes {2} [built]
      single entry ./pageA  pageA
+chunk    {3} pageB.js (pageB) 148 bytes ={1}= >{0}< [entry] [rendered]
+    > ./pageB pageB
+ [3] ./pageB.js 148 bytes {3} [built]
+     single entry ./pageB  pageB
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
      Asset       Size  Chunks             Chunk Names
-      0.js  120 bytes       0  [emitted]  
-commons.js   95 bytes       1  [emitted]  commons
-  pageB.js   1.88 KiB       2  [emitted]  pageB
-  pageA.js   1.91 KiB       3  [emitted]  pageA
+      0.js  121 bytes       0  [emitted]  
+commons.js   94 bytes       1  [emitted]  commons
+  pageA.js   2.29 KiB       2  [emitted]  pageA
+  pageB.js   2.26 KiB       3  [emitted]  pageB
 Entrypoint pageA = commons.js pageA.js
 Entrypoint pageB = commons.js pageB.js
-chunk    {0} 0.js 91 bytes <{1}> <{2}> <{3}> [rendered]
-    > [2] ./pageB.js 2:0-5:2
-    > ./shared [3] ./pageA.js 2:0-4:2
- [0] ./shared.js 91 bytes {0} [built]
-     require.ensure item ./shared [2] ./pageB.js 2:0-5:2
-     cjs require ./shared [2] ./pageB.js 3:14-33
-     amd require ./shared [3] ./pageA.js 2:0-4:2
+chunk    {0} 0.js 88 bytes <{1}> <{2}> <{3}> [rendered]
+    > ./shared [2] ./pageA.js 2:0-4:2
+    > [3] ./pageB.js 2:0-5:2
+ [1] ./shared.js 88 bytes {0} [built]
+     amd require ./shared [2] ./pageA.js 2:0-4:2
+     require.ensure item ./shared [3] ./pageB.js 2:0-5:2
+     cjs require ./shared [3] ./pageB.js 3:14-33
 chunk    {1} commons.js (commons) 26 bytes ={2}= ={3}= >{0}< [initial] [rendered] split chunk (cache group: commons) (name: commons)
     > ./pageA pageA
     > ./pageB pageB
- [1] ./common.js 26 bytes {1} [built]
-     cjs require ./common [0] ./shared.js 1:13-32
-     cjs require ./common [2] ./pageB.js 1:13-32
-     cjs require ./common [3] ./pageA.js 1:13-32
-chunk    {2} pageB.js (pageB) 152 bytes ={1}= >{0}< [entry] [rendered]
-    > ./pageB pageB
- [2] ./pageB.js 152 bytes {2} [built]
-     single entry ./pageB  pageB
-chunk    {3} pageA.js (pageA) 108 bytes ={1}= >{0}< [entry] [rendered]
+ [0] ./common.js 26 bytes {1} [built]
+     cjs require ./common [1] ./shared.js 1:13-32
+     cjs require ./common [2] ./pageA.js 1:13-32
+     cjs require ./common [3] ./pageB.js 1:13-32
+chunk    {2} pageA.js (pageA) 105 bytes ={1}= >{0}< [entry] [rendered]
     > ./pageA pageA
- [3] ./pageA.js 108 bytes {3} [built]
+ [2] ./pageA.js 105 bytes {2} [built]
      single entry ./pageA  pageA
+chunk    {3} pageB.js (pageB) 148 bytes ={1}= >{0}< [entry] [rendered]
+    > ./pageB pageB
+ [3] ./pageB.js 148 bytes {3} [built]
+     single entry ./pageB  pageB
 ```
diff --git a/examples/named-chunks/README.md b/examples/named-chunks/README.md
index 07017fd847b..19ecd126437 100644
--- a/examples/named-chunks/README.md
+++ b/examples/named-chunks/README.md
@@ -35,6 +35,7 @@ require.ensure(["b"], function(require) {
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -51,6 +52,7 @@ require.ensure(["b"], function(require) {
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -65,7 +67,7 @@ require.ensure(["b"], function(require) {
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		2: 0
+/******/ 		0: 0
 /******/ 	};
 /******/
 /******/
@@ -123,19 +125,16 @@ require.ensure(["b"], function(require) {
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -152,6 +151,10 @@ require.ensure(["b"], function(require) {
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -167,19 +170,34 @@ require.ensure(["b"], function(require) {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -207,7 +225,7 @@ require.ensure(["b"], function(require) {
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 3);
+/******/ 	return __webpack_require__(__webpack_require__.s = 2);
 /******/ })
 /************************************************************************/
 ```
@@ -219,23 +237,13 @@ require.ensure(["b"], function(require) {
 /* 0 */,
 /* 1 */,
 /* 2 */
-/*!***************************!*\
-  !*** ./node_modules/a.js ***!
-  \***************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-// module a
-
-/***/ }),
-/* 3 */
 /*!********************!*\
   !*** ./example.js ***!
   \********************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-var a = __webpack_require__(/*! a */ 2);
+var a = __webpack_require__(/*! a */ 3);
 
 __webpack_require__.e(/*! require.ensure | my own chunk */ 1).then((function(require) {
 	// a named chunk
@@ -251,20 +259,30 @@ __webpack_require__.e(/*! require.ensure | my own chunk */ 1).then((function(req
 	// the same again
 }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 
-__webpack_require__.e(/*! require.ensure */ 0).then((function(require) {
+__webpack_require__.e(/*! require.ensure */ 2).then((function(require) {
 	// chunk without name
 	var d = __webpack_require__(/*! d */ 1);
 }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 
 
+/***/ }),
+/* 3 */
+/*!***************************!*\
+  !*** ./node_modules/a.js ***!
+  \***************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+// module a
+
 /***/ })
 /******/ ]);
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */
 /*!***************************!*\
   !*** ./node_modules/b.js ***!
@@ -284,14 +302,26 @@ __webpack_require__.e(/*! require.ensure */ 0).then((function(require) {
 
 // module d
 
+/***/ }),
+/* 2 */,
+/* 3 */,
+/* 4 */
+/*!***************************!*\
+  !*** ./node_modules/c.js ***!
+  \***************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+// module c
+
 /***/ })
 ]]);
 ```
 
-# dist/1.output.js
+# dist/2.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[2],[
 /* 0 */
 /*!***************************!*\
   !*** ./node_modules/b.js ***!
@@ -311,18 +341,6 @@ __webpack_require__.e(/*! require.ensure */ 0).then((function(require) {
 
 // module d
 
-/***/ }),
-/* 2 */,
-/* 3 */,
-/* 4 */
-/*!***************************!*\
-  !*** ./node_modules/c.js ***!
-  \***************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-// module c
-
 /***/ })
 ]]);
 ```
@@ -333,48 +351,48 @@ __webpack_require__.e(/*! require.ensure */ 0).then((function(require) {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  463 bytes       0  [emitted]  
+  output.js   9.12 KiB       0  [emitted]  main
 1.output.js  677 bytes       1  [emitted]  my own chunk
-  output.js   8.13 KiB       2  [emitted]  main
+2.output.js  463 bytes       2  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 22 bytes <{2}> [rendered]
-    > [3] ./example.js 17:0-20:2
-    2 modules
-chunk    {1} 1.output.js (my own chunk) 33 bytes <{2}> [rendered]
-    > [3] ./example.js 13:0-15:18
-    > [3] ./example.js 3:0-6:18
-    > [3] ./example.js 8:0-11:18
-    3 modules
-chunk    {2} output.js (main) 452 bytes >{0}< >{1}< [entry] [rendered]
+chunk    {0} output.js (main) 432 bytes >{1}< >{2}< [entry] [rendered]
     > .\example.js main
- [3] ./example.js 441 bytes {2} [built]
+ [2] ./example.js 421 bytes {0} [built]
      single entry .\example.js  main
      + 1 hidden module
+chunk    {1} 1.output.js (my own chunk) 33 bytes <{0}> [rendered]
+    > [2] ./example.js 13:0-15:18
+    > [2] ./example.js 3:0-6:18
+    > [2] ./example.js 8:0-11:18
+    3 modules
+chunk    {2} 2.output.js 22 bytes <{0}> [rendered]
+    > [2] ./example.js 17:0-20:2
+    2 modules
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js   92 bytes       0  [emitted]  
-1.output.js  112 bytes    1, 0  [emitted]  my own chunk
-  output.js   1.84 KiB       2  [emitted]  main
+  output.js   2.22 KiB       0  [emitted]  main
+1.output.js  112 bytes    1, 2  [emitted]  my own chunk
+2.output.js   92 bytes       2  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 22 bytes <{2}> [rendered]
-    > [3] ./example.js 17:0-20:2
-    2 modules
-chunk    {1} 1.output.js (my own chunk) 33 bytes <{2}> [rendered]
-    > [3] ./example.js 13:0-15:18
-    > [3] ./example.js 3:0-6:18
-    > [3] ./example.js 8:0-11:18
-    3 modules
-chunk    {2} output.js (main) 452 bytes >{0}< >{1}< [entry] [rendered]
+chunk    {0} output.js (main) 432 bytes >{1}< >{2}< [entry] [rendered]
     > .\example.js main
- [3] ./example.js 441 bytes {2} [built]
+ [2] ./example.js 421 bytes {0} [built]
      single entry .\example.js  main
      + 1 hidden module
+chunk    {1} 1.output.js (my own chunk) 33 bytes <{0}> [rendered]
+    > [2] ./example.js 13:0-15:18
+    > [2] ./example.js 3:0-6:18
+    > [2] ./example.js 8:0-11:18
+    3 modules
+chunk    {2} 2.output.js 22 bytes <{0}> [rendered]
+    > [2] ./example.js 17:0-20:2
+    2 modules
 ```
diff --git a/examples/named-chunks/template.md b/examples/named-chunks/template.md
index ef6baf49ea2..9e48aefbb35 100644
--- a/examples/named-chunks/template.md
+++ b/examples/named-chunks/template.md
@@ -11,16 +11,16 @@
 {{dist/output.js}}
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-{{dist/0.output.js}}
+{{dist/1.output.js}}
 ```
 
-# dist/1.output.js
+# dist/2.output.js
 
 ``` javascript
-{{dist/1.output.js}}
+{{dist/2.output.js}}
 ```
 
 # Info
diff --git a/examples/require.context/README.md b/examples/require.context/README.md
index 32b55404af1..1da7d4f88fc 100644
--- a/examples/require.context/README.md
+++ b/examples/require.context/README.md
@@ -65,19 +65,34 @@ module.exports = function() {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -137,8 +152,7 @@ var map = {
 
 function webpackContext(req) {
 	var id = webpackContextResolve(req);
-	var module = __webpack_require__(id);
-	return module;
+	return __webpack_require__(id);
 }
 function webpackContextResolve(req) {
 	var id = map[req];
@@ -202,50 +216,50 @@ module.exports = function() {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
     Asset      Size  Chunks             Chunk Names
-output.js  4.48 KiB       0  [emitted]  main
+output.js  5.41 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 613 bytes [entry] [rendered]
+chunk    {0} output.js (main) 603 bytes [entry] [rendered]
     > .\example.js main
- [0] ./example.js 150 bytes {0} [built]
+ [0] ./example.js 146 bytes {0} [built]
      single entry .\example.js  main
  [1] ./templates sync ^\.\/.*$ 217 bytes {0} [built]
      cjs require context ./templates [0] ./example.js 2:8-44
- [2] ./templates/a.js 82 bytes {0} [optional] [built]
-     context element ./a.js [1] ./templates sync ^\.\/.*$ ./a.js
+ [2] ./templates/a.js 80 bytes {0} [optional] [built]
      context element ./a [1] ./templates sync ^\.\/.*$ ./a
- [3] ./templates/b.js 82 bytes {0} [optional] [built]
-     context element ./b.js [1] ./templates sync ^\.\/.*$ ./b.js
+     context element ./a.js [1] ./templates sync ^\.\/.*$ ./a.js
+ [3] ./templates/b.js 80 bytes {0} [optional] [built]
      context element ./b [1] ./templates sync ^\.\/.*$ ./b
- [4] ./templates/c.js 82 bytes {0} [optional] [built]
-     context element ./c.js [1] ./templates sync ^\.\/.*$ ./c.js
+     context element ./b.js [1] ./templates sync ^\.\/.*$ ./b.js
+ [4] ./templates/c.js 80 bytes {0} [optional] [built]
      context element ./c [1] ./templates sync ^\.\/.*$ ./c
+     context element ./c.js [1] ./templates sync ^\.\/.*$ ./c.js
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
     Asset      Size  Chunks             Chunk Names
-output.js  1.16 KiB       0  [emitted]  main
+output.js  1.54 KiB       0  [emitted]  main
 Entrypoint main = output.js
-chunk    {0} output.js (main) 613 bytes [entry] [rendered]
+chunk    {0} output.js (main) 603 bytes [entry] [rendered]
     > .\example.js main
- [0] ./templates/c.js 82 bytes {0} [optional] [built]
-     context element ./c.js [3] ./templates sync ^\.\/.*$ ./c.js
-     context element ./c [3] ./templates sync ^\.\/.*$ ./c
- [1] ./templates/b.js 82 bytes {0} [optional] [built]
-     context element ./b.js [3] ./templates sync ^\.\/.*$ ./b.js
-     context element ./b [3] ./templates sync ^\.\/.*$ ./b
- [2] ./templates/a.js 82 bytes {0} [optional] [built]
-     context element ./a.js [3] ./templates sync ^\.\/.*$ ./a.js
-     context element ./a [3] ./templates sync ^\.\/.*$ ./a
- [3] ./templates sync ^\.\/.*$ 217 bytes {0} [built]
-     cjs require context ./templates [4] ./example.js 2:8-44
- [4] ./example.js 150 bytes {0} [built]
+ [0] ./templates/a.js 80 bytes {0} [optional] [built]
+     context element ./a [4] ./templates sync ^\.\/.*$ ./a
+     context element ./a.js [4] ./templates sync ^\.\/.*$ ./a.js
+ [1] ./templates/b.js 80 bytes {0} [optional] [built]
+     context element ./b [4] ./templates sync ^\.\/.*$ ./b
+     context element ./b.js [4] ./templates sync ^\.\/.*$ ./b.js
+ [2] ./templates/c.js 80 bytes {0} [optional] [built]
+     context element ./c [4] ./templates sync ^\.\/.*$ ./c
+     context element ./c.js [4] ./templates sync ^\.\/.*$ ./c.js
+ [3] ./example.js 146 bytes {0} [built]
      single entry .\example.js  main
+ [4] ./templates sync ^\.\/.*$ 217 bytes {0} [built]
+     cjs require context ./templates [3] ./example.js 2:8-44
 ```
 
 # Code Splitting
diff --git a/examples/require.resolve/README.md b/examples/require.resolve/README.md
index 4626d98d462..ecf08d474d6 100644
--- a/examples/require.resolve/README.md
+++ b/examples/require.resolve/README.md
@@ -66,19 +66,34 @@ module.exports = Math.random();
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -146,17 +161,17 @@ module.exports = Math.random();
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
     Asset      Size  Chunks             Chunk Names
-output.js  3.25 KiB       0  [emitted]  main
+output.js  4.21 KiB       0  [emitted]  main
 Entrypoint main = output.js
 chunk    {0} output.js (main) 313 bytes [entry] [rendered]
     > .\example.js main
  [0] ./example.js 282 bytes {0} [built]
      single entry .\example.js  main
  [1] ./a.js 31 bytes {0} [built]
-     require.resolve ./a.js [0] ./example.js 4:10-35
      cjs require ./a [0] ./example.js 1:8-22
+     require.resolve ./a.js [0] ./example.js 4:10-35
      cjs require ./a [0] ./example.js 10:9-23
 ```
 
@@ -164,15 +179,15 @@ chunk    {0} output.js (main) 313 bytes [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
-    Asset       Size  Chunks             Chunk Names
-output.js  667 bytes       0  [emitted]  main
+Version: webpack 4.20.1
+    Asset      Size  Chunks             Chunk Names
+output.js  1.03 KiB       0  [emitted]  main
 Entrypoint main = output.js
 chunk    {0} output.js (main) 313 bytes [entry] [rendered]
     > .\example.js main
  [0] ./a.js 31 bytes {0} [built]
-     require.resolve ./a.js [1] ./example.js 4:10-35
      cjs require ./a [1] ./example.js 1:8-22
+     require.resolve ./a.js [1] ./example.js 4:10-35
      cjs require ./a [1] ./example.js 10:9-23
  [1] ./example.js 282 bytes {0} [built]
      single entry .\example.js  main
diff --git a/examples/scope-hoisting/README.md b/examples/scope-hoisting/README.md
index 0eac11822e0..3f4b85276bf 100644
--- a/examples/scope-hoisting/README.md
+++ b/examples/scope-hoisting/README.md
@@ -125,6 +125,7 @@ module.exports = {
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -141,6 +142,7 @@ module.exports = {
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -155,7 +157,7 @@ module.exports = {
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		1: 0
+/******/ 		0: 0
 /******/ 	};
 /******/
 /******/
@@ -213,19 +215,16 @@ module.exports = {
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -242,6 +241,10 @@ module.exports = {
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
@@ -257,19 +260,34 @@ module.exports = {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -322,7 +340,7 @@ var y = "y";
 
 // CONCATENATED MODULE: ./node_modules/shared.js
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return x; });
-/* concated harmony reexport */__webpack_require__.d(__webpack_exports__, "b", function() { return y; });
+/* concated harmony reexport y */__webpack_require__.d(__webpack_exports__, "b", function() { return y; });
 // shared module
 var x = "x";
 
@@ -359,7 +377,7 @@ function b_a() {
 
 
 
-__webpack_require__.e(/*! import() */ 0).then(__webpack_require__.bind(null, /*! ./lazy */ 3)).then(function(lazy) {
+__webpack_require__.e(/*! import() */ 1).then(__webpack_require__.bind(null, /*! ./lazy */ 3)).then(function(lazy) {
 	console.log(a, b_a(), shared["a" /* x */], shared["b" /* y */], lazy.c, lazy.d.a, lazy.x, lazy.y);
 });
 
@@ -368,10 +386,10 @@ __webpack_require__.e(/*! import() */ 0).then(__webpack_require__.bind(null, /*!
 /******/ ]);
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */,
 /* 1 */,
 /* 2 */
@@ -401,6 +419,7 @@ exports.c = "e";
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 var d_namespaceObject = {};
+__webpack_require__.r(d_namespaceObject);
 __webpack_require__.d(d_namespaceObject, "a", function() { return a; });
 
 // EXTERNAL MODULE: ./node_modules/cjs.js
@@ -422,10 +441,10 @@ var c = String.fromCharCode(cjs["c"].charCodeAt(0) - 2);
 var a = "d";
 
 // CONCATENATED MODULE: ./lazy.js
-/* concated harmony reexport */__webpack_require__.d(__webpack_exports__, "c", function() { return c; });
-/* concated harmony reexport */__webpack_require__.d(__webpack_exports__, "x", function() { return shared["a" /* x */]; });
-/* concated harmony reexport */__webpack_require__.d(__webpack_exports__, "y", function() { return shared["b" /* y */]; });
-/* concated harmony reexport */__webpack_require__.d(__webpack_exports__, "d", function() { return d_namespaceObject; });
+/* concated harmony reexport c */__webpack_require__.d(__webpack_exports__, "c", function() { return c; });
+/* concated harmony reexport x */__webpack_require__.d(__webpack_exports__, "x", function() { return shared["a" /* x */]; });
+/* concated harmony reexport y */__webpack_require__.d(__webpack_exports__, "y", function() { return shared["b" /* y */]; });
+/* concated harmony reexport d */__webpack_require__.d(__webpack_exports__, "d", function() { return d_namespaceObject; });
 
 
 
@@ -438,7 +457,7 @@ var a = "d";
 Minimized
 
 ``` javascript
-(window.webpackJsonp=window.webpackJsonp||[]).push([[0],[,,function(n,r){r.c="e"},function(n,r,t){"use strict";t.r(r);var c={};t.d(c,"a",function(){return e});var o=t(2),u=t(0),d=String.fromCharCode(o.c.charCodeAt(0)-2),e="d";t.d(r,"c",function(){return d}),t.d(r,"x",function(){return u.a}),t.d(r,"y",function(){return u.b}),t.d(r,"d",function(){return c})}]]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[1],[,,function(n,r){r.c="e"},function(n,r,t){"use strict";t.r(r);var c={};t.r(c),t.d(c,"a",function(){return e});var o=t(2),u=t(0),d=String.fromCharCode(o.c.charCodeAt(0)-2),e="d";t.d(r,"c",function(){return d}),t.d(r,"x",function(){return u.a}),t.d(r,"y",function(){return u.b}),t.d(r,"d",function(){return c})}]]);
 ```
 
 # Info
@@ -447,24 +466,14 @@ Minimized
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset      Size  Chunks             Chunk Names
-0.output.js  1.87 KiB       0  [emitted]  
-  output.js  8.47 KiB       1  [emitted]  main
+  output.js  9.47 KiB       0  [emitted]  main
+1.output.js   1.9 KiB       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 286 bytes <{1}> [rendered]
-    > ./lazy [] 4:0-16
- [3] ./lazy.js + 2 modules 242 bytes {0} [built]
-     [exports: d, c, x, y]
-     import() ./lazy  ./example.js 4:0-16
-     | ./lazy.js 60 bytes [built]
-     |     [exports: d, c, x, y]
-     |     import() ./lazy  ./example.js 4:0-16
-     |     + 2 hidden modules
-     + 1 hidden module
-chunk    {1} output.js (main) 390 bytes >{0}< [entry] [rendered]
+chunk    {0} output.js (main) 372 bytes >{1}< [entry] [rendered]
     > .\example.js main
- [0] ./node_modules/shared.js + 1 modules 105 bytes {1} [built]
+ [0] ./node_modules/shared.js + 1 modules 100 bytes {0} [built]
      [exports: x, y]
      [all exports used]
      harmony side effect evaluation shared [1] ./example.js + 2 modules 3:0-23
@@ -473,37 +482,37 @@ chunk    {1} output.js (main) 390 bytes >{0}< [entry] [rendered]
      harmony export imported specifier shared [3] ./lazy.js + 2 modules 6:0-30
      harmony export imported specifier shared [3] ./lazy.js + 2 modules 6:0-30
      |    2 modules
- [1] ./example.js + 2 modules 285 bytes {1} [built]
+ [1] ./example.js + 2 modules 272 bytes {0} [built]
      [no exports]
      single entry .\example.js  main
-     | ./example.js 167 bytes [built]
+     | ./example.js 161 bytes [built]
      |     [no exports]
      |     single entry .\example.js  main
      |     + 2 hidden modules
+chunk    {1} 1.output.js 273 bytes <{0}> [rendered]
+    > ./lazy [] 4:0-16
+ [3] ./lazy.js + 2 modules 231 bytes {1} [built]
+     [exports: d, c, x, y]
+     import() ./lazy  ./example.js 4:0-16
+     | ./lazy.js 57 bytes [built]
+     |     [exports: d, c, x, y]
+     |     import() ./lazy  ./example.js 4:0-16
+     |     + 2 hidden modules
+     + 1 hidden module
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
       Asset       Size  Chunks             Chunk Names
-0.output.js  362 bytes       0  [emitted]  
-  output.js   1.82 KiB       1  [emitted]  main
+  output.js    2.2 KiB       0  [emitted]  main
+1.output.js  369 bytes       1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js 286 bytes <{1}> [rendered]
-    > ./lazy [] 4:0-16
- [3] ./lazy.js + 2 modules 242 bytes {0} [built]
-     [exports: d, c, x, y]
-     import() ./lazy  ./example.js 4:0-16
-     | ./lazy.js 60 bytes [built]
-     |     [exports: d, c, x, y]
-     |     import() ./lazy  ./example.js 4:0-16
-     |     + 2 hidden modules
-     + 1 hidden module
-chunk    {1} output.js (main) 390 bytes >{0}< [entry] [rendered]
+chunk    {0} output.js (main) 372 bytes >{1}< [entry] [rendered]
     > .\example.js main
- [0] ./node_modules/shared.js + 1 modules 105 bytes {1} [built]
+ [0] ./node_modules/shared.js + 1 modules 100 bytes {0} [built]
      [exports: x, y]
      [all exports used]
      harmony side effect evaluation shared [1] ./example.js + 2 modules 3:0-23
@@ -512,11 +521,21 @@ chunk    {1} output.js (main) 390 bytes >{0}< [entry] [rendered]
      harmony export imported specifier shared [3] ./lazy.js + 2 modules 6:0-30
      harmony export imported specifier shared [3] ./lazy.js + 2 modules 6:0-30
      |    2 modules
- [1] ./example.js + 2 modules 285 bytes {1} [built]
+ [1] ./example.js + 2 modules 272 bytes {0} [built]
      [no exports]
      single entry .\example.js  main
-     | ./example.js 167 bytes [built]
+     | ./example.js 161 bytes [built]
      |     [no exports]
      |     single entry .\example.js  main
      |     + 2 hidden modules
+chunk    {1} 1.output.js 273 bytes <{0}> [rendered]
+    > ./lazy [] 4:0-16
+ [3] ./lazy.js + 2 modules 231 bytes {1} [built]
+     [exports: d, c, x, y]
+     import() ./lazy  ./example.js 4:0-16
+     | ./lazy.js 57 bytes [built]
+     |     [exports: d, c, x, y]
+     |     import() ./lazy  ./example.js 4:0-16
+     |     + 2 hidden modules
+     + 1 hidden module
 ```
diff --git a/examples/scope-hoisting/template.md b/examples/scope-hoisting/template.md
index 077229d8243..2a7064cc7c5 100644
--- a/examples/scope-hoisting/template.md
+++ b/examples/scope-hoisting/template.md
@@ -91,16 +91,16 @@ While module concatenation identifiers in modules are renamed to avoid conflicts
 {{dist/output.js}}
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-{{dist/0.output.js}}
+{{dist/1.output.js}}
 ```
 
 Minimized
 
 ``` javascript
-{{production:dist/0.output.js}}
+{{production:dist/1.output.js}}
 ```
 
 # Info
diff --git a/examples/side-effects/README.md b/examples/side-effects/README.md
index 71ec4a3e869..55482e917ec 100644
--- a/examples/side-effects/README.md
+++ b/examples/side-effects/README.md
@@ -95,19 +95,34 @@ export { c } from "./c";
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -298,9 +313,9 @@ const c = "c";
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
     Asset      Size  Chunks             Chunk Names
-output.js  7.89 KiB       0  [emitted]  main
+output.js  8.85 KiB       0  [emitted]  main
 Entrypoint main = output.js
 chunk    {0} output.js (main) 422 bytes [entry] [rendered]
     > .\example.js main
@@ -314,9 +329,9 @@ chunk    {0} output.js (main) 422 bytes [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
     Asset       Size  Chunks             Chunk Names
-output.js  600 bytes       0  [emitted]  main
+output.js  985 bytes       0  [emitted]  main
 Entrypoint main = output.js
 chunk    {0} output.js (main) 325 bytes [entry] [rendered]
     > .\example.js main
diff --git a/examples/source-map/README.md b/examples/source-map/README.md
index 86f86453177..a531426e60e 100644
--- a/examples/source-map/README.md
+++ b/examples/source-map/README.md
@@ -52,7 +52,7 @@ module.exports = [
 
 ## source-map.js and source-map.js.map
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */
 /*!*************************************************************!*\
   !*** (webpack)/node_modules/coffee-loader!./example.coffee ***!
@@ -79,17 +79,17 @@ race = function() {
 
 
 /***/ })
-],[[0,1]]]);
+],[[0,0]]]);
 //# sourceMappingURL=bundle-source-map.js.map
 ```
 
 ``` javascript
-{"version":3,"sources":["webpack:///./example.coffee"],"names":[],"mappings":";;;;;;;;AAGA;EAAA;;AAAA,OACE;EAAA,MAAQ,IAAI,CAAC,IAAb;EACA,QAAQ,MADR;EAEA,MAAQ,SAAC,CAAD;WAAO,IAAI,OAAO,CAAP;EAAX,CAFR;;;AAKF,OAAO;AACL;EADM,uBAAQ;SACd,MAAM,MAAN,EAAc,OAAd;AADK","file":"./bundle-source-map.js","sourcesContent":["# Taken from http://coffeescript.org/\r\n\r\n# Objects:\r\nmath =\r\n  root:   Math.sqrt\r\n  square: square\r\n  cube:   (x) -> x * square x\r\n\r\n# Splats:\r\nrace = (winner, runners...) ->\r\n  print winner, runners\r\n"],"sourceRoot":""}
+{"version":3,"sources":["webpack:///./example.coffee"],"names":[],"mappings":";;;;;;;;AAGA;EAAA;;AAAA,OACE;EAAA,MAAQ,IAAI,CAAC,IAAb;EACA,QAAQ,MADR;EAEA,MAAQ,SAAC,CAAD;WAAO,IAAI,OAAO,CAAP;EAAX,CAFR;;;AAKF,OAAO;AACL;EADM,uBAAQ;SACd,MAAM,MAAN,EAAc,OAAd;AADK","file":"./bundle-source-map.js","sourcesContent":["# Taken from http://coffeescript.org/\n\n# Objects:\nmath =\n  root:   Math.sqrt\n  square: square\n  cube:   (x) -> x * square x\n\n# Splats:\nrace = (winner, runners...) ->\n  print winner, runners\n"],"sourceRoot":""}
 ```
 
 ## hidden-source-map.js and hidden-source-map.js.map
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */
 /*!*************************************************************!*\
   !*** (webpack)/node_modules/coffee-loader!./example.coffee ***!
@@ -116,16 +116,16 @@ race = function() {
 
 
 /***/ })
-],[[0,1]]]);
+],[[0,0]]]);
 ```
 
 ``` javascript
-{"version":3,"sources":["webpack:///./example.coffee"],"names":[],"mappings":";;;;;;;;AAGA;EAAA;;AAAA,OACE;EAAA,MAAQ,IAAI,CAAC,IAAb;EACA,QAAQ,MADR;EAEA,MAAQ,SAAC,CAAD;WAAO,IAAI,OAAO,CAAP;EAAX,CAFR;;;AAKF,OAAO;AACL;EADM,uBAAQ;SACd,MAAM,MAAN,EAAc,OAAd;AADK","file":"./bundle-hidden-source-map.js","sourcesContent":["# Taken from http://coffeescript.org/\r\n\r\n# Objects:\r\nmath =\r\n  root:   Math.sqrt\r\n  square: square\r\n  cube:   (x) -> x * square x\r\n\r\n# Splats:\r\nrace = (winner, runners...) ->\r\n  print winner, runners\r\n"],"sourceRoot":""}
+{"version":3,"sources":["webpack:///./example.coffee"],"names":[],"mappings":";;;;;;;;AAGA;EAAA;;AAAA,OACE;EAAA,MAAQ,IAAI,CAAC,IAAb;EACA,QAAQ,MADR;EAEA,MAAQ,SAAC,CAAD;WAAO,IAAI,OAAO,CAAP;EAAX,CAFR;;;AAKF,OAAO;AACL;EADM,uBAAQ;SACd,MAAM,MAAN,EAAc,OAAd;AADK","file":"./bundle-hidden-source-map.js","sourcesContent":["# Taken from http://coffeescript.org/\n\n# Objects:\nmath =\n  root:   Math.sqrt\n  square: square\n  cube:   (x) -> x * square x\n\n# Splats:\nrace = (winner, runners...) ->\n  print winner, runners\n"],"sourceRoot":""}
 ```
 
 ## inline-source-map.js
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */
 /*!*************************************************************!*\
   !*** (webpack)/node_modules/coffee-loader!./example.coffee ***!
@@ -152,8 +152,8 @@ race = function() {
 
 
 /***/ })
-],[[0,1]]]);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi9leGFtcGxlLmNvZmZlZSJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7OztBQUdBO0VBQUE7O0FBQUEsT0FDRTtFQUFBLE1BQVEsSUFBSSxDQUFDLElBQWI7RUFDQSxRQUFRLE1BRFI7RUFFQSxNQUFRLFNBQUMsQ0FBRDtXQUFPLElBQUksT0FBTyxDQUFQO0VBQVgsQ0FGUjs7O0FBS0YsT0FBTztBQUNMO0VBRE0sdUJBQVE7U0FDZCxNQUFNLE1BQU4sRUFBYyxPQUFkO0FBREsiLCJmaWxlIjoiLi9idW5kbGUtaW5saW5lLXNvdXJjZS1tYXAuanMiLCJzb3VyY2VzQ29udGVudCI6WyIjIFRha2VuIGZyb20gaHR0cDovL2NvZmZlZXNjcmlwdC5vcmcvXHJcblxyXG4jIE9iamVjdHM6XHJcbm1hdGggPVxyXG4gIHJvb3Q6ICAgTWF0aC5zcXJ0XHJcbiAgc3F1YXJlOiBzcXVhcmVcclxuICBjdWJlOiAgICh4KSAtPiB4ICogc3F1YXJlIHhcclxuXHJcbiMgU3BsYXRzOlxyXG5yYWNlID0gKHdpbm5lciwgcnVubmVycy4uLikgLT5cclxuICBwcmludCB3aW5uZXIsIHJ1bm5lcnNcclxuIl0sInNvdXJjZVJvb3QiOiIifQ==
+],[[0,0]]]);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi9leGFtcGxlLmNvZmZlZSJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7OztBQUdBO0VBQUE7O0FBQUEsT0FDRTtFQUFBLE1BQVEsSUFBSSxDQUFDLElBQWI7RUFDQSxRQUFRLE1BRFI7RUFFQSxNQUFRLFNBQUMsQ0FBRDtXQUFPLElBQUksT0FBTyxDQUFQO0VBQVgsQ0FGUjs7O0FBS0YsT0FBTztBQUNMO0VBRE0sdUJBQVE7U0FDZCxNQUFNLE1BQU4sRUFBYyxPQUFkO0FBREsiLCJmaWxlIjoiLi9idW5kbGUtaW5saW5lLXNvdXJjZS1tYXAuanMiLCJzb3VyY2VzQ29udGVudCI6WyIjIFRha2VuIGZyb20gaHR0cDovL2NvZmZlZXNjcmlwdC5vcmcvXG5cbiMgT2JqZWN0czpcbm1hdGggPVxuICByb290OiAgIE1hdGguc3FydFxuICBzcXVhcmU6IHNxdWFyZVxuICBjdWJlOiAgICh4KSAtPiB4ICogc3F1YXJlIHhcblxuIyBTcGxhdHM6XG5yYWNlID0gKHdpbm5lciwgcnVubmVycy4uLikgLT5cbiAgcHJpbnQgd2lubmVyLCBydW5uZXJzXG4iXSwic291cmNlUm9vdCI6IiJ9
 ```
 
 ## nosources-source-map.js.map
@@ -163,7 +163,7 @@ race = function() {
 
 ## eval-source-map.js
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */
 /*!*************************************************************!*\
   !*** (webpack)/node_modules/coffee-loader!./example.coffee ***!
@@ -171,15 +171,15 @@ race = function() {
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-eval("var math, race,\n  slice = [].slice;\n\nmath = {\n  root: Math.sqrt,\n  square: square,\n  cube: function(x) {\n    return x * square(x);\n  }\n};\n\nrace = function() {\n  var runners, winner;\n  winner = arguments[0], runners = 2 <= arguments.length ? slice.call(arguments, 1) : [];\n  return print(winner, runners);\n};\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi9leGFtcGxlLmNvZmZlZT8yNDE2Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBO0VBQUE7O0FBQUEsT0FDRTtFQUFBLE1BQVEsSUFBSSxDQUFDLElBQWI7RUFDQSxRQUFRLE1BRFI7RUFFQSxNQUFRLFNBQUMsQ0FBRDtXQUFPLElBQUksT0FBTyxDQUFQO0VBQVgsQ0FGUjs7O0FBS0YsT0FBTztBQUNMO0VBRE0sdUJBQVE7U0FDZCxNQUFNLE1BQU4sRUFBYyxPQUFkO0FBREsiLCJmaWxlIjoiMC5qcyIsInNvdXJjZXNDb250ZW50IjpbIiMgVGFrZW4gZnJvbSBodHRwOi8vY29mZmVlc2NyaXB0Lm9yZy9cclxuXHJcbiMgT2JqZWN0czpcclxubWF0aCA9XHJcbiAgcm9vdDogICBNYXRoLnNxcnRcclxuICBzcXVhcmU6IHNxdWFyZVxyXG4gIGN1YmU6ICAgKHgpIC0+IHggKiBzcXVhcmUgeFxyXG5cclxuIyBTcGxhdHM6XHJcbnJhY2UgPSAod2lubmVyLCBydW5uZXJzLi4uKSAtPlxyXG4gIHByaW50IHdpbm5lciwgcnVubmVyc1xyXG4iXSwic291cmNlUm9vdCI6IiJ9\n//# sourceURL=webpack-internal:///0\n");
+eval("var math, race,\n  slice = [].slice;\n\nmath = {\n  root: Math.sqrt,\n  square: square,\n  cube: function(x) {\n    return x * square(x);\n  }\n};\n\nrace = function() {\n  var runners, winner;\n  winner = arguments[0], runners = 2 <= arguments.length ? slice.call(arguments, 1) : [];\n  return print(winner, runners);\n};\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi9leGFtcGxlLmNvZmZlZT8yNDE2Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBO0VBQUE7O0FBQUEsT0FDRTtFQUFBLE1BQVEsSUFBSSxDQUFDLElBQWI7RUFDQSxRQUFRLE1BRFI7RUFFQSxNQUFRLFNBQUMsQ0FBRDtXQUFPLElBQUksT0FBTyxDQUFQO0VBQVgsQ0FGUjs7O0FBS0YsT0FBTztBQUNMO0VBRE0sdUJBQVE7U0FDZCxNQUFNLE1BQU4sRUFBYyxPQUFkO0FBREsiLCJmaWxlIjoiMC5qcyIsInNvdXJjZXNDb250ZW50IjpbIiMgVGFrZW4gZnJvbSBodHRwOi8vY29mZmVlc2NyaXB0Lm9yZy9cblxuIyBPYmplY3RzOlxubWF0aCA9XG4gIHJvb3Q6ICAgTWF0aC5zcXJ0XG4gIHNxdWFyZTogc3F1YXJlXG4gIGN1YmU6ICAgKHgpIC0+IHggKiBzcXVhcmUgeFxuXG4jIFNwbGF0czpcbnJhY2UgPSAod2lubmVyLCBydW5uZXJzLi4uKSAtPlxuICBwcmludCB3aW5uZXIsIHJ1bm5lcnNcbiJdLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///0\n");
 
 /***/ })
-],[[0,1]]]);
+],[[0,0]]]);
 ```
 
 ## eval.js
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */
 /*!*************************************************************!*\
   !*** (webpack)/node_modules/coffee-loader!./example.coffee ***!
@@ -190,12 +190,12 @@ eval("var math, race,\n  slice = [].slice;\n\nmath = {\n  root: Math.sqrt,\n  sq
 eval("var math, race,\n  slice = [].slice;\n\nmath = {\n  root: Math.sqrt,\n  square: square,\n  cube: function(x) {\n    return x * square(x);\n  }\n};\n\nrace = function() {\n  var runners, winner;\n  winner = arguments[0], runners = 2 <= arguments.length ? slice.call(arguments, 1) : [];\n  return print(winner, runners);\n};\n\n\n//# sourceURL=webpack:///./example.coffee?(webpack)/node_modules/coffee-loader");
 
 /***/ })
-],[[0,1]]]);
+],[[0,0]]]);
 ```
 
 ## cheap-eval-source-map.js
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */
 /*!*************************************************************!*\
   !*** (webpack)/node_modules/coffee-loader!./example.coffee ***!
@@ -206,12 +206,12 @@ eval("var math, race,\n  slice = [].slice;\n\nmath = {\n  root: Math.sqrt,\n  sq
 eval("var math, race,\n  slice = [].slice;\n\nmath = {\n  root: Math.sqrt,\n  square: square,\n  cube: function(x) {\n    return x * square(x);\n  }\n};\n\nrace = function() {\n  var runners, winner;\n  winner = arguments[0], runners = 2 <= arguments.length ? slice.call(arguments, 1) : [];\n  return print(winner, runners);\n};\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMC5qcyIsInNvdXJjZXMiOlsid2VicGFjazovLy8uL2V4YW1wbGUuY29mZmVlP2MxNzAiXSwic291cmNlc0NvbnRlbnQiOlsidmFyIG1hdGgsIHJhY2UsXG4gIHNsaWNlID0gW10uc2xpY2U7XG5cbm1hdGggPSB7XG4gIHJvb3Q6IE1hdGguc3FydCxcbiAgc3F1YXJlOiBzcXVhcmUsXG4gIGN1YmU6IGZ1bmN0aW9uKHgpIHtcbiAgICByZXR1cm4geCAqIHNxdWFyZSh4KTtcbiAgfVxufTtcblxucmFjZSA9IGZ1bmN0aW9uKCkge1xuICB2YXIgcnVubmVycywgd2lubmVyO1xuICB3aW5uZXIgPSBhcmd1bWVudHNbMF0sIHJ1bm5lcnMgPSAyIDw9IGFyZ3VtZW50cy5sZW5ndGggPyBzbGljZS5jYWxsKGFyZ3VtZW50cywgMSkgOiBbXTtcbiAgcmV0dXJuIHByaW50KHdpbm5lciwgcnVubmVycyk7XG59O1xuIl0sIm1hcHBpbmdzIjoiQUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTsiLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///0\n");
 
 /***/ })
-],[[0,1]]]);
+],[[0,0]]]);
 ```
 
 ## cheap-module-eval-source-map.js
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
 /* 0 */
 /*!*************************************************************!*\
   !*** (webpack)/node_modules/coffee-loader!./example.coffee ***!
@@ -219,15 +219,15 @@ eval("var math, race,\n  slice = [].slice;\n\nmath = {\n  root: Math.sqrt,\n  sq
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-eval("var math, race,\n  slice = [].slice;\n\nmath = {\n  root: Math.sqrt,\n  square: square,\n  cube: function(x) {\n    return x * square(x);\n  }\n};\n\nrace = function() {\n  var runners, winner;\n  winner = arguments[0], runners = 2 <= arguments.length ? slice.call(arguments, 1) : [];\n  return print(winner, runners);\n};\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMC5qcyIsInNvdXJjZXMiOlsid2VicGFjazovLy8uL2V4YW1wbGUuY29mZmVlPzI0MTYiXSwic291cmNlc0NvbnRlbnQiOlsiIyBUYWtlbiBmcm9tIGh0dHA6Ly9jb2ZmZWVzY3JpcHQub3JnL1xyXG5cclxuIyBPYmplY3RzOlxyXG5tYXRoID1cclxuICByb290OiAgIE1hdGguc3FydFxyXG4gIHNxdWFyZTogc3F1YXJlXHJcbiAgY3ViZTogICAoeCkgLT4geCAqIHNxdWFyZSB4XHJcblxyXG4jIFNwbGF0czpcclxucmFjZSA9ICh3aW5uZXIsIHJ1bm5lcnMuLi4pIC0+XHJcbiAgcHJpbnQgd2lubmVyLCBydW5uZXJzXHJcbiJdLCJtYXBwaW5ncyI6IkFBR0E7QUFBQTtBQUNBO0FBREE7QUFDQTtBQUNBO0FBQ0E7QUFBQTtBQUFBOzs7QUFHQTtBQUNBO0FBREE7QUFDQTtBQURBOyIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///0\n");
+eval("var math, race,\n  slice = [].slice;\n\nmath = {\n  root: Math.sqrt,\n  square: square,\n  cube: function(x) {\n    return x * square(x);\n  }\n};\n\nrace = function() {\n  var runners, winner;\n  winner = arguments[0], runners = 2 <= arguments.length ? slice.call(arguments, 1) : [];\n  return print(winner, runners);\n};\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMC5qcyIsInNvdXJjZXMiOlsid2VicGFjazovLy8uL2V4YW1wbGUuY29mZmVlPzI0MTYiXSwic291cmNlc0NvbnRlbnQiOlsiIyBUYWtlbiBmcm9tIGh0dHA6Ly9jb2ZmZWVzY3JpcHQub3JnL1xuXG4jIE9iamVjdHM6XG5tYXRoID1cbiAgcm9vdDogICBNYXRoLnNxcnRcbiAgc3F1YXJlOiBzcXVhcmVcbiAgY3ViZTogICAoeCkgLT4geCAqIHNxdWFyZSB4XG5cbiMgU3BsYXRzOlxucmFjZSA9ICh3aW5uZXIsIHJ1bm5lcnMuLi4pIC0+XG4gIHByaW50IHdpbm5lciwgcnVubmVyc1xuIl0sIm1hcHBpbmdzIjoiQUFHQTtBQUFBO0FBQ0E7QUFEQTtBQUNBO0FBQ0E7QUFDQTtBQUFBO0FBQUE7OztBQUdBO0FBQ0E7QUFEQTtBQUNBO0FBREE7Iiwic291cmNlUm9vdCI6IiJ9\n//# sourceURL=webpack-internal:///0\n");
 
 /***/ })
-],[[0,1]]]);
+],[[0,0]]]);
 ```
 
 ## cheap-module-source-map.js.map
 ``` javascript
-{"version":3,"file":"./bundle-cheap-module-source-map.js","sources":["webpack:///./example.coffee"],"sourcesContent":["# Taken from http://coffeescript.org/\r\n\r\n# Objects:\r\nmath =\r\n  root:   Math.sqrt\r\n  square: square\r\n  cube:   (x) -> x * square x\r\n\r\n# Splats:\r\nrace = (winner, runners...) ->\r\n  print winner, runners\r\n"],"mappings":";;;;;;;;AAGA;AAAA;AACA;AADA;AACA;AACA;AACA;AAAA;AAAA;;;AAGA;AACA;AADA;AACA;AADA;;;;A","sourceRoot":""}
+{"version":3,"file":"./bundle-cheap-module-source-map.js","sources":["webpack:///./example.coffee"],"sourcesContent":["# Taken from http://coffeescript.org/\n\n# Objects:\nmath =\n  root:   Math.sqrt\n  square: square\n  cube:   (x) -> x * square x\n\n# Splats:\nrace = (winner, runners...) ->\n  print winner, runners\n"],"mappings":";;;;;;;;AAGA;AAAA;AACA;AADA;AACA;AACA;AACA;AAAA;AAAA;;;AAGA;AACA;AADA;AACA;AADA;;;;A","sourceRoot":""}
 ```
 
 ## cheap-source-map.js.map
@@ -239,135 +239,135 @@ eval("var math, race,\n  slice = [].slice;\n\nmath = {\n  root: Math.sqrt,\n  sq
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
 Child
     Hash: 0a1b2c3d4e5f6a7b8c9d
                                         Asset      Size  Chunks             Chunk Names
-            ./bundle-cheap-eval-source-map.js   1.5 KiB       0  [emitted]  bundle
-    ./runtime~bundle-cheap-eval-source-map.js  5.06 KiB       1  [emitted]  runtime~bundle
+    ./runtime~bundle-cheap-eval-source-map.js  6.04 KiB       0  [emitted]  runtime~bundle
+            ./bundle-cheap-eval-source-map.js   1.5 KiB       1  [emitted]  bundle
     Entrypoint bundle = ./runtime~bundle-cheap-eval-source-map.js ./bundle-cheap-eval-source-map.js
-    chunk    {0} ./bundle-cheap-eval-source-map.js (bundle) 308 bytes ={1}= [initial] [rendered]
+    chunk    {0} ./runtime~bundle-cheap-eval-source-map.js (runtime~bundle) 0 bytes ={1}= [entry] [rendered]
         > coffee-loader!./example.coffee bundle
-     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {0} [built]
-         single entry coffee-loader!./example.coffee  bundle
-    chunk    {1} ./runtime~bundle-cheap-eval-source-map.js (runtime~bundle) 0 bytes ={0}= [entry] [rendered]
+    chunk    {1} ./bundle-cheap-eval-source-map.js (bundle) 308 bytes ={0}= [initial] [rendered]
         > coffee-loader!./example.coffee bundle
+     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {1} [built]
+         single entry coffee-loader!./example.coffee  bundle
 Child
     Hash: 0a1b2c3d4e5f6a7b8c9d
                                                Asset      Size  Chunks             Chunk Names
-            ./bundle-cheap-module-eval-source-map.js  1.36 KiB       0  [emitted]  bundle
-    ./runtime~bundle-cheap-module-eval-source-map.js  5.06 KiB       1  [emitted]  runtime~bundle
+    ./runtime~bundle-cheap-module-eval-source-map.js  6.04 KiB       0  [emitted]  runtime~bundle
+            ./bundle-cheap-module-eval-source-map.js  1.33 KiB       1  [emitted]  bundle
     Entrypoint bundle = ./runtime~bundle-cheap-module-eval-source-map.js ./bundle-cheap-module-eval-source-map.js
-    chunk    {0} ./bundle-cheap-module-eval-source-map.js (bundle) 308 bytes ={1}= [initial] [rendered]
+    chunk    {0} ./runtime~bundle-cheap-module-eval-source-map.js (runtime~bundle) 0 bytes ={1}= [entry] [rendered]
         > coffee-loader!./example.coffee bundle
-     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {0} [built]
-         single entry coffee-loader!./example.coffee  bundle
-    chunk    {1} ./runtime~bundle-cheap-module-eval-source-map.js (runtime~bundle) 0 bytes ={0}= [entry] [rendered]
+    chunk    {1} ./bundle-cheap-module-eval-source-map.js (bundle) 308 bytes ={0}= [initial] [rendered]
         > coffee-loader!./example.coffee bundle
+     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {1} [built]
+         single entry coffee-loader!./example.coffee  bundle
 Child
     Hash: 0a1b2c3d4e5f6a7b8c9d
                                               Asset       Size  Chunks             Chunk Names
-                ./bundle-cheap-module-source-map.js  733 bytes       0  [emitted]  bundle
-        ./runtime~bundle-cheap-module-source-map.js   5.13 KiB       1  [emitted]  runtime~bundle
-            ./bundle-cheap-module-source-map.js.map  459 bytes       0  [emitted]  bundle
-    ./runtime~bundle-cheap-module-source-map.js.map   5.04 KiB       1  [emitted]  runtime~bundle
+        ./runtime~bundle-cheap-module-source-map.js   6.11 KiB       0  [emitted]  runtime~bundle
+                ./bundle-cheap-module-source-map.js  733 bytes       1  [emitted]  bundle
+    ./runtime~bundle-cheap-module-source-map.js.map      6 KiB       0  [emitted]  runtime~bundle
+            ./bundle-cheap-module-source-map.js.map  437 bytes       1  [emitted]  bundle
     Entrypoint bundle = ./runtime~bundle-cheap-module-source-map.js ./runtime~bundle-cheap-module-source-map.js.map ./bundle-cheap-module-source-map.js ./bundle-cheap-module-source-map.js.map
-    chunk    {0} ./bundle-cheap-module-source-map.js, ./bundle-cheap-module-source-map.js.map (bundle) 308 bytes ={1}= [initial] [rendered]
+    chunk    {0} ./runtime~bundle-cheap-module-source-map.js, ./runtime~bundle-cheap-module-source-map.js.map (runtime~bundle) 0 bytes ={1}= [entry] [rendered]
         > coffee-loader!./example.coffee bundle
-     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {0} [built]
-         single entry coffee-loader!./example.coffee  bundle
-    chunk    {1} ./runtime~bundle-cheap-module-source-map.js, ./runtime~bundle-cheap-module-source-map.js.map (runtime~bundle) 0 bytes ={0}= [entry] [rendered]
+    chunk    {1} ./bundle-cheap-module-source-map.js, ./bundle-cheap-module-source-map.js.map (bundle) 308 bytes ={0}= [initial] [rendered]
         > coffee-loader!./example.coffee bundle
+     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {1} [built]
+         single entry coffee-loader!./example.coffee  bundle
 Child
     Hash: 0a1b2c3d4e5f6a7b8c9d
                                        Asset       Size  Chunks             Chunk Names
-                ./bundle-cheap-source-map.js  726 bytes       0  [emitted]  bundle
-        ./runtime~bundle-cheap-source-map.js   5.12 KiB       1  [emitted]  runtime~bundle
-            ./bundle-cheap-source-map.js.map  561 bytes       0  [emitted]  bundle
-    ./runtime~bundle-cheap-source-map.js.map   5.03 KiB       1  [emitted]  runtime~bundle
+        ./runtime~bundle-cheap-source-map.js    6.1 KiB       0  [emitted]  runtime~bundle
+                ./bundle-cheap-source-map.js  726 bytes       1  [emitted]  bundle
+    ./runtime~bundle-cheap-source-map.js.map      6 KiB       0  [emitted]  runtime~bundle
+            ./bundle-cheap-source-map.js.map  561 bytes       1  [emitted]  bundle
     Entrypoint bundle = ./runtime~bundle-cheap-source-map.js ./runtime~bundle-cheap-source-map.js.map ./bundle-cheap-source-map.js ./bundle-cheap-source-map.js.map
-    chunk    {0} ./bundle-cheap-source-map.js, ./bundle-cheap-source-map.js.map (bundle) 308 bytes ={1}= [initial] [rendered]
+    chunk    {0} ./runtime~bundle-cheap-source-map.js, ./runtime~bundle-cheap-source-map.js.map (runtime~bundle) 0 bytes ={1}= [entry] [rendered]
         > coffee-loader!./example.coffee bundle
-     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {0} [built]
-         single entry coffee-loader!./example.coffee  bundle
-    chunk    {1} ./runtime~bundle-cheap-source-map.js, ./runtime~bundle-cheap-source-map.js.map (runtime~bundle) 0 bytes ={0}= [entry] [rendered]
+    chunk    {1} ./bundle-cheap-source-map.js, ./bundle-cheap-source-map.js.map (bundle) 308 bytes ={0}= [initial] [rendered]
         > coffee-loader!./example.coffee bundle
+     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {1} [built]
+         single entry coffee-loader!./example.coffee  bundle
 Child
     Hash: 0a1b2c3d4e5f6a7b8c9d
                        Asset       Size  Chunks             Chunk Names
-            ./bundle-eval.js  781 bytes       0  [emitted]  bundle
-    ./runtime~bundle-eval.js   5.06 KiB       1  [emitted]  runtime~bundle
+    ./runtime~bundle-eval.js   6.04 KiB       0  [emitted]  runtime~bundle
+            ./bundle-eval.js  781 bytes       1  [emitted]  bundle
     Entrypoint bundle = ./runtime~bundle-eval.js ./bundle-eval.js
-    chunk    {0} ./bundle-eval.js (bundle) 308 bytes ={1}= [initial] [rendered]
+    chunk    {0} ./runtime~bundle-eval.js (runtime~bundle) 0 bytes ={1}= [entry] [rendered]
         > coffee-loader!./example.coffee bundle
-     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {0} [built]
-         single entry coffee-loader!./example.coffee  bundle
-    chunk    {1} ./runtime~bundle-eval.js (runtime~bundle) 0 bytes ={0}= [entry] [rendered]
+    chunk    {1} ./bundle-eval.js (bundle) 308 bytes ={0}= [initial] [rendered]
         > coffee-loader!./example.coffee bundle
+     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {1} [built]
+         single entry coffee-loader!./example.coffee  bundle
 Child
     Hash: 0a1b2c3d4e5f6a7b8c9d
                                   Asset      Size  Chunks             Chunk Names
-            ./bundle-eval-source-map.js  1.49 KiB       0  [emitted]  bundle
-    ./runtime~bundle-eval-source-map.js  5.06 KiB       1  [emitted]  runtime~bundle
+    ./runtime~bundle-eval-source-map.js  6.04 KiB       0  [emitted]  runtime~bundle
+            ./bundle-eval-source-map.js  1.47 KiB       1  [emitted]  bundle
     Entrypoint bundle = ./runtime~bundle-eval-source-map.js ./bundle-eval-source-map.js
-    chunk    {0} ./bundle-eval-source-map.js (bundle) 308 bytes ={1}= [initial] [rendered]
+    chunk    {0} ./runtime~bundle-eval-source-map.js (runtime~bundle) 0 bytes ={1}= [entry] [rendered]
         > coffee-loader!./example.coffee bundle
-     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {0} [built]
-         single entry coffee-loader!./example.coffee  bundle
-    chunk    {1} ./runtime~bundle-eval-source-map.js (runtime~bundle) 0 bytes ={0}= [entry] [rendered]
+    chunk    {1} ./bundle-eval-source-map.js (bundle) 308 bytes ={0}= [initial] [rendered]
         > coffee-loader!./example.coffee bundle
+     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {1} [built]
+         single entry coffee-loader!./example.coffee  bundle
 Child
     Hash: 0a1b2c3d4e5f6a7b8c9d
                                         Asset       Size  Chunks             Chunk Names
-                ./bundle-hidden-source-map.js  674 bytes       0  [emitted]  bundle
-        ./runtime~bundle-hidden-source-map.js   5.06 KiB       1  [emitted]  runtime~bundle
-            ./bundle-hidden-source-map.js.map  556 bytes       0  [emitted]  bundle
-    ./runtime~bundle-hidden-source-map.js.map   5.08 KiB       1  [emitted]  runtime~bundle
+        ./runtime~bundle-hidden-source-map.js   6.04 KiB       0  [emitted]  runtime~bundle
+                ./bundle-hidden-source-map.js  674 bytes       1  [emitted]  bundle
+    ./runtime~bundle-hidden-source-map.js.map   6.09 KiB       0  [emitted]  runtime~bundle
+            ./bundle-hidden-source-map.js.map  534 bytes       1  [emitted]  bundle
     Entrypoint bundle = ./runtime~bundle-hidden-source-map.js ./runtime~bundle-hidden-source-map.js.map ./bundle-hidden-source-map.js ./bundle-hidden-source-map.js.map
-    chunk    {0} ./bundle-hidden-source-map.js, ./bundle-hidden-source-map.js.map (bundle) 308 bytes ={1}= [initial] [rendered]
+    chunk    {0} ./runtime~bundle-hidden-source-map.js, ./runtime~bundle-hidden-source-map.js.map (runtime~bundle) 0 bytes ={1}= [entry] [rendered]
         > coffee-loader!./example.coffee bundle
-     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {0} [built]
-         single entry coffee-loader!./example.coffee  bundle
-    chunk    {1} ./runtime~bundle-hidden-source-map.js, ./runtime~bundle-hidden-source-map.js.map (runtime~bundle) 0 bytes ={0}= [entry] [rendered]
+    chunk    {1} ./bundle-hidden-source-map.js, ./bundle-hidden-source-map.js.map (bundle) 308 bytes ={0}= [initial] [rendered]
         > coffee-loader!./example.coffee bundle
+     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {1} [built]
+         single entry coffee-loader!./example.coffee  bundle
 Child
     Hash: 0a1b2c3d4e5f6a7b8c9d
                                     Asset      Size  Chunks             Chunk Names
-            ./bundle-inline-source-map.js  1.45 KiB       0  [emitted]  bundle
-    ./runtime~bundle-inline-source-map.js  11.9 KiB       1  [emitted]  runtime~bundle
+    ./runtime~bundle-inline-source-map.js  14.2 KiB       0  [emitted]  runtime~bundle
+            ./bundle-inline-source-map.js  1.42 KiB       1  [emitted]  bundle
     Entrypoint bundle = ./runtime~bundle-inline-source-map.js ./bundle-inline-source-map.js
-    chunk    {0} ./bundle-inline-source-map.js (bundle) 308 bytes ={1}= [initial] [rendered]
+    chunk    {0} ./runtime~bundle-inline-source-map.js (runtime~bundle) 0 bytes ={1}= [entry] [rendered]
         > coffee-loader!./example.coffee bundle
-     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {0} [built]
-         single entry coffee-loader!./example.coffee  bundle
-    chunk    {1} ./runtime~bundle-inline-source-map.js (runtime~bundle) 0 bytes ={0}= [entry] [rendered]
+    chunk    {1} ./bundle-inline-source-map.js (bundle) 308 bytes ={0}= [initial] [rendered]
         > coffee-loader!./example.coffee bundle
+     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {1} [built]
+         single entry coffee-loader!./example.coffee  bundle
 Child
     Hash: 0a1b2c3d4e5f6a7b8c9d
                                            Asset       Size  Chunks             Chunk Names
-                ./bundle-nosources-source-map.js  730 bytes       0  [emitted]  bundle
-        ./runtime~bundle-nosources-source-map.js   5.12 KiB       1  [emitted]  runtime~bundle
-            ./bundle-nosources-source-map.js.map  314 bytes       0  [emitted]  bundle
-    ./runtime~bundle-nosources-source-map.js.map  848 bytes       1  [emitted]  runtime~bundle
+        ./runtime~bundle-nosources-source-map.js    6.1 KiB       0  [emitted]  runtime~bundle
+                ./bundle-nosources-source-map.js  730 bytes       1  [emitted]  bundle
+    ./runtime~bundle-nosources-source-map.js.map  981 bytes       0  [emitted]  runtime~bundle
+            ./bundle-nosources-source-map.js.map  314 bytes       1  [emitted]  bundle
     Entrypoint bundle = ./runtime~bundle-nosources-source-map.js ./runtime~bundle-nosources-source-map.js.map ./bundle-nosources-source-map.js ./bundle-nosources-source-map.js.map
-    chunk    {0} ./bundle-nosources-source-map.js, ./bundle-nosources-source-map.js.map (bundle) 308 bytes ={1}= [initial] [rendered]
+    chunk    {0} ./runtime~bundle-nosources-source-map.js, ./runtime~bundle-nosources-source-map.js.map (runtime~bundle) 0 bytes ={1}= [entry] [rendered]
         > coffee-loader!./example.coffee bundle
-     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {0} [built]
-         single entry coffee-loader!./example.coffee  bundle
-    chunk    {1} ./runtime~bundle-nosources-source-map.js, ./runtime~bundle-nosources-source-map.js.map (runtime~bundle) 0 bytes ={0}= [entry] [rendered]
+    chunk    {1} ./bundle-nosources-source-map.js, ./bundle-nosources-source-map.js.map (bundle) 308 bytes ={0}= [initial] [rendered]
         > coffee-loader!./example.coffee bundle
+     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {1} [built]
+         single entry coffee-loader!./example.coffee  bundle
 Child
     Hash: 0a1b2c3d4e5f6a7b8c9d
                                  Asset       Size  Chunks             Chunk Names
-                ./bundle-source-map.js  720 bytes       0  [emitted]  bundle
-        ./runtime~bundle-source-map.js   5.11 KiB       1  [emitted]  runtime~bundle
-            ./bundle-source-map.js.map  549 bytes       0  [emitted]  bundle
-    ./runtime~bundle-source-map.js.map   5.07 KiB       1  [emitted]  runtime~bundle
+        ./runtime~bundle-source-map.js   6.09 KiB       0  [emitted]  runtime~bundle
+                ./bundle-source-map.js  720 bytes       1  [emitted]  bundle
+    ./runtime~bundle-source-map.js.map   6.08 KiB       0  [emitted]  runtime~bundle
+            ./bundle-source-map.js.map  527 bytes       1  [emitted]  bundle
     Entrypoint bundle = ./runtime~bundle-source-map.js ./runtime~bundle-source-map.js.map ./bundle-source-map.js ./bundle-source-map.js.map
-    chunk    {0} ./bundle-source-map.js, ./bundle-source-map.js.map (bundle) 308 bytes ={1}= [initial] [rendered]
+    chunk    {0} ./runtime~bundle-source-map.js, ./runtime~bundle-source-map.js.map (runtime~bundle) 0 bytes ={1}= [entry] [rendered]
         > coffee-loader!./example.coffee bundle
-     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {0} [built]
-         single entry coffee-loader!./example.coffee  bundle
-    chunk    {1} ./runtime~bundle-source-map.js, ./runtime~bundle-source-map.js.map (runtime~bundle) 0 bytes ={0}= [entry] [rendered]
+    chunk    {1} ./bundle-source-map.js, ./bundle-source-map.js.map (bundle) 308 bytes ={0}= [initial] [rendered]
         > coffee-loader!./example.coffee bundle
+     [0] (webpack)/node_modules/coffee-loader!./example.coffee 308 bytes {1} [built]
+         single entry coffee-loader!./example.coffee  bundle
 ```
diff --git a/examples/two-explicit-vendor-chunks/README.md b/examples/two-explicit-vendor-chunks/README.md
index 0e10bdeb105..ce93cd93bc9 100644
--- a/examples/two-explicit-vendor-chunks/README.md
+++ b/examples/two-explicit-vendor-chunks/README.md
@@ -77,19 +77,34 @@ module.exports = {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -181,19 +196,34 @@ module.exports = "Vendor1";
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -293,19 +323,34 @@ __webpack_require__(/*! ./vendor1 */ 1);
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -373,13 +418,13 @@ __webpack_require__(/*! ./vendor2 */ 3);
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
      Asset      Size  Chunks             Chunk Names
-vendor1.js  2.99 KiB       0  [emitted]  vendor1
-vendor2.js  3.25 KiB       1  [emitted]  vendor2
-  pageA.js   3.3 KiB       2  [emitted]  pageA
-  pageB.js  2.74 KiB       3  [emitted]  pageB
-  pageC.js  2.74 KiB       4  [emitted]  pageC
+vendor1.js  3.96 KiB       0  [emitted]  vendor1
+vendor2.js  4.21 KiB       1  [emitted]  vendor2
+  pageA.js  4.26 KiB       2  [emitted]  pageA
+  pageB.js  3.71 KiB       3  [emitted]  pageB
+  pageC.js  3.71 KiB       4  [emitted]  pageC
 Entrypoint vendor1 = vendor1.js
 Entrypoint vendor2 = vendor2.js
 Entrypoint pageA = pageA.js
@@ -390,30 +435,30 @@ chunk    {0} vendor1.js (vendor1) 55 bytes [entry] [rendered]
  [0] multi ./vendor1 28 bytes {0} [built]
      multi entry 
  [1] ./vendor1.js 27 bytes {0} {1} {2} [built]
-     single entry ./vendor1 [0] multi ./vendor1 vendor1:100000
+     single entry ./vendor1 [0] multi ./vendor1 vendor1[0]
      cjs require ./vendor1 [3] ./vendor2.js 2:0-20
      cjs require ./vendor1 [4] ./pageA.js 2:0-20
-chunk    {1} vendor2.js (vendor2) 107 bytes [entry] [rendered]
+chunk    {1} vendor2.js (vendor2) 105 bytes [entry] [rendered]
     > vendor2
  [1] ./vendor1.js 27 bytes {0} {1} {2} [built]
-     single entry ./vendor1 [0] multi ./vendor1 vendor1:100000
+     single entry ./vendor1 [0] multi ./vendor1 vendor1[0]
      cjs require ./vendor1 [3] ./vendor2.js 2:0-20
      cjs require ./vendor1 [4] ./pageA.js 2:0-20
  [2] multi ./vendor2 28 bytes {1} [built]
      multi entry 
- [3] ./vendor2.js 52 bytes {1} {2} [built]
-     single entry ./vendor2 [2] multi ./vendor2 vendor2:100000
+ [3] ./vendor2.js 50 bytes {1} {2} [built]
+     single entry ./vendor2 [2] multi ./vendor2 vendor2[0]
      cjs require ./vendor2 [4] ./pageA.js 3:0-20
-chunk    {2} pageA.js (pageA) 152 bytes [entry] [rendered]
+chunk    {2} pageA.js (pageA) 147 bytes [entry] [rendered]
     > ./pageA pageA
  [1] ./vendor1.js 27 bytes {0} {1} {2} [built]
-     single entry ./vendor1 [0] multi ./vendor1 vendor1:100000
+     single entry ./vendor1 [0] multi ./vendor1 vendor1[0]
      cjs require ./vendor1 [3] ./vendor2.js 2:0-20
      cjs require ./vendor1 [4] ./pageA.js 2:0-20
- [3] ./vendor2.js 52 bytes {1} {2} [built]
-     single entry ./vendor2 [2] multi ./vendor2 vendor2:100000
+ [3] ./vendor2.js 50 bytes {1} {2} [built]
+     single entry ./vendor2 [2] multi ./vendor2 vendor2[0]
      cjs require ./vendor2 [4] ./pageA.js 3:0-20
- [4] ./pageA.js 73 bytes {2} [built]
+ [4] ./pageA.js 70 bytes {2} [built]
      single entry ./pageA  pageA
 chunk    {3} pageB.js (pageB) 25 bytes [entry] [rendered]
     > ./pageB pageB
@@ -429,54 +474,54 @@ chunk    {4} pageC.js (pageC) 25 bytes [entry] [rendered]
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
      Asset       Size  Chunks             Chunk Names
-  pageC.js  569 bytes       0  [emitted]  pageC
-  pageB.js  569 bytes       1  [emitted]  pageB
-  pageA.js  658 bytes       2  [emitted]  pageA
-vendor2.js  646 bytes       3  [emitted]  vendor2
-vendor1.js  605 bytes       4  [emitted]  vendor1
+vendor1.js  987 bytes       0  [emitted]  vendor1
+vendor2.js      1 KiB       1  [emitted]  vendor2
+  pageA.js   1.02 KiB       2  [emitted]  pageA
+  pageB.js  954 bytes       3  [emitted]  pageB
+  pageC.js  954 bytes       4  [emitted]  pageC
 Entrypoint vendor1 = vendor1.js
 Entrypoint vendor2 = vendor2.js
 Entrypoint pageA = pageA.js
 Entrypoint pageB = pageB.js
 Entrypoint pageC = pageC.js
-chunk    {0} pageC.js (pageC) 25 bytes [entry] [rendered]
-    > ./pageC pageC
- [2] ./pageC.js 25 bytes {0} [built]
-     single entry ./pageC  pageC
-chunk    {1} pageB.js (pageB) 25 bytes [entry] [rendered]
-    > ./pageB pageB
- [3] ./pageB.js 25 bytes {1} [built]
-     single entry ./pageB  pageB
-chunk    {2} pageA.js (pageA) 152 bytes [entry] [rendered]
-    > ./pageA pageA
- [0] ./vendor1.js 27 bytes {2} {3} {4} [built]
+chunk    {0} vendor1.js (vendor1) 55 bytes [entry] [rendered]
+    > vendor1
+ [0] ./vendor1.js 27 bytes {0} {1} {2} [built]
      cjs require ./vendor1 [1] ./vendor2.js 2:0-20
+     single entry ./vendor1 [2] multi ./vendor1 vendor1[0]
      cjs require ./vendor1 [4] ./pageA.js 2:0-20
-     single entry ./vendor1 [6] multi ./vendor1 vendor1:100000
- [1] ./vendor2.js 52 bytes {2} {3} [built]
-     cjs require ./vendor2 [4] ./pageA.js 3:0-20
-     single entry ./vendor2 [5] multi ./vendor2 vendor2:100000
- [4] ./pageA.js 73 bytes {2} [built]
-     single entry ./pageA  pageA
-chunk    {3} vendor2.js (vendor2) 107 bytes [entry] [rendered]
+ [2] multi ./vendor1 28 bytes {0} [built]
+     multi entry 
+chunk    {1} vendor2.js (vendor2) 105 bytes [entry] [rendered]
     > vendor2
- [0] ./vendor1.js 27 bytes {2} {3} {4} [built]
+ [0] ./vendor1.js 27 bytes {0} {1} {2} [built]
      cjs require ./vendor1 [1] ./vendor2.js 2:0-20
+     single entry ./vendor1 [2] multi ./vendor1 vendor1[0]
      cjs require ./vendor1 [4] ./pageA.js 2:0-20
-     single entry ./vendor1 [6] multi ./vendor1 vendor1:100000
- [1] ./vendor2.js 52 bytes {2} {3} [built]
+ [1] ./vendor2.js 50 bytes {1} {2} [built]
+     single entry ./vendor2 [3] multi ./vendor2 vendor2[0]
      cjs require ./vendor2 [4] ./pageA.js 3:0-20
-     single entry ./vendor2 [5] multi ./vendor2 vendor2:100000
- [5] multi ./vendor2 28 bytes {3} [built]
+ [3] multi ./vendor2 28 bytes {1} [built]
      multi entry 
-chunk    {4} vendor1.js (vendor1) 55 bytes [entry] [rendered]
-    > vendor1
- [0] ./vendor1.js 27 bytes {2} {3} {4} [built]
+chunk    {2} pageA.js (pageA) 147 bytes [entry] [rendered]
+    > ./pageA pageA
+ [0] ./vendor1.js 27 bytes {0} {1} {2} [built]
      cjs require ./vendor1 [1] ./vendor2.js 2:0-20
+     single entry ./vendor1 [2] multi ./vendor1 vendor1[0]
      cjs require ./vendor1 [4] ./pageA.js 2:0-20
-     single entry ./vendor1 [6] multi ./vendor1 vendor1:100000
- [6] multi ./vendor1 28 bytes {4} [built]
-     multi entry 
+ [1] ./vendor2.js 50 bytes {1} {2} [built]
+     single entry ./vendor2 [3] multi ./vendor2 vendor2[0]
+     cjs require ./vendor2 [4] ./pageA.js 3:0-20
+ [4] ./pageA.js 70 bytes {2} [built]
+     single entry ./pageA  pageA
+chunk    {3} pageB.js (pageB) 25 bytes [entry] [rendered]
+    > ./pageB pageB
+ [5] ./pageB.js 25 bytes {3} [built]
+     single entry ./pageB  pageB
+chunk    {4} pageC.js (pageC) 25 bytes [entry] [rendered]
+    > ./pageC pageC
+ [6] ./pageC.js 25 bytes {4} [built]
+     single entry ./pageC  pageC
 ```
diff --git a/examples/wasm-simple/README.md b/examples/wasm-simple/README.md
index 684ba4af212..f15fd6bc348 100644
--- a/examples/wasm-simple/README.md
+++ b/examples/wasm-simple/README.md
@@ -64,6 +64,7 @@ export function fibonacciJavascript(i) {
 /******/ 		var chunkIds = data[0];
 /******/ 		var moreModules = data[1];
 /******/
+/******/
 /******/ 		// add "moreModules" to the modules object,
 /******/ 		// then flag all "chunkIds" as loaded and fire callback
 /******/ 		var moduleId, chunkId, i = 0, resolves = [];
@@ -80,6 +81,7 @@ export function fibonacciJavascript(i) {
 /******/ 			}
 /******/ 		}
 /******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
+/******/
 /******/ 		while(resolves.length) {
 /******/ 			resolves.shift()();
 /******/ 		}
@@ -94,7 +96,7 @@ export function fibonacciJavascript(i) {
 /******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 /******/ 	// Promise = chunk loading, 0 = chunk loaded
 /******/ 	var installedChunks = {
-/******/ 		2: 0
+/******/ 		0: 0
 /******/ 	};
 /******/
 /******/
@@ -107,23 +109,25 @@ export function fibonacciJavascript(i) {
 /******/ 	// object to store loaded and loading wasm modules
 /******/ 	var installedWasmModules = {};
 /******/
+/******/ 	function promiseResolve() { return Promise.resolve(); }
+/******/
 /******/ 	var wasmImportObjects = {
 /******/ 		1: function() {
 /******/ 			return {
 /******/
 /******/ 			};
 /******/ 		},
-/******/ 		3: function() {
+/******/ 		1: function() {
 /******/ 			return {
 /******/
 /******/ 			};
 /******/ 		},
-/******/ 		4: function() {
+/******/ 		3: function() {
 /******/ 			return {
 /******/
 /******/ 			};
 /******/ 		},
-/******/ 		1: function() {
+/******/ 		4: function() {
 /******/ 			return {
 /******/
 /******/ 			};
@@ -178,19 +182,16 @@ export function fibonacciJavascript(i) {
 /******/ 				// start chunk loading
 /******/ 				var head = document.getElementsByTagName('head')[0];
 /******/ 				var script = document.createElement('script');
+/******/ 				var onScriptComplete;
 /******/
 /******/ 				script.charset = 'utf-8';
 /******/ 				script.timeout = 120;
-/******/
 /******/ 				if (__webpack_require__.nc) {
 /******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 				}
 /******/ 				script.src = jsonpScriptSrc(chunkId);
-/******/ 				var timeout = setTimeout(function(){
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
-/******/ 				}, 120000);
-/******/ 				script.onerror = script.onload = onScriptComplete;
-/******/ 				function onScriptComplete(event) {
+/******/
+/******/ 				onScriptComplete = function (event) {
 /******/ 					// avoid mem leaks in IE.
 /******/ 					script.onerror = script.onload = null;
 /******/ 					clearTimeout(timeout);
@@ -207,13 +208,17 @@ export function fibonacciJavascript(i) {
 /******/ 						installedChunks[chunkId] = undefined;
 /******/ 					}
 /******/ 				};
+/******/ 				var timeout = setTimeout(function(){
+/******/ 					onScriptComplete({ type: 'timeout', target: script });
+/******/ 				}, 120000);
+/******/ 				script.onerror = script.onload = onScriptComplete;
 /******/ 				head.appendChild(script);
 /******/ 			}
 /******/ 		}
 /******/
 /******/ 		// Fetch + compile chunk loading for webassembly
 /******/
-/******/ 		var wasmModules = {"0":[1,3,4],"1":[1]}[chunkId] || [];
+/******/ 		var wasmModules = {"1":[1],"2":[1,3,4]}[chunkId] || [];
 /******/
 /******/ 		wasmModules.forEach(function(wasmModuleId) {
 /******/ 			var installedWasmModuleData = installedWasmModules[wasmModuleId];
@@ -223,7 +228,7 @@ export function fibonacciJavascript(i) {
 /******/ 				promises.push(installedWasmModuleData);
 /******/ 			else {
 /******/ 				var importObject = wasmImportObjects[wasmModuleId]();
-/******/ 				var req = fetch(__webpack_require__.p + "" + {"1":"30aba380c690e17b4bf0","3":"061d333ce184178519f1","4":"8ac55ff8d1119fe3b24f"}[wasmModuleId] + ".wasm");
+/******/ 				var req = fetch(__webpack_require__.p + "" + {"1":"c50d6212832abfc3ae1e","3":"3580ad47c1ba500584ea","4":"baf012e37fe9b85e815a"}[wasmModuleId] + ".wasm");
 /******/ 				var promise;
 /******/ 				if(importObject instanceof Promise && typeof WebAssembly.compileStreaming === 'function') {
 /******/ 					promise = Promise.all([WebAssembly.compileStreaming(req), importObject]).then(function(items) {
@@ -238,7 +243,7 @@ export function fibonacciJavascript(i) {
 /******/ 					});
 /******/ 				}
 /******/ 				promises.push(installedWasmModules[wasmModuleId] = promise.then(function(res) {
-/******/ 					return __webpack_require__.w[wasmModuleId] = res.instance || res;
+/******/ 					return __webpack_require__.w[wasmModuleId] = (res.instance || res).exports;
 /******/ 				}));
 /******/ 			}
 /******/ 		});
@@ -254,19 +259,34 @@ export function fibonacciJavascript(i) {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -285,7 +305,7 @@ export function fibonacciJavascript(i) {
 /******/ 	// on error function for async loading
 /******/ 	__webpack_require__.oe = function(err) { console.error(err); throw err; };
 /******/
-/******/ 	// object with all WebAssembly.instance
+/******/ 	// object with all WebAssembly.instance exports
 /******/ 	__webpack_require__.w = {};
 /******/
 /******/ 	var jsonpArray = window["webpackJsonp"] = window["webpackJsonp"] || [];
@@ -315,7 +335,7 @@ export function fibonacciJavascript(i) {
 
 __webpack_require__.e(/*! import() */ 1).then(__webpack_require__.bind(null, /*! ./add.wasm */ 1)).then(addModule => {
 	console.log(addModule.add(22, 2200));
-	__webpack_require__.e(/*! import() */ 0).then(__webpack_require__.bind(null, /*! ./math */ 2)).then(math => {
+	__webpack_require__.e(/*! import() */ 2).then(__webpack_require__.bind(null, /*! ./math */ 2)).then(math => {
 		console.log(math.add(10, 101));
 		console.log(math.factorial(15));
 		console.log(math.factorialJavascript(15));
@@ -345,10 +365,38 @@ function timed(name, fn) {
 /******/ ]);
 ```
 
-# dist/0.output.js
+# dist/1.output.js
+
+``` javascript
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
+/* 0 */,
+/* 1 */
+/*!******************!*\
+  !*** ./add.wasm ***!
+  \******************/
+/*! exports provided: add */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Instantiate WebAssembly module
+var wasmExports = __webpack_require__.w[module.i];
+__webpack_require__.r(exports);
+// export exports from WebAssembly module
+for(var name in wasmExports) if(name != "__webpack_init__") exports[name] = wasmExports[name];
+// exec imports from WebAssembly module (for esm order)
+
+
+// exec wasm module
+wasmExports["__webpack_init__"]()
+
+/***/ })
+]]);
+```
+
+# dist/2.output.js
 
 ``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[0],[
+(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[2],[
 /* 0 */,
 /* 1 */
 /*!******************!*\
@@ -359,13 +407,15 @@ function timed(name, fn) {
 
 "use strict";
 // Instantiate WebAssembly module
-var instance = __webpack_require__.w[module.i];
+var wasmExports = __webpack_require__.w[module.i];
+__webpack_require__.r(exports);
 // export exports from WebAssembly module
-module.exports = instance.exports;
+for(var name in wasmExports) if(name != "__webpack_init__") exports[name] = wasmExports[name];
 // exec imports from WebAssembly module (for esm order)
 
+
 // exec wasm module
-instance.exports.__webpack_init__()
+wasmExports["__webpack_init__"]()
 
 /***/ }),
 /* 2 */
@@ -382,10 +432,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _add_wasm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./add.wasm */ 1);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "add", function() { return _add_wasm__WEBPACK_IMPORTED_MODULE_0__["add"]; });
 
-/* harmony import */ var _factorial_wasm__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./factorial.wasm */ 4);
+/* harmony import */ var _factorial_wasm__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./factorial.wasm */ 3);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "factorial", function() { return _factorial_wasm__WEBPACK_IMPORTED_MODULE_1__["factorial"]; });
 
-/* harmony import */ var _fibonacci_wasm__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./fibonacci.wasm */ 3);
+/* harmony import */ var _fibonacci_wasm__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./fibonacci.wasm */ 4);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fibonacci", function() { return _fibonacci_wasm__WEBPACK_IMPORTED_MODULE_2__["fibonacci"]; });
 
 
@@ -408,64 +458,42 @@ function fibonacciJavascript(i) {
 /***/ }),
 /* 3 */
 /*!************************!*\
-  !*** ./fibonacci.wasm ***!
+  !*** ./factorial.wasm ***!
   \************************/
-/*! exports provided: fibonacci */
+/*! exports provided: factorial */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 // Instantiate WebAssembly module
-var instance = __webpack_require__.w[module.i];
+var wasmExports = __webpack_require__.w[module.i];
+__webpack_require__.r(exports);
 // export exports from WebAssembly module
-module.exports = instance.exports;
+for(var name in wasmExports) if(name != "__webpack_init__") exports[name] = wasmExports[name];
 // exec imports from WebAssembly module (for esm order)
 
+
 // exec wasm module
-instance.exports.__webpack_init__()
+wasmExports["__webpack_init__"]()
 
 /***/ }),
 /* 4 */
 /*!************************!*\
-  !*** ./factorial.wasm ***!
+  !*** ./fibonacci.wasm ***!
   \************************/
-/*! exports provided: factorial */
+/*! exports provided: fibonacci */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 // Instantiate WebAssembly module
-var instance = __webpack_require__.w[module.i];
+var wasmExports = __webpack_require__.w[module.i];
+__webpack_require__.r(exports);
 // export exports from WebAssembly module
-module.exports = instance.exports;
+for(var name in wasmExports) if(name != "__webpack_init__") exports[name] = wasmExports[name];
 // exec imports from WebAssembly module (for esm order)
 
-// exec wasm module
-instance.exports.__webpack_init__()
-
-/***/ })
-]]);
-```
-
-# dist/1.output.js
-
-``` javascript
-(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],[
-/* 0 */,
-/* 1 */
-/*!******************!*\
-  !*** ./add.wasm ***!
-  \******************/
-/*! exports provided: add */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Instantiate WebAssembly module
-var instance = __webpack_require__.w[module.i];
-// export exports from WebAssembly module
-module.exports = instance.exports;
-// exec imports from WebAssembly module (for esm order)
 
 // exec wasm module
-instance.exports.__webpack_init__()
+wasmExports["__webpack_init__"]()
 
 /***/ })
 ]]);
@@ -477,88 +505,88 @@ instance.exports.__webpack_init__()
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
                     Asset          Size  Chunks             Chunk Names
-              0.output.js       3.1 KiB       0  [emitted]  
-30aba380c690e17b4bf0.wasm  unknown size    0, 1  [emitted]  
-061d333ce184178519f1.wasm  unknown size       0  [emitted]  
-8ac55ff8d1119fe3b24f.wasm  unknown size       0  [emitted]  
-              1.output.js     542 bytes       1  [emitted]  
-                output.js      10.2 KiB       2  [emitted]  main
+                output.js      11.3 KiB       0  [emitted]  main
+              1.output.js     636 bytes       1  [emitted]  
+c50d6212832abfc3ae1e.wasm  unknown size    1, 2  [emitted]  
+              2.output.js      3.37 KiB       2  [emitted]  
+3580ad47c1ba500584ea.wasm  unknown size       2  [emitted]  
+baf012e37fe9b85e815a.wasm  unknown size       2  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js, 30aba380c690e17b4bf0.wasm, 061d333ce184178519f1.wasm, 8ac55ff8d1119fe3b24f.wasm 570 bytes <{2}> [rendered]
+chunk    {0} output.js (main) 762 bytes >{1}< >{2}< [entry] [rendered]
+    > .\example.js main
+ [0] ./example.js 762 bytes {0} [built]
+     single entry .\example.js  main
+chunk    {1} 1.output.js, c50d6212832abfc3ae1e.wasm 41 bytes <{0}> [rendered]
+    > ./add.wasm [0] ./example.js 1:0-20
+ [1] ./add.wasm 41 bytes {1} {2} [built]
+     [exports: add]
+     import() ./add.wasm [0] ./example.js 1:0-20
+     harmony side effect evaluation ./add.wasm [2] ./math.js 1:0-33
+     harmony export imported specifier ./add.wasm [2] ./math.js 5:0-37
+chunk    {2} 2.output.js, c50d6212832abfc3ae1e.wasm, 3580ad47c1ba500584ea.wasm, baf012e37fe9b85e815a.wasm 570 bytes <{0}> [rendered]
     > ./math [0] ./example.js 3:1-17
- [1] ./add.wasm 41 bytes {0} {1} [built]
+ [1] ./add.wasm 41 bytes {1} {2} [built]
      [exports: add]
      import() ./add.wasm [0] ./example.js 1:0-20
      harmony side effect evaluation ./add.wasm [2] ./math.js 1:0-33
      harmony export imported specifier ./add.wasm [2] ./math.js 5:0-37
- [2] ./math.js 400 bytes {0} [built]
+ [2] ./math.js 400 bytes {2} [built]
      [exports: add, factorial, fibonacci, factorialJavascript, fibonacciJavascript]
      import() ./math [0] ./example.js 3:1-17
- [3] ./fibonacci.wasm 67 bytes {0} [built]
-     [exports: fibonacci]
-     harmony side effect evaluation ./fibonacci.wasm [2] ./math.js 3:0-45
-     harmony export imported specifier ./fibonacci.wasm [2] ./math.js 5:0-37
- [4] ./factorial.wasm 62 bytes {0} [built]
+ [3] ./factorial.wasm 62 bytes {2} [built]
      [exports: factorial]
      harmony side effect evaluation ./factorial.wasm [2] ./math.js 2:0-45
      harmony export imported specifier ./factorial.wasm [2] ./math.js 5:0-37
-chunk    {1} 1.output.js, 30aba380c690e17b4bf0.wasm 41 bytes <{2}> [rendered]
-    > ./add.wasm [0] ./example.js 1:0-20
- [1] ./add.wasm 41 bytes {0} {1} [built]
-     [exports: add]
-     import() ./add.wasm [0] ./example.js 1:0-20
-     harmony side effect evaluation ./add.wasm [2] ./math.js 1:0-33
-     harmony export imported specifier ./add.wasm [2] ./math.js 5:0-37
-chunk    {2} output.js (main) 762 bytes >{0}< >{1}< [entry] [rendered]
-    > .\example.js main
- [0] ./example.js 762 bytes {2} [built]
-     single entry .\example.js  main
+ [4] ./fibonacci.wasm 67 bytes {2} [built]
+     [exports: fibonacci]
+     harmony side effect evaluation ./fibonacci.wasm [2] ./math.js 3:0-45
+     harmony export imported specifier ./fibonacci.wasm [2] ./math.js 5:0-37
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
                     Asset          Size   Chunks             Chunk Names
-              0.output.js     722 bytes     0, 1  [emitted]  
-9e0b33732e07ce9eacd3.wasm  unknown size  0, 1, 1  [emitted]  
-52a9b4a4020ad3ef6f0b.wasm  unknown size     0, 1  [emitted]  
-68db91566fc0884f2a9b.wasm  unknown size     0, 1  [emitted]  
-              1.output.js     155 bytes        1  [emitted]  
-                output.js      2.92 KiB        2  [emitted]  main
+                output.js      3.32 KiB        0  [emitted]  main
+              1.output.js     184 bytes        1  [emitted]  
+a36cec63b02caac8e61a.wasm  unknown size  1, 2, 1  [emitted]  
+              2.output.js     681 bytes     2, 1  [emitted]  
+a04390412f9500b1d7ae.wasm  unknown size     2, 1  [emitted]  
+0a12d714e570b7fd9d8b.wasm  unknown size     2, 1  [emitted]  
 Entrypoint main = output.js
-chunk    {0} 0.output.js, 9e0b33732e07ce9eacd3.wasm, 52a9b4a4020ad3ef6f0b.wasm, 68db91566fc0884f2a9b.wasm 570 bytes <{2}> [rendered]
+chunk    {0} output.js (main) 762 bytes >{1}< >{2}< [entry] [rendered]
+    > .\example.js main
+ [0] ./example.js 762 bytes {0} [built]
+     single entry .\example.js  main
+chunk    {1} 1.output.js, a36cec63b02caac8e61a.wasm 41 bytes <{0}> [rendered]
+    > ./add.wasm [0] ./example.js 1:0-20
+ [1] ./add.wasm 41 bytes {1} {2} [built]
+     [exports: add]
+     import() ./add.wasm [0] ./example.js 1:0-20
+     harmony side effect evaluation ./add.wasm [2] ./math.js 1:0-33
+     harmony export imported specifier ./add.wasm [2] ./math.js 5:0-37
+chunk    {2} 2.output.js, a36cec63b02caac8e61a.wasm, a04390412f9500b1d7ae.wasm, 0a12d714e570b7fd9d8b.wasm 570 bytes <{0}> [rendered]
     > ./math [0] ./example.js 3:1-17
- [1] ./add.wasm 41 bytes {0} {1} [built]
+ [1] ./add.wasm 41 bytes {1} {2} [built]
      [exports: add]
      import() ./add.wasm [0] ./example.js 1:0-20
      harmony side effect evaluation ./add.wasm [2] ./math.js 1:0-33
      harmony export imported specifier ./add.wasm [2] ./math.js 5:0-37
- [2] ./math.js 400 bytes {0} [built]
+ [2] ./math.js 400 bytes {2} [built]
      [exports: add, factorial, fibonacci, factorialJavascript, fibonacciJavascript]
      import() ./math [0] ./example.js 3:1-17
- [3] ./fibonacci.wasm 67 bytes {0} [built]
-     [exports: fibonacci]
-     [all exports used]
-     harmony side effect evaluation ./fibonacci.wasm [2] ./math.js 3:0-45
-     harmony export imported specifier ./fibonacci.wasm [2] ./math.js 5:0-37
- [4] ./factorial.wasm 62 bytes {0} [built]
+ [3] ./factorial.wasm 62 bytes {2} [built]
      [exports: factorial]
      [all exports used]
      harmony side effect evaluation ./factorial.wasm [2] ./math.js 2:0-45
      harmony export imported specifier ./factorial.wasm [2] ./math.js 5:0-37
-chunk    {1} 1.output.js, 9e0b33732e07ce9eacd3.wasm 41 bytes <{2}> [rendered]
-    > ./add.wasm [0] ./example.js 1:0-20
- [1] ./add.wasm 41 bytes {0} {1} [built]
-     [exports: add]
-     import() ./add.wasm [0] ./example.js 1:0-20
-     harmony side effect evaluation ./add.wasm [2] ./math.js 1:0-33
-     harmony export imported specifier ./add.wasm [2] ./math.js 5:0-37
-chunk    {2} output.js (main) 762 bytes >{0}< >{1}< [entry] [rendered]
-    > .\example.js main
- [0] ./example.js 762 bytes {2} [built]
-     single entry .\example.js  main
+ [4] ./fibonacci.wasm 67 bytes {2} [built]
+     [exports: fibonacci]
+     [all exports used]
+     harmony side effect evaluation ./fibonacci.wasm [2] ./math.js 3:0-45
+     harmony export imported specifier ./fibonacci.wasm [2] ./math.js 5:0-37
 ```
diff --git a/examples/wasm-simple/template.md b/examples/wasm-simple/template.md
index 882ae226777..87ca69b85d8 100644
--- a/examples/wasm-simple/template.md
+++ b/examples/wasm-simple/template.md
@@ -20,16 +20,16 @@ WebAssembly modules can be imported like other modules. Their download and compi
 {{dist/output.js}}
 ```
 
-# dist/0.output.js
+# dist/1.output.js
 
 ``` javascript
-{{dist/0.output.js}}
+{{dist/1.output.js}}
 ```
 
-# dist/1.output.js
+# dist/2.output.js
 
 ``` javascript
-{{dist/1.output.js}}
+{{dist/2.output.js}}
 ```
 
 # Info
diff --git a/examples/web-worker/README.md b/examples/web-worker/README.md
index 4ee25044ec5..7f56ac41ee3 100644
--- a/examples/web-worker/README.md
+++ b/examples/web-worker/README.md
@@ -64,19 +64,34 @@ onmessage = function(event) {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -94,7 +109,7 @@ onmessage = function(event) {
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1);
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
 /******/ })
 /************************************************************************/
 ```
@@ -104,25 +119,13 @@ onmessage = function(event) {
 ``` javascript
 /******/ ([
 /* 0 */
-/*!****************************************************************************************!*\
-  !*** (webpack)/node_modules/worker-loader/dist/cjs.js?name=hash.worker.js!./worker.js ***!
-  \****************************************************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = function() {
-  return new Worker(__webpack_require__.p + "hash.worker.js");
-};
-
-/***/ }),
-/* 1 */
 /*!********************!*\
   !*** ./example.js ***!
   \********************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-var Worker = __webpack_require__(/*! worker-loader?name=hash.worker.js!./worker */ 0);
+var Worker = __webpack_require__(/*! worker-loader?name=hash.worker.js!./worker */ 1);
 var worker = new Worker;
 worker.postMessage("b");
 worker.onmessage = function(event) {
@@ -130,6 +133,18 @@ worker.onmessage = function(event) {
 }
 
 
+/***/ }),
+/* 1 */
+/*!****************************************************************************************!*\
+  !*** (webpack)/node_modules/worker-loader/dist/cjs.js?name=hash.worker.js!./worker.js ***!
+  \****************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = function() {
+  return new Worker(__webpack_require__.p + "hash.worker.js");
+};
+
 /***/ })
 /******/ ]);
 ```
@@ -152,7 +167,7 @@ worker.onmessage = function(event) {
 /******/ 	// object to store loaded chunks
 /******/ 	// "1" means "already loaded"
 /******/ 	var installedChunks = {
-/******/ 		1: 1
+/******/ 		0: 1
 /******/ 	};
 /******/
 /******/ 	// The require function
@@ -201,19 +216,34 @@ worker.onmessage = function(event) {
 /******/ 	// define getter function for harmony exports
 /******/ 	__webpack_require__.d = function(exports, name, getter) {
 /******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, {
-/******/ 				configurable: false,
-/******/ 				enumerable: true,
-/******/ 				get: getter
-/******/ 			});
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 /******/ 		}
 /******/ 	};
 /******/
 /******/ 	// define __esModule on exports
 /******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
 /******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 /******/ 	};
 /******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
 /******/ 	// getDefaultExport function for compatibility with non-harmony modules
 /******/ 	__webpack_require__.n = function(module) {
 /******/ 		var getter = module && module.__esModule ?
@@ -244,7 +274,7 @@ worker.onmessage = function(event) {
 
 onmessage = function(event) {
 	var template = event.data;
-	__webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = [__webpack_require__(1)("./" + event.data)]; (function(tmpl) {
+	__webpack_require__.e(/*! AMD require */ 1).then(function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = [__webpack_require__(1)("./" + event.data)]; (function(tmpl) {
 		postMessage(tmpl());
 	}).apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__);}).catch(__webpack_require__.oe);
 }
@@ -254,10 +284,10 @@ onmessage = function(event) {
 /******/ ]);
 ```
 
-# dist/0.[hash].worker.js
+# dist/1.[hash].worker.js
 
 ``` javascript
-window["webpackChunk"]([0],[
+window["webpackChunk"]([1],[
 /* 0 */,
 /* 1 */
 /*!**************************************************!*\
@@ -267,19 +297,18 @@ window["webpackChunk"]([0],[
 /***/ (function(module, exports, __webpack_require__) {
 
 var map = {
-	"./a": 4,
-	"./a.js": 4,
+	"./a": 2,
+	"./a.js": 2,
 	"./b": 3,
 	"./b.js": 3,
-	"./c": 2,
-	"./c.js": 2
+	"./c": 4,
+	"./c.js": 4
 };
 
 
 function webpackContext(req) {
 	var id = webpackContextResolve(req);
-	var module = __webpack_require__(id);
-	return module;
+	return __webpack_require__(id);
 }
 function webpackContextResolve(req) {
 	var id = map[req];
@@ -300,13 +329,13 @@ webpackContext.id = 1;
 /***/ }),
 /* 2 */
 /*!*****************************************!*\
-  !*** ../require.context/templates/c.js ***!
+  !*** ../require.context/templates/a.js ***!
   \*****************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
 module.exports = function() {
-	return "This text was generated by template C";
+	return "This text was generated by template A";
 }
 
 /***/ }),
@@ -324,13 +353,13 @@ module.exports = function() {
 /***/ }),
 /* 4 */
 /*!*****************************************!*\
-  !*** ../require.context/templates/a.js ***!
+  !*** ../require.context/templates/c.js ***!
   \*****************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
 module.exports = function() {
-	return "This text was generated by template A";
+	return "This text was generated by template C";
 }
 
 /***/ })
@@ -343,78 +372,78 @@ module.exports = function() {
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
            Asset      Size  Chunks             Chunk Names
-0.hash.worker.js  1.82 KiB          [emitted]  
-  hash.worker.js  4.02 KiB          [emitted]  
-       output.js  3.46 KiB       0  [emitted]  main
+  hash.worker.js  4.98 KiB          [emitted]  
+1.hash.worker.js  1.79 KiB          [emitted]  
+       output.js  4.42 KiB       0  [emitted]  main
 Entrypoint main = output.js
 chunk    {0} output.js (main) 326 bytes [entry] [rendered]
     > .\example.js main
- [0] (webpack)/node_modules/worker-loader/dist/cjs.js?name=hash.worker.js!./worker.js 97 bytes {0} [not cacheable] [built]
-     cjs require worker-loader?name=hash.worker.js!./worker [1] ./example.js 1:13-66
- [1] ./example.js 229 bytes {0} [built]
+ [0] ./example.js 229 bytes {0} [built]
      single entry .\example.js  main
+ [1] (webpack)/node_modules/worker-loader/dist/cjs.js?name=hash.worker.js!./worker.js 97 bytes {0} [not cacheable] [built]
+     cjs require worker-loader?name=hash.worker.js!./worker [0] ./example.js 1:13-66
 Child worker:
                Asset      Size  Chunks             Chunk Names
-    0.hash.worker.js  1.82 KiB       0  [emitted]  
-      hash.worker.js  4.02 KiB       1  [emitted]  main
+      hash.worker.js  4.98 KiB       0  [emitted]  main
+    1.hash.worker.js  1.79 KiB       1  [emitted]  
     Entrypoint main = hash.worker.js
-    chunk    {0} 0.hash.worker.js 463 bytes <{1}> [rendered]
+    chunk    {0} hash.worker.js (main) 162 bytes >{1}< [entry] [rendered]
+        > !!.\worker.js main
+     [0] ./worker.js 162 bytes {0} [built]
+         single entry !!.\worker.js  main
+    chunk    {1} 1.hash.worker.js 457 bytes <{0}> [rendered]
         > [0] ./worker.js 3:1-5:3
-     [1] ../require.context/templates sync ^\.\/.*$ 217 bytes {0} [built]
+     [1] ../require.context/templates sync ^\.\/.*$ 217 bytes {1} [built]
          amd require context ../require.context/templates [0] ./worker.js 3:1-5:3
-     [2] ../require.context/templates/c.js 82 bytes {0} [optional] [built]
-         context element ./c.js [1] ../require.context/templates sync ^\.\/.*$ ./c.js
-         context element ./c [1] ../require.context/templates sync ^\.\/.*$ ./c
-     [3] ../require.context/templates/b.js 82 bytes {0} [optional] [built]
-         context element ./b.js [1] ../require.context/templates sync ^\.\/.*$ ./b.js
-         context element ./b [1] ../require.context/templates sync ^\.\/.*$ ./b
-     [4] ../require.context/templates/a.js 82 bytes {0} [optional] [built]
-         context element ./a.js [1] ../require.context/templates sync ^\.\/.*$ ./a.js
+     [2] ../require.context/templates/a.js 80 bytes {1} [optional] [built]
          context element ./a [1] ../require.context/templates sync ^\.\/.*$ ./a
-    chunk    {1} hash.worker.js (main) 168 bytes >{0}< [entry] [rendered]
-        > !!.\worker.js main
-     [0] ./worker.js 168 bytes {1} [built]
-         single entry !!.\worker.js  main
+         context element ./a.js [1] ../require.context/templates sync ^\.\/.*$ ./a.js
+     [3] ../require.context/templates/b.js 80 bytes {1} [optional] [built]
+         context element ./b [1] ../require.context/templates sync ^\.\/.*$ ./b
+         context element ./b.js [1] ../require.context/templates sync ^\.\/.*$ ./b.js
+     [4] ../require.context/templates/c.js 80 bytes {1} [optional] [built]
+         context element ./c [1] ../require.context/templates sync ^\.\/.*$ ./c
+         context element ./c.js [1] ../require.context/templates sync ^\.\/.*$ ./c.js
 ```
 
 ## Production mode
 
 ```
 Hash: 0a1b2c3d4e5f6a7b8c9d
-Version: webpack 4.8.0
+Version: webpack 4.20.1
            Asset       Size  Chunks             Chunk Names
-0.hash.worker.js  594 bytes          [emitted]  
-  hash.worker.js  919 bytes          [emitted]  
-       output.js  697 bytes       0  [emitted]  main
+  hash.worker.js   1.27 KiB          [emitted]  
+1.hash.worker.js  593 bytes          [emitted]  
+       output.js   1.06 KiB       0  [emitted]  main
 Entrypoint main = output.js
 chunk    {0} output.js (main) 326 bytes [entry] [rendered]
     > .\example.js main
- [0] (webpack)/node_modules/worker-loader/dist/cjs.js?name=hash.worker.js!./worker.js 97 bytes {0} [not cacheable] [built]
-     cjs require worker-loader?name=hash.worker.js!./worker [1] ./example.js 1:13-66
- [1] ./example.js 229 bytes {0} [built]
+ [0] ./example.js 229 bytes {0} [built]
      single entry .\example.js  main
+ [1] (webpack)/node_modules/worker-loader/dist/cjs.js?name=hash.worker.js!./worker.js 97 bytes {0} [not cacheable] [built]
+     cjs require worker-loader?name=hash.worker.js!./worker [0] ./example.js 1:13-66
 Child worker:
                Asset       Size  Chunks             Chunk Names
-    0.hash.worker.js  594 bytes       0  [emitted]  
-      hash.worker.js  919 bytes       1  [emitted]  main
+      hash.worker.js   1.27 KiB       0  [emitted]  main
+    1.hash.worker.js  593 bytes       1  [emitted]  
     Entrypoint main = hash.worker.js
-    chunk    {0} 0.hash.worker.js 463 bytes <{1}> [rendered]
+    chunk    {0} hash.worker.js (main) 162 bytes >{1}< [entry] [rendered]
+        > !!.\worker.js main
+     [0] ./worker.js 162 bytes {0} [built]
+         single entry !!.\worker.js  main
+    chunk    {1} 1.hash.worker.js 457 bytes <{0}> [rendered]
         > [0] ./worker.js 3:1-5:3
-     [1] ../require.context/templates sync ^\.\/.*$ 217 bytes {0} [built]
+     [1] ../require.context/templates sync ^\.\/.*$ 217 bytes {1} [built]
          amd require context ../require.context/templates [0] ./worker.js 3:1-5:3
-     [2] ../require.context/templates/c.js 82 bytes {0} [optional] [built]
-         context element ./c.js [1] ../require.context/templates sync ^\.\/.*$ ./c.js
-         context element ./c [1] ../require.context/templates sync ^\.\/.*$ ./c
-     [3] ../require.context/templates/b.js 82 bytes {0} [optional] [built]
-         context element ./b.js [1] ../require.context/templates sync ^\.\/.*$ ./b.js
-         context element ./b [1] ../require.context/templates sync ^\.\/.*$ ./b
-     [4] ../require.context/templates/a.js 82 bytes {0} [optional] [built]
-         context element ./a.js [1] ../require.context/templates sync ^\.\/.*$ ./a.js
+     [2] ../require.context/templates/a.js 80 bytes {1} [optional] [built]
          context element ./a [1] ../require.context/templates sync ^\.\/.*$ ./a
-    chunk    {1} hash.worker.js (main) 168 bytes >{0}< [entry] [rendered]
-        > !!.\worker.js main
-     [0] ./worker.js 168 bytes {1} [built]
-         single entry !!.\worker.js  main
+         context element ./a.js [1] ../require.context/templates sync ^\.\/.*$ ./a.js
+     [3] ../require.context/templates/b.js 80 bytes {1} [optional] [built]
+         context element ./b [1] ../require.context/templates sync ^\.\/.*$ ./b
+         context element ./b.js [1] ../require.context/templates sync ^\.\/.*$ ./b.js
+     [4] ../require.context/templates/c.js 80 bytes {1} [optional] [built]
+         context element ./c [1] ../require.context/templates sync ^\.\/.*$ ./c
+         context element ./c.js [1] ../require.context/templates sync ^\.\/.*$ ./c.js
 ```
diff --git a/examples/web-worker/template.md b/examples/web-worker/template.md
index 40477fbd0b5..3cd08bf534b 100644
--- a/examples/web-worker/template.md
+++ b/examples/web-worker/template.md
@@ -23,10 +23,10 @@
 {{dist/hash.worker.js}}
 ```
 
-# dist/0.[hash].worker.js
+# dist/1.[hash].worker.js
 
 ``` javascript
-{{dist/0.hash.worker.js}}
+{{dist/1.hash.worker.js}}
 ```
 
 # Info
diff --git a/hot/dev-server.js b/hot/dev-server.js
index a4cb0f50d24..682a47f8423 100644
--- a/hot/dev-server.js
+++ b/hot/dev-server.js
@@ -40,10 +40,10 @@ if (module.hot) {
 						"warning",
 						"[HMR] Cannot apply update. Need to do a full reload!"
 					);
-					log("warning", "[HMR] " + err.stack || err.message);
+					log("warning", "[HMR] " + (err.stack || err.message));
 					window.location.reload();
 				} else {
-					log("warning", "[HMR] Update failed: " + err.stack || err.message);
+					log("warning", "[HMR] Update failed: " + (err.stack || err.message));
 				}
 			});
 	};
diff --git a/hot/log.js b/hot/log.js
index d9e09b221de..0d05673f83b 100644
--- a/hot/log.js
+++ b/hot/log.js
@@ -30,9 +30,11 @@ module.exports = function(level, msg) {
 	}
 };
 
+/* eslint-disable node/no-unsupported-features/node-builtins */
 var group = console.group || dummy;
 var groupCollapsed = console.groupCollapsed || dummy;
 var groupEnd = console.groupEnd || dummy;
+/* eslint-enable node/no-unsupported-features/node-builtins */
 
 module.exports.group = logGroup(group);
 
diff --git a/hot/only-dev-server.js b/hot/only-dev-server.js
index cf452dc6e33..043f2430b54 100644
--- a/hot/only-dev-server.js
+++ b/hot/only-dev-server.js
@@ -72,11 +72,11 @@ if (module.hot) {
 						"warning",
 						"[HMR] Cannot check for update. Need to do a full reload!"
 					);
-					log("warning", "[HMR] " + err.stack || err.message);
+					log("warning", "[HMR] " + (err.stack || err.message));
 				} else {
 					log(
 						"warning",
-						"[HMR] Update check failed: " + err.stack || err.message
+						"[HMR] Update check failed: " + (err.stack || err.message)
 					);
 				}
 			});
diff --git a/hot/poll.js b/hot/poll.js
index f615accef7a..8193db01f5c 100644
--- a/hot/poll.js
+++ b/hot/poll.js
@@ -23,10 +23,13 @@ if (module.hot) {
 					var status = module.hot.status();
 					if (["abort", "fail"].indexOf(status) >= 0) {
 						log("warning", "[HMR] Cannot apply update.");
-						log("warning", "[HMR] " + err.stack || err.message);
+						log("warning", "[HMR] " + (err.stack || err.message));
 						log("warning", "[HMR] You need to restart the application!");
 					} else {
-						log("warning", "[HMR] Update failed: " + err.stack || err.message);
+						log(
+							"warning",
+							"[HMR] Update failed: " + (err.stack || err.message)
+						);
 					}
 				});
 		}
diff --git a/hot/signal.js b/hot/signal.js
index d3ce50e8cc5..24c4f5cb337 100644
--- a/hot/signal.js
+++ b/hot/signal.js
@@ -37,10 +37,10 @@ if (module.hot) {
 				var status = module.hot.status();
 				if (["abort", "fail"].indexOf(status) >= 0) {
 					log("warning", "[HMR] Cannot apply update.");
-					log("warning", "[HMR] " + err.stack || err.message);
+					log("warning", "[HMR] " + (err.stack || err.message));
 					log("warning", "[HMR] You need to restart the application!");
 				} else {
-					log("warning", "[HMR] Update failed: " + err.stack || err.message);
+					log("warning", "[HMR] Update failed: " + (err.stack || err.message));
 				}
 			});
 	};
diff --git a/lib/AmdMainTemplatePlugin.js b/lib/AmdMainTemplatePlugin.js
index ff715ec6c17..5e2c0bd7df0 100644
--- a/lib/AmdMainTemplatePlugin.js
+++ b/lib/AmdMainTemplatePlugin.js
@@ -10,13 +10,24 @@ const Template = require("./Template");
 
 /** @typedef {import("./Compilation")} Compilation */
 
+/**
+ * @typedef {Object} AmdMainTemplatePluginOptions
+ * @param {string=} name the library name
+ * @property {boolean=} requireAsWrapper
+ */
+
 class AmdMainTemplatePlugin {
 	/**
-	 * @param {string} name the library name
+	 * @param {AmdMainTemplatePluginOptions} options the plugin options
 	 */
-	constructor(name) {
-		/** @type {string} */
-		this.name = name;
+	constructor(options) {
+		if (!options || typeof options === "string") {
+			this.name = options;
+			this.requireAsWrapper = false;
+		} else {
+			this.name = options.name;
+			this.requireAsWrapper = options.requireAsWrapper;
+		}
 	}
 
 	/**
@@ -39,7 +50,13 @@ class AmdMainTemplatePlugin {
 				)
 				.join(", ");
 
-			if (this.name) {
+			if (this.requireAsWrapper) {
+				return new ConcatSource(
+					`require(${externalsDepsArray}, function(${externalsArguments}) { return `,
+					source,
+					"});"
+				);
+			} else if (this.name) {
 				const name = mainTemplate.getAssetPath(this.name, {
 					hash,
 					chunk
@@ -79,7 +96,9 @@ class AmdMainTemplatePlugin {
 
 		mainTemplate.hooks.hash.tap("AmdMainTemplatePlugin", hash => {
 			hash.update("exports amd");
-			hash.update(this.name);
+			if (this.name) {
+				hash.update(this.name);
+			}
 		});
 	}
 }
diff --git a/lib/AsyncDependenciesBlock.js b/lib/AsyncDependenciesBlock.js
index 3bf22d2e297..a7e029131fd 100644
--- a/lib/AsyncDependenciesBlock.js
+++ b/lib/AsyncDependenciesBlock.js
@@ -3,9 +3,22 @@
 	Author Tobias Koppers @sokra
 */
 "use strict";
+
 const DependenciesBlock = require("./DependenciesBlock");
 
+/** @typedef {import("./ChunkGroup")} ChunkGroup */
+/** @typedef {import("./Module")} Module */
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("./util/createHash").Hash} Hash */
+/** @typedef {TODO} GroupOptions */
+
 module.exports = class AsyncDependenciesBlock extends DependenciesBlock {
+	/**
+	 * @param {GroupOptions} groupOptions options for the group
+	 * @param {Module} module the Module object
+	 * @param {DependencyLocation=} loc the line of code
+	 * @param {TODO=} request the request
+	 */
 	constructor(groupOptions, module, loc, request) {
 		super();
 		if (typeof groupOptions === "string") {
@@ -14,28 +27,50 @@ module.exports = class AsyncDependenciesBlock extends DependenciesBlock {
 			groupOptions = { name: undefined };
 		}
 		this.groupOptions = groupOptions;
+		/** @type {ChunkGroup=} */
 		this.chunkGroup = undefined;
 		this.module = module;
 		this.loc = loc;
 		this.request = request;
+		/** @type {DependenciesBlock} */
+		this.parent = undefined;
 	}
 
+	/**
+	 * @returns {string} The name of the chunk
+	 */
 	get chunkName() {
 		return this.groupOptions.name;
 	}
 
+	/**
+	 * @param {string} value The new chunk name
+	 * @returns {void}
+	 */
 	set chunkName(value) {
 		this.groupOptions.name = value;
 	}
 
+	/**
+	 * @returns {never} this throws and should never be called
+	 */
 	get chunks() {
 		throw new Error("Moved to AsyncDependenciesBlock.chunkGroup");
 	}
 
+	/**
+	 * @param {never} value setter value
+	 * @returns {never} this is going to throw therefore we should throw type
+	 * assertions by returning never
+	 */
 	set chunks(value) {
 		throw new Error("Moved to AsyncDependenciesBlock.chunkGroup");
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track block changes, from "crypto" module
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update(JSON.stringify(this.groupOptions));
 		hash.update(
@@ -50,16 +85,25 @@ module.exports = class AsyncDependenciesBlock extends DependenciesBlock {
 		super.updateHash(hash);
 	}
 
+	/**
+	 * @returns {void}
+	 */
 	disconnect() {
 		this.chunkGroup = undefined;
 		super.disconnect();
 	}
 
+	/**
+	 * @returns {void}
+	 */
 	unseal() {
 		this.chunkGroup = undefined;
 		super.unseal();
 	}
 
+	/**
+	 * @returns {void}
+	 */
 	sortItems() {
 		super.sortItems();
 	}
diff --git a/lib/AutomaticPrefetchPlugin.js b/lib/AutomaticPrefetchPlugin.js
index 4efb350ce95..2d0db16ecdb 100644
--- a/lib/AutomaticPrefetchPlugin.js
+++ b/lib/AutomaticPrefetchPlugin.js
@@ -8,7 +8,14 @@ const asyncLib = require("neo-async");
 const PrefetchDependency = require("./dependencies/PrefetchDependency");
 const NormalModule = require("./NormalModule");
 
+/** @typedef {import("./Compiler")} Compiler */
+
 class AutomaticPrefetchPlugin {
+	/**
+	 * Apply the plugin
+	 * @param {Compiler} compiler Webpack Compiler
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
 			"AutomaticPrefetchPlugin",
@@ -23,7 +30,7 @@ class AutomaticPrefetchPlugin {
 		compiler.hooks.afterCompile.tap("AutomaticPrefetchPlugin", compilation => {
 			lastModules = compilation.modules
 				.filter(m => m instanceof NormalModule)
-				.map(m => ({
+				.map((/** @type {NormalModule} */ m) => ({
 					context: m.context,
 					request: m.request
 				}));
diff --git a/lib/BannerPlugin.js b/lib/BannerPlugin.js
index 1e9aa343c0e..80c66a5ac11 100644
--- a/lib/BannerPlugin.js
+++ b/lib/BannerPlugin.js
@@ -12,6 +12,9 @@ const Template = require("./Template");
 const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/BannerPlugin.json");
 
+/** @typedef {import("../declarations/plugins/BannerPlugin").BannerPluginArgument} BannerPluginArgument */
+/** @typedef {import("../declarations/plugins/BannerPlugin").BannerPluginOptions} BannerPluginOptions */
+
 const wrapComment = str => {
 	if (!str.includes("\n")) {
 		return Template.toComment(str);
@@ -23,6 +26,9 @@ const wrapComment = str => {
 };
 
 class BannerPlugin {
+	/**
+	 * @param {BannerPluginArgument} options options object
+	 */
 	constructor(options) {
 		if (arguments.length > 1) {
 			throw new Error(
@@ -38,17 +44,19 @@ class BannerPlugin {
 			};
 		}
 
-		this.options = options || {};
+		/** @type {BannerPluginOptions} */
+		this.options = options;
 
-		if (typeof options.banner === "function") {
-			const getBanner = this.options.banner;
+		const bannerOption = options.banner;
+		if (typeof bannerOption === "function") {
+			const getBanner = bannerOption;
 			this.banner = this.options.raw
 				? getBanner
 				: data => wrapComment(getBanner(data));
 		} else {
 			const banner = this.options.raw
-				? this.options.banner
-				: wrapComment(this.options.banner);
+				? bannerOption
+				: wrapComment(bannerOption);
 			this.banner = () => banner;
 		}
 	}
diff --git a/lib/Chunk.js b/lib/Chunk.js
index 14d61861260..e9bcb709ee2 100644
--- a/lib/Chunk.js
+++ b/lib/Chunk.js
@@ -8,45 +8,57 @@ const util = require("util");
 const SortableSet = require("./util/SortableSet");
 const intersect = require("./util/SetHelpers").intersect;
 const GraphHelpers = require("./GraphHelpers");
+const Entrypoint = require("./Entrypoint");
 let debugId = 1000;
 const ERR_CHUNK_ENTRY = "Chunk.entry was removed. Use hasRuntime()";
 const ERR_CHUNK_INITIAL =
 	"Chunk.initial was removed. Use canBeInitial/isOnlyInitial()";
 
-/** @typedef {import("./Module.js")} Module */
+/** @typedef {import("./Module")} Module */
 /** @typedef {import("./ChunkGroup")} ChunkGroup */
-/** @typedef {import("./ModuleReason.js")} ModuleReason */
+/** @typedef {import("./ModuleReason")} ModuleReason */
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("./util/createHash").Hash} Hash */
 
 /**
- *  @typedef {Object} Identifiable an object who contains an identifier function property
- *  @property {() => string} identifier the resource or unique identifier of something
+ *  @typedef {Object} WithId an object who has an id property *
+ *  @property {string | number} id the id of the object
  */
 
 /**
- *  @typedef {Object} WithId an object who has an id property
- *  @property {string} id the id of the object
+ * Compare two Modules based on their ids for sorting
+ * @param {Module} a module
+ * @param {Module} b module
+ * @returns {-1|0|1} sort value
  */
 
+// TODO use @callback
 /** @typedef {(a: Module, b: Module) => -1|0|1} ModuleSortPredicate */
 /** @typedef {(m: Module) => boolean} ModuleFilterPredicate */
 /** @typedef {(c: Chunk) => boolean} ChunkFilterPredicate */
 
+const sortModuleById = (a, b) => {
+	if (a.id < b.id) return -1;
+	if (b.id < a.id) return 1;
+	return 0;
+};
+
 /**
- * @param {WithId} a object that contains an ID property
- * @param {WithId} b object that contains an ID property
+ * Compare two ChunkGroups based on their ids for sorting
+ * @param {ChunkGroup} a chunk group
+ * @param {ChunkGroup} b chunk group
  * @returns {-1|0|1} sort value
  */
-const sortById = (a, b) => {
+const sortChunkGroupById = (a, b) => {
 	if (a.id < b.id) return -1;
 	if (b.id < a.id) return 1;
 	return 0;
 };
 
 /**
- *
- * @param {Identifiable} a first object with ident fn
- * @param {Identifiable} b second object with ident fn
+ * Compare two Identifiables , based on their ids for sorting
+ * @param {Module} a first object with ident fn
+ * @param {Module} b second object with ident fn
  * @returns {-1|0|1} The order number of the sort
  */
 const sortByIdentifier = (a, b) => {
@@ -70,13 +82,13 @@ const getModulesIdent = set => {
 
 /**
  * @template T
- * @param {Set<T>} set the set to convert to array
+ * @param {SortableSet<T>} set the sortable set to convert to array
  * @returns {Array<T>} the array returned from Array.from(set)
  */
 const getArray = set => Array.from(set);
 
 /**
- * @param {Set<Module>} set the Set to get the count/size of
+ * @param {SortableSet<Module>} set the sortable Set to get the count/size of
  * @returns {number} the size of the modules
  */
 const getModulesSize = set => {
@@ -108,13 +120,13 @@ class Chunk {
 		this.preventIntegration = false;
 		/** @type {Module=} */
 		this.entryModule = undefined;
-		//TODO make these typed generics for Module[] and ChunkGroup[] and their sort being (T, T): => 1,-1,0
-		//See https://github.com/webpack/webpack/pull/7046
-		/** @private */
+		/** @private @type {SortableSet<Module>} */
 		this._modules = new SortableSet(undefined, sortByIdentifier);
-		/** @private */
-		this._groups = new SortableSet(undefined, sortById);
-		/** @type {Source[]} */
+		/** @type {string?} */
+		this.filenameTemplate = undefined;
+		/** @private @type {SortableSet<ChunkGroup>} */
+		this._groups = new SortableSet(undefined, sortChunkGroupById);
+		/** @type {string[]} */
 		this.files = [];
 		/** @type {boolean} */
 		this.rendered = false;
@@ -171,7 +183,11 @@ class Chunk {
 	hasRuntime() {
 		for (const chunkGroup of this._groups) {
 			// We only need to check the first one
-			return chunkGroup.isInitial() && chunkGroup.getRuntimeChunk() === this;
+			return (
+				chunkGroup.isInitial() &&
+				chunkGroup instanceof Entrypoint &&
+				chunkGroup.getRuntimeChunk() === this
+			);
 		}
 		return false;
 	}
@@ -286,7 +302,7 @@ class Chunk {
 	}
 
 	/**
-	 * @returns {SortableSet} the chunkGroups that said chunk is referenced in
+	 * @returns {SortableSet<ChunkGroup>} the chunkGroups that said chunk is referenced in
 	 */
 	get groupsIterable() {
 		return this._groups;
@@ -297,17 +313,17 @@ class Chunk {
 	 * @returns {-1|0|1} this is a comparitor function like sort and returns -1, 0, or 1 based on sort order
 	 */
 	compareTo(otherChunk) {
-		this._modules.sort();
-		otherChunk._modules.sort();
 		if (this._modules.size > otherChunk._modules.size) return -1;
 		if (this._modules.size < otherChunk._modules.size) return 1;
+		this._modules.sort();
+		otherChunk._modules.sort();
 		const a = this._modules[Symbol.iterator]();
 		const b = otherChunk._modules[Symbol.iterator]();
-		// eslint-disable-next-line
+		// eslint-disable-next-line no-constant-condition
 		while (true) {
 			const aItem = a.next();
-			const bItem = b.next();
 			if (aItem.done) return 0;
+			const bItem = b.next();
 			const aModuleIdentifier = aItem.value.identifier();
 			const bModuleIdentifier = bItem.value.identifier();
 			if (aModuleIdentifier < bModuleIdentifier) return -1;
@@ -323,6 +339,9 @@ class Chunk {
 		return this._modules.has(module);
 	}
 
+	/**
+	 * @returns {Module[]} an array of modules (do not modify)
+	 */
 	getModules() {
 		return this._modules.getFromCache(getArray);
 	}
@@ -480,6 +499,11 @@ class Chunk {
 		return this.addMultiplierAndOverhead(this.modulesSize(), options);
 	}
 
+	/**
+	 * @param {Chunk} otherChunk the other chunk
+	 * @param {TODO} options the options for this function
+	 * @returns {number | false} the size, or false if it can't be integrated
+	 */
 	integratedSize(otherChunk, options) {
 		// Chunk if it's possible to integrate this chunk
 		if (!this.canBeIntegrated(otherChunk)) {
@@ -498,17 +522,20 @@ class Chunk {
 	}
 
 	/**
-	 * @param {ModuleSortPredicate=} sortByFn a predicate function used to sort modules
+	 * @param {function(Module, Module): -1|0|1=} sortByFn a predicate function used to sort modules
 	 * @returns {void}
 	 */
 	sortModules(sortByFn) {
-		this._modules.sortWith(sortByFn || sortById);
+		this._modules.sortWith(sortByFn || sortModuleById);
 	}
 
-	sortItems(sortChunks) {
+	sortItems() {
 		this.sortModules();
 	}
 
+	/**
+	 * @returns {Set<Chunk>} a set of all the async chunks
+	 */
 	getAllAsyncChunks() {
 		const queue = new Set();
 		const chunks = new Set();
@@ -537,9 +564,23 @@ class Chunk {
 		return chunks;
 	}
 
+	/**
+	 * @typedef {Object} ChunkMaps
+	 * @property {Record<string|number, string>} hash
+	 * @property {Record<string|number, Record<string, string>>} contentHash
+	 * @property {Record<string|number, string>} name
+	 */
+
+	/**
+	 * @param {boolean} realHash should the full hash or the rendered hash be used
+	 * @returns {ChunkMaps} the chunk map information
+	 */
 	getChunkMaps(realHash) {
+		/** @type {Record<string|number, string>} */
 		const chunkHashMap = Object.create(null);
+		/** @type {Record<string|number, Record<string, string>>} */
 		const chunkContentHashMap = Object.create(null);
+		/** @type {Record<string|number, string>} */
 		const chunkNameMap = Object.create(null);
 
 		for (const chunk of this.getAllAsyncChunks()) {
@@ -562,6 +603,9 @@ class Chunk {
 		};
 	}
 
+	/**
+	 * @returns {Record<string, Set<TODO>[]>} a record object of names to lists of child ids(?)
+	 */
 	getChildIdsByOrders() {
 		const lists = new Map();
 		for (const group of this.groupsIterable) {
@@ -589,7 +633,7 @@ class Chunk {
 			list.sort((a, b) => {
 				const cmp = b.order - a.order;
 				if (cmp !== 0) return cmp;
-				// TOOD webpack 5 remove this check of compareTo
+				// TODO webpack 5 remove this check of compareTo
 				if (a.group.compareTo) {
 					return a.group.compareTo(b.group);
 				}
@@ -632,11 +676,24 @@ class Chunk {
 		return chunkMaps;
 	}
 
+	/**
+	 * @typedef {Object} ChunkModuleMaps
+	 * @property {Record<string|number, (string|number)[]>} id
+	 * @property {Record<string|number, string>} hash
+	 */
+
+	/**
+	 * @param {ModuleFilterPredicate} filterFn function used to filter modules
+	 * @returns {ChunkModuleMaps} module map information
+	 */
 	getChunkModuleMaps(filterFn) {
+		/** @type {Record<string|number, (string|number)[]>} */
 		const chunkModuleIdMap = Object.create(null);
+		/** @type {Record<string|number, string>} */
 		const chunkModuleHashMap = Object.create(null);
 
 		for (const chunk of this.getAllAsyncChunks()) {
+			/** @type {(string|number)[]} */
 			let array;
 			for (const module of chunk.modulesIterable) {
 				if (filterFn(module)) {
@@ -661,8 +718,8 @@ class Chunk {
 
 	/**
 	 *
-	 * @param {ModuleFilterPredicate} filterFn predicate function used to filter modules
-	 * @param {ChunkFilterPredicate} filterChunkFn predicate function used to filter chunks
+	 * @param {function(Module): boolean} filterFn predicate function used to filter modules
+	 * @param {function(Chunk): boolean} filterChunkFn predicate function used to filter chunks
 	 * @returns {boolean} return true if module exists in graph
 	 */
 	hasModuleInGraph(filterFn, filterChunkFn) {
@@ -697,17 +754,37 @@ class Chunk {
 // TODO remove in webpack 5
 Object.defineProperty(Chunk.prototype, "forEachModule", {
 	configurable: false,
-	value: util.deprecate(function(fn) {
-		this._modules.forEach(fn);
-	}, "Chunk.forEachModule: Use for(const module of chunk.modulesIterable) instead")
+	value: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {Chunk}
+		 * @typedef {function(any, any, Set<any>): void} ForEachModuleCallback
+		 * @param {ForEachModuleCallback} fn Callback function
+		 * @returns {void}
+		 */
+		function(fn) {
+			this._modules.forEach(fn);
+		},
+		"Chunk.forEachModule: Use for(const module of chunk.modulesIterable) instead"
+	)
 });
 
 // TODO remove in webpack 5
 Object.defineProperty(Chunk.prototype, "mapModules", {
 	configurable: false,
-	value: util.deprecate(function(fn) {
-		return Array.from(this._modules, fn);
-	}, "Chunk.mapModules: Use Array.from(chunk.modulesIterable, fn) instead")
+	value: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {Chunk}
+		 * @typedef {function(any, number): any} MapModulesCallback
+		 * @param {MapModulesCallback} fn Callback function
+		 * @returns {TODO[]} result of mapped modules
+		 */
+		function(fn) {
+			return Array.from(this._modules, fn);
+		},
+		"Chunk.mapModules: Use Array.from(chunk.modulesIterable, fn) instead"
+	)
 });
 
 // TODO remove in webpack 5
diff --git a/lib/ChunkGroup.js b/lib/ChunkGroup.js
index 7cb72079df5..031fc14e45d 100644
--- a/lib/ChunkGroup.js
+++ b/lib/ChunkGroup.js
@@ -11,7 +11,6 @@ const compareLocations = require("./compareLocations");
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./ModuleReason")} ModuleReason */
 
-/** @typedef {{id: number}} HasId */
 /** @typedef {{module: Module, loc: TODO, request: string}} OriginRecord */
 /** @typedef {string|{name: string}} ChunkGroupOptions */
 
@@ -19,15 +18,15 @@ let debugId = 5000;
 
 /**
  * @template T
- * @param {Set<T>} set set to convert to array.
+ * @param {SortableSet<T>} set set to convert to array.
  * @returns {T[]} the array format of existing set
  */
 const getArray = set => Array.from(set);
 
 /**
  * A convenience method used to sort chunks based on their id's
- * @param {HasId} a first sorting comparitor
- * @param {HasId} b second sorting comparitor
+ * @param {ChunkGroup} a first sorting comparator
+ * @param {ChunkGroup} b second sorting comparator
  * @returns {1|0|-1} a sorting index to determine order
  */
 const sortById = (a, b) => {
@@ -37,8 +36,8 @@ const sortById = (a, b) => {
 };
 
 /**
- * @param {OriginRecord} a the first comparitor in sort
- * @param {OriginRecord} b the second comparitor in sort
+ * @param {OriginRecord} a the first comparator in sort
+ * @param {OriginRecord} b the second comparator in sort
  * @returns {1|-1|0} returns sorting order as index
  */
 const sortOrigin = (a, b) => {
@@ -63,6 +62,7 @@ class ChunkGroup {
 		/** @type {number} */
 		this.groupDebugId = debugId++;
 		this.options = options;
+		/** @type {SortableSet<ChunkGroup>} */
 		this._children = new SortableSet(undefined, sortById);
 		this._parents = new SortableSet(undefined, sortById);
 		this._blocks = new SortableSet();
@@ -70,6 +70,12 @@ class ChunkGroup {
 		this.chunks = [];
 		/** @type {OriginRecord[]} */
 		this.origins = [];
+		/** Indicies in top-down order */
+		/** @private @type {Map<Module, number>} */
+		this._moduleIndicies = new Map();
+		/** Indicies in bottom-up order */
+		/** @private @type {Map<Module, number>} */
+		this._moduleIndicies2 = new Map();
 	}
 
 	/**
@@ -401,7 +407,7 @@ class ChunkGroup {
 		if (this.chunks.length < otherGroup.chunks.length) return 1;
 		const a = this.chunks[Symbol.iterator]();
 		const b = otherGroup.chunks[Symbol.iterator]();
-		// eslint-disable-next-line
+		// eslint-disable-next-line no-constant-condition
 		while (true) {
 			const aItem = a.next();
 			const bItem = b.next();
@@ -436,7 +442,7 @@ class ChunkGroup {
 			list.sort((a, b) => {
 				const cmp = b.order - a.order;
 				if (cmp !== 0) return cmp;
-				// TOOD webpack 5 remove this check of compareTo
+				// TODO webpack 5 remove this check of compareTo
 				if (a.group.compareTo) {
 					return a.group.compareTo(b.group);
 				}
@@ -447,6 +453,44 @@ class ChunkGroup {
 		return result;
 	}
 
+	/**
+	 * Sets the top-down index of a module in this ChunkGroup
+	 * @param {Module} module module for which the index should be set
+	 * @param {number} index the index of the module
+	 * @returns {void}
+	 */
+	setModuleIndex(module, index) {
+		this._moduleIndicies.set(module, index);
+	}
+
+	/**
+	 * Gets the top-down index of a module in this ChunkGroup
+	 * @param {Module} module the module
+	 * @returns {number} index
+	 */
+	getModuleIndex(module) {
+		return this._moduleIndicies.get(module);
+	}
+
+	/**
+	 * Sets the bottom-up index of a module in this ChunkGroup
+	 * @param {Module} module module for which the index should be set
+	 * @param {number} index the index of the module
+	 * @returns {void}
+	 */
+	setModuleIndex2(module, index) {
+		this._moduleIndicies2.set(module, index);
+	}
+
+	/**
+	 * Gets the bottom-up index of a module in this ChunkGroup
+	 * @param {Module} module the module
+	 * @returns {number} index
+	 */
+	getModuleIndex2(module) {
+		return this._moduleIndicies2.get(module);
+	}
+
 	checkConstraints() {
 		const chunk = this;
 		for (const child of chunk._children) {
diff --git a/lib/ChunkTemplate.js b/lib/ChunkTemplate.js
index c22586f1fcc..65861af49f4 100644
--- a/lib/ChunkTemplate.js
+++ b/lib/ChunkTemplate.js
@@ -9,12 +9,13 @@ const { Tapable, SyncWaterfallHook, SyncHook } = require("tapable");
 /** @typedef {import("./ModuleTemplate")} ModuleTemplate */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./Module")} Module} */
-/** @typedef {import("crypto").Hash} Hash */
+/** @typedef {import("./Dependency").DependencyTemplate} DependencyTemplate} */
+/** @typedef {import("./util/createHash").Hash} Hash} */
 
 /**
  * @typedef {Object} RenderManifestOptions
  * @property {Chunk} chunk the chunk used to render
- * @property {Hash} hash
+ * @property {string} hash
  * @property {string} fullHash
  * @property {TODO} outputOptions
  * @property {{javascript: ModuleTemplate, webassembly: ModuleTemplate}} moduleTemplates
@@ -26,6 +27,7 @@ module.exports = class ChunkTemplate extends Tapable {
 		super();
 		this.outputOptions = outputOptions || {};
 		this.hooks = {
+			/** @type {SyncWaterfallHook<TODO[], RenderManifestOptions>} */
 			renderManifest: new SyncWaterfallHook(["result", "options"]),
 			modules: new SyncWaterfallHook([
 				"source",
@@ -58,13 +60,27 @@ module.exports = class ChunkTemplate extends Tapable {
 		return result;
 	}
 
+	/**
+	 * Updates hash with information from this template
+	 * @param {Hash} hash the hash to update
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update("ChunkTemplate");
 		hash.update("2");
 		this.hooks.hash.call(hash);
 	}
 
-	updateHashForChunk(hash, chunk) {
+	/**
+	 * TODO webpack 5: remove moduleTemplate and dependencyTemplates
+	 * Updates hash with chunk-specific information from this template
+	 * @param {Hash} hash the hash to update
+	 * @param {Chunk} chunk the chunk
+	 * @param {ModuleTemplate} moduleTemplate ModuleTemplate instance for render
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates dependency templates
+	 * @returns {void}
+	 */
+	updateHashForChunk(hash, chunk, moduleTemplate, dependencyTemplates) {
 		this.updateHash(hash);
 		this.hooks.hashForChunk.call(hash, chunk);
 	}
diff --git a/lib/CommentCompilationWarning.js b/lib/CommentCompilationWarning.js
index 29377e94692..79f0a2af5d5 100644
--- a/lib/CommentCompilationWarning.js
+++ b/lib/CommentCompilationWarning.js
@@ -6,7 +6,17 @@
 
 const WebpackError = require("./WebpackError");
 
+/** @typedef {import("./Module")} Module */
+
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
+
 class CommentCompilationWarning extends WebpackError {
+	/**
+	 *
+	 * @param {string} message warning message
+	 * @param {Module} module affected module
+	 * @param {DependencyLocation} loc affected lines of code
+	 */
 	constructor(message, module, loc) {
 		super(message);
 
diff --git a/lib/CompatibilityPlugin.js b/lib/CompatibilityPlugin.js
index 5d2680245bb..1544d6c82a4 100644
--- a/lib/CompatibilityPlugin.js
+++ b/lib/CompatibilityPlugin.js
@@ -8,7 +8,7 @@ const ConstDependency = require("./dependencies/ConstDependency");
 
 const NullFactory = require("./NullFactory");
 
-/** @typedef {import("./Compiler.js")} Compiler */
+/** @typedef {import("./Compiler")} Compiler */
 
 class CompatibilityPlugin {
 	/**
@@ -30,7 +30,7 @@ class CompatibilityPlugin {
 					.for("javascript/auto")
 					.tap("CompatibilityPlugin", (parser, parserOptions) => {
 						if (
-							typeof parserOptions.browserify !== "undefined" &&
+							parserOptions.browserify !== undefined &&
 							!parserOptions.browserify
 						)
 							return;
diff --git a/lib/Compilation.js b/lib/Compilation.js
index 1fd02ed4f6f..5f64119a8bc 100644
--- a/lib/Compilation.js
+++ b/lib/Compilation.js
@@ -26,7 +26,6 @@ const ChunkTemplate = require("./ChunkTemplate");
 const HotUpdateChunkTemplate = require("./HotUpdateChunkTemplate");
 const ModuleTemplate = require("./ModuleTemplate");
 const RuntimeTemplate = require("./RuntimeTemplate");
-const Dependency = require("./Dependency");
 const ChunkRenderError = require("./ChunkRenderError");
 const AsyncDependencyToInitialChunkError = require("./AsyncDependencyToInitialChunkError");
 const Stats = require("./Stats");
@@ -35,13 +34,92 @@ const createHash = require("./util/createHash");
 const Queue = require("./util/Queue");
 const SortableSet = require("./util/SortableSet");
 const GraphHelpers = require("./GraphHelpers");
-
+const ModuleDependency = require("./dependencies/ModuleDependency");
+const compareLocations = require("./compareLocations");
+
+/** @typedef {import("./Module")} Module */
+/** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("./WebpackError")} WebpackError */
+/** @typedef {import("./DependenciesBlockVariable")} DependenciesBlockVariable */
+/** @typedef {import("./dependencies/SingleEntryDependency")} SingleEntryDependency */
+/** @typedef {import("./dependencies/MultiEntryDependency")} MultiEntryDependency */
+/** @typedef {import("./dependencies/DllEntryDependency")} DllEntryDependency */
+/** @typedef {import("./dependencies/DependencyReference")} DependencyReference */
+/** @typedef {import("./DependenciesBlock")} DependenciesBlock */
+/** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
+/** @typedef {import("./Dependency")} Dependency */
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("./Dependency").DependencyTemplate} DependencyTemplate */
+/** @typedef {import("./util/createHash").Hash} Hash */
+
+// TODO use @callback
+/** @typedef {{[assetName: string]: Source}} CompilationAssets */
+/** @typedef {(err: Error|null, result?: Module) => void } ModuleCallback */
+/** @typedef {(err?: Error|null, result?: Module) => void } ModuleChainCallback */
+/** @typedef {(module: Module) => void} OnModuleCallback */
+/** @typedef {(err?: Error|null) => void} Callback */
+/** @typedef {(d: Dependency) => any} DepBlockVarDependenciesCallback */
+/** @typedef {new (...args: any[]) => Dependency} DepConstructor */
+/** @typedef {{apply: () => void}} Plugin */
+
+/**
+ * @typedef {Object} ModuleFactoryCreateDataContextInfo
+ * @property {string} issuer
+ * @property {string} compiler
+ */
+
+/**
+ * @typedef {Object} ModuleFactoryCreateData
+ * @property {ModuleFactoryCreateDataContextInfo} contextInfo
+ * @property {any=} resolveOptions
+ * @property {string} context
+ * @property {Dependency[]} dependencies
+ */
+
+/**
+ * @typedef {Object} ModuleFactory
+ * @property {(data: ModuleFactoryCreateData, callback: ModuleCallback) => any} create
+ */
+
+/**
+ * @typedef {Object} SortedDependency
+ * @property {ModuleFactory} factory
+ * @property {Dependency[]} dependencies
+ */
+
+/**
+ * @typedef {Object} AvailableModulesChunkGroupMapping
+ * @property {ChunkGroup} chunkGroup
+ * @property {Set<Module>} availableModules
+ * @property {boolean} needCopy
+ */
+
+/**
+ * @typedef {Object} DependenciesBlockLike
+ * @property {Dependency[]} dependencies
+ * @property {AsyncDependenciesBlock[]} blocks
+ * @property {DependenciesBlockVariable[]} variables
+ */
+
+/**
+ * @param {Chunk} a first chunk to sort by id
+ * @param {Chunk} b second chunk to sort by id
+ * @returns {-1|0|1} sort value
+ */
 const byId = (a, b) => {
-	if (a.id < b.id) return -1;
-	if (a.id > b.id) return 1;
+	if (a.id !== null && b.id !== null) {
+		if (a.id < b.id) return -1;
+		if (a.id > b.id) return 1;
+	}
 	return 0;
 };
 
+/**
+ * @param {Module} a first module to sort by
+ * @param {Module} b second module to sort by
+ * @returns {-1|0|1} sort value
+ */
 const byIdOrIdentifier = (a, b) => {
 	if (a.id < b.id) return -1;
 	if (a.id > b.id) return 1;
@@ -52,6 +130,11 @@ const byIdOrIdentifier = (a, b) => {
 	return 0;
 };
 
+/**
+ * @param {Module} a first module to sort by
+ * @param {Module} b second module to sort by
+ * @returns {-1|0|1} sort value
+ */
 const byIndexOrIdentifier = (a, b) => {
 	if (a.index < b.index) return -1;
 	if (a.index > b.index) return 1;
@@ -62,14 +145,24 @@ const byIndexOrIdentifier = (a, b) => {
 	return 0;
 };
 
+/**
+ * @param {Compilation} a first compilation to sort by
+ * @param {Compilation} b second compilation to sort by
+ * @returns {-1|0|1} sort value
+ */
 const byNameOrHash = (a, b) => {
 	if (a.name < b.name) return -1;
 	if (a.name > b.name) return 1;
 	if (a.fullHash < b.fullHash) return -1;
-	if (a.fullhash > b.fullHash) return 1;
+	if (a.fullHash > b.fullHash) return 1;
 	return 0;
 };
 
+/**
+ * @param {DependenciesBlockVariable[]} variables DepBlock Variables to iterate over
+ * @param {DepBlockVarDependenciesCallback} fn callback to apply on iterated elements
+ * @returns {void}
+ */
 const iterationBlockVariable = (variables, fn) => {
 	for (
 		let indexVariable = 0;
@@ -83,105 +176,194 @@ const iterationBlockVariable = (variables, fn) => {
 	}
 };
 
+/**
+ * @template T
+ * @param {T[]} arr array of elements to iterate over
+ * @param {function(T): void} fn callback applied to each element
+ * @returns {void}
+ */
 const iterationOfArrayCallback = (arr, fn) => {
 	for (let index = 0; index < arr.length; index++) {
 		fn(arr[index]);
 	}
 };
 
-function addAllToSet(set, otherSet) {
+/**
+ * @template T
+ * @param {Set<T>} set set to add items to
+ * @param {Set<T>} otherSet set to add items from
+ * @returns {void}
+ */
+const addAllToSet = (set, otherSet) => {
 	for (const item of otherSet) {
 		set.add(item);
 	}
-}
+};
 
 class Compilation extends Tapable {
+	/**
+	 * Creates an instance of Compilation.
+	 * @param {Compiler} compiler the compiler which created the compilation
+	 */
 	constructor(compiler) {
 		super();
 		this.hooks = {
+			/** @type {SyncHook<Module>} */
 			buildModule: new SyncHook(["module"]),
+			/** @type {SyncHook<Module>} */
 			rebuildModule: new SyncHook(["module"]),
+			/** @type {SyncHook<Module, Error>} */
 			failedModule: new SyncHook(["module", "error"]),
+			/** @type {SyncHook<Module>} */
 			succeedModule: new SyncHook(["module"]),
 
+			/** @type {SyncWaterfallHook<DependencyReference, Dependency, Module>} */
+			dependencyReference: new SyncWaterfallHook([
+				"dependencyReference",
+				"dependency",
+				"module"
+			]),
+
+			/** @type {SyncHook<Module[]>} */
 			finishModules: new SyncHook(["modules"]),
+			/** @type {SyncHook<Module>} */
 			finishRebuildingModule: new SyncHook(["module"]),
-
+			/** @type {SyncHook} */
 			unseal: new SyncHook([]),
+			/** @type {SyncHook} */
 			seal: new SyncHook([]),
 
+			/** @type {SyncHook} */
+			beforeChunks: new SyncHook([]),
+			/** @type {SyncHook<Chunk[]>} */
+			afterChunks: new SyncHook(["chunks"]),
+
+			/** @type {SyncBailHook<Module[]>} */
 			optimizeDependenciesBasic: new SyncBailHook(["modules"]),
+			/** @type {SyncBailHook<Module[]>} */
 			optimizeDependencies: new SyncBailHook(["modules"]),
+			/** @type {SyncBailHook<Module[]>} */
 			optimizeDependenciesAdvanced: new SyncBailHook(["modules"]),
+			/** @type {SyncBailHook<Module[]>} */
 			afterOptimizeDependencies: new SyncHook(["modules"]),
 
+			/** @type {SyncHook} */
 			optimize: new SyncHook([]),
-
+			/** @type {SyncBailHook<Module[]>} */
 			optimizeModulesBasic: new SyncBailHook(["modules"]),
+			/** @type {SyncBailHook<Module[]>} */
 			optimizeModules: new SyncBailHook(["modules"]),
+			/** @type {SyncBailHook<Module[]>} */
 			optimizeModulesAdvanced: new SyncBailHook(["modules"]),
+			/** @type {SyncHook<Module[]>} */
 			afterOptimizeModules: new SyncHook(["modules"]),
 
+			/** @type {SyncBailHook<Chunk[], ChunkGroup[]>} */
 			optimizeChunksBasic: new SyncBailHook(["chunks", "chunkGroups"]),
+			/** @type {SyncBailHook<Chunk[], ChunkGroup[]>} */
 			optimizeChunks: new SyncBailHook(["chunks", "chunkGroups"]),
+			/** @type {SyncBailHook<Chunk[], ChunkGroup[]>} */
 			optimizeChunksAdvanced: new SyncBailHook(["chunks", "chunkGroups"]),
+			/** @type {SyncHook<Chunk[], ChunkGroup[]>} */
 			afterOptimizeChunks: new SyncHook(["chunks", "chunkGroups"]),
 
+			/** @type {AsyncSeriesHook<Chunk[], Module[]>} */
 			optimizeTree: new AsyncSeriesHook(["chunks", "modules"]),
+			/** @type {SyncHook<Chunk[], Module[]>} */
 			afterOptimizeTree: new SyncHook(["chunks", "modules"]),
 
+			/** @type {SyncBailHook<Chunk[], Module[]>} */
 			optimizeChunkModulesBasic: new SyncBailHook(["chunks", "modules"]),
+			/** @type {SyncBailHook<Chunk[], Module[]>} */
 			optimizeChunkModules: new SyncBailHook(["chunks", "modules"]),
+			/** @type {SyncBailHook<Chunk[], Module[]>} */
 			optimizeChunkModulesAdvanced: new SyncBailHook(["chunks", "modules"]),
+			/** @type {SyncHook<Chunk[], Module[]>} */
 			afterOptimizeChunkModules: new SyncHook(["chunks", "modules"]),
+			/** @type {SyncBailHook} */
 			shouldRecord: new SyncBailHook([]),
 
+			/** @type {SyncHook<Module[], any>} */
 			reviveModules: new SyncHook(["modules", "records"]),
+			/** @type {SyncHook<Module[]>} */
 			optimizeModuleOrder: new SyncHook(["modules"]),
+			/** @type {SyncHook<Module[]>} */
 			advancedOptimizeModuleOrder: new SyncHook(["modules"]),
+			/** @type {SyncHook<Module[]>} */
 			beforeModuleIds: new SyncHook(["modules"]),
+			/** @type {SyncHook<Module[]>} */
 			moduleIds: new SyncHook(["modules"]),
+			/** @type {SyncHook<Module[]>} */
 			optimizeModuleIds: new SyncHook(["modules"]),
+			/** @type {SyncHook<Module[]>} */
 			afterOptimizeModuleIds: new SyncHook(["modules"]),
 
+			/** @type {SyncHook<Chunk[], any>} */
 			reviveChunks: new SyncHook(["chunks", "records"]),
+			/** @type {SyncHook<Chunk[]>} */
 			optimizeChunkOrder: new SyncHook(["chunks"]),
+			/** @type {SyncHook<Chunk[]>} */
 			beforeChunkIds: new SyncHook(["chunks"]),
+			/** @type {SyncHook<Chunk[]>} */
 			optimizeChunkIds: new SyncHook(["chunks"]),
+			/** @type {SyncHook<Chunk[]>} */
 			afterOptimizeChunkIds: new SyncHook(["chunks"]),
 
+			/** @type {SyncHook<Module[], any>} */
 			recordModules: new SyncHook(["modules", "records"]),
+			/** @type {SyncHook<Chunk[], any>} */
 			recordChunks: new SyncHook(["chunks", "records"]),
 
+			/** @type {SyncHook} */
 			beforeHash: new SyncHook([]),
+			/** @type {SyncHook<Chunk>} */
 			contentHash: new SyncHook(["chunk"]),
+			/** @type {SyncHook} */
 			afterHash: new SyncHook([]),
-
+			/** @type {SyncHook<any>} */
 			recordHash: new SyncHook(["records"]),
-
+			/** @type {SyncHook<Compilation, any>} */
 			record: new SyncHook(["compilation", "records"]),
 
+			/** @type {SyncHook} */
 			beforeModuleAssets: new SyncHook([]),
+			/** @type {SyncBailHook} */
 			shouldGenerateChunkAssets: new SyncBailHook([]),
+			/** @type {SyncHook} */
 			beforeChunkAssets: new SyncHook([]),
+			/** @type {SyncHook<Chunk[]>} */
 			additionalChunkAssets: new SyncHook(["chunks"]),
 
+			/** @type {AsyncSeriesHook} */
 			additionalAssets: new AsyncSeriesHook([]),
+			/** @type {AsyncSeriesHook<Chunk[]>} */
 			optimizeChunkAssets: new AsyncSeriesHook(["chunks"]),
+			/** @type {SyncHook<Chunk[]>} */
 			afterOptimizeChunkAssets: new SyncHook(["chunks"]),
+			/** @type {AsyncSeriesHook<CompilationAssets>} */
 			optimizeAssets: new AsyncSeriesHook(["assets"]),
+			/** @type {SyncHook<CompilationAssets>} */
 			afterOptimizeAssets: new SyncHook(["assets"]),
 
+			/** @type {SyncBailHook} */
 			needAdditionalSeal: new SyncBailHook([]),
+			/** @type {AsyncSeriesHook} */
 			afterSeal: new AsyncSeriesHook([]),
 
+			/** @type {SyncHook<Chunk, Hash>} */
 			chunkHash: new SyncHook(["chunk", "chunkHash"]),
+			/** @type {SyncHook<Module, string>} */
 			moduleAsset: new SyncHook(["module", "filename"]),
+			/** @type {SyncHook<Chunk, string>} */
 			chunkAsset: new SyncHook(["chunk", "filename"]),
 
+			/** @type {SyncWaterfallHook<string, TODO>} */
 			assetPath: new SyncWaterfallHook(["filename", "data"]), // TODO MainTemplate
 
+			/** @type {SyncBailHook} */
 			needAdditionalPass: new SyncBailHook([]),
+
+			/** @type {SyncHook<Compiler, string, number>} */
 			childCompiler: new SyncHook([
 				"childCompiler",
 				"compilerName",
@@ -190,11 +372,16 @@ class Compilation extends Tapable {
 
 			// TODO the following hooks are weirdly located here
 			// TODO move them for webpack 5
+			/** @type {SyncHook<object, Module>} */
 			normalModuleLoader: new SyncHook(["loaderContext", "module"]),
 
+			/** @type {SyncBailHook<Chunk[]>} */
 			optimizeExtractedChunksBasic: new SyncBailHook(["chunks"]),
+			/** @type {SyncBailHook<Chunk[]>} */
 			optimizeExtractedChunks: new SyncBailHook(["chunks"]),
+			/** @type {SyncBailHook<Chunk[]>} */
 			optimizeExtractedChunksAdvanced: new SyncBailHook(["chunks"]),
+			/** @type {SyncHook<Chunk[]>} */
 			afterOptimizeExtractedChunks: new SyncHook(["chunks"])
 		};
 		this._pluginCompat.tap("Compilation", options => {
@@ -208,14 +395,18 @@ class Compilation extends Tapable {
 					break;
 			}
 		});
+		/** @type {string=} */
 		this.name = undefined;
+		/** @type {Compiler} */
 		this.compiler = compiler;
 		this.resolverFactory = compiler.resolverFactory;
 		this.inputFileSystem = compiler.inputFileSystem;
 		this.requestShortener = compiler.requestShortener;
 
-		const options = (this.options = compiler.options);
+		const options = compiler.options;
+		this.options = options;
 		this.outputOptions = options && options.output;
+		/** @type {boolean=} */
 		this.bail = options && options.bail;
 		this.profile = options && options.profile;
 		this.performance = options && options.performance;
@@ -237,34 +428,54 @@ class Compilation extends Tapable {
 		this.semaphore = new Semaphore(options.parallelism || 100);
 
 		this.entries = [];
+		/** @private @type {{name: string, request: string, module: Module}[]} */
 		this._preparedEntrypoints = [];
 		this.entrypoints = new Map();
+		/** @type {Chunk[]} */
 		this.chunks = [];
+		/** @type {ChunkGroup[]} */
 		this.chunkGroups = [];
+		/** @type {Map<string, ChunkGroup>} */
 		this.namedChunkGroups = new Map();
+		/** @type {Map<string, Chunk>} */
 		this.namedChunks = new Map();
+		/** @type {Module[]} */
 		this.modules = [];
+		/** @private @type {Map<string, Module>} */
 		this._modules = new Map();
 		this.cache = null;
 		this.records = null;
-		this.nextFreeModuleIndex = undefined;
-		this.nextFreeModuleIndex2 = undefined;
+		/** @type {string[]} */
 		this.additionalChunkAssets = [];
+		/** @type {CompilationAssets} */
 		this.assets = {};
+		/** @type {WebpackError[]} */
 		this.errors = [];
+		/** @type {WebpackError[]} */
 		this.warnings = [];
+		/** @type {Compilation[]} */
 		this.children = [];
+		/** @type {Map<DepConstructor, ModuleFactory>} */
 		this.dependencyFactories = new Map();
+		/** @type {Map<DepConstructor, DependencyTemplate>} */
 		this.dependencyTemplates = new Map();
+		// TODO refactor this in webpack 5 to a custom DependencyTemplates class with a hash property
+		// @ts-ignore
 		this.dependencyTemplates.set("hash", "");
 		this.childrenCounters = {};
+		/** @type {Set<number|string>} */
 		this.usedChunkIds = null;
+		/** @type {Set<number>} */
 		this.usedModuleIds = null;
+		/** @type {Map<string, number>=} */
 		this.fileTimestamps = undefined;
+		/** @type {Map<string, number>=} */
 		this.contextTimestamps = undefined;
+		/** @type {Set<string>=} */
 		this.compilationDependencies = undefined;
-
+		/** @private @type {Map<Module, Callback[]>} */
 		this._buildingModules = new Map();
+		/** @private @type {Map<Module, Callback[]>} */
 		this._rebuildingModules = new Map();
 	}
 
@@ -272,6 +483,20 @@ class Compilation extends Tapable {
 		return new Stats(this);
 	}
 
+	/**
+	 * @typedef {Object} AddModuleResult
+	 * @property {Module} module the added or existing module
+	 * @property {boolean} issuer was this the first request for this module
+	 * @property {boolean} build should the module be build
+	 * @property {boolean} dependencies should dependencies be walked
+	 */
+
+	/**
+	 * @param {Module} module module to be added that was created
+	 * @param {any=} cacheGroup cacheGroup it is apart of
+	 * @returns {AddModuleResult} returns meta about whether or not the module had built
+	 * had an issuer, or any dependnecies
+	 */
 	addModule(module, cacheGroup) {
 		const identifier = module.identifier();
 		const alreadyAddedModule = this._modules.get(identifier);
@@ -332,15 +557,30 @@ class Compilation extends Tapable {
 		};
 	}
 
+	/**
+	 * Fetches a module from a compilation by its identifier
+	 * @param {Module} module the module provided
+	 * @returns {Module} the module requested
+	 */
 	getModule(module) {
 		const identifier = module.identifier();
 		return this._modules.get(identifier);
 	}
 
+	/**
+	 * Attempts to search for a module by its identifier
+	 * @param {string} identifier identifier (usually path) for module
+	 * @returns {Module|undefined} attempt to search for module and return it, else undefined
+	 */
 	findModule(identifier) {
 		return this._modules.get(identifier);
 	}
 
+	/**
+	 * @param {Module} module module with its callback list
+	 * @param {Callback} callback the callback function
+	 * @returns {void}
+	 */
 	waitForBuildingFinished(module, callback) {
 		let callbackList = this._buildingModules.get(module);
 		if (callbackList) {
@@ -350,6 +590,16 @@ class Compilation extends Tapable {
 		}
 	}
 
+	/**
+	 * Builds the module object
+	 *
+	 * @param {Module} module module to be built
+	 * @param {boolean} optional optional flag
+	 * @param {Module=} origin origin module this module build was requested from
+	 * @param {Dependency[]=} dependencies optional dependencies from the module to be built
+	 * @param {TODO} thisCallback the callback
+	 * @returns {TODO} returns the callback function with results
+	 */
 	buildModule(module, optional, origin, dependencies, thisCallback) {
 		let callbackList = this._buildingModules.get(module);
 		if (callbackList) {
@@ -395,7 +645,7 @@ class Compilation extends Tapable {
 					war.dependencies = dependencies;
 					this.warnings.push(war);
 				}
-				module.dependencies.sort(Dependency.compare);
+				module.dependencies.sort((a, b) => compareLocations(a.loc, b.loc));
 				if (error) {
 					this.hooks.failedModule.call(module, error);
 					return callback(error);
@@ -406,6 +656,11 @@ class Compilation extends Tapable {
 		);
 	}
 
+	/**
+	 * @param {Module} module to be processed for deps
+	 * @param {ModuleCallback} callback callback to be triggered
+	 * @returns {void}
+	 */
 	processModuleDependencies(module, callback) {
 		const dependencies = new Map();
 
@@ -469,6 +724,15 @@ class Compilation extends Tapable {
 		);
 	}
 
+	/**
+	 * @param {Module} module module to add deps to
+	 * @param {SortedDependency[]} dependencies set of sorted dependencies to iterate through
+	 * @param {(boolean|null)=} bail whether to bail or not
+	 * @param {TODO} cacheGroup optional cacheGroup
+	 * @param {boolean} recursive whether it is recursive traversal
+	 * @param {function} callback callback for when dependencies are finished being added
+	 * @returns {void}
+	 */
 	addModuleDependencies(
 		module,
 		dependencies,
@@ -627,6 +891,7 @@ class Compilation extends Tapable {
 				// leaking the Compilation object.
 
 				if (err) {
+					// eslint-disable-next-line no-self-assign
 					err.stack = err.stack;
 					return callback(err);
 				}
@@ -636,6 +901,14 @@ class Compilation extends Tapable {
 		);
 	}
 
+	/**
+	 *
+	 * @param {string} context context string path
+	 * @param {Dependency} dependency dependency used to create Module chain
+	 * @param {OnModuleCallback} onModule function invoked on modules creation
+	 * @param {ModuleChainCallback} callback callback for when module chain is complete
+	 * @returns {void} will throw if dependency instance is not a valid Dependency
+	 */
 	_addModuleChain(context, dependency, onModule, callback) {
 		const start = this.profile && Date.now();
 		const currentProfile = this.profile && {};
@@ -657,8 +930,8 @@ class Compilation extends Tapable {
 		) {
 			throw new Error("Parameter 'dependency' must be a Dependency");
 		}
-
-		const moduleFactory = this.dependencyFactories.get(dependency.constructor);
+		const Dep = /** @type {DepConstructor} */ (dependency.constructor);
+		const moduleFactory = this.dependencyFactories.get(Dep);
 		if (!moduleFactory) {
 			throw new Error(
 				`No dependency factory available for this dependency type: ${
@@ -744,13 +1017,34 @@ class Compilation extends Tapable {
 		});
 	}
 
+	/**
+	 *
+	 * @param {string} context context path for entry
+	 * @param {Dependency} entry entry dependency being created
+	 * @param {string} name name of entry
+	 * @param {ModuleCallback} callback callback function
+	 * @returns {void} returns
+	 */
 	addEntry(context, entry, name, callback) {
 		const slot = {
 			name: name,
-			request: entry.request,
+			// TODO webpack 5 remove `request`
+			request: null,
 			module: null
 		};
-		this._preparedEntrypoints.push(slot);
+
+		if (entry instanceof ModuleDependency) {
+			slot.request = entry.request;
+		}
+
+		// TODO webpack 5: merge modules instead when multiple entry modules are supported
+		const idx = this._preparedEntrypoints.findIndex(slot => slot.name === name);
+		if (idx >= 0) {
+			// Overwrite existing entrypoint
+			this._preparedEntrypoints[idx] = slot;
+		} else {
+			this._preparedEntrypoints.push(slot);
+		}
 		this._addModuleChain(
 			context,
 			entry,
@@ -766,13 +1060,21 @@ class Compilation extends Tapable {
 					slot.module = module;
 				} else {
 					const idx = this._preparedEntrypoints.indexOf(slot);
-					this._preparedEntrypoints.splice(idx, 1);
+					if (idx >= 0) {
+						this._preparedEntrypoints.splice(idx, 1);
+					}
 				}
 				return callback(null, module);
 			}
 		);
 	}
 
+	/**
+	 * @param {string} context context path string
+	 * @param {Dependency} dependency dep used to create module
+	 * @param {ModuleCallback} callback module callback sending module up a level
+	 * @returns {void}
+	 */
 	prefetch(context, dependency, callback) {
 		this._addModuleChain(
 			context,
@@ -784,6 +1086,11 @@ class Compilation extends Tapable {
 		);
 	}
 
+	/**
+	 * @param {Module} module module to be rebuilt
+	 * @param {Callback} thisCallback callback when module finishes rebuilding
+	 * @returns {void}
+	 */
 	rebuildModule(module, thisCallback) {
 		let callbackList = this._rebuildingModules.get(module);
 		if (callbackList) {
@@ -846,6 +1153,10 @@ class Compilation extends Tapable {
 		}
 	}
 
+	/**
+	 * @param {Callback} callback signals when the seal method is finishes
+	 * @returns {void}
+	 */
 	seal(callback) {
 		this.hooks.seal.call();
 
@@ -858,8 +1169,7 @@ class Compilation extends Tapable {
 		}
 		this.hooks.afterOptimizeDependencies.call(this.modules);
 
-		this.nextFreeModuleIndex = 0;
-		this.nextFreeModuleIndex2 = 0;
+		this.hooks.beforeChunks.call();
 		for (const preparedEntrypoint of this._preparedEntrypoints) {
 			const module = preparedEntrypoint.module;
 			const name = preparedEntrypoint.name;
@@ -877,11 +1187,12 @@ class Compilation extends Tapable {
 			chunk.entryModule = module;
 			chunk.name = name;
 
-			this.assignIndex(module);
 			this.assignDepth(module);
 		}
 		this.processDependenciesBlocksForChunkGroups(this.chunkGroups.slice());
 		this.sortModules(this.modules);
+		this.hooks.afterChunks.call(this.chunks);
+
 		this.hooks.optimize.call();
 
 		while (
@@ -990,10 +1301,22 @@ class Compilation extends Tapable {
 		});
 	}
 
+	/**
+	 * @param {Module[]} modules the modules array on compilation to perform the sort for
+	 * @returns {void}
+	 */
 	sortModules(modules) {
+		// TODO webpack 5: this should only be enabled when `moduleIds: "natural"`
+		// TODO move it into a plugin (NaturalModuleIdsPlugin) and use this in WebpackOptionsApply
+		// TODO remove this method
 		modules.sort(byIndexOrIdentifier);
 	}
 
+	/**
+	 * @param {Module} module moulde to report from
+	 * @param {DependenciesBlock[]} blocks blocks to report from
+	 * @returns {void}
+	 */
 	reportDependencyErrorsAndWarnings(module, blocks) {
 		for (let indexBlock = 0; indexBlock < blocks.length; indexBlock++) {
 			const block = blocks[indexBlock];
@@ -1026,6 +1349,13 @@ class Compilation extends Tapable {
 		}
 	}
 
+	/**
+	 * @param {TODO} groupOptions options for the chunk group
+	 * @param {Module} module the module the references the chunk group
+	 * @param {DependencyLocation} loc the location from with the chunk group is referenced (inside of module)
+	 * @param {string} request the request from which the the chunk group is referenced
+	 * @returns {ChunkGroup} the new or existing chunk group
+	 */
 	addChunkInGroup(groupOptions, module, loc, request) {
 		if (typeof groupOptions === "string") {
 			groupOptions = { name: groupOptions };
@@ -1054,6 +1384,13 @@ class Compilation extends Tapable {
 		return chunkGroup;
 	}
 
+	/**
+	 * This method first looks to see if a name is provided for a new chunk,
+	 * and first looks to see if any named chunks already exist and reuse that chunk instead.
+	 *
+	 * @param {string=} name optional chunk name to be provided
+	 * @returns {Chunk} create a chunk (invoked during seal event)
+	 */
 	addChunk(name) {
 		if (name) {
 			const chunk = this.namedChunks.get(name);
@@ -1069,76 +1406,20 @@ class Compilation extends Tapable {
 		return chunk;
 	}
 
-	assignIndex(module) {
-		const assignIndexToModule = module => {
-			// enter module
-			if (typeof module.index !== "number") {
-				module.index = this.nextFreeModuleIndex++;
-
-				// leave module
-				queue.push(() => (module.index2 = this.nextFreeModuleIndex2++));
-
-				// enter it as block
-				assignIndexToDependencyBlock(module);
-			}
-		};
-
-		const assignIndexToDependency = dependency => {
-			if (dependency.module) {
-				queue.push(() => assignIndexToModule(dependency.module));
-			}
-		};
-
-		const assignIndexToDependencyBlock = block => {
-			let allDependencies = [];
-
-			const iteratorDependency = d => allDependencies.push(d);
-
-			const iteratorBlock = b =>
-				queue.push(() => assignIndexToDependencyBlock(b));
-
-			if (block.variables) {
-				iterationBlockVariable(block.variables, iteratorDependency);
-			}
-
-			if (block.dependencies) {
-				iterationOfArrayCallback(block.dependencies, iteratorDependency);
-			}
-			if (block.blocks) {
-				const blocks = block.blocks;
-				let indexBlock = blocks.length;
-				while (indexBlock--) {
-					iteratorBlock(blocks[indexBlock]);
-				}
-			}
-
-			let indexAll = allDependencies.length;
-			while (indexAll--) {
-				iteratorAllDependencies(allDependencies[indexAll]);
-			}
-		};
-
-		const queue = [
-			() => {
-				assignIndexToModule(module);
-			}
-		];
-
-		const iteratorAllDependencies = d => {
-			queue.push(() => assignIndexToDependency(d));
-		};
-
-		while (queue.length) {
-			queue.pop()();
-		}
-	}
-
+	/**
+	 * @param {Module} module module to assign depth
+	 * @returns {void}
+	 */
 	assignDepth(module) {
 		const queue = new Set([module]);
 		let depth;
 
 		module.depth = 0;
 
+		/**
+		 * @param {Module} module module for processeing
+		 * @returns {void}
+		 */
 		const enqueueJob = module => {
 			const d = module.depth;
 			if (typeof d === "number" && d <= depth) return;
@@ -1146,12 +1427,20 @@ class Compilation extends Tapable {
 			module.depth = depth;
 		};
 
-		const assignDepthToDependency = (dependency, depth) => {
+		/**
+		 * @param {Dependency} dependency dependency to assign depth to
+		 * @returns {void}
+		 */
+		const assignDepthToDependency = dependency => {
 			if (dependency.module) {
 				enqueueJob(dependency.module);
 			}
 		};
 
+		/**
+		 * @param {DependenciesBlock} block block to assign depth to
+		 * @returns {void}
+		 */
 		const assignDepthToDependencyBlock = block => {
 			if (block.variables) {
 				iterationBlockVariable(block.variables, assignDepthToDependency);
@@ -1175,7 +1464,25 @@ class Compilation extends Tapable {
 		}
 	}
 
-	// This method creates the Chunk graph from the Module graph
+	/**
+	 * @param {Module} module the module containing the dependency
+	 * @param {Dependency} dependency the dependency
+	 * @returns {DependencyReference} a reference for the dependency
+	 */
+	getDependencyReference(module, dependency) {
+		// TODO remove dep.getReference existence check in webpack 5
+		if (typeof dependency.getReference !== "function") return null;
+		const ref = dependency.getReference();
+		if (!ref) return null;
+		return this.hooks.dependencyReference.call(ref, dependency, module);
+	}
+
+	/**
+	 * This method creates the Chunk graph from the Module graph
+	 * @private
+	 * @param {TODO[]} inputChunkGroups chunk groups which are processed
+	 * @returns {void}
+	 */
 	processDependenciesBlocksForChunkGroups(inputChunkGroups) {
 		// Process is splitting into two parts:
 		// Part one traverse the module graph and builds a very basic chunks graph
@@ -1185,15 +1492,21 @@ class Compilation extends Tapable {
 		//   eachother and Blocks with Chunks. It stops traversing when all modules
 		//   for a chunk are already available. So it doesn't connect unneeded chunks.
 
-		const chunkDependencies = new Map(); // Map<Chunk, Array<{Module, Chunk}>>
+		/** @type {Map<ChunkGroup, {block: AsyncDependenciesBlock, chunkGroup: ChunkGroup, couldBeFiltered: boolean}[]>} */
+		const chunkDependencies = new Map();
 		const allCreatedChunkGroups = new Set();
 
 		// PREPARE
+		/** @type {Map<DependenciesBlock, { modules: Module[], blocks: AsyncDependenciesBlock[]}>} */
 		const blockInfoMap = new Map();
 
+		/**
+		 * @param {Dependency} d dependency to iterate over
+		 * @returns {void}
+		 */
 		const iteratorDependency = d => {
 			// We skip Dependencies without Reference
-			const ref = d.getReference();
+			const ref = this.getDependencyReference(currentModule, d);
 			if (!ref) {
 				return;
 			}
@@ -1210,14 +1523,29 @@ class Compilation extends Tapable {
 			blockInfoModules.add(refModule);
 		};
 
+		/**
+		 * @param {AsyncDependenciesBlock} b blocks to prepare
+		 * @returns {void}
+		 */
 		const iteratorBlockPrepare = b => {
 			blockInfoBlocks.push(b);
 			blockQueue.push(b);
 		};
 
-		let block, blockQueue, blockInfoModules, blockInfoBlocks;
+		/** @type {Module} */
+		let currentModule;
+		/** @type {DependenciesBlock} */
+		let block;
+		/** @type {DependenciesBlock[]} */
+		let blockQueue;
+		/** @type {Set<Module>} */
+		let blockInfoModules;
+		/** @type {AsyncDependenciesBlock[]} */
+		let blockInfoBlocks;
+
 		for (const module of this.modules) {
 			blockQueue = [module];
+			currentModule = module;
 			while (blockQueue.length > 0) {
 				block = blockQueue.pop();
 				blockInfoModules = new Set();
@@ -1236,7 +1564,7 @@ class Compilation extends Tapable {
 				}
 
 				const blockInfo = {
-					modules: blockInfoModules,
+					modules: Array.from(blockInfoModules),
 					blocks: blockInfoBlocks
 				};
 				blockInfoMap.set(block, blockInfo);
@@ -1245,19 +1573,65 @@ class Compilation extends Tapable {
 
 		// PART ONE
 
+		/** @type {Map<ChunkGroup, { index: number, index2: number }>} */
+		const chunkGroupCounters = new Map();
+		for (const chunkGroup of inputChunkGroups) {
+			chunkGroupCounters.set(chunkGroup, { index: 0, index2: 0 });
+		}
+
+		let nextFreeModuleIndex = 0;
+		let nextFreeModuleIndex2 = 0;
+
+		/** @type {Map<DependenciesBlock, ChunkGroup>} */
 		const blockChunkGroups = new Map();
 
-		// Start with the provided modules/chunks
-		const queue = inputChunkGroups.map(chunkGroup => ({
+		/** @type {Set<DependenciesBlock>} */
+		const blocksWithNestedBlocks = new Set();
+
+		const ADD_AND_ENTER_MODULE = 0;
+		const ENTER_MODULE = 1;
+		const PROCESS_BLOCK = 2;
+		const LEAVE_MODULE = 3;
+
+		/**
+		 * @typedef {Object} QueueItem
+		 * @property {number} action
+		 * @property {DependenciesBlock} block
+		 * @property {Module} module
+		 * @property {Chunk} chunk
+		 * @property {ChunkGroup} chunkGroup
+		 */
+
+		/**
+		 * @param {ChunkGroup} chunkGroup chunk group
+		 * @returns {QueueItem} queue item
+		 */
+		const chunkGroupToQueueItem = chunkGroup => ({
+			action: ENTER_MODULE,
 			block: chunkGroup.chunks[0].entryModule,
 			module: chunkGroup.chunks[0].entryModule,
 			chunk: chunkGroup.chunks[0],
 			chunkGroup
-		}));
+		});
 
-		let module, chunk, chunkGroup;
+		// Start with the provided modules/chunks
+		/** @type {QueueItem[]} */
+		let queue = inputChunkGroups.map(chunkGroupToQueueItem).reverse();
+		/** @type {QueueItem[]} */
+		let queueDelayed = [];
+
+		/** @type {Module} */
+		let module;
+		/** @type {Chunk} */
+		let chunk;
+		/** @type {ChunkGroup} */
+		let chunkGroup;
 
 		// For each async Block in graph
+		/**
+		 * @param {AsyncDependenciesBlock} b iterating over each Async DepBlock
+		 * @returns {void}
+		 */
 		const iteratorBlock = b => {
 			// 1. We create a chunk for this Block
 			// but only once (blockChunkGroups map)
@@ -1276,6 +1650,7 @@ class Compilation extends Tapable {
 						b.loc,
 						b.request
 					);
+					chunkGroupCounters.set(c, { index: 0, index2: 0 });
 					blockChunkGroups.set(b, c);
 					allCreatedChunkGroups.add(c);
 				}
@@ -1290,11 +1665,13 @@ class Compilation extends Tapable {
 			if (!deps) chunkDependencies.set(chunkGroup, (deps = []));
 			deps.push({
 				block: b,
-				chunkGroup: c
+				chunkGroup: c,
+				couldBeFiltered: true
 			});
 
 			// 3. We enqueue the DependenciesBlock for traversal
-			queue.push({
+			queueDelayed.push({
+				action: PROCESS_BLOCK,
 				block: b,
 				module: module,
 				chunk: c.chunks[0],
@@ -1305,47 +1682,122 @@ class Compilation extends Tapable {
 		// Iterative traversal of the Module graph
 		// Recursive would be simpler to write but could result in Stack Overflows
 		while (queue.length) {
-			const queueItem = queue.pop();
-			module = queueItem.module;
-			block = queueItem.block;
-			chunk = queueItem.chunk;
-			chunkGroup = queueItem.chunkGroup;
+			while (queue.length) {
+				const queueItem = queue.pop();
+				module = queueItem.module;
+				block = queueItem.block;
+				chunk = queueItem.chunk;
+				chunkGroup = queueItem.chunkGroup;
+
+				switch (queueItem.action) {
+					case ADD_AND_ENTER_MODULE: {
+						// We connect Module and Chunk when not already done
+						if (chunk.addModule(module)) {
+							module.addChunk(chunk);
+						} else {
+							// already connected, skip it
+							break;
+						}
+					}
+					// fallthrough
+					case ENTER_MODULE: {
+						if (chunkGroup !== undefined) {
+							const index = chunkGroup.getModuleIndex(module);
+							if (index === undefined) {
+								chunkGroup.setModuleIndex(
+									module,
+									chunkGroupCounters.get(chunkGroup).index++
+								);
+							}
+						}
 
-			// get prepared block info
-			const blockInfo = blockInfoMap.get(block);
-
-			// Traverse all referenced modules
-			for (const refModule of blockInfo.modules) {
-				// We connect Module and Chunk when not already done
-				if (chunk.addModule(refModule)) {
-					refModule.addChunk(chunk);
-
-					// And enqueue the Module for traversal
-					queue.push({
-						block: refModule,
-						module: refModule,
-						chunk,
-						chunkGroup
-					});
+						if (module.index === null) {
+							module.index = nextFreeModuleIndex++;
+						}
+
+						queue.push({
+							action: LEAVE_MODULE,
+							block,
+							module,
+							chunk,
+							chunkGroup
+						});
+					}
+					// fallthrough
+					case PROCESS_BLOCK: {
+						// get prepared block info
+						const blockInfo = blockInfoMap.get(block);
+
+						// Traverse all referenced modules
+						for (let i = blockInfo.modules.length - 1; i >= 0; i--) {
+							const refModule = blockInfo.modules[i];
+							if (chunk.containsModule(refModule)) {
+								// skip early if already connected
+								continue;
+							}
+							// enqueue the add and enter to enter in the correct order
+							// this is relevant with circular dependencies
+							queue.push({
+								action: ADD_AND_ENTER_MODULE,
+								block: refModule,
+								module: refModule,
+								chunk,
+								chunkGroup
+							});
+						}
+
+						// Traverse all Blocks
+						iterationOfArrayCallback(blockInfo.blocks, iteratorBlock);
+
+						if (blockInfo.blocks.length > 0 && module !== block) {
+							blocksWithNestedBlocks.add(block);
+						}
+						break;
+					}
+					case LEAVE_MODULE: {
+						if (chunkGroup !== undefined) {
+							const index = chunkGroup.getModuleIndex2(module);
+							if (index === undefined) {
+								chunkGroup.setModuleIndex2(
+									module,
+									chunkGroupCounters.get(chunkGroup).index2++
+								);
+							}
+						}
+
+						if (module.index2 === null) {
+							module.index2 = nextFreeModuleIndex2++;
+						}
+						break;
+					}
 				}
 			}
-
-			// Traverse all Blocks
-			iterationOfArrayCallback(blockInfo.blocks, iteratorBlock);
+			const tempQueue = queue;
+			queue = queueDelayed.reverse();
+			queueDelayed = tempQueue;
 		}
 
 		// PART TWO
-
+		/** @type {Set<Module>} */
 		let availableModules;
+		/** @type {Set<Module>} */
 		let newAvailableModules;
+		/** @type {Queue<AvailableModulesChunkGroupMapping>} */
 		const queue2 = new Queue(
 			inputChunkGroups.map(chunkGroup => ({
 				chunkGroup,
-				availableModules: new Set()
+				availableModules: new Set(),
+				needCopy: true
 			}))
 		);
 
-		// Helper function to check if all modules of a chunk are available
+		/**
+		 * Helper function to check if all modules of a chunk are available
+		 *
+		 * @param {ChunkGroup} chunkGroup the chunkGroup to scan
+		 * @param {Set<Module>} availableModules the comparitor set
+		 * @returns {boolean} return true if all modules of a chunk are available
+		 */
 		const areModulesAvailable = (chunkGroup, availableModules) => {
 			for (const chunk of chunkGroup.chunks) {
 				for (const module of chunk.modulesIterable) {
@@ -1356,14 +1808,23 @@ class Compilation extends Tapable {
 		};
 
 		// For each edge in the basic chunk graph
+		/**
+		 * @param {TODO} dep the dependency used for filtering
+		 * @returns {boolean} used to filter "edges" (aka Dependencies) that were pointing
+		 * to modules that are already available. Also filters circular dependencies in the chunks graph
+		 */
 		const filterFn = dep => {
-			// Filter egdes that are not needed because all modules are already available
-			// This also filters circular dependencies in the chunks graph
 			const depChunkGroup = dep.chunkGroup;
-			if (areModulesAvailable(depChunkGroup, newAvailableModules)) return false; // break all modules are already available
+			if (!dep.couldBeFiltered) return true;
+			if (blocksWithNestedBlocks.has(dep.block)) return true;
+			if (areModulesAvailable(depChunkGroup, newAvailableModules)) {
+				return false; // break all modules are already available
+			}
+			dep.couldBeFiltered = false;
 			return true;
 		};
 
+		/** @type {Map<ChunkGroup, Set<Module>>} */
 		const minAvailableModulesMap = new Map();
 
 		// Iterative traversing of the basic chunk graph
@@ -1378,7 +1839,10 @@ class Compilation extends Tapable {
 			// the list didn't shrink.
 			let minAvailableModules = minAvailableModulesMap.get(chunkGroup);
 			if (minAvailableModules === undefined) {
-				minAvailableModulesMap.set(chunkGroup, new Set(availableModules));
+				minAvailableModulesMap.set(
+					chunkGroup,
+					queueItem.needCopy ? new Set(availableModules) : availableModules
+				);
 			} else {
 				let deletedModules = false;
 				for (const m of minAvailableModules) {
@@ -1404,33 +1868,36 @@ class Compilation extends Tapable {
 				}
 			}
 
-			// 4. Filter edges with available modules
-			const filteredDeps = deps.filter(filterFn);
-
-			// 5. Foreach remaining edge
+			// 4. Foreach remaining edge
 			const nextChunkGroups = new Set();
-			for (let i = 0; i < filteredDeps.length; i++) {
-				const dep = filteredDeps[i];
+			for (let i = 0; i < deps.length; i++) {
+				const dep = deps[i];
+
+				// Filter inline, rather than creating a new array from `.filter()`
+				if (!filterFn(dep)) {
+					continue;
+				}
 				const depChunkGroup = dep.chunkGroup;
 				const depBlock = dep.block;
 
-				// 6. Connect block with chunk
+				// 5. Connect block with chunk
 				GraphHelpers.connectDependenciesBlockAndChunkGroup(
 					depBlock,
 					depChunkGroup
 				);
 
-				// 7. Connect chunk with parent
+				// 6. Connect chunk with parent
 				GraphHelpers.connectChunkGroupParentAndChild(chunkGroup, depChunkGroup);
 
 				nextChunkGroups.add(depChunkGroup);
 			}
 
-			// 8. Enqueue further traversal
+			// 7. Enqueue further traversal
 			for (const nextChunkGroup of nextChunkGroups) {
 				queue2.enqueue({
 					chunkGroup: nextChunkGroup,
-					availableModules: newAvailableModules
+					availableModules: newAvailableModules,
+					needCopy: nextChunkGroup.size !== 1
 				});
 			}
 		}
@@ -1448,6 +1915,12 @@ class Compilation extends Tapable {
 		}
 	}
 
+	/**
+	 *
+	 * @param {Module} module module relationship for removal
+	 * @param {DependenciesBlockLike} block //TODO: good description
+	 * @returns {void}
+	 */
 	removeReasonsOfDependencyBlock(module, block) {
 		const iteratorDependency = d => {
 			if (!d.module) {
@@ -1475,6 +1948,11 @@ class Compilation extends Tapable {
 		}
 	}
 
+	/**
+	 * @param {Module} module module to patch tie
+	 * @param {Chunk} chunk chunk to patch tie
+	 * @returns {void}
+	 */
 	patchChunksAfterReasonRemoval(module, chunk) {
 		if (!module.hasReasons()) {
 			this.removeReasonsOfDependencyBlock(module, module);
@@ -1486,6 +1964,12 @@ class Compilation extends Tapable {
 		}
 	}
 
+	/**
+	 *
+	 * @param {DependenciesBlock} block block tie for Chunk
+	 * @param {Chunk} chunk chunk to remove from dep
+	 * @returns {void}
+	 */
 	removeChunkFromDependencies(block, chunk) {
 		const iteratorDependency = d => {
 			if (!d.module) {
@@ -1496,12 +1980,16 @@ class Compilation extends Tapable {
 
 		const blocks = block.blocks;
 		for (let indexBlock = 0; indexBlock < blocks.length; indexBlock++) {
-			const chunks = blocks[indexBlock].chunks;
+			const asyncBlock = blocks[indexBlock];
+			// Grab all chunks from the first Block's AsyncDepBlock
+			const chunks = asyncBlock.chunkGroup.chunks;
+			// For each chunk in chunkGroup
 			for (let indexChunk = 0; indexChunk < chunks.length; indexChunk++) {
-				const blockChunk = chunks[indexChunk];
-				chunk.removeChunk(blockChunk);
-				blockChunk.removeParent(chunk);
-				this.removeChunkFromDependencies(chunks, blockChunk);
+				const iteratedChunk = chunks[indexChunk];
+				asyncBlock.chunkGroup.removeChunk(iteratedChunk);
+				asyncBlock.chunkGroup.removeParent(iteratedChunk);
+				// Recurse
+				this.removeChunkFromDependencies(block, iteratedChunk);
 			}
 		}
 
@@ -1565,6 +2053,7 @@ class Compilation extends Tapable {
 	}
 
 	applyChunkIds() {
+		/** @type {Set<number>} */
 		const usedIds = new Set();
 
 		// Get used ids from usedChunkIds property (i. e. from records)
@@ -1599,6 +2088,7 @@ class Compilation extends Tapable {
 		nextFreeChunkId++;
 
 		// Determine free chunk ids from 0 to maximum
+		/** @type {number[]} */
 		const unusedIds = [];
 		if (nextFreeChunkId > 0) {
 			let index = nextFreeChunkId;
@@ -1635,7 +2125,7 @@ class Compilation extends Tapable {
 
 		const chunks = this.chunks;
 		for (let indexChunk = 0; indexChunk < chunks.length; indexChunk++) {
-			chunks[indexChunk].sortItems(false);
+			chunks[indexChunk].sortItems();
 		}
 	}
 
@@ -1656,9 +2146,19 @@ class Compilation extends Tapable {
 
 		const chunks = this.chunks;
 		for (let indexChunk = 0; indexChunk < chunks.length; indexChunk++) {
-			chunks[indexChunk].sortItems(true);
+			chunks[indexChunk].sortItems();
 		}
 
+		/**
+		 * Used to sort errors and warnings in compilation. this.warnings, and
+		 * this.errors contribute to the compilation hash and therefore should be
+		 * updated whenever other references (having a chunk id) are sorted. This preserves the hash
+		 * integrity
+		 *
+		 * @param {WebpackError} a first WebpackError instance (including subclasses)
+		 * @param {WebpackError} b second WebpackError instance (including subclasses)
+		 * @returns {-1|0|1} sort order index
+		 */
 		const byMessage = (a, b) => {
 			const ma = `${a.message}`;
 			const mb = `${b.message}`;
@@ -1768,24 +2268,37 @@ class Compilation extends Tapable {
 		for (let i = 0; i < chunks.length; i++) {
 			const chunk = chunks[i];
 			const chunkHash = createHash(hashFunction);
-			if (outputOptions.hashSalt) {
-				chunkHash.update(outputOptions.hashSalt);
-			}
-			chunk.updateHash(chunkHash);
-			const template = chunk.hasRuntime()
-				? this.mainTemplate
-				: this.chunkTemplate;
-			template.updateHashForChunk(chunkHash, chunk);
-			this.hooks.chunkHash.call(chunk, chunkHash);
-			chunk.hash = chunkHash.digest(hashDigest);
-			hash.update(chunk.hash);
-			chunk.renderedHash = chunk.hash.substr(0, hashDigestLength);
-			this.hooks.contentHash.call(chunk);
+			try {
+				if (outputOptions.hashSalt) {
+					chunkHash.update(outputOptions.hashSalt);
+				}
+				chunk.updateHash(chunkHash);
+				const template = chunk.hasRuntime()
+					? this.mainTemplate
+					: this.chunkTemplate;
+				template.updateHashForChunk(
+					chunkHash,
+					chunk,
+					this.moduleTemplates.javascript,
+					this.dependencyTemplates
+				);
+				this.hooks.chunkHash.call(chunk, chunkHash);
+				chunk.hash = chunkHash.digest(hashDigest);
+				hash.update(chunk.hash);
+				chunk.renderedHash = chunk.hash.substr(0, hashDigestLength);
+				this.hooks.contentHash.call(chunk);
+			} catch (err) {
+				this.errors.push(new ChunkRenderError(chunk, "", err));
+			}
 		}
 		this.fullHash = hash.digest(hashDigest);
 		this.hash = this.fullHash.substr(0, hashDigestLength);
 	}
 
+	/**
+	 * @param {string} update extra information
+	 * @returns {void}
+	 */
 	modifyHash(update) {
 		const outputOptions = this.outputOptions;
 		const hashFunction = outputOptions.hashFunction;
@@ -1814,6 +2327,8 @@ class Compilation extends Tapable {
 	createChunkAssets() {
 		const outputOptions = this.outputOptions;
 		const cachedSourceMap = new Map();
+		/** @type {Map<string, {hash: string, source: Source, chunk: Chunk}>} */
+		const alreadyWrittenFiles = new Map();
 		for (let i = 0; i < this.chunks.length; i++) {
 			const chunk = this.chunks[i];
 			chunk.files = [];
@@ -1836,6 +2351,28 @@ class Compilation extends Tapable {
 					const cacheName = fileManifest.identifier;
 					const usedHash = fileManifest.hash;
 					filenameTemplate = fileManifest.filenameTemplate;
+					file = this.getPath(filenameTemplate, fileManifest.pathOptions);
+
+					// check if the same filename was already written by another chunk
+					const alreadyWritten = alreadyWrittenFiles.get(file);
+					if (alreadyWritten !== undefined) {
+						if (alreadyWritten.hash === usedHash) {
+							if (this.cache) {
+								this.cache[cacheName] = {
+									hash: usedHash,
+									source: alreadyWritten.source
+								};
+							}
+							chunk.files.push(file);
+							this.hooks.chunkAsset.call(chunk, file);
+							continue;
+						} else {
+							throw new Error(
+								`Conflict: Multiple chunks emit assets to the same filename ${file}` +
+									` (chunks ${alreadyWritten.chunk.id} and ${chunk.id})`
+							);
+						}
+					}
 					if (
 						this.cache &&
 						this.cache[cacheName] &&
@@ -1862,7 +2399,6 @@ class Compilation extends Tapable {
 							};
 						}
 					}
-					file = this.getPath(filenameTemplate, fileManifest.pathOptions);
 					if (this.assets[file] && this.assets[file] !== source) {
 						throw new Error(
 							`Conflict: Multiple assets emit to the same filename ${file}`
@@ -1871,6 +2407,11 @@ class Compilation extends Tapable {
 					this.assets[file] = source;
 					chunk.files.push(file);
 					this.hooks.chunkAsset.call(chunk, file);
+					alreadyWrittenFiles.set(file, {
+						hash: usedHash,
+						source,
+						chunk
+					});
 				}
 			} catch (err) {
 				this.errors.push(
@@ -1880,12 +2421,27 @@ class Compilation extends Tapable {
 		}
 	}
 
+	/**
+	 * @param {string} filename used to get asset path with hash
+	 * @param {TODO=} data // TODO: figure out this param type
+	 * @returns {string} interpolated path
+	 */
 	getPath(filename, data) {
 		data = data || {};
 		data.hash = data.hash || this.hash;
 		return this.mainTemplate.getAssetPath(filename, data);
 	}
 
+	/**
+	 * This function allows you to run another instance of webpack inside of webpack however as
+	 * a child with different settings and configurations (if desired) applied. It copies all hooks, plugins
+	 * from parent (or top level compiler) and creates a child Compilation
+	 *
+	 * @param {string} name name of the child compiler
+	 * @param {TODO} outputOptions // Need to convert config schema to types for this
+	 * @param {Plugin[]} plugins webpack plugins that will be applied
+	 * @returns {Compiler} creates a child Compiler instance
+	 */
 	createChildCompiler(name, outputOptions, plugins) {
 		const idx = this.childrenCounters[name] || 0;
 		this.childrenCounters[name] = idx + 1;
@@ -1899,6 +2455,7 @@ class Compilation extends Tapable {
 	}
 
 	checkConstraints() {
+		/** @type {Set<number|string>} */
 		const usedIds = new Set();
 
 		const modules = this.modules;
@@ -1928,21 +2485,48 @@ class Compilation extends Tapable {
 }
 
 // TODO remove in webpack 5
-Compilation.prototype.applyPlugins = util.deprecate(function(name, ...args) {
-	this.hooks[
-		name.replace(/[- ]([a-z])/g, match => match[1].toUpperCase())
-	].call(...args);
-}, "Compilation.applyPlugins is deprecated. Use new API on `.hooks` instead");
+Compilation.prototype.applyPlugins = util.deprecate(
+	/**
+	 * @deprecated
+	 * @param {string} name Name
+	 * @param {any[]} args Other arguments
+	 * @returns {void}
+	 * @this {Compilation}
+	 */
+	function(name, ...args) {
+		this.hooks[
+			name.replace(/[- ]([a-z])/g, match => match[1].toUpperCase())
+		].call(...args);
+	},
+	"Compilation.applyPlugins is deprecated. Use new API on `.hooks` instead"
+);
 
 // TODO remove in webpack 5
 Object.defineProperty(Compilation.prototype, "moduleTemplate", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.moduleTemplates.javascript;
-	}, "Compilation.moduleTemplate: Use Compilation.moduleTemplates.javascript instead"),
-	set: util.deprecate(function(value) {
-		this.moduleTemplates.javascript = value;
-	}, "Compilation.moduleTemplate: Use Compilation.moduleTemplates.javascript instead.")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {Compilation}
+		 * @returns {TODO} module template
+		 */
+		function() {
+			return this.moduleTemplates.javascript;
+		},
+		"Compilation.moduleTemplate: Use Compilation.moduleTemplates.javascript instead"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @param {ModuleTemplate} value Template value
+		 * @this {Compilation}
+		 * @returns {void}
+		 */
+		function(value) {
+			this.moduleTemplates.javascript = value;
+		},
+		"Compilation.moduleTemplate: Use Compilation.moduleTemplates.javascript instead."
+	)
 });
 
 module.exports = Compilation;
diff --git a/lib/Compiler.js b/lib/Compiler.js
index 11d51471bc7..9b23e7269a1 100644
--- a/lib/Compiler.js
+++ b/lib/Compiler.js
@@ -27,38 +27,76 @@ const RequestShortener = require("./RequestShortener");
 const { makePathsRelative } = require("./util/identifier");
 const ConcurrentCompilationError = require("./ConcurrentCompilationError");
 
+/** @typedef {import("../declarations/WebpackOptions").Entry} Entry */
+/** @typedef {import("../declarations/WebpackOptions").WebpackOptions} WebpackOptions */
+
+/**
+ * @typedef {Object} CompilationParams
+ * @property {NormalModuleFactory} normalModuleFactory
+ * @property {ContextModuleFactory} contextModuleFactory
+ * @property {Set<string>} compilationDependencies
+ */
+
 class Compiler extends Tapable {
 	constructor(context) {
 		super();
 		this.hooks = {
+			/** @type {SyncBailHook<Compilation>} */
 			shouldEmit: new SyncBailHook(["compilation"]),
+			/** @type {AsyncSeriesHook<Stats>} */
 			done: new AsyncSeriesHook(["stats"]),
+			/** @type {AsyncSeriesHook<>} */
 			additionalPass: new AsyncSeriesHook([]),
-			beforeRun: new AsyncSeriesHook(["compilation"]),
-			run: new AsyncSeriesHook(["compilation"]),
+			/** @type {AsyncSeriesHook<Compiler>} */
+			beforeRun: new AsyncSeriesHook(["compiler"]),
+			/** @type {AsyncSeriesHook<Compiler>} */
+			run: new AsyncSeriesHook(["compiler"]),
+			/** @type {AsyncSeriesHook<Compilation>} */
 			emit: new AsyncSeriesHook(["compilation"]),
+			/** @type {AsyncSeriesHook<Compilation>} */
 			afterEmit: new AsyncSeriesHook(["compilation"]),
+
+			/** @type {SyncHook<Compilation, CompilationParams>} */
 			thisCompilation: new SyncHook(["compilation", "params"]),
+			/** @type {SyncHook<Compilation, CompilationParams>} */
 			compilation: new SyncHook(["compilation", "params"]),
+			/** @type {SyncHook<NormalModuleFactory>} */
 			normalModuleFactory: new SyncHook(["normalModuleFactory"]),
+			/** @type {SyncHook<ContextModuleFactory>}  */
 			contextModuleFactory: new SyncHook(["contextModulefactory"]),
+
+			/** @type {AsyncSeriesHook<CompilationParams>} */
 			beforeCompile: new AsyncSeriesHook(["params"]),
+			/** @type {SyncHook<CompilationParams>} */
 			compile: new SyncHook(["params"]),
+			/** @type {AsyncParallelHook<Compilation>} */
 			make: new AsyncParallelHook(["compilation"]),
+			/** @type {AsyncSeriesHook<Compilation>} */
 			afterCompile: new AsyncSeriesHook(["compilation"]),
+
+			/** @type {AsyncSeriesHook<Compiler>} */
 			watchRun: new AsyncSeriesHook(["compiler"]),
+			/** @type {SyncHook<Error>} */
 			failed: new SyncHook(["error"]),
+			/** @type {SyncHook<string, string>} */
 			invalid: new SyncHook(["filename", "changeTime"]),
+			/** @type {SyncHook} */
 			watchClose: new SyncHook([]),
 
 			// TODO the following hooks are weirdly located here
 			// TODO move them for webpack 5
+			/** @type {SyncHook} */
 			environment: new SyncHook([]),
+			/** @type {SyncHook} */
 			afterEnvironment: new SyncHook([]),
+			/** @type {SyncHook<Compiler>} */
 			afterPlugins: new SyncHook(["compiler"]),
+			/** @type {SyncHook<Compiler>} */
 			afterResolvers: new SyncHook(["compiler"]),
+			/** @type {SyncBailHook<string, Entry>} */
 			entryOption: new SyncBailHook(["context", "entry"])
 		};
+
 		this._pluginCompat.tap("Compiler", options => {
 			switch (options.name) {
 				case "additional-pass":
@@ -75,19 +113,26 @@ class Compiler extends Tapable {
 			}
 		});
 
+		/** @type {string=} */
 		this.name = undefined;
+		/** @type {Compilation=} */
 		this.parentCompilation = undefined;
+		/** @type {string} */
 		this.outputPath = "";
+
 		this.outputFileSystem = null;
 		this.inputFileSystem = null;
 
+		/** @type {string|null} */
 		this.recordsInputPath = null;
+		/** @type {string|null} */
 		this.recordsOutputPath = null;
 		this.records = {};
-
+		/** @type {Map<string, number>} */
 		this.fileTimestamps = new Map();
+		/** @type {Map<string, number>} */
 		this.contextTimestamps = new Map();
-
+		/** @type {ResolverFactory} */
 		this.resolverFactory = new ResolverFactory();
 
 		// TODO remove in webpack 5
@@ -130,12 +175,14 @@ class Compiler extends Tapable {
 			}
 		};
 
-		this.options = {};
+		/** @type {WebpackOptions} */
+		this.options = /** @type {WebpackOptions} */ ({});
 
 		this.context = context;
 
 		this.requestShortener = new RequestShortener(context);
 
+		/** @type {boolean} */
 		this.running = false;
 	}
 
diff --git a/lib/ContextExclusionPlugin.js b/lib/ContextExclusionPlugin.js
index 1333e9dbcfd..0b1dda0e9f5 100644
--- a/lib/ContextExclusionPlugin.js
+++ b/lib/ContextExclusionPlugin.js
@@ -1,10 +1,21 @@
 "use strict";
 
+/** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./ContextModuleFactory")} ContextModuleFactory */
+
 class ContextExclusionPlugin {
+	/**
+	 * @param {RegExp} negativeMatcher Matcher regular expression
+	 */
 	constructor(negativeMatcher) {
 		this.negativeMatcher = negativeMatcher;
 	}
 
+	/**
+	 * Apply the plugin
+	 * @param {Compiler} compiler Webpack Compiler
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.contextModuleFactory.tap("ContextExclusionPlugin", cmf => {
 			cmf.hooks.contextModuleFiles.tap("ContextExclusionPlugin", files => {
diff --git a/lib/ContextModule.js b/lib/ContextModule.js
index 175187a6973..78e0e47aa73 100644
--- a/lib/ContextModule.js
+++ b/lib/ContextModule.js
@@ -3,20 +3,38 @@
 	Author Tobias Koppers @sokra
 */
 "use strict";
-const path = require("path");
 const util = require("util");
 const { OriginalSource, RawSource } = require("webpack-sources");
 const Module = require("./Module");
 const AsyncDependenciesBlock = require("./AsyncDependenciesBlock");
 const Template = require("./Template");
+const contextify = require("./util/identifier").contextify;
 
+/** @typedef {"sync" | "eager" | "weak" | "async-weak" | "lazy" | "lazy-once"} ContextMode Context mode */
 /** @typedef {import("./dependencies/ContextElementDependency")} ContextElementDependency */
 
+/**
+ * @callback ResolveDependenciesCallback
+ * @param {Error=} err
+ * @param {ContextElementDependency[]} dependencies
+ */
+
+/**
+ * @callback ResolveDependencies
+ * @param {TODO} fs
+ * @param {TODO} options
+ * @param {ResolveDependenciesCallback} callback
+ */
+
 class ContextModule extends Module {
 	// type ContextMode = "sync" | "eager" | "weak" | "async-weak" | "lazy" | "lazy-once"
 	// type ContextOptions = { resource: string, recursive: boolean, regExp: RegExp, addon?: string, mode?: ContextMode, chunkName?: string, include?: RegExp, exclude?: RegExp, groupOptions?: Object }
 	// resolveDependencies: (fs: FS, options: ContextOptions, (err: Error?, dependencies: Dependency[]) => void) => void
 	// options: ContextOptions
+	/**
+	 * @param {ResolveDependencies} resolveDependencies function to get dependencies in this context
+	 * @param {TODO} options options object
+	 */
 	constructor(resolveDependencies, options) {
 		let resource;
 		let resourceQuery;
@@ -63,18 +81,6 @@ class ContextModule extends Module {
 		return regexString.substring(1, regexString.length - 1);
 	}
 
-	contextify(context, request) {
-		return request
-			.split("!")
-			.map(subrequest => {
-				let rp = path.relative(context, subrequest);
-				if (path.sep === "\\") rp = rp.replace(/\\/g, "/");
-				if (rp.indexOf("../") !== 0) rp = "./" + rp;
-				return rp;
-			})
-			.join("!");
-	}
-
 	_createIdentifier() {
 		let identifier = this.context;
 		if (this.options.resourceQuery) {
@@ -155,7 +161,7 @@ class ContextModule extends Module {
 	}
 
 	libIdent(options) {
-		let identifier = this.contextify(options.context, this.context);
+		let identifier = contextify(options.context, this.context);
 		if (this.options.mode) {
 			identifier += ` ${this.options.mode}`;
 		}
@@ -163,7 +169,7 @@ class ContextModule extends Module {
 			identifier += " recursive";
 		}
 		if (this.options.addon) {
-			identifier += ` ${this.contextify(options.context, this.options.addon)}`;
+			identifier += ` ${contextify(options.context, this.options.addon)}`;
 		}
 		if (this.options.regExp) {
 			identifier += ` ${this.prettyRegExp(this.options.regExp + "")}`;
@@ -206,7 +212,9 @@ class ContextModule extends Module {
 
 			// enhance dependencies with meta info
 			for (const dep of dependencies) {
-				dep.loc = dep.userRequest;
+				dep.loc = {
+					name: dep.userRequest
+				};
 				dep.request = this.options.addon + dep.request;
 			}
 
@@ -696,56 +704,141 @@ webpackEmptyAsyncContext.id = ${JSON.stringify(id)};`;
 // TODO remove in webpack 5
 Object.defineProperty(ContextModule.prototype, "recursive", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.options.recursive;
-	}, "ContextModule.recursive has been moved to ContextModule.options.recursive"),
-	set: util.deprecate(function(value) {
-		this.options.recursive = value;
-	}, "ContextModule.recursive has been moved to ContextModule.options.recursive")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @returns {boolean} is recursive
+		 */
+		function() {
+			return this.options.recursive;
+		},
+		"ContextModule.recursive has been moved to ContextModule.options.recursive"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @param {boolean} value is recursive
+		 * @returns {void}
+		 */
+		function(value) {
+			this.options.recursive = value;
+		},
+		"ContextModule.recursive has been moved to ContextModule.options.recursive"
+	)
 });
 
 // TODO remove in webpack 5
 Object.defineProperty(ContextModule.prototype, "regExp", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.options.regExp;
-	}, "ContextModule.regExp has been moved to ContextModule.options.regExp"),
-	set: util.deprecate(function(value) {
-		this.options.regExp = value;
-	}, "ContextModule.regExp has been moved to ContextModule.options.regExp")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @returns {RegExp} regular expression
+		 */
+		function() {
+			return this.options.regExp;
+		},
+		"ContextModule.regExp has been moved to ContextModule.options.regExp"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @param {RegExp} value Regular expression
+		 * @returns {void}
+		 */
+		function(value) {
+			this.options.regExp = value;
+		},
+		"ContextModule.regExp has been moved to ContextModule.options.regExp"
+	)
 });
 
 // TODO remove in webpack 5
 Object.defineProperty(ContextModule.prototype, "addon", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.options.addon;
-	}, "ContextModule.addon has been moved to ContextModule.options.addon"),
-	set: util.deprecate(function(value) {
-		this.options.addon = value;
-	}, "ContextModule.addon has been moved to ContextModule.options.addon")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @returns {string} addon
+		 */
+		function() {
+			return this.options.addon;
+		},
+		"ContextModule.addon has been moved to ContextModule.options.addon"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @param {string} value addon
+		 * @returns {void}
+		 */
+		function(value) {
+			this.options.addon = value;
+		},
+		"ContextModule.addon has been moved to ContextModule.options.addon"
+	)
 });
 
 // TODO remove in webpack 5
 Object.defineProperty(ContextModule.prototype, "async", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.options.mode;
-	}, "ContextModule.async has been moved to ContextModule.options.mode"),
-	set: util.deprecate(function(value) {
-		this.options.mode = value;
-	}, "ContextModule.async has been moved to ContextModule.options.mode")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @returns {boolean} is async
+		 */
+		function() {
+			return this.options.mode;
+		},
+		"ContextModule.async has been moved to ContextModule.options.mode"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @param {ContextMode} value Context mode
+		 * @returns {void}
+		 */
+		function(value) {
+			this.options.mode = value;
+		},
+		"ContextModule.async has been moved to ContextModule.options.mode"
+	)
 });
 
 // TODO remove in webpack 5
 Object.defineProperty(ContextModule.prototype, "chunkName", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.options.chunkName;
-	}, "ContextModule.chunkName has been moved to ContextModule.options.chunkName"),
-	set: util.deprecate(function(value) {
-		this.options.chunkName = value;
-	}, "ContextModule.chunkName has been moved to ContextModule.options.chunkName")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @returns {string} chunk name
+		 */
+		function() {
+			return this.options.chunkName;
+		},
+		"ContextModule.chunkName has been moved to ContextModule.options.chunkName"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @this {ContextModule}
+		 * @param {string} value chunk name
+		 * @returns {void}
+		 */
+		function(value) {
+			this.options.chunkName = value;
+		},
+		"ContextModule.chunkName has been moved to ContextModule.options.chunkName"
+	)
 });
 
 module.exports = ContextModule;
diff --git a/lib/ContextModuleFactory.js b/lib/ContextModuleFactory.js
index 2a52a58f058..f5941128813 100644
--- a/lib/ContextModuleFactory.js
+++ b/lib/ContextModuleFactory.js
@@ -15,15 +15,21 @@ const {
 const ContextModule = require("./ContextModule");
 const ContextElementDependency = require("./dependencies/ContextElementDependency");
 
+/** @typedef {import("./Module")} Module */
+
 const EMPTY_RESOLVE_OPTIONS = {};
 
 module.exports = class ContextModuleFactory extends Tapable {
 	constructor(resolverFactory) {
 		super();
 		this.hooks = {
+			/** @type {AsyncSeriesWaterfallHook<TODO>} */
 			beforeResolve: new AsyncSeriesWaterfallHook(["data"]),
+			/** @type {AsyncSeriesWaterfallHook<TODO>} */
 			afterResolve: new AsyncSeriesWaterfallHook(["data"]),
+			/** @type {SyncWaterfallHook<string[]>} */
 			contextModuleFiles: new SyncWaterfallHook(["files"]),
+			/** @type {SyncWaterfallHook<TODO[]>} */
 			alternatives: new AsyncSeriesWaterfallHook(["modules"])
 		};
 		this._pluginCompat.tap("ContextModuleFactory", options => {
diff --git a/lib/ContextReplacementPlugin.js b/lib/ContextReplacementPlugin.js
index 39c29de83bf..5523c8ab683 100644
--- a/lib/ContextReplacementPlugin.js
+++ b/lib/ContextReplacementPlugin.js
@@ -60,13 +60,13 @@ class ContextReplacementPlugin {
 			cmf.hooks.beforeResolve.tap("ContextReplacementPlugin", result => {
 				if (!result) return;
 				if (resourceRegExp.test(result.request)) {
-					if (typeof newContentResource !== "undefined") {
+					if (newContentResource !== undefined) {
 						result.request = newContentResource;
 					}
-					if (typeof newContentRecursive !== "undefined") {
+					if (newContentRecursive !== undefined) {
 						result.recursive = newContentRecursive;
 					}
-					if (typeof newContentRegExp !== "undefined") {
+					if (newContentRegExp !== undefined) {
 						result.regExp = newContentRegExp;
 					}
 					if (typeof newContentCallback === "function") {
@@ -82,13 +82,13 @@ class ContextReplacementPlugin {
 			cmf.hooks.afterResolve.tap("ContextReplacementPlugin", result => {
 				if (!result) return;
 				if (resourceRegExp.test(result.resource)) {
-					if (typeof newContentResource !== "undefined") {
+					if (newContentResource !== undefined) {
 						result.resource = path.resolve(result.resource, newContentResource);
 					}
-					if (typeof newContentRecursive !== "undefined") {
+					if (newContentRecursive !== undefined) {
 						result.recursive = newContentRecursive;
 					}
-					if (typeof newContentRegExp !== "undefined") {
+					if (newContentRegExp !== undefined) {
 						result.regExp = newContentRegExp;
 					}
 					if (typeof newContentCreateContextMap === "function") {
diff --git a/lib/DefinePlugin.js b/lib/DefinePlugin.js
index 4d485a9eb95..805b055ef19 100644
--- a/lib/DefinePlugin.js
+++ b/lib/DefinePlugin.js
@@ -9,26 +9,55 @@ const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 const ParserHelpers = require("./ParserHelpers");
 const NullFactory = require("./NullFactory");
 
-const stringifyObj = obj => {
+/** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./Parser")} Parser */
+/** @typedef {null|undefined|RegExp|Function|string|number} CodeValuePrimitive */
+/** @typedef {CodeValuePrimitive|Record<string, CodeValuePrimitive>|RuntimeValue} CodeValue */
+
+class RuntimeValue {
+	constructor(fn, fileDependencies) {
+		this.fn = fn;
+		this.fileDependencies = fileDependencies || [];
+	}
+
+	exec(parser) {
+		for (const fileDependency of this.fileDependencies) {
+			parser.state.module.buildInfo.fileDependencies.add(fileDependency);
+		}
+
+		return this.fn();
+	}
+}
+
+const stringifyObj = (obj, parser) => {
 	return (
 		"Object({" +
 		Object.keys(obj)
 			.map(key => {
 				const code = obj[key];
-				return JSON.stringify(key) + ":" + toCode(code);
+				return JSON.stringify(key) + ":" + toCode(code, parser);
 			})
 			.join(",") +
 		"})"
 	);
 };
 
-const toCode = code => {
+/**
+ * Convert code to a string that evaluates
+ * @param {CodeValue} code Code to evaluate
+ * @param {Parser} parser Parser
+ * @returns {string} code converted to string that evaluates
+ */
+const toCode = (code, parser) => {
 	if (code === null) {
 		return "null";
 	}
 	if (code === undefined) {
 		return "undefined";
 	}
+	if (code instanceof RuntimeValue) {
+		return toCode(code.exec(parser), parser);
+	}
 	if (code instanceof RegExp && code.toString) {
 		return code.toString();
 	}
@@ -36,16 +65,29 @@ const toCode = code => {
 		return "(" + code.toString() + ")";
 	}
 	if (typeof code === "object") {
-		return stringifyObj(code);
+		return stringifyObj(code, parser);
 	}
 	return code + "";
 };
 
 class DefinePlugin {
+	/**
+	 * Create a new define plugin
+	 * @param {Record<string, CodeValue>} definitions A map of global object definitions
+	 */
 	constructor(definitions) {
 		this.definitions = definitions;
 	}
 
+	static runtimeValue(fn, fileDependencies) {
+		return new RuntimeValue(fn, fileDependencies);
+	}
+
+	/**
+	 * Apply the plugin
+	 * @param {Compiler} compiler Webpack compiler
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		const definitions = this.definitions;
 		compiler.hooks.compilation.tap(
@@ -57,13 +99,25 @@ class DefinePlugin {
 					new ConstDependency.Template()
 				);
 
+				/**
+				 * Handler
+				 * @param {Parser} parser Parser
+				 * @returns {void}
+				 */
 				const handler = parser => {
+					/**
+					 * Walk definitions
+					 * @param {Object} definitions Definitions map
+					 * @param {string} prefix Prefix string
+					 * @returns {void}
+					 */
 					const walkDefinitions = (definitions, prefix) => {
 						Object.keys(definitions).forEach(key => {
 							const code = definitions[key];
 							if (
 								code &&
 								typeof code === "object" &&
+								!(code instanceof RuntimeValue) &&
 								!(code instanceof RegExp)
 							) {
 								walkDefinitions(code, prefix + key + ".");
@@ -75,6 +129,12 @@ class DefinePlugin {
 						});
 					};
 
+					/**
+					 * Apply define key
+					 * @param {string} prefix Prefix
+					 * @param {string} key Key
+					 * @returns {void}
+					 */
 					const applyDefineKey = (prefix, key) => {
 						const splittedKey = key.split(".");
 						splittedKey.slice(1).forEach((_, i) => {
@@ -85,12 +145,17 @@ class DefinePlugin {
 						});
 					};
 
+					/**
+					 * Apply Code
+					 * @param {string} key Key
+					 * @param {CodeValue} code Code
+					 * @returns {void}
+					 */
 					const applyDefine = (key, code) => {
 						const isTypeof = /^typeof\s+/.test(key);
 						if (isTypeof) key = key.replace(/^typeof\s+/, "");
 						let recurse = false;
 						let recurseTypeof = false;
-						code = toCode(code);
 						if (!isTypeof) {
 							parser.hooks.canRename
 								.for(key)
@@ -108,24 +173,25 @@ class DefinePlugin {
 									 */
 									if (recurse) return;
 									recurse = true;
-									const res = parser.evaluate(code);
+									const res = parser.evaluate(toCode(code, parser));
 									recurse = false;
 									res.setRange(expr.range);
 									return res;
 								});
-							parser.hooks.expression
-								.for(key)
-								.tap(
-									"DefinePlugin",
-									/__webpack_require__/.test(code)
-										? ParserHelpers.toConstantDependencyWithWebpackRequire(
-												parser,
-												code
-										  )
-										: ParserHelpers.toConstantDependency(parser, code)
-								);
+							parser.hooks.expression.for(key).tap("DefinePlugin", expr => {
+								const strCode = toCode(code, parser);
+								if (/__webpack_require__/.test(strCode)) {
+									return ParserHelpers.toConstantDependencyWithWebpackRequire(
+										parser,
+										strCode
+									)(expr);
+								} else {
+									return ParserHelpers.toConstantDependency(parser, strCode)(
+										expr
+									);
+								}
+							});
 						}
-						const typeofCode = isTypeof ? code : "typeof (" + code + ")";
 						parser.hooks.evaluateTypeof.for(key).tap("DefinePlugin", expr => {
 							/**
 							 * this is needed in case there is a recursion in the DefinePlugin
@@ -137,12 +203,18 @@ class DefinePlugin {
 							 */
 							if (recurseTypeof) return;
 							recurseTypeof = true;
+							const typeofCode = isTypeof
+								? toCode(code, parser)
+								: "typeof (" + toCode(code, parser) + ")";
 							const res = parser.evaluate(typeofCode);
 							recurseTypeof = false;
 							res.setRange(expr.range);
 							return res;
 						});
 						parser.hooks.typeof.for(key).tap("DefinePlugin", expr => {
+							const typeofCode = isTypeof
+								? toCode(code, parser)
+								: "typeof (" + toCode(code, parser) + ")";
 							const res = parser.evaluate(typeofCode);
 							if (!res.isString()) return;
 							return ParserHelpers.toConstantDependency(
@@ -152,8 +224,13 @@ class DefinePlugin {
 						});
 					};
 
+					/**
+					 * Apply Object
+					 * @param {string} key Key
+					 * @param {Object} obj Object
+					 * @returns {void}
+					 */
 					const applyObjectDefine = (key, obj) => {
-						const code = stringifyObj(obj);
 						parser.hooks.canRename
 							.for(key)
 							.tap("DefinePlugin", ParserHelpers.approve);
@@ -162,29 +239,29 @@ class DefinePlugin {
 							.tap("DefinePlugin", expr =>
 								new BasicEvaluatedExpression().setTruthy().setRange(expr.range)
 							);
-						parser.hooks.evaluateTypeof
-							.for(key)
-							.tap("DefinePlugin", ParserHelpers.evaluateToString("object"));
-						parser.hooks.expression
-							.for(key)
-							.tap(
-								"DefinePlugin",
-								/__webpack_require__/.test(code)
-									? ParserHelpers.toConstantDependencyWithWebpackRequire(
-											parser,
-											code
-									  )
-									: ParserHelpers.toConstantDependency(parser, code)
-							);
-						parser.hooks.typeof
-							.for(key)
-							.tap(
-								"DefinePlugin",
-								ParserHelpers.toConstantDependency(
+						parser.hooks.evaluateTypeof.for(key).tap("DefinePlugin", expr => {
+							return ParserHelpers.evaluateToString("object")(expr);
+						});
+						parser.hooks.expression.for(key).tap("DefinePlugin", expr => {
+							const strCode = stringifyObj(obj, parser);
+
+							if (/__webpack_require__/.test(strCode)) {
+								return ParserHelpers.toConstantDependencyWithWebpackRequire(
 									parser,
-									JSON.stringify("object")
-								)
-							);
+									strCode
+								)(expr);
+							} else {
+								return ParserHelpers.toConstantDependency(parser, strCode)(
+									expr
+								);
+							}
+						});
+						parser.hooks.typeof.for(key).tap("DefinePlugin", expr => {
+							return ParserHelpers.toConstantDependency(
+								parser,
+								JSON.stringify("object")
+							)(expr);
+						});
 					};
 
 					walkDefinitions(definitions, "");
diff --git a/lib/DelegatedModule.js b/lib/DelegatedModule.js
index 769d030cc5c..170ceca7a1a 100644
--- a/lib/DelegatedModule.js
+++ b/lib/DelegatedModule.js
@@ -11,6 +11,9 @@ const WebpackMissingModule = require("./dependencies/WebpackMissingModule");
 const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
 const DelegatedExportsDependency = require("./dependencies/DelegatedExportsDependency");
 
+/** @typedef {import("./dependencies/ModuleDependency")} ModuleDependency */
+/** @typedef {import("./util/createHash").Hash} Hash */
+
 class DelegatedModule extends Module {
 	constructor(sourceRequest, data, type, userRequest, originalRequest) {
 		super("javascript/dynamic", null);
@@ -22,6 +25,9 @@ class DelegatedModule extends Module {
 		this.userRequest = userRequest;
 		this.originalRequest = originalRequest;
 		this.delegateData = data;
+
+		// Build info
+		this.delegatedSourceDependency = undefined;
 	}
 
 	libIdent(options) {
@@ -48,7 +54,10 @@ class DelegatedModule extends Module {
 		this.built = true;
 		this.buildMeta = Object.assign({}, this.delegateData.buildMeta);
 		this.buildInfo = {};
-		this.addDependency(new DelegatedSourceDependency(this.sourceRequest));
+		this.delegatedSourceDependency = new DelegatedSourceDependency(
+			this.sourceRequest
+		);
+		this.addDependency(this.delegatedSourceDependency);
 		this.addDependency(
 			new DelegatedExportsDependency(this, this.delegateData.exports || true)
 		);
@@ -91,6 +100,10 @@ class DelegatedModule extends Module {
 		return 42;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update(this.type);
 		hash.update(JSON.stringify(this.request));
diff --git a/lib/DelegatedModuleFactoryPlugin.js b/lib/DelegatedModuleFactoryPlugin.js
index 26db0066f75..a0a05a43878 100644
--- a/lib/DelegatedModuleFactoryPlugin.js
+++ b/lib/DelegatedModuleFactoryPlugin.js
@@ -15,7 +15,13 @@ class DelegatedModuleFactoryPlugin {
 	constructor(options) {
 		this.options = options;
 		options.type = options.type || "require";
-		options.extensions = options.extensions || ["", ".js"];
+		options.extensions = options.extensions || [
+			"",
+			".wasm",
+			".mjs",
+			".js",
+			".json"
+		];
 	}
 
 	apply(normalModuleFactory) {
diff --git a/lib/DependenciesBlock.js b/lib/DependenciesBlock.js
index 77fe91629b0..142f3eacbaf 100644
--- a/lib/DependenciesBlock.js
+++ b/lib/DependenciesBlock.js
@@ -8,23 +8,39 @@ const DependenciesBlockVariable = require("./DependenciesBlockVariable");
 
 /** @typedef {import("./ChunkGroup")} ChunkGroup */
 /** @typedef {import("./Dependency")} Dependency */
+/** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
+/** @typedef {import("./DependenciesBlockVariable")} DependenciesBlockVariable */
+/** @typedef {(d: Dependency) => boolean} DependencyFilterFunction */
+/** @typedef {import("./util/createHash").Hash} Hash */
 
 class DependenciesBlock {
 	constructor() {
 		/** @type {Dependency[]} */
 		this.dependencies = [];
+		/** @type {AsyncDependenciesBlock[]} */
 		this.blocks = [];
+		/** @type {DependenciesBlockVariable[]} */
 		this.variables = [];
-		// TODO remove this line, it's wrong
-		/** @type {ChunkGroup=} */
-		this.chunkGroup = undefined;
 	}
 
+	/**
+	 * Adds a DependencyBlock to DependencyBlock relationship.
+	 * This is used for when a Module has a AsyncDependencyBlock tie (for code-splitting)
+	 *
+	 * @param {AsyncDependenciesBlock} block block being added
+	 * @returns {void}
+	 */
 	addBlock(block) {
 		this.blocks.push(block);
 		block.parent = this;
 	}
 
+	/**
+	 * @param {string} name name of dependency
+	 * @param {string} expression expression string for variable
+	 * @param {Dependency[]} dependencies dependency instances tied to variable
+	 * @returns {void}
+	 */
 	addVariable(name, expression, dependencies) {
 		for (let v of this.variables) {
 			if (v.name === name && v.expression === expression) {
@@ -36,10 +52,19 @@ class DependenciesBlock {
 		);
 	}
 
+	/**
+	 * @param {Dependency} dependency dependency being tied to block.
+	 * This is an "edge" pointing to another "node" on module graph.
+	 * @returns {void}
+	 */
 	addDependency(dependency) {
 		this.dependencies.push(dependency);
 	}
 
+	/**
+	 * @param {Dependency} dependency dependency being removed
+	 * @returns {void}
+	 */
 	removeDependency(dependency) {
 		const idx = this.dependencies.indexOf(dependency);
 		if (idx >= 0) {
@@ -47,6 +72,10 @@ class DependenciesBlock {
 		}
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		for (const dep of this.dependencies) dep.updateHash(hash);
 		for (const block of this.blocks) block.updateHash(hash);
@@ -63,6 +92,10 @@ class DependenciesBlock {
 		for (const block of this.blocks) block.unseal();
 	}
 
+	/**
+	 * @param {DependencyFilterFunction} filter filter function for dependencies, gets passed all dependency ties from current instance
+	 * @returns {boolean} returns boolean for filter
+	 */
 	hasDependencies(filter) {
 		if (filter) {
 			for (const dep of this.dependencies) {
diff --git a/lib/DependenciesBlockVariable.js b/lib/DependenciesBlockVariable.js
index 7f7416271aa..c4ed9162700 100644
--- a/lib/DependenciesBlockVariable.js
+++ b/lib/DependenciesBlockVariable.js
@@ -6,13 +6,30 @@
 
 const { RawSource, ReplaceSource } = require("webpack-sources");
 
+/** @typedef {import("./Dependency")} Dependency */
+/** @typedef {import("./Dependency").DependencyTemplate} DependencyTemplate */
+/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("./util/createHash").Hash} Hash */
+/** @typedef {(d: Dependency) => boolean} DependencyFilterFunction */
+/** @typedef {Map<Function, DependencyTemplate>} DependencyTemplates */
+
 class DependenciesBlockVariable {
+	/**
+	 * Creates an instance of DependenciesBlockVariable.
+	 * @param {string} name name of DependenciesBlockVariable
+	 * @param {string} expression expression string
+	 * @param {Dependency[]=} dependencies dependencies tied to this varaiable
+	 */
 	constructor(name, expression, dependencies) {
 		this.name = name;
 		this.expression = expression;
 		this.dependencies = dependencies || [];
 	}
 
+	/**
+	 * @param {Hash} hash hash for instance to update
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update(this.name);
 		hash.update(this.expression);
@@ -21,6 +38,11 @@ class DependenciesBlockVariable {
 		}
 	}
 
+	/**
+	 * @param {DependencyTemplates} dependencyTemplates Dependency constructors and templates Map.
+	 * @param {RuntimeTemplate} runtimeTemplate runtimeTemplate to generate expression souce
+	 * @returns {ReplaceSource} returns constructed source for expression via templates
+	 */
 	expressionSource(dependencyTemplates, runtimeTemplate) {
 		const source = new ReplaceSource(new RawSource(this.expression));
 		for (const dep of this.dependencies) {
@@ -41,11 +63,9 @@ class DependenciesBlockVariable {
 
 	hasDependencies(filter) {
 		if (filter) {
-			if (this.dependencies.some(filter)) return true;
-		} else {
-			if (this.dependencies.length > 0) return true;
+			return this.dependencies.some(filter);
 		}
-		return false;
+		return this.dependencies.length > 0;
 	}
 }
 
diff --git a/lib/Dependency.js b/lib/Dependency.js
index 7bd2b5ef119..6d27b1ed6d2 100644
--- a/lib/Dependency.js
+++ b/lib/Dependency.js
@@ -4,15 +4,47 @@
 */
 "use strict";
 
+const util = require("util");
 const compareLocations = require("./compareLocations");
 const DependencyReference = require("./dependencies/DependencyReference");
 
+/** @typedef {import("./Module")} Module */
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
+
+/**
+ * @typedef {Object} DependencyTemplate
+ * @property {function(Dependency, Source, RuntimeTemplate, Map<Function, DependencyTemplate>): void} apply
+ */
+
+/** @typedef {Object} SourcePosition
+ *  @property {number} line
+ *  @property {number=} column
+ */
+
+/** @typedef {Object} RealDependencyLocation
+ *  @property {SourcePosition} start
+ *  @property {SourcePosition=} end
+ *  @property {number=} index
+ */
+
+/** @typedef {Object} SynteticDependencyLocation
+ *  @property {string} name
+ *  @property {number=} index
+ */
+
+/** @typedef {SynteticDependencyLocation|RealDependencyLocation} DependencyLocation */
+
 class Dependency {
 	constructor() {
+		/** @type {Module|null} */
 		this.module = null;
 		// TODO remove in webpack 5
+		/** @type {boolean} */
 		this.weak = false;
+		/** @type {boolean} */
 		this.optional = false;
+		/** @type {DependencyLocation} */
 		this.loc = undefined;
 	}
 
@@ -47,6 +79,11 @@ class Dependency {
 		this.module = null;
 	}
 }
-Dependency.compare = (a, b) => compareLocations(a.loc, b.loc);
+
+// TODO remove in webpack 5
+Dependency.compare = util.deprecate(
+	(a, b) => compareLocations(a.loc, b.loc),
+	"Dependency.compare is deprecated and will be removed in the next major version"
+);
 
 module.exports = Dependency;
diff --git a/lib/DllEntryPlugin.js b/lib/DllEntryPlugin.js
index dbb1a40b3ab..562628d906a 100644
--- a/lib/DllEntryPlugin.js
+++ b/lib/DllEntryPlugin.js
@@ -36,7 +36,10 @@ class DllEntryPlugin {
 				new DllEntryDependency(
 					this.entries.map((e, idx) => {
 						const dep = new SingleEntryDependency(e);
-						dep.loc = `${this.name}:${idx}`;
+						dep.loc = {
+							name: this.name,
+							index: idx
+						};
 						return dep;
 					}),
 					this.name
diff --git a/lib/DllModule.js b/lib/DllModule.js
index c0a45d731ea..0cd9cbcf8ce 100644
--- a/lib/DllModule.js
+++ b/lib/DllModule.js
@@ -7,6 +7,8 @@
 const { RawSource } = require("webpack-sources");
 const Module = require("./Module");
 
+/** @typedef {import("./util/createHash").Hash} Hash */
+
 class DllModule extends Module {
 	constructor(context, dependencies, name, type) {
 		super("javascript/dynamic", context);
@@ -44,6 +46,10 @@ class DllModule extends Module {
 		return 12;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update("dll module");
 		hash.update(this.name || "");
diff --git a/lib/DllPlugin.js b/lib/DllPlugin.js
index 5542833719b..884c21c5821 100644
--- a/lib/DllPlugin.js
+++ b/lib/DllPlugin.js
@@ -11,7 +11,12 @@ const FlagInitialModulesAsUsedPlugin = require("./FlagInitialModulesAsUsedPlugin
 const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/DllPlugin.json");
 
+/** @typedef {import("../declarations/plugins/DllPlugin").DllPluginOptions} DllPluginOptions */
+
 class DllPlugin {
+	/**
+	 * @param {DllPluginOptions} options options object
+	 */
 	constructor(options) {
 		validateOptions(schema, options, "Dll Plugin");
 		this.options = options;
diff --git a/lib/DllReferencePlugin.js b/lib/DllReferencePlugin.js
index b8cf3013be3..62e26d89369 100644
--- a/lib/DllReferencePlugin.js
+++ b/lib/DllReferencePlugin.js
@@ -10,11 +10,19 @@ const DelegatedModuleFactoryPlugin = require("./DelegatedModuleFactoryPlugin");
 const ExternalModuleFactoryPlugin = require("./ExternalModuleFactoryPlugin");
 const DelegatedExportsDependency = require("./dependencies/DelegatedExportsDependency");
 const NullFactory = require("./NullFactory");
+const makePathsRelative = require("./util/identifier").makePathsRelative;
+const WebpackError = require("./WebpackError");
 
 const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/DllReferencePlugin.json");
 
+/** @typedef {import("../declarations/plugins/DllReferencePlugin").DllReferencePluginOptions} DllReferencePluginOptions */
+/** @typedef {import("../declarations/plugins/DllReferencePlugin").DllReferencePluginOptionsManifest} DllReferencePluginOptionsManifest */
+
 class DllReferencePlugin {
+	/**
+	 * @param {DllReferencePluginOptions} options options object
+	 */
 	constructor(options) {
 		validateOptions(schema, options, "Dll Reference Plugin");
 		this.options = options;
@@ -38,35 +46,71 @@ class DllReferencePlugin {
 		compiler.hooks.beforeCompile.tapAsync(
 			"DllReferencePlugin",
 			(params, callback) => {
-				const manifest = this.options.manifest;
-				if (typeof manifest === "string") {
-					params.compilationDependencies.add(manifest);
-					compiler.inputFileSystem.readFile(manifest, (err, result) => {
-						if (err) return callback(err);
-						params["dll reference " + manifest] = parseJson(
-							result.toString("utf-8")
-						);
-						return callback();
-					});
-				} else {
-					return callback();
+				if ("manifest" in this.options) {
+					const manifest = this.options.manifest;
+					if (typeof manifest === "string") {
+						params.compilationDependencies.add(manifest);
+						compiler.inputFileSystem.readFile(manifest, (err, result) => {
+							if (err) return callback(err);
+							// Catch errors parsing the manifest so that blank
+							// or malformed manifest files don't kill the process.
+							try {
+								params["dll reference " + manifest] = parseJson(
+									result.toString("utf-8")
+								);
+							} catch (e) {
+								// Store the error in the params so that it can
+								// be added as a compilation error later on.
+								const manifestPath = makePathsRelative(
+									compiler.options.context,
+									manifest
+								);
+								params[
+									"dll reference parse error " + manifest
+								] = new DllManifestError(manifestPath, e.message);
+							}
+							return callback();
+						});
+						return;
+					}
 				}
+				return callback();
 			}
 		);
 
 		compiler.hooks.compile.tap("DllReferencePlugin", params => {
-			let manifest = this.options.manifest;
-			if (typeof manifest === "string") {
-				manifest = params["dll reference " + manifest];
+			let name = this.options.name;
+			let sourceType = this.options.sourceType;
+			let content =
+				"content" in this.options ? this.options.content : undefined;
+			if ("manifest" in this.options) {
+				let manifestParameter = this.options.manifest;
+				let manifest;
+				if (typeof manifestParameter === "string") {
+					// If there was an error parsing the manifest
+					// file, exit now because the error will be added
+					// as a compilation error in the "compilation" hook.
+					if (params["dll reference parse error " + manifestParameter]) {
+						return;
+					}
+					manifest =
+						/** @type {DllReferencePluginOptionsManifest} */ (params[
+							"dll reference " + manifestParameter
+						]);
+				} else {
+					manifest = manifestParameter;
+				}
+				if (manifest) {
+					if (!name) name = manifest.name;
+					if (!sourceType) sourceType = manifest.type;
+					if (!content) content = manifest.content;
+				}
 			}
-			const name = this.options.name || manifest.name;
-			const sourceType =
-				this.options.sourceType || (manifest && manifest.type) || "var";
 			const externals = {};
 			const source = "dll-reference " + name;
 			externals[source] = name;
 			const normalModuleFactory = params.normalModuleFactory;
-			new ExternalModuleFactoryPlugin(sourceType, externals).apply(
+			new ExternalModuleFactoryPlugin(sourceType || "var", externals).apply(
 				normalModuleFactory
 			);
 			new DelegatedModuleFactoryPlugin({
@@ -74,10 +118,38 @@ class DllReferencePlugin {
 				type: this.options.type,
 				scope: this.options.scope,
 				context: this.options.context || compiler.options.context,
-				content: this.options.content || manifest.content,
+				content,
 				extensions: this.options.extensions
 			}).apply(normalModuleFactory);
 		});
+
+		compiler.hooks.compilation.tap(
+			"DllReferencePlugin",
+			(compilation, params) => {
+				if ("manifest" in this.options) {
+					let manifest = this.options.manifest;
+					if (typeof manifest === "string") {
+						// If there was an error parsing the manifest file, add the
+						// error as a compilation error to make the compilation fail.
+						let e = params["dll reference parse error " + manifest];
+						if (e) {
+							compilation.errors.push(e);
+						}
+					}
+				}
+			}
+		);
+	}
+}
+
+class DllManifestError extends WebpackError {
+	constructor(filename, message) {
+		super();
+
+		this.name = "DllManifestError";
+		this.message = `Dll manifest ${filename}\n${message}`;
+
+		Error.captureStackTrace(this, this.constructor);
 	}
 }
 
diff --git a/lib/DynamicEntryPlugin.js b/lib/DynamicEntryPlugin.js
index 0f1fabf0e8b..be9b237b94d 100644
--- a/lib/DynamicEntryPlugin.js
+++ b/lib/DynamicEntryPlugin.js
@@ -10,12 +10,24 @@ const MultiModuleFactory = require("./MultiModuleFactory");
 const MultiEntryPlugin = require("./MultiEntryPlugin");
 const SingleEntryPlugin = require("./SingleEntryPlugin");
 
+/** @typedef {import("../declarations/WebpackOptions").EntryDynamic} EntryDynamic */
+/** @typedef {import("../declarations/WebpackOptions").EntryStatic} EntryStatic */
+/** @typedef {import("./Compiler")} Compiler */
+
 class DynamicEntryPlugin {
+	/**
+	 * @param {string} context the context path
+	 * @param {EntryDynamic} entry the entry value
+	 */
 	constructor(context, entry) {
 		this.context = context;
 		this.entry = entry;
 	}
 
+	/**
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
 			"DynamicEntryPlugin",
@@ -36,6 +48,11 @@ class DynamicEntryPlugin {
 		compiler.hooks.make.tapAsync(
 			"DynamicEntryPlugin",
 			(compilation, callback) => {
+				/**
+				 * @param {string|string[]} entry entry value or array of entry values
+				 * @param {string} name name of entry
+				 * @returns {Promise<EntryStatic>} returns the promise resolving the Compilation#addEntry function
+				 */
 				const addEntry = (entry, name) => {
 					const dep = DynamicEntryPlugin.createDependency(entry, name);
 					return new Promise((resolve, reject) => {
@@ -63,7 +80,11 @@ class DynamicEntryPlugin {
 }
 
 module.exports = DynamicEntryPlugin;
-
+/**
+ * @param {string|string[]} entry entry value or array of entry paths
+ * @param {string} name name of entry
+ * @returns {SingleEntryDependency|MultiEntryDependency} returns dep
+ */
 DynamicEntryPlugin.createDependency = (entry, name) => {
 	if (Array.isArray(entry)) {
 		return MultiEntryPlugin.createDependency(entry, name);
diff --git a/lib/EntryOptionPlugin.js b/lib/EntryOptionPlugin.js
index c8c3ce75588..ddda157fe80 100644
--- a/lib/EntryOptionPlugin.js
+++ b/lib/EntryOptionPlugin.js
@@ -8,6 +8,15 @@ const SingleEntryPlugin = require("./SingleEntryPlugin");
 const MultiEntryPlugin = require("./MultiEntryPlugin");
 const DynamicEntryPlugin = require("./DynamicEntryPlugin");
 
+/** @typedef {import("../declarations/WebpackOptions").EntryItem} EntryItem */
+/** @typedef {import("./Compiler")} Compiler */
+
+/**
+ * @param {string} context context path
+ * @param {EntryItem} item entry array or single path
+ * @param {string} name entry key name
+ * @returns {SingleEntryPlugin | MultiEntryPlugin} returns either a single or multi entry plugin
+ */
 const itemToPlugin = (context, item, name) => {
 	if (Array.isArray(item)) {
 		return new MultiEntryPlugin(context, item, name);
@@ -16,6 +25,10 @@ const itemToPlugin = (context, item, name) => {
 };
 
 module.exports = class EntryOptionPlugin {
+	/**
+	 * @param {Compiler} compiler the compiler instance one is tapping into
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.entryOption.tap("EntryOptionPlugin", (context, entry) => {
 			if (typeof entry === "string" || Array.isArray(entry)) {
diff --git a/lib/Entrypoint.js b/lib/Entrypoint.js
index 892855e1607..c67ff44ed7c 100644
--- a/lib/Entrypoint.js
+++ b/lib/Entrypoint.js
@@ -6,7 +6,7 @@
 
 const ChunkGroup = require("./ChunkGroup");
 
-/** @typedef {import("./Chunk.js")} Chunk */
+/** @typedef {import("./Chunk")} Chunk */
 
 /**
  * Entrypoint serves as an encapsulation primitive for chunks that are
diff --git a/lib/EnvironmentPlugin.js b/lib/EnvironmentPlugin.js
index 388ce817372..c9fafaa8a7e 100644
--- a/lib/EnvironmentPlugin.js
+++ b/lib/EnvironmentPlugin.js
@@ -5,6 +5,9 @@
 
 "use strict";
 
+/** @typedef {import("./Compiler")} Compiler */
+
+const WebpackError = require("./WebpackError");
 const DefinePlugin = require("./DefinePlugin");
 
 const needsEnvVarFix =
@@ -25,6 +28,10 @@ class EnvironmentPlugin {
 		}
 	}
 
+	/**
+	 * @param {Compiler} compiler webpack compiler instance
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		const definitions = this.keys.reduce((defs, key) => {
 			// TODO remove once the fix has made its way into Node 8.
@@ -41,7 +48,7 @@ class EnvironmentPlugin {
 
 			if (value === undefined) {
 				compiler.hooks.thisCompilation.tap("EnvironmentPlugin", compilation => {
-					const error = new Error(
+					const error = new WebpackError(
 						`EnvironmentPlugin - ${key} environment variable is undefined.\n\n` +
 							"You can pass an object with default values to suppress this warning.\n" +
 							"See https://webpack.js.org/plugins/environment-plugin for example."
@@ -53,7 +60,7 @@ class EnvironmentPlugin {
 			}
 
 			defs[`process.env.${key}`] =
-				typeof value === "undefined" ? "undefined" : JSON.stringify(value);
+				value === undefined ? "undefined" : JSON.stringify(value);
 
 			return defs;
 		}, {});
diff --git a/lib/ExtendedAPIPlugin.js b/lib/ExtendedAPIPlugin.js
index a894a9faf7a..e41defb1fab 100644
--- a/lib/ExtendedAPIPlugin.js
+++ b/lib/ExtendedAPIPlugin.js
@@ -10,12 +10,16 @@ const ParserHelpers = require("./ParserHelpers");
 const NullFactory = require("./NullFactory");
 
 const REPLACEMENTS = {
-	__webpack_hash__: "__webpack_require__.h", // eslint-disable-line camelcase
-	__webpack_chunkname__: "__webpack_require__.cn" // eslint-disable-line camelcase
+	// eslint-disable-next-line camelcase
+	__webpack_hash__: "__webpack_require__.h",
+	// eslint-disable-next-line camelcase
+	__webpack_chunkname__: "__webpack_require__.cn"
 };
 const REPLACEMENT_TYPES = {
-	__webpack_hash__: "string", // eslint-disable-line camelcase
-	__webpack_chunkname__: "string" // eslint-disable-line camelcase
+	// eslint-disable-next-line camelcase
+	__webpack_hash__: "string",
+	// eslint-disable-next-line camelcase
+	__webpack_chunkname__: "string"
 };
 
 class ExtendedAPIPlugin {
diff --git a/lib/ExternalModule.js b/lib/ExternalModule.js
index 8707f4f1f61..d7e4e3f5574 100644
--- a/lib/ExternalModule.js
+++ b/lib/ExternalModule.js
@@ -9,6 +9,8 @@ const Module = require("./Module");
 const WebpackMissingModule = require("./dependencies/WebpackMissingModule");
 const Template = require("./Template");
 
+/** @typedef {import("./util/createHash").Hash} Hash */
+
 class ExternalModule extends Module {
 	constructor(request, type, userRequest) {
 		super("javascript/dynamic", null);
@@ -72,7 +74,9 @@ class ExternalModule extends Module {
 			.slice(1)
 			.map(r => `[${JSON.stringify(r)}]`)
 			.join("");
-		return `module.exports = require(${moduleName})${objectLookup};`;
+		return `module.exports = require(${JSON.stringify(
+			moduleName
+		)})${objectLookup};`;
 	}
 
 	checkExternalVariable(variableToCheck, request) {
@@ -92,15 +96,25 @@ class ExternalModule extends Module {
 	}
 
 	getSourceForDefaultCase(optional, request) {
+		if (!Array.isArray(request)) {
+			// make it an array as the look up works the same basically
+			request = [request];
+		}
+
+		const variableName = request[0];
 		const missingModuleError = optional
-			? this.checkExternalVariable(request, request)
+			? this.checkExternalVariable(variableName, request.join("."))
 			: "";
-		return `${missingModuleError}module.exports = ${request};`;
+		const objectLookup = request
+			.slice(1)
+			.map(r => `[${JSON.stringify(r)}]`)
+			.join("");
+		return `${missingModuleError}module.exports = ${variableName}${objectLookup};`;
 	}
 
 	getSourceString(runtime) {
 		const request =
-			typeof this.request === "object"
+			typeof this.request === "object" && !Array.isArray(this.request)
 				? this.request[this.externalType]
 				: this.request;
 		switch (this.externalType) {
@@ -120,6 +134,7 @@ class ExternalModule extends Module {
 			case "commonjs2":
 				return this.getSourceForCommonJsExternal(request);
 			case "amd":
+			case "amd-require":
 			case "umd":
 			case "umd2":
 				return this.getSourceForAmdOrUmdExternal(
@@ -148,6 +163,10 @@ class ExternalModule extends Module {
 		return 42;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update(this.externalType);
 		hash.update(JSON.stringify(this.request));
diff --git a/lib/ExternalModuleFactoryPlugin.js b/lib/ExternalModuleFactoryPlugin.js
index 40c2156609e..b75cc7476fa 100644
--- a/lib/ExternalModuleFactoryPlugin.js
+++ b/lib/ExternalModuleFactoryPlugin.js
@@ -27,7 +27,7 @@ class ExternalModuleFactoryPlugin {
 					}
 					if (value === false) return factory(data, callback);
 					if (value === true) value = dependency.request;
-					if (typeof type === "undefined" && /^[a-z0-9]+ /.test(value)) {
+					if (type === undefined && /^[a-z0-9]+ /.test(value)) {
 						const idx = value.indexOf(" ");
 						type = value.substr(0, idx);
 						value = value.substr(idx + 1);
@@ -64,7 +64,7 @@ class ExternalModuleFactoryPlugin {
 								asyncFlag = true;
 								if (i >= externals.length) return callback();
 								handleExternals(externals[i++], handleExternalsAndCallback);
-							} while (!asyncFlag); // eslint-disable-line keyword-spacing
+							} while (!asyncFlag);
 							asyncFlag = false;
 						};
 
@@ -81,7 +81,7 @@ class ExternalModuleFactoryPlugin {
 							dependency.request,
 							(err, value, type) => {
 								if (err) return callback(err);
-								if (typeof value !== "undefined") {
+								if (value !== undefined) {
 									handleExternal(value, type, callback);
 								} else {
 									callback();
diff --git a/lib/FlagDependencyUsagePlugin.js b/lib/FlagDependencyUsagePlugin.js
index e464c1cd6ac..85c22160892 100644
--- a/lib/FlagDependencyUsagePlugin.js
+++ b/lib/FlagDependencyUsagePlugin.js
@@ -4,6 +4,11 @@
 */
 "use strict";
 
+/** @typedef {import("./Module")} Module */
+/** @typedef {import("./DependenciesBlock")} DependenciesBlock */
+
+/** @typedef {false | true | string[]} UsedExports */
+
 const addToSet = (a, b) => {
 	for (const item of b) {
 		if (!a.includes(item)) a.push(item);
@@ -54,37 +59,36 @@ class FlagDependencyUsagePlugin {
 								return;
 						}
 
-						queue.push([module, module.usedExports]);
+						queue.push([module, module, module.usedExports]);
 					};
 
-					const processDependenciesBlock = (depBlock, usedExports) => {
+					const processDependenciesBlock = (module, depBlock, usedExports) => {
 						for (const dep of depBlock.dependencies) {
-							processDependency(dep);
+							processDependency(module, dep);
 						}
 						for (const variable of depBlock.variables) {
 							for (const dep of variable.dependencies) {
-								processDependency(dep);
+								processDependency(module, dep);
 							}
 						}
 						for (const block of depBlock.blocks) {
-							queue.push([block, usedExports]);
+							queue.push([module, block, usedExports]);
 						}
 					};
 
-					const processDependency = dep => {
-						// TODO remove dep.getReference existance check in webpack 5
-						const reference = dep.getReference && dep.getReference();
+					const processDependency = (module, dep) => {
+						const reference = compilation.getDependencyReference(module, dep);
 						if (!reference) return;
-						const module = reference.module;
+						const referenceModule = reference.module;
 						const importedNames = reference.importedNames;
-						const oldUsed = module.used;
-						const oldUsedExports = module.usedExports;
+						const oldUsed = referenceModule.used;
+						const oldUsedExports = referenceModule.usedExports;
 						if (
 							!oldUsed ||
 							(importedNames &&
 								(!oldUsedExports || !isSubset(oldUsedExports, importedNames)))
 						) {
-							processModule(module, importedNames);
+							processModule(referenceModule, importedNames);
 						}
 					};
 
@@ -92,6 +96,7 @@ class FlagDependencyUsagePlugin {
 						module.used = false;
 					}
 
+					/** @type {[Module, DependenciesBlock, UsedExports][]} */
 					const queue = [];
 					for (const preparedEntrypoint of compilation._preparedEntrypoints) {
 						if (preparedEntrypoint.module) {
@@ -101,7 +106,7 @@ class FlagDependencyUsagePlugin {
 
 					while (queue.length) {
 						const queueItem = queue.pop();
-						processDependenciesBlock(queueItem[0], queueItem[1]);
+						processDependenciesBlock(queueItem[0], queueItem[1], queueItem[2]);
 					}
 				}
 			);
diff --git a/lib/Generator.js b/lib/Generator.js
index 441f22872de..655a9b1da81 100644
--- a/lib/Generator.js
+++ b/lib/Generator.js
@@ -4,9 +4,10 @@
 */
 "use strict";
 
-/** @typedef {import("./Module")} Module */
+/** @typedef {import("./NormalModule")} NormalModule */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("./Dependency").DependencyTemplate} DependencyTemplate */
 
 /**
  *
@@ -18,14 +19,14 @@ class Generator {
 
 	/**
 	 * @abstract
-	 * @param {Module} module module for which the code should be generated
-	 * @param {Map<Function, TODO>} dependencyTemplates mapping from dependencies to templates
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates mapping from dependencies to templates
 	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
 	 * @param {string} type which kind of code should be generated
 	 * @returns {Source} generated code
 	 */
 	generate(module, dependencyTemplates, runtimeTemplate, type) {
-		throw new Error("Generator.generate: must be overriden");
+		throw new Error("Generator.generate: must be overridden");
 	}
 }
 
@@ -35,6 +36,13 @@ class ByTypeGenerator extends Generator {
 		this.map = map;
 	}
 
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates mapping from dependencies to templates
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
+	 * @param {string} type which kind of code should be generated
+	 * @returns {Source} generated code
+	 */
 	generate(module, dependencyTemplates, runtimeTemplate, type) {
 		const generator = this.map[type];
 		if (!generator) {
diff --git a/lib/GraphHelpers.js b/lib/GraphHelpers.js
index d668159705a..73c567442d5 100644
--- a/lib/GraphHelpers.js
+++ b/lib/GraphHelpers.js
@@ -2,6 +2,7 @@
 /** @typedef {import("./ChunkGroup")} ChunkGroup */
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./DependenciesBlock")} DependenciesBlock */
+/** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
 
 /**
  * @param {ChunkGroup} chunkGroup the ChunkGroup to connect
@@ -47,7 +48,7 @@ const disconnectChunkAndModule = (chunk, module) => {
 };
 
 /**
- * @param {DependenciesBlock} depBlock DepBlock being tied to ChunkGroup
+ * @param {AsyncDependenciesBlock} depBlock DepBlock being tied to ChunkGroup
  * @param {ChunkGroup} chunkGroup ChunkGroup being tied to DepBlock
  * @returns {void}
  */
diff --git a/lib/HashedModuleIdsPlugin.js b/lib/HashedModuleIdsPlugin.js
index aeb9f1d9346..0c720c181b2 100644
--- a/lib/HashedModuleIdsPlugin.js
+++ b/lib/HashedModuleIdsPlugin.js
@@ -8,10 +8,18 @@ const createHash = require("./util/createHash");
 const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/HashedModuleIdsPlugin.json");
 
+/** @typedef {import("../declarations/plugins/HashedModuleIdsPlugin").HashedModuleIdsPluginOptions} HashedModuleIdsPluginOptions */
+
 class HashedModuleIdsPlugin {
+	/**
+	 * @param {HashedModuleIdsPluginOptions=} options options object
+	 */
 	constructor(options) {
-		validateOptions(schema, options || {}, "Hashed Module Ids Plugin");
+		if (!options) options = {};
+
+		validateOptions(schema, options, "Hashed Module Ids Plugin");
 
+		/** @type {HashedModuleIdsPluginOptions} */
 		this.options = Object.assign(
 			{
 				context: null,
diff --git a/lib/HotModuleReplacement.runtime.js b/lib/HotModuleReplacement.runtime.js
index 4afddedc939..5497091c817 100644
--- a/lib/HotModuleReplacement.runtime.js
+++ b/lib/HotModuleReplacement.runtime.js
@@ -5,12 +5,15 @@
 /*global $hash$ $requestTimeout$ installedModules $require$ hotDownloadManifest hotDownloadUpdateChunk hotDisposeChunk modules */
 module.exports = function() {
 	var hotApplyOnUpdate = true;
-	var hotCurrentHash = $hash$; // eslint-disable-line no-unused-vars
+	// eslint-disable-next-line no-unused-vars
+	var hotCurrentHash = $hash$;
 	var hotRequestTimeout = $requestTimeout$;
 	var hotCurrentModuleData = {};
-	var hotCurrentChildModule; // eslint-disable-line no-unused-vars
-	var hotCurrentParents = []; // eslint-disable-line no-unused-vars
-	var hotCurrentParentsTemp = []; // eslint-disable-line no-unused-vars
+	var hotCurrentChildModule;
+	// eslint-disable-next-line no-unused-vars
+	var hotCurrentParents = [];
+	// eslint-disable-next-line no-unused-vars
+	var hotCurrentParentsTemp = [];
 
 	// eslint-disable-next-line no-unused-vars
 	function hotCreateRequire(moduleId) {
@@ -102,7 +105,7 @@ module.exports = function() {
 			// Module API
 			active: true,
 			accept: function(dep, callback) {
-				if (typeof dep === "undefined") hot._selfAccepted = true;
+				if (dep === undefined) hot._selfAccepted = true;
 				else if (typeof dep === "function") hot._selfAccepted = dep;
 				else if (typeof dep === "object")
 					for (var i = 0; i < dep.length; i++)
@@ -110,7 +113,7 @@ module.exports = function() {
 				else hot._acceptedDependencies[dep] = callback || function() {};
 			},
 			decline: function(dep) {
-				if (typeof dep === "undefined") hot._selfDeclined = true;
+				if (dep === undefined) hot._selfDeclined = true;
 				else if (typeof dep === "object")
 					for (var i = 0; i < dep.length; i++)
 						hot._declinedDependencies[dep[i]] = true;
@@ -199,8 +202,8 @@ module.exports = function() {
 			});
 			hotUpdate = {};
 			/*foreachInstalledChunks*/
+			// eslint-disable-next-line no-lone-blocks
 			{
-				// eslint-disable-line no-lone-blocks
 				/*globals chunkId */
 				hotEnsureUpdateChunk(chunkId);
 			}
diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js
index 4b0edac7241..365a2443a72 100644
--- a/lib/HotModuleReplacementPlugin.js
+++ b/lib/HotModuleReplacementPlugin.js
@@ -35,6 +35,118 @@ module.exports = class HotModuleReplacementPlugin {
 				return callback();
 			}
 		);
+
+		const addParserPlugins = (parser, parserOptions) => {
+			parser.hooks.expression
+				.for("__webpack_hash__")
+				.tap(
+					"HotModuleReplacementPlugin",
+					ParserHelpers.toConstantDependencyWithWebpackRequire(
+						parser,
+						"__webpack_require__.h()"
+					)
+				);
+			parser.hooks.evaluateTypeof
+				.for("__webpack_hash__")
+				.tap(
+					"HotModuleReplacementPlugin",
+					ParserHelpers.evaluateToString("string")
+				);
+			parser.hooks.evaluateIdentifier.for("module.hot").tap(
+				{
+					name: "HotModuleReplacementPlugin",
+					before: "NodeStuffPlugin"
+				},
+				expr => {
+					return ParserHelpers.evaluateToIdentifier(
+						"module.hot",
+						!!parser.state.compilation.hotUpdateChunkTemplate
+					)(expr);
+				}
+			);
+			// TODO webpack 5: refactor this, no custom hooks
+			if (!parser.hooks.hotAcceptCallback) {
+				parser.hooks.hotAcceptCallback = new SyncBailHook([
+					"expression",
+					"requests"
+				]);
+			}
+			if (!parser.hooks.hotAcceptWithoutCallback) {
+				parser.hooks.hotAcceptWithoutCallback = new SyncBailHook([
+					"expression",
+					"requests"
+				]);
+			}
+			parser.hooks.call
+				.for("module.hot.accept")
+				.tap("HotModuleReplacementPlugin", expr => {
+					if (!parser.state.compilation.hotUpdateChunkTemplate) {
+						return false;
+					}
+					if (expr.arguments.length >= 1) {
+						const arg = parser.evaluateExpression(expr.arguments[0]);
+						let params = [];
+						let requests = [];
+						if (arg.isString()) {
+							params = [arg];
+						} else if (arg.isArray()) {
+							params = arg.items.filter(param => param.isString());
+						}
+						if (params.length > 0) {
+							params.forEach((param, idx) => {
+								const request = param.string;
+								const dep = new ModuleHotAcceptDependency(request, param.range);
+								dep.optional = true;
+								dep.loc = Object.create(expr.loc);
+								dep.loc.index = idx;
+								parser.state.module.addDependency(dep);
+								requests.push(request);
+							});
+							if (expr.arguments.length > 1) {
+								parser.hooks.hotAcceptCallback.call(
+									expr.arguments[1],
+									requests
+								);
+								parser.walkExpression(expr.arguments[1]); // other args are ignored
+								return true;
+							} else {
+								parser.hooks.hotAcceptWithoutCallback.call(expr, requests);
+								return true;
+							}
+						}
+					}
+				});
+			parser.hooks.call
+				.for("module.hot.decline")
+				.tap("HotModuleReplacementPlugin", expr => {
+					if (!parser.state.compilation.hotUpdateChunkTemplate) {
+						return false;
+					}
+					if (expr.arguments.length === 1) {
+						const arg = parser.evaluateExpression(expr.arguments[0]);
+						let params = [];
+						if (arg.isString()) {
+							params = [arg];
+						} else if (arg.isArray()) {
+							params = arg.items.filter(param => param.isString());
+						}
+						params.forEach((param, idx) => {
+							const dep = new ModuleHotDeclineDependency(
+								param.string,
+								param.range
+							);
+							dep.optional = true;
+							dep.loc = Object.create(expr.loc);
+							dep.loc.index = idx;
+							parser.state.module.addDependency(dep);
+						});
+					}
+				});
+			parser.hooks.expression
+				.for("module.hot")
+				.tap("HotModuleReplacementPlugin", ParserHelpers.skipTraversal);
+		};
+
 		compiler.hooks.compilation.tap(
 			"HotModuleReplacementPlugin",
 			(compilation, { normalModuleFactory }) => {
@@ -173,11 +285,7 @@ module.exports = class HotModuleReplacementPlugin {
 									compilation.assets[filename] = source;
 									hotUpdateMainContent.c[chunkId] = true;
 									currentChunk.files.push(filename);
-									compilation.hooks.chunkAsset.call(
-										"HotModuleReplacementPlugin",
-										currentChunk,
-										filename
-									);
+									compilation.hooks.chunkAsset.call(currentChunk, filename);
 								}
 							} else {
 								hotUpdateMainContent.c[chunkId] = false;
@@ -275,127 +383,13 @@ module.exports = class HotModuleReplacementPlugin {
 					}
 				);
 
-				const handler = (parser, parserOptions) => {
-					parser.hooks.expression
-						.for("__webpack_hash__")
-						.tap(
-							"HotModuleReplacementPlugin",
-							ParserHelpers.toConstantDependencyWithWebpackRequire(
-								parser,
-								"__webpack_require__.h()"
-							)
-						);
-					parser.hooks.evaluateTypeof
-						.for("__webpack_hash__")
-						.tap(
-							"HotModuleReplacementPlugin",
-							ParserHelpers.evaluateToString("string")
-						);
-					parser.hooks.evaluateIdentifier.for("module.hot").tap(
-						{
-							name: "HotModuleReplacementPlugin",
-							before: "NodeStuffPlugin"
-						},
-						expr => {
-							return ParserHelpers.evaluateToIdentifier(
-								"module.hot",
-								!!parser.state.compilation.hotUpdateChunkTemplate
-							)(expr);
-						}
-					);
-					// TODO webpack 5: refactor this, no custom hooks
-					if (!parser.hooks.hotAcceptCallback) {
-						parser.hooks.hotAcceptCallback = new SyncBailHook([
-							"expression",
-							"requests"
-						]);
-					}
-					if (!parser.hooks.hotAcceptWithoutCallback) {
-						parser.hooks.hotAcceptWithoutCallback = new SyncBailHook([
-							"expression",
-							"requests"
-						]);
-					}
-					parser.hooks.call
-						.for("module.hot.accept")
-						.tap("HotModuleReplacementPlugin", expr => {
-							if (!parser.state.compilation.hotUpdateChunkTemplate) {
-								return false;
-							}
-							if (expr.arguments.length >= 1) {
-								const arg = parser.evaluateExpression(expr.arguments[0]);
-								let params = [];
-								let requests = [];
-								if (arg.isString()) {
-									params = [arg];
-								} else if (arg.isArray()) {
-									params = arg.items.filter(param => param.isString());
-								}
-								if (params.length > 0) {
-									params.forEach((param, idx) => {
-										const request = param.string;
-										const dep = new ModuleHotAcceptDependency(
-											request,
-											param.range
-										);
-										dep.optional = true;
-										dep.loc = Object.create(expr.loc);
-										dep.loc.index = idx;
-										parser.state.module.addDependency(dep);
-										requests.push(request);
-									});
-									if (expr.arguments.length > 1) {
-										parser.hooks.hotAcceptCallback.call(
-											expr.arguments[1],
-											requests
-										);
-										parser.walkExpression(expr.arguments[1]); // other args are ignored
-										return true;
-									} else {
-										parser.hooks.hotAcceptWithoutCallback.call(expr, requests);
-										return true;
-									}
-								}
-							}
-						});
-					parser.hooks.call
-						.for("module.hot.decline")
-						.tap("HotModuleReplacementPlugin", expr => {
-							if (!parser.state.compilation.hotUpdateChunkTemplate) {
-								return false;
-							}
-							if (expr.arguments.length === 1) {
-								const arg = parser.evaluateExpression(expr.arguments[0]);
-								let params = [];
-								if (arg.isString()) {
-									params = [arg];
-								} else if (arg.isArray()) {
-									params = arg.items.filter(param => param.isString());
-								}
-								params.forEach((param, idx) => {
-									const dep = new ModuleHotDeclineDependency(
-										param.string,
-										param.range
-									);
-									dep.optional = true;
-									dep.loc = Object.create(expr.loc);
-									dep.loc.index = idx;
-									parser.state.module.addDependency(dep);
-								});
-							}
-						});
-					parser.hooks.expression
-						.for("module.hot")
-						.tap("HotModuleReplacementPlugin", ParserHelpers.skipTraversal);
-				};
-
 				// TODO add HMR support for javascript/esm
 				normalModuleFactory.hooks.parser
 					.for("javascript/auto")
-					.tap("HotModuleReplacementPlugin", handler);
+					.tap("HotModuleReplacementPlugin", addParserPlugins);
 				normalModuleFactory.hooks.parser
 					.for("javascript/dynamic")
-					.tap("HotModuleReplacementPlugin", handler);
+					.tap("HotModuleReplacementPlugin", addParserPlugins);
 
 				compilation.hooks.normalModuleLoader.tap(
 					"HotModuleReplacementPlugin",
@@ -409,5 +403,5 @@ module.exports = class HotModuleReplacementPlugin {
 };
 
 const hotInitCode = Template.getFunctionContent(
-	require("./HotModuleReplacement.runtime.js")
+	require("./HotModuleReplacement.runtime")
 );
diff --git a/lib/HotUpdateChunk.js b/lib/HotUpdateChunk.js
index 17eaf128178..8845643b4f2 100644
--- a/lib/HotUpdateChunk.js
+++ b/lib/HotUpdateChunk.js
@@ -9,6 +9,7 @@ const Chunk = require("./Chunk");
 class HotUpdateChunk extends Chunk {
 	constructor() {
 		super();
+		/** @type {(string|number)[]} */
 		this.removedModules = undefined;
 	}
 }
diff --git a/lib/IgnorePlugin.js b/lib/IgnorePlugin.js
index 5cc6c62f80f..7660aef0a6f 100644
--- a/lib/IgnorePlugin.js
+++ b/lib/IgnorePlugin.js
@@ -4,42 +4,68 @@
 */
 "use strict";
 
+const validateOptions = require("schema-utils");
+const schema = require("../schemas/plugins/IgnorePlugin.json");
+
+/** @typedef {import("../declarations/plugins/IgnorePlugin").IgnorePluginOptions} IgnorePluginOptions */
+/** @typedef {import("./Compiler")} Compiler */
+
 class IgnorePlugin {
-	constructor(resourceRegExp, contextRegExp) {
-		this.resourceRegExp = resourceRegExp;
-		this.contextRegExp = contextRegExp;
+	/**
+	 * @param {IgnorePluginOptions} options IgnorePlugin options
+	 */
+	constructor(options) {
+		// TODO webpack 5 remove this compat-layer
+		if (arguments.length > 1 || options instanceof RegExp) {
+			options = {
+				resourceRegExp: arguments[0],
+				contextRegExp: arguments[1]
+			};
+		}
+
+		validateOptions(schema, options, "IgnorePlugin");
+		this.options = options;
 
+		/** @private @type {Function} */
 		this.checkIgnore = this.checkIgnore.bind(this);
 	}
 
-	/*
-	 * Only returns true if a "resourceRegExp" exists
+	/**
+	 * @param {string} resource resource
+	 * @returns {boolean} returns true if a "resourceRegExp" exists
 	 * and the resource given matches the regexp.
 	 */
 	checkResource(resource) {
-		if (!this.resourceRegExp) {
-			return false;
+		if ("checkResource" in this.options && this.options.checkResource) {
+			return this.options.checkResource(resource);
+		}
+		if ("resourceRegExp" in this.options && this.options.resourceRegExp) {
+			return this.options.resourceRegExp.test(resource);
 		}
-		return this.resourceRegExp.test(resource);
+		return false;
 	}
 
-	/*
-	 * Returns true if contextRegExp does not exist
+	/**
+	 * @param {string} context context
+	 * @returns {boolean} returns true if "contextRegExp" does not exist
 	 * or if context matches the given regexp.
 	 */
 	checkContext(context) {
-		if (!this.contextRegExp) {
-			return true;
+		if ("checkContext" in this.options && this.options.checkContext) {
+			return this.options.checkContext(context);
+		}
+		if ("contextRegExp" in this.options && this.options.contextRegExp) {
+			return this.options.contextRegExp.test(context);
 		}
-		return this.contextRegExp.test(context);
+		return true;
 	}
 
-	/*
-	 * Returns true if result should be ignored.
-	 * false if it shouldn't.
-	 *
-	 * Not that if "contextRegExp" is given, both the "resourceRegExp"
+	/**
+	 * Note that if "contextRegExp" is given, both the "resourceRegExp"
 	 * and "contextRegExp" have to match.
+	 *
+	 * @param {TODO} result result
+	 * @returns {boolean} returns true if result should be ignored
 	 */
 	checkResult(result) {
 		if (!result) {
@@ -50,6 +76,10 @@ class IgnorePlugin {
 		);
 	}
 
+	/**
+	 * @param {TODO} result result
+	 * @returns {TODO|null} returns result or null if result should be ignored
+	 */
 	checkIgnore(result) {
 		// check if result is ignored
 		if (this.checkResult(result)) {
@@ -58,6 +88,10 @@ class IgnorePlugin {
 		return result;
 	}
 
+	/**
+	 * @param {Compiler} compiler Webpack Compiler
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.normalModuleFactory.tap("IgnorePlugin", nmf => {
 			nmf.hooks.beforeResolve.tap("IgnorePlugin", this.checkIgnore);
diff --git a/lib/JavascriptModulesPlugin.js b/lib/JavascriptModulesPlugin.js
index 5e0aaf8c4c7..07030c9a301 100644
--- a/lib/JavascriptModulesPlugin.js
+++ b/lib/JavascriptModulesPlugin.js
@@ -135,7 +135,14 @@ class JavascriptModulesPlugin {
 					const template = chunk.hasRuntime()
 						? compilation.mainTemplate
 						: compilation.chunkTemplate;
-					template.updateHashForChunk(hash, chunk);
+					hash.update(`${chunk.id} `);
+					hash.update(chunk.ids ? chunk.ids.join(",") : "");
+					template.updateHashForChunk(
+						hash,
+						chunk,
+						compilation.moduleTemplates.javascript,
+						compilation.dependencyTemplates
+					);
 					for (const m of chunk.modulesIterable) {
 						if (typeof m.source === "function") {
 							hash.update(m.hash);
diff --git a/lib/JsonGenerator.js b/lib/JsonGenerator.js
index 508ae5ccc51..5b4c739538f 100644
--- a/lib/JsonGenerator.js
+++ b/lib/JsonGenerator.js
@@ -4,18 +4,31 @@
 */
 "use strict";
 
-const { ConcatSource } = require("webpack-sources");
+const { ConcatSource, RawSource } = require("webpack-sources");
 
-const stringifySafe = data =>
-	JSON.stringify(data).replace(
+const stringifySafe = data => {
+	const stringified = JSON.stringify(data);
+	if (!stringified) {
+		return undefined; // Invalid JSON
+	}
+
+	return stringified.replace(
 		/\u2028|\u2029/g,
 		str => (str === "\u2029" ? "\\u2029" : "\\u2028")
 	); // invalid in JavaScript but valid JSON
+};
 
 class JsonGenerator {
 	generate(module, dependencyTemplates, runtimeTemplate) {
 		const source = new ConcatSource();
 		const data = module.buildInfo.jsonData;
+		if (data === undefined) {
+			return new RawSource(
+				runtimeTemplate.missingModuleStatement({
+					request: module.rawRequest
+				})
+			);
+		}
 		if (
 			Array.isArray(module.buildMeta.providedExports) &&
 			!module.isUsed("default")
diff --git a/lib/LibraryTemplatePlugin.js b/lib/LibraryTemplatePlugin.js
index 484442efcbc..eb6e7ed26a8 100644
--- a/lib/LibraryTemplatePlugin.js
+++ b/lib/LibraryTemplatePlugin.js
@@ -6,6 +6,7 @@
 
 const SetVarMainTemplatePlugin = require("./SetVarMainTemplatePlugin");
 
+/** @typedef {import("../declarations/WebpackOptions").LibraryCustomUmdObject} LibraryCustomUmdObject */
 /** @typedef {import("./Compiler")} Compiler */
 
 /**
@@ -18,19 +19,26 @@ const accessorToObjectAccess = accessor => {
 
 /**
  * @param {string=} base the path prefix
- * @param {string|string[]} accessor the accessor
+ * @param {string|string[]|LibraryCustomUmdObject} accessor the accessor
+ * @param {"amd" | "commonjs" | "root"} umdProperty property used when a custom umd object is provided
  * @param {string=} joinWith the element separator
  * @returns {string} the path
  */
-const accessorAccess = (base, accessor, joinWith = "; ") => {
-	const accessors = Array.isArray(accessor) ? accessor : [accessor];
+const accessorAccess = (base, accessor, umdProperty, joinWith = "; ") => {
+	const normalizedAccessor =
+		typeof accessor === "object" && !Array.isArray(accessor)
+			? accessor[umdProperty]
+			: accessor;
+	const accessors = Array.isArray(normalizedAccessor)
+		? normalizedAccessor
+		: [normalizedAccessor];
 	return accessors
 		.map((_, idx) => {
 			const a = base
 				? base + accessorToObjectAccess(accessors.slice(0, idx + 1))
 				: accessors[0] + accessorToObjectAccess(accessors.slice(1, idx + 1));
 			if (idx === accessors.length - 1) return a;
-			if (idx === 0 && typeof base === "undefined") {
+			if (idx === 0 && base === undefined) {
 				return `${a} = typeof ${a} === "object" ? ${a} : {}`;
 			}
 			return `${a} = ${a} || {}`;
@@ -40,7 +48,7 @@ const accessorAccess = (base, accessor, joinWith = "; ") => {
 
 class LibraryTemplatePlugin {
 	/**
-	 * @param {string} name name of library
+	 * @param {string|string[]|LibraryCustomUmdObject} name name of library
 	 * @param {string} target type of library
 	 * @param {boolean} umdNamedDefine setting this to true will name the UMD module
 	 * @param {string|TODO} auxiliaryComment comment in the UMD wrapper
@@ -68,14 +76,22 @@ class LibraryTemplatePlugin {
 			}
 			switch (this.target) {
 				case "var":
+					if (
+						!this.name ||
+						(typeof this.name === "object" && !Array.isArray(this.name))
+					) {
+						throw new Error(
+							"library name must be set and not an UMD custom object for non-UMD target"
+						);
+					}
 					new SetVarMainTemplatePlugin(
-						`var ${accessorAccess(undefined, this.name)}`,
+						`var ${accessorAccess(undefined, this.name, "root")}`,
 						false
 					).apply(compilation);
 					break;
 				case "assign":
 					new SetVarMainTemplatePlugin(
-						accessorAccess(undefined, this.name),
+						accessorAccess(undefined, this.name, "root"),
 						false
 					).apply(compilation);
 					break;
@@ -84,7 +100,7 @@ class LibraryTemplatePlugin {
 				case "window":
 					if (this.name) {
 						new SetVarMainTemplatePlugin(
-							accessorAccess(this.target, this.name),
+							accessorAccess(this.target, this.name, "root"),
 							false
 						).apply(compilation);
 					} else {
@@ -96,7 +112,8 @@ class LibraryTemplatePlugin {
 						new SetVarMainTemplatePlugin(
 							accessorAccess(
 								compilation.runtimeTemplate.outputOptions.globalObject,
-								this.name
+								this.name,
+								"root"
 							),
 							false
 						).apply(compilation);
@@ -110,7 +127,7 @@ class LibraryTemplatePlugin {
 				case "commonjs":
 					if (this.name) {
 						new SetVarMainTemplatePlugin(
-							accessorAccess("exports", this.name),
+							accessorAccess("exports", this.name, "commonjs"),
 							false
 						).apply(compilation);
 					} else {
@@ -123,9 +140,16 @@ class LibraryTemplatePlugin {
 						compilation
 					);
 					break;
-				case "amd": {
+				case "amd":
+				case "amd-require": {
 					const AmdMainTemplatePlugin = require("./AmdMainTemplatePlugin");
-					new AmdMainTemplatePlugin(this.name).apply(compilation);
+					if (this.name && typeof this.name !== "string") {
+						throw new Error("library name must be a string for amd target");
+					}
+					new AmdMainTemplatePlugin({
+						name: this.name,
+						requireAsWrapper: this.target === "amd-require"
+					}).apply(compilation);
 					break;
 				}
 				case "umd":
@@ -140,6 +164,8 @@ class LibraryTemplatePlugin {
 				}
 				case "jsonp": {
 					const JsonpExportMainTemplatePlugin = require("./web/JsonpExportMainTemplatePlugin");
+					if (typeof this.name !== "string")
+						throw new Error("library name must be a string for jsonp target");
 					new JsonpExportMainTemplatePlugin(this.name).apply(compilation);
 					break;
 				}
diff --git a/lib/LoaderOptionsPlugin.js b/lib/LoaderOptionsPlugin.js
index 5d13e2c0643..651987b8d71 100644
--- a/lib/LoaderOptionsPlugin.js
+++ b/lib/LoaderOptionsPlugin.js
@@ -9,7 +9,12 @@ const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/LoaderOptionsPlugin.json");
 
+/** @typedef {import("../declarations/plugins/LoaderOptionsPlugin").LoaderOptionsPluginOptions} LoaderOptionsPluginOptions */
+
 class LoaderOptionsPlugin {
+	/**
+	 * @param {LoaderOptionsPluginOptions} options options object
+	 */
 	constructor(options) {
 		validateOptions(schema, options || {}, "Loader Options Plugin");
 
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
index 3463546fea6..db42205e7de 100644
--- a/lib/MainTemplate.js
+++ b/lib/MainTemplate.js
@@ -19,15 +19,17 @@ const {
 const Template = require("./Template");
 
 /** @typedef {import("webpack-sources").ConcatSource} ConcatSource */
+/** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("./ModuleTemplate")} ModuleTemplate */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./Module")} Module} */
-/** @typedef {import("crypto").Hash} Hash} */
+/** @typedef {import("./util/createHash").Hash} Hash} */
+/** @typedef {import("./Dependency").DependencyTemplate} DependencyTemplate} */
 
 /**
  * @typedef {Object} RenderManifestOptions
  * @property {Chunk} chunk the chunk used to render
- * @property {Hash} hash
+ * @property {string} hash
  * @property {string} fullHash
  * @property {TODO} outputOptions
  * @property {{javascript: ModuleTemplate, webassembly: ModuleTemplate}} moduleTemplates
@@ -92,7 +94,9 @@ module.exports = class MainTemplate extends Tapable {
 			localVars: new SyncWaterfallHook(["source", "chunk", "hash"]),
 			require: new SyncWaterfallHook(["source", "chunk", "hash"]),
 			requireExtensions: new SyncWaterfallHook(["source", "chunk", "hash"]),
+			/** @type {SyncWaterfallHook<string, Chunk, string>} */
 			beforeStartup: new SyncWaterfallHook(["source", "chunk", "hash"]),
+			/** @type {SyncWaterfallHook<string, Chunk, string>} */
 			startup: new SyncWaterfallHook(["source", "chunk", "hash"]),
 			render: new SyncWaterfallHook([
 				"source",
@@ -243,6 +247,19 @@ module.exports = class MainTemplate extends Tapable {
 				);
 				buf.push(Template.indent("return Promise.all(promises);"));
 				buf.push("};");
+			} else if (
+				chunk.hasModuleInGraph(m =>
+					m.blocks.some(b => b.chunkGroup && b.chunkGroup.chunks.length > 0)
+				)
+			) {
+				// There async blocks in the graph, so we need to add an empty requireEnsure
+				// function anyway. This can happen with multiple entrypoints.
+				buf.push("// The chunk loading function for additional chunks");
+				buf.push("// Since all referenced chunks are already included");
+				buf.push("// in this file, this function is empty here.");
+				buf.push(`${this.requireFn}.e = function requireEnsure() {`);
+				buf.push(Template.indent("return Promise.resolve();"));
+				buf.push("};");
 			}
 			buf.push("");
 			buf.push("// expose the modules object (__webpack_modules__)");
@@ -357,14 +374,14 @@ module.exports = class MainTemplate extends Tapable {
 	}
 
 	/**
-	 *
+	 * TODO webpack 5: remove moduleTemplate and dependencyTemplates
 	 * @param {string} hash hash to be used for render call
 	 * @param {Chunk} chunk Chunk instance
 	 * @param {ModuleTemplate} moduleTemplate ModuleTemplate instance for render
-	 * @param {TODO} dependencyTemplates DependencyTemplate[]s
-	 * @returns {ConcatSource} the newly generated source from rendering
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates dependency templates
+	 * @returns {string[]} the generated source of the bootstrap code
 	 */
-	render(hash, chunk, moduleTemplate, dependencyTemplates) {
+	renderBootstrap(hash, chunk, moduleTemplate, dependencyTemplates) {
 		const buf = [];
 		buf.push(
 			this.hooks.bootstrap.call(
@@ -388,6 +405,23 @@ module.exports = class MainTemplate extends Tapable {
 		buf.push("");
 		buf.push(Template.asString(this.hooks.beforeStartup.call("", chunk, hash)));
 		buf.push(Template.asString(this.hooks.startup.call("", chunk, hash)));
+		return buf;
+	}
+
+	/**
+	 * @param {string} hash hash to be used for render call
+	 * @param {Chunk} chunk Chunk instance
+	 * @param {ModuleTemplate} moduleTemplate ModuleTemplate instance for render
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates dependency templates
+	 * @returns {ConcatSource} the newly generated source from rendering
+	 */
+	render(hash, chunk, moduleTemplate, dependencyTemplates) {
+		const buf = this.renderBootstrap(
+			hash,
+			chunk,
+			moduleTemplate,
+			dependencyTemplates
+		);
 		let source = this.hooks.render.call(
 			new OriginalSource(
 				Template.prefix(buf, " \t") + "\n",
@@ -447,7 +481,7 @@ module.exports = class MainTemplate extends Tapable {
 	/**
 	 *
 	 * @param {string} hash string hash
-	 * @param {number} length length
+	 * @param {number=} length length
 	 * @returns {string} call hook return
 	 */
 	renderCurrentHashCode(hash, length) {
@@ -474,16 +508,37 @@ module.exports = class MainTemplate extends Tapable {
 		return this.hooks.assetPath.call(path, options);
 	}
 
+	/**
+	 * Updates hash with information from this template
+	 * @param {Hash} hash the hash to update
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update("maintemplate");
 		hash.update("3");
-		hash.update(this.outputOptions.publicPath + "");
 		this.hooks.hash.call(hash);
 	}
 
-	updateHashForChunk(hash, chunk) {
+	/**
+	 * TODO webpack 5: remove moduleTemplate and dependencyTemplates
+	 * Updates hash with chunk-specific information from this template
+	 * @param {Hash} hash the hash to update
+	 * @param {Chunk} chunk the chunk
+	 * @param {ModuleTemplate} moduleTemplate ModuleTemplate instance for render
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates dependency templates
+	 * @returns {void}
+	 */
+	updateHashForChunk(hash, chunk, moduleTemplate, dependencyTemplates) {
 		this.updateHash(hash);
 		this.hooks.hashForChunk.call(hash, chunk);
+		for (const line of this.renderBootstrap(
+			"0000",
+			chunk,
+			moduleTemplate,
+			dependencyTemplates
+		)) {
+			hash.update(line);
+		}
 	}
 
 	useChunkHash(chunk) {
diff --git a/lib/Module.js b/lib/Module.js
index 36ffd681e2d..3fb571cbe18 100644
--- a/lib/Module.js
+++ b/lib/Module.js
@@ -13,6 +13,8 @@ const Template = require("./Template");
 
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./RequestShortener")} RequestShortener */
+/** @typedef {import("./WebpackError")} WebpackError */
+/** @typedef {import("./util/createHash").Hash} Hash */
 
 const EMPTY_RESOLVE_OPTIONS = {};
 
@@ -47,15 +49,15 @@ class Module extends DependenciesBlock {
 		this.renderedHash = undefined;
 
 		// Info from Factory
-		/** @type {object} */
+		/** @type {TODO} */
 		this.resolveOptions = EMPTY_RESOLVE_OPTIONS;
 		/** @type {object} */
 		this.factoryMeta = {};
 
 		// Info from Build
-		/** @type {Error[]} */
+		/** @type {WebpackError[]} */
 		this.warnings = [];
-		/** @type {Error[]} */
+		/** @type {WebpackError[]} */
 		this.errors = [];
 		/** @type {object} */
 		this.buildMeta = undefined;
@@ -65,7 +67,7 @@ class Module extends DependenciesBlock {
 		// Graph (per Compilation)
 		/** @type {ModuleReason[]} */
 		this.reasons = [];
-		/** @type {SortableSet} */
+		/** @type {SortableSet<Chunk>} */
 		this._chunks = new SortableSet(undefined, sortById);
 
 		// Info from Compilation (per Compilation)
@@ -181,6 +183,9 @@ class Module extends DependenciesBlock {
 		);
 	}
 
+	/**
+	 * @returns {Chunk[]} all chunks which contain the module
+	 */
 	getChunks() {
 		return Array.from(this._chunks);
 	}
@@ -257,6 +262,10 @@ class Module extends DependenciesBlock {
 		}
 	}
 
+	/**
+	 * @param {string=} exportName the name of the export
+	 * @returns {boolean|string} false if the export isn't used, true if no exportName is provided and the module is used, or the name to access it if the export is used
+	 */
 	isUsed(exportName) {
 		if (!exportName) return this.used !== false;
 		if (this.used === null || this.usedExports === null) return exportName;
@@ -294,6 +303,10 @@ class Module extends DependenciesBlock {
 		return true;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update(`${this.id}`);
 		hash.update(JSON.stringify(this.usedExports));
@@ -335,17 +348,35 @@ class Module extends DependenciesBlock {
 // TODO remove in webpack 5
 Object.defineProperty(Module.prototype, "forEachChunk", {
 	configurable: false,
-	value: util.deprecate(function(fn) {
-		this._chunks.forEach(fn);
-	}, "Module.forEachChunk: Use for(const chunk of module.chunksIterable) instead")
+	value: util.deprecate(
+		/**
+		 * @deprecated
+		 * @param {function(any, any, Set<any>): void} fn callback function
+		 * @returns {void}
+		 * @this {Module}
+		 */
+		function(fn) {
+			this._chunks.forEach(fn);
+		},
+		"Module.forEachChunk: Use for(const chunk of module.chunksIterable) instead"
+	)
 });
 
 // TODO remove in webpack 5
 Object.defineProperty(Module.prototype, "mapChunks", {
 	configurable: false,
-	value: util.deprecate(function(fn) {
-		return Array.from(this._chunks, fn);
-	}, "Module.mapChunks: Use Array.from(module.chunksIterable, fn) instead")
+	value: util.deprecate(
+		/**
+		 * @deprecated
+		 * @param {function(any, any): void} fn Mapper function
+		 * @returns {Array<TODO>} Array of chunks mapped
+		 * @this {Module}
+		 */
+		function(fn) {
+			return Array.from(this._chunks, fn);
+		},
+		"Module.mapChunks: Use Array.from(module.chunksIterable, fn) instead"
+	)
 });
 
 // TODO remove in webpack 5
@@ -362,12 +393,29 @@ Object.defineProperty(Module.prototype, "entry", {
 // TODO remove in webpack 5
 Object.defineProperty(Module.prototype, "meta", {
 	configurable: false,
-	get: util.deprecate(function() {
-		return this.buildMeta;
-	}, "Module.meta was renamed to Module.buildMeta"),
-	set: util.deprecate(function(value) {
-		this.buildMeta = value;
-	}, "Module.meta was renamed to Module.buildMeta")
+	get: util.deprecate(
+		/**
+		 * @deprecated
+		 * @returns {void}
+		 * @this {Module}
+		 */
+		function() {
+			return this.buildMeta;
+		},
+		"Module.meta was renamed to Module.buildMeta"
+	),
+	set: util.deprecate(
+		/**
+		 * @deprecated
+		 * @param {TODO} value Value
+		 * @returns {void}
+		 * @this {Module}
+		 */
+		function(value) {
+			this.buildMeta = value;
+		},
+		"Module.meta was renamed to Module.buildMeta"
+	)
 });
 
 /** @type {function(): string} */
@@ -380,6 +428,8 @@ Module.prototype.build = null;
 Module.prototype.source = null;
 Module.prototype.size = null;
 Module.prototype.nameForCondition = null;
+/** @type {null | function(Chunk): boolean} */
+Module.prototype.chunkCondition = null;
 Module.prototype.updateCacheModule = null;
 
 module.exports = Module;
diff --git a/lib/ModuleReason.js b/lib/ModuleReason.js
index 239584b6c1e..3697f849502 100644
--- a/lib/ModuleReason.js
+++ b/lib/ModuleReason.js
@@ -4,7 +4,15 @@
 */
 "use strict";
 
+/** @typedef {import("./Module")} Module */
+/** @typedef {import("./Dependency")} Dependency */
+
 class ModuleReason {
+	/**
+	 * @param {Module} module the referencing module
+	 * @param {Dependency} dependency the referencing dependency
+	 * @param {string=} explanation some extra detail
+	 */
 	constructor(module, dependency, explanation) {
 		this.module = module;
 		this.dependency = dependency;
diff --git a/lib/ModuleTemplate.js b/lib/ModuleTemplate.js
index 50697aecfa7..06e787ed930 100644
--- a/lib/ModuleTemplate.js
+++ b/lib/ModuleTemplate.js
@@ -6,6 +6,9 @@
 
 const { Tapable, SyncWaterfallHook, SyncHook } = require("tapable");
 
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("./Module")} Module */
+
 module.exports = class ModuleTemplate extends Tapable {
 	constructor(runtimeTemplate, type) {
 		super();
@@ -40,6 +43,12 @@ module.exports = class ModuleTemplate extends Tapable {
 		};
 	}
 
+	/**
+	 * @param {Module} module the module
+	 * @param {TODO} dependencyTemplates templates for dependencies
+	 * @param {TODO} options render options
+	 * @returns {Source} the source
+	 */
 	render(module, dependencyTemplates, options) {
 		try {
 			const moduleSource = module.source(
diff --git a/lib/MultiEntryPlugin.js b/lib/MultiEntryPlugin.js
index 29e8064298c..b38a82399d9 100644
--- a/lib/MultiEntryPlugin.js
+++ b/lib/MultiEntryPlugin.js
@@ -8,13 +8,25 @@ const MultiEntryDependency = require("./dependencies/MultiEntryDependency");
 const SingleEntryDependency = require("./dependencies/SingleEntryDependency");
 const MultiModuleFactory = require("./MultiModuleFactory");
 
-module.exports = class MultiEntryPlugin {
+/** @typedef {import("./Compiler")} Compiler */
+
+class MultiEntryPlugin {
+	/**
+	 * The MultiEntryPlugin is invoked whenever this.options.entry value is an array of paths
+	 * @param {string} context context path
+	 * @param {string[]} entries array of entry paths
+	 * @param {string} name entry key name
+	 */
 	constructor(context, entries, name) {
 		this.context = context;
 		this.entries = entries;
 		this.name = name;
 	}
 
+	/**
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
 			"MultiEntryPlugin",
@@ -43,16 +55,26 @@ module.exports = class MultiEntryPlugin {
 		);
 	}
 
+	/**
+	 * @param {string[]} entries each entry path string
+	 * @param {string} name name of the entry
+	 * @returns {MultiEntryDependency} returns a constructed Dependency
+	 */
 	static createDependency(entries, name) {
 		return new MultiEntryDependency(
 			entries.map((e, idx) => {
 				const dep = new SingleEntryDependency(e);
 				// Because entrypoints are not dependencies found in an
 				// existing module, we give it a synthetic id
-				dep.loc = `${name}:${100000 + idx}`;
+				dep.loc = {
+					name,
+					index: idx
+				};
 				return dep;
 			}),
 			name
 		);
 	}
-};
+}
+
+module.exports = MultiEntryPlugin;
diff --git a/lib/MultiModule.js b/lib/MultiModule.js
index 6aee82f6694..c8e5d575718 100644
--- a/lib/MultiModule.js
+++ b/lib/MultiModule.js
@@ -8,6 +8,8 @@ const Module = require("./Module");
 const Template = require("./Template");
 const { RawSource } = require("webpack-sources");
 
+/** @typedef {import("./util/createHash").Hash} Hash */
+
 class MultiModule extends Module {
 	constructor(context, dependencies, name) {
 		super("javascript/dynamic", context);
@@ -45,6 +47,10 @@ class MultiModule extends Module {
 		return 16 + this.dependencies.length * 12;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update("multi module");
 		hash.update(this.name || "");
diff --git a/lib/MultiStats.js b/lib/MultiStats.js
index 4713524b8db..1a5fcf2b007 100644
--- a/lib/MultiStats.js
+++ b/lib/MultiStats.js
@@ -40,11 +40,11 @@ class MultiStats {
 			return obj;
 		});
 		const showVersion =
-			typeof options.version === "undefined"
+			options.version === undefined
 				? jsons.every(j => j.version)
 				: options.version !== false;
 		const showHash =
-			typeof options.hash === "undefined"
+			options.hash === undefined
 				? jsons.every(j => j.hash)
 				: options.hash !== false;
 		if (showVersion) {
diff --git a/lib/NodeStuffPlugin.js b/lib/NodeStuffPlugin.js
index 9ee407cd6df..75d2e73b063 100644
--- a/lib/NodeStuffPlugin.js
+++ b/lib/NodeStuffPlugin.js
@@ -108,6 +108,24 @@ class NodeStuffPlugin {
 								"require.extensions is not supported by webpack. Use a loader instead."
 							)
 						);
+					parser.hooks.expression
+						.for("require.main.require")
+						.tap(
+							"NodeStuffPlugin",
+							ParserHelpers.expressionIsUnsupported(
+								parser,
+								"require.main.require is not supported by webpack."
+							)
+						);
+					parser.hooks.expression
+						.for("module.parent.require")
+						.tap(
+							"NodeStuffPlugin",
+							ParserHelpers.expressionIsUnsupported(
+								parser,
+								"module.parent.require is not supported by webpack."
+							)
+						);
 					parser.hooks.expression
 						.for("module.loaded")
 						.tap("NodeStuffPlugin", expr => {
diff --git a/lib/NormalModule.js b/lib/NormalModule.js
index 1e65bce91a1..fdabc3000ce 100644
--- a/lib/NormalModule.js
+++ b/lib/NormalModule.js
@@ -4,7 +4,6 @@
 */
 "use strict";
 
-const path = require("path");
 const NativeModule = require("module");
 
 const {
@@ -23,6 +22,9 @@ const ModuleBuildError = require("./ModuleBuildError");
 const ModuleError = require("./ModuleError");
 const ModuleWarning = require("./ModuleWarning");
 const createHash = require("./util/createHash");
+const contextify = require("./util/identifier").contextify;
+
+/** @typedef {import("./util/createHash").Hash} Hash */
 
 const asString = buf => {
 	if (Buffer.isBuffer(buf)) {
@@ -38,28 +40,6 @@ const asBuffer = str => {
 	return str;
 };
 
-const contextify = (context, request) => {
-	return request
-		.split("!")
-		.map(r => {
-			const splitPath = r.split("?");
-			if (/^[a-zA-Z]:\\/.test(splitPath[0])) {
-				splitPath[0] = path.win32.relative(context, splitPath[0]);
-				if (!/^[a-zA-Z]:\\/.test(splitPath[0])) {
-					splitPath[0] = splitPath[0].replace(/\\/g, "/");
-				}
-			}
-			if (/^\//.test(splitPath[0])) {
-				splitPath[0] = path.posix.relative(context, splitPath[0]);
-			}
-			if (!/^(\.\.\/|\/|[a-zA-Z]:\\)/.test(splitPath[0])) {
-				splitPath[0] = "./" + splitPath[0];
-			}
-			return splitPath.join("?");
-		})
-		.join("!");
-};
-
 class NonErrorEmittedError extends WebpackError {
 	constructor(error) {
 		super();
@@ -191,6 +171,7 @@ class NormalModule extends Module {
 					})
 				);
 			},
+			// TODO remove in webpack 5
 			exec: (code, filename) => {
 				// @ts-ignore Argument of type 'this' is not assignable to parameter of type 'Module'.
 				const module = new NativeModule(filename, this);
@@ -265,6 +246,8 @@ class NormalModule extends Module {
 		}
 
 		if (Buffer.isBuffer(source)) {
+			// @ts-ignore
+			// TODO We need to fix @types/webpack-sources to allow RawSource to take a Buffer | string
 			return new RawSource(source);
 		}
 
@@ -486,6 +469,7 @@ class NormalModule extends Module {
 	}
 
 	getHashDigest(dependencyTemplates) {
+		// TODO webpack 5 refactor
 		let dtHash = dependencyTemplates.get("hash");
 		return `${this.hash}-${dtHash}`;
 	}
@@ -545,6 +529,10 @@ class NormalModule extends Module {
 		return this._source ? this._source.size() : -1;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		hash.update(this._buildHash);
 		super.updateHash(hash);
diff --git a/lib/OptionsDefaulter.js b/lib/OptionsDefaulter.js
index c5ff612d8d7..cad07ea06c2 100644
--- a/lib/OptionsDefaulter.js
+++ b/lib/OptionsDefaulter.js
@@ -16,8 +16,7 @@ const getProperty = (obj, name) => {
 const setProperty = (obj, name, value) => {
 	name = name.split(".");
 	for (let i = 0; i < name.length - 1; i++) {
-		if (typeof obj[name[i]] !== "object" && typeof obj[name[i]] !== "undefined")
-			return;
+		if (typeof obj[name[i]] !== "object" && obj[name[i]] !== undefined) return;
 		if (Array.isArray(obj[name[i]])) return;
 		if (!obj[name[i]]) obj[name[i]] = {};
 		obj = obj[name[i]];
diff --git a/lib/Parser.js b/lib/Parser.js
index 515df38771f..787f67d6102 100644
--- a/lib/Parser.js
+++ b/lib/Parser.js
@@ -2185,9 +2185,18 @@ class Parser extends Tapable {
 // TODO remove in webpack 5
 Object.defineProperty(Parser.prototype, "getCommentOptions", {
 	configurable: false,
-	value: util.deprecate(function(range) {
-		return this.parseCommentOptions(range).options;
-	}, "Parser.getCommentOptions: Use Parser.parseCommentOptions(range) instead")
+	value: util.deprecate(
+		/**
+		 * @deprecated
+		 * @param {TODO} range Range
+		 * @returns {void}
+		 * @this {Parser}
+		 */
+		function(range) {
+			return this.parseCommentOptions(range).options;
+		},
+		"Parser.getCommentOptions: Use Parser.parseCommentOptions(range) instead"
+	)
 });
 
 module.exports = Parser;
diff --git a/lib/ProgressPlugin.js b/lib/ProgressPlugin.js
index 32cd6d2cb20..a8612932de1 100644
--- a/lib/ProgressPlugin.js
+++ b/lib/ProgressPlugin.js
@@ -24,7 +24,7 @@ const createDefaultHandler = profile => {
 			for (let detail of details) {
 				if (!detail) continue;
 				if (detail.length > 40) {
-					detail = `…${detail.substr(detail.length - 39)}`;
+					detail = `...${detail.substr(detail.length - 39)}`;
 				}
 				msg += ` ${detail}`;
 			}
diff --git a/lib/RequireJsStuffPlugin.js b/lib/RequireJsStuffPlugin.js
index 84793c8a997..632deefc2d6 100644
--- a/lib/RequireJsStuffPlugin.js
+++ b/lib/RequireJsStuffPlugin.js
@@ -19,10 +19,7 @@ module.exports = class RequireJsStuffPlugin {
 					new ConstDependency.Template()
 				);
 				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.requireJs !== "undefined" &&
-						!parserOptions.requireJs
-					)
+					if (parserOptions.requireJs !== undefined && !parserOptions.requireJs)
 						return;
 
 					parser.hooks.call
diff --git a/lib/RuleSet.js b/lib/RuleSet.js
index abc44c1a9b4..7ed8eba6f5c 100644
--- a/lib/RuleSet.js
+++ b/lib/RuleSet.js
@@ -75,13 +75,13 @@ normalized:
 "use strict";
 
 const notMatcher = matcher => {
-	return function(str) {
+	return str => {
 		return !matcher(str);
 	};
 };
 
 const orMatcher = items => {
-	return function(str) {
+	return str => {
 		for (let i = 0; i < items.length; i++) {
 			if (items[i](str)) return true;
 		}
@@ -90,7 +90,7 @@ const orMatcher = items => {
 };
 
 const andMatcher = items => {
-	return function(str) {
+	return str => {
 		for (let i = 0; i < items.length; i++) {
 			if (!items[i](str)) return false;
 		}
diff --git a/lib/RuntimeTemplate.js b/lib/RuntimeTemplate.js
index 92292d389c1..613aed1c3ad 100644
--- a/lib/RuntimeTemplate.js
+++ b/lib/RuntimeTemplate.js
@@ -6,6 +6,8 @@
 
 const Template = require("./Template");
 
+/** @typedef {import("./Module")} Module */
+
 module.exports = class RuntimeTemplate {
 	constructor(outputOptions, requestShortener) {
 		this.outputOptions = outputOptions || {};
@@ -188,6 +190,16 @@ module.exports = class RuntimeTemplate {
 		return `${promise || "Promise.resolve()"}.then(${getModuleFunction})`;
 	}
 
+	/**
+	 *
+	 * @param {Object} options options object
+	 * @param {boolean=} options.update whether a new variable should be created or the existing one updated
+	 * @param {Module} options.module the module
+	 * @param {string} options.request the request that should be printed as comment
+	 * @param {string} options.importVar name of the import variable
+	 * @param {Module} options.originModule module in which the statement is emitted
+	 * @returns {string} the import statement
+	 */
 	importStatement({ update, module, request, importVar, originModule }) {
 		if (!module) {
 			return this.missingModuleStatement({
@@ -265,6 +277,10 @@ module.exports = class RuntimeTemplate {
 
 		if (exportName) {
 			const used = module.isUsed(exportName);
+			if (!used) {
+				const comment = Template.toNormalComment(`unused export ${exportName}`);
+				return `${comment} undefined`;
+			}
 			const comment =
 				used !== exportName ? Template.toNormalComment(exportName) + " " : "";
 			const access = `${importVar}[${comment}${JSON.stringify(used)}]`;
diff --git a/lib/SingleEntryPlugin.js b/lib/SingleEntryPlugin.js
index 755a6b59725..4a1703b1f85 100644
--- a/lib/SingleEntryPlugin.js
+++ b/lib/SingleEntryPlugin.js
@@ -5,13 +5,27 @@
 "use strict";
 const SingleEntryDependency = require("./dependencies/SingleEntryDependency");
 
+/** @typedef {import("./Compiler")} Compiler */
+
 class SingleEntryPlugin {
+	/**
+	 * An entry plugin which will handle
+	 * creation of the SingleEntryDependency
+	 *
+	 * @param {string} context context path
+	 * @param {string} entry entry path
+	 * @param {string} name entry key name
+	 */
 	constructor(context, entry, name) {
 		this.context = context;
 		this.entry = entry;
 		this.name = name;
 	}
 
+	/**
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
 			"SingleEntryPlugin",
@@ -34,9 +48,14 @@ class SingleEntryPlugin {
 		);
 	}
 
+	/**
+	 * @param {string} entry entry request
+	 * @param {string} name entry name
+	 * @returns {SingleEntryDependency} the dependency
+	 */
 	static createDependency(entry, name) {
 		const dep = new SingleEntryDependency(entry);
-		dep.loc = name;
+		dep.loc = { name };
 		return dep;
 	}
 }
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
index 111d7a877ff..3c56d52108d 100644
--- a/lib/SourceMapDevToolPlugin.js
+++ b/lib/SourceMapDevToolPlugin.js
@@ -13,6 +13,8 @@ const createHash = require("./util/createHash");
 const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/SourceMapDevToolPlugin.json");
 
+/** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
+
 const basename = name => {
 	if (!name.includes("/")) return name;
 	return name.substr(name.lastIndexOf("/") + 1);
@@ -52,6 +54,9 @@ const getTaskForFile = (file, chunk, options, compilation) => {
 };
 
 class SourceMapDevToolPlugin {
+	/**
+	 * @param {SourceMapDevToolPluginOptions=} options options object
+	 */
 	constructor(options) {
 		if (arguments.length > 1) {
 			throw new Error(
@@ -59,10 +64,12 @@ class SourceMapDevToolPlugin {
 			);
 		}
 
-		validateOptions(schema, options || {}, "SourceMap DevTool Plugin");
-
 		if (!options) options = {};
+
+		validateOptions(schema, options, "SourceMap DevTool Plugin");
+
 		this.sourceMapFilename = options.filename;
+		/** @type {string | false} */
 		this.sourceMappingURLComment =
 			options.append === false
 				? false
@@ -84,7 +91,7 @@ class SourceMapDevToolPlugin {
 		const fallbackModuleFilenameTemplate = this.fallbackModuleFilenameTemplate;
 		const requestShortener = compiler.requestShortener;
 		const options = this.options;
-		options.test = options.test || /\.(js|css)($|\?)/i;
+		options.test = options.test || /\.(m?js|css)($|\?)/i;
 
 		const matchObject = ModuleFilenameHelpers.matchObject.bind(
 			undefined,
@@ -227,6 +234,7 @@ class SourceMapDevToolPlugin {
 						sourceMap.sourceRoot = options.sourceRoot || "";
 						sourceMap.file = file;
 						assetsCache.set(asset, { file, assets });
+						/** @type {string | false} */
 						let currentSourceMappingURLComment = sourceMappingURLComment;
 						if (
 							currentSourceMappingURLComment !== false &&
@@ -276,6 +284,11 @@ class SourceMapDevToolPlugin {
 							] = new RawSource(sourceMapString);
 							chunk.files.push(sourceMapFile);
 						} else {
+							if (currentSourceMappingURLComment === false) {
+								throw new Error(
+									"SourceMapDevToolPlugin: append can't be false when no filename is provided"
+								);
+							}
 							assets[file] = compilation.assets[file] = new ConcatSource(
 								new RawSource(source),
 								currentSourceMappingURLComment
diff --git a/lib/Stats.js b/lib/Stats.js
index 5179c8108a0..fd7902bee79 100644
--- a/lib/Stats.js
+++ b/lib/Stats.js
@@ -8,11 +8,18 @@ const RequestShortener = require("./RequestShortener");
 const SizeFormatHelpers = require("./SizeFormatHelpers");
 const formatLocation = require("./formatLocation");
 const identifierUtils = require("./util/identifier");
+const compareLocations = require("./compareLocations");
 
 const optionsOrFallback = (...args) => {
 	let optionValues = [];
 	optionValues.push(...args);
-	return optionValues.find(optionValue => typeof optionValue !== "undefined");
+	return optionValues.find(optionValue => optionValue !== undefined);
+};
+
+const compareId = (a, b) => {
+	if (a < b) return -1;
+	if (a > b) return 1;
+	return 0;
 };
 
 class Stats {
@@ -98,20 +105,17 @@ class Stats {
 		}
 
 		const optionOrLocalFallback = (v, def) =>
-			typeof v !== "undefined"
-				? v
-				: typeof options.all !== "undefined"
-					? options.all
-					: def;
+			v !== undefined ? v : options.all !== undefined ? options.all : def;
 
 		const testAgainstGivenOption = item => {
 			if (typeof item === "string") {
 				const regExp = new RegExp(
 					`[\\\\/]${item.replace(
+						// eslint-disable-next-line no-useless-escape
 						/[-[\]{}()*+?.\\^$|]/g,
 						"\\$&"
 					)}([\\\\/]|$|!|\\?)`
-				); // eslint-disable-line no-useless-escape
+				);
 				return ident => regExp.test(ident);
 			}
 			if (item && typeof item === "object" && typeof item.test === "function") {
@@ -516,6 +520,23 @@ class Stats {
 			}
 			if (showReasons) {
 				obj.reasons = module.reasons
+					.sort((a, b) => {
+						if (a.module && !b.module) return -1;
+						if (!a.module && b.module) return 1;
+						if (a.module && b.module) {
+							const cmp = compareId(a.module.id, b.module.id);
+							if (cmp) return cmp;
+						}
+						if (a.dependency && !b.dependency) return -1;
+						if (!a.dependency && b.dependency) return 1;
+						if (a.dependency && b.dependency) {
+							const cmp = compareLocations(a.dependency.loc, b.dependency.loc);
+							if (cmp) return cmp;
+							if (a.dependency.type < b.dependency.type) return -1;
+							if (a.dependency.type > b.dependency.type) return 1;
+						}
+						return 0;
+					})
 					.map(reason => {
 						const obj = {
 							moduleId: reason.module ? reason.module.id : null,
@@ -541,8 +562,7 @@ class Stats {
 							}
 						}
 						return obj;
-					})
-					.sort((a, b) => a.moduleId - b.moduleId);
+					});
 			}
 			if (showUsedExports) {
 				if (module.used === true) {
@@ -613,9 +633,9 @@ class Stats {
 					names: chunk.name ? [chunk.name] : [],
 					files: chunk.files.slice(),
 					hash: chunk.renderedHash,
-					siblings: Array.from(siblings).sort(),
-					parents: Array.from(parents).sort(),
-					children: Array.from(children).sort(),
+					siblings: Array.from(siblings).sort(compareId),
+					parents: Array.from(parents).sort(compareId),
+					children: Array.from(children).sort(compareId),
 					childrenByOrder: childIdByOrder
 				};
 				if (showChunkModules) {
diff --git a/lib/Template.js b/lib/Template.js
index 7e76092e053..adb16836499 100644
--- a/lib/Template.js
+++ b/lib/Template.js
@@ -22,13 +22,15 @@ const COMMENT_END_REGEX = /\*\//g;
 const PATH_NAME_NORMALIZE_REPLACE_REGEX = /[^a-zA-Z0-9_!§$()=\-^°]+/g;
 const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
+/** @typedef {import("webpack-sources").Source} Source */
+
 /**
  * @typedef {Object} HasId
- * @property {number} id
- * */
+ * @property {number | string} id
+ */
 
 /**
- * @typedef {(m: Module, idx: number) => boolean} ModuleFilterPredicate
+ * @typedef {function(Module, number): boolean} ModuleFilterPredicate
  */
 
 /**
@@ -37,21 +39,13 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  * @returns {-1|0|1} the sort value
  */
 const stringifyIdSortPredicate = (a, b) => {
-	var aId = a.id + "";
-	var bId = b.id + "";
+	const aId = a.id + "";
+	const bId = b.id + "";
 	if (aId < bId) return -1;
 	if (aId > bId) return 1;
 	return 0;
 };
 
-/**
- * @param {Module} module the module to compare against
- * @returns {boolean} return true if module.id is equal to type "number"
- */
-const moduleIdIsNumber = module => {
-	return typeof module.id === "number";
-};
-
 class Template {
 	/**
 	 *
@@ -65,6 +59,7 @@ class Template {
 			.replace(INDENT_MULTILINE_REGEX, "")
 			.replace(LINE_SEPARATOR_REGEX, "\n");
 	}
+
 	/**
 	 * @param {string} str the string converted to identifier
 	 * @returns {string} created identifier
@@ -134,31 +129,28 @@ class Template {
 
 	/**
 	 *
-	 * @param {string | string[]} str string to convert to identity
+	 * @param {string | string[]} s string to convert to identity
 	 * @returns {string} converted identity
 	 */
-	static indent(str) {
-		if (Array.isArray(str)) {
-			return str.map(Template.indent).join("\n");
+	static indent(s) {
+		if (Array.isArray(s)) {
+			return s.map(Template.indent).join("\n");
 		} else {
-			str = str.trimRight();
+			const str = s.trimRight();
 			if (!str) return "";
-			var ind = str[0] === "\n" ? "" : "\t";
+			const ind = str[0] === "\n" ? "" : "\t";
 			return ind + str.replace(/\n([^\n])/g, "\n\t$1");
 		}
 	}
 
 	/**
 	 *
-	 * @param {string|string[]} str string to create prefix for
+	 * @param {string|string[]} s string to create prefix for
 	 * @param {string} prefix prefix to compose
 	 * @returns {string} returns new prefix string
 	 */
-	static prefix(str, prefix) {
-		if (Array.isArray(str)) {
-			str = str.join("\n");
-		}
-		str = str.trim();
+	static prefix(s, prefix) {
+		const str = Template.asString(s).trim();
 		if (!str) return "";
 		const ind = str[0] === "\n" ? "" : prefix;
 		return ind + str.replace(/\n([^\n])/g, "\n" + prefix + "$1");
@@ -177,18 +169,20 @@ class Template {
 	}
 
 	/**
-	 *
-	 * @param {Module[]} modules a collection of modules to get array bounds for
+	 * @typedef {Object} WithId
+	 * @property {string|number} id
+	 */
+
+	/**
+	 * @param {WithId[]} modules a collection of modules to get array bounds for
 	 * @returns {[number, number] | false} returns the upper and lower array bounds
 	 * or false if not every module has a number based id
 	 */
 	static getModulesArrayBounds(modules) {
-		// Typeguards don't work for .every() with predicate functions
-		// https://github.com/Microsoft/TypeScript/issues/23799
-		if (!modules.every(moduleIdIsNumber)) return false;
-		var maxId = -Infinity;
-		var minId = Infinity;
+		let maxId = -Infinity;
+		let minId = Infinity;
 		for (const module of modules) {
+			if (typeof module.id !== "number") return false;
 			if (maxId < module.id) maxId = /** @type {number} */ (module.id);
 			if (minId > module.id) minId = /** @type {number} */ (module.id);
 		}
@@ -196,15 +190,11 @@ class Template {
 			// add minId x ',' instead of 'Array(minId).concat(…)'
 			minId = 0;
 		}
-		var objectOverhead = modules
-			.map(module => {
-				var idLength = (module.id + "").length;
-				return idLength + 2;
-			})
-			.reduce((a, b) => {
-				return a + b;
-			}, -1);
-		var arrayOverhead = minId === 0 ? maxId : 16 + ("" + minId).length + maxId;
+		const objectOverhead = modules
+			.map(module => (module.id + "").length + 2)
+			.reduce((a, b) => a + b, -1);
+		const arrayOverhead =
+			minId === 0 ? maxId : 16 + ("" + minId).length + maxId;
 		return arrayOverhead < objectOverhead ? [minId, maxId] : false;
 	}
 
@@ -221,13 +211,13 @@ class Template {
 		filterFn,
 		moduleTemplate,
 		dependencyTemplates,
-		prefix
+		prefix = ""
 	) {
-		if (!prefix) prefix = "";
-		var source = new ConcatSource();
+		const source = new ConcatSource();
 		const modules = chunk.getModules().filter(filterFn);
+		let removedModules;
 		if (chunk instanceof HotUpdateChunk) {
-			var removedModules = chunk.removedModules;
+			removedModules = chunk.removedModules;
 		}
 		if (
 			modules.length === 0 &&
@@ -236,7 +226,8 @@ class Template {
 			source.add("[]");
 			return source;
 		}
-		var allModules = modules.map(module => {
+		/** @type {{id: string|number, source: Source|string}[]} */
+		const allModules = modules.map(module => {
 			return {
 				id: module.id,
 				source: moduleTemplate.render(module, dependencyTemplates, {
@@ -247,43 +238,51 @@ class Template {
 		if (removedModules && removedModules.length > 0) {
 			for (const id of removedModules) {
 				allModules.push({
-					id: id,
+					id,
 					source: "false"
 				});
 			}
 		}
-		var bounds = Template.getModulesArrayBounds(allModules);
-
+		const bounds = Template.getModulesArrayBounds(allModules);
 		if (bounds) {
 			// Render a spare array
-			var minId = bounds[0];
-			var maxId = bounds[1];
-			if (minId !== 0) source.add("Array(" + minId + ").concat(");
+			const minId = bounds[0];
+			const maxId = bounds[1];
+			if (minId !== 0) {
+				source.add(`Array(${minId}).concat(`);
+			}
 			source.add("[\n");
+			/** @type {Map<string|number, {id: string|number, source: Source|string}>} */
 			const modules = new Map();
 			for (const module of allModules) {
 				modules.set(module.id, module);
 			}
-			for (var idx = minId; idx <= maxId; idx++) {
-				var module = modules.get(idx);
-				if (idx !== minId) source.add(",\n");
-				source.add("/* " + idx + " */");
+			for (let idx = minId; idx <= maxId; idx++) {
+				const module = modules.get(idx);
+				if (idx !== minId) {
+					source.add(",\n");
+				}
+				source.add(`/* ${idx} */`);
 				if (module) {
 					source.add("\n");
 					source.add(module.source);
 				}
 			}
 			source.add("\n" + prefix + "]");
-			if (minId !== 0) source.add(")");
+			if (minId !== 0) {
+				source.add(")");
+			}
 		} else {
 			// Render an object
 			source.add("{\n");
 			allModules.sort(stringifyIdSortPredicate).forEach((module, idx) => {
-				if (idx !== 0) source.add(",\n");
+				if (idx !== 0) {
+					source.add(",\n");
+				}
 				source.add(`\n/***/ ${JSON.stringify(module.id)}:\n`);
 				source.add(module.source);
 			});
-			source.add("\n\n" + prefix + "}");
+			source.add(`\n\n${prefix}}`);
 		}
 		return source;
 	}
diff --git a/lib/UmdMainTemplatePlugin.js b/lib/UmdMainTemplatePlugin.js
index 795ae278272..ba5d24a2bdd 100644
--- a/lib/UmdMainTemplatePlugin.js
+++ b/lib/UmdMainTemplatePlugin.js
@@ -7,6 +7,7 @@
 const { ConcatSource, OriginalSource } = require("webpack-sources");
 const Template = require("./Template");
 
+/** @typedef {import("../declarations/WebpackOptions").LibraryCustomUmdObject} LibraryCustomUmdObject */
 /** @typedef {import("./Compilation")} Compilation */
 
 /**
@@ -31,14 +32,14 @@ const accessorAccess = (base, accessor, joinWith = ", ") => {
 				? base + accessorToObjectAccess(accessors.slice(0, idx + 1))
 				: accessors[0] + accessorToObjectAccess(accessors.slice(1, idx + 1));
 			if (idx === accessors.length - 1) return a;
-			if (idx === 0 && typeof base === "undefined")
+			if (idx === 0 && base === undefined)
 				return `${a} = typeof ${a} === "object" ? ${a} : {}`;
 			return `${a} = ${a} || {}`;
 		})
 		.join(joinWith);
 };
 
-/** @typedef {string | string[] | Record<string, string | string[]>} UmdMainTemplatePluginName */
+/** @typedef {string | string[] | LibraryCustomUmdObject} UmdMainTemplatePluginName */
 
 /**
  * @typedef {Object} AuxiliaryCommentObject
@@ -107,14 +108,14 @@ class UmdMainTemplatePlugin {
 				requiredExternals = externals;
 			}
 
-			function replaceKeys(str) {
+			const replaceKeys = str => {
 				return mainTemplate.getAssetPath(str, {
 					hash,
 					chunk
 				});
-			}
+			};
 
-			function externalsDepsArray(modules) {
+			const externalsDepsArray = modules => {
 				return `[${replaceKeys(
 					modules
 						.map(m =>
@@ -124,9 +125,9 @@ class UmdMainTemplatePlugin {
 						)
 						.join(", ")
 				)}]`;
-			}
+			};
 
-			function externalsRootArray(modules) {
+			const externalsRootArray = modules => {
 				return replaceKeys(
 					modules
 						.map(m => {
@@ -136,9 +137,9 @@ class UmdMainTemplatePlugin {
 						})
 						.join(", ")
 				);
-			}
+			};
 
-			function externalsRequireArray(type) {
+			const externalsRequireArray = type => {
 				return replaceKeys(
 					externals
 						.map(m => {
@@ -147,7 +148,7 @@ class UmdMainTemplatePlugin {
 							if (typeof request === "object") {
 								request = request[type];
 							}
-							if (typeof request === "undefined") {
+							if (request === undefined) {
 								throw new Error(
 									"Missing external configuration for type:" + type
 								);
@@ -166,20 +167,20 @@ class UmdMainTemplatePlugin {
 						})
 						.join(", ")
 				);
-			}
+			};
 
-			function externalsArguments(modules) {
+			const externalsArguments = modules => {
 				return modules
 					.map(
 						m =>
 							`__WEBPACK_EXTERNAL_MODULE_${Template.toIdentifier(`${m.id}`)}__`
 					)
 					.join(", ");
-			}
+			};
 
-			function libraryName(library) {
+			const libraryName = library => {
 				return JSON.stringify(replaceKeys([].concat(library).pop()));
-			}
+			};
 
 			let amdFactory;
 			if (optionalExternals.length > 0) {
diff --git a/lib/UnsupportedFeatureWarning.js b/lib/UnsupportedFeatureWarning.js
index 284429ea94d..72eef834e89 100644
--- a/lib/UnsupportedFeatureWarning.js
+++ b/lib/UnsupportedFeatureWarning.js
@@ -6,7 +6,15 @@
 
 const WebpackError = require("./WebpackError");
 
+/** @typedef {import("./Module")} Module */
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
+
 class UnsupportedFeatureWarning extends WebpackError {
+	/**
+	 * @param {Module} module module relevant to warning
+	 * @param {string} message description of warning
+	 * @param {DependencyLocation} loc location start and end positions of the module
+	 */
 	constructor(module, message, loc) {
 		super(message);
 
diff --git a/lib/UseStrictPlugin.js b/lib/UseStrictPlugin.js
index 2e0743da848..425be2e31c7 100644
--- a/lib/UseStrictPlugin.js
+++ b/lib/UseStrictPlugin.js
@@ -6,7 +6,13 @@
 
 const ConstDependency = require("./dependencies/ConstDependency");
 
+/** @typedef {import("./Compiler")} Compiler */
+
 class UseStrictPlugin {
+	/**
+	 * @param {Compiler} compiler Webpack Compiler
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
 			"UseStrictPlugin",
diff --git a/lib/WatchIgnorePlugin.js b/lib/WatchIgnorePlugin.js
index 7a00e998f05..ddff0da38d7 100644
--- a/lib/WatchIgnorePlugin.js
+++ b/lib/WatchIgnorePlugin.js
@@ -7,23 +7,7 @@
 const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/WatchIgnorePlugin.json");
 
-class WatchIgnorePlugin {
-	constructor(paths) {
-		validateOptions(schema, paths, "Watch Ignore Plugin");
-		this.paths = paths;
-	}
-
-	apply(compiler) {
-		compiler.hooks.afterEnvironment.tap("WatchIgnorePlugin", () => {
-			compiler.watchFileSystem = new IgnoringWatchFileSystem(
-				compiler.watchFileSystem,
-				this.paths
-			);
-		});
-	}
-}
-
-module.exports = WatchIgnorePlugin;
+/** @typedef {import("../declarations/plugins/WatchIgnorePlugin").WatchIgnorePluginOptions} WatchIgnorePluginOptions */
 
 class IgnoringWatchFileSystem {
 	constructor(wfs, paths) {
@@ -98,3 +82,24 @@ class IgnoringWatchFileSystem {
 		};
 	}
 }
+
+class WatchIgnorePlugin {
+	/**
+	 * @param {WatchIgnorePluginOptions} paths list of paths
+	 */
+	constructor(paths) {
+		validateOptions(schema, paths, "Watch Ignore Plugin");
+		this.paths = paths;
+	}
+
+	apply(compiler) {
+		compiler.hooks.afterEnvironment.tap("WatchIgnorePlugin", () => {
+			compiler.watchFileSystem = new IgnoringWatchFileSystem(
+				compiler.watchFileSystem,
+				this.paths
+			);
+		});
+	}
+}
+
+module.exports = WatchIgnorePlugin;
diff --git a/lib/WebpackError.js b/lib/WebpackError.js
index 8451fcb7d74..891809a67e9 100644
--- a/lib/WebpackError.js
+++ b/lib/WebpackError.js
@@ -13,6 +13,10 @@ class WebpackError extends Error {
 		super(message);
 
 		this.details = undefined;
+		this.missing = undefined;
+		this.origin = undefined;
+		this.dependencies = undefined;
+		this.module = undefined;
 
 		Error.captureStackTrace(this, this.constructor);
 	}
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
index d583787ac13..6593d492a8f 100644
--- a/lib/WebpackOptionsApply.js
+++ b/lib/WebpackOptionsApply.js
@@ -46,7 +46,9 @@ const RemoveParentModulesPlugin = require("./optimize/RemoveParentModulesPlugin"
 const RemoveEmptyChunksPlugin = require("./optimize/RemoveEmptyChunksPlugin");
 const MergeDuplicateChunksPlugin = require("./optimize/MergeDuplicateChunksPlugin");
 const FlagIncludedChunksPlugin = require("./optimize/FlagIncludedChunksPlugin");
-const OccurrenceOrderPlugin = require("./optimize/OccurrenceOrderPlugin");
+const OccurrenceChunkOrderPlugin = require("./optimize/OccurrenceChunkOrderPlugin");
+const OccurrenceModuleOrderPlugin = require("./optimize/OccurrenceModuleOrderPlugin");
+const NaturalChunkOrderPlugin = require("./optimize/NaturalChunkOrderPlugin");
 const SideEffectsFlagPlugin = require("./optimize/SideEffectsFlagPlugin");
 const FlagDependencyUsagePlugin = require("./FlagDependencyUsagePlugin");
 const FlagDependencyExportsPlugin = require("./FlagDependencyExportsPlugin");
@@ -56,15 +58,24 @@ const RuntimeChunkPlugin = require("./optimize/RuntimeChunkPlugin");
 const NoEmitOnErrorsPlugin = require("./NoEmitOnErrorsPlugin");
 const NamedModulesPlugin = require("./NamedModulesPlugin");
 const NamedChunksPlugin = require("./NamedChunksPlugin");
+const HashedModuleIdsPlugin = require("./HashedModuleIdsPlugin");
 const DefinePlugin = require("./DefinePlugin");
 const SizeLimitsPlugin = require("./performance/SizeLimitsPlugin");
 const WasmFinalizeExportsPlugin = require("./wasm/WasmFinalizeExportsPlugin");
 
+/** @typedef {import("../declarations/WebpackOptions").WebpackOptions} WebpackOptions */
+/** @typedef {import("./Compiler")} Compiler */
+
 class WebpackOptionsApply extends OptionsApply {
 	constructor() {
 		super();
 	}
 
+	/**
+	 * @param {WebpackOptions} options options object
+	 * @param {Compiler} compiler compiler object
+	 * @returns {WebpackOptions} options object
+	 */
 	process(options, compiler) {
 		let ExternalsPlugin;
 		compiler.outputPath = options.output.path;
@@ -72,6 +83,8 @@ class WebpackOptionsApply extends OptionsApply {
 		compiler.recordsOutputPath =
 			options.recordsOutputPath || options.recordsPath;
 		compiler.name = options.name;
+		// TODO webpack 5 refactor this to MultiCompiler.setDependencies() with a WeakMap
+		// @ts-ignore TODO
 		compiler.dependencies = options.dependencies;
 		if (typeof options.target === "string") {
 			let JsonpTemplatePlugin;
@@ -170,9 +183,13 @@ class WebpackOptionsApply extends OptionsApply {
 					break;
 				case "electron-renderer":
 					JsonpTemplatePlugin = require("./web/JsonpTemplatePlugin");
+					FetchCompileWasmTemplatePlugin = require("./web/FetchCompileWasmTemplatePlugin");
 					NodeTargetPlugin = require("./node/NodeTargetPlugin");
 					ExternalsPlugin = require("./ExternalsPlugin");
 					new JsonpTemplatePlugin().apply(compiler);
+					new FetchCompileWasmTemplatePlugin({
+						mangleImports: options.optimization.mangleWasmImports
+					}).apply(compiler);
 					new FunctionModulePlugin().apply(compiler);
 					new NodeTargetPlugin().apply(compiler);
 					new ExternalsPlugin("commonjs", [
@@ -194,7 +211,9 @@ class WebpackOptionsApply extends OptionsApply {
 				default:
 					throw new Error("Unsupported target '" + options.target + "'.");
 			}
-		} else if (options.target !== false) {
+		}
+		// @ts-ignore This is always true, which is good this way
+		else if (options.target !== false) {
 			options.target(compiler);
 		} else {
 			throw new Error("Unsupported target '" + options.target + "'.");
@@ -324,9 +343,6 @@ class WebpackOptionsApply extends OptionsApply {
 		if (options.optimization.flagIncludedChunks) {
 			new FlagIncludedChunksPlugin().apply(compiler);
 		}
-		if (options.optimization.occurrenceOrder) {
-			new OccurrenceOrderPlugin(true).apply(compiler);
-		}
 		if (options.optimization.sideEffects) {
 			new SideEffectsFlagPlugin().apply(compiler);
 		}
@@ -351,11 +367,93 @@ class WebpackOptionsApply extends OptionsApply {
 		if (options.optimization.checkWasmTypes) {
 			new WasmFinalizeExportsPlugin().apply(compiler);
 		}
-		if (options.optimization.namedModules) {
-			new NamedModulesPlugin().apply(compiler);
+		let moduleIds = options.optimization.moduleIds;
+		if (moduleIds === undefined) {
+			// TODO webpack 5 remove all these options
+			if (options.optimization.occurrenceOrder) {
+				moduleIds = "size";
+			}
+			if (options.optimization.namedModules) {
+				moduleIds = "named";
+			}
+			if (options.optimization.hashedModuleIds) {
+				moduleIds = "hashed";
+			}
+			if (moduleIds === undefined) {
+				moduleIds = "natural";
+			}
 		}
-		if (options.optimization.namedChunks) {
-			new NamedChunksPlugin().apply(compiler);
+		if (moduleIds) {
+			switch (moduleIds) {
+				case "natural":
+					// TODO webpack 5: see hint in Compilation.sortModules
+					break;
+				case "named":
+					new NamedModulesPlugin().apply(compiler);
+					break;
+				case "hashed":
+					new HashedModuleIdsPlugin().apply(compiler);
+					break;
+				case "size":
+					new OccurrenceModuleOrderPlugin({
+						prioritiseInitial: true
+					}).apply(compiler);
+					break;
+				case "total-size":
+					new OccurrenceModuleOrderPlugin({
+						prioritiseInitial: false
+					}).apply(compiler);
+					break;
+				default:
+					throw new Error(
+						`webpack bug: moduleIds: ${moduleIds} is not implemented`
+					);
+			}
+		}
+		let chunkIds = options.optimization.chunkIds;
+		if (chunkIds === undefined) {
+			// TODO webpack 5 remove all these options
+			if (options.optimization.occurrenceOrder) {
+				// This looks weird but it's for backward-compat
+				// This bug already existed before adding this feature
+				chunkIds = "total-size";
+			}
+			if (options.optimization.namedChunks) {
+				chunkIds = "named";
+			}
+			if (chunkIds === undefined) {
+				chunkIds = "natural";
+			}
+		}
+		if (chunkIds) {
+			switch (chunkIds) {
+				case "natural":
+					new NaturalChunkOrderPlugin().apply(compiler);
+					break;
+				case "named":
+					// TODO webapck 5: for backward-compat this need to have OccurrenceChunkOrderPlugin too
+					// The NamedChunksPlugin doesn't give every chunk a name
+					// This should be fixed, and the OccurrenceChunkOrderPlugin should be removed here.
+					new OccurrenceChunkOrderPlugin({
+						prioritiseInitial: false
+					}).apply(compiler);
+					new NamedChunksPlugin().apply(compiler);
+					break;
+				case "size":
+					new OccurrenceChunkOrderPlugin({
+						prioritiseInitial: true
+					}).apply(compiler);
+					break;
+				case "total-size":
+					new OccurrenceChunkOrderPlugin({
+						prioritiseInitial: false
+					}).apply(compiler);
+					break;
+				default:
+					throw new Error(
+						`webpack bug: chunkIds: ${chunkIds} is not implemented`
+					);
+			}
 		}
 		if (options.optimization.nodeEnv) {
 			new DefinePlugin({
@@ -364,7 +462,11 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 		if (options.optimization.minimize) {
 			for (const minimizer of options.optimization.minimizer) {
-				minimizer.apply(compiler);
+				if (typeof minimizer === "function") {
+					minimizer.apply(compiler);
+				} else {
+					minimizer.apply(compiler);
+				}
 			}
 		}
 
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
index e15d58d7905..def82855a43 100644
--- a/lib/WebpackOptionsDefaulter.js
+++ b/lib/WebpackOptionsDefaulter.js
@@ -17,6 +17,16 @@ const isWebLikeTarget = options => {
 	return options.target === "web" || options.target === "webworker";
 };
 
+const getDevtoolNamespace = library => {
+	// if options.output.library is a string
+	if (Array.isArray(library)) {
+		return library.join(".");
+	} else if (typeof library === "object") {
+		return getDevtoolNamespace(library.root);
+	}
+	return library || "";
+};
+
 class WebpackOptionsDefaulter extends OptionsDefaulter {
 	constructor() {
 		super();
@@ -136,12 +146,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			}
 		});
 		this.set("output.devtoolNamespace", "make", options => {
-			if (Array.isArray(options.output.library)) {
-				return options.output.library.join(".");
-			} else if (typeof options.output.library === "object") {
-				return options.output.library.root || "";
-			}
-			return options.output.library || "";
+			return getDevtoolNamespace(options.output.library);
 		});
 		this.set("output.libraryTarget", "var");
 		this.set("output.path", path.join(process.cwd(), "dist"));
@@ -201,6 +206,9 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("optimization.flagIncludedChunks", "make", options =>
 			isProductionLikeMode(options)
 		);
+		// TODO webpack 5 add `moduleIds: "named"` default for development
+		// TODO webpack 5 add `moduleIds: "size"` default for production
+		// TODO webpack 5 remove optimization.occurrenceOrder
 		this.set("optimization.occurrenceOrder", "make", options =>
 			isProductionLikeMode(options)
 		);
@@ -215,6 +223,9 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			isProductionLikeMode(options)
 		);
 		this.set("optimization.splitChunks", {});
+		this.set("optimization.splitChunks.hidePathInfo", "make", options => {
+			return isProductionLikeMode(options);
+		});
 		this.set("optimization.splitChunks.chunks", "async");
 		this.set("optimization.splitChunks.minSize", "make", options => {
 			return isProductionLikeMode(options) ? 30000 : 10000;
@@ -230,11 +241,13 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("optimization.splitChunks.name", true);
 		this.set("optimization.splitChunks.cacheGroups", {});
 		this.set("optimization.splitChunks.cacheGroups.default", {
+			automaticNamePrefix: "",
 			reuseExistingChunk: true,
 			minChunks: 2,
 			priority: -20
 		});
 		this.set("optimization.splitChunks.cacheGroups.vendors", {
+			automaticNamePrefix: "vendors",
 			test: /[\\/]node_modules[\\/]/,
 			priority: -10
 		});
@@ -258,11 +271,16 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			isProductionLikeMode(options)
 		);
 		this.set("optimization.mangleWasmImports", false);
+		// TODO webpack 5 remove optimization.namedModules
 		this.set(
 			"optimization.namedModules",
 			"make",
 			options => options.mode === "development"
 		);
+		this.set("optimization.hashedModuleIds", false);
+		// TODO webpack 5 add `chunkIds: "named"` default for development
+		// TODO webpack 5 add `chunkIds: "size"` default for production
+		// TODO webpack 5 remove optimization.namedChunks
 		this.set(
 			"optimization.namedChunks",
 			"make",
@@ -309,7 +327,11 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("resolve.extensions", [".wasm", ".mjs", ".js", ".json"]);
 		this.set("resolve.mainFiles", ["index"]);
 		this.set("resolve.aliasFields", "make", options => {
-			if (options.target === "web" || options.target === "webworker") {
+			if (
+				options.target === "web" ||
+				options.target === "webworker" ||
+				options.target === "electron-renderer"
+			) {
 				return ["browser"];
 			} else {
 				return [];
diff --git a/lib/WebpackOptionsValidationError.js b/lib/WebpackOptionsValidationError.js
index 3fdbd0df6ba..d66cb2ccca2 100644
--- a/lib/WebpackOptionsValidationError.js
+++ b/lib/WebpackOptionsValidationError.js
@@ -332,7 +332,6 @@ class WebpackOptionsValidationError extends WebpackError {
 			}
 			return baseMessage;
 		} else {
-			// eslint-disable-line no-fallthrough
 			return `${dataPath} ${err.message} (${JSON.stringify(
 				err,
 				null,
diff --git a/lib/compareLocations.js b/lib/compareLocations.js
index 7dce42bdb12..3840eb893ad 100644
--- a/lib/compareLocations.js
+++ b/lib/compareLocations.js
@@ -4,23 +4,13 @@
 */
 "use strict";
 
-/**
- * @typedef {Object} LineAndColumn
- * @property {number=} line
- * @property {number=} column
- */
-
-/**
- * @typedef {Object} NodeLocation
- * @property {LineAndColumn=} start
- * @property {LineAndColumn=} end
- * @property {number=} index
- */
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 
+// TODO webpack 5 remove string type from a and b
 /**
  * Compare two locations
- * @param {string|NodeLocation} a A location node
- * @param {string|NodeLocation} b A location node
+ * @param {string|DependencyLocation} a A location node
+ * @param {string|DependencyLocation} b A location node
  * @returns {-1|0|1} sorting comparator value
  */
 module.exports = (a, b) => {
@@ -38,7 +28,7 @@ module.exports = (a, b) => {
 		if (typeof b === "string") {
 			return -1;
 		} else if (typeof b === "object") {
-			if (a.start && b.start) {
+			if ("start" in a && "start" in b) {
 				const ap = a.start;
 				const bp = b.start;
 				if (ap.line < bp.line) return -1;
@@ -46,8 +36,14 @@ module.exports = (a, b) => {
 				if (ap.column < bp.column) return -1;
 				if (ap.column > bp.column) return 1;
 			}
-			if (a.index < b.index) return -1;
-			if (a.index > b.index) return 1;
+			if ("name" in a && "name" in b) {
+				if (a.name < b.name) return -1;
+				if (a.name > b.name) return 1;
+			}
+			if ("index" in a && "index" in b) {
+				if (a.index < b.index) return -1;
+				if (a.index > b.index) return 1;
+			}
 			return 0;
 		} else {
 			return 0;
diff --git a/lib/debug/ProfilingPlugin.js b/lib/debug/ProfilingPlugin.js
index 118d5007de3..1629baaa9b1 100644
--- a/lib/debug/ProfilingPlugin.js
+++ b/lib/debug/ProfilingPlugin.js
@@ -2,10 +2,14 @@ const fs = require("fs");
 const { Tracer } = require("chrome-trace-event");
 const validateOptions = require("schema-utils");
 const schema = require("../../schemas/plugins/debug/ProfilingPlugin.json");
+
+/** @typedef {import("../../declarations/plugins/debug/ProfilingPlugin").ProfilingPluginOptions} ProfilingPluginOptions */
+
 let inspector = undefined;
 
 try {
-	inspector = require("inspector"); // eslint-disable-line node/no-missing-require
+	// eslint-disable-next-line node/no-unsupported-features/node-builtins
+	inspector = require("inspector");
 } catch (e) {
 	console.log("Unable to CPU profile in < node 8.0");
 }
@@ -84,7 +88,7 @@ class Profiler {
  * @param {string} outputPath The location where to write the log.
  * @returns {Trace} The trace object
  */
-function createTrace(outputPath) {
+const createTrace = outputPath => {
 	const trace = new Tracer({
 		noStream: true
 	});
@@ -130,13 +134,23 @@ function createTrace(outputPath) {
 		trace,
 		counter,
 		profiler,
-		end: callback => fsStream.end(callback)
+		end: callback => {
+			// Wait until the write stream finishes.
+			fsStream.on("finish", () => {
+				callback();
+			});
+			// Tear down the readable trace stream.
+			trace.push(null);
+		}
 	};
-}
+};
 
 const pluginName = "ProfilingPlugin";
 
 class ProfilingPlugin {
+	/**
+	 * @param {ProfilingPluginOptions=} opts options object
+	 */
 	constructor(opts) {
 		validateOptions(schema, opts || {}, "Profiling plugin");
 		opts = opts || {};
@@ -347,7 +361,6 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 	switch (type) {
 		case "promise":
 			return (...args) => {
-				// eslint-disable-line
 				const id = ++tracer.counter;
 				tracer.trace.begin({
 					name,
@@ -366,7 +379,6 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 			};
 		case "async":
 			return (...args) => {
-				// eslint-disable-line
 				const id = ++tracer.counter;
 				tracer.trace.begin({
 					name,
@@ -385,7 +397,6 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 			};
 		case "sync":
 			return (...args) => {
-				// eslint-disable-line
 				const id = ++tracer.counter;
 				// Do not instrument ourself due to the CPU
 				// profile needing to be the last event in the trace.
diff --git a/lib/dependencies/AMDDefineDependencyParserPlugin.js b/lib/dependencies/AMDDefineDependencyParserPlugin.js
index c4cb5789a22..95e862d1282 100644
--- a/lib/dependencies/AMDDefineDependencyParserPlugin.js
+++ b/lib/dependencies/AMDDefineDependencyParserPlugin.js
@@ -23,17 +23,17 @@ const isBoundFunctionExpression = expr => {
 	return true;
 };
 
-function isUnboundFunctionExpression(expr) {
+const isUnboundFunctionExpression = expr => {
 	if (expr.type === "FunctionExpression") return true;
 	if (expr.type === "ArrowFunctionExpression") return true;
 	return false;
-}
+};
 
-function isCallable(expr) {
+const isCallable = expr => {
 	if (isUnboundFunctionExpression(expr)) return true;
 	if (isBoundFunctionExpression(expr)) return true;
 	return false;
-}
+};
 
 class AMDDefineDependencyParserPlugin {
 	constructor(options) {
@@ -80,7 +80,6 @@ class AMDDefineDependencyParserPlugin {
 						request
 					))
 				) {
-					// eslint-disable-line no-cond-assign
 					dep = new LocalModuleDependency(localModule, undefined, false);
 					dep.loc = expr.loc;
 					parser.state.current.addDependency(dep);
@@ -121,7 +120,6 @@ class AMDDefineDependencyParserPlugin {
 					namedModule
 				))
 			) {
-				// eslint-disable-line no-cond-assign
 				dep = new LocalModuleDependency(localModule, param.range, false);
 			} else {
 				dep = this.newRequireItemDependency(param.string, param.range);
diff --git a/lib/dependencies/AMDPlugin.js b/lib/dependencies/AMDPlugin.js
index 06b8cd73075..d113491c969 100644
--- a/lib/dependencies/AMDPlugin.js
+++ b/lib/dependencies/AMDPlugin.js
@@ -98,8 +98,7 @@ class AMDPlugin {
 				);
 
 				const handler = (parser, parserOptions) => {
-					if (typeof parserOptions.amd !== "undefined" && !parserOptions.amd)
-						return;
+					if (parserOptions.amd !== undefined && !parserOptions.amd) return;
 
 					const setExpressionToModule = (outerExpr, module) => {
 						parser.hooks.expression.for(outerExpr).tap("AMDPlugin", expr => {
diff --git a/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js b/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js
index 1173f982e89..e6826722e75 100644
--- a/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js
+++ b/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js
@@ -79,7 +79,6 @@ class AMDRequireDependenciesBlockParserPlugin {
 						request
 					))
 				) {
-					// eslint-disable-line no-cond-assign
 					dep = new LocalModuleDependency(localModule, undefined, false);
 					dep.loc = expr.loc;
 					parser.state.current.addDependency(dep);
@@ -127,7 +126,6 @@ class AMDRequireDependenciesBlockParserPlugin {
 					param.string
 				))
 			) {
-				// eslint-disable-line no-cond-assign
 				dep = new LocalModuleDependency(localModule, param.range, false);
 			} else {
 				dep = this.newRequireItemDependency(param.string, param.range);
diff --git a/lib/dependencies/CommonJsPlugin.js b/lib/dependencies/CommonJsPlugin.js
index fc6cae7ec82..6d441a872d9 100644
--- a/lib/dependencies/CommonJsPlugin.js
+++ b/lib/dependencies/CommonJsPlugin.js
@@ -83,10 +83,7 @@ class CommonJsPlugin {
 				);
 
 				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.commonjs !== "undefined" &&
-						!parserOptions.commonjs
-					)
+					if (parserOptions.commonjs !== undefined && !parserOptions.commonjs)
 						return;
 
 					const requireExpressions = [
diff --git a/lib/dependencies/CommonJsRequireDependencyParserPlugin.js b/lib/dependencies/CommonJsRequireDependencyParserPlugin.js
index 29dc81749b2..875657348a7 100644
--- a/lib/dependencies/CommonJsRequireDependencyParserPlugin.js
+++ b/lib/dependencies/CommonJsRequireDependencyParserPlugin.js
@@ -125,6 +125,12 @@ class CommonJsRequireDependencyParserPlugin {
 		parser.hooks.new
 			.for("require")
 			.tap("CommonJsRequireDependencyParserPlugin", createHandler(true));
+		parser.hooks.call
+			.for("module.require")
+			.tap("CommonJsRequireDependencyParserPlugin", createHandler(false));
+		parser.hooks.new
+			.for("module.require")
+			.tap("CommonJsRequireDependencyParserPlugin", createHandler(true));
 	}
 }
 module.exports = CommonJsRequireDependencyParserPlugin;
diff --git a/lib/dependencies/ContextDependencyHelpers.js b/lib/dependencies/ContextDependencyHelpers.js
index d4cc72dbbfc..2dabc3345a5 100644
--- a/lib/dependencies/ContextDependencyHelpers.js
+++ b/lib/dependencies/ContextDependencyHelpers.js
@@ -15,6 +15,32 @@ const quotemeta = str => {
 	return str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
 };
 
+const splitContextFromPrefix = prefix => {
+	const idx = prefix.lastIndexOf("/");
+	let context = ".";
+	if (idx >= 0) {
+		context = prefix.substr(0, idx);
+		prefix = `.${prefix.substr(idx)}`;
+	}
+	return {
+		context,
+		prefix
+	};
+};
+
+const splitQueryFromPostfix = postfix => {
+	const idx = postfix.indexOf("?");
+	let query = "";
+	if (idx >= 0) {
+		query = postfix.substr(idx);
+		postfix = postfix.substr(0, idx);
+	}
+	return {
+		postfix,
+		query
+	};
+};
+
 ContextDependencyHelpers.create = (
 	Dep,
 	range,
@@ -23,38 +49,30 @@ ContextDependencyHelpers.create = (
 	options,
 	contextOptions
 ) => {
-	let dep;
-	let prefix;
-	let postfix;
-	let prefixRange;
-	let valueRange;
-	let idx;
-	let context;
-	let regExp;
 	if (param.isTemplateString()) {
-		prefix = param.quasis[0].string;
-		postfix =
+		let prefixRaw = param.quasis[0].string;
+		let postfixRaw =
 			param.quasis.length > 1
 				? param.quasis[param.quasis.length - 1].string
 				: "";
-		prefixRange = [param.quasis[0].range[0], param.quasis[0].range[1]];
-		valueRange = param.range;
-		idx = prefix.lastIndexOf("/");
-		context = ".";
-		if (idx >= 0) {
-			context = prefix.substr(0, idx);
-			prefix = `.${prefix.substr(idx)}`;
-		}
+		const prefixRange = [param.quasis[0].range[0], param.quasis[0].range[1]];
+		const postfixRange =
+			param.quasis.length > 1
+				? param.quasis[param.quasis.length - 1].range
+				: "";
+		const valueRange = param.range;
+		const { context, prefix } = splitContextFromPrefix(prefixRaw);
+		const { postfix, query } = splitQueryFromPostfix(postfixRaw);
 		// If there are more than two quasis, maybe the generated RegExp can be more precise?
-		regExp = new RegExp(
+		const regExp = new RegExp(
 			`^${quotemeta(prefix)}${options.wrappedContextRegExp.source}${quotemeta(
 				postfix
 			)}$`
 		);
-		dep = new Dep(
+		const dep = new Dep(
 			Object.assign(
 				{
-					request: context,
+					request: context + query,
 					recursive: options.wrappedContextRecursive,
 					regExp,
 					mode: "sync"
@@ -65,12 +83,20 @@ ContextDependencyHelpers.create = (
 			valueRange
 		);
 		dep.loc = expr.loc;
-		dep.replaces = [
-			{
+		const replaces = [];
+		if (prefixRange && prefix !== prefixRaw) {
+			replaces.push({
 				range: prefixRange,
 				value: prefix
-			}
-		];
+			});
+		}
+		if (postfixRange && postfix !== postfixRaw) {
+			replaces.push({
+				range: postfixRange,
+				value: postfix
+			});
+		}
+		dep.replaces = replaces;
 		dep.critical =
 			options.wrappedContextCritical &&
 			"a part of the request of a dependency is an expression";
@@ -80,30 +106,26 @@ ContextDependencyHelpers.create = (
 		((param.prefix && param.prefix.isString()) ||
 			(param.postfix && param.postfix.isString()))
 	) {
-		prefix = param.prefix && param.prefix.isString() ? param.prefix.string : "";
-		postfix =
+		let prefixRaw =
+			param.prefix && param.prefix.isString() ? param.prefix.string : "";
+		let postfixRaw =
 			param.postfix && param.postfix.isString() ? param.postfix.string : "";
-		prefixRange =
+		const prefixRange =
 			param.prefix && param.prefix.isString() ? param.prefix.range : null;
-		valueRange = [
-			prefixRange ? prefixRange[1] : param.range[0],
-			param.range[1]
-		];
-		idx = prefix.lastIndexOf("/");
-		context = ".";
-		if (idx >= 0) {
-			context = prefix.substr(0, idx);
-			prefix = `.${prefix.substr(idx)}`;
-		}
-		regExp = new RegExp(
+		const postfixRange =
+			param.postfix && param.postfix.isString() ? param.postfix.range : null;
+		const valueRange = param.range;
+		const { context, prefix } = splitContextFromPrefix(prefixRaw);
+		const { postfix, query } = splitQueryFromPostfix(postfixRaw);
+		const regExp = new RegExp(
 			`^${quotemeta(prefix)}${options.wrappedContextRegExp.source}${quotemeta(
 				postfix
 			)}$`
 		);
-		dep = new Dep(
+		const dep = new Dep(
 			Object.assign(
 				{
-					request: context,
+					request: context + query,
 					recursive: options.wrappedContextRecursive,
 					regExp,
 					mode: "sync"
@@ -114,13 +136,26 @@ ContextDependencyHelpers.create = (
 			valueRange
 		);
 		dep.loc = expr.loc;
-		dep.prepend = param.prefix && param.prefix.isString() ? prefix : null;
+		const replaces = [];
+		if (prefixRange && prefix !== prefixRaw) {
+			replaces.push({
+				range: prefixRange,
+				value: JSON.stringify(prefix)
+			});
+		}
+		if (postfixRange && postfix !== postfixRaw) {
+			replaces.push({
+				range: postfixRange,
+				value: JSON.stringify(postfix)
+			});
+		}
+		dep.replaces = replaces;
 		dep.critical =
 			options.wrappedContextCritical &&
 			"a part of the request of a dependency is an expression";
 		return dep;
 	} else {
-		dep = new Dep(
+		const dep = new Dep(
 			Object.assign(
 				{
 					request: options.exprContextRequest,
diff --git a/lib/dependencies/ContextDependencyTemplateAsId.js b/lib/dependencies/ContextDependencyTemplateAsId.js
index 14f5aa79e9c..1ee83ff9915 100644
--- a/lib/dependencies/ContextDependencyTemplateAsId.js
+++ b/lib/dependencies/ContextDependencyTemplateAsId.js
@@ -20,6 +20,7 @@ class ContextDependencyTemplateAsId {
 					}
 				}
 				source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
+				// TODO webpack 5 remove `prepend` it's no longer used
 				source.replace(
 					dep.range[0],
 					dep.valueRange[0] - 1,
diff --git a/lib/dependencies/ContextDependencyTemplateAsRequireCall.js b/lib/dependencies/ContextDependencyTemplateAsRequireCall.js
index 5dac6c78297..6d833ac83f6 100644
--- a/lib/dependencies/ContextDependencyTemplateAsRequireCall.js
+++ b/lib/dependencies/ContextDependencyTemplateAsRequireCall.js
@@ -20,6 +20,7 @@ class ContextDependencyTemplateAsRequireCall {
 					}
 				}
 				source.replace(dep.valueRange[1], dep.range[1] - 1, ")");
+				// TODO webpack 5 remove `prepend` it's no longer used
 				source.replace(
 					dep.range[0],
 					dep.valueRange[0] - 1,
diff --git a/lib/dependencies/DependencyReference.js b/lib/dependencies/DependencyReference.js
index 0499eedc4ee..a8f6afae069 100644
--- a/lib/dependencies/DependencyReference.js
+++ b/lib/dependencies/DependencyReference.js
@@ -7,6 +7,9 @@
 /** @typedef {import("../Module")} Module */
 
 class DependencyReference {
+	// TODO webpack 5: module must be dynamic, you must pass a function returning a module
+	// This is needed to remove the hack in ConcatenatedModule
+	// The problem is that the `module` in Dependency could be replaced i. e. because of Scope Hoisting
 	/**
 	 *
 	 * @param {Module} module the referenced module
@@ -15,6 +18,7 @@ class DependencyReference {
 	 * @param {number} order the order information or NaN if don't care
 	 */
 	constructor(module, importedNames, weak = false, order = NaN) {
+		// TODO webpack 5: make it a getter
 		this.module = module;
 		// true: full object
 		// false: only sideeffects/no export
diff --git a/lib/dependencies/HarmonyExportDependencyParserPlugin.js b/lib/dependencies/HarmonyExportDependencyParserPlugin.js
index de2d9c257e2..6ab0c0fe154 100644
--- a/lib/dependencies/HarmonyExportDependencyParserPlugin.js
+++ b/lib/dependencies/HarmonyExportDependencyParserPlugin.js
@@ -54,10 +54,25 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 		parser.hooks.exportExpression.tap(
 			"HarmonyExportDependencyParserPlugin",
 			(statement, expr) => {
+				const comments = parser.getComments([
+					statement.range[0],
+					expr.range[0]
+				]);
 				const dep = new HarmonyExportExpressionDependency(
 					parser.state.module,
 					expr.range,
-					statement.range
+					statement.range,
+					comments
+						.map(c => {
+							switch (c.type) {
+								case "Block":
+									return `/*${c.value}*/`;
+								case "Line":
+									return `//${c.value}\n`;
+							}
+							return "";
+						})
+						.join("")
 				);
 				dep.loc = Object.create(statement.loc);
 				dep.loc.index = -1;
diff --git a/lib/dependencies/HarmonyExportExpressionDependency.js b/lib/dependencies/HarmonyExportExpressionDependency.js
index 1f12f9d76ef..dfb499add64 100644
--- a/lib/dependencies/HarmonyExportExpressionDependency.js
+++ b/lib/dependencies/HarmonyExportExpressionDependency.js
@@ -6,11 +6,12 @@
 const NullDependency = require("./NullDependency");
 
 class HarmonyExportExpressionDependency extends NullDependency {
-	constructor(originModule, range, rangeStatement) {
+	constructor(originModule, range, rangeStatement, prefix) {
 		super();
 		this.originModule = originModule;
 		this.range = range;
 		this.rangeStatement = rangeStatement;
+		this.prefix = prefix;
 	}
 
 	get type() {
@@ -31,7 +32,11 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 		const content = this.getContent(dep.originModule, used);
 
 		if (dep.range) {
-			source.replace(dep.rangeStatement[0], dep.range[0] - 1, content + "(");
+			source.replace(
+				dep.rangeStatement[0],
+				dep.range[0] - 1,
+				content + "(" + dep.prefix
+			);
 			source.replace(dep.range[1], dep.rangeStatement[1] - 1, ");");
 			return;
 		}
diff --git a/lib/dependencies/HarmonyExportImportedSpecifierDependency.js b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
index adf0be81421..1965d0dbb8d 100644
--- a/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
+++ b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
@@ -244,7 +244,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 				return new DependencyReference(
 					mode.module,
 					Array.from(mode.map.values()),
-					false
+					false,
+					this.sourceOrder
 				);
 
 			case "dynamic-reexport":
@@ -602,10 +603,10 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 
 	getReexportStatement(module, key, name, valueKey) {
 		const exportsName = module.exportsArgument;
-		const returnValue = this.getReturnValue(valueKey);
+		const returnValue = this.getReturnValue(name, valueKey);
 		return `__webpack_require__.d(${exportsName}, ${JSON.stringify(
 			key
-		)}, function() { return ${name}${returnValue}; });\n`;
+		)}, function() { return ${returnValue}; });\n`;
 	}
 
 	getReexportFakeNamespaceObjectStatement(module, key, name) {
@@ -616,20 +617,29 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	}
 
 	getConditionalReexportStatement(module, key, name, valueKey) {
+		if (valueKey === false) {
+			return "/* unused export */\n";
+		}
 		const exportsName = module.exportsArgument;
-		const returnValue = this.getReturnValue(valueKey);
+		const returnValue = this.getReturnValue(name, valueKey);
 		return `if(__webpack_require__.o(${name}, ${JSON.stringify(
 			valueKey
 		)})) __webpack_require__.d(${exportsName}, ${JSON.stringify(
 			key
-		)}, function() { return ${name}${returnValue}; });\n`;
+		)}, function() { return ${returnValue}; });\n`;
 	}
 
-	getReturnValue(valueKey) {
+	getReturnValue(name, valueKey) {
 		if (valueKey === null) {
-			return "_default.a";
+			return `${name}_default.a`;
+		}
+		if (valueKey === "") {
+			return name;
+		}
+		if (valueKey === false) {
+			return "/* unused export */ undefined";
 		}
 
-		return valueKey && "[" + JSON.stringify(valueKey) + "]";
+		return `${name}[${JSON.stringify(valueKey)}]`;
 	}
 };
diff --git a/lib/dependencies/HarmonyImportDependencyParserPlugin.js b/lib/dependencies/HarmonyImportDependencyParserPlugin.js
index 97e28ec4920..7f9fcde20d0 100644
--- a/lib/dependencies/HarmonyImportDependencyParserPlugin.js
+++ b/lib/dependencies/HarmonyImportDependencyParserPlugin.js
@@ -168,11 +168,16 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 		parser.hooks.hotAcceptCallback.tap(
 			"HarmonyImportDependencyParserPlugin",
 			(expr, requests) => {
+				const harmonyParserScope = parser.state.harmonyParserScope;
+				if (!harmonyParserScope) {
+					// This is not a harmony module, skip it
+					return;
+				}
 				const dependencies = requests.map(request => {
 					const dep = new HarmonyAcceptImportDependency(
 						request,
 						parser.state.module,
-						parser.state.harmonyParserScope
+						harmonyParserScope
 					);
 					dep.loc = expr.loc;
 					parser.state.module.addDependency(dep);
diff --git a/lib/dependencies/HarmonyModulesPlugin.js b/lib/dependencies/HarmonyModulesPlugin.js
index 12a50a25aea..43a8d4c0c1d 100644
--- a/lib/dependencies/HarmonyModulesPlugin.js
+++ b/lib/dependencies/HarmonyModulesPlugin.js
@@ -121,10 +121,7 @@ class HarmonyModulesPlugin {
 				);
 
 				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.harmony !== "undefined" &&
-						!parserOptions.harmony
-					)
+					if (parserOptions.harmony !== undefined && !parserOptions.harmony)
 						return;
 
 					new HarmonyDetectionParserPlugin().apply(parser);
diff --git a/lib/dependencies/ImportParserPlugin.js b/lib/dependencies/ImportParserPlugin.js
index 14043851965..edabf5bb03c 100644
--- a/lib/dependencies/ImportParserPlugin.js
+++ b/lib/dependencies/ImportParserPlugin.js
@@ -54,7 +54,7 @@ class ImportParserPlugin {
 			}
 
 			if (importOptions) {
-				if (typeof importOptions.webpackIgnore !== "undefined") {
+				if (importOptions.webpackIgnore !== undefined) {
 					if (typeof importOptions.webpackIgnore !== "boolean") {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
@@ -66,13 +66,13 @@ class ImportParserPlugin {
 							)
 						);
 					} else {
-						// Do not instrument `import()` is `webpackIgnore` is `true`
+						// Do not instrument `import()` if `webpackIgnore` is `true`
 						if (importOptions.webpackIgnore) {
 							return false;
 						}
 					}
 				}
-				if (typeof importOptions.webpackChunkName !== "undefined") {
+				if (importOptions.webpackChunkName !== undefined) {
 					if (typeof importOptions.webpackChunkName !== "string") {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
@@ -87,7 +87,7 @@ class ImportParserPlugin {
 						chunkName = importOptions.webpackChunkName;
 					}
 				}
-				if (typeof importOptions.webpackMode !== "undefined") {
+				if (importOptions.webpackMode !== undefined) {
 					if (typeof importOptions.webpackMode !== "string") {
 						parser.state.module.warnings.push(
 							new UnsupportedFeatureWarning(
@@ -102,7 +102,7 @@ class ImportParserPlugin {
 						mode = importOptions.webpackMode;
 					}
 				}
-				if (typeof importOptions.webpackPrefetch !== "undefined") {
+				if (importOptions.webpackPrefetch !== undefined) {
 					if (importOptions.webpackPrefetch === true) {
 						groupOptions.prefetchOrder = 0;
 					} else if (typeof importOptions.webpackPrefetch === "number") {
@@ -119,7 +119,7 @@ class ImportParserPlugin {
 						);
 					}
 				}
-				if (typeof importOptions.webpackPreload !== "undefined") {
+				if (importOptions.webpackPreload !== undefined) {
 					if (importOptions.webpackPreload === true) {
 						groupOptions.preloadOrder = 0;
 					} else if (typeof importOptions.webpackPreload === "number") {
@@ -136,7 +136,7 @@ class ImportParserPlugin {
 						);
 					}
 				}
-				if (typeof importOptions.webpackInclude !== "undefined") {
+				if (importOptions.webpackInclude !== undefined) {
 					if (
 						!importOptions.webpackInclude ||
 						importOptions.webpackInclude.constructor.name !== "RegExp"
@@ -154,7 +154,7 @@ class ImportParserPlugin {
 						include = new RegExp(importOptions.webpackInclude);
 					}
 				}
-				if (typeof importOptions.webpackExclude !== "undefined") {
+				if (importOptions.webpackExclude !== undefined) {
 					if (
 						!importOptions.webpackExclude ||
 						importOptions.webpackExclude.constructor.name !== "RegExp"
diff --git a/lib/dependencies/ImportPlugin.js b/lib/dependencies/ImportPlugin.js
index 8d488e0d904..1647192595b 100644
--- a/lib/dependencies/ImportPlugin.js
+++ b/lib/dependencies/ImportPlugin.js
@@ -57,10 +57,7 @@ class ImportPlugin {
 				);
 
 				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.import !== "undefined" &&
-						!parserOptions.import
-					)
+					if (parserOptions.import !== undefined && !parserOptions.import)
 						return;
 
 					new ImportParserPlugin(options).apply(parser);
diff --git a/lib/dependencies/LoaderDependency.js b/lib/dependencies/LoaderDependency.js
index 343c44860a3..9d0876bcee0 100644
--- a/lib/dependencies/LoaderDependency.js
+++ b/lib/dependencies/LoaderDependency.js
@@ -6,6 +6,9 @@
 const ModuleDependency = require("./ModuleDependency");
 
 class LoaderDependency extends ModuleDependency {
+	/**
+	 * @param {string} request request string
+	 */
 	constructor(request) {
 		super(request);
 	}
diff --git a/lib/dependencies/LoaderPlugin.js b/lib/dependencies/LoaderPlugin.js
index 14388db5eca..c781d063605 100644
--- a/lib/dependencies/LoaderPlugin.js
+++ b/lib/dependencies/LoaderPlugin.js
@@ -5,6 +5,17 @@
 "use strict";
 
 const LoaderDependency = require("./LoaderDependency");
+const NormalModule = require("../NormalModule");
+
+/** @typedef {import("../Module")} Module */
+
+/**
+ * @callback LoadModuleCallback
+ * @param {Error=} err error object
+ * @param {string=} source source code
+ * @param {object=} map source map
+ * @param {Module=} module loaded module if successful
+ */
 
 class LoaderPlugin {
 	apply(compiler) {
@@ -22,9 +33,16 @@ class LoaderPlugin {
 			compilation.hooks.normalModuleLoader.tap(
 				"LoaderPlugin",
 				(loaderContext, module) => {
+					/**
+					 * @param {string} request the request string to load the module from
+					 * @param {LoadModuleCallback} callback callback returning the loaded module or error
+					 * @returns {void}
+					 */
 					loaderContext.loadModule = (request, callback) => {
 						const dep = new LoaderDependency(request);
-						dep.loc = request;
+						dep.loc = {
+							name: request
+						};
 						const factory = compilation.dependencyFactories.get(
 							dep.constructor
 						);
@@ -57,7 +75,8 @@ class LoaderPlugin {
 									if (!dep.module) {
 										return callback(new Error("Cannot load the module"));
 									}
-									if (dep.module.error) {
+									// TODO consider removing this in webpack 5
+									if (dep.module instanceof NormalModule && dep.module.error) {
 										return callback(dep.module.error);
 									}
 									if (!dep.module._source) {
diff --git a/lib/dependencies/ModuleDependency.js b/lib/dependencies/ModuleDependency.js
index 992d86534db..f325e7a98d6 100644
--- a/lib/dependencies/ModuleDependency.js
+++ b/lib/dependencies/ModuleDependency.js
@@ -6,6 +6,9 @@
 const Dependency = require("../Dependency");
 
 class ModuleDependency extends Dependency {
+	/**
+	 * @param {string} request request path which needs resolving
+	 */
 	constructor(request) {
 		super();
 		this.request = request;
diff --git a/lib/dependencies/MultiEntryDependency.js b/lib/dependencies/MultiEntryDependency.js
index a075eb3181e..712d3ff1f22 100644
--- a/lib/dependencies/MultiEntryDependency.js
+++ b/lib/dependencies/MultiEntryDependency.js
@@ -3,9 +3,14 @@
 	Author Tobias Koppers @sokra
 */
 "use strict";
+/** @typedef {import("./SingleEntryDependency")} SingleEntryDependency */
 const Dependency = require("../Dependency");
 
 class MultiEntryDependency extends Dependency {
+	/**
+	 * @param {SingleEntryDependency[]} dependencies an array of SingleEntryDependencies
+	 * @param {string} name entry name
+	 */
 	constructor(dependencies, name) {
 		super();
 		this.dependencies = dependencies;
diff --git a/lib/dependencies/RequireContextPlugin.js b/lib/dependencies/RequireContextPlugin.js
index 24312449c22..4e44e87117a 100644
--- a/lib/dependencies/RequireContextPlugin.js
+++ b/lib/dependencies/RequireContextPlugin.js
@@ -42,7 +42,7 @@ class RequireContextPlugin {
 
 				const handler = (parser, parserOptions) => {
 					if (
-						typeof parserOptions.requireContext !== "undefined" &&
+						parserOptions.requireContext !== undefined &&
 						!parserOptions.requireContext
 					)
 						return;
diff --git a/lib/dependencies/RequireEnsurePlugin.js b/lib/dependencies/RequireEnsurePlugin.js
index e508ec4fcdd..c818e91bc1d 100644
--- a/lib/dependencies/RequireEnsurePlugin.js
+++ b/lib/dependencies/RequireEnsurePlugin.js
@@ -38,7 +38,7 @@ class RequireEnsurePlugin {
 
 				const handler = (parser, parserOptions) => {
 					if (
-						typeof parserOptions.requireEnsure !== "undefined" &&
+						parserOptions.requireEnsure !== undefined &&
 						!parserOptions.requireEnsure
 					)
 						return;
diff --git a/lib/dependencies/RequireIncludePlugin.js b/lib/dependencies/RequireIncludePlugin.js
index e5811a07e70..e7d535bc3a0 100644
--- a/lib/dependencies/RequireIncludePlugin.js
+++ b/lib/dependencies/RequireIncludePlugin.js
@@ -25,7 +25,7 @@ class RequireIncludePlugin {
 
 				const handler = (parser, parserOptions) => {
 					if (
-						typeof parserOptions.requireInclude !== "undefined" &&
+						parserOptions.requireInclude !== undefined &&
 						!parserOptions.requireInclude
 					)
 						return;
diff --git a/lib/dependencies/SingleEntryDependency.js b/lib/dependencies/SingleEntryDependency.js
index 387975dc8df..75a8c080fec 100644
--- a/lib/dependencies/SingleEntryDependency.js
+++ b/lib/dependencies/SingleEntryDependency.js
@@ -6,6 +6,9 @@
 const ModuleDependency = require("./ModuleDependency");
 
 class SingleEntryDependency extends ModuleDependency {
+	/**
+	 * @param {string} request request path for entry
+	 */
 	constructor(request) {
 		super(request);
 	}
diff --git a/lib/dependencies/SystemPlugin.js b/lib/dependencies/SystemPlugin.js
index 69f3e8dc017..0e3419b5748 100644
--- a/lib/dependencies/SystemPlugin.js
+++ b/lib/dependencies/SystemPlugin.js
@@ -17,13 +17,10 @@ class SystemPlugin {
 			"SystemPlugin",
 			(compilation, { normalModuleFactory }) => {
 				const handler = (parser, parserOptions) => {
-					if (
-						typeof parserOptions.system !== "undefined" &&
-						!parserOptions.system
-					)
+					if (parserOptions.system !== undefined && !parserOptions.system)
 						return;
 
-					const shouldWarn = typeof parserOptions.system === "undefined";
+					const shouldWarn = parserOptions.system === undefined;
 
 					const setNotSupported = name => {
 						parser.hooks.evaluateTypeof
@@ -72,7 +69,7 @@ class SystemPlugin {
 					parser.hooks.expression.for("System").tap("SystemPlugin", () => {
 						const systemPolyfillRequire = ParserHelpers.requireFileAsExpression(
 							parser.state.module.context,
-							require.resolve("../../buildin/system.js")
+							require.resolve("../../buildin/system")
 						);
 						return ParserHelpers.addParsedVariableToModule(
 							parser,
diff --git a/lib/dependencies/WebAssemblyImportDependency.js b/lib/dependencies/WebAssemblyImportDependency.js
index 64e97159711..d765b0db067 100644
--- a/lib/dependencies/WebAssemblyImportDependency.js
+++ b/lib/dependencies/WebAssemblyImportDependency.js
@@ -8,12 +8,20 @@ const DependencyReference = require("./DependencyReference");
 const ModuleDependency = require("./ModuleDependency");
 const UnsupportedWebAssemblyFeatureError = require("../wasm/UnsupportedWebAssemblyFeatureError");
 
+/** @typedef {import("@webassemblyjs/ast").ModuleImportDescription} ModuleImportDescription */
+
 class WebAssemblyImportDependency extends ModuleDependency {
+	/**
+	 * @param {string} request the request
+	 * @param {string} name the imported name
+	 * @param {ModuleImportDescription} description the WASM ast node
+	 * @param {false | string} onlyDirectImport if only direct imports are allowed
+	 */
 	constructor(request, name, description, onlyDirectImport) {
 		super(request);
 		/** @type {string} */
 		this.name = name;
-		/** @type {TODO} */
+		/** @type {ModuleImportDescription} */
 		this.description = description;
 		/** @type {false | string} */
 		this.onlyDirectImport = onlyDirectImport;
diff --git a/lib/formatLocation.js b/lib/formatLocation.js
index 8bd574d0102..f608cd496dc 100644
--- a/lib/formatLocation.js
+++ b/lib/formatLocation.js
@@ -5,57 +5,71 @@
 
 "use strict";
 
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("./Dependency").SourcePosition} SourcePosition */
+
+// TODO webpack 5: pos must be SourcePosition
+/**
+ * @param {SourcePosition|DependencyLocation|string} pos position
+ * @returns {string} formatted position
+ */
 const formatPosition = pos => {
 	if (pos === null) return "";
-	const typeOfPos = typeof pos;
-	switch (typeOfPos) {
-		case "string":
-			return pos;
-		case "number":
-			return `${pos}`;
-		case "object":
-			if (typeof pos.line === "number" && typeof pos.column === "number") {
-				return `${pos.line}:${pos.column}`;
-			} else if (typeof pos.line === "number") {
-				return `${pos.line}:?`;
-			} else if (typeof pos.index === "number") {
-				return `+${pos.index}`;
-			} else {
-				return "";
-			}
-		default:
+	// TODO webpack 5: Simplify this
+	if (typeof pos === "string") return pos;
+	if (typeof pos === "number") return `${pos}`;
+	if (typeof pos === "object") {
+		if ("line" in pos && "column" in pos) {
+			return `${pos.line}:${pos.column}`;
+		} else if ("line" in pos) {
+			return `${pos.line}:?`;
+		} else if ("index" in pos) {
+			// TODO webpack 5 remove this case
+			return `+${pos.index}`;
+		} else {
 			return "";
+		}
 	}
+	return "";
 };
 
+// TODO webpack 5: loc must be DependencyLocation
+/**
+ * @param {DependencyLocation|SourcePosition|string} loc location
+ * @returns {string} formatted location
+ */
 const formatLocation = loc => {
 	if (loc === null) return "";
-	const typeOfLoc = typeof loc;
-	switch (typeOfLoc) {
-		case "string":
-			return loc;
-		case "number":
-			return `${loc}`;
-		case "object":
-			if (loc.start && loc.end) {
-				if (
-					typeof loc.start.line === "number" &&
-					typeof loc.end.line === "number" &&
-					typeof loc.end.column === "number" &&
-					loc.start.line === loc.end.line
-				) {
-					return `${formatPosition(loc.start)}-${loc.end.column}`;
-				} else {
-					return `${formatPosition(loc.start)}-${formatPosition(loc.end)}`;
-				}
-			}
-			if (loc.start) {
-				return formatPosition(loc.start);
+	// TODO webpack 5: Simplify this
+	if (typeof loc === "string") return loc;
+	if (typeof loc === "number") return `${loc}`;
+	if (typeof loc === "object") {
+		if ("start" in loc && loc.start && "end" in loc && loc.end) {
+			if (
+				typeof loc.start === "object" &&
+				typeof loc.start.line === "number" &&
+				typeof loc.end === "object" &&
+				typeof loc.end.line === "number" &&
+				typeof loc.end.column === "number" &&
+				loc.start.line === loc.end.line
+			) {
+				return `${formatPosition(loc.start)}-${loc.end.column}`;
+			} else {
+				return `${formatPosition(loc.start)}-${formatPosition(loc.end)}`;
 			}
-			return formatPosition(loc);
-		default:
-			return "";
+		}
+		if ("start" in loc && loc.start) {
+			return formatPosition(loc.start);
+		}
+		if ("name" in loc && "index" in loc) {
+			return `${loc.name}[${loc.index}]`;
+		}
+		if ("name" in loc) {
+			return loc.name;
+		}
+		return formatPosition(loc);
 	}
+	return "";
 };
 
 module.exports = formatLocation;
diff --git a/lib/node/NodeMainTemplateAsync.runtime.js b/lib/node/NodeMainTemplateAsync.runtime.js
index bcdd57dabc6..35eb47b665e 100644
--- a/lib/node/NodeMainTemplateAsync.runtime.js
+++ b/lib/node/NodeMainTemplateAsync.runtime.js
@@ -37,7 +37,7 @@ module.exports = function() {
 		});
 	}
 
-	//eslint-disable-next-line no-unused-vars
+	// eslint-disable-next-line no-unused-vars
 	function hotDisposeChunk(chunkId) {
 		delete installedChunks[chunkId];
 	}
diff --git a/lib/node/NodeMainTemplatePlugin.js b/lib/node/NodeMainTemplatePlugin.js
index c32ae38da56..a2702969975 100644
--- a/lib/node/NodeMainTemplatePlugin.js
+++ b/lib/node/NodeMainTemplatePlugin.js
@@ -96,7 +96,7 @@ module.exports = class NodeMainTemplatePlugin {
 								"var promise = new Promise(function(resolve, reject) {",
 								Template.indent([
 									"installedChunkData = installedChunks[chunkId] = [resolve, reject];",
-									"var filename = __dirname + " +
+									"var filename = require('path').join(__dirname, " +
 										mainTemplate.getAssetPath(
 											JSON.stringify(`/${chunkFilename}`),
 											{
@@ -155,7 +155,7 @@ module.exports = class NodeMainTemplatePlugin {
 												contentHashType: "javascript"
 											}
 										) +
-										";",
+										");",
 									"require('fs').readFile(filename, 'utf-8',  function(err, content) {",
 									Template.indent(
 										[
@@ -305,8 +305,8 @@ module.exports = class NodeMainTemplatePlugin {
 				);
 				return Template.getFunctionContent(
 					asyncChunkLoading
-						? require("./NodeMainTemplateAsync.runtime.js")
-						: require("./NodeMainTemplate.runtime.js")
+						? require("./NodeMainTemplateAsync.runtime")
+						: require("./NodeMainTemplate.runtime")
 				)
 					.replace(/\$require\$/g, mainTemplate.requireFn)
 					.replace(/\$hotMainFilename\$/g, currentHotUpdateMainFilename)
@@ -315,9 +315,7 @@ module.exports = class NodeMainTemplatePlugin {
 		);
 		mainTemplate.hooks.hash.tap("NodeMainTemplatePlugin", hash => {
 			hash.update("node");
-			hash.update("3");
-			hash.update(mainTemplate.outputOptions.filename + "");
-			hash.update(mainTemplate.outputOptions.chunkFilename + "");
+			hash.update("4");
 		});
 	}
 };
diff --git a/lib/node/NodeSourcePlugin.js b/lib/node/NodeSourcePlugin.js
index 31825bb5c87..d5505f6f5be 100644
--- a/lib/node/NodeSourcePlugin.js
+++ b/lib/node/NodeSourcePlugin.js
@@ -71,7 +71,7 @@ module.exports = class NodeSourcePlugin {
 							.tap("NodeSourcePlugin", () => {
 								const retrieveGlobalModule = ParserHelpers.requireFileAsExpression(
 									parser.state.module.context,
-									require.resolve("../../buildin/global.js")
+									require.resolve("../../buildin/global")
 								);
 								return ParserHelpers.addParsedVariableToModule(
 									parser,
diff --git a/lib/node/NodeTargetPlugin.js b/lib/node/NodeTargetPlugin.js
index ff9cdc88246..b76b70690e8 100644
--- a/lib/node/NodeTargetPlugin.js
+++ b/lib/node/NodeTargetPlugin.js
@@ -7,6 +7,7 @@
 const ExternalsPlugin = require("../ExternalsPlugin");
 
 const builtins =
+	// eslint-disable-next-line node/no-unsupported-features/node-builtins
 	require("module").builtinModules || Object.keys(process.binding("natives"));
 
 class NodeTargetPlugin {
diff --git a/lib/optimize/AggressiveSplittingPlugin.js b/lib/optimize/AggressiveSplittingPlugin.js
index 9aec3644bfd..3843878538a 100644
--- a/lib/optimize/AggressiveSplittingPlugin.js
+++ b/lib/optimize/AggressiveSplittingPlugin.js
@@ -9,6 +9,8 @@ const { intersect } = require("../util/SetHelpers");
 const validateOptions = require("schema-utils");
 const schema = require("../../schemas/plugins/optimize/AggressiveSplittingPlugin.json");
 
+/** @typedef {import("../../declarations/plugins/optimize/AggressiveSplittingPlugin").AggressiveSplittingPluginOptions} AggressiveSplittingPluginOptions */
+
 const moveModuleBetween = (oldChunk, newChunk) => {
 	return module => {
 		oldChunk.moveModule(module, newChunk);
@@ -22,10 +24,15 @@ const isNotAEntryModule = entryModule => {
 };
 
 class AggressiveSplittingPlugin {
+	/**
+	 * @param {AggressiveSplittingPluginOptions=} options options object
+	 */
 	constructor(options) {
-		validateOptions(schema, options || {}, "Aggressive Splitting Plugin");
+		if (!options) options = {};
+
+		validateOptions(schema, options, "Aggressive Splitting Plugin");
 
-		this.options = options || {};
+		this.options = options;
 		if (typeof this.options.minSize !== "number") {
 			this.options.minSize = 30 * 1024;
 		}
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
index 2ec0d4bc775..aa244a2f550 100644
--- a/lib/optimize/ConcatenatedModule.js
+++ b/lib/optimize/ConcatenatedModule.js
@@ -20,6 +20,14 @@ const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibi
 const createHash = require("../util/createHash");
 
 /** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../util/createHash").Hash} Hash */
+
+/**
+ * @typedef {Object} ConcatenationEntry
+ * @property {"concatenated" | "external"} type
+ * @property {Module} module
+ */
 
 const ensureNsObjSource = (
 	info,
@@ -125,6 +133,11 @@ const getFinalName = (
 						requestShortener,
 						strictHarmonyModule
 					);
+				} else if (!info.module.isUsed(exportName)) {
+					return "/* unused export */ undefined";
+				}
+				if (info.globalExports.has(directExport)) {
+					return directExport;
 				}
 				const name = info.internalNames.get(directExport);
 				if (!name) {
@@ -257,7 +270,7 @@ const getPathInAst = (ast, node) => {
 	if (Array.isArray(ast)) {
 		for (i = 0; i < ast.length; i++) {
 			const enterResult = enterNode(ast[i]);
-			if (typeof enterResult !== "undefined") return enterResult;
+			if (enterResult !== undefined) return enterResult;
 		}
 	} else if (ast && typeof ast === "object") {
 		const keys = Object.keys(ast);
@@ -265,22 +278,23 @@ const getPathInAst = (ast, node) => {
 			const value = ast[keys[i]];
 			if (Array.isArray(value)) {
 				const pathResult = getPathInAst(value, node);
-				if (typeof pathResult !== "undefined") return pathResult;
+				if (pathResult !== undefined) return pathResult;
 			} else if (value && typeof value === "object") {
 				const enterResult = enterNode(value);
-				if (typeof enterResult !== "undefined") return enterResult;
+				if (enterResult !== undefined) return enterResult;
 			}
 		}
 	}
 };
 
 class ConcatenatedModule extends Module {
-	constructor(rootModule, modules) {
+	constructor(rootModule, modules, concatenationList) {
 		super("javascript/esm", null);
 		super.setChunks(rootModule._chunks);
 
 		// Info from Factory
 		this.rootModule = rootModule;
+		this.factoryMeta = rootModule.factoryMeta;
 
 		// Info from Compilation
 		this.index = rootModule.index;
@@ -319,10 +333,9 @@ class ConcatenatedModule extends Module {
 
 		this.warnings = [];
 		this.errors = [];
-		this._orderedConcatenationList = this._createOrderedConcatenationList(
-			rootModule,
-			modulesSet
-		);
+		this._orderedConcatenationList =
+			concatenationList ||
+			ConcatenatedModule.createConcatenationList(rootModule, modulesSet, null);
 		for (const info of this._orderedConcatenationList) {
 			if (info.type === "concatenated") {
 				const m = info.module;
@@ -409,7 +422,13 @@ class ConcatenatedModule extends Module {
 		}, 0);
 	}
 
-	_createOrderedConcatenationList(rootModule, modulesSet) {
+	/**
+	 * @param {Module} rootModule the root of the concatenation
+	 * @param {Set<Module>} modulesSet a set of modules which should be concatenated
+	 * @param {Compilation} compilation the compilation context
+	 * @returns {ConcatenationEntry[]} concatenation list
+	 */
+	static createConcatenationList(rootModule, modulesSet, compilation) {
 		const list = [];
 		const set = new Set();
 
@@ -423,15 +442,16 @@ class ConcatenatedModule extends Module {
 			const references = module.dependencies
 				.filter(dep => dep instanceof HarmonyImportDependency)
 				.map(dep => {
-					const ref = dep.getReference();
+					const ref = compilation.getDependencyReference(module, dep);
 					if (ref) map.set(ref, dep);
 					return ref;
 				})
 				.filter(ref => ref);
 			DependencyReference.sort(references);
+			// TODO webpack 5: remove this hack, see also DependencyReference
 			return references.map(ref => {
 				const dep = map.get(ref);
-				return () => dep.getReference().module;
+				return () => compilation.getDependencyReference(module, dep).module;
 			});
 		};
 
@@ -545,6 +565,7 @@ class ConcatenatedModule extends Module {
 						globalScope: undefined,
 						moduleScope: undefined,
 						internalNames: new Map(),
+						globalExports: new Set(),
 						exportMap: exportMap,
 						reexportMap: reexportMap,
 						hasNamespaceObject: false,
@@ -623,6 +644,7 @@ class ConcatenatedModule extends Module {
 
 		// Must use full identifier in our cache here to ensure that the source
 		// is updated should our dependencies list change.
+		// TODO webpack 5 refactor
 		innerDependencyTemplates.set(
 			"hash",
 			innerDependencyTemplates.get("hash") + this.identifier()
@@ -923,6 +945,19 @@ class ConcatenatedModule extends Module {
 					}
 				}
 			}
+
+			// add exported globals
+			if (info.type === "concatenated") {
+				const variables = new Set();
+				for (const variable of info.moduleScope.variables) {
+					variables.add(variable.name);
+				}
+				for (const [, variable] of info.exportMap) {
+					if (!variables.has(variable)) {
+						info.globalExports.add(variable);
+					}
+				}
+			}
 		}
 
 		// generate names for symbols
@@ -1163,6 +1198,10 @@ class ConcatenatedModule extends Module {
 		return nameWithNumber;
 	}
 
+	/**
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @returns {void}
+	 */
 	updateHash(hash) {
 		for (const info of this._orderedConcatenationList) {
 			switch (info.type) {
@@ -1325,12 +1364,20 @@ class HarmonyExportExpressionDependencyConcatenatedTemplate {
 		}
 
 		if (dep.range) {
-			source.replace(dep.rangeStatement[0], dep.range[0] - 1, content + "(");
+			source.replace(
+				dep.rangeStatement[0],
+				dep.range[0] - 1,
+				content + "(" + dep.prefix
+			);
 			source.replace(dep.range[1], dep.rangeStatement[1] - 1, ");");
 			return;
 		}
 
-		source.replace(dep.rangeStatement[0], dep.rangeStatement[1] - 1, content);
+		source.replace(
+			dep.rangeStatement[0],
+			dep.rangeStatement[1] - 1,
+			content + dep.prefix
+		);
 	}
 }
 
@@ -1408,8 +1455,9 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 					if (!used) {
 						source.insert(
 							-1,
-							`/* unused concated harmony import ${dep.name} */\n`
+							`/* unused concated harmony import ${def.name} */\n`
 						);
+						continue;
 					}
 					let finalName;
 					const strictFlag = dep.originModule.buildMeta.strictHarmonyModule
@@ -1426,9 +1474,11 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 						}_${exportData}${strictFlag}__`;
 					}
 					const exportsName = this.rootModule.exportsArgument;
-					const content = `/* concated harmony reexport */__webpack_require__.d(${exportsName}, ${JSON.stringify(
-						used
-					)}, function() { return ${finalName}; });\n`;
+					const content =
+						`/* concated harmony reexport ${def.name} */` +
+						`__webpack_require__.d(${exportsName}, ` +
+						`${JSON.stringify(used)}, ` +
+						`function() { return ${finalName}; });\n`;
 					source.insert(-1, content);
 				}
 			} else {
diff --git a/lib/optimize/LimitChunkCountPlugin.js b/lib/optimize/LimitChunkCountPlugin.js
index f38b942b1ca..a271191bf7f 100644
--- a/lib/optimize/LimitChunkCountPlugin.js
+++ b/lib/optimize/LimitChunkCountPlugin.js
@@ -7,10 +7,17 @@
 const validateOptions = require("schema-utils");
 const schema = require("../../schemas/plugins/optimize/LimitChunkCountPlugin.json");
 
+/** @typedef {import("../../declarations/plugins/optimize/LimitChunkCountPlugin").LimitChunkCountPluginOptions} LimitChunkCountPluginOptions */
+
 class LimitChunkCountPlugin {
+	/**
+	 * @param {LimitChunkCountPluginOptions=} options options object
+	 */
 	constructor(options) {
-		validateOptions(schema, options || {}, "Limit Chunk Count Plugin");
-		this.options = options || {};
+		if (!options) options = {};
+
+		validateOptions(schema, options, "Limit Chunk Count Plugin");
+		this.options = options;
 	}
 	apply(compiler) {
 		const options = this.options;
diff --git a/lib/optimize/MinChunkSizePlugin.js b/lib/optimize/MinChunkSizePlugin.js
index 0f3893910ad..144af278ace 100644
--- a/lib/optimize/MinChunkSizePlugin.js
+++ b/lib/optimize/MinChunkSizePlugin.js
@@ -7,7 +7,12 @@
 const validateOptions = require("schema-utils");
 const schema = require("../../schemas/plugins/optimize/MinChunkSizePlugin.json");
 
+/** @typedef {import("../../declarations/plugins/optimize/MinChunkSizePlugin").MinChunkSizePluginOptions} MinChunkSizePluginOptions */
+
 class MinChunkSizePlugin {
+	/**
+	 * @param {MinChunkSizePluginOptions} options options object
+	 */
 	constructor(options) {
 		validateOptions(schema, options, "Min Chunk Size Plugin");
 		this.options = options;
diff --git a/lib/optimize/ModuleConcatenationPlugin.js b/lib/optimize/ModuleConcatenationPlugin.js
index 24710016f95..15b7d796a39 100644
--- a/lib/optimize/ModuleConcatenationPlugin.js
+++ b/lib/optimize/ModuleConcatenationPlugin.js
@@ -213,8 +213,9 @@ class ModuleConcatenationPlugin {
 							const failureCache = new Map();
 
 							// try to add all imports
-							for (const imp of this.getImports(currentRoot)) {
-								const problem = this.tryToAdd(
+							for (const imp of this._getImports(compilation, currentRoot)) {
+								const problem = this._tryToAdd(
+									compilation,
 									currentConfiguration,
 									imp,
 									possibleInners,
@@ -245,9 +246,15 @@ class ModuleConcatenationPlugin {
 						for (const concatConfiguration of concatConfigurations) {
 							if (usedModules.has(concatConfiguration.rootModule)) continue;
 							const modules = concatConfiguration.getModules();
+							const rootModule = concatConfiguration.rootModule;
 							const newModule = new ConcatenatedModule(
-								concatConfiguration.rootModule,
-								modules
+								rootModule,
+								Array.from(modules),
+								ConcatenatedModule.createConcatenationList(
+									rootModule,
+									modules,
+									compilation
+								)
 							);
 							for (const warning of concatConfiguration.getWarningsSorted()) {
 								newModule.optimizationBailout.push(requestShortener => {
@@ -320,15 +327,16 @@ class ModuleConcatenationPlugin {
 		);
 	}
 
-	getImports(module) {
+	_getImports(compilation, module) {
 		return new Set(
 			module.dependencies
 
 				// Get reference info only for harmony Dependencies
-				.map(
-					dep =>
-						dep instanceof HarmonyImportDependency ? dep.getReference() : null
-				)
+				.map(dep => {
+					if (!(dep instanceof HarmonyImportDependency)) return null;
+					if (!compilation) return dep.getReference();
+					return compilation.getDependencyReference(module, dep);
+				})
 
 				// Reference is valid and has a module
 				// Dependencies are simple enough to concat them
@@ -345,7 +353,7 @@ class ModuleConcatenationPlugin {
 		);
 	}
 
-	tryToAdd(config, module, possibleModules, failureCache) {
+	_tryToAdd(compilation, config, module, possibleModules, failureCache) {
 		const cacheEntry = failureCache.get(module);
 		if (cacheEntry) {
 			return cacheEntry;
@@ -383,7 +391,8 @@ class ModuleConcatenationPlugin {
 			)
 				continue;
 
-			const problem = this.tryToAdd(
+			const problem = this._tryToAdd(
+				compilation,
 				testConfig,
 				reason.module,
 				possibleModules,
@@ -399,8 +408,14 @@ class ModuleConcatenationPlugin {
 		config.set(testConfig);
 
 		// Eagerly try to add imports too if possible
-		for (const imp of this.getImports(module)) {
-			const problem = this.tryToAdd(config, imp, possibleModules, failureCache);
+		for (const imp of this._getImports(compilation, module)) {
+			const problem = this._tryToAdd(
+				compilation,
+				config,
+				imp,
+				possibleModules,
+				failureCache
+			);
 			if (problem) {
 				config.addWarning(imp, problem);
 			}
@@ -451,7 +466,7 @@ class ConcatConfiguration {
 	}
 
 	getModules() {
-		return this.modules.asArray();
+		return this.modules.asSet();
 	}
 
 	clone() {
diff --git a/lib/optimize/NaturalChunkOrderPlugin.js b/lib/optimize/NaturalChunkOrderPlugin.js
new file mode 100644
index 00000000000..00f8010d8b8
--- /dev/null
+++ b/lib/optimize/NaturalChunkOrderPlugin.js
@@ -0,0 +1,41 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+/** @typedef {import("../Compiler")} Compiler */
+
+class NaturalChunkOrderPlugin {
+	/**
+	 * @param {Compiler} compiler webpack compiler
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		compiler.hooks.compilation.tap("NaturalChunkOrderPlugin", compilation => {
+			compilation.hooks.optimizeChunkOrder.tap(
+				"NaturalChunkOrderPlugin",
+				chunks => {
+					chunks.sort((chunkA, chunkB) => {
+						const a = chunkA.modulesIterable[Symbol.iterator]();
+						const b = chunkB.modulesIterable[Symbol.iterator]();
+						// eslint-disable-next-line no-constant-condition
+						while (true) {
+							const aItem = a.next();
+							const bItem = b.next();
+							if (aItem.done && bItem.done) return 0;
+							if (aItem.done) return -1;
+							if (bItem.done) return 1;
+							const aModuleId = aItem.value.id;
+							const bModuleId = bItem.value.id;
+							if (aModuleId < bModuleId) return -1;
+							if (aModuleId > bModuleId) return 1;
+						}
+					});
+				}
+			);
+		});
+	}
+}
+
+module.exports = NaturalChunkOrderPlugin;
diff --git a/lib/optimize/OccurrenceChunkOrderPlugin.js b/lib/optimize/OccurrenceChunkOrderPlugin.js
new file mode 100644
index 00000000000..4f7ec9a4fff
--- /dev/null
+++ b/lib/optimize/OccurrenceChunkOrderPlugin.js
@@ -0,0 +1,66 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const validateOptions = require("schema-utils");
+const schema = require("../../schemas/plugins/optimize/OccurrenceOrderChunkIdsPlugin.json");
+
+/** @typedef {import("../../declarations/plugins/optimize/OccurrenceOrderChunkIdsPlugin").OccurrenceOrderChunkIdsPluginOptions} OccurrenceOrderChunkIdsPluginOptions */
+
+class OccurrenceOrderChunkIdsPlugin {
+	/**
+	 * @param {OccurrenceOrderChunkIdsPluginOptions=} options options object
+	 */
+	constructor(options = {}) {
+		validateOptions(schema, options, "Occurrence Order Chunk Ids Plugin");
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const prioritiseInitial = this.options.prioritiseInitial;
+		compiler.hooks.compilation.tap(
+			"OccurrenceOrderChunkIdsPlugin",
+			compilation => {
+				compilation.hooks.optimizeChunkOrder.tap(
+					"OccurrenceOrderChunkIdsPlugin",
+					chunks => {
+						const occursInInitialChunksMap = new Map();
+						const originalOrder = new Map();
+
+						let i = 0;
+						for (const c of chunks) {
+							let occurs = 0;
+							for (const chunkGroup of c.groupsIterable) {
+								for (const parent of chunkGroup.parentsIterable) {
+									if (parent.isInitial()) occurs++;
+								}
+							}
+							occursInInitialChunksMap.set(c, occurs);
+							originalOrder.set(c, i++);
+						}
+
+						chunks.sort((a, b) => {
+							if (prioritiseInitial) {
+								const aEntryOccurs = occursInInitialChunksMap.get(a);
+								const bEntryOccurs = occursInInitialChunksMap.get(b);
+								if (aEntryOccurs > bEntryOccurs) return -1;
+								if (aEntryOccurs < bEntryOccurs) return 1;
+							}
+							const aOccurs = a.getNumberOfGroups();
+							const bOccurs = b.getNumberOfGroups();
+							if (aOccurs > bOccurs) return -1;
+							if (aOccurs < bOccurs) return 1;
+							const orgA = originalOrder.get(a);
+							const orgB = originalOrder.get(b);
+							return orgA - orgB;
+						});
+					}
+				);
+			}
+		);
+	}
+}
+
+module.exports = OccurrenceOrderChunkIdsPlugin;
diff --git a/lib/optimize/OccurrenceModuleOrderPlugin.js b/lib/optimize/OccurrenceModuleOrderPlugin.js
new file mode 100644
index 00000000000..d17c8d92f5f
--- /dev/null
+++ b/lib/optimize/OccurrenceModuleOrderPlugin.js
@@ -0,0 +1,108 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const validateOptions = require("schema-utils");
+const schema = require("../../schemas/plugins/optimize/OccurrenceOrderModuleIdsPlugin.json");
+
+/** @typedef {import("../../declarations/plugins/optimize/OccurrenceOrderModuleIdsPlugin").OccurrenceOrderModuleIdsPluginOptions} OccurrenceOrderModuleIdsPluginOptions */
+
+class OccurrenceOrderModuleIdsPlugin {
+	/**
+	 * @param {OccurrenceOrderModuleIdsPluginOptions=} options options object
+	 */
+	constructor(options = {}) {
+		validateOptions(schema, options, "Occurrence Order Module Ids Plugin");
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const prioritiseInitial = this.options.prioritiseInitial;
+		compiler.hooks.compilation.tap(
+			"OccurrenceOrderModuleIdsPlugin",
+			compilation => {
+				compilation.hooks.optimizeModuleOrder.tap(
+					"OccurrenceOrderModuleIdsPlugin",
+					modules => {
+						const occursInInitialChunksMap = new Map();
+						const occursInAllChunksMap = new Map();
+
+						const initialChunkChunkMap = new Map();
+						const entryCountMap = new Map();
+						for (const m of modules) {
+							let initial = 0;
+							let entry = 0;
+							for (const c of m.chunksIterable) {
+								if (c.canBeInitial()) initial++;
+								if (c.entryModule === m) entry++;
+							}
+							initialChunkChunkMap.set(m, initial);
+							entryCountMap.set(m, entry);
+						}
+
+						const countOccursInEntry = (sum, r) => {
+							if (!r.module) {
+								return sum;
+							}
+							return sum + initialChunkChunkMap.get(r.module);
+						};
+						const countOccurs = (sum, r) => {
+							if (!r.module) {
+								return sum;
+							}
+							let factor = 1;
+							if (typeof r.dependency.getNumberOfIdOccurrences === "function") {
+								factor = r.dependency.getNumberOfIdOccurrences();
+							}
+							if (factor === 0) {
+								return sum;
+							}
+							return sum + factor * r.module.getNumberOfChunks();
+						};
+
+						if (prioritiseInitial) {
+							for (const m of modules) {
+								const result =
+									m.reasons.reduce(countOccursInEntry, 0) +
+									initialChunkChunkMap.get(m) +
+									entryCountMap.get(m);
+								occursInInitialChunksMap.set(m, result);
+							}
+						}
+
+						const originalOrder = new Map();
+						let i = 0;
+						for (const m of modules) {
+							const result =
+								m.reasons.reduce(countOccurs, 0) +
+								m.getNumberOfChunks() +
+								entryCountMap.get(m);
+							occursInAllChunksMap.set(m, result);
+							originalOrder.set(m, i++);
+						}
+
+						modules.sort((a, b) => {
+							if (prioritiseInitial) {
+								const aEntryOccurs = occursInInitialChunksMap.get(a);
+								const bEntryOccurs = occursInInitialChunksMap.get(b);
+								if (aEntryOccurs > bEntryOccurs) return -1;
+								if (aEntryOccurs < bEntryOccurs) return 1;
+							}
+							const aOccurs = occursInAllChunksMap.get(a);
+							const bOccurs = occursInAllChunksMap.get(b);
+							if (aOccurs > bOccurs) return -1;
+							if (aOccurs < bOccurs) return 1;
+							const orgA = originalOrder.get(a);
+							const orgB = originalOrder.get(b);
+							return orgA - orgB;
+						});
+					}
+				);
+			}
+		);
+	}
+}
+
+module.exports = OccurrenceOrderModuleIdsPlugin;
diff --git a/lib/optimize/OccurrenceOrderPlugin.js b/lib/optimize/OccurrenceOrderPlugin.js
index 8e23f951473..c73ec8e5750 100644
--- a/lib/optimize/OccurrenceOrderPlugin.js
+++ b/lib/optimize/OccurrenceOrderPlugin.js
@@ -4,6 +4,8 @@
 */
 "use strict";
 
+// TODO webpack 5 remove this plugin
+// It has been splitted into separate plugins for modules and chunks
 class OccurrenceOrderPlugin {
 	constructor(preferEntry) {
 		if (preferEntry !== undefined && typeof preferEntry !== "boolean") {
@@ -89,7 +91,7 @@ class OccurrenceOrderPlugin {
 						if (aOccurs < bOccurs) return 1;
 						const orgA = originalOrder.get(a);
 						const orgB = originalOrder.get(b);
-						return orgB - orgA;
+						return orgA - orgB;
 					});
 				}
 			);
@@ -122,7 +124,7 @@ class OccurrenceOrderPlugin {
 						if (aOccurs < bOccurs) return 1;
 						const orgA = originalOrder.get(a);
 						const orgB = originalOrder.get(b);
-						return orgB - orgA;
+						return orgA - orgB;
 					});
 				}
 			);
diff --git a/lib/optimize/SplitChunksPlugin.js b/lib/optimize/SplitChunksPlugin.js
index c49c5b1761e..a9bce221baa 100644
--- a/lib/optimize/SplitChunksPlugin.js
+++ b/lib/optimize/SplitChunksPlugin.js
@@ -8,9 +8,16 @@ const crypto = require("crypto");
 const SortableSet = require("../util/SortableSet");
 const GraphHelpers = require("../GraphHelpers");
 const { isSubset } = require("../util/SetHelpers");
+const deterministicGrouping = require("../util/deterministicGrouping");
+const contextify = require("../util/identifier").contextify;
 
+/** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../util/deterministicGrouping").Options<Module>} DeterministicGroupingOptionsForModule */
+/** @typedef {import("../util/deterministicGrouping").GroupedItems<Module>} DeterministicGroupingGroupedItemsForModule */
+
+const deterministicGroupingForModules = /** @type {function(DeterministicGroupingOptionsForModule): DeterministicGroupingGroupedItemsForModule[]} */ (deterministicGrouping);
 
 const hashFilename = name => {
 	return crypto
@@ -104,25 +111,29 @@ module.exports = class SplitChunksPlugin {
 				options.chunks || "all"
 			),
 			minSize: options.minSize || 0,
+			maxSize: options.maxSize || 0,
 			minChunks: options.minChunks || 1,
 			maxAsyncRequests: options.maxAsyncRequests || 1,
 			maxInitialRequests: options.maxInitialRequests || 1,
-			getName:
-				SplitChunksPlugin.normalizeName({
-					name: options.name,
-					automaticNameDelimiter: options.automaticNameDelimiter
-				}) || (() => {}),
+			hidePathInfo: options.hidePathInfo || false,
 			filename: options.filename || undefined,
 			getCacheGroups: SplitChunksPlugin.normalizeCacheGroups({
 				cacheGroups: options.cacheGroups,
+				name: options.name,
 				automaticNameDelimiter: options.automaticNameDelimiter
-			})
+			}),
+			automaticNameDelimiter: options.automaticNameDelimiter,
+			fallbackCacheGroup: SplitChunksPlugin.normalizeFallbackCacheGroup(
+				options.fallbackCacheGroup || {},
+				options
+			)
 		};
 	}
 
-	static normalizeName({ name, automaticNameDelimiter }) {
+	static normalizeName({ name, automaticNameDelimiter, automaticNamePrefix }) {
 		if (name === true) {
-			const cache = new Map();
+			/** @type {WeakMap<Chunk[], Record<string, string>>} */
+			const cache = new WeakMap();
 			const fn = (module, chunks, cacheGroup) => {
 				let cacheEntry = cache.get(chunks);
 				if (cacheEntry === undefined) {
@@ -137,10 +148,12 @@ module.exports = class SplitChunksPlugin {
 					return;
 				}
 				names.sort();
-				let name =
-					(cacheGroup && cacheGroup !== "default"
-						? cacheGroup + automaticNameDelimiter
-						: "") + names.join(automaticNameDelimiter);
+				const prefix =
+					typeof automaticNamePrefix === "string"
+						? automaticNamePrefix
+						: cacheGroup;
+				const namePrefix = prefix ? prefix + automaticNameDelimiter : "";
+				let name = namePrefix + names.join(automaticNameDelimiter);
 				// Filenames and paths can't be too long otherwise an
 				// ENAMETOOLONG error is raised. If the generated name if too
 				// long, it is truncated and a hash is appended. The limit has
@@ -177,7 +190,27 @@ module.exports = class SplitChunksPlugin {
 		if (typeof chunks === "function") return chunks;
 	}
 
-	static normalizeCacheGroups({ cacheGroups, automaticNameDelimiter }) {
+	static normalizeFallbackCacheGroup(
+		{
+			minSize = undefined,
+			maxSize = undefined,
+			automaticNameDelimiter = undefined
+		},
+		{
+			minSize: defaultMinSize = undefined,
+			maxSize: defaultMaxSize = undefined,
+			automaticNameDelimiter: defaultAutomaticNameDelimiter = undefined
+		}
+	) {
+		return {
+			minSize: typeof minSize === "number" ? minSize : defaultMinSize || 0,
+			maxSize: typeof maxSize === "number" ? maxSize : defaultMaxSize || 0,
+			automaticNameDelimiter:
+				automaticNameDelimiter || defaultAutomaticNameDelimiter || "~"
+		};
+	}
+
+	static normalizeCacheGroups({ cacheGroups, name, automaticNameDelimiter }) {
 		if (typeof cacheGroups === "function") {
 			// TODO webpack 5 remove this
 			if (cacheGroups.length !== 1) {
@@ -216,15 +249,21 @@ module.exports = class SplitChunksPlugin {
 						results.push({
 							key: key,
 							priority: option.priority,
-							getName: SplitChunksPlugin.normalizeName({
-								name: option.name,
-								automaticNameDelimiter
-							}),
+							getName:
+								SplitChunksPlugin.normalizeName({
+									name: option.name || name,
+									automaticNameDelimiter:
+										typeof option.automaticNameDelimiter === "string"
+											? option.automaticNameDelimiter
+											: automaticNameDelimiter,
+									automaticNamePrefix: option.automaticNamePrefix
+								}) || (() => {}),
 							chunksFilter: SplitChunksPlugin.normalizeChunksFilter(
 								option.chunks
 							),
 							enforce: option.enforce,
 							minSize: option.minSize,
+							maxSize: option.maxSize,
 							minChunks: option.minChunks,
 							maxAsyncRequests: option.maxAsyncRequests,
 							maxInitialRequests: option.maxInitialRequests,
@@ -278,6 +317,10 @@ module.exports = class SplitChunksPlugin {
 		return false;
 	}
 
+	/**
+	 * @param {Compiler} compiler webpack compiler
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.thisCompilation.tap("SplitChunksPlugin", compilation => {
 			let alreadyOptimized = false;
@@ -447,6 +490,12 @@ module.exports = class SplitChunksPlugin {
 									chunksKeys: new Set()
 								})
 							);
+						} else {
+							if (info.cacheGroup !== cacheGroup) {
+								if (info.cacheGroup.priority < cacheGroup.priority) {
+									info.cacheGroup = cacheGroup;
+								}
+							}
 						}
 						info.modules.add(module);
 						info.size += module.size();
@@ -486,6 +535,12 @@ module.exports = class SplitChunksPlugin {
 										: cacheGroupSource.enforce
 											? 0
 											: this.options.minSize,
+								maxSize:
+									cacheGroupSource.maxSize !== undefined
+										? cacheGroupSource.maxSize
+										: cacheGroupSource.enforce
+											? 0
+											: this.options.maxSize,
 								minChunks:
 									cacheGroupSource.minChunks !== undefined
 										? cacheGroupSource.minChunks
@@ -512,6 +567,10 @@ module.exports = class SplitChunksPlugin {
 									cacheGroupSource.filename !== undefined
 										? cacheGroupSource.filename
 										: this.options.filename,
+								automaticNameDelimiter:
+									cacheGroupSource.automaticNameDelimiter !== undefined
+										? cacheGroupSource.automaticNameDelimiter
+										: this.options.automaticNameDelimiter,
 								reuseExistingChunk: cacheGroupSource.reuseExistingChunk
 							};
 							// For all combination of chunk selection
@@ -537,6 +596,9 @@ module.exports = class SplitChunksPlugin {
 						}
 					}
 
+					/** @type {Map<Chunk, {minSize: number, maxSize: number, automaticNameDelimiter: string}>} */
+					const maxSizeQueueMap = new Map();
+
 					while (chunksInfoMap.size > 0) {
 						// Find best matching entry
 						let bestEntryKey;
@@ -563,6 +625,7 @@ module.exports = class SplitChunksPlugin {
 
 						let chunkName = item.name;
 						// Variable for the new chunk (lazy created)
+						/** @type {Chunk} */
 						let newChunk;
 						// When no chunk name, check if we can reuse a chunk instead of creating a new one
 						let isReused = false;
@@ -591,7 +654,7 @@ module.exports = class SplitChunksPlugin {
 								isReused = true;
 							}
 						}
-						// Check if maxRequests condition can be fullfilled
+						// Check if maxRequests condition can be fulfilled
 
 						const usedChunks = Array.from(item.chunks).filter(chunk => {
 							// skip if we address ourself
@@ -689,6 +752,22 @@ module.exports = class SplitChunksPlugin {
 								}
 							}
 						}
+
+						if (item.cacheGroup.maxSize > 0) {
+							const oldMaxSizeSettings = maxSizeQueueMap.get(newChunk);
+							maxSizeQueueMap.set(newChunk, {
+								minSize: Math.max(
+									oldMaxSizeSettings ? oldMaxSizeSettings.minSize : 0,
+									item.cacheGroup.minSize
+								),
+								maxSize: Math.min(
+									oldMaxSizeSettings ? oldMaxSizeSettings.maxSize : Infinity,
+									item.cacheGroup.maxSize
+								),
+								automaticNameDelimiter: item.cacheGroup.automaticNameDelimiter
+							});
+						}
+
 						// remove all modules from other entries and update size
 						for (const [key, info] of chunksInfoMap) {
 							if (isOverlap(info.chunks, item.chunks)) {
@@ -709,6 +788,77 @@ module.exports = class SplitChunksPlugin {
 							}
 						}
 					}
+
+					// Make sure that maxSize is fulfilled
+					for (const chunk of compilation.chunks.slice()) {
+						const { minSize, maxSize, automaticNameDelimiter } =
+							maxSizeQueueMap.get(chunk) || this.options.fallbackCacheGroup;
+						if (!maxSize) continue;
+						const results = deterministicGroupingForModules({
+							maxSize,
+							minSize,
+							items: chunk.modulesIterable,
+							getKey(module) {
+								const ident = contextify(
+									compilation.options.context,
+									module.identifier()
+								);
+								const name = module.nameForCondition
+									? contextify(
+											compilation.options.context,
+											module.nameForCondition()
+									  )
+									: ident.replace(/^.*!|\?[^?!]*$/g, "");
+								const fullKey =
+									name + automaticNameDelimiter + hashFilename(ident);
+								return fullKey.replace(/[\\/?]/g, "_");
+							},
+							getSize(module) {
+								return module.size();
+							}
+						});
+						results.sort((a, b) => {
+							if (a.key < b.key) return -1;
+							if (a.key > b.key) return 1;
+							return 0;
+						});
+						for (let i = 0; i < results.length; i++) {
+							const group = results[i];
+							const key = this.options.hidePathInfo
+								? hashFilename(group.key)
+								: group.key;
+							let name = chunk.name
+								? chunk.name + automaticNameDelimiter + key
+								: null;
+							if (name && name.length > 100) {
+								name =
+									name.slice(0, 100) +
+									automaticNameDelimiter +
+									hashFilename(name);
+							}
+							let newPart;
+							if (i !== results.length - 1) {
+								newPart = compilation.addChunk(name);
+								chunk.split(newPart);
+								newPart.chunkReason = chunk.chunkReason;
+								// Add all modules to the new chunk
+								for (const module of group.items) {
+									if (typeof module.chunkCondition === "function") {
+										if (!module.chunkCondition(newPart)) continue;
+									}
+									// Add module to new chunk
+									GraphHelpers.connectChunkAndModule(newPart, module);
+									// Remove module from used chunks
+									chunk.removeModule(module);
+									module.rewriteChunkInReasons(chunk, [newPart]);
+								}
+							} else {
+								// change the chunk to be a part
+								newPart = chunk;
+								chunk.name = name;
+							}
+						}
+					}
 				}
 			);
 		});
diff --git a/lib/util/Queue.js b/lib/util/Queue.js
index 385b3a9bf51..6615e9f7759 100644
--- a/lib/util/Queue.js
+++ b/lib/util/Queue.js
@@ -5,7 +5,7 @@
  */
 class Queue {
 	/**
-	 * @param {IterableIterator<T>=} items The initial elements.
+	 * @param {Iterable<T>=} items The initial elements.
 	 */
 	constructor(items) {
 		/** @private @type {Set<T>} */
diff --git a/lib/util/Semaphore.js b/lib/util/Semaphore.js
index 359378056ad..d6c876651eb 100644
--- a/lib/util/Semaphore.js
+++ b/lib/util/Semaphore.js
@@ -5,12 +5,24 @@
 "use strict";
 
 class Semaphore {
+	/**
+	 * Creates an instance of Semaphore.
+	 *
+	 * @param {number} available the amount available number of "tasks"
+	 * in the Semaphore
+	 */
 	constructor(available) {
 		this.available = available;
+		/** @type {(function(): void)[]} */
 		this.waiters = [];
+		/** @private */
 		this._continue = this._continue.bind(this);
 	}
 
+	/**
+	 * @param {function(): void} callback function block to capture and run
+	 * @returns {void}
+	 */
 	acquire(callback) {
 		if (this.available > 0) {
 			this.available--;
diff --git a/lib/util/SetHelpers.js b/lib/util/SetHelpers.js
index 8833415f8e0..96c063c7edc 100644
--- a/lib/util/SetHelpers.js
+++ b/lib/util/SetHelpers.js
@@ -5,7 +5,7 @@
  * @param {Set[]} sets an array of sets being checked for shared elements
  * @returns {Set<TODO>} returns a new Set containing the intersecting items
  */
-function intersect(sets) {
+const intersect = sets => {
 	if (sets.length === 0) return new Set();
 	if (sets.length === 1) return new Set(sets[0]);
 	let minSize = Infinity;
@@ -28,7 +28,7 @@ function intersect(sets) {
 		}
 	}
 	return current;
-}
+};
 
 /**
  * Checks if a set is the subset of another set
@@ -36,13 +36,13 @@ function intersect(sets) {
  * @param {Set<TODO>} smallSet the set whos elements might be contained inside of bigSet
  * @returns {boolean} returns true if smallSet contains all elements inside of the bigSet
  */
-function isSubset(bigSet, smallSet) {
+const isSubset = (bigSet, smallSet) => {
 	if (bigSet.size < smallSet.size) return false;
 	for (const item of smallSet) {
 		if (!bigSet.has(item)) return false;
 	}
 	return true;
-}
+};
 
 exports.intersect = intersect;
 exports.isSubset = isSubset;
diff --git a/lib/util/SortableSet.js b/lib/util/SortableSet.js
index 6bc49a60db6..44b692f37ca 100644
--- a/lib/util/SortableSet.js
+++ b/lib/util/SortableSet.js
@@ -1,19 +1,32 @@
 "use strict";
-//TODO: Make this a generic type
-//https://github.com/Microsoft/TypeScript/issues/23385
-//https://github.com/Microsoft/TypeScript/issues/23384
+
+/**
+ * A subset of Set that offers sorting functionality
+ * @template T item type in set
+ * @extends {Set<T>}
+ */
 class SortableSet extends Set {
+	/**
+	 * Create a new sortable set
+	 * @param {Iterable<T>=} initialIterable The initial iterable value
+	 * @typedef {function(T, T): number} SortFunction
+	 * @param {SortFunction=} defaultSort Default sorting function
+	 */
 	constructor(initialIterable, defaultSort) {
 		super(initialIterable);
+		/** @private @type {function(T, T): number}} */
 		this._sortFn = defaultSort;
+		/** @private @type {function(T, T): number} | null} */
 		this._lastActiveSortFn = null;
+		/** @private @type {Map<Function, T[]> | undefined} */
 		this._cache = undefined;
+		/** @private @type {Map<Function, T[]|string|number> | undefined} */
 		this._cacheOrderIndependent = undefined;
 	}
 
 	/**
-	 * @param {TODO} value - value to add to set
-	 * @returns {this} - returns itself
+	 * @param {T} value value to add to set
+	 * @returns {this} returns itself
 	 */
 	add(value) {
 		this._lastActiveSortFn = null;
@@ -23,19 +36,31 @@ class SortableSet extends Set {
 		return this;
 	}
 
+	/**
+	 * @param {T} value value to delete
+	 * @returns {boolean} true if value existed in set, false otherwise
+	 */
 	delete(value) {
 		this._invalidateCache();
 		this._invalidateOrderedCache();
 		return super.delete(value);
 	}
 
+	/**
+	 * @returns {void}
+	 */
 	clear() {
 		this._invalidateCache();
 		this._invalidateOrderedCache();
 		return super.clear();
 	}
 
-	sortWith(/** @type {(a: TODO, b: TODO) => number} */ sortFn) {
+	/**
+	 * Sort with a comparer function
+	 * @param {SortFunction} sortFn Sorting comparer function
+	 * @returns {void}
+	 */
+	sortWith(sortFn) {
 		if (this.size <= 1 || sortFn === this._lastActiveSortFn) {
 			// already sorted - nothing to do
 			return;
@@ -50,16 +75,14 @@ class SortableSet extends Set {
 		this._invalidateCache();
 	}
 
-	/**
-	 * @returns {void}
-	 */
 	sort() {
 		this.sortWith(this._sortFn);
 	}
 
 	/**
-	 * @param {Function} fn - function to calculate value
-	 * @returns {TODO} - returns result of fn(this), cached until set changes
+	 * Get data from cache
+	 * @param {function(SortableSet<T>): T[]} fn function to calculate value
+	 * @returns {T[]} returns result of fn(this), cached until set changes
 	 */
 	getFromCache(fn) {
 		if (this._cache === undefined) {
@@ -76,8 +99,8 @@ class SortableSet extends Set {
 	}
 
 	/**
-	 * @param {Function} fn - function to calculate value
-	 * @returns {TODO} - returns result of fn(this), cached until set changes
+	 * @param {function(SortableSet<T>): string|number|T[]} fn function to calculate value
+	 * @returns {any} returns result of fn(this), cached until set changes
 	 */
 	getFromUnorderedCache(fn) {
 		if (this._cacheOrderIndependent === undefined) {
@@ -93,12 +116,20 @@ class SortableSet extends Set {
 		return newData;
 	}
 
+	/**
+	 * @private
+	 * @returns {void}
+	 */
 	_invalidateCache() {
 		if (this._cache !== undefined) {
 			this._cache.clear();
 		}
 	}
 
+	/**
+	 * @private
+	 * @returns {void}
+	 */
 	_invalidateOrderedCache() {
 		if (this._cacheOrderIndependent !== undefined) {
 			this._cacheOrderIndependent.clear();
diff --git a/lib/util/StackedSetMap.js b/lib/util/StackedSetMap.js
index 589b68d52b8..fcf628b0deb 100644
--- a/lib/util/StackedSetMap.js
+++ b/lib/util/StackedSetMap.js
@@ -128,8 +128,17 @@ class StackedSetMap {
 }
 
 // TODO remove in webpack 5
-StackedSetMap.prototype.push = util.deprecate(function(item) {
-	this.add(item);
-}, "This is no longer an Array: Use add instead.");
+StackedSetMap.prototype.push = util.deprecate(
+	/**
+	 * @deprecated
+	 * @this {StackedSetMap}
+	 * @param {any} item Item to add
+	 * @returns {void}
+	 */
+	function(item) {
+		this.add(item);
+	},
+	"This is no longer an Array: Use add instead."
+);
 
 module.exports = StackedSetMap;
diff --git a/lib/util/cachedMerge.js b/lib/util/cachedMerge.js
index ff7b4426a62..124f647a3f4 100644
--- a/lib/util/cachedMerge.js
+++ b/lib/util/cachedMerge.js
@@ -7,7 +7,7 @@
 const mergeCache = new WeakMap();
 
 /**
- * Merges two given objects and caches the result to avoid computation if same objects passed as arguements again.
+ * Merges two given objects and caches the result to avoid computation if same objects passed as arguments again.
  * @example
  * // performs Object.assign(first, second), stores the result in WeakMap and returns result
  * cachedMerge({a: 1}, {a: 2})
diff --git a/lib/util/createHash.js b/lib/util/createHash.js
index 2d21d0aa52b..bb5062c6721 100644
--- a/lib/util/createHash.js
+++ b/lib/util/createHash.js
@@ -4,8 +4,18 @@
 */
 "use strict";
 
+/** @typedef {{new(): Hash}} HashConstructor */
+/**
+ * @typedef {Object} Hash
+ * @property {function(string|Buffer, string=): Hash} update
+ * @property {function(string): string} digest
+ */
+
 const BULK_SIZE = 1000;
 
+/**
+ * @implements {Hash}
+ */
 class BulkUpdateDecorator {
 	constructor(hash) {
 		this.hash = hash;
@@ -63,6 +73,11 @@ class DebugHash {
 	}
 }
 
+/**
+ * Creates a hash by name or function
+ * @param {string | HashConstructor} algorithm the algorithm name or a constructor creating a hash
+ * @returns {Hash} the hash
+ */
 module.exports = algorithm => {
 	if (typeof algorithm === "function") {
 		return new BulkUpdateDecorator(new algorithm());
diff --git a/lib/util/deterministicGrouping.js b/lib/util/deterministicGrouping.js
new file mode 100644
index 00000000000..7c47b823d1a
--- /dev/null
+++ b/lib/util/deterministicGrouping.js
@@ -0,0 +1,251 @@
+"use strict";
+
+// Simulations show these probabilities for a single change
+// 93.1% that one group is invalidated
+// 4.8% that two groups are invalidated
+// 1.1% that 3 groups are invalidated
+// 0.1% that 4 or more groups are invalidated
+//
+// And these for removing/adding 10 lexically adjacent files
+// 64.5% that one group is invalidated
+// 24.8% that two groups are invalidated
+// 7.8% that 3 groups are invalidated
+// 2.7% that 4 or more groups are invalidated
+//
+// And these for removing/adding 3 random files
+// 0% that one group is invalidated
+// 3.7% that two groups are invalidated
+// 80.8% that 3 groups are invalidated
+// 12.3% that 4 groups are invalidated
+// 3.2% that 5 or more groups are invalidated
+
+/**
+ *
+ * @param {string} a key
+ * @param {string} b key
+ * @returns {number} the similarity as number
+ */
+const similarity = (a, b) => {
+	const l = Math.min(a.length, b.length);
+	let dist = 0;
+	for (let i = 0; i < l; i++) {
+		const ca = a.charCodeAt(i);
+		const cb = b.charCodeAt(i);
+		dist += Math.max(0, 10 - Math.abs(ca - cb));
+	}
+	return dist;
+};
+
+/**
+ * @param {string} a key
+ * @param {string} b key
+ * @returns {string} the common part and a single char for the difference
+ */
+const getName = (a, b) => {
+	const l = Math.min(a.length, b.length);
+	let r = "";
+	for (let i = 0; i < l; i++) {
+		const ca = a.charAt(i);
+		const cb = b.charAt(i);
+		r += ca;
+		if (ca === cb) {
+			continue;
+		}
+		return r;
+	}
+	return a;
+};
+
+/**
+ * @template T
+ */
+class Node {
+	/**
+	 * @param {T} item item
+	 * @param {string} key key
+	 * @param {number} size size
+	 */
+	constructor(item, key, size) {
+		this.item = item;
+		this.key = key;
+		this.size = size;
+	}
+}
+
+/**
+ * @template T
+ */
+class Group {
+	/**
+	 * @param {Node<T>[]} nodes nodes
+	 * @param {number[]} similarities similarities between the nodes (length = nodes.length - 1)
+	 */
+	constructor(nodes, similarities) {
+		this.nodes = nodes;
+		this.similarities = similarities;
+		this.size = nodes.reduce((size, node) => size + node.size, 0);
+		/** @type {string} */
+		this.key = undefined;
+	}
+}
+
+/**
+ * @template T
+ * @typedef {Object} GroupedItems<T>
+ * @property {string} key
+ * @property {T[]} items
+ * @property {number} size
+ */
+
+/**
+ * @template T
+ * @typedef {Object} Options
+ * @property {number} maxSize maximum size of a group
+ * @property {number} minSize minimum size of a group (preferred over maximum size)
+ * @property {Iterable<T>} items a list of items
+ * @property {function(T): number} getSize function to get size of an item
+ * @property {function(T): string} getKey function to get the key of an item
+ */
+
+/**
+ * @template T
+ * @param {Options<T>} options options object
+ * @returns {GroupedItems<T>[]} grouped items
+ */
+module.exports = ({ maxSize, minSize, items, getSize, getKey }) => {
+	/** @type {Group<T>[]} */
+	const result = [];
+
+	const nodes = Array.from(
+		items,
+		item => new Node(item, getKey(item), getSize(item))
+	);
+
+	/** @type {Node<T>[]} */
+	const initialNodes = [];
+
+	// return nodes bigger than maxSize directly as group
+	for (const node of nodes) {
+		if (node.size >= maxSize) {
+			result.push(new Group([node], []));
+		} else {
+			initialNodes.push(node);
+		}
+	}
+
+	if (initialNodes.length > 0) {
+		// lexically ordering of keys
+		initialNodes.sort((a, b) => {
+			if (a.key < b.key) return -1;
+			if (a.key > b.key) return 1;
+			return 0;
+		});
+
+		// calculate similarities between lexically adjacent nodes
+		/** @type {number[]} */
+		const similarities = [];
+		for (let i = 1; i < initialNodes.length; i++) {
+			const a = initialNodes[i - 1];
+			const b = initialNodes[i];
+			similarities.push(similarity(a.key, b.key));
+		}
+
+		const queue = [new Group(initialNodes, similarities)];
+
+		while (queue.length) {
+			const group = queue.pop();
+			// only groups bigger than maxSize need to be splitted
+			if (group.size < maxSize) {
+				result.push(group);
+				continue;
+			}
+
+			// find unsplittable area from left and right
+			// going minSize from left and right
+			let left = 0;
+			let leftSize = 0;
+			while (leftSize < minSize) {
+				leftSize += group.nodes[left].size;
+				left++;
+			}
+			let right = group.nodes.length - 1;
+			let rightSize = 0;
+			while (rightSize < minSize) {
+				rightSize += group.nodes[right].size;
+				right--;
+			}
+
+			if (left - 1 > right) {
+				// can't split group while holding minSize
+				// because minSize is preferred of maxSize we return
+				// the group here even while it's too big
+				// To avoid this make sure maxSize > minSize * 3
+				result.push(group);
+				continue;
+			}
+			if (left <= right) {
+				// when there is a area between left and right
+				// we look for best split point
+				// we split at the minimum similarity
+				// here key space is separated the most
+				let best = left - 1;
+				let bestSimilarity = group.similarities[best];
+				for (let i = left; i <= right; i++) {
+					const similarity = group.similarities[i];
+					if (similarity < bestSimilarity) {
+						best = i;
+						bestSimilarity = similarity;
+					}
+				}
+				left = best + 1;
+				right = best;
+			}
+
+			// create two new groups for left and right area
+			// and queue them up
+			const rightNodes = [group.nodes[right + 1]];
+			/** @type {number[]} */
+			const rightSimilaries = [];
+			for (let i = right + 2; i < group.nodes.length; i++) {
+				rightSimilaries.push(group.similarities[i - 1]);
+				rightNodes.push(group.nodes[i]);
+			}
+			queue.push(new Group(rightNodes, rightSimilaries));
+
+			const leftNodes = [group.nodes[0]];
+			/** @type {number[]} */
+			const leftSimilaries = [];
+			for (let i = 1; i < left; i++) {
+				leftSimilaries.push(group.similarities[i - 1]);
+				leftNodes.push(group.nodes[i]);
+			}
+			queue.push(new Group(leftNodes, leftSimilaries));
+		}
+	}
+
+	// lexically ordering
+	result.sort((a, b) => {
+		if (a.nodes[0].key < b.nodes[0].key) return -1;
+		if (a.nodes[0].key > b.nodes[0].key) return 1;
+		return 0;
+	});
+
+	// give every group a name
+	for (let i = 0; i < result.length; i++) {
+		const group = result[i];
+		const first = group.nodes[0];
+		const last = group.nodes[group.nodes.length - 1];
+		let name = getName(first.key, last.key);
+		group.key = name;
+	}
+
+	// return the results
+	return result.map(group => {
+		/** @type {GroupedItems} */
+		return {
+			key: group.key,
+			items: group.nodes.map(node => node.item),
+			size: group.size
+		};
+	});
+};
diff --git a/lib/util/identifier.js b/lib/util/identifier.js
index 9176facd0fd..186bc064e53 100644
--- a/lib/util/identifier.js
+++ b/lib/util/identifier.js
@@ -60,13 +60,13 @@ exports.makePathsRelative = (context, identifier, cache) => {
 
 	let cachedResult;
 	let contextCache = relativePaths.get(context);
-	if (typeof contextCache === "undefined") {
+	if (contextCache === undefined) {
 		relativePaths.set(context, (contextCache = new Map()));
 	} else {
 		cachedResult = contextCache.get(identifier);
 	}
 
-	if (typeof cachedResult !== "undefined") {
+	if (cachedResult !== undefined) {
 		return cachedResult;
 	} else {
 		const relativePath = _makePathsRelative(context, identifier);
@@ -74,3 +74,30 @@ exports.makePathsRelative = (context, identifier, cache) => {
 		return relativePath;
 	}
 };
+
+/**
+ * @param {string} context absolute context path
+ * @param {string} request any request string may containing absolute paths, query string, etc.
+ * @returns {string} a new request string avoiding absolute paths when possible
+ */
+exports.contextify = (context, request) => {
+	return request
+		.split("!")
+		.map(r => {
+			const splitPath = r.split("?", 2);
+			if (/^[a-zA-Z]:\\/.test(splitPath[0])) {
+				splitPath[0] = path.win32.relative(context, splitPath[0]);
+				if (!/^[a-zA-Z]:\\/.test(splitPath[0])) {
+					splitPath[0] = splitPath[0].replace(/\\/g, "/");
+				}
+			}
+			if (/^\//.test(splitPath[0])) {
+				splitPath[0] = path.posix.relative(context, splitPath[0]);
+			}
+			if (!/^(\.\.\/|\/|[a-zA-Z]:\\)/.test(splitPath[0])) {
+				splitPath[0] = "./" + splitPath[0];
+			}
+			return splitPath.join("?");
+		})
+		.join("!");
+};
diff --git a/lib/wasm/WasmFinalizeExportsPlugin.js b/lib/wasm/WasmFinalizeExportsPlugin.js
index 5187dd9f124..d665a5b81c2 100644
--- a/lib/wasm/WasmFinalizeExportsPlugin.js
+++ b/lib/wasm/WasmFinalizeExportsPlugin.js
@@ -4,7 +4,7 @@
 	*/
 "use strict";
 
-const UnsupportedWebAssemblyFeatureError = require("../wasm/UnsupportedWebAssemblyFeatureError");
+const UnsupportedWebAssemblyFeatureError = require("./UnsupportedWebAssemblyFeatureError");
 
 class WasmFinalizeExportsPlugin {
 	apply(compiler) {
@@ -25,7 +25,10 @@ class WasmFinalizeExportsPlugin {
 							for (const reason of module.reasons) {
 								// 2. is referenced by a non-WebAssembly module
 								if (reason.module.type.startsWith("webassembly") === false) {
-									const ref = reason.dependency.getReference();
+									const ref = compilation.getDependencyReference(
+										reason.module,
+										reason.dependency
+									);
 
 									const importedNames = ref.importedNames;
 
diff --git a/lib/wasm/WasmMainTemplatePlugin.js b/lib/wasm/WasmMainTemplatePlugin.js
index b946c4e00c8..fccfa819df4 100644
--- a/lib/wasm/WasmMainTemplatePlugin.js
+++ b/lib/wasm/WasmMainTemplatePlugin.js
@@ -8,9 +8,10 @@ const Template = require("../Template");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../MainTemplate")} MainTemplate */
 
 // Get all wasm modules
-function getAllWasmModules(chunk) {
+const getAllWasmModules = chunk => {
 	const wasmModules = chunk.getAllAsyncChunks();
 	const array = [];
 	for (const chunk of wasmModules) {
@@ -22,7 +23,7 @@ function getAllWasmModules(chunk) {
 	}
 
 	return array;
-}
+};
 
 /**
  * generates the import object function for a module
@@ -30,7 +31,7 @@ function getAllWasmModules(chunk) {
  * @param {boolean} mangle mangle imports
  * @returns {string} source code
  */
-function generateImportObject(module, mangle) {
+const generateImportObject = (module, mangle) => {
 	const waitForInstances = new Map();
 	const properties = [];
 	const usedWasmDependencies = WebAssemblyUtils.getUsedDependencies(
@@ -151,7 +152,7 @@ function generateImportObject(module, mangle) {
 			"},"
 		]);
 	}
-}
+};
 
 class WasmMainTemplatePlugin {
 	constructor({ generateLoadBinaryCode, supportsStreaming, mangleImports }) {
@@ -159,6 +160,11 @@ class WasmMainTemplatePlugin {
 		this.supportsStreaming = supportsStreaming;
 		this.mangleImports = mangleImports;
 	}
+
+	/**
+	 * @param {MainTemplate} mainTemplate main template
+	 * @returns {void}
+	 */
 	apply(mainTemplate) {
 		mainTemplate.hooks.localVars.tap(
 			"WasmMainTemplatePlugin",
@@ -329,23 +335,8 @@ class WasmMainTemplatePlugin {
 		);
 		mainTemplate.hooks.hash.tap("WasmMainTemplatePlugin", hash => {
 			hash.update("WasmMainTemplatePlugin");
-			hash.update("1");
-			hash.update(`${mainTemplate.outputOptions.webassemblyModuleFilename}`);
-			hash.update(`${this.mangleImports}`);
+			hash.update("2");
 		});
-		mainTemplate.hooks.hashForChunk.tap(
-			"WasmMainTemplatePlugin",
-			(hash, chunk) => {
-				const chunkModuleMaps = chunk.getChunkModuleMaps(m =>
-					m.type.startsWith("webassembly")
-				);
-				hash.update(JSON.stringify(chunkModuleMaps.id));
-				const wasmModules = getAllWasmModules(chunk);
-				for (const module of wasmModules) {
-					hash.update(module.hash);
-				}
-			}
-		);
 	}
 }
 
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index d5fb13c4eb7..7df85a60159 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -9,7 +9,6 @@ const Template = require("../Template");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 const { RawSource } = require("webpack-sources");
 
-const { shrinkPaddedLEB128 } = require("@webassemblyjs/wasm-opt");
 const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
 const { decode } = require("@webassemblyjs/wasm-parser");
 const t = require("@webassemblyjs/ast");
@@ -21,32 +20,28 @@ const WebAssemblyExportImportedDependency = require("../dependencies/WebAssembly
 
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("./WebAssemblyUtils").UsedWasmDependency} UsedWasmDependency */
+/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../Dependency").DependencyTemplate} DependencyTemplate */
 
 /**
  * @typedef {(ArrayBuffer) => ArrayBuffer} ArrayBufferTransform
  */
 
-/**
- * Run some preprocessing on the binary before wasm-edit
- *
- * @param {ArrayBuffer} ab - original binary
- * @returns {ArrayBufferTransform} transform
- */
-function preprocess(ab) {
-	const optBin = shrinkPaddedLEB128(new Uint8Array(ab));
-	return optBin.buffer;
-}
-
 /**
  * @template T
  * @param {Function[]} fns transforms
  * @returns {Function} composed transform
  */
-function compose(...fns) {
-	return fns.reduce((prevFn, nextFn) => {
-		return value => nextFn(prevFn(value));
-	}, value => value);
-}
+const compose = (...fns) => {
+	return fns.reduce(
+		(prevFn, nextFn) => {
+			return value => nextFn(prevFn(value));
+		},
+		value => value
+	);
+};
 
 // TODO replace with @callback
 
@@ -70,7 +65,7 @@ const removeStartFunc = state => bin => {
  * @param {Object} ast - Module's AST
  * @returns {Array<t.ModuleImport>} - nodes
  */
-function getImportedGlobals(ast) {
+const getImportedGlobals = ast => {
 	const importedGlobals = [];
 
 	t.traverse(ast, {
@@ -82,9 +77,9 @@ function getImportedGlobals(ast) {
 	});
 
 	return importedGlobals;
-}
+};
 
-function getCountImportedFunc(ast) {
+const getCountImportedFunc = ast => {
 	let count = 0;
 
 	t.traverse(ast, {
@@ -96,7 +91,7 @@ function getCountImportedFunc(ast) {
 	});
 
 	return count;
-}
+};
 
 /**
  * Get next type index
@@ -104,15 +99,15 @@ function getCountImportedFunc(ast) {
  * @param {Object} ast - Module's AST
  * @returns {t.Index} - index
  */
-function getNextTypeIndex(ast) {
+const getNextTypeIndex = ast => {
 	const typeSectionMetadata = t.getSectionMetadata(ast, "type");
 
-	if (typeof typeSectionMetadata === "undefined") {
+	if (typeSectionMetadata === undefined) {
 		return t.indexLiteral(0);
 	}
 
 	return t.indexLiteral(typeSectionMetadata.vectorOfSize.value);
-}
+};
 
 /**
  * Get next func index
@@ -125,17 +120,17 @@ function getNextTypeIndex(ast) {
  * @param {Number} countImportedFunc - number of imported funcs
  * @returns {t.Index} - index
  */
-function getNextFuncIndex(ast, countImportedFunc) {
+const getNextFuncIndex = (ast, countImportedFunc) => {
 	const funcSectionMetadata = t.getSectionMetadata(ast, "func");
 
-	if (typeof funcSectionMetadata === "undefined") {
+	if (funcSectionMetadata === undefined) {
 		return t.indexLiteral(0 + countImportedFunc);
 	}
 
 	const vectorOfSize = funcSectionMetadata.vectorOfSize.value;
 
 	return t.indexLiteral(vectorOfSize + countImportedFunc);
-}
+};
 
 /**
  * Create a init instruction for a global
@@ -264,7 +259,7 @@ const rewriteImports = ({ ast, usedDependencyMap }) => bin => {
 				path.node.module + ":" + path.node.name
 			);
 
-			if (typeof result !== "undefined") {
+			if (result !== undefined) {
 				path.node.module = result.module;
 				path.node.name = result.name;
 			}
@@ -366,9 +361,15 @@ class WebAssemblyGenerator extends Generator {
 		this.options = options;
 	}
 
-	generate(module) {
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates mapping from dependencies to templates
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
+	 * @param {string} type which kind of code should be generated
+	 * @returns {Source} generated code
+	 */
+	generate(module, dependencyTemplates, runtimeTemplate, type) {
 		let bin = module.originalSource().source();
-		bin = preprocess(bin);
 
 		const initFuncId = t.identifier(
 			Array.isArray(module.usedExports)
@@ -398,7 +399,10 @@ class WebAssemblyGenerator extends Generator {
 		const externalExports = new Set(
 			module.dependencies
 				.filter(d => d instanceof WebAssemblyExportImportedDependency)
-				.map(d => d.exportName)
+				.map(d => {
+					const wasmDep = /** @type {WebAssemblyExportImportedDependency} */ (d);
+					return wasmDep.exportName;
+				})
 		);
 
 		/** @type {t.Instruction[]} */
diff --git a/lib/wasm/WebAssemblyInInitialChunkError.js b/lib/wasm/WebAssemblyInInitialChunkError.js
new file mode 100644
index 00000000000..319e757aece
--- /dev/null
+++ b/lib/wasm/WebAssemblyInInitialChunkError.js
@@ -0,0 +1,88 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+*/
+"use strict";
+
+const WebpackError = require("../WebpackError");
+
+/** @typedef {import("../Module")} Module */
+/** @typedef {import("../RequestShortener")} RequestShortener */
+
+/**
+ * @param {Module} module module to get chains from
+ * @param {RequestShortener} requestShortener to make readable identifiers
+ * @returns {string[]} all chains to the module
+ */
+const getInitialModuleChains = (module, requestShortener) => {
+	const queue = [
+		{ head: module, message: module.readableIdentifier(requestShortener) }
+	];
+	/** @type {Set<string>} */
+	const results = new Set();
+	/** @type {Set<string>} */
+	const incompleteResults = new Set();
+	/** @type {Set<Module>} */
+	const visitedModules = new Set();
+
+	for (const chain of queue) {
+		const { head, message } = chain;
+		let final = true;
+		/** @type {Set<Module>} */
+		const alreadyReferencedModules = new Set();
+		for (const reason of head.reasons) {
+			const newHead = reason.module;
+			if (newHead) {
+				if (!newHead.getChunks().some(c => c.canBeInitial())) continue;
+				final = false;
+				if (alreadyReferencedModules.has(newHead)) continue;
+				alreadyReferencedModules.add(newHead);
+				const moduleName = newHead.readableIdentifier(requestShortener);
+				const detail = reason.explanation ? ` (${reason.explanation})` : "";
+				const newMessage = `${moduleName}${detail} --> ${message}`;
+				if (visitedModules.has(newHead)) {
+					incompleteResults.add(`... --> ${newMessage}`);
+					continue;
+				}
+				visitedModules.add(newHead);
+				queue.push({
+					head: newHead,
+					message: newMessage
+				});
+			} else {
+				final = false;
+				const newMessage = reason.explanation
+					? `(${reason.explanation}) --> ${message}`
+					: message;
+				results.add(newMessage);
+			}
+		}
+		if (final) {
+			results.add(message);
+		}
+	}
+	for (const result of incompleteResults) {
+		results.add(result);
+	}
+	return Array.from(results);
+};
+
+module.exports = class WebAssemblyInInitialChunkError extends WebpackError {
+	/**
+	 * @param {Module} module WASM module
+	 * @param {RequestShortener} requestShortener request shortener
+	 */
+	constructor(module, requestShortener) {
+		const moduleChains = getInitialModuleChains(module, requestShortener);
+		const message = `WebAssembly module is included in initial chunk.
+This is not allowed, because WebAssembly download and compilation must happen asynchronous.
+Add an async splitpoint (i. e. import()) somewhere between your entrypoint and the WebAssembly module:
+${moduleChains.map(s => `* ${s}`).join("\n")}`;
+
+		super(message);
+		this.name = "WebAssemblyInInitialChunkError";
+		this.hideStack = true;
+		this.module = module;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+};
diff --git a/lib/wasm/WebAssemblyJavascriptGenerator.js b/lib/wasm/WebAssemblyJavascriptGenerator.js
index 994036d3680..b164a029211 100644
--- a/lib/wasm/WebAssemblyJavascriptGenerator.js
+++ b/lib/wasm/WebAssemblyJavascriptGenerator.js
@@ -10,8 +10,20 @@ const { RawSource } = require("webpack-sources");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
 
+/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../Dependency").DependencyTemplate} DependencyTemplate */
+
 class WebAssemblyJavascriptGenerator extends Generator {
-	generate(module, dependencyTemplates, runtimeTemplate) {
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {Map<Function, DependencyTemplate>} dependencyTemplates mapping from dependencies to templates
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
+	 * @param {string} type which kind of code should be generated
+	 * @returns {Source} generated code
+	 */
+	generate(module, dependencyTemplates, runtimeTemplate, type) {
 		const initIdentifer = Array.isArray(module.usedExports)
 			? Template.numberToIdentifer(module.usedExports.length)
 			: "__webpack_init__";
@@ -21,6 +33,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 		const initParams = [];
 		let index = 0;
 		for (const dep of module.dependencies) {
+			const depAsAny = /** @type {any} */ (dep);
 			if (dep.module) {
 				let importData = importedModules.get(dep.module);
 				if (importData === undefined) {
@@ -29,7 +42,8 @@ class WebAssemblyJavascriptGenerator extends Generator {
 						(importData = {
 							importVar: `m${index}`,
 							index,
-							request: dep.userRequest,
+							request:
+								"userRequest" in depAsAny ? depAsAny.userRequest : undefined,
 							names: new Set(),
 							reexports: []
 						})
diff --git a/lib/wasm/WebAssemblyModulesPlugin.js b/lib/wasm/WebAssemblyModulesPlugin.js
index e1ac050c531..ca9bf26bce6 100644
--- a/lib/wasm/WebAssemblyModulesPlugin.js
+++ b/lib/wasm/WebAssemblyModulesPlugin.js
@@ -10,12 +10,19 @@ const WebAssemblyGenerator = require("./WebAssemblyGenerator");
 const WebAssemblyJavascriptGenerator = require("./WebAssemblyJavascriptGenerator");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
+const WebAssemblyInInitialChunkError = require("./WebAssemblyInInitialChunkError");
+
+/** @typedef {import("../Compiler")} Compiler */
 
 class WebAssemblyModulesPlugin {
 	constructor(options) {
 		this.options = options;
 	}
 
+	/**
+	 * @param {Compiler} compiler compiler
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
 			"WebAssemblyModulesPlugin",
@@ -78,6 +85,27 @@ class WebAssemblyModulesPlugin {
 						return result;
 					}
 				);
+
+				compilation.hooks.afterChunks.tap("WebAssemblyModulesPlugin", () => {
+					const initialWasmModules = new Set();
+					for (const chunk of compilation.chunks) {
+						if (chunk.canBeInitial()) {
+							for (const module of chunk.modulesIterable) {
+								if (module.type.startsWith("webassembly")) {
+									initialWasmModules.add(module);
+								}
+							}
+						}
+					}
+					for (const module of initialWasmModules) {
+						compilation.errors.push(
+							new WebAssemblyInInitialChunkError(
+								module,
+								compilation.requestShortener
+							)
+						);
+					}
+				});
 			}
 		);
 	}
diff --git a/lib/web/JsonpChunkTemplatePlugin.js b/lib/web/JsonpChunkTemplatePlugin.js
index bd2bdcb2684..123dd52046a 100644
--- a/lib/web/JsonpChunkTemplatePlugin.js
+++ b/lib/web/JsonpChunkTemplatePlugin.js
@@ -6,7 +6,23 @@
 
 const { ConcatSource } = require("webpack-sources");
 
+/** @typedef {import("../ChunkTemplate")} ChunkTemplate */
+
+const getEntryInfo = chunk => {
+	return [chunk.entryModule].filter(Boolean).map(m =>
+		[m.id].concat(
+			Array.from(chunk.groupsIterable)[0]
+				.chunks.filter(c => c !== chunk)
+				.map(c => c.id)
+		)
+	);
+};
+
 class JsonpChunkTemplatePlugin {
+	/**
+	 * @param {ChunkTemplate} chunkTemplate the chunk template
+	 * @returns {void}
+	 */
 	apply(chunkTemplate) {
 		chunkTemplate.hooks.render.tap(
 			"JsonpChunkTemplatePlugin",
@@ -23,13 +39,7 @@ class JsonpChunkTemplatePlugin {
 					)}] || []).push([${JSON.stringify(chunk.ids)},`
 				);
 				source.add(modules);
-				const entries = [chunk.entryModule].filter(Boolean).map(m =>
-					[m.id].concat(
-						Array.from(chunk.groupsIterable)[0]
-							.chunks.filter(c => c !== chunk)
-							.map(c => c.id)
-					)
-				);
+				const entries = getEntryInfo(chunk);
 				if (entries.length > 0) {
 					source.add(`,${JSON.stringify(entries)}`);
 				} else if (prefetchChunks && prefetchChunks.length) {
@@ -49,6 +59,13 @@ class JsonpChunkTemplatePlugin {
 			hash.update(`${chunkTemplate.outputOptions.jsonpFunction}`);
 			hash.update(`${chunkTemplate.outputOptions.globalObject}`);
 		});
+		chunkTemplate.hooks.hashForChunk.tap(
+			"JsonpChunkTemplatePlugin",
+			(hash, chunk) => {
+				hash.update(JSON.stringify(getEntryInfo(chunk)));
+				hash.update(JSON.stringify(chunk.getChildIdsByOrders().prefetch) || "");
+			}
+		);
 	}
 }
 module.exports = JsonpChunkTemplatePlugin;
diff --git a/lib/web/JsonpExportMainTemplatePlugin.js b/lib/web/JsonpExportMainTemplatePlugin.js
index c2974049358..064b249e3f8 100644
--- a/lib/web/JsonpExportMainTemplatePlugin.js
+++ b/lib/web/JsonpExportMainTemplatePlugin.js
@@ -7,6 +7,9 @@
 const { ConcatSource } = require("webpack-sources");
 
 class JsonpExportMainTemplatePlugin {
+	/**
+	 * @param {string} name jsonp function name
+	 */
 	constructor(name) {
 		this.name = name;
 	}
diff --git a/lib/web/JsonpMainTemplate.runtime.js b/lib/web/JsonpMainTemplate.runtime.js
index d8b642b0861..2af53d839b2 100644
--- a/lib/web/JsonpMainTemplate.runtime.js
+++ b/lib/web/JsonpMainTemplate.runtime.js
@@ -16,7 +16,7 @@ module.exports = function() {
 		var script = document.createElement("script");
 		script.charset = "utf-8";
 		script.src = $require$.p + $hotChunkFilename$;
-		$crossOriginLoading$;
+		if ($crossOriginLoading$) script.crossOrigin = $crossOriginLoading$;
 		head.appendChild(script);
 	}
 
diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js
index e843a270a44..0b4a612c08c 100644
--- a/lib/web/JsonpMainTemplatePlugin.js
+++ b/lib/web/JsonpMainTemplatePlugin.js
@@ -154,15 +154,21 @@ class JsonpMainTemplatePlugin {
 						: "",
 					"script.charset = 'utf-8';",
 					`script.timeout = ${chunkLoadTimeout / 1000};`,
-					crossOriginLoading
-						? `script.crossOrigin = ${JSON.stringify(crossOriginLoading)};`
-						: "",
 					`if (${mainTemplate.requireFn}.nc) {`,
 					Template.indent(
 						`script.setAttribute("nonce", ${mainTemplate.requireFn}.nc);`
 					),
 					"}",
 					"script.src = jsonpScriptSrc(chunkId);",
+					crossOriginLoading
+						? Template.asString([
+								"if (script.src.indexOf(window.location.origin + '/') !== 0) {",
+								Template.indent(
+									`script.crossOrigin = ${JSON.stringify(crossOriginLoading)};`
+								),
+								"}"
+						  ])
+						: "",
 					"onScriptComplete = function (event) {",
 					Template.indent([
 						"// avoid mem leaks in IE.",
@@ -208,9 +214,6 @@ class JsonpMainTemplatePlugin {
 						? `link.type = ${JSON.stringify(jsonpScriptType)};`
 						: "",
 					"link.charset = 'utf-8';",
-					crossOriginLoading
-						? `link.crossOrigin = ${JSON.stringify(crossOriginLoading)};`
-						: "",
 					`if (${mainTemplate.requireFn}.nc) {`,
 					Template.indent(
 						`link.setAttribute("nonce", ${mainTemplate.requireFn}.nc);`
@@ -218,7 +221,16 @@ class JsonpMainTemplatePlugin {
 					"}",
 					'link.rel = "preload";',
 					'link.as = "script";',
-					"link.href = jsonpScriptSrc(chunkId);"
+					"link.href = jsonpScriptSrc(chunkId);",
+					crossOriginLoading
+						? Template.asString([
+								"if (link.href.indexOf(window.location.origin + '/') !== 0) {",
+								Template.indent(
+									`link.crossOrigin = ${JSON.stringify(crossOriginLoading)};`
+								),
+								"}"
+						  ])
+						: ""
 				]);
 			}
 		);
@@ -544,15 +556,13 @@ class JsonpMainTemplatePlugin {
 					}
 				);
 				const runtimeSource = Template.getFunctionContent(
-					require("./JsonpMainTemplate.runtime.js")
+					require("./JsonpMainTemplate.runtime")
 				)
 					.replace(/\/\/\$semicolon/g, ";")
 					.replace(/\$require\$/g, mainTemplate.requireFn)
 					.replace(
 						/\$crossOriginLoading\$/g,
-						crossOriginLoading
-							? `script.crossOrigin = ${JSON.stringify(crossOriginLoading)}`
-							: ""
+						crossOriginLoading ? JSON.stringify(crossOriginLoading) : "null"
 					)
 					.replace(/\$hotMainFilename\$/g, currentHotUpdateMainFilename)
 					.replace(/\$hotChunkFilename\$/g, currentHotUpdateChunkFilename)
@@ -569,11 +579,7 @@ ${globalObject}[${JSON.stringify(hotUpdateFunction)}] = ${runtimeSource}`;
 		);
 		mainTemplate.hooks.hash.tap("JsonpMainTemplatePlugin", hash => {
 			hash.update("jsonp");
-			hash.update("5");
-			hash.update(`${mainTemplate.outputOptions.globalObject}`);
-			hash.update(`${mainTemplate.outputOptions.chunkFilename}`);
-			hash.update(`${mainTemplate.outputOptions.jsonpFunction}`);
-			hash.update(`${mainTemplate.outputOptions.hotUpdateFunction}`);
+			hash.update("6");
 		});
 	}
 }
diff --git a/lib/webpack.js b/lib/webpack.js
index facfebf6c08..58c96d15b62 100644
--- a/lib/webpack.js
+++ b/lib/webpack.js
@@ -15,6 +15,13 @@ const webpackOptionsSchema = require("../schemas/WebpackOptions.json");
 const RemovedPluginError = require("./RemovedPluginError");
 const version = require("../package.json").version;
 
+/** @typedef {import("../declarations/WebpackOptions").WebpackOptions} WebpackOptions */
+
+/**
+ * @param {WebpackOptions} options options object
+ * @param {function(Error=, Stats=): void=} callback callback
+ * @returns {Compiler | MultiCompiler} the compiler object
+ */
 const webpack = (options, callback) => {
 	const webpackOptionsValidationErrors = validateSchema(
 		webpackOptionsSchema,
@@ -34,7 +41,11 @@ const webpack = (options, callback) => {
 		new NodeEnvironmentPlugin().apply(compiler);
 		if (options.plugins && Array.isArray(options.plugins)) {
 			for (const plugin of options.plugins) {
-				plugin.apply(compiler);
+				if (typeof plugin === "function") {
+					plugin.apply(compiler);
+				} else {
+					plugin.apply(compiler);
+				}
 			}
 		}
 		compiler.hooks.environment.call();
@@ -69,6 +80,7 @@ webpack.WebpackOptionsApply = WebpackOptionsApply;
 webpack.Compiler = Compiler;
 webpack.MultiCompiler = MultiCompiler;
 webpack.NodeEnvironmentPlugin = NodeEnvironmentPlugin;
+// @ts-ignore Global @this directive is not supported
 webpack.validate = validateSchema.bind(this, webpackOptionsSchema);
 webpack.validateSchema = validateSchema;
 webpack.WebpackOptionsValidationError = WebpackOptionsValidationError;
@@ -123,6 +135,9 @@ exportPlugins(exports, {
 	UmdMainTemplatePlugin: () => require("./UmdMainTemplatePlugin"),
 	WatchIgnorePlugin: () => require("./WatchIgnorePlugin")
 });
+exportPlugins((exports.dependencies = {}), {
+	DependencyReference: () => require("./dependencies/DependencyReference")
+});
 exportPlugins((exports.optimize = {}), {
 	AggressiveMergingPlugin: () => require("./optimize/AggressiveMergingPlugin"),
 	AggressiveSplittingPlugin: () =>
@@ -134,6 +149,10 @@ exportPlugins((exports.optimize = {}), {
 	ModuleConcatenationPlugin: () =>
 		require("./optimize/ModuleConcatenationPlugin"),
 	OccurrenceOrderPlugin: () => require("./optimize/OccurrenceOrderPlugin"),
+	OccurrenceModuleOrderPlugin: () =>
+		require("./optimize/OccurrenceModuleOrderPlugin"),
+	OccurrenceChunkOrderPlugin: () =>
+		require("./optimize/OccurrenceChunkOrderPlugin"),
 	RuntimeChunkPlugin: () => require("./optimize/RuntimeChunkPlugin"),
 	SideEffectsFlagPlugin: () => require("./optimize/SideEffectsFlagPlugin"),
 	SplitChunksPlugin: () => require("./optimize/SplitChunksPlugin")
diff --git a/lib/webpack.web.js b/lib/webpack.web.js
index 365aa06ad31..1f60eab7f45 100644
--- a/lib/webpack.web.js
+++ b/lib/webpack.web.js
@@ -9,7 +9,7 @@ const WebEnvironmentPlugin = require("./web/WebEnvironmentPlugin");
 const WebpackOptionsApply = require("./WebpackOptionsApply");
 const WebpackOptionsDefaulter = require("./WebpackOptionsDefaulter");
 
-function webpack(options, callback) {
+const webpack = (options, callback) => {
 	new WebpackOptionsDefaulter().process(options);
 
 	const compiler = new Compiler();
@@ -22,7 +22,7 @@ function webpack(options, callback) {
 		compiler.run(callback);
 	}
 	return compiler;
-}
+};
 module.exports = webpack;
 
 webpack.WebpackOptionsDefaulter = WebpackOptionsDefaulter;
diff --git a/lib/webworker/WebWorkerMainTemplatePlugin.js b/lib/webworker/WebWorkerMainTemplatePlugin.js
index e685470960f..39f7dabbd09 100644
--- a/lib/webworker/WebWorkerMainTemplatePlugin.js
+++ b/lib/webworker/WebWorkerMainTemplatePlugin.js
@@ -54,6 +54,20 @@ class WebWorkerMainTemplatePlugin {
 										)} + "`,
 									chunk: {
 										id: '" + chunkId + "',
+										hash: `" + ${JSON.stringify(chunkMaps.hash)}[chunkId] + "`,
+										hashWithLength(length) {
+											const shortChunkHashMap = Object.create(null);
+											for (const chunkId of Object.keys(chunkMaps.hash)) {
+												if (typeof chunkMaps.hash[chunkId] === "string") {
+													shortChunkHashMap[chunkId] = chunkMaps.hash[
+														chunkId
+													].substr(0, length);
+												}
+											}
+											return `" + ${JSON.stringify(
+												shortChunkHashMap
+											)}[chunkId] + "`;
+										},
 										contentHash: {
 											javascript: `" + ${JSON.stringify(
 												chunkMaps.contentHash.javascript
@@ -74,7 +88,10 @@ class WebWorkerMainTemplatePlugin {
 													shortContentHashMap
 												)}[chunkId] + "`;
 											}
-										}
+										},
+										name: `" + (${JSON.stringify(
+											chunkMaps.name
+										)}[chunkId]||chunkId) + "`
 									},
 									contentHashType: "javascript"
 								}) +
@@ -155,7 +172,7 @@ class WebWorkerMainTemplatePlugin {
 					)}];\n` +
 					`${globalObject}[${JSON.stringify(hotUpdateFunction)}] = ` +
 					Template.getFunctionContent(
-						require("./WebWorkerMainTemplate.runtime.js")
+						require("./WebWorkerMainTemplate.runtime")
 					)
 						.replace(/\/\/\$semicolon/g, ";")
 						.replace(/\$require\$/g, mainTemplate.requireFn)
@@ -167,12 +184,7 @@ class WebWorkerMainTemplatePlugin {
 		);
 		mainTemplate.hooks.hash.tap("WebWorkerMainTemplatePlugin", hash => {
 			hash.update("webworker");
-			hash.update("3");
-			hash.update(`${mainTemplate.outputOptions.publicPath}`);
-			hash.update(`${mainTemplate.outputOptions.filename}`);
-			hash.update(`${mainTemplate.outputOptions.chunkFilename}`);
-			hash.update(`${mainTemplate.outputOptions.chunkCallbackName}`);
-			hash.update(`${mainTemplate.outputOptions.globalObject}`);
+			hash.update("4");
 		});
 	}
 }
diff --git a/package.json b/package.json
index 71ba1ff74a7..bdc45b56dd4 100644
--- a/package.json
+++ b/package.json
@@ -1,22 +1,21 @@
 {
   "name": "webpack",
-  "version": "4.12.0",
+  "version": "4.20.2",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
   "dependencies": {
-    "@webassemblyjs/ast": "1.5.12",
-    "@webassemblyjs/helper-module-context": "1.5.12",
-    "@webassemblyjs/wasm-edit": "1.5.12",
-    "@webassemblyjs/wasm-opt": "1.5.12",
-    "@webassemblyjs/wasm-parser": "1.5.12",
+    "@webassemblyjs/ast": "1.7.8",
+    "@webassemblyjs/helper-module-context": "1.7.8",
+    "@webassemblyjs/wasm-edit": "1.7.8",
+    "@webassemblyjs/wasm-parser": "1.7.8",
     "acorn": "^5.6.2",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
     "ajv-keywords": "^3.1.0",
     "chrome-trace-event": "^1.0.0",
-    "enhanced-resolve": "^4.0.0",
-    "eslint-scope": "^3.7.1",
+    "enhanced-resolve": "^4.1.0",
+    "eslint-scope": "^4.0.0",
     "json-parse-better-errors": "^1.0.2",
     "loader-runner": "^2.3.0",
     "loader-utils": "^1.1.0",
@@ -26,41 +25,44 @@
     "neo-async": "^2.5.0",
     "node-libs-browser": "^2.0.0",
     "schema-utils": "^0.4.4",
-    "tapable": "^1.0.0",
+    "tapable": "^1.1.0",
     "uglifyjs-webpack-plugin": "^1.2.4",
     "watchpack": "^1.5.0",
-    "webpack-sources": "^1.0.1"
+    "webpack-sources": "^1.3.0"
   },
   "devDependencies": {
     "@types/node": "^9.6.4",
     "@types/tapable": "^1.0.1",
+    "@types/webpack-sources": "^0.1.4",
     "benchmark": "^2.1.1",
     "bundle-loader": "~0.5.0",
     "codacy-coverage": "^2.0.1",
     "coffee-loader": "^0.9.0",
     "coffeescript": "^1.10.0",
-    "coveralls": "^2.11.2",
+    "coveralls": "^3.0.2",
     "css-loader": "^0.28.3",
     "es6-promise-polyfill": "^1.1.1",
-    "eslint": "^4.19.1",
+    "eslint": "^5.2.0",
     "eslint-config-prettier": "^2.9.0",
-    "eslint-plugin-jest": "^21.17.0",
-    "eslint-plugin-node": "^6.0.1",
-    "eslint-plugin-prettier": "^2.6.0",
+    "eslint-plugin-jest": "^21.18.0",
+    "eslint-plugin-node": "^7.0.1",
+    "eslint-plugin-prettier": "^2.6.2",
     "express": "~4.13.1",
     "file-loader": "^1.1.6",
     "glob": "^7.1.2",
+    "husky": "^1.0.0-rc.6",
     "i18n-webpack-plugin": "^1.0.0",
     "istanbul": "^0.4.5",
     "jade": "^1.11.0",
     "jade-loader": "~0.8.0",
-    "jest": "^23.0.1",
-    "jest-silent-reporter": "^0.0.5",
+    "jest": "^23.4.1",
     "json-loader": "^0.5.7",
+    "json-schema-to-typescript": "^6.0.1",
     "less": "^2.5.1",
     "less-loader": "^4.0.3",
+    "lint-staged": "^7.2.0",
     "lodash": "^4.17.4",
-    "prettier": "^1.13.5",
+    "prettier": "^1.14.0",
     "pug": "^2.0.3",
     "pug-loader": "^2.4.0",
     "raw-loader": "~0.5.0",
@@ -70,7 +72,7 @@
     "script-loader": "~0.7.0",
     "simple-git": "^1.65.0",
     "style-loader": "^0.19.1",
-    "typescript": "^2.9.0-dev.20180518",
+    "typescript": "^3.0.0-rc",
     "url-loader": "^0.6.2",
     "val-loader": "^1.0.2",
     "vm-browserify": "~0.0.0",
@@ -102,26 +104,27 @@
   "scripts": {
     "setup": "node ./setup/setup.js",
     "test": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest",
+    "test:update-snapshots": "yarn jest -u",
     "test:integration": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.test.js\"",
     "test:basic": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/{TestCasesNormal,StatsTestCases,ConfigTestCases}.test.js\"",
     "test:unit": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.unittest.js\"",
-    "travis:integration": "yarn cover:init && yarn cover:integration \"test/((?!TestCases)|TestCasesD)\" --ci $JEST && mv coverage/coverage-final.json coverage/coverage-final-1.json && yarn cover:integration \"test/TestCases(?!D)\" --ci $JEST && mv coverage/coverage-final.json coverage/coverage-final-2.json",
+    "travis:integration": "yarn cover:init && yarn cover:integration \"test/(?!TestCases)\" --ci $JEST && mv coverage/coverage-final.json coverage/coverage-final-1.json && yarn cover:integration \"test/TestCasesD\" --ci $JEST && mv coverage/coverage-final.json coverage/coverage-final-2.json && yarn cover:integration \"test/TestCases(?!D)\" --ci $JEST && mv coverage/coverage-final.json coverage/coverage-final-3.json",
     "travis:basic": "yarn test:basic --ci $JEST",
     "travis:lint-unit": "yarn lint && yarn cover:init && yarn cover:unit --ci $JEST",
     "travis:benchmark": "yarn benchmark --ci",
-    "appveyor:integration": "yarn cover:init && yarn cover:integration \"test/((?!TestCases)|TestCasesD)\" --ci %JEST% && move coverage\\coverage-final.json coverage\\coverage-final-1.json && yarn cover:integration \"test/TestCases(?!D)\" --ci %JEST% && move coverage\\coverage-final.json coverage\\coverage-final-2.json",
+    "appveyor:integration": "yarn cover:init && yarn cover:integration \"test/(?!TestCases)\" --ci %JEST% && move coverage\\coverage-final.json coverage\\coverage-final-1.json&& yarn cover:integration \"test/TestCasesD\" --ci %JEST% && move coverage\\coverage-final.json coverage\\coverage-final-2.json && yarn cover:integration \"test/TestCases(?!D)\" --ci %JEST% && move coverage\\coverage-final.json coverage\\coverage-final-3.json",
     "appveyor:unit": "yarn cover:init && yarn cover:unit --ci %JEST%",
     "appveyor:benchmark": "yarn benchmark --ci",
-    "circleci:test": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --ci",
-    "circleci:lint": "yarn lint",
     "build:examples": "cd examples && node buildAll.js",
     "pretest": "yarn lint",
     "prelint": "yarn setup",
-    "lint": "yarn code-lint && yarn schema-lint && yarn type-lint",
-    "code-lint": "eslint --cache setup lib bin hot buildin benchmark \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\"",
+    "lint": "yarn code-lint && yarn schema-lint && yarn type-lint && yarn special-lint",
+    "code-lint": "eslint --cache \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.js\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
     "type-lint": "tsc --pretty",
-    "fix": "yarn code-lint --fix",
-    "pretty": "prettier --write \"setup/**/*.js\" \"lib/**/*.js\" \"bin/*.js\" \"hot/*.js\" \"buildin/*.js\" \"benchmark/**/*.js\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" \"declarations.d.ts\"",
+    "special-lint": "node tooling/inherit-types && node tooling/format-schemas && node tooling/compile-to-definitions",
+    "special-lint-fix": "node tooling/inherit-types --write --override && node tooling/format-schemas --write && node tooling/compile-to-definitions --write",
+    "fix": "yarn code-lint --fix && yarn special-lint-fix",
+    "pretty": "prettier --loglevel warn --write \"*.{ts,js,json}\" \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.{js,json}\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
     "schema-lint": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.lint.js\" --no-verbose",
     "benchmark": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.benchmark.js\" --runInBand",
     "cover": "yarn cover:init && yarn cover:all && yarn cover:report",
@@ -131,6 +134,16 @@
     "cover:unit": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.unittest.js\" --coverage",
     "cover:report": "istanbul report"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.js|{lib,setup,bin,hot,buildin,tooling,schemas}/**/*.js|test/*.js|{test,examples}/**/webpack.config.js}": [
+      "eslint --cache"
+    ]
+  },
   "jest": {
     "forceExit": true,
     "setupTestFrameworkScriptFile": "<rootDir>/test/setupTestFramework.js",
@@ -139,35 +152,38 @@
       "<rootDir>/test/*.unittest.js"
     ],
     "watchPathIgnorePatterns": [
-      "<rootDir>/node_modules/webpack/node_modules/",
-      "<rootDir>/test/js/",
-      "<rootDir>/test/browsertest/js/",
-      "<rootDir>/test/fixtures/temp-cache-fixture/",
+      "<rootDir>/.git",
+      "<rootDir>/node_modules",
+      "<rootDir>/test/js",
+      "<rootDir>/test/browsertest/js",
+      "<rootDir>/test/fixtures/temp-cache-fixture",
       "<rootDir>/test/fixtures/temp-",
-      "<rootDir>/benchmark/",
+      "<rootDir>/benchmark",
       "<rootDir>/examples/*/dist",
-      "<rootDir>/coverage/",
-      "<rootDir>/.eslintcache/"
+      "<rootDir>/coverage",
+      "<rootDir>/.eslintcache"
     ],
     "modulePathIgnorePatterns": [
-      "<rootDir>/node_modules/webpack/node_modules/",
-      "<rootDir>/test/js/",
-      "<rootDir>/test/browsertest/js/",
-      "<rootDir>/test/fixtures/temp-cache-fixture/",
+      "<rootDir>/.git",
+      "<rootDir>/node_modules/webpack/node_modules",
+      "<rootDir>/test/js",
+      "<rootDir>/test/browsertest/js",
+      "<rootDir>/test/fixtures/temp-cache-fixture",
       "<rootDir>/test/fixtures/temp-",
-      "<rootDir>/benchmark/",
+      "<rootDir>/benchmark",
       "<rootDir>/examples/*/dist",
-      "<rootDir>/coverage/",
-      "<rootDir>/.eslintcache/"
+      "<rootDir>/coverage",
+      "<rootDir>/.eslintcache"
     ],
     "transformIgnorePatterns": [
-      "<rootDir>/"
+      "<rootDir>"
     ],
     "coverageDirectory": "<rootDir>/coverage",
     "coveragePathIgnorePatterns": [
       "\\.runtime\\.js$",
-      "<rootDir>/test/",
-      "<rootDir>/schemas/"
+      "<rootDir>/test",
+      "<rootDir>/schemas",
+      "<rootDir>/node_modules"
     ],
     "testEnvironment": "node",
     "coverageReporters": [
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
index ed3dfa894c9..ea06060b23c 100644
--- a/schemas/WebpackOptions.json
+++ b/schemas/WebpackOptions.json
@@ -1,123 +1,107 @@
 {
-  "additionalProperties": false,
   "definitions": {
-    "common.pluginFunction": {
-      "description": "Function acting as plugin",
-      "instanceof": "Function",
-      "properties": {
-        "apply": {
-          "description": "The run point of the plugin, required method.",
-          "instanceof": "Function"
-        }
-      },
-      "additionalProperties": true,
-      "required": [
-        "apply"
-      ]
-    },
-    "common.pluginObject": {
-      "description": "Plugin instance",
-      "type": "object",
-      "properties": {
-        "apply": {
-          "description": "The run point of the plugin, required method.",
-          "instanceof": "Function"
-        }
-      },
-      "additionalProperties": true,
-      "required": [
-        "apply"
-      ]
-    },
-    "common.arrayOfStringOrStringArrayValues": {
+    "ArrayOfStringOrStringArrayValues": {
+      "type": "array",
       "items": {
         "description": "string or array of strings",
         "anyOf": [
           {
-            "minLength": 1,
-            "type": "string"
+            "type": "string",
+            "minLength": 1
           },
           {
+            "type": "array",
             "items": {
               "description": "A non-empty string",
-              "minLength": 1,
-              "type": "string"
-            },
-            "type": "array"
+              "type": "string",
+              "minLength": 1
+            }
           }
         ]
-      },
-      "type": "array"
-    },
-    "common.arrayOfStringValues": {
-      "items": {
-        "description": "A non-empty string",
-        "minLength": 1,
-        "type": "string"
-      },
-      "type": "array"
+      }
     },
-    "common.nonEmptyArrayOfUniqueStringValues": {
+    "ArrayOfStringValues": {
+      "type": "array",
       "items": {
         "description": "A non-empty string",
-        "minLength": 1,
-        "type": "string"
-      },
-      "minItems": 1,
-      "type": "array",
-      "uniqueItems": true
+        "type": "string",
+        "minLength": 1
+      }
     },
-    "entry": {
-      "oneOf": [
+    "Entry": {
+      "anyOf": [
         {
-          "minProperties": 1,
-          "additionalProperties": {
-            "description": "An entry point with name",
-            "oneOf": [
-              {
-                "description": "The string is resolved to a module which is loaded upon startup.",
-                "minLength": 1,
-                "type": "string"
-              },
-              {
-                "description": "All modules are loaded upon startup. The last one is exported.",
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/common.nonEmptyArrayOfUniqueStringValues"
-                  }
-                ]
-              }
-            ]
-          },
-          "description": "Multiple entry bundles are created. The key is the chunk name. The value can be a string or an array.",
-          "type": "object"
+          "$ref": "#/definitions/EntryDynamic"
         },
+        {
+          "$ref": "#/definitions/EntryStatic"
+        }
+      ]
+    },
+    "EntryDynamic": {
+      "description": "A Function returning an entry object, an entry string, an entry array or a promise to these things.",
+      "instanceof": "Function",
+      "tsType": "(() => EntryStatic | Promise<EntryStatic>)"
+    },
+    "EntryItem": {
+      "oneOf": [
         {
           "description": "An entry point without name. The string is resolved to a module which is loaded upon startup.",
-          "minLength": 1,
-          "type": "string"
+          "type": "string",
+          "minLength": 1
         },
         {
           "description": "An entry point without name. All modules are loaded upon startup. The last one is exported.",
           "anyOf": [
             {
-              "$ref": "#/definitions/common.nonEmptyArrayOfUniqueStringValues"
+              "$ref": "#/definitions/NonEmptyArrayOfUniqueStringValues"
             }
           ]
+        }
+      ]
+    },
+    "EntryObject": {
+      "description": "Multiple entry bundles are created. The key is the chunk name. The value can be a string or an array.",
+      "type": "object",
+      "additionalProperties": {
+        "description": "An entry point with name",
+        "oneOf": [
+          {
+            "description": "The string is resolved to a module which is loaded upon startup.",
+            "type": "string",
+            "minLength": 1
+          },
+          {
+            "description": "All modules are loaded upon startup. The last one is exported.",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/NonEmptyArrayOfUniqueStringValues"
+              }
+            ]
+          }
+        ]
+      },
+      "minProperties": 1
+    },
+    "EntryStatic": {
+      "oneOf": [
+        {
+          "$ref": "#/definitions/EntryObject"
         },
         {
-          "description": "A Function returning an entry object, an entry string, an entry array or a promise to these things.",
-          "instanceof": "Function"
+          "$ref": "#/definitions/EntryItem"
         }
       ]
     },
-    "externals": {
+    "ExternalItem": {
       "anyOf": [
         {
           "description": "An exact matched dependency becomes external. The same string is used as external dependency.",
           "type": "string"
         },
         {
+          "description": "If an dependency matches exactly a property of the object, the property value is used as dependency.",
+          "type": "object",
           "additionalProperties": {
             "description": "The dependency used for the external",
             "anyOf": [
@@ -127,38 +111,120 @@
               {
                 "type": "object"
               },
+              {
+                "$ref": "#/definitions/ArrayOfStringValues"
+              },
               {
                 "type": "boolean"
               }
             ]
-          },
-          "description": "If an dependency matches exactly a property of the object, the property value is used as dependency.",
-          "type": "object"
+          }
         },
+        {
+          "description": "Every matched dependency becomes external.",
+          "instanceof": "RegExp",
+          "tsType": "RegExp"
+        }
+      ]
+    },
+    "Externals": {
+      "anyOf": [
         {
           "description": "`function(context, request, callback(err, result))` The function is called on each dependency.",
-          "instanceof": "Function"
+          "instanceof": "Function",
+          "tsType": "((context: string, request: string, callback: (err?: Error, result?: string) => void) => void)"
         },
         {
-          "description": "Every matched dependency becomes external.",
-          "instanceof": "RegExp"
+          "$ref": "#/definitions/ExternalItem"
         },
         {
+          "type": "array",
           "items": {
             "description": "External configuration",
             "anyOf": [
               {
-                "$ref": "#/definitions/externals"
+                "description": "`function(context, request, callback(err, result))` The function is called on each dependency.",
+                "instanceof": "Function",
+                "tsType": "((context: string, request: string, callback: (err?: Error, result?: string) => void) => void)"
+              },
+              {
+                "$ref": "#/definitions/ExternalItem"
               }
             ]
-          },
-          "type": "array"
+          }
         }
       ]
     },
-    "module": {
+    "FilterItemTypes": {
+      "anyOf": [
+        {
+          "instanceof": "RegExp",
+          "tsType": "RegExp"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "instanceof": "Function",
+          "tsType": "Function"
+        }
+      ]
+    },
+    "FilterTypes": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/FilterItemTypes"
+        },
+        {
+          "type": "array",
+          "items": {
+            "description": "Rule to filter",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/FilterItemTypes"
+              }
+            ]
+          }
+        }
+      ]
+    },
+    "LibraryCustomUmdObject": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "amd": {
+          "description": "Name of the exposed AMD library in the UMD",
+          "type": "string"
+        },
+        "commonjs": {
+          "description": "Name of the exposed commonjs export in the UMD",
+          "type": "string"
+        },
+        "root": {
+          "description": "Name of the property exposed globally by a UMD library",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "$ref": "#/definitions/ArrayOfStringValues"
+            }
+          ]
+        }
+      }
+    },
+    "ModuleOptions": {
+      "type": "object",
       "additionalProperties": false,
       "properties": {
+        "defaultRules": {
+          "description": "An array of rules applied by default for modules.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/RuleSetRules"
+            }
+          ]
+        },
         "exprContextCritical": {
           "description": "Enable warnings for full dynamic dependencies",
           "type": "boolean"
@@ -174,7 +240,8 @@
               "type": "boolean"
             },
             {
-              "instanceof": "RegExp"
+              "instanceof": "RegExp",
+              "tsType": "RegExp"
             }
           ]
         },
@@ -186,27 +253,30 @@
           "description": "Don't parse files matching. It's matched against the full resolved request.",
           "anyOf": [
             {
+              "type": "array",
               "items": {
                 "description": "A regular expression, when matched the module is not parsed",
-                "instanceof": "RegExp"
+                "instanceof": "RegExp",
+                "tsType": "RegExp"
               },
-              "minItems": 1,
-              "type": "array"
+              "minItems": 1
             },
             {
-              "instanceof": "RegExp"
+              "instanceof": "RegExp",
+              "tsType": "RegExp"
             },
             {
-              "instanceof": "Function"
+              "instanceof": "Function",
+              "tsType": "Function"
             },
             {
+              "type": "array",
               "items": {
                 "description": "An absolute path, when the module starts with this path it is not parsed",
                 "type": "string",
                 "absolutePath": true
               },
-              "minItems": 1,
-              "type": "array"
+              "minItems": 1
             },
             {
               "type": "string",
@@ -215,21 +285,21 @@
           ]
         },
         "rules": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/ruleSet-rules"
-            }
-          ],
-          "description": "An array of rules applied for modules."
-        },
-        "defaultRules": {
-          "description": "An array of rules applied by default for modules.",
+          "description": "An array of rules applied for modules.",
           "anyOf": [
             {
-              "$ref": "#/definitions/ruleSet-rules"
+              "$ref": "#/definitions/RuleSetRules"
             }
           ]
         },
+        "strictExportPresence": {
+          "description": "Emit errors instead of warnings when imported names don't exist in imported module",
+          "type": "boolean"
+        },
+        "strictThisContextOnImports": {
+          "description": "Handle the this context correctly according to the spec for namespace objects",
+          "type": "boolean"
+        },
         "unknownContextCritical": {
           "description": "Enable warnings when using the require function in a not statically analyse-able way",
           "type": "boolean"
@@ -245,7 +315,8 @@
               "type": "boolean"
             },
             {
-              "instanceof": "RegExp"
+              "instanceof": "RegExp",
+              "tsType": "RegExp"
             }
           ]
         },
@@ -260,7 +331,8 @@
               "type": "boolean"
             },
             {
-              "instanceof": "Function"
+              "instanceof": "Function",
+              "tsType": "Function"
             }
           ]
         },
@@ -274,89 +346,473 @@
         },
         "wrappedContextRegExp": {
           "description": "Set the inner regular expression for partial dynamic dependencies",
-          "instanceof": "RegExp"
+          "instanceof": "RegExp",
+          "tsType": "RegExp"
+        }
+      }
+    },
+    "NodeOptions": {
+      "type": "object",
+      "additionalProperties": {
+        "description": "Include a polyfill for the node.js module",
+        "enum": [false, true, "mock", "empty"]
+      },
+      "properties": {
+        "Buffer": {
+          "description": "Include a polyfill for the 'Buffer' variable",
+          "enum": [false, true, "mock"]
         },
-        "strictExportPresence": {
-          "description": "Emit errors instead of warnings when imported names don't exist in imported module",
-          "type": "boolean"
+        "__dirname": {
+          "description": "Include a polyfill for the '__dirname' variable",
+          "enum": [false, true, "mock"]
         },
-        "strictThisContextOnImports": {
-          "description": "Handle the this context correctly according to the spec for namespace objects",
+        "__filename": {
+          "description": "Include a polyfill for the '__filename' variable",
+          "enum": [false, true, "mock"]
+        },
+        "console": {
+          "description": "Include a polyfill for the 'console' variable",
+          "enum": [false, true, "mock"]
+        },
+        "global": {
+          "description": "Include a polyfill for the 'global' variable",
           "type": "boolean"
+        },
+        "process": {
+          "description": "Include a polyfill for the 'process' variable",
+          "enum": [false, true, "mock"]
         }
+      }
+    },
+    "NonEmptyArrayOfUniqueStringValues": {
+      "type": "array",
+      "items": {
+        "description": "A non-empty string",
+        "type": "string",
+        "minLength": 1
       },
-      "type": "object"
+      "minItems": 1,
+      "uniqueItems": true
     },
-    "output": {
+    "OptimizationOptions": {
+      "description": "Enables/Disables integrated optimizations",
+      "type": "object",
       "additionalProperties": false,
       "properties": {
-        "auxiliaryComment": {
-          "description": "Add a comment in the UMD wrapper.",
-          "anyOf": [
-            {
-              "description": "Append the same comment above each import style.",
-              "type": "string"
-            },
-            {
-              "additionalProperties": false,
-              "description": "Set explicit comments for `commonjs`, `commonjs2`, `amd`, and `root`.",
-              "properties": {
-                "amd": {
-                  "description": "Set comment for `amd` section in UMD",
-                  "type": "string"
-                },
-                "commonjs": {
-                  "description": "Set comment for `commonjs` (exports) section in UMD",
-                  "type": "string"
-                },
-                "commonjs2": {
-                  "description": "Set comment for `commonjs2` (module.exports) section in UMD",
-                  "type": "string"
-                },
-                "root": {
-                  "description": "Set comment for `root` (global variable) section in UMD",
-                  "type": "string"
-                }
-              },
-              "type": "object"
-            }
-          ]
+        "checkWasmTypes": {
+          "description": "Check for incompatible wasm types when importing/exporting from/to ESM",
+          "type": "boolean"
         },
-        "chunkFilename": {
-          "description": "The filename of non-entry chunks as relative path inside the `output.path` directory.",
-          "type": "string",
-          "absolutePath": false
+        "chunkIds": {
+          "description": "Define the algorithm to choose chunk ids (named: readable ids for better debugging, size: numeric ids focused on minimal initial download size, total-size: numeric ids focused on minimal total download size, false: no algorithm used, as custom one can be provided via plugin)",
+          "enum": ["natural", "named", "size", "total-size", false]
         },
-        "webassemblyModuleFilename": {
-          "description": "The filename of WebAssembly modules as relative path inside the `output.path` directory.",
-          "type": "string",
-          "absolutePath": false
+        "concatenateModules": {
+          "description": "Concatenate modules when possible to generate less modules, more efficient code and enable more optimizations by the minimizer",
+          "type": "boolean"
         },
-        "globalObject": {
-          "description": "An expression which is used to address the global object/scope in runtime code",
-          "type": "string",
-          "minLength": 1
+        "flagIncludedChunks": {
+          "description": "Also flag chunks as loaded which contain a subset of the modules",
+          "type": "boolean"
         },
-        "crossOriginLoading": {
-          "description": "This option enables cross-origin loading of chunks.",
-          "enum": [
-            false,
-            "anonymous",
-            "use-credentials"
-          ]
+        "hashedModuleIds": {
+          "description": "Use hashed module id instead module identifiers for better long term caching (deprecated, used moduleIds: hashed instead)",
+          "type": "boolean"
         },
-        "jsonpScriptType": {
-          "description": "This option enables loading async chunks via a custom script type, such as script type=\"module\"",
-          "enum": [
-            false,
-            "text/javascript",
-            "module"
-          ]
+        "mangleWasmImports": {
+          "description": "Reduce size of WASM by changing imports to shorter strings.",
+          "type": "boolean"
         },
-        "chunkLoadTimeout": {
+        "mergeDuplicateChunks": {
+          "description": "Merge chunks which contain the same modules",
+          "type": "boolean"
+        },
+        "minimize": {
+          "description": "Enable minimizing the output. Uses optimization.minimizer.",
+          "type": "boolean"
+        },
+        "minimizer": {
+          "description": "Minimizer(s) to use for minimizing the output",
+          "type": "array",
+          "items": {
+            "description": "Plugin of type object or instanceof Function",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/WebpackPluginInstance"
+              },
+              {
+                "$ref": "#/definitions/WebpackPluginFunction"
+              }
+            ]
+          }
+        },
+        "moduleIds": {
+          "description": "Define the algorithm to choose module ids (natural: numeric ids in order of usage, named: readable ids for better debugging, hashed: short hashes as ids for better long term caching, size: numeric ids focused on minimal initial download size, total-size: numeric ids focused on minimal total download size, false: no algorithm used, as custom one can be provided via plugin)",
+          "enum": ["natural", "named", "hashed", "size", "total-size", false]
+        },
+        "namedChunks": {
+          "description": "Use readable chunk identifiers for better debugging (deprecated, used chunkIds: named instead)",
+          "type": "boolean"
+        },
+        "namedModules": {
+          "description": "Use readable module identifiers for better debugging (deprecated, used moduleIds: named instead)",
+          "type": "boolean"
+        },
+        "noEmitOnErrors": {
+          "description": "Avoid emitting assets when errors occur",
+          "type": "boolean"
+        },
+        "nodeEnv": {
+          "description": "Set process.env.NODE_ENV to a specific value",
+          "anyOf": [
+            {
+              "enum": [false]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "occurrenceOrder": {
+          "description": "Figure out a order of modules which results in the smallest initial bundle",
+          "type": "boolean"
+        },
+        "portableRecords": {
+          "description": "Generate records with relative paths to be able to move the context folder",
+          "type": "boolean"
+        },
+        "providedExports": {
+          "description": "Figure out which exports are provided by modules to generate more efficient code",
+          "type": "boolean"
+        },
+        "removeAvailableModules": {
+          "description": "Removes modules from chunks when these modules are already included in all parents",
+          "type": "boolean"
+        },
+        "removeEmptyChunks": {
+          "description": "Remove chunks which are empty",
+          "type": "boolean"
+        },
+        "runtimeChunk": {
+          "description": "Create an additional chunk which contains only the webpack runtime and chunk hash maps",
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "enum": ["single", "multiple"]
+            },
+            {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "name": {
+                  "description": "The name or name factory for the runtime chunks",
+                  "oneOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "instanceof": "Function",
+                      "tsType": "Function"
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        },
+        "sideEffects": {
+          "description": "Skip over modules which are flagged to contain no side effects when exports are not used",
+          "type": "boolean"
+        },
+        "splitChunks": {
+          "description": "Optimize duplication and caching by splitting chunks by shared modules and cache group",
+          "oneOf": [
+            {
+              "enum": [false]
+            },
+            {
+              "$ref": "#/definitions/OptimizationSplitChunksOptions"
+            }
+          ]
+        },
+        "usedExports": {
+          "description": "Figure out which exports are used by modules to mangle export names, omit unused exports and generate more efficient code",
+          "type": "boolean"
+        }
+      }
+    },
+    "OptimizationSplitChunksOptions": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "automaticNameDelimiter": {
+          "description": "Sets the name delimiter for created chunks",
+          "type": "string",
+          "minLength": 1
+        },
+        "cacheGroups": {
+          "description": "Assign modules to a cache group (modules from different cache groups are tried to keep in separate chunks)",
+          "type": "object",
+          "additionalProperties": {
+            "description": "Configuration for a cache group",
+            "anyOf": [
+              {
+                "enum": [false]
+              },
+              {
+                "instanceof": "Function",
+                "tsType": "Function"
+              },
+              {
+                "type": "string"
+              },
+              {
+                "instanceof": "RegExp",
+                "tsType": "RegExp"
+              },
+              {
+                "type": "object",
+                "additionalProperties": false,
+                "properties": {
+                  "automaticNameDelimiter": {
+                    "description": "Sets the name delimiter for created chunks",
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "automaticNamePrefix": {
+                    "description": "Sets the name prefix for created chunks",
+                    "type": "string"
+                  },
+                  "chunks": {
+                    "description": "Select chunks for determining cache group content (defaults to \"initial\", \"initial\" and \"all\" requires adding these chunks to the HTML)",
+                    "oneOf": [
+                      {
+                        "enum": ["initial", "async", "all"]
+                      },
+                      {
+                        "instanceof": "Function",
+                        "tsType": "Function"
+                      }
+                    ]
+                  },
+                  "enforce": {
+                    "description": "Ignore minimum size, minimum chunks and maximum requests and always create chunks for this cache group",
+                    "type": "boolean"
+                  },
+                  "filename": {
+                    "description": "Sets the template for the filename for created chunks (Only works for initial chunks)",
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "maxAsyncRequests": {
+                    "description": "Maximum number of requests which are accepted for on-demand loading",
+                    "type": "number",
+                    "minimum": 1
+                  },
+                  "maxInitialRequests": {
+                    "description": "Maximum number of initial chunks which are accepted for an entry point",
+                    "type": "number",
+                    "minimum": 1
+                  },
+                  "maxSize": {
+                    "description": "Maximal size hint for the created chunks",
+                    "type": "number",
+                    "minimum": 0
+                  },
+                  "minChunks": {
+                    "description": "Minimum number of times a module has to be duplicated until it's considered for splitting",
+                    "type": "number",
+                    "minimum": 1
+                  },
+                  "minSize": {
+                    "description": "Minimal size for the created chunk",
+                    "type": "number",
+                    "minimum": 0
+                  },
+                  "name": {
+                    "description": "Give chunks for this cache group a name (chunks with equal name are merged)",
+                    "oneOf": [
+                      {
+                        "type": "boolean"
+                      },
+                      {
+                        "instanceof": "Function",
+                        "tsType": "Function"
+                      },
+                      {
+                        "type": "string"
+                      }
+                    ]
+                  },
+                  "priority": {
+                    "description": "Priority of this cache group",
+                    "type": "number"
+                  },
+                  "reuseExistingChunk": {
+                    "description": "Try to reuse existing chunk (with name) when it has matching modules",
+                    "type": "boolean"
+                  },
+                  "test": {
+                    "description": "Assign modules to a cache group",
+                    "oneOf": [
+                      {
+                        "instanceof": "Function",
+                        "tsType": "Function"
+                      },
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "instanceof": "RegExp",
+                        "tsType": "RegExp"
+                      }
+                    ]
+                  }
+                }
+              }
+            ]
+          }
+        },
+        "chunks": {
+          "description": "Select chunks for determining shared modules (defaults to \"async\", \"initial\" and \"all\" requires adding these chunks to the HTML)",
+          "oneOf": [
+            {
+              "enum": ["initial", "async", "all"]
+            },
+            {
+              "instanceof": "Function",
+              "tsType": "Function"
+            }
+          ]
+        },
+        "fallbackCacheGroup": {
+          "description": "Options for modules not selected by any other cache group",
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "automaticNameDelimiter": {
+              "description": "Sets the name delimiter for created chunks",
+              "type": "string",
+              "minLength": 1
+            },
+            "maxSize": {
+              "description": "Maximal size hint for the created chunks",
+              "type": "number",
+              "minimum": 0
+            },
+            "minSize": {
+              "description": "Minimal size for the created chunk",
+              "type": "number",
+              "minimum": 0
+            }
+          }
+        },
+        "filename": {
+          "description": "Sets the template for the filename for created chunks (Only works for initial chunks)",
+          "type": "string",
+          "minLength": 1
+        },
+        "hidePathInfo": {
+          "description": "Prevents exposing path info when creating names for parts splitted by maxSize",
+          "type": "boolean"
+        },
+        "maxAsyncRequests": {
+          "description": "Maximum number of requests which are accepted for on-demand loading",
+          "type": "number",
+          "minimum": 1
+        },
+        "maxInitialRequests": {
+          "description": "Maximum number of initial chunks which are accepted for an entry point",
+          "type": "number",
+          "minimum": 1
+        },
+        "maxSize": {
+          "description": "Maximal size hint for the created chunks",
+          "type": "number",
+          "minimum": 0
+        },
+        "minChunks": {
+          "description": "Minimum number of times a module has to be duplicated until it's considered for splitting",
+          "type": "number",
+          "minimum": 1
+        },
+        "minSize": {
+          "description": "Minimal size for the created chunks",
+          "type": "number",
+          "minimum": 0
+        },
+        "name": {
+          "description": "Give chunks created a name (chunks with equal name are merged)",
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "instanceof": "Function",
+              "tsType": "Function"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      }
+    },
+    "OutputOptions": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "auxiliaryComment": {
+          "description": "Add a comment in the UMD wrapper.",
+          "anyOf": [
+            {
+              "description": "Append the same comment above each import style.",
+              "type": "string"
+            },
+            {
+              "description": "Set explicit comments for `commonjs`, `commonjs2`, `amd`, and `root`.",
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "amd": {
+                  "description": "Set comment for `amd` section in UMD",
+                  "type": "string"
+                },
+                "commonjs": {
+                  "description": "Set comment for `commonjs` (exports) section in UMD",
+                  "type": "string"
+                },
+                "commonjs2": {
+                  "description": "Set comment for `commonjs2` (module.exports) section in UMD",
+                  "type": "string"
+                },
+                "root": {
+                  "description": "Set comment for `root` (global variable) section in UMD",
+                  "type": "string"
+                }
+              }
+            }
+          ]
+        },
+        "chunkCallbackName": {
+          "description": "The callback function name used by webpack for loading of chunks in WebWorkers.",
+          "type": "string"
+        },
+        "chunkFilename": {
+          "description": "The filename of non-entry chunks as relative path inside the `output.path` directory.",
+          "type": "string",
+          "absolutePath": false
+        },
+        "chunkLoadTimeout": {
           "description": "Number of milliseconds before chunk request expires",
           "type": "number"
         },
+        "crossOriginLoading": {
+          "description": "This option enables cross-origin loading of chunks.",
+          "enum": [false, "anonymous", "use-credentials"]
+        },
         "devtoolFallbackModuleFilenameTemplate": {
           "description": "Similar to `output.devtoolModuleFilenameTemplate`, but used in the case of duplicate module identifiers.",
           "anyOf": [
@@ -364,7 +820,8 @@
               "type": "string"
             },
             {
-              "instanceof": "Function"
+              "instanceof": "Function",
+              "tsType": "Function"
             }
           ]
         },
@@ -388,7 +845,8 @@
               "type": "string"
             },
             {
-              "instanceof": "Function"
+              "instanceof": "Function",
+              "tsType": "Function"
             }
           ]
         },
@@ -400,26 +858,28 @@
           "description": "Specifies the name of each output file on disk. You must **not** specify an absolute path here! The `output.path` option determines the location on disk the files are written to, filename is used solely for naming the individual files.",
           "anyOf": [
             {
-              "type": "string"
+              "type": "string",
+              "absolutePath": false
             },
             {
-              "instanceof": "Function"
+              "instanceof": "Function",
+              "tsType": "Function"
             }
-          ],
-          "absolutePath": false
+          ]
+        },
+        "globalObject": {
+          "description": "An expression which is used to address the global object/scope in runtime code",
+          "type": "string",
+          "minLength": 1
         },
         "hashDigest": {
           "description": "Digest type used for the hash",
-          "enum": [
-            "latin1",
-            "hex",
-            "base64"
-          ]
+          "type": "string"
         },
         "hashDigestLength": {
           "description": "Number of chars which are used for the hash",
-          "minimum": 1,
-          "type": "number"
+          "type": "number",
+          "minimum": 1
         },
         "hashFunction": {
           "description": "Algorithm used for generation the hash (see node.js crypto package)",
@@ -429,26 +889,28 @@
               "minLength": 1
             },
             {
-              "instanceof": "Function"
+              "instanceof": "Function",
+              "tsType": "(new () => import('../lib/util/createHash').Hash)"
             }
           ]
         },
         "hashSalt": {
           "description": "Any string which is added to the hash to salt it",
-          "minLength": 1,
-          "type": "string"
+          "type": "string",
+          "minLength": 1
         },
         "hotUpdateChunkFilename": {
           "description": "The filename of the Hot Update Chunks. They are inside the output.path directory.",
           "anyOf": [
             {
-              "type": "string"
+              "type": "string",
+              "absolutePath": false
             },
             {
-              "instanceof": "Function"
+              "instanceof": "Function",
+              "tsType": "Function"
             }
-          ],
-          "absolutePath": false
+          ]
         },
         "hotUpdateFunction": {
           "description": "The JSONP function used by webpack for async loading of hot update chunks.",
@@ -458,61 +920,51 @@
           "description": "The filename of the Hot Update Main File. It is inside the `output.path` directory.",
           "anyOf": [
             {
-              "type": "string"
+              "type": "string",
+              "absolutePath": false
             },
             {
-              "instanceof": "Function"
+              "instanceof": "Function",
+              "tsType": "Function"
             }
-          ],
-          "absolutePath": false
+          ]
         },
         "jsonpFunction": {
           "description": "The JSONP function used by webpack for async loading of chunks.",
           "type": "string"
         },
-        "chunkCallbackName": {
-          "description": "The callback function name used by webpack for loading of chunks in WebWorkers.",
-          "type": "string"
+        "jsonpScriptType": {
+          "description": "This option enables loading async chunks via a custom script type, such as script type=\"module\"",
+          "enum": [false, "text/javascript", "module"]
         },
         "library": {
+          "description": "If set, export the bundle as library. `output.library` is the name.",
           "anyOf": [
             {
               "type": "string"
             },
             {
+              "type": "array",
               "items": {
                 "description": "A part of the library name",
                 "type": "string"
-              },
-              "type": "array"
+              }
             },
             {
-              "type": "object",
-              "additionalProperties": false,
-              "properties": {
-                "root": {
-                  "description": "Name of the property exposed globally by a UMD library",
-                  "anyOf": [
-                    {
-                      "type": "string"
-                    },
-                    {
-                      "$ref": "#/definitions/common.arrayOfStringValues"
-                    }
-                  ]
-                },
-                "amd": {
-                  "description": "Name of the exposed AMD library in the UMD",
-                  "type": "string"
-                },
-                "commonjs": {
-                  "description": "Name of the exposed commonjs export in the UMD",
-                  "type": "string"
-                }
-              }
+              "$ref": "#/definitions/LibraryCustomUmdObject"
+            }
+          ]
+        },
+        "libraryExport": {
+          "description": "Specify which export should be exposed as library",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "$ref": "#/definitions/ArrayOfStringValues"
             }
-          ],
-          "description": "If set, export the bundle as library. `output.library` is the name."
+          ]
         },
         "libraryTarget": {
           "description": "Type of library",
@@ -527,22 +979,12 @@
             "commonjs2",
             "commonjs-module",
             "amd",
+            "amd-require",
             "umd",
             "umd2",
             "jsonp"
           ]
         },
-        "libraryExport": {
-          "description": "Specify which export should be exposed as library",
-          "anyOf": [
-            {
-              "type": "string"
-            },
-            {
-              "$ref": "#/definitions/common.arrayOfStringValues"
-            }
-          ]
-        },
         "path": {
           "description": "The output directory as **absolute path** (required).",
           "type": "string",
@@ -559,7 +1001,8 @@
               "type": "string"
             },
             {
-              "instanceof": "Function"
+              "instanceof": "Function",
+              "tsType": "Function"
             }
           ]
         },
@@ -579,26 +1022,56 @@
         "umdNamedDefine": {
           "description": "If `output.libraryTarget` is set to umd and `output.library` is set, setting this to true will name the AMD module.",
           "type": "boolean"
+        },
+        "webassemblyModuleFilename": {
+          "description": "The filename of WebAssembly modules as relative path inside the `output.path` directory.",
+          "type": "string",
+          "absolutePath": false
         }
-      },
-      "type": "object"
+      }
     },
-    "resolve": {
+    "PerformanceOptions": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "assetFilter": {
+          "description": "Filter function to select assets that are checked",
+          "instanceof": "Function",
+          "tsType": "Function"
+        },
+        "hints": {
+          "description": "Sets the format of the hints: warnings, errors or nothing at all",
+          "enum": [false, "warning", "error"]
+        },
+        "maxAssetSize": {
+          "description": "Filesize limit (in bytes) when exceeded, that webpack will provide performance hints",
+          "type": "number"
+        },
+        "maxEntrypointSize": {
+          "description": "Total size of an entry point (in bytes)",
+          "type": "number"
+        }
+      }
+    },
+    "ResolveOptions": {
+      "type": "object",
       "additionalProperties": false,
       "properties": {
         "alias": {
           "description": "Redirect module requests",
           "anyOf": [
             {
+              "type": "object",
               "additionalProperties": {
                 "description": "New request",
                 "type": "string"
-              },
-              "type": "object"
+              }
             },
             {
+              "type": "array",
               "items": {
                 "description": "Alias configuration",
+                "type": "object",
                 "additionalProperties": false,
                 "properties": {
                   "alias": {
@@ -613,10 +1086,8 @@
                     "description": "Redirect only exact matching request",
                     "type": "boolean"
                   }
-                },
-                "type": "object"
-              },
-              "type": "array"
+                }
+              }
             }
           ]
         },
@@ -624,23 +1095,28 @@
           "description": "Fields in the description file (package.json) which are used to redirect requests inside the module",
           "anyOf": [
             {
-              "$ref": "#/definitions/common.arrayOfStringOrStringArrayValues"
+              "$ref": "#/definitions/ArrayOfStringOrStringArrayValues"
             }
           ]
         },
         "cachePredicate": {
           "description": "Predicate function to decide which requests should be cached",
-          "instanceof": "Function"
+          "instanceof": "Function",
+          "tsType": "Function"
         },
         "cacheWithContext": {
           "description": "Include the context information in the cache identifier when caching",
           "type": "boolean"
         },
+        "concord": {
+          "description": "Enable concord resolving extras",
+          "type": "boolean"
+        },
         "descriptionFiles": {
           "description": "Filenames used to find a description file",
           "anyOf": [
             {
-              "$ref": "#/definitions/common.arrayOfStringValues"
+              "$ref": "#/definitions/ArrayOfStringValues"
             }
           ]
         },
@@ -656,7 +1132,7 @@
           "description": "Extensions added to the request when trying to find the file",
           "anyOf": [
             {
-              "$ref": "#/definitions/common.arrayOfStringValues"
+              "$ref": "#/definitions/ArrayOfStringValues"
             }
           ]
         },
@@ -667,7 +1143,7 @@
           "description": "Field names from the description file (package.json) which are used to find the default entry point",
           "anyOf": [
             {
-              "$ref": "#/definitions/common.arrayOfStringOrStringArrayValues"
+              "$ref": "#/definitions/ArrayOfStringOrStringArrayValues"
             }
           ]
         },
@@ -675,7 +1151,7 @@
           "description": "Filenames used to find the default entry point if there is no description file or main field",
           "anyOf": [
             {
-              "$ref": "#/definitions/common.arrayOfStringValues"
+              "$ref": "#/definitions/ArrayOfStringValues"
             }
           ]
         },
@@ -683,7 +1159,7 @@
           "description": "Extensions added to the module request when trying to find the module",
           "anyOf": [
             {
-              "$ref": "#/definitions/common.arrayOfStringValues"
+              "$ref": "#/definitions/ArrayOfStringValues"
             }
           ]
         },
@@ -691,7 +1167,7 @@
           "description": "Folder names or directory paths where to find modules",
           "anyOf": [
             {
-              "$ref": "#/definitions/common.arrayOfStringValues"
+              "$ref": "#/definitions/ArrayOfStringValues"
             }
           ]
         },
@@ -702,10 +1178,10 @@
             "description": "Plugin of type object or instanceof Function",
             "anyOf": [
               {
-                "$ref": "#/definitions/common.pluginObject"
+                "$ref": "#/definitions/WebpackPluginInstance"
               },
               {
-                "$ref": "#/definitions/common.pluginFunction"
+                "$ref": "#/definitions/WebpackPluginFunction"
               }
             ]
           }
@@ -717,52 +1193,123 @@
           "description": "Enable resolving symlinks to the original location",
           "type": "boolean"
         },
-        "concord": {
-          "description": "Enable concord resolving extras",
-          "type": "boolean"
-        },
         "unsafeCache": {
           "description": "Enable caching of successfully resolved requests",
           "anyOf": [
             {
               "type": "boolean"
             },
-            {
-              "additionalProperties": true,
-              "type": "object"
+            {
+              "type": "object",
+              "additionalProperties": true
+            }
+          ]
+        },
+        "useSyncFileSystemCalls": {
+          "description": "Use synchronous filesystem calls for the resolver",
+          "type": "boolean"
+        }
+      }
+    },
+    "RuleSetCondition": {
+      "anyOf": [
+        {
+          "instanceof": "RegExp",
+          "tsType": "RegExp"
+        },
+        {
+          "type": "string",
+          "minLength": 1
+        },
+        {
+          "instanceof": "Function",
+          "tsType": "((value: string) => boolean)"
+        },
+        {
+          "$ref": "#/definitions/RuleSetConditions"
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "and": {
+              "description": "Logical AND",
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/RuleSetConditions"
+                }
+              ]
+            },
+            "exclude": {
+              "description": "Exclude all modules matching any of these conditions",
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/RuleSetConditionOrConditions"
+                }
+              ]
+            },
+            "include": {
+              "description": "Exclude all modules matching not any of these conditions",
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/RuleSetConditionOrConditions"
+                }
+              ]
+            },
+            "not": {
+              "description": "Logical NOT",
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/RuleSetConditions"
+                }
+              ]
+            },
+            "or": {
+              "description": "Logical OR",
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/RuleSetConditions"
+                }
+              ]
+            },
+            "test": {
+              "description": "Exclude all modules matching any of these conditions",
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/RuleSetConditionOrConditions"
+                }
+              ]
             }
-          ]
-        },
-        "useSyncFileSystemCalls": {
-          "description": "Use synchronous filesystem calls for the resolver",
-          "type": "boolean"
+          }
         }
-      },
-      "type": "object"
+      ]
     },
-    "ruleSet-condition": {
+    "RuleSetConditionAbsolute": {
       "anyOf": [
         {
-          "instanceof": "RegExp"
+          "instanceof": "RegExp",
+          "tsType": "RegExp"
         },
         {
-          "minLength": 1,
-          "type": "string"
+          "type": "string",
+          "absolutePath": true
         },
         {
-          "instanceof": "Function"
+          "instanceof": "Function",
+          "tsType": "((value: string) => boolean)"
         },
         {
-          "$ref": "#/definitions/ruleSet-conditions"
+          "$ref": "#/definitions/RuleSetConditionsAbsolute"
         },
         {
+          "type": "object",
           "additionalProperties": false,
           "properties": {
             "and": {
               "description": "Logical AND",
               "anyOf": [
                 {
-                  "$ref": "#/definitions/ruleSet-conditions"
+                  "$ref": "#/definitions/RuleSetConditionsAbsolute"
                 }
               ]
             },
@@ -770,7 +1317,7 @@
               "description": "Exclude all modules matching any of these conditions",
               "anyOf": [
                 {
-                  "$ref": "#/definitions/ruleSet-condition"
+                  "$ref": "#/definitions/RuleSetConditionOrConditionsAbsolute"
                 }
               ]
             },
@@ -778,7 +1325,7 @@
               "description": "Exclude all modules matching not any of these conditions",
               "anyOf": [
                 {
-                  "$ref": "#/definitions/ruleSet-condition"
+                  "$ref": "#/definitions/RuleSetConditionOrConditionsAbsolute"
                 }
               ]
             },
@@ -786,7 +1333,7 @@
               "description": "Logical NOT",
               "anyOf": [
                 {
-                  "$ref": "#/definitions/ruleSet-conditions"
+                  "$ref": "#/definitions/RuleSetConditionsAbsolute"
                 }
               ]
             },
@@ -794,7 +1341,7 @@
               "description": "Logical OR",
               "anyOf": [
                 {
-                  "$ref": "#/definitions/ruleSet-conditions"
+                  "$ref": "#/definitions/RuleSetConditionsAbsolute"
                 }
               ]
             },
@@ -802,31 +1349,65 @@
               "description": "Exclude all modules matching any of these conditions",
               "anyOf": [
                 {
-                  "$ref": "#/definitions/ruleSet-condition"
+                  "$ref": "#/definitions/RuleSetConditionOrConditionsAbsolute"
                 }
               ]
             }
-          },
-          "type": "object"
+          }
+        }
+      ]
+    },
+    "RuleSetConditionOrConditions": {
+      "description": "One or multiple rule conditions",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/RuleSetCondition"
+        },
+        {
+          "$ref": "#/definitions/RuleSetConditions"
+        }
+      ]
+    },
+    "RuleSetConditionOrConditionsAbsolute": {
+      "description": "One or multiple rule conditions",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/RuleSetConditionAbsolute"
+        },
+        {
+          "$ref": "#/definitions/RuleSetConditionsAbsolute"
         }
       ]
     },
-    "ruleSet-conditions": {
+    "RuleSetConditions": {
+      "type": "array",
       "items": {
         "description": "A rule condition",
         "anyOf": [
           {
-            "$ref": "#/definitions/ruleSet-condition"
+            "$ref": "#/definitions/RuleSetCondition"
           }
         ]
       },
-      "type": "array"
+      "tsType": "RuleSetConditionsRecursive"
     },
-    "ruleSet-loader": {
-      "minLength": 1,
-      "type": "string"
+    "RuleSetConditionsAbsolute": {
+      "type": "array",
+      "items": {
+        "description": "A rule condition",
+        "anyOf": [
+          {
+            "$ref": "#/definitions/RuleSetConditionAbsolute"
+          }
+        ]
+      },
+      "tsType": "RuleSetConditionsAbsoluteRecursive"
+    },
+    "RuleSetLoader": {
+      "type": "string",
+      "minLength": 1
     },
-    "ruleSet-query": {
+    "RuleSetQuery": {
       "anyOf": [
         {
           "type": "object"
@@ -836,46 +1417,43 @@
         }
       ]
     },
-    "ruleSet-rule": {
+    "RuleSetRule": {
+      "type": "object",
       "additionalProperties": false,
       "properties": {
+        "compiler": {
+          "description": "Match the child compiler name",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/RuleSetConditionOrConditions"
+            }
+          ]
+        },
         "enforce": {
           "description": "Enforce this rule as pre or post step",
-          "enum": [
-            "pre",
-            "post"
-          ]
+          "enum": ["pre", "post"]
         },
         "exclude": {
           "description": "Shortcut for resource.exclude",
-          "allOf": [
-            {
-              "$ref": "#/definitions/ruleSet-condition"
-            },
+          "anyOf": [
             {
-              "absolutePath": true
+              "$ref": "#/definitions/RuleSetConditionOrConditionsAbsolute"
             }
           ]
         },
         "include": {
           "description": "Shortcut for resource.include",
-          "allOf": [
-            {
-              "$ref": "#/definitions/ruleSet-condition"
-            },
+          "anyOf": [
             {
-              "absolutePath": true
+              "$ref": "#/definitions/RuleSetConditionOrConditionsAbsolute"
             }
           ]
         },
         "issuer": {
           "description": "Match the issuer of the module (The module pointing to this module)",
-          "allOf": [
-            {
-              "$ref": "#/definitions/ruleSet-condition"
-            },
+          "anyOf": [
             {
-              "absolutePath": true
+              "$ref": "#/definitions/RuleSetConditionOrConditionsAbsolute"
             }
           ]
         },
@@ -883,10 +1461,10 @@
           "description": "Shortcut for use.loader",
           "anyOf": [
             {
-              "$ref": "#/definitions/ruleSet-loader"
+              "$ref": "#/definitions/RuleSetLoader"
             },
             {
-              "$ref": "#/definitions/ruleSet-use"
+              "$ref": "#/definitions/RuleSetUse"
             }
           ]
         },
@@ -894,7 +1472,7 @@
           "description": "Shortcut for use.loader",
           "anyOf": [
             {
-              "$ref": "#/definitions/ruleSet-use"
+              "$ref": "#/definitions/RuleSetUse"
             }
           ]
         },
@@ -902,7 +1480,7 @@
           "description": "Only execute the first matching rule in this array",
           "anyOf": [
             {
-              "$ref": "#/definitions/ruleSet-rules"
+              "$ref": "#/definitions/RuleSetRules"
             }
           ]
         },
@@ -910,54 +1488,37 @@
           "description": "Shortcut for use.options",
           "anyOf": [
             {
-              "$ref": "#/definitions/ruleSet-query"
+              "$ref": "#/definitions/RuleSetQuery"
             }
           ]
         },
         "parser": {
           "description": "Options for parsing",
-          "additionalProperties": true,
-          "type": "object"
-        },
-        "resolve": {
-          "description": "Options for the resolver",
           "type": "object",
-          "anyOf": [
-            {
-              "$ref": "#/definitions/resolve"
-            }
-          ]
-        },
-        "sideEffects": {
-          "description": "Flags a module as with or without side effects",
-          "type": "boolean"
+          "additionalProperties": true
         },
         "query": {
           "description": "Shortcut for use.query",
           "anyOf": [
             {
-              "$ref": "#/definitions/ruleSet-query"
+              "$ref": "#/definitions/RuleSetQuery"
             }
           ]
         },
-        "type": {
-          "description": "Module type to use for the module",
-          "enum": [
-            "javascript/auto",
-            "javascript/dynamic",
-            "javascript/esm",
-            "json",
-            "webassembly/experimental"
+        "resolve": {
+          "description": "Options for the resolver",
+          "type": "object",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ResolveOptions"
+            }
           ]
         },
         "resource": {
           "description": "Match the resource path of the module",
-          "allOf": [
-            {
-              "$ref": "#/definitions/ruleSet-condition"
-            },
+          "anyOf": [
             {
-              "absolutePath": true
+              "$ref": "#/definitions/RuleSetConditionOrConditionsAbsolute"
             }
           ]
         },
@@ -965,15 +1526,7 @@
           "description": "Match the resource query of the module",
           "anyOf": [
             {
-              "$ref": "#/definitions/ruleSet-condition"
-            }
-          ]
-        },
-        "compiler": {
-          "description": "Match the child compiler name",
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ruleSet-condition"
+              "$ref": "#/definitions/RuleSetConditionOrConditions"
             }
           ]
         },
@@ -981,659 +1534,494 @@
           "description": "Match and execute these rules when this rule is matched",
           "anyOf": [
             {
-              "$ref": "#/definitions/ruleSet-rules"
+              "$ref": "#/definitions/RuleSetRules"
             }
           ]
         },
+        "sideEffects": {
+          "description": "Flags a module as with or without side effects",
+          "type": "boolean"
+        },
         "test": {
           "description": "Shortcut for resource.test",
-          "allOf": [
-            {
-              "$ref": "#/definitions/ruleSet-condition"
-            },
+          "anyOf": [
             {
-              "absolutePath": true
+              "$ref": "#/definitions/RuleSetConditionOrConditionsAbsolute"
             }
           ]
         },
+        "type": {
+          "description": "Module type to use for the module",
+          "enum": [
+            "javascript/auto",
+            "javascript/dynamic",
+            "javascript/esm",
+            "json",
+            "webassembly/experimental"
+          ]
+        },
         "use": {
           "description": "Modifiers applied to the module when rule is matched",
           "anyOf": [
             {
-              "$ref": "#/definitions/ruleSet-use"
-            }
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "ruleSet-rules": {
-      "items": {
-        "description": "A rule",
-        "anyOf": [
-          {
-            "$ref": "#/definitions/ruleSet-rule"
-          }
-        ]
-      },
-      "type": "array"
-    },
-    "ruleSet-use": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ruleSet-use-item"
-        },
-        {
-          "instanceof": "Function"
-        },
-        {
-          "items": {
-            "description": "An use item",
-            "anyOf": [
-              {
-                "$ref": "#/definitions/ruleSet-use-item"
-              }
-            ]
-          },
-          "type": "array"
-        }
-      ]
-    },
-    "ruleSet-use-item": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ruleSet-loader"
-        },
-        {
-          "instanceof": "Function"
-        },
-        {
-          "additionalProperties": false,
-          "properties": {
-            "loader": {
-              "description": "Loader name",
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ruleSet-loader"
-                }
-              ]
-            },
-            "options": {
-              "description": "Loader options",
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ruleSet-query"
-                }
-              ]
-            },
-            "ident": {
-              "description": "Unique loader identifier",
-              "type": "string"
-            },
-            "query": {
-              "description": "Loader query",
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ruleSet-query"
-                }
-              ]
+              "$ref": "#/definitions/RuleSetUse"
             }
-          },
-          "type": "object"
-        }
-      ]
-    },
-    "filter-item-types": {
-      "anyOf": [
-        {
-          "instanceof": "RegExp"
-        },
-        {
-          "type": "string"
-        },
-        {
-          "instanceof": "Function"
-        }
-      ]
-    },
-    "filter-types": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/filter-item-types"
-        },
-        {
-          "type": "array",
-          "items": {
-            "description": "Rule to filter",
-            "anyOf": [
-              {
-                "$ref": "#/definitions/filter-item-types"
-              }
-            ]
-          }
-        }
-      ]
-    }
-  },
-  "properties": {
-    "mode": {
-      "description": "Enable production optimizations or development hints.",
-      "enum": [
-        "development",
-        "production",
-        "none"
-      ]
-    },
-    "amd": {
-      "description": "Set the value of `require.amd` and `define.amd`."
-    },
-    "bail": {
-      "description": "Report the first error as a hard error instead of tolerating it.",
-      "type": "boolean"
-    },
-    "cache": {
-      "description": "Cache generated modules and chunks to improve performance for multiple incremental builds.",
-      "anyOf": [
-        {
-          "description": "You can pass `false` to disable it.",
-          "type": "boolean"
-        },
-        {
-          "description": "You can pass an object to enable it and let webpack use the passed object as cache. This way you can share the cache object between multiple compiler calls.",
-          "type": "object"
+          ]
         }
-      ]
-    },
-    "context": {
-      "description": "The base directory (absolute path!) for resolving the `entry` option. If `output.pathinfo` is set, the included pathinfo is shortened to this directory.",
-      "type": "string",
-      "absolutePath": true
+      }
     },
-    "dependencies": {
-      "description": "References to other configurations to depend on.",
+    "RuleSetRules": {
+      "type": "array",
       "items": {
-        "description": "References to another configuration to depend on.",
-        "type": "string"
-      },
-      "type": "array"
-    },
-    "devServer": {
-      "description": "Options for the webpack-dev-server",
-      "type": "object"
+        "description": "A rule",
+        "anyOf": [
+          {
+            "$ref": "#/definitions/RuleSetRule"
+          }
+        ]
+      }
     },
-    "devtool": {
-      "description": "A developer tool to enhance debugging.",
+    "RuleSetUse": {
       "anyOf": [
         {
-          "type": "string"
+          "$ref": "#/definitions/RuleSetUseItem"
         },
         {
-          "enum": [
-            false
-          ]
-        }
-      ]
-    },
-    "entry": {
-      "description": "The entry point(s) of the compilation.",
-      "anyOf": [
-        {
-          "$ref": "#/definitions/entry"
-        }
-      ]
-    },
-    "externals": {
-      "description": "Specify dependencies that shouldn't be resolved by webpack, but should become dependencies of the resulting bundle. The kind of the dependency depends on `output.libraryTarget`.",
-      "anyOf": [
+          "instanceof": "Function",
+          "tsType": "Function"
+        },
         {
-          "$ref": "#/definitions/externals"
+          "type": "array",
+          "items": {
+            "description": "An use item",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/RuleSetUseItem"
+              }
+            ]
+          }
         }
       ]
     },
-    "loader": {
-      "description": "Custom values available in the loader context.",
-      "type": "object"
-    },
-    "module": {
-      "description": "Options affecting the normal modules (`NormalModuleFactory`).",
+    "RuleSetUseItem": {
       "anyOf": [
         {
-          "$ref": "#/definitions/module"
-        }
-      ]
-    },
-    "name": {
-      "description": "Name of the configuration. Used when loading multiple configurations.",
-      "type": "string"
-    },
-    "node": {
-      "description": "Include polyfills or mocks for various node stuff.",
-      "anyOf": [
+          "$ref": "#/definitions/RuleSetLoader"
+        },
         {
-          "enum": [
-            false
-          ]
+          "instanceof": "Function",
+          "tsType": "Function"
         },
         {
-          "additionalProperties": {
-            "description": "Include a polyfill for the node.js module",
-            "enum": [
-              false,
-              true,
-              "mock",
-              "empty"
-            ]
-          },
+          "type": "object",
+          "additionalProperties": false,
           "properties": {
-            "Buffer": {
-              "description": "Include a polyfill for the 'Buffer' variable",
-              "enum": [
-                false,
-                true,
-                "mock"
-              ]
-            },
-            "__dirname": {
-              "description": "Include a polyfill for the '__dirname' variable",
-              "enum": [
-                false,
-                true,
-                "mock"
-              ]
+            "ident": {
+              "description": "Unique loader identifier",
+              "type": "string"
             },
-            "__filename": {
-              "description": "Include a polyfill for the '__filename' variable",
-              "enum": [
-                false,
-                true,
-                "mock"
+            "loader": {
+              "description": "Loader name",
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/RuleSetLoader"
+                }
               ]
             },
-            "console": {
-              "description": "Include a polyfill for the 'console' variable",
-              "enum": [
-                false,
-                true,
-                "mock"
+            "options": {
+              "description": "Loader options",
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/RuleSetQuery"
+                }
               ]
             },
-            "global": {
-              "description": "Include a polyfill for the 'global' variable",
-              "type": "boolean"
-            },
-            "process": {
-              "description": "Include a polyfill for the 'process' variable",
-              "enum": [
-                false,
-                true,
-                "mock"
+            "query": {
+              "description": "Loader query",
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/RuleSetQuery"
+                }
               ]
             }
-          },
-          "type": "object"
-        }
-      ]
-    },
-    "output": {
-      "description": "Options affecting the output of the compilation. `output` options tell webpack how to write the compiled files to disk.",
-      "anyOf": [
-        {
-          "$ref": "#/definitions/output"
+          }
         }
       ]
     },
-    "optimization": {
-      "description": "Enables/Disables integrated optimizations",
+    "StatsOptions": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "removeAvailableModules": {
-          "description": "Removes modules from chunks when these modules are already included in all parents",
+        "all": {
+          "description": "fallback value for stats options when an option is not defined (has precedence over local webpack defaults)",
           "type": "boolean"
         },
-        "removeEmptyChunks": {
-          "description": "Remove chunks which are empty",
+        "assets": {
+          "description": "add assets information",
           "type": "boolean"
         },
-        "mergeDuplicateChunks": {
-          "description": "Merge chunks which contain the same modules",
+        "assetsSort": {
+          "description": "sort the assets by that field",
+          "type": "string"
+        },
+        "builtAt": {
+          "description": "add built at time information",
           "type": "boolean"
         },
-        "flagIncludedChunks": {
-          "description": "Also flag chunks as loaded which contain a subset of the modules",
+        "cached": {
+          "description": "add also information about cached (not built) modules",
           "type": "boolean"
         },
-        "occurrenceOrder": {
-          "description": "Figure out a order of modules which results in the smallest initial bundle",
+        "cachedAssets": {
+          "description": "Show cached assets (setting this to `false` only shows emitted files)",
           "type": "boolean"
         },
-        "sideEffects": {
-          "description": "Skip over modules which are flagged to contain no side effects when exports are not used",
+        "children": {
+          "description": "add children information",
           "type": "boolean"
         },
-        "providedExports": {
-          "description": "Figure out which exports are provided by modules to generate more efficient code",
+        "chunkGroups": {
+          "description": "Display all chunk groups with the corresponding bundles",
           "type": "boolean"
         },
-        "usedExports": {
-          "description": "Figure out which exports are used by modules to mangle export names, omit unused exports and generate more efficient code",
+        "chunkModules": {
+          "description": "add built modules information to chunk information",
           "type": "boolean"
         },
-        "concatenateModules": {
-          "description": "Concatenate modules when possible to generate less modules, more efficient code and enable more optimizations by the minimizer",
+        "chunkOrigins": {
+          "description": "add the origins of chunks and chunk merging info",
           "type": "boolean"
         },
-        "splitChunks": {
-          "description": "Optimize duplication and caching by splitting chunks by shared modules and cache group",
+        "chunks": {
+          "description": "add chunk information",
+          "type": "boolean"
+        },
+        "chunksSort": {
+          "description": "sort the chunks by that field",
+          "type": "string"
+        },
+        "colors": {
+          "description": "Enables/Disables colorful output",
           "oneOf": [
             {
-              "enum": [
-                false
-              ]
+              "description": "`webpack --colors` equivalent",
+              "type": "boolean"
             },
             {
               "type": "object",
               "additionalProperties": false,
               "properties": {
-                "chunks": {
-                  "description": "Select chunks for determining shared modules (defaults to \"async\", \"initial\" and \"all\" requires adding these chunks to the HTML)",
-                  "oneOf": [
-                    {
-                      "enum": [
-                        "initial",
-                        "async",
-                        "all"
-                      ]
-                    },
-                    {
-                      "instanceof": "Function"
-                    }
-                  ]
-                },
-                "minSize": {
-                  "description": "Minimal size for the created chunk",
-                  "type": "number",
-                  "minimum": 0
-                },
-                "minChunks": {
-                  "description": "Minimum number of times a module has to be duplicated until it's considered for splitting",
-                  "type": "number",
-                  "minimum": 1
-                },
-                "maxAsyncRequests": {
-                  "description": "Maximum number of requests which are accepted for on-demand loading",
-                  "type": "number",
-                  "minimum": 1
+                "bold": {
+                  "description": "Custom color for bold text",
+                  "type": "string"
                 },
-                "maxInitialRequests": {
-                  "description": "Maximum number of initial chunks which are accepted for an entry point",
-                  "type": "number",
-                  "minimum": 1
+                "cyan": {
+                  "description": "Custom color for cyan text",
+                  "type": "string"
                 },
-                "name": {
-                  "description": "Give chunks created a name (chunks with equal name are merged)",
-                  "oneOf": [
-                    {
-                      "type": "boolean"
-                    },
-                    {
-                      "instanceof": "Function"
-                    },
-                    {
-                      "type": "string"
-                    }
-                  ]
+                "green": {
+                  "description": "Custom color for green text",
+                  "type": "string"
                 },
-                "filename": {
-                  "description": "Sets the template for the filename for created chunks (Only works for initial chunks)",
-                  "type": "string",
-                  "minLength": 1
+                "magenta": {
+                  "description": "Custom color for magenta text",
+                  "type": "string"
                 },
-                "automaticNameDelimiter": {
-                  "description": "Sets the name delimiter for created chunks",
-                  "type": "string",
-                  "minLength": 1
+                "red": {
+                  "description": "Custom color for red text",
+                  "type": "string"
                 },
-                "cacheGroups": {
-                  "description": "Assign modules to a cache group (modules from different cache groups are tried to keep in separate chunks)",
-                  "type": "object",
-                  "additionalProperties": {
-                    "description": "Configuration for a cache group",
-                    "anyOf": [
-                      {
-                        "enum": [
-                          false
-                        ]
-                      },
-                      {
-                        "instanceof": "Function"
-                      },
-                      {
-                        "type": "string"
-                      },
-                      {
-                        "instanceof": "RegExp"
-                      },
-                      {
-                        "type": "object",
-                        "additionalProperties": false,
-                        "properties": {
-                          "test": {
-                            "description": "Assign modules to a cache group",
-                            "oneOf": [
-                              {
-                                "instanceof": "Function"
-                              },
-                              {
-                                "type": "string"
-                              },
-                              {
-                                "instanceof": "RegExp"
-                              }
-                            ]
-                          },
-                          "chunks": {
-                            "description": "Select chunks for determining cache group content (defaults to \"initial\", \"initial\" and \"all\" requires adding these chunks to the HTML)",
-                            "oneOf": [
-                              {
-                                "enum": [
-                                  "initial",
-                                  "async",
-                                  "all"
-                                ]
-                              },
-                              {
-                                "instanceof": "Function"
-                              }
-                            ]
-                          },
-                          "enforce": {
-                            "description": "Ignore minimum size, minimum chunks and maximum requests and always create chunks for this cache group",
-                            "type": "boolean"
-                          },
-                          "priority": {
-                            "description": "Priority of this cache group",
-                            "type": "number"
-                          },
-                          "minSize": {
-                            "description": "Minimal size for the created chunk",
-                            "type": "number",
-                            "minimum": 0
-                          },
-                          "minChunks": {
-                            "description": "Minimum number of times a module has to be duplicated until it's considered for splitting",
-                            "type": "number",
-                            "minimum": 1
-                          },
-                          "maxAsyncRequests": {
-                            "description": "Maximum number of requests which are accepted for on-demand loading",
-                            "type": "number",
-                            "minimum": 1
-                          },
-                          "maxInitialRequests": {
-                            "description": "Maximum number of initial chunks which are accepted for an entry point",
-                            "type": "number",
-                            "minimum": 1
-                          },
-                          "reuseExistingChunk": {
-                            "description": "Try to reuse existing chunk (with name) when it has matching modules",
-                            "type": "boolean"
-                          },
-                          "name": {
-                            "description": "Give chunks for this cache group a name (chunks with equal name are merged)",
-                            "oneOf": [
-                              {
-                                "type": "boolean"
-                              },
-                              {
-                                "instanceof": "Function"
-                              },
-                              {
-                                "type": "string"
-                              }
-                            ]
-                          },
-                          "filename": {
-                            "description": "Sets the template for the filename for created chunks (Only works for initial chunks)",
-                            "type": "string",
-                            "minLength": 1
-                          }
-                        }
-                      }
-                    ]
-                  }
+                "yellow": {
+                  "description": "Custom color for yellow text",
+                  "type": "string"
                 }
               }
             }
           ]
         },
-        "runtimeChunk": {
-          "description": "Create an additional chunk which contains only the webpack runtime and chunk hash maps",
-          "oneOf": [
+        "context": {
+          "description": "context directory for request shortening",
+          "type": "string",
+          "absolutePath": true
+        },
+        "depth": {
+          "description": "add module depth in module graph",
+          "type": "boolean"
+        },
+        "entrypoints": {
+          "description": "Display the entry points with the corresponding bundles",
+          "type": "boolean"
+        },
+        "env": {
+          "description": "add --env information",
+          "type": "boolean"
+        },
+        "errorDetails": {
+          "description": "add details to errors (like resolving log)",
+          "type": "boolean"
+        },
+        "errors": {
+          "description": "add errors",
+          "type": "boolean"
+        },
+        "exclude": {
+          "description": "Please use excludeModules instead.",
+          "anyOf": [
             {
-              "type": "boolean"
+              "$ref": "#/definitions/FilterTypes"
             },
             {
-              "enum": [
-                "single",
-                "multiple"
-              ]
+              "type": "boolean"
+            }
+          ]
+        },
+        "excludeAssets": {
+          "description": "Suppress assets that match the specified filters. Filters can be Strings, RegExps or Functions",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/FilterTypes"
+            }
+          ]
+        },
+        "excludeModules": {
+          "description": "Suppress modules that match the specified filters. Filters can be Strings, RegExps, Booleans or Functions",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/FilterTypes"
             },
             {
-              "type": "object",
-              "additionalProperties": false,
-              "properties": {
-                "name": {
-                  "description": "The name or name factory for the runtime chunks",
-                  "oneOf": [
-                    {
-                      "type": "string"
-                    },
-                    {
-                      "instanceof": "Function"
-                    }
-                  ]
-                }
-              }
+              "type": "boolean"
             }
           ]
         },
-        "noEmitOnErrors": {
-          "description": "Avoid emitting assets when errors occur",
+        "hash": {
+          "description": "add the hash of the compilation",
           "type": "boolean"
         },
-        "checkWasmTypes": {
-          "description": "Check for incompatible wasm types when importing/exporting from/to ESM",
+        "maxModules": {
+          "description": "Set the maximum number of modules to be shown",
+          "type": "number"
+        },
+        "moduleAssets": {
+          "description": "add information about assets inside modules",
           "type": "boolean"
         },
-        "mangleWasmImports": {
-          "description": "Reduce size of WASM by changing imports to shorter strings.",
+        "moduleTrace": {
+          "description": "add dependencies and origin of warnings/errors",
           "type": "boolean"
         },
-        "namedModules": {
-          "description": "Use readable module identifiers for better debugging",
+        "modules": {
+          "description": "add built modules information",
           "type": "boolean"
         },
-        "namedChunks": {
-          "description": "Use readable chunk identifiers for better debugging",
+        "modulesSort": {
+          "description": "sort the modules by that field",
+          "type": "string"
+        },
+        "nestedModules": {
+          "description": "add information about modules nested in other modules (like with module concatenation)",
+          "type": "boolean"
+        },
+        "optimizationBailout": {
+          "description": "show reasons why optimization bailed out for modules",
+          "type": "boolean"
+        },
+        "outputPath": {
+          "description": "Add output path information",
+          "type": "boolean"
+        },
+        "performance": {
+          "description": "add performance hint flags",
+          "type": "boolean"
+        },
+        "providedExports": {
+          "description": "show exports provided by modules",
+          "type": "boolean"
+        },
+        "publicPath": {
+          "description": "Add public path information",
+          "type": "boolean"
+        },
+        "reasons": {
+          "description": "add information about the reasons why modules are included",
+          "type": "boolean"
+        },
+        "source": {
+          "description": "add the source code of modules",
+          "type": "boolean"
+        },
+        "timings": {
+          "description": "add timing information",
+          "type": "boolean"
+        },
+        "usedExports": {
+          "description": "show exports used by modules",
           "type": "boolean"
         },
-        "portableRecords": {
-          "description": "Generate records with relative paths to be able to move the context folder",
+        "version": {
+          "description": "add webpack version information",
           "type": "boolean"
         },
-        "minimize": {
-          "description": "Enable minimizing the output. Uses optimization.minimizer.",
+        "warnings": {
+          "description": "add warnings",
           "type": "boolean"
         },
-        "minimizer": {
-          "description": "Minimizer(s) to use for minimizing the output",
-          "type": "array",
-          "items": {
-            "description": "Plugin of type object or instanceof Function",
-            "anyOf": [
-              {
-                "$ref": "#/definitions/common.pluginObject"
-              },
-              {
-                "$ref": "#/definitions/common.pluginFunction"
-              }
-            ]
-          }
-        },
-        "nodeEnv": {
-          "description": "Set process.env.NODE_ENV to a specific value",
+        "warningsFilter": {
+          "description": "Suppress warnings that match the specified filters. Filters can be Strings, RegExps or Functions",
           "anyOf": [
             {
-              "enum": [
-                false
-              ]
-            },
-            {
-              "type": "string"
+              "$ref": "#/definitions/FilterTypes"
             }
           ]
         }
       }
     },
+    "WebpackPluginFunction": {
+      "description": "Function acting as plugin",
+      "instanceof": "Function",
+      "tsType": "(compiler: import('../lib/Compiler')) => void"
+    },
+    "WebpackPluginInstance": {
+      "description": "Plugin instance",
+      "type": "object",
+      "additionalProperties": true,
+      "properties": {
+        "apply": {
+          "description": "The run point of the plugin, required method.",
+          "instanceof": "Function",
+          "tsType": "(compiler: import('../lib/Compiler')) => void"
+        }
+      },
+      "required": ["apply"]
+    }
+  },
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "amd": {
+      "description": "Set the value of `require.amd` and `define.amd`."
+    },
+    "bail": {
+      "description": "Report the first error as a hard error instead of tolerating it.",
+      "type": "boolean"
+    },
+    "cache": {
+      "description": "Cache generated modules and chunks to improve performance for multiple incremental builds.",
+      "anyOf": [
+        {
+          "description": "You can pass `false` to disable it.",
+          "type": "boolean"
+        },
+        {
+          "description": "You can pass an object to enable it and let webpack use the passed object as cache. This way you can share the cache object between multiple compiler calls.",
+          "type": "object"
+        }
+      ]
+    },
+    "context": {
+      "description": "The base directory (absolute path!) for resolving the `entry` option. If `output.pathinfo` is set, the included pathinfo is shortened to this directory.",
+      "type": "string",
+      "absolutePath": true
+    },
+    "dependencies": {
+      "description": "References to other configurations to depend on.",
+      "type": "array",
+      "items": {
+        "description": "References to another configuration to depend on.",
+        "type": "string"
+      }
+    },
+    "devServer": {
+      "description": "Options for the webpack-dev-server",
+      "type": "object"
+    },
+    "devtool": {
+      "description": "A developer tool to enhance debugging.",
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "enum": [false]
+        }
+      ]
+    },
+    "entry": {
+      "description": "The entry point(s) of the compilation.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Entry"
+        }
+      ]
+    },
+    "externals": {
+      "description": "Specify dependencies that shouldn't be resolved by webpack, but should become dependencies of the resulting bundle. The kind of the dependency depends on `output.libraryTarget`.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Externals"
+        }
+      ]
+    },
+    "loader": {
+      "description": "Custom values available in the loader context.",
+      "type": "object"
+    },
+    "mode": {
+      "description": "Enable production optimizations or development hints.",
+      "enum": ["development", "production", "none"]
+    },
+    "module": {
+      "description": "Options affecting the normal modules (`NormalModuleFactory`).",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/ModuleOptions"
+        }
+      ]
+    },
+    "name": {
+      "description": "Name of the configuration. Used when loading multiple configurations.",
+      "type": "string"
+    },
+    "node": {
+      "description": "Include polyfills or mocks for various node stuff.",
+      "anyOf": [
+        {
+          "enum": [false]
+        },
+        {
+          "$ref": "#/definitions/NodeOptions"
+        }
+      ]
+    },
+    "optimization": {
+      "description": "Enables/Disables integrated optimizations",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/OptimizationOptions"
+        }
+      ]
+    },
+    "output": {
+      "description": "Options affecting the output of the compilation. `output` options tell webpack how to write the compiled files to disk.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/OutputOptions"
+        }
+      ]
+    },
     "parallelism": {
       "description": "The number of parallel processed modules in the compilation.",
-      "minimum": 1,
-      "type": "number"
+      "type": "number",
+      "minimum": 1
     },
     "performance": {
       "description": "Configuration for web performance recommendations.",
       "anyOf": [
         {
-          "enum": [
-            false
-          ]
+          "enum": [false]
         },
         {
-          "additionalProperties": false,
-          "properties": {
-            "assetFilter": {
-              "description": "Filter function to select assets that are checked",
-              "instanceof": "Function"
-            },
-            "hints": {
-              "description": "Sets the format of the hints: warnings, errors or nothing at all",
-              "enum": [
-                false,
-                "warning",
-                "error"
-              ]
-            },
-            "maxEntrypointSize": {
-              "description": "Total size of an entry point (in bytes)",
-              "type": "number"
-            },
-            "maxAssetSize": {
-              "description": "Filesize limit (in bytes) when exceeded, that webpack will provide performance hints",
-              "type": "number"
-            }
-          },
-          "type": "object"
+          "$ref": "#/definitions/PerformanceOptions"
         }
       ]
     },
@@ -1644,10 +2032,10 @@
         "description": "Plugin of type object or instanceof Function",
         "anyOf": [
           {
-            "$ref": "#/definitions/common.pluginObject"
+            "$ref": "#/definitions/WebpackPluginInstance"
           },
           {
-            "$ref": "#/definitions/common.pluginFunction"
+            "$ref": "#/definitions/WebpackPluginFunction"
           }
         ]
       }
@@ -1675,7 +2063,7 @@
       "description": "Options for the resolver",
       "anyOf": [
         {
-          "$ref": "#/definitions/resolve"
+          "$ref": "#/definitions/ResolveOptions"
         }
       ]
     },
@@ -1683,7 +2071,7 @@
       "description": "Options for the resolver when resolving loaders",
       "anyOf": [
         {
-          "$ref": "#/definitions/resolve"
+          "$ref": "#/definitions/ResolveOptions"
         }
       ]
     },
@@ -1695,232 +2083,7 @@
       "description": "Used by the webpack CLI program to pass stats options.",
       "anyOf": [
         {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "all": {
-              "type": "boolean",
-              "description": "fallback value for stats options when an option is not defined (has precedence over local webpack defaults)"
-            },
-            "context": {
-              "type": "string",
-              "description": "context directory for request shortening",
-              "absolutePath": true
-            },
-            "hash": {
-              "type": "boolean",
-              "description": "add the hash of the compilation"
-            },
-            "version": {
-              "type": "boolean",
-              "description": "add webpack version information"
-            },
-            "timings": {
-              "type": "boolean",
-              "description": "add timing information"
-            },
-            "builtAt": {
-              "type": "boolean",
-              "description": "add built at time information"
-            },
-            "performance": {
-              "type": "boolean",
-              "description": "add performance hint flags"
-            },
-            "depth": {
-              "type": "boolean",
-              "description": "add module depth in module graph"
-            },
-            "assets": {
-              "type": "boolean",
-              "description": "add assets information"
-            },
-            "env": {
-              "type": "boolean",
-              "description": "add --env information"
-            },
-            "colors": {
-              "description": "Enables/Disables colorful output",
-              "oneOf": [
-                {
-                  "type": "boolean",
-                  "description": "`webpack --colors` equivalent"
-                },
-                {
-                  "type": "object",
-                  "additionalProperties": false,
-                  "properties": {
-                    "bold": {
-                      "description": "Custom color for bold text",
-                      "type": "string"
-                    },
-                    "red": {
-                      "description": "Custom color for red text",
-                      "type": "string"
-                    },
-                    "green": {
-                      "description": "Custom color for green text",
-                      "type": "string"
-                    },
-                    "cyan": {
-                      "description": "Custom color for cyan text",
-                      "type": "string"
-                    },
-                    "magenta": {
-                      "description": "Custom color for magenta text",
-                      "type": "string"
-                    },
-                    "yellow": {
-                      "description": "Custom color for yellow text",
-                      "type": "string"
-                    }
-                  }
-                }
-              ]
-            },
-            "maxModules": {
-              "type": "number",
-              "description": "Set the maximum number of modules to be shown"
-            },
-            "chunks": {
-              "type": "boolean",
-              "description": "add chunk information"
-            },
-            "chunkModules": {
-              "type": "boolean",
-              "description": "add built modules information to chunk information"
-            },
-            "modules": {
-              "type": "boolean",
-              "description": "add built modules information"
-            },
-            "nestedModules": {
-              "type": "boolean",
-              "description": "add information about modules nested in other modules (like with module concatenation)"
-            },
-            "moduleAssets": {
-              "type": "boolean",
-              "description": "add information about assets inside modules"
-            },
-            "children": {
-              "type": "boolean",
-              "description": "add children information"
-            },
-            "cached": {
-              "type": "boolean",
-              "description": "add also information about cached (not built) modules"
-            },
-            "cachedAssets": {
-              "type": "boolean",
-              "description": "Show cached assets (setting this to `false` only shows emitted files)"
-            },
-            "reasons": {
-              "type": "boolean",
-              "description": "add information about the reasons why modules are included"
-            },
-            "source": {
-              "type": "boolean",
-              "description": "add the source code of modules"
-            },
-            "warnings": {
-              "type": "boolean",
-              "description": "add warnings"
-            },
-            "errors": {
-              "type": "boolean",
-              "description": "add errors"
-            },
-            "warningsFilter": {
-              "description": "Suppress warnings that match the specified filters. Filters can be Strings, RegExps or Functions",
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/filter-types"
-                }
-              ]
-            },
-            "excludeAssets": {
-              "description": "Suppress assets that match the specified filters. Filters can be Strings, RegExps or Functions",
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/filter-types"
-                }
-              ]
-            },
-            "excludeModules": {
-              "description": "Suppress modules that match the specified filters. Filters can be Strings, RegExps, Booleans or Functions",
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/filter-types"
-                },
-                {
-                  "type": "boolean"
-                }
-              ]
-            },
-            "exclude": {
-              "description": "Please use excludeModules instead.",
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/filter-types"
-                },
-                {
-                  "type": "boolean"
-                }
-              ]
-            },
-            "entrypoints": {
-              "type": "boolean",
-              "description": "Display the entry points with the corresponding bundles"
-            },
-            "chunkGroups": {
-              "type": "boolean",
-              "description": "Display all chunk groups with the corresponding bundles"
-            },
-            "errorDetails": {
-              "type": "boolean",
-              "description": "add details to errors (like resolving log)"
-            },
-            "chunkOrigins": {
-              "type": "boolean",
-              "description": "add the origins of chunks and chunk merging info"
-            },
-            "modulesSort": {
-              "type": "string",
-              "description": "sort the modules by that field"
-            },
-            "moduleTrace": {
-              "type": "boolean",
-              "description": "add dependencies and origin of warnings/errors"
-            },
-            "chunksSort": {
-              "type": "string",
-              "description": "sort the chunks by that field"
-            },
-            "assetsSort": {
-              "type": "string",
-              "description": "sort the assets by that field"
-            },
-            "publicPath": {
-              "type": "boolean",
-              "description": "Add public path information"
-            },
-            "outputPath": {
-              "type": "boolean",
-              "description": "Add output path information"
-            },
-            "providedExports": {
-              "type": "boolean",
-              "description": "show exports provided by modules"
-            },
-            "usedExports": {
-              "type": "boolean",
-              "description": "show exports used by modules"
-            },
-            "optimizationBailout": {
-              "type": "boolean",
-              "description": "show reasons why optimization bailed out for modules"
-            }
-          }
+          "$ref": "#/definitions/StatsOptions"
         },
         {
           "type": "boolean"
@@ -1952,7 +2115,8 @@
           ]
         },
         {
-          "instanceof": "Function"
+          "instanceof": "Function",
+          "tsType": "((compiler: import('../lib/Compiler')) => void)"
         }
       ]
     },
@@ -1962,6 +2126,7 @@
     },
     "watchOptions": {
       "description": "Options for the watcher",
+      "type": "object",
       "additionalProperties": false,
       "properties": {
         "aggregateTimeout": {
@@ -1971,10 +2136,6 @@
         "ignored": {
           "description": "Ignore some files from watching"
         },
-        "stdin": {
-          "description": "Stop watching when stdin stream has ended",
-          "type": "boolean"
-        },
         "poll": {
           "description": "Enable polling mode for watching",
           "anyOf": [
@@ -1987,10 +2148,12 @@
               "type": "number"
             }
           ]
+        },
+        "stdin": {
+          "description": "Stop watching when stdin stream has ended",
+          "type": "boolean"
         }
-      },
-      "type": "object"
+      }
     }
-  },
-  "type": "object"
+  }
 }
diff --git a/schemas/ajv.absolutePath.js b/schemas/ajv.absolutePath.js
index 2d7c92fdd97..8ef11f4359d 100644
--- a/schemas/ajv.absolutePath.js
+++ b/schemas/ajv.absolutePath.js
@@ -35,7 +35,7 @@ module.exports = ajv =>
 							data,
 							`The provided value ${JSON.stringify(
 								data
-							)} contans exclamation mark (!) which is not allowed because it's reserved for loader syntax.`
+							)} contains exclamation mark (!) which is not allowed because it's reserved for loader syntax.`
 						)
 					];
 					passes = false;
diff --git a/schemas/plugins/BannerPlugin.json b/schemas/plugins/BannerPlugin.json
index 87e47903611..af313b90dee 100644
--- a/schemas/plugins/BannerPlugin.json
+++ b/schemas/plugins/BannerPlugin.json
@@ -1,67 +1,68 @@
 {
   "definitions": {
-    "rule": {
+    "BannerFunction": {
+      "description": "The banner as function, it will be wrapped in a comment",
+      "instanceof": "Function",
+      "tsType": "(data: { hash: string, chunk: import('../../lib/Chunk'), filename: string, basename: string, query: string}) => string"
+    },
+    "Rule": {
       "oneOf": [
         {
-          "instanceof": "RegExp"
+          "instanceof": "RegExp",
+          "tsType": "RegExp"
         },
         {
-          "minLength": 1,
-          "type": "string"
+          "type": "string",
+          "minLength": 1
         }
       ]
     },
-    "rules": {
+    "Rules": {
       "oneOf": [
         {
+          "type": "array",
           "items": {
             "description": "A rule condition",
             "anyOf": [
               {
-                "$ref": "#/definitions/rule"
+                "$ref": "#/definitions/Rule"
               }
             ]
-          },
-          "type": "array"
+          }
         },
         {
-          "$ref": "#/definitions/rule"
+          "$ref": "#/definitions/Rule"
         }
       ]
     }
   },
+  "title": "BannerPluginArgument",
   "oneOf": [
     {
+      "title": "BannerPluginOptions",
       "type": "object",
       "additionalProperties": false,
-      "required": [
-        "banner"
-      ],
       "properties": {
         "banner": {
           "description": "Specifies the banner",
           "anyOf": [
             {
-              "instanceof": "Function"
+              "$ref": "#/definitions/BannerFunction"
             },
             {
               "type": "string"
             }
           ]
         },
-        "raw": {
-          "description": "If true, banner will not be wrapped in a comment",
-          "type": "boolean"
-        },
         "entryOnly": {
           "description": "If true, the banner will only be added to the entry chunks",
           "type": "boolean"
         },
-        "test": {
-          "description": "Include all modules that pass test assertion",
+        "exclude": {
+          "description": "Exclude all modules matching any of these conditions",
           "anyOf": [
             {
-              "$ref": "#/definitions/rules"
+              "$ref": "#/definitions/Rules"
             }
           ]
         },
@@ -69,28 +70,32 @@
           "description": "Include all modules matching any of these conditions",
           "anyOf": [
             {
-              "$ref": "#/definitions/rules"
+              "$ref": "#/definitions/Rules"
             }
           ]
         },
-        "exclude": {
-          "description": "Exclude all modules matching any of these conditions",
+        "raw": {
+          "description": "If true, banner will not be wrapped in a comment",
+          "type": "boolean"
+        },
+        "test": {
+          "description": "Include all modules that pass test assertion",
           "anyOf": [
             {
-              "$ref": "#/definitions/rules"
+              "$ref": "#/definitions/Rules"
             }
           ]
         }
-      }
+      },
+      "required": ["banner"]
     },
     {
-      "description": "The banner as function, it will be wrapped in a comment",
-      "instanceof": "Function"
+      "$ref": "#/definitions/BannerFunction"
     },
     {
       "description": "The banner as string, it will be wrapped in a comment",
-      "minLength": 1,
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     }
   ]
 }
diff --git a/schemas/plugins/DllPlugin.json b/schemas/plugins/DllPlugin.json
index 940da62f155..8d9961e8974 100644
--- a/schemas/plugins/DllPlugin.json
+++ b/schemas/plugins/DllPlugin.json
@@ -1,32 +1,32 @@
 {
+  "title": "DllPluginOptions",
+  "type": "object",
   "additionalProperties": false,
-  "required": [
-    "path"
-  ],
   "properties": {
     "context": {
       "description": "Context of requests in the manifest file (defaults to the webpack context)",
-      "minLength": 1,
-      "type": "string"
+      "type": "string",
+      "minLength": 1
+    },
+    "entryOnly": {
+      "description": "If true, only entry points will be exposed",
+      "type": "boolean"
     },
     "name": {
       "description": "Name of the exposed dll function (external name, use value of 'output.library')",
-      "minLength": 1,
-      "type": "string"
-    },
-    "type": {
-      "description": "Type of the dll bundle (external type, use value of 'output.libraryTarget')",
-      "minLength": 1,
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "path": {
       "description": "Absolute path to the manifest json file (output)",
-      "minLength": 1,
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
-    "entryOnly": {
-      "description": "If true, only entry points will be exposed",
-      "type": "boolean"
+    "type": {
+      "description": "Type of the dll bundle (external type, use value of 'output.libraryTarget')",
+      "type": "string",
+      "minLength": 1
     }
-  }
+  },
+  "required": ["path"]
 }
diff --git a/schemas/plugins/DllReferencePlugin.json b/schemas/plugins/DllReferencePlugin.json
index 75fcff565db..1e078b97786 100644
--- a/schemas/plugins/DllReferencePlugin.json
+++ b/schemas/plugins/DllReferencePlugin.json
@@ -1,77 +1,83 @@
 {
-  "additionalProperties": false,
-  "anyOf": [
-    {
-      "required": [
-        "manifest"
-      ]
-    },
-    {
-      "required": [
-        "content"
-      ]
-    }
-  ],
-  "properties": {
-    "context": {
-      "description": "(absolute path) context of requests in the manifest (or content property)",
-      "type": "string",
-      "absolutePath": true
+  "definitions": {
+    "DllReferencePluginOptionsContent": {
+      "description": "The mappings from request to module info",
+      "type": "object",
+      "additionalProperties": {
+        "description": "Module info",
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "buildMeta": {
+            "description": "Meta information about the module",
+            "type": "object"
+          },
+          "exports": {
+            "description": "Information about the provided exports of the module",
+            "anyOf": [
+              {
+                "description": "Exports unknown/dynamic",
+                "enum": [true]
+              },
+              {
+                "description": "List of provided exports of the module",
+                "type": "array",
+                "items": {
+                  "description": "Name of the export",
+                  "type": "string",
+                  "minLength": 1
+                }
+              }
+            ]
+          },
+          "id": {
+            "description": "Module ID",
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "string",
+                "minLength": 1
+              }
+            ]
+          }
+        },
+        "required": ["id"]
+      },
+      "minProperties": 1
     },
-    "manifest": {
-      "description": "An object containing content and name or a string to the absolute path of the JSON manifest to be loaded upon compilation",
-      "oneOf": [
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "content": {
-              "description": "The mappings from request to module id",
-              "minLength": 1,
-              "type": "object"
-            },
-            "name": {
-              "description": "The name where the dll is exposed (external name)",
-              "minLength": 1,
-              "type": "string"
-            },
-            "type": {
-              "description": "The type how the dll is exposed (external type)",
-              "minLength": 1,
-              "type": "string"
+    "DllReferencePluginOptionsManifest": {
+      "description": "An object containing content, name and type",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "content": {
+          "description": "The mappings from request to module info",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/DllReferencePluginOptionsContent"
             }
-          }
+          ]
         },
-        {
+        "name": {
+          "description": "The name where the dll is exposed (external name)",
           "type": "string",
-          "absolutePath": true
+          "minLength": 1
+        },
+        "type": {
+          "description": "The type how the dll is exposed (external type)",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/DllReferencePluginOptionsSourceType"
+            }
+          ]
         }
-      ]
-    },
-    "content": {
-      "description": "The mappings from request to module id (defaults to manifest.content)",
-      "minLength": 1,
-      "type": "object"
-    },
-    "name": {
-      "description": "The name where the dll is exposed (external name, defaults to manifest.name)",
-      "minLength": 1,
-      "type": "string"
-    },
-    "type": {
-      "description": "The way how the export of the dll bundle is used",
-      "enum": [
-        "require",
-        "object"
-      ]
+      },
+      "required": ["content"]
     },
-    "scope": {
-      "description": "Prefix which is used for accessing the content of the dll",
-      "minLength": 1,
-      "type": "string"
-    },
-    "sourceType": {
-      "description": "How the dll is exposed (libraryTarget, defaults to manifest.type)",
+    "DllReferencePluginOptionsSourceType": {
+      "description": "The type how the dll is exposed (external type)",
       "enum": [
         "var",
         "assign",
@@ -82,18 +88,118 @@
         "commonjs2",
         "commonjs-module",
         "amd",
+        "amd-require",
         "umd",
         "umd2",
         "jsonp"
       ]
+    }
+  },
+  "title": "DllReferencePluginOptions",
+  "anyOf": [
+    {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "context": {
+          "description": "(absolute path) context of requests in the manifest (or content property)",
+          "type": "string",
+          "absolutePath": true
+        },
+        "extensions": {
+          "description": "Extensions used to resolve modules in the dll bundle (only used when using 'scope')",
+          "type": "array",
+          "items": {
+            "description": "An extension",
+            "type": "string"
+          }
+        },
+        "manifest": {
+          "description": "An object containing content and name or a string to the absolute path of the JSON manifest to be loaded upon compilation",
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DllReferencePluginOptionsManifest"
+            },
+            {
+              "type": "string",
+              "absolutePath": true
+            }
+          ]
+        },
+        "name": {
+          "description": "The name where the dll is exposed (external name, defaults to manifest.name)",
+          "type": "string",
+          "minLength": 1
+        },
+        "scope": {
+          "description": "Prefix which is used for accessing the content of the dll",
+          "type": "string",
+          "minLength": 1
+        },
+        "sourceType": {
+          "description": "How the dll is exposed (libraryTarget, defaults to manifest.type)",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/DllReferencePluginOptionsSourceType"
+            }
+          ]
+        },
+        "type": {
+          "description": "The way how the export of the dll bundle is used",
+          "enum": ["require", "object"]
+        }
+      },
+      "required": ["manifest"]
     },
-    "extensions": {
-      "description": "Extensions used to resolve modules in the dll bundle (only used when using 'scope')",
-      "type": "array",
-      "items": {
-        "description": "An extension",
-        "type": "string"
-      }
+    {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "content": {
+          "description": "The mappings from request to module info",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/DllReferencePluginOptionsContent"
+            }
+          ]
+        },
+        "context": {
+          "description": "(absolute path) context of requests in the manifest (or content property)",
+          "type": "string",
+          "absolutePath": true
+        },
+        "extensions": {
+          "description": "Extensions used to resolve modules in the dll bundle (only used when using 'scope')",
+          "type": "array",
+          "items": {
+            "description": "An extension",
+            "type": "string"
+          }
+        },
+        "name": {
+          "description": "The name where the dll is exposed (external name)",
+          "type": "string",
+          "minLength": 1
+        },
+        "scope": {
+          "description": "Prefix which is used for accessing the content of the dll",
+          "type": "string",
+          "minLength": 1
+        },
+        "sourceType": {
+          "description": "How the dll is exposed (libraryTarget)",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/DllReferencePluginOptionsSourceType"
+            }
+          ]
+        },
+        "type": {
+          "description": "The way how the export of the dll bundle is used",
+          "enum": ["require", "object"]
+        }
+      },
+      "required": ["content", "name"]
     }
-  }
+  ]
 }
diff --git a/schemas/plugins/HashedModuleIdsPlugin.json b/schemas/plugins/HashedModuleIdsPlugin.json
index 66ed722f6ad..c4592ea6516 100644
--- a/schemas/plugins/HashedModuleIdsPlugin.json
+++ b/schemas/plugins/HashedModuleIdsPlugin.json
@@ -1,24 +1,26 @@
 {
+  "title": "HashedModuleIdsPluginOptions",
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "hashFunction": {
-      "description": "The hashing algorithm to use, defaults to 'md5'. All functions from Node.JS' crypto.createHash are supported.",
+    "context": {
+      "description": "The context directory for creating names.",
       "type": "string",
-      "minLength": 1
+      "absolutePath": true
     },
     "hashDigest": {
       "description": "The encoding to use when generating the hash, defaults to 'base64'. All encodings from Node.JS' hash.digest are supported.",
-      "enum": [
-        "hex",
-        "latin1",
-        "base64"
-      ]
+      "enum": ["hex", "latin1", "base64"]
     },
     "hashDigestLength": {
       "description": "The prefix length of the hash digest to use, defaults to 4.",
       "type": "number",
       "minimum": 1
+    },
+    "hashFunction": {
+      "description": "The hashing algorithm to use, defaults to 'md5'. All functions from Node.JS' crypto.createHash are supported.",
+      "type": "string",
+      "minLength": 1
     }
   }
 }
diff --git a/schemas/plugins/IgnorePlugin.json b/schemas/plugins/IgnorePlugin.json
new file mode 100644
index 00000000000..83cd78ad8f1
--- /dev/null
+++ b/schemas/plugins/IgnorePlugin.json
@@ -0,0 +1,37 @@
+{
+  "title": "IgnorePluginOptions",
+  "oneOf": [
+    {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "contextRegExp": {
+          "description": "A RegExp to test the context (directory) against",
+          "instanceof": "RegExp",
+          "tsType": "RegExp"
+        },
+        "resourceRegExp": {
+          "description": "A RegExp to test the request against",
+          "instanceof": "RegExp",
+          "tsType": "RegExp"
+        }
+      }
+    },
+    {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "checkContext": {
+          "description": "A filter function for context",
+          "instanceof": "Function",
+          "tsType": "((context: string) => boolean)"
+        },
+        "checkResource": {
+          "description": "A filter function for resource",
+          "instanceof": "Function",
+          "tsType": "((resource: string) => boolean)"
+        }
+      }
+    }
+  ]
+}
diff --git a/schemas/plugins/LoaderOptionsPlugin.json b/schemas/plugins/LoaderOptionsPlugin.json
index 3a84e0347b2..67efca43336 100644
--- a/schemas/plugins/LoaderOptionsPlugin.json
+++ b/schemas/plugins/LoaderOptionsPlugin.json
@@ -1,4 +1,5 @@
 {
+  "title": "LoaderOptionsPluginOptions",
   "type": "object",
   "additionalProperties": true,
   "properties": {
diff --git a/schemas/plugins/SourceMapDevToolPlugin.json b/schemas/plugins/SourceMapDevToolPlugin.json
index b0d11ae2ae1..dd9d3109009 100644
--- a/schemas/plugins/SourceMapDevToolPlugin.json
+++ b/schemas/plugins/SourceMapDevToolPlugin.json
@@ -1,21 +1,21 @@
 {
-  "type": "object",
-  "additionalProperties": false,
   "definitions": {
     "rule": {
       "oneOf": [
         {
-          "instanceof": "RegExp"
+          "instanceof": "RegExp",
+          "tsType": "RegExp"
         },
         {
-          "minLength": 1,
-          "type": "string"
+          "type": "string",
+          "minLength": 1
         }
       ]
     },
     "rules": {
       "oneOf": [
         {
+          "type": "array",
           "items": {
             "description": "A rule condition",
             "anyOf": [
@@ -23,8 +23,7 @@
                 "$ref": "#/definitions/rule"
               }
             ]
-          },
-          "type": "array"
+          }
         },
         {
           "$ref": "#/definitions/rule"
@@ -32,23 +31,27 @@
       ]
     }
   },
+  "title": "SourceMapDevToolPluginOptions",
+  "type": "object",
+  "additionalProperties": false,
   "properties": {
-    "test": {
-      "description": "Include source maps for modules based on their extension (defaults to .js and .css)",
-      "anyOf": [
+    "append": {
+      "description": "Appends the given value to the original asset. Usually the #sourceMappingURL comment. [url] is replaced with a URL to the source map file. false disables the appending",
+      "oneOf": [
         {
-          "$ref": "#/definitions/rules"
-        }
-      ]
-    },
-    "include": {
-      "description": "Include source maps for module paths that match the given value",
-      "anyOf": [
+          "description": "Append no SourceMap comment to the bundle, but still generate SourceMaps",
+          "enum": [false, null]
+        },
         {
-          "$ref": "#/definitions/rules"
+          "type": "string",
+          "minLength": 1
         }
       ]
     },
+    "columns": {
+      "description": "Indicates whether column mappings should be used (defaults to true)",
+      "type": "boolean"
+    },
     "exclude": {
       "description": "Exclude modules that match the given value from source map generation",
       "anyOf": [
@@ -57,93 +60,46 @@
         }
       ]
     },
-    "filename": {
-      "description": "Defines the output filename of the SourceMap (will be inlined if no value is provided)",
+    "fallbackModuleFilenameTemplate": {
+      "description": "Generator string or function to create identifiers of modules for the 'sources' array in the SourceMap used only if 'moduleFilenameTemplate' would result in a conflict",
       "oneOf": [
         {
-          "description": "Disable separate SourceMap file and inline SourceMap as DataUrl",
-          "enum": [
-            false,
-            null
-          ]
+          "description": "Custom function generating the identifer",
+          "instanceof": "Function",
+          "tsType": "Function"
         },
         {
           "type": "string",
-          "minLength": 1,
-          "absolutePath": false
+          "minLength": 1
         }
       ]
     },
-    "append": {
-      "description": "Appends the given value to the original asset. Usually the #sourceMappingURL comment. [url] is replaced with a URL to the source map file. false disables the appending",
-      "oneOf": [
-        {
-          "description": "Append no SourceMap comment to the bundle, but still generate SourceMaps",
-          "enum": [
-            false,
-            null
-          ]
-        },
-        {
-          "minLength": 1,
-          "type": "string"
-        }
-      ]
+    "fileContext": {
+      "description": "Path prefix to which the [file] placeholder is relative to",
+      "type": "string"
     },
-    "moduleFilenameTemplate": {
-      "description": "Generator string or function to create identifiers of modules for the 'sources' array in the SourceMap",
+    "filename": {
+      "description": "Defines the output filename of the SourceMap (will be inlined if no value is provided)",
       "oneOf": [
         {
-          "description": "Custom function generating the identifer",
-          "instanceof": "Function"
+          "description": "Disable separate SourceMap file and inline SourceMap as DataUrl",
+          "enum": [false, null]
         },
         {
-          "minLength": 1,
-          "type": "string"
+          "type": "string",
+          "absolutePath": false,
+          "minLength": 1
         }
       ]
     },
-    "fallbackModuleFilenameTemplate": {
-      "description": "Generator string or function to create identifiers of modules for the 'sources' array in the SourceMap used only if 'moduleFilenameTemplate' would result in a conflict",
-      "oneOf": [
-        {
-          "description": "Custom function generating the identifer",
-          "instanceof": "Function"
-        },
+    "include": {
+      "description": "Include source maps for module paths that match the given value",
+      "anyOf": [
         {
-          "minLength": 1,
-          "type": "string"
+          "$ref": "#/definitions/rules"
         }
       ]
     },
-    "namespace": {
-      "description": "Namespace prefix to allow multiple webpack roots in the devtools",
-      "type": "string"
-    },
-    "module": {
-      "description": "Indicates whether SourceMaps from loaders should be used (defaults to true)",
-      "type": "boolean"
-    },
-    "columns": {
-      "description": "Indicates whether column mappings should be used (defaults to true)",
-      "type": "boolean"
-    },
-    "noSources": {
-      "description": "Omit the 'sourceContents' array from the SourceMap",
-      "type": "boolean"
-    },
-    "sourceRoot": {
-      "description": "Provide a custom value for the 'sourceRoot' property in the SourceMap",
-      "type": "string"
-    },
-    "publicPath": {
-      "description": "Provide a custom public path for the SourceMapping comment",
-      "type": "string"
-    },
-    "fileContext": {
-      "description": "Path prefix to which the [file] placeholder is relative to",
-      "type": "string"
-    },
     "lineToLine": {
       "description": "(deprecated) try to map original files line to line to generated files",
       "anyOf": [
@@ -155,8 +111,8 @@
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "test": {
-              "description": "Include source maps for modules based on their extension (defaults to .js and .css)",
+            "exclude": {
+              "description": "Exclude modules that match the given value from source map generation",
               "anyOf": [
                 {
                   "$ref": "#/definitions/rules"
@@ -171,8 +127,8 @@
                 }
               ]
             },
-            "exclude": {
-              "description": "Exclude modules that match the given value from source map generation",
+            "test": {
+              "description": "Include source maps for modules based on their extension (defaults to .js and .css)",
               "anyOf": [
                 {
                   "$ref": "#/definitions/rules"
@@ -182,6 +138,48 @@
           }
         }
       ]
+    },
+    "module": {
+      "description": "Indicates whether SourceMaps from loaders should be used (defaults to true)",
+      "type": "boolean"
+    },
+    "moduleFilenameTemplate": {
+      "description": "Generator string or function to create identifiers of modules for the 'sources' array in the SourceMap",
+      "oneOf": [
+        {
+          "description": "Custom function generating the identifer",
+          "instanceof": "Function",
+          "tsType": "Function"
+        },
+        {
+          "type": "string",
+          "minLength": 1
+        }
+      ]
+    },
+    "namespace": {
+      "description": "Namespace prefix to allow multiple webpack roots in the devtools",
+      "type": "string"
+    },
+    "noSources": {
+      "description": "Omit the 'sourceContents' array from the SourceMap",
+      "type": "boolean"
+    },
+    "publicPath": {
+      "description": "Provide a custom public path for the SourceMapping comment",
+      "type": "string"
+    },
+    "sourceRoot": {
+      "description": "Provide a custom value for the 'sourceRoot' property in the SourceMap",
+      "type": "string"
+    },
+    "test": {
+      "description": "Include source maps for modules based on their extension (defaults to .js and .css)",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/rules"
+        }
+      ]
     }
   }
 }
diff --git a/schemas/plugins/WatchIgnorePlugin.json b/schemas/plugins/WatchIgnorePlugin.json
index a69c755292b..b08d50ba69c 100644
--- a/schemas/plugins/WatchIgnorePlugin.json
+++ b/schemas/plugins/WatchIgnorePlugin.json
@@ -1,4 +1,5 @@
 {
+  "title": "WatchIgnorePluginOptions",
   "description": "A list of RegExps or absolute paths to directories or files that should be ignored",
   "type": "array",
   "items": {
@@ -8,7 +9,8 @@
         "type": "string"
       },
       {
-        "instanceof": "RegExp"
+        "instanceof": "RegExp",
+        "tsType": "RegExp"
       }
     ]
   },
diff --git a/schemas/plugins/debug/ProfilingPlugin.json b/schemas/plugins/debug/ProfilingPlugin.json
index 299762f58d0..e9a4bf18bef 100644
--- a/schemas/plugins/debug/ProfilingPlugin.json
+++ b/schemas/plugins/debug/ProfilingPlugin.json
@@ -1,4 +1,5 @@
 {
+  "title": "ProfilingPluginOptions",
   "type": "object",
   "additionalProperties": false,
   "properties": {
diff --git a/schemas/plugins/optimize/AggressiveSplittingPlugin.json b/schemas/plugins/optimize/AggressiveSplittingPlugin.json
index 6c699d5e645..19bcdfd5680 100644
--- a/schemas/plugins/optimize/AggressiveSplittingPlugin.json
+++ b/schemas/plugins/optimize/AggressiveSplittingPlugin.json
@@ -1,15 +1,8 @@
 {
+  "title": "AggressiveSplittingPluginOptions",
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "minSize": {
-      "description": "Byte, split point. Default: 30720",
-      "type": "number"
-    },
-    "maxSize": {
-      "description": "Byte, maxsize of per file. Default: 51200",
-      "type": "number"
-    },
     "chunkOverhead": {
       "description": "Default: 0",
       "type": "number"
@@ -17,6 +10,14 @@
     "entryChunkMultiplicator": {
       "description": "Default: 1",
       "type": "number"
+    },
+    "maxSize": {
+      "description": "Byte, maxsize of per file. Default: 51200",
+      "type": "number"
+    },
+    "minSize": {
+      "description": "Byte, split point. Default: 30720",
+      "type": "number"
     }
   }
 }
diff --git a/schemas/plugins/optimize/LimitChunkCountPlugin.json b/schemas/plugins/optimize/LimitChunkCountPlugin.json
index 5e2b6761975..b2636eefd41 100644
--- a/schemas/plugins/optimize/LimitChunkCountPlugin.json
+++ b/schemas/plugins/optimize/LimitChunkCountPlugin.json
@@ -1,4 +1,5 @@
 {
+  "title": "LimitChunkCountPluginOptions",
   "type": "object",
   "additionalProperties": false,
   "properties": {
diff --git a/schemas/plugins/optimize/MinChunkSizePlugin.json b/schemas/plugins/optimize/MinChunkSizePlugin.json
index 2cb57a0b02a..03e17d65e37 100644
--- a/schemas/plugins/optimize/MinChunkSizePlugin.json
+++ b/schemas/plugins/optimize/MinChunkSizePlugin.json
@@ -1,13 +1,12 @@
 {
-  "additionalProperties": false,
+  "title": "MinChunkSizePluginOptions",
   "type": "object",
-  "required": [
-    "minChunkSize"
-  ],
+  "additionalProperties": false,
   "properties": {
     "minChunkSize": {
       "description": "Minimum number of characters",
       "type": "number"
     }
-  }
+  },
+  "required": ["minChunkSize"]
 }
diff --git a/schemas/plugins/optimize/OccurrenceOrderChunkIdsPlugin.json b/schemas/plugins/optimize/OccurrenceOrderChunkIdsPlugin.json
new file mode 100644
index 00000000000..12facf2f67d
--- /dev/null
+++ b/schemas/plugins/optimize/OccurrenceOrderChunkIdsPlugin.json
@@ -0,0 +1,11 @@
+{
+  "title": "OccurrenceOrderChunkIdsPluginOptions",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "prioritiseInitial": {
+      "description": "Prioritise initial size over total size",
+      "type": "boolean"
+    }
+  }
+}
diff --git a/schemas/plugins/optimize/OccurrenceOrderModuleIdsPlugin.json b/schemas/plugins/optimize/OccurrenceOrderModuleIdsPlugin.json
new file mode 100644
index 00000000000..d76ac14df6a
--- /dev/null
+++ b/schemas/plugins/optimize/OccurrenceOrderModuleIdsPlugin.json
@@ -0,0 +1,11 @@
+{
+  "title": "OccurrenceOrderModuleIdsPluginOptions",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "prioritiseInitial": {
+      "description": "Prioritise initial size over total size",
+      "type": "boolean"
+    }
+  }
+}
diff --git a/setup/setup.js b/setup/setup.js
index ad774bc1103..eeb17422c4b 100644
--- a/setup/setup.js
+++ b/setup/setup.js
@@ -47,7 +47,7 @@ function checkSymlinkExistsAsync() {
 }
 
 function ensureYarnInstalledAsync() {
-	var semverPattern = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/;
+	const semverPattern = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/;
 	return execGetOutput("yarn", ["-v"], "Check yarn version")
 		.then(stdout => semverPattern.test(stdout), () => false)
 		.then(hasYarn => hasYarn || installYarnAsync());
diff --git a/test/Compiler.test.js b/test/Compiler.test.js
index 063343f38c2..8f7d3a7c637 100644
--- a/test/Compiler.test.js
+++ b/test/Compiler.test.js
@@ -85,7 +85,7 @@ describe("Compiler", () => {
 			expect(Object.keys(files)).toEqual(["/main.js"]);
 			const bundle = files["/main.js"];
 			expect(bundle).toMatch("function __webpack_require__(");
-			expect(bundle).toMatch("__webpack_require__(/*! ./a */ 0);");
+			expect(bundle).toMatch(/__webpack_require__\(\/\*! \.\/a \*\/ \d\);/);
 			expect(bundle).toMatch("./c.js");
 			expect(bundle).toMatch("./a.js");
 			expect(bundle).toMatch("This is a");
@@ -145,9 +145,9 @@ describe("Compiler", () => {
 	it("should compile a file with multiple chunks", done => {
 		compile("./chunks", {}, (stats, files) => {
 			expect(stats.chunks).toHaveLength(2);
-			expect(Object.keys(files)).toEqual(["/0.js", "/main.js"]);
+			expect(Object.keys(files)).toEqual(["/main.js", "/1.js"]);
 			const bundle = files["/main.js"];
-			const chunk = files["/0.js"];
+			const chunk = files["/1.js"];
 			expect(bundle).toMatch("function __webpack_require__(");
 			expect(bundle).toMatch("__webpack_require__(/*! ./b */");
 			expect(chunk).not.toMatch("__webpack_require__(/* ./b */");
@@ -448,4 +448,26 @@ describe("Compiler", () => {
 			});
 		});
 	});
+	it("should use cache on second run call", function(done) {
+		const compiler = webpack({
+			context: __dirname,
+			mode: "development",
+			devtool: false,
+			entry: "./fixtures/count-loader!./fixtures/count-loader",
+			output: {
+				path: "/"
+			}
+		});
+		compiler.outputFileSystem = new MemoryFs();
+		compiler.run(() => {
+			compiler.run(() => {
+				const result = compiler.outputFileSystem.readFileSync(
+					"/main.js",
+					"utf-8"
+				);
+				expect(result).toContain("module.exports = 0;");
+				done();
+			});
+		});
+	});
 });
diff --git a/test/ConfigTestCases.test.js b/test/ConfigTestCases.test.js
index 4f3808341bd..48a76f894d4 100644
--- a/test/ConfigTestCases.test.js
+++ b/test/ConfigTestCases.test.js
@@ -7,6 +7,7 @@ const vm = require("vm");
 const mkdirp = require("mkdirp");
 const rimraf = require("rimraf");
 const checkArrayExpectation = require("./checkArrayExpectation");
+const createLazyTestEnv = require("./helpers/createLazyTestEnv");
 const FakeDocument = require("./helpers/FakeDocument");
 
 const Stats = require("../lib/Stats");
@@ -17,7 +18,7 @@ describe("ConfigTestCases", () => {
 	const casesPath = path.join(__dirname, "configCases");
 	let categories = fs.readdirSync(casesPath);
 
-	jest.setTimeout(10000);
+	jest.setTimeout(20000);
 
 	categories = categories.map(cat => {
 		return {
@@ -51,9 +52,6 @@ describe("ConfigTestCases", () => {
 						category.name,
 						testName
 					);
-					const exportedTests = [];
-					const exportedBeforeEach = [];
-					const exportedAfterEach = [];
 					it(
 						testName + " should compile",
 						() =>
@@ -87,12 +85,13 @@ describe("ConfigTestCases", () => {
 								});
 								let testConfig = {
 									findBundle: function(i, options) {
+										const ext = path.extname(options.output.filename);
 										if (
 											fs.existsSync(
-												path.join(options.output.path, "bundle" + i + ".js")
+												path.join(options.output.path, "bundle" + i + ext)
 											)
 										) {
-											return "./bundle" + i + ".js";
+											return "./bundle" + i + ext;
 										}
 									},
 									timeout: 30000
@@ -106,6 +105,7 @@ describe("ConfigTestCases", () => {
 								} catch (e) {
 									// ignored
 								}
+								if (testConfig.timeout) setDefaultTimeout(testConfig.timeout);
 
 								webpack(options, (err, stats) => {
 									if (err) {
@@ -157,28 +157,19 @@ describe("ConfigTestCases", () => {
 									)
 										return;
 
-									function _it(title, fn) {
-										exportedTests.push({
-											title,
-											fn,
-											timeout: testConfig.timeout
-										});
-									}
-
-									function _beforeEach(fn) {
-										return exportedBeforeEach.push(fn);
-									}
-
-									function _afterEach(fn) {
-										return exportedAfterEach.push(fn);
-									}
-
 									const globalContext = {
 										console: console,
 										expect: expect,
 										setTimeout: setTimeout,
 										clearTimeout: clearTimeout,
-										document: new FakeDocument()
+										document: new FakeDocument(),
+										location: {
+											href: "https://test.cases/path/index.html",
+											origin: "https://test.cases",
+											toString() {
+												return "https://test.cases/path/index.html";
+											}
+										}
 									};
 
 									function _require(currentDirectory, module) {
@@ -204,6 +195,7 @@ describe("ConfigTestCases", () => {
 											) {
 												fn = vm.runInNewContext(
 													"(function(require, module, exports, __dirname, __filename, it, beforeEach, afterEach, expect, jest, window) {" +
+														'function nsObj(m) { Object.defineProperty(m, Symbol.toStringTag, { value: "Module" }); return m; }' +
 														content +
 														"\n})",
 													globalContext,
@@ -213,6 +205,7 @@ describe("ConfigTestCases", () => {
 												fn = vm.runInThisContext(
 													"(function(require, module, exports, __dirname, __filename, it, beforeEach, afterEach, expect, jest) {" +
 														"global.expect = expect; " +
+														'function nsObj(m) { Object.defineProperty(m, Symbol.toStringTag, { value: "Module" }); return m; }' +
 														content +
 														"\n})",
 													p
@@ -263,31 +256,21 @@ describe("ConfigTestCases", () => {
 												"Should have found at least one bundle file per webpack config"
 											)
 										);
-									if (exportedTests.length < filesCount)
+									if (getNumberOfTests() < filesCount)
 										return done(new Error("No tests exported by test case"));
 									if (testConfig.afterExecute) testConfig.afterExecute();
-									const asyncSuite = describe(`ConfigTestCases ${
-										category.name
-									} ${testName} exported tests`, () => {
-										exportedBeforeEach.forEach(beforeEach);
-										exportedAfterEach.forEach(afterEach);
-										exportedTests.forEach(
-											({ title, fn, timeout }) =>
-												fn
-													? fit(title, fn, timeout)
-													: fit(title, () => {}).pend("Skipped")
-										);
-									});
-									// workaround for jest running clearSpies on the wrong suite (invoked by clearResourcesForRunnable)
-									asyncSuite.disabled = true;
-
-									jasmine
-										.getEnv()
-										.execute([asyncSuite.id], asyncSuite)
-										.then(done, done);
+									done();
 								});
 							})
 					);
+
+					const {
+						it: _it,
+						beforeEach: _beforeEach,
+						afterEach: _afterEach,
+						setDefaultTimeout,
+						getNumberOfTests
+					} = createLazyTestEnv(jasmine.getEnv(), 10000);
 				});
 			});
 		});
diff --git a/test/Errors.test.js b/test/Errors.test.js
index ab5c5afb332..8d5a8fbd1be 100644
--- a/test/Errors.test.js
+++ b/test/Errors.test.js
@@ -94,6 +94,42 @@ describe("Errors", () => {
 			}
 		);
 	});
+	it("should report require.main.require as unsupported", done => {
+		getErrors(
+			{
+				mode: "development",
+				entry: "./require.main.require"
+			},
+			(errors, warnings) => {
+				expect(errors).toHaveLength(0);
+				expect(warnings).toHaveLength(1);
+				const lines = warnings[0].split("\n");
+				expect(lines[0]).toMatch(/require.main.require\.js/);
+				expect(lines[1]).toMatch(
+					/require.main.require is not supported by webpack/
+				);
+				done();
+			}
+		);
+	});
+	it("should report module.parent.require as unsupported", done => {
+		getErrors(
+			{
+				mode: "development",
+				entry: "./module.parent.require"
+			},
+			(errors, warnings) => {
+				expect(errors).toHaveLength(0);
+				expect(warnings).toHaveLength(1);
+				const lines = warnings[0].split("\n");
+				expect(lines[0]).toMatch(/module.parent.require\.js/);
+				expect(lines[1]).toMatch(
+					/module.parent.require is not supported by webpack/
+				);
+				done();
+			}
+		);
+	});
 	it("should warn about case-sensitive module names", done => {
 		getErrors(
 			{
diff --git a/test/ExternalModule.unittest.js b/test/ExternalModule.unittest.js
deleted file mode 100644
index 075c4600919..00000000000
--- a/test/ExternalModule.unittest.js
+++ /dev/null
@@ -1,308 +0,0 @@
-/* globals describe, it, beforeEach */
-"use strict";
-
-const ExternalModule = require("../lib/ExternalModule");
-const OriginalSource = require("webpack-sources").OriginalSource;
-const RawSource = require("webpack-sources").RawSource;
-
-describe("ExternalModule", () => {
-	let externalModule;
-	let request;
-	let type;
-	beforeEach(() => {
-		request = "some/request";
-		type = "some-type";
-		externalModule = new ExternalModule(request, type, `${type} ${request}`);
-	});
-	describe("#identifier", () => {
-		it("returns an identifier for this module", () => {
-			const expected = `external "${request}"`;
-			expect(externalModule.identifier()).toBe(expected);
-		});
-	});
-
-	describe("#readableIdentifier", () => {
-		it("returns an identifier for this module", () => {
-			const expected = `external "${request}"`;
-			expect(externalModule.identifier()).toBe(expected);
-		});
-	});
-
-	describe("#needRebuild", () => {
-		it("always returns false", () => {
-			expect(externalModule.needRebuild()).toBe(false);
-		});
-	});
-
-	describe("#size", () => {
-		it("always returns 42", () => {
-			expect(externalModule.size()).toBe(42);
-		});
-	});
-
-	describe("#source", () => {
-		it("calls getSource with the result of getSourceString", () => {
-			// set up
-			const expectedString = "something expected stringy";
-			const expectedSource = "something expected source";
-			externalModule.getSource = jest.fn(() => expectedSource);
-			externalModule.getSourceString = jest.fn(() => expectedString);
-
-			// invoke
-			const result = externalModule.source();
-
-			// check
-			expect(externalModule.getSource.mock.calls.length).toBe(1);
-			expect(externalModule.getSourceString.mock.calls.length).toBe(1);
-			expect(externalModule.getSource.mock.calls[0][0]).toBe(expectedString);
-			expect(result).toEqual(expectedSource);
-		});
-	});
-
-	describe("#getSource", () => {
-		describe("given it should use source maps", () => {
-			beforeEach(() => {
-				externalModule.useSourceMap = true;
-			});
-			it("returns an instance of OriginalSource", () => {
-				// set up
-				const someSourceString = "some source string";
-
-				// invoke
-				const result = externalModule.getSource(someSourceString);
-
-				// check
-				expect(result).toBeInstanceOf(OriginalSource);
-			});
-		});
-		describe("given it does not use source maps", () => {
-			beforeEach(() => {
-				externalModule.useSourceMap = false;
-			});
-			it("returns an instance of RawSource", () => {
-				// set up
-				const someSourceString = "some source string";
-
-				// invoke
-				const result = externalModule.getSource(someSourceString);
-
-				// check
-				expect(result).toBeInstanceOf(RawSource);
-			});
-		});
-	});
-
-	describe("#getSourceForGlobalVariableExternal", () => {
-		describe("given an array as variable name in the global namespace", () => {
-			it("use the array as lookup in the global object", () => {
-				// set up
-				const type = "window";
-				const varName = ["foo", "bar"];
-				const expected =
-					'(function() { module.exports = window["foo"]["bar"]; }());';
-
-				// invoke
-				const result = externalModule.getSourceForGlobalVariableExternal(
-					varName,
-					type
-				);
-
-				// check
-				expect(result).toEqual(expected);
-			});
-		});
-		describe("given an single variable name", () => {
-			it("look it up in the global namespace", () => {
-				// set up
-				const type = "window";
-				const varName = "foo";
-				const expected = '(function() { module.exports = window["foo"]; }());';
-
-				// invoke
-				const result = externalModule.getSourceForGlobalVariableExternal(
-					varName,
-					type
-				);
-
-				// check
-				expect(result).toEqual(expected);
-			});
-		});
-	});
-
-	describe("#getSourceForCommonJsExternal", () => {
-		describe("given an array as names in the global namespace", () => {
-			it("use the first to require a module and the rest as lookup on the required module", () => {
-				// set up
-				const varName = ["module", "look", "up"];
-				const expected = 'module.exports = require(module)["look"]["up"];';
-
-				// invoke
-				const result = externalModule.getSourceForCommonJsExternal(
-					varName,
-					type
-				);
-
-				// check
-				expect(result).toEqual(expected);
-			});
-		});
-		describe("given an single variable name", () => {
-			it("require a module with that name", () => {
-				// set up
-				const type = "window";
-				const varName = "foo";
-				const expected = 'module.exports = require("foo");';
-
-				// invoke
-				const result = externalModule.getSourceForCommonJsExternal(
-					varName,
-					type
-				);
-
-				// check
-				expect(result).toEqual(expected);
-			});
-		});
-	});
-
-	describe("#checkExternalVariable", () => {
-		it("creates a check that fails if a variable does not exist", () => {
-			// set up
-			const variableToCheck = "foo";
-			const request = "bar";
-			const expected = `if(typeof foo === 'undefined') {var e = new Error("Cannot find module 'bar'"); e.code = 'MODULE_NOT_FOUND'; throw e;}
-`;
-
-			// invoke
-			const result = externalModule.checkExternalVariable(
-				variableToCheck,
-				request
-			);
-
-			// check
-			expect(result).toEqual(expected);
-		});
-	});
-
-	describe("#getSourceForAmdOrUmdExternal", () => {
-		it("looks up a global variable as specified by the id", () => {
-			// set up
-			const id = "someId";
-			const optional = false;
-			const expected = "module.exports = __WEBPACK_EXTERNAL_MODULE_someId__;";
-
-			// invoke
-			const result = externalModule.getSourceForAmdOrUmdExternal(
-				id,
-				optional,
-				request
-			);
-
-			// check
-			expect(result).toEqual(expected);
-		});
-		describe("given an optional check is set", function() {
-			it("ads a check for the existence of the variable before looking it up", () => {
-				// set up
-				const id = "someId";
-				const optional = true;
-				const expected = `if(typeof __WEBPACK_EXTERNAL_MODULE_someId__ === 'undefined') {var e = new Error("Cannot find module 'some/request'"); e.code = 'MODULE_NOT_FOUND'; throw e;}
-module.exports = __WEBPACK_EXTERNAL_MODULE_someId__;`;
-
-				// invoke
-				const result = externalModule.getSourceForAmdOrUmdExternal(
-					id,
-					optional,
-					request
-				);
-
-				// check
-				expect(result).toEqual(expected);
-			});
-		});
-	});
-
-	describe("#getSourceForDefaultCase", () => {
-		it("returns the given request as lookup", () => {
-			// set up
-			const optional = false;
-			const expected = "module.exports = some/request;";
-
-			// invoke
-			const result = externalModule.getSourceForDefaultCase(optional, request);
-
-			// check
-			expect(result).toEqual(expected);
-		});
-		describe("given an optional check is requested", function() {
-			it("checks for the existence of the request setting it", () => {
-				// set up
-				const optional = true;
-				const expected = `if(typeof some/request === 'undefined') {var e = new Error("Cannot find module 'some/request'"); e.code = 'MODULE_NOT_FOUND'; throw e;}
-module.exports = some/request;`;
-
-				// invoke
-				const result = externalModule.getSourceForDefaultCase(
-					optional,
-					request
-				);
-
-				// check
-				expect(result).toEqual(expected);
-			});
-		});
-	});
-
-	describe("#updateHash", () => {
-		let hashedText;
-		let hash;
-		beforeEach(() => {
-			hashedText = "";
-			hash = {
-				update: text => {
-					hashedText += text;
-				}
-			};
-			externalModule.id = 12345678;
-			externalModule.updateHash(hash);
-		});
-		it("updates hash with request", () => {
-			expect(hashedText).toMatch("some/request");
-		});
-		it("updates hash with type", () => {
-			expect(hashedText).toMatch("some-type");
-		});
-		it("updates hash with module id", () => {
-			expect(hashedText).toMatch("12345678");
-		});
-	});
-
-	describe("#updateHash without optional", () => {
-		let hashedText;
-		let hash;
-		beforeEach(() => {
-			hashedText = "";
-			hash = {
-				update: text => {
-					hashedText += text;
-				}
-			};
-			// Note no set of `externalModule.optional`, which crashed externals in 3.7.0
-			externalModule.id = 12345678;
-			externalModule.updateHash(hash);
-		});
-		it("updates hash with request", () => {
-			expect(hashedText).toMatch("some/request");
-		});
-		it("updates hash with type", () => {
-			expect(hashedText).toMatch("some-type");
-		});
-		it("updates hash with optional flag", () => {
-			expect(hashedText).toMatch("false");
-		});
-		it("updates hash with module id", () => {
-			expect(hashedText).toMatch("12345678");
-		});
-	});
-});
diff --git a/test/HotModuleReplacementPlugin.test.js b/test/HotModuleReplacementPlugin.test.js
index c86df04ed75..09a0578d12b 100644
--- a/test/HotModuleReplacementPlugin.test.js
+++ b/test/HotModuleReplacementPlugin.test.js
@@ -50,10 +50,11 @@ describe("HotModuleReplacementPlugin", () => {
 			output: {
 				path: path.join(__dirname, "js", "HotModuleReplacementPlugin")
 			},
-			plugins: [
-				new webpack.HotModuleReplacementPlugin(),
-				new webpack.optimize.OccurrenceOrderPlugin()
-			]
+			plugins: [new webpack.HotModuleReplacementPlugin()],
+			optimization: {
+				moduleIds: "size",
+				chunkIds: "size"
+			}
 		});
 		fs.writeFileSync(entryFile, "1", "utf-8");
 		compiler.run((err, stats) => {
diff --git a/test/HotTestCases.test.js b/test/HotTestCases.test.js
index 22a5f852eb2..bb9e4d31ac6 100644
--- a/test/HotTestCases.test.js
+++ b/test/HotTestCases.test.js
@@ -5,6 +5,7 @@ const path = require("path");
 const fs = require("fs");
 const vm = require("vm");
 const checkArrayExpectation = require("./checkArrayExpectation");
+const createLazyTestEnv = require("./helpers/createLazyTestEnv");
 
 const webpack = require("../lib/webpack");
 
@@ -24,11 +25,10 @@ describe("HotTestCases", () => {
 	categories.forEach(category => {
 		describe(category.name, () => {
 			category.tests.forEach(testName => {
-				describe(
-					testName,
-					() => {
-						let exportedTests = [];
-						it(testName + " should compile", done => {
+				describe(testName, () => {
+					it(
+						testName + " should compile",
+						done => {
 							const testDirectory = path.join(
 								casesPath,
 								category.name,
@@ -50,6 +50,7 @@ describe("HotTestCases", () => {
 							let options = {};
 							if (fs.existsSync(configPath)) options = require(configPath);
 							if (!options.mode) options.mode = "development";
+							if (!options.devtool) options.devtool = false;
 							if (!options.context) options.context = testDirectory;
 							if (!options.entry) options.entry = "./index.js";
 							if (!options.output) options.output = {};
@@ -61,7 +62,6 @@ describe("HotTestCases", () => {
 							if (!options.module) options.module = {};
 							if (!options.module.rules) options.module.rules = [];
 							options.module.rules.push({
-								test: /\.js$/,
 								loader: path.join(
 									__dirname,
 									"hotCases",
@@ -106,14 +106,10 @@ describe("HotTestCases", () => {
 									return;
 								}
 
-								function _it(title, fn) {
-									exportedTests.push({ title, fn, timeout: 10000 });
-								}
-
 								function _next(callback) {
 									fakeUpdateLoaderOptions.updateIndex++;
 									compiler.run((err, stats) => {
-										if (err) return done(err);
+										if (err) return callback(err);
 										const jsonStats = stats.toJson({
 											errorDetails: true
 										});
@@ -124,7 +120,7 @@ describe("HotTestCases", () => {
 												"error",
 												"errors" + fakeUpdateLoaderOptions.updateIndex,
 												"Error",
-												done
+												callback
 											)
 										) {
 											return;
@@ -136,12 +132,12 @@ describe("HotTestCases", () => {
 												"warning",
 												"warnings" + fakeUpdateLoaderOptions.updateIndex,
 												"Warning",
-												done
+												callback
 											)
 										) {
 											return;
 										}
-										if (callback) callback(jsonStats);
+										callback(null, jsonStats);
 									});
 								}
 
@@ -151,6 +147,7 @@ describe("HotTestCases", () => {
 										const fn = vm.runInThisContext(
 											"(function(require, module, exports, __dirname, __filename, it, expect, NEXT, STATS) {" +
 												"global.expect = expect;" +
+												'function nsObj(m) { Object.defineProperty(m, Symbol.toStringTag, { value: "Module" }); return m; }' +
 												fs.readFileSync(p, "utf-8") +
 												"\n})",
 											p
@@ -174,31 +171,20 @@ describe("HotTestCases", () => {
 									} else return require(module);
 								}
 								_require("./bundle.js");
-								if (exportedTests.length < 1)
+								if (getNumberOfTests() < 1)
 									return done(new Error("No tests exported by test case"));
 
-								const asyncSuite = describe(`HotTestCases ${
-									category.name
-								} ${testName} exported tests`, () => {
-									exportedTests.forEach(({ title, fn, timeout }) => {
-										jest.setTimeout(10000);
-										return fn
-											? fit(title, fn, timeout)
-											: fit(title, () => {}).pend("Skipped");
-									});
-								});
-								// workaround for jest running clearSpies on the wrong suite (invoked by clearResourcesForRunnable)
-								asyncSuite.disabled = true;
-
-								jasmine
-									.getEnv()
-									.execute([asyncSuite.id], asyncSuite)
-									.then(done, done);
+								done();
 							});
-						});
-					},
-					10000
-				);
+						},
+						10000
+					);
+
+					const { it: _it, getNumberOfTests } = createLazyTestEnv(
+						jasmine.getEnv(),
+						10000
+					);
+				});
 			});
 		});
 	});
diff --git a/test/README.md b/test/README.md
index f648f049744..c11ac7e6a64 100644
--- a/test/README.md
+++ b/test/README.md
@@ -19,10 +19,10 @@ Watch mode:
 yarn jest --watch ConfigTestCases
 ```
 
-See also: [Jest CLI docs](https://facebook.github.io/jest/docs/cli.html)
+See also: [Jest CLI docs](https://jestjs.io/docs/cli)
 
 ## Test suite overview
-We use Jest for our tests. For more information on Jest you can visit their [homepage](https://facebook.github.io/jest/)!
+We use Jest for our tests. For more information on Jest you can visit their [homepage](https://jestjs.io/)!
 
 ### Class Tests
 All test files can be found in *.test.js. There are many tests that simply test API's of a specific class/file (such as `Compiler`, `Errors`, Integration, `Parser`, `RuleSet`, Validation).
@@ -62,7 +62,7 @@ Please follow the approach described bellow:
 * jest will automatically add the output from your test code to ```StatsTestCases.test.js.snap``` and you can always check your results there
 * Next time test will run -> runner will compare results against your output written to snapshot previously
 
-You can read more about SnapShot testing [right here](https://facebook.github.io/jest/docs/en/snapshot-testing.html)
+You can read more about SnapShot testing [right here](https://jestjs.io/docs/snapshot-testing)
 
 ## Questions? Comments?
 If you are still nervous or don't quite understand, please submit an issue and tag us in it, and provide a relevant PR while working on!
diff --git a/test/Schemas.lint.js b/test/Schemas.lint.js
index 50fff3badb6..8908cfdc6fb 100644
--- a/test/Schemas.lint.js
+++ b/test/Schemas.lint.js
@@ -28,24 +28,18 @@ describe("Schemas", () => {
 			});
 
 			if (content) {
-				it("should be formated correctly", () => {
-					expect(fileContent.replace(/\r\n?/g, "\n")).toBe(
-						JSON.stringify(content, 0, 2) + "\n"
-					);
-				});
-
 				const arrayProperties = ["oneOf", "anyOf", "allOf"];
 				const allowedProperties = [
 					"definitions",
 					"$ref",
-					"id",
+					"$id",
+					"title",
 					"items",
 					"properties",
 					"additionalProperties",
 					"type",
 					"oneOf",
 					"anyOf",
-					"allOf",
 					"absolutePath",
 					"description",
 					"enum",
@@ -55,7 +49,8 @@ describe("Schemas", () => {
 					"uniqueItems",
 					"minItems",
 					"minProperties",
-					"instanceof"
+					"instanceof",
+					"tsType"
 				];
 
 				const validateProperty = property => {
@@ -80,7 +75,7 @@ describe("Schemas", () => {
 						}
 					});
 
-					if (Object.keys(item).indexOf("$ref") >= 0) {
+					if ("$ref" in item) {
 						it("should not have other properties next to $ref", () => {
 							const otherProperties = Object.keys(item).filter(
 								p => p !== "$ref"
@@ -95,6 +90,34 @@ describe("Schemas", () => {
 						});
 					}
 
+					if ("instanceof" in item) {
+						it("should have tsType specified when using instanceof", () => {
+							if (!("tsType" in item)) {
+								throw new Error("When using instanceof, tsType is required");
+							}
+						});
+					}
+
+					if ("absolutePath" in item) {
+						it("should have type: 'string' specified when using absolutePath", () => {
+							if (item.type !== "string") {
+								throw new Error(
+									"When using absolutePath, type must be 'string'"
+								);
+							}
+						});
+					}
+
+					if ("properties" in item || "additionalProperties" in item) {
+						it("should have type: 'object' specified when using properties or additionalProperties", () => {
+							if (item.type !== "object") {
+								throw new Error(
+									"When using properties or additionalProperties, type must be 'object'"
+								);
+							}
+						});
+					}
+
 					arrayProperties.forEach(prop => {
 						if (prop in item) {
 							describe(prop, () => {
diff --git a/test/StatsTestCases.test.js b/test/StatsTestCases.test.js
index 6ab8049d6d0..f0ca3ae0e6e 100644
--- a/test/StatsTestCases.test.js
+++ b/test/StatsTestCases.test.js
@@ -15,7 +15,16 @@ const tests = fs
 		testName =>
 			fs.existsSync(path.join(base, testName, "index.js")) ||
 			fs.existsSync(path.join(base, testName, "webpack.config.js"))
-	);
+	)
+	.filter(testName => {
+		const testDirectory = path.join(base, testName);
+		const filterPath = path.join(testDirectory, "test.filter.js");
+		if (fs.existsSync(filterPath) && !require(filterPath)()) {
+			describe.skip(testName, () => it("filtered"));
+			return false;
+		}
+		return true;
+	});
 
 describe("StatsTestCases", () => {
 	tests.forEach(testName => {
@@ -66,7 +75,6 @@ describe("StatsTestCases", () => {
 						])
 					);
 				};
-				new webpack.optimize.OccurrenceOrderPlugin().apply(c);
 			});
 			c.run((err, stats) => {
 				if (err) return done(err);
diff --git a/test/TestCases.template.js b/test/TestCases.template.js
index 57dab3269db..622b6e2b934 100644
--- a/test/TestCases.template.js
+++ b/test/TestCases.template.js
@@ -7,6 +7,7 @@ const vm = require("vm");
 const mkdirp = require("mkdirp");
 const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
 const checkArrayExpectation = require("./checkArrayExpectation");
+const createLazyTestEnv = require("./helpers/createLazyTestEnv");
 
 const Stats = require("../lib/Stats");
 const webpack = require("../lib/webpack");
@@ -29,6 +30,7 @@ const DEFAULT_OPTIMIZATIONS = {
 	noEmitOnErrors: false,
 	concatenateModules: false,
 	namedModules: false,
+	hashedModuleIds: false,
 	minimizer: [uglifyJsForTesting]
 };
 
@@ -170,7 +172,6 @@ const describeCases = config => {
 							it(
 								testName + " should compile",
 								done => {
-									const exportedTests = [];
 									webpack(options, (err, stats) => {
 										if (err) done(err);
 										const statOptions = Stats.presetToOptions("verbose");
@@ -205,16 +206,13 @@ const describeCases = config => {
 										)
 											return;
 
-										function _it(title, fn) {
-											exportedTests.push({ title, fn, timeout: 10000 });
-										}
-
 										function _require(module) {
 											if (module.substr(0, 2) === "./") {
 												const p = path.join(outputDirectory, module);
 												const fn = vm.runInThisContext(
 													"(function(require, module, exports, __dirname, it, expect) {" +
 														"global.expect = expect;" +
+														'function nsObj(m) { Object.defineProperty(m, Symbol.toStringTag, { value: "Module" }); return m; }' +
 														fs.readFileSync(p, "utf-8") +
 														"\n})",
 													p
@@ -237,30 +235,19 @@ const describeCases = config => {
 										}
 										_require.webpackTestSuiteRequire = true;
 										_require("./bundle.js");
-										if (exportedTests.length === 0)
+										if (getNumberOfTests() === 0)
 											return done(new Error("No tests exported by test case"));
 
-										const asyncSuite = describe(`${config.name} ${
-											category.name
-										} ${testName} exported tests`, () => {
-											exportedTests.forEach(
-												({ title, fn, timeout }) =>
-													fn
-														? fit(title, fn, timeout)
-														: fit(title, () => {}).pend("Skipped")
-											);
-										});
-										// workaround for jest running clearSpies on the wrong suite (invoked by clearResourcesForRunnable)
-										asyncSuite.disabled = true;
-
-										jasmine
-											.getEnv()
-											.execute([asyncSuite.id], asyncSuite)
-											.then(done, done);
+										done();
 									});
 								},
 								60000
 							);
+
+							const { it: _it, getNumberOfTests } = createLazyTestEnv(
+								jasmine.getEnv(),
+								10000
+							);
 						});
 					});
 			});
diff --git a/test/Validation.test.js b/test/Validation.test.js
index 6f29d6a9ee5..9d306bcbacf 100644
--- a/test/Validation.test.js
+++ b/test/Validation.test.js
@@ -22,17 +22,17 @@ describe("Validation", () => {
 			},
 			message: [
 				" - configuration.entry should be one of these:",
-				"   object { <key>: non-empty string | [non-empty string] } | non-empty string | [non-empty string] | function",
+				"   function | object { <key>: non-empty string | [non-empty string] } | non-empty string | [non-empty string]",
 				"   -> The entry point(s) of the compilation.",
 				"   Details:",
+				"    * configuration.entry should be an instance of function",
+				"      -> A Function returning an entry object, an entry string, an entry array or a promise to these things.",
 				"    * configuration.entry should be an object.",
 				"      -> Multiple entry bundles are created. The key is the chunk name. The value can be a string or an array.",
 				"    * configuration.entry should not be empty.",
 				"      -> An entry point without name. The string is resolved to a module which is loaded upon startup.",
 				"    * configuration.entry should be an array:",
-				"      [non-empty string]",
-				"    * configuration.entry should be an instance of function",
-				"      -> A Function returning an entry object, an entry string, an entry array or a promise to these things."
+				"      [non-empty string]"
 			]
 		},
 		{
@@ -44,18 +44,18 @@ describe("Validation", () => {
 			},
 			message: [
 				" - configuration.entry should be one of these:",
-				"   object { <key>: non-empty string | [non-empty string] } | non-empty string | [non-empty string] | function",
+				"   function | object { <key>: non-empty string | [non-empty string] } | non-empty string | [non-empty string]",
 				"   -> The entry point(s) of the compilation.",
 				"   Details:",
+				"    * configuration.entry should be an instance of function",
+				"      -> A Function returning an entry object, an entry string, an entry array or a promise to these things.",
 				"    * configuration.entry['bundle'] should be a string.",
 				"      -> The string is resolved to a module which is loaded upon startup.",
 				"    * configuration.entry['bundle'] should not be empty.",
 				"    * configuration.entry should be a string.",
 				"      -> An entry point without name. The string is resolved to a module which is loaded upon startup.",
 				"    * configuration.entry should be an array:",
-				"      [non-empty string]",
-				"    * configuration.entry should be an instance of function",
-				"      -> A Function returning an entry object, an entry string, an entry array or a promise to these things."
+				"      [non-empty string]"
 			]
 		},
 		{
@@ -89,16 +89,16 @@ describe("Validation", () => {
 			},
 			message: [
 				" - configuration.entry should be one of these:",
-				"   object { <key>: non-empty string | [non-empty string] } | non-empty string | [non-empty string] | function",
+				"   function | object { <key>: non-empty string | [non-empty string] } | non-empty string | [non-empty string]",
 				"   -> The entry point(s) of the compilation.",
 				"   Details:",
+				"    * configuration.entry should be an instance of function",
+				"      -> A Function returning an entry object, an entry string, an entry array or a promise to these things.",
 				"    * configuration.entry should be an object.",
 				"      -> Multiple entry bundles are created. The key is the chunk name. The value can be a string or an array.",
 				"    * configuration.entry should be a string.",
 				"      -> An entry point without name. The string is resolved to a module which is loaded upon startup.",
-				"    * configuration.entry should not contain the item 'abc' twice.",
-				"    * configuration.entry should be an instance of function",
-				"      -> A Function returning an entry object, an entry string, an entry array or a promise to these things."
+				"    * configuration.entry should not contain the item 'abc' twice."
 			]
 		},
 		{
@@ -111,17 +111,17 @@ describe("Validation", () => {
 			},
 			message: [
 				" - configuration.entry should be one of these:",
-				"   object { <key>: non-empty string | [non-empty string] } | non-empty string | [non-empty string] | function",
+				"   function | object { <key>: non-empty string | [non-empty string] } | non-empty string | [non-empty string]",
 				"   -> The entry point(s) of the compilation.",
 				"   Details:",
+				"    * configuration.entry should be an instance of function",
+				"      -> A Function returning an entry object, an entry string, an entry array or a promise to these things.",
 				"    * configuration.entry should be an object.",
 				"      -> Multiple entry bundles are created. The key is the chunk name. The value can be a string or an array.",
 				"    * configuration.entry should be a string.",
 				"      -> An entry point without name. The string is resolved to a module which is loaded upon startup.",
 				"    * configuration.entry[0] should be a string.",
 				"      -> A non-empty string",
-				"    * configuration.entry should be an instance of function",
-				"      -> A Function returning an entry object, an entry string, an entry array or a promise to these things.",
 				" - configuration.output.filename should be one of these:",
 				"   string | function",
 				"   -> Specifies the name of each output file on disk. You must **not** specify an absolute path here! The `output.path` option determines the location on disk the files are written to, filename is used solely for naming the individual files.",
@@ -145,17 +145,17 @@ describe("Validation", () => {
 			],
 			message: [
 				" - configuration[0].entry should be one of these:",
-				"   object { <key>: non-empty string | [non-empty string] } | non-empty string | [non-empty string] | function",
+				"   function | object { <key>: non-empty string | [non-empty string] } | non-empty string | [non-empty string]",
 				"   -> The entry point(s) of the compilation.",
 				"   Details:",
+				"    * configuration[0].entry should be an instance of function",
+				"      -> A Function returning an entry object, an entry string, an entry array or a promise to these things.",
 				"    * configuration[0].entry should be an object.",
 				"      -> Multiple entry bundles are created. The key is the chunk name. The value can be a string or an array.",
 				"    * configuration[0].entry should be a string.",
 				"      -> An entry point without name. The string is resolved to a module which is loaded upon startup.",
 				"    * configuration[0].entry[0] should be a string.",
 				"      -> A non-empty string",
-				"    * configuration[0].entry should be an instance of function",
-				"      -> A Function returning an entry object, an entry string, an entry array or a promise to these things.",
 				" - configuration[1].output.filename should be one of these:",
 				"   string | function",
 				"   -> Specifies the name of each output file on disk. You must **not** specify an absolute path here! The `output.path` option determines the location on disk the files are written to, filename is used solely for naming the individual files.",
@@ -185,7 +185,7 @@ describe("Validation", () => {
 			},
 			message: [
 				" - configuration.module.rules[0].oneOf[0] has an unknown property 'passer'. These properties are valid:",
-				"   object { enforce?, exclude?, include?, issuer?, loader?, loaders?, oneOf?, options?, parser?, resolve?, sideEffects?, query?, type?, resource?, resourceQuery?, compiler?, rules?, test?, use? }",
+				"   object { compiler?, enforce?, exclude?, include?, issuer?, loader?, loaders?, oneOf?, options?, parser?, query?, resolve?, resource?, resourceQuery?, rules?, sideEffects?, test?, type?, use? }",
 				"   -> A rule"
 			]
 		},
@@ -197,9 +197,9 @@ describe("Validation", () => {
 			},
 			message: [
 				" - configuration has an unknown property 'postcss'. These properties are valid:",
-				"   object { mode?, amd?, bail?, cache?, context?, dependencies?, devServer?, devtool?, entry?, externals?, " +
-					"loader?, module?, name?, node?, output?, optimization?, parallelism?, performance?, plugins?, profile?, recordsInputPath?, " +
-					"recordsOutputPath?, recordsPath?, resolve?, resolveLoader?, serve?, stats?, target?, watch?, watchOptions? }",
+				"   object { amd?, bail?, cache?, context?, dependencies?, devServer?, devtool?, entry?, externals?, loader?, mode?, module?, " +
+					"name?, node?, optimization?, output?, parallelism?, performance?, plugins?, profile?, recordsInputPath?, recordsOutputPath?, " +
+					"recordsPath?, resolve?, resolveLoader?, serve?, stats?, target?, watch?, watchOptions? }",
 				"   For typos: please correct them.",
 				"   For loader options: webpack >= v2.0.0 no longer allows custom properties in configuration.",
 				"     Loaders should be updated to allow passing options via loader options in module.rules.",
@@ -239,7 +239,7 @@ describe("Validation", () => {
 				}
 			},
 			message: [
-				' - configuration.output.path: The provided value "/somepath/!test" contans exclamation mark (!) which is not allowed because it\'s reserved for loader syntax.',
+				' - configuration.output.path: The provided value "/somepath/!test" contains exclamation mark (!) which is not allowed because it\'s reserved for loader syntax.',
 				"   -> The output directory as **absolute path** (required)."
 			]
 		},
@@ -252,9 +252,13 @@ describe("Validation", () => {
 				}
 			},
 			message: [
-				' - configuration.output.filename: A relative path is expected. However, the provided value "/bar" is an absolute path!',
+				" - configuration.output.filename should be one of these:",
+				"   string | function",
 				"   -> Specifies the name of each output file on disk. You must **not** specify an absolute path here! The `output.path` option determines the location on disk the files are written to, filename is used solely for naming the individual files.",
-				"   Please use output.path to specify absolute path and output.filename for the file name."
+				"   Details:",
+				'    * configuration.output.filename: A relative path is expected. However, the provided value "/bar" is an absolute path!',
+				"      Please use output.path to specify absolute path and output.filename for the file name.",
+				"    * configuration.output.filename should be an instance of function"
 			]
 		},
 		{
@@ -368,9 +372,6 @@ describe("Validation", () => {
 				"    * configuration.plugins[0] misses the property 'apply'.",
 				"      function",
 				"      -> The run point of the plugin, required method.",
-				"    * configuration.plugins[0] misses the property 'apply'.",
-				"      function",
-				"      -> The run point of the plugin, required method.",
 				"    * configuration.plugins[0] should be an instance of function",
 				"      -> Function acting as plugin"
 			]
diff --git a/test/WatchTestCases.test.js b/test/WatchTestCases.test.js
index a1d957aacbc..95255c29872 100644
--- a/test/WatchTestCases.test.js
+++ b/test/WatchTestCases.test.js
@@ -7,6 +7,7 @@ const vm = require("vm");
 const mkdirp = require("mkdirp");
 const rimraf = require("rimraf");
 const checkArrayExpectation = require("./checkArrayExpectation");
+const createLazyTestEnv = require("./helpers/createLazyTestEnv");
 const { remove } = require("./helpers/remove");
 
 const Stats = require("../lib/Stats");
@@ -140,6 +141,7 @@ describe("WatchTestCases", () => {
 							let triggeringFilename;
 							let lastHash = "";
 							const currentWatchStepModule = require("./helpers/currentWatchStep");
+							let compilationFinished = done;
 							currentWatchStepModule.step = run.name;
 							copyDiff(path.join(testDirectory, run.name), tempDirectory, true);
 
@@ -156,13 +158,15 @@ describe("WatchTestCases", () => {
 										aggregateTimeout: 1000
 									},
 									(err, stats) => {
-										if (err) return done(err);
+										if (err) return compilationFinished(err);
 										if (!stats)
-											return done(new Error("No stats reported from Compiler"));
+											return compilationFinished(
+												new Error("No stats reported from Compiler")
+											);
 										if (stats.hash === lastHash) return;
 										lastHash = stats.hash;
 										if (run.done && lastHash !== stats.hash) {
-											return done(
+											return compilationFinished(
 												new Error(
 													"Compilation changed but no change was issued " +
 														lastHash +
@@ -178,7 +182,7 @@ describe("WatchTestCases", () => {
 										}
 										if (waitMode) return;
 										run.done = true;
-										if (err) return done(err);
+										if (err) return compilationFinished(err);
 										const statOptions = Stats.presetToOptions("verbose");
 										statOptions.colors = false;
 										mkdirp.sync(outputDirectory);
@@ -196,7 +200,7 @@ describe("WatchTestCases", () => {
 												jsonStats,
 												"error",
 												"Error",
-												done
+												compilationFinished
 											)
 										)
 											return;
@@ -206,17 +210,11 @@ describe("WatchTestCases", () => {
 												jsonStats,
 												"warning",
 												"Warning",
-												done
+												compilationFinished
 											)
 										)
 											return;
 
-										const exportedTests = [];
-
-										function _it(title, fn) {
-											exportedTests.push({ title, fn, timeout: 45000 });
-										}
-
 										const globalContext = {
 											console: console,
 											expect: expect
@@ -245,6 +243,7 @@ describe("WatchTestCases", () => {
 												) {
 													fn = vm.runInNewContext(
 														"(function(require, module, exports, __dirname, __filename, it, WATCH_STEP, STATS_JSON, STATE, expect, window) {" +
+															'function nsObj(m) { Object.defineProperty(m, Symbol.toStringTag, { value: "Module" }); return m; }' +
 															content +
 															"\n})",
 														globalContext,
@@ -254,6 +253,7 @@ describe("WatchTestCases", () => {
 													fn = vm.runInThisContext(
 														"(function(require, module, exports, __dirname, __filename, it, WATCH_STEP, STATS_JSON, STATE, expect) {" +
 															"global.expect = expect;" +
+															'function nsObj(m) { Object.defineProperty(m, Symbol.toStringTag, { value: "Module" }); return m; }' +
 															content +
 															"\n})",
 														p
@@ -269,7 +269,7 @@ describe("WatchTestCases", () => {
 													m.exports,
 													path.dirname(p),
 													p,
-													_it,
+													run.it,
 													run.name,
 													jsonStats,
 													state,
@@ -296,22 +296,26 @@ describe("WatchTestCases", () => {
 											// empty
 										}
 
-										if (testConfig.noTests) return process.nextTick(done);
+										if (testConfig.noTests)
+											return process.nextTick(compilationFinished);
 										_require(
 											outputDirectory,
 											testConfig.bundlePath || "./bundle.js"
 										);
 
-										if (exportedTests.length < 1)
-											return done(new Error("No tests exported by test case"));
+										if (run.getNumberOfTests() < 1)
+											return compilationFinished(
+												new Error("No tests exported by test case")
+											);
 
-										const continueStep = () => {
+										run.it("should compile the next step", done => {
 											runIdx++;
 											if (runIdx < runs.length) {
 												run = runs[runIdx];
 												waitMode = true;
 												setTimeout(() => {
 													waitMode = false;
+													compilationFinished = done;
 													currentWatchStepModule.step = run.name;
 													copyDiff(
 														path.join(testDirectory, run.name),
@@ -324,26 +328,9 @@ describe("WatchTestCases", () => {
 
 												done();
 											}
-										};
-
-										// Run the tests
-										const asyncSuite = describe(`WatchTestCases ${
-											category.name
-										} ${testName} step ${run.name}`, () => {
-											exportedTests.forEach(
-												({ title, fn, timeout }) =>
-													fn
-														? fit(title, fn, timeout)
-														: fit(title, () => {}).pend("Skipped")
-											);
 										});
-										// workaround for jest running clearSpies on the wrong suite (invoked by clearResourcesForRunnable)
-										asyncSuite.disabled = true;
 
-										jasmine
-											.getEnv()
-											.execute([asyncSuite.id], asyncSuite)
-											.then(continueStep, done);
+										compilationFinished();
 									}
 								);
 							}, 300);
@@ -351,6 +338,16 @@ describe("WatchTestCases", () => {
 						45000
 					);
 
+					for (const run of runs) {
+						const { it: _it, getNumberOfTests } = createLazyTestEnv(
+							jasmine.getEnv(),
+							10000,
+							run.name
+						);
+						run.it = _it;
+						run.getNumberOfTests = getNumberOfTests;
+					}
+
 					afterAll(() => {
 						remove(tempDirectory);
 					});
diff --git a/test/__snapshots__/ConfigTestCases.test.js.snap b/test/__snapshots__/ConfigTestCases.test.js.snap
index 0dab29d9c95..bf334e16f45 100644
--- a/test/__snapshots__/ConfigTestCases.test.js.snap
+++ b/test/__snapshots__/ConfigTestCases.test.js.snap
@@ -4,10 +4,10 @@ exports[`ConfigTestCases records issue-2991 exported tests should write relative
 "{
   \\"modules\\": {
     \\"byIdentifier\\": {
-      \\"external \\\\\\"path\\\\\\"\\": 0,
-      \\"external \\\\\\"fs\\\\\\"\\": 1,
-      \\"ignored  pkgs/somepackage/foo\\": 2,
-      \\"test.js\\": 3
+      \\"test.js\\": 0,
+      \\"ignored  pkgs/somepackage/foo\\": 1,
+      \\"external \\\\\\"fs\\\\\\"\\": 2,
+      \\"external \\\\\\"path\\\\\\"\\": 3
     },
     \\"usedIds\\": {
       \\"0\\": 0,
@@ -32,12 +32,12 @@ exports[`ConfigTestCases records issue-7339 exported tests should write relative
 "{
   \\"modules\\": {
     \\"byIdentifier\\": {
-      \\"dependencies/foo.js\\": 0,
-      \\"dependencies/bar.js\\": 1,
-      \\"external \\\\\\"path\\\\\\"\\": 2,
-      \\"external \\\\\\"fs\\\\\\"\\": 3,
-      \\"dependencies sync /^\\\\\\\\.\\\\\\\\/.*$/\\": 4,
-      \\"test.js\\": 5
+      \\"dependencies/bar.js\\": 0,
+      \\"dependencies/foo.js\\": 1,
+      \\"test.js\\": 2,
+      \\"dependencies sync /^\\\\\\\\.\\\\\\\\/.*$/\\": 3,
+      \\"external \\\\\\"fs\\\\\\"\\": 4,
+      \\"external \\\\\\"path\\\\\\"\\": 5
     },
     \\"usedIds\\": {
       \\"0\\": 0,
diff --git a/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
index 1fe3e735870..324197d47b6 100644
--- a/test/__snapshots__/StatsTestCases.test.js.snap
+++ b/test/__snapshots__/StatsTestCases.test.js.snap
@@ -1,145 +1,145 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`StatsTestCases should print correct stats for aggressive-splitting-entry 1`] = `
-"Hash: 4aa5beb3bbe987f505a74aa5beb3bbe987f505a7
+"Hash: 180e37a66128164d46de180e37a66128164d46de
 Child fitting:
-    Hash: 4aa5beb3bbe987f505a7
+    Hash: 180e37a66128164d46de
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
                       Asset      Size  Chunks             Chunk Names
-    9ac13fb7087e9ff1b93e.js  1.05 KiB       0  [emitted]  
-    2b4c8b62a524452d2de1.js  11.1 KiB       1  [emitted]  
-    d1ba53816ff760e185b0.js  1.94 KiB       2  [emitted]  
-    7b5b0a943e9362bc88c6.js  1.94 KiB       3  [emitted]  
-    Entrypoint main = d1ba53816ff760e185b0.js 7b5b0a943e9362bc88c6.js 2b4c8b62a524452d2de1.js
-    chunk    {0} 9ac13fb7087e9ff1b93e.js 916 bytes <{1}> <{2}> <{3}>
+    d4b551c6319035df2898.js  1.05 KiB       0  [emitted]  
+    c20f80d2394cac12b99b.js  11.1 KiB       1  [emitted]  
+    33966214360bbbb31383.js  1.94 KiB       2  [emitted]  
+    445d4c6a1d7381d6cb2c.js  1.94 KiB       3  [emitted]  
+    Entrypoint main = 33966214360bbbb31383.js 445d4c6a1d7381d6cb2c.js c20f80d2394cac12b99b.js
+    chunk    {0} d4b551c6319035df2898.js 916 bytes <{1}> <{2}> <{3}>
         > ./g [4] ./index.js 7:0-13
      [7] ./g.js 916 bytes {0} [built]
-    chunk    {1} 2b4c8b62a524452d2de1.js 1.87 KiB ={2}= ={3}= >{0}< [entry] [rendered]
+    chunk    {1} c20f80d2394cac12b99b.js 1.87 KiB ={2}= ={3}= >{0}< [entry] [rendered]
         > ./index main
      [3] ./e.js 899 bytes {1} [built]
      [4] ./index.js 111 bytes {1} [built]
      [6] ./f.js 900 bytes {1} [built]
-    chunk    {2} d1ba53816ff760e185b0.js 1.76 KiB ={1}= ={3}= >{0}< [initial] [rendered] [recorded] aggressive splitted
+    chunk    {2} 33966214360bbbb31383.js 1.76 KiB ={1}= ={3}= >{0}< [initial] [rendered] [recorded] aggressive splitted
         > ./index main
      [0] ./b.js 899 bytes {2} [built]
      [5] ./a.js 899 bytes {2} [built]
-    chunk    {3} 7b5b0a943e9362bc88c6.js 1.76 KiB ={1}= ={2}= >{0}< [initial] [rendered] [recorded] aggressive splitted
+    chunk    {3} 445d4c6a1d7381d6cb2c.js 1.76 KiB ={1}= ={2}= >{0}< [initial] [rendered] [recorded] aggressive splitted
         > ./index main
      [1] ./c.js 899 bytes {3} [built]
      [2] ./d.js 899 bytes {3} [built]
 Child content-change:
-    Hash: 4aa5beb3bbe987f505a7
+    Hash: 180e37a66128164d46de
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
                       Asset      Size  Chunks             Chunk Names
-    9ac13fb7087e9ff1b93e.js  1.05 KiB       0  [emitted]  
-    2b4c8b62a524452d2de1.js  11.1 KiB       1  [emitted]  
-    d1ba53816ff760e185b0.js  1.94 KiB       2  [emitted]  
-    7b5b0a943e9362bc88c6.js  1.94 KiB       3  [emitted]  
-    Entrypoint main = d1ba53816ff760e185b0.js 7b5b0a943e9362bc88c6.js 2b4c8b62a524452d2de1.js
-    chunk    {0} 9ac13fb7087e9ff1b93e.js 916 bytes <{1}> <{2}> <{3}>
+    d4b551c6319035df2898.js  1.05 KiB       0  [emitted]  
+    c20f80d2394cac12b99b.js  11.1 KiB       1  [emitted]  
+    33966214360bbbb31383.js  1.94 KiB       2  [emitted]  
+    445d4c6a1d7381d6cb2c.js  1.94 KiB       3  [emitted]  
+    Entrypoint main = 33966214360bbbb31383.js 445d4c6a1d7381d6cb2c.js c20f80d2394cac12b99b.js
+    chunk    {0} d4b551c6319035df2898.js 916 bytes <{1}> <{2}> <{3}>
         > ./g [4] ./index.js 7:0-13
      [7] ./g.js 916 bytes {0} [built]
-    chunk    {1} 2b4c8b62a524452d2de1.js 1.87 KiB ={2}= ={3}= >{0}< [entry] [rendered]
+    chunk    {1} c20f80d2394cac12b99b.js 1.87 KiB ={2}= ={3}= >{0}< [entry] [rendered]
         > ./index main
      [3] ./e.js 899 bytes {1} [built]
      [4] ./index.js 111 bytes {1} [built]
      [6] ./f.js 900 bytes {1} [built]
-    chunk    {2} d1ba53816ff760e185b0.js 1.76 KiB ={1}= ={3}= >{0}< [initial] [rendered] [recorded] aggressive splitted
+    chunk    {2} 33966214360bbbb31383.js 1.76 KiB ={1}= ={3}= >{0}< [initial] [rendered] [recorded] aggressive splitted
         > ./index main
      [0] ./b.js 899 bytes {2} [built]
      [5] ./a.js 899 bytes {2} [built]
-    chunk    {3} 7b5b0a943e9362bc88c6.js 1.76 KiB ={1}= ={2}= >{0}< [initial] [rendered] [recorded] aggressive splitted
+    chunk    {3} 445d4c6a1d7381d6cb2c.js 1.76 KiB ={1}= ={2}= >{0}< [initial] [rendered] [recorded] aggressive splitted
         > ./index main
      [1] ./c.js 899 bytes {3} [built]
      [2] ./d.js 899 bytes {3} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for aggressive-splitting-on-demand 1`] = `
-"Hash: 2e21ab9d4836a0caedb1
+"Hash: 70c362658281742abe1e
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
                   Asset      Size  Chunks             Chunk Names
-cf8697fa2c994f39a5d4.js  1.94 KiB    6, 7  [emitted]  
-fd868baa40dab4fc30fd.js  1.93 KiB       0  [emitted]  
-79c527bb5bf9cba1dc12.js  1.96 KiB       2  [emitted]  
-e9d82e81fefd7353e8df.js  1.94 KiB    3, 1  [emitted]  
-ae76098eeb55b9c448f2.js  1.01 KiB       4  [emitted]  
-05d92aaacfbffa4b7e56.js  1.94 KiB       5  [emitted]  
-d6418937dfae4b3ee922.js     1 KiB       1  [emitted]  
-685acdc95ff4af957f47.js     1 KiB       7  [emitted]  
-606f48c13070850338b1.js  1.94 KiB       8  [emitted]  
-c5a8eae840969538f450.js  1.94 KiB       9  [emitted]  
-7bf22146f3e40919bde5.js   9.7 KiB      10  [emitted]  main
-fcdf398c8972e4dcf788.js  1.94 KiB      11  [emitted]  
-Entrypoint main = 7bf22146f3e40919bde5.js
-chunk    {0} fd868baa40dab4fc30fd.js 1.76 KiB <{10}> ={1}= ={2}= ={3}= ={7}= ={9}= [recorded] aggressive splitted
+a2fea791e74e99836233.js  1.94 KiB       6  [emitted]  
+2736cf9d79233cd0a9b6.js  1.93 KiB       0  [emitted]  
+7f83e5c2f4e52435dd2c.js  1.96 KiB       2  [emitted]  
+43c1ac24102c075ecb2d.js  1.94 KiB    3, 1  [emitted]  
+3d7e118b7fada40e804e.js   9.7 KiB       4  [emitted]  main
+6a80fd33f274d3117a32.js  1.01 KiB       5  [emitted]  
+29de52df747b400f6177.js     1 KiB       1  [emitted]  
+a9463ba36646aa40b97c.js  1.94 KiB    7, 9  [emitted]  
+5bc7f208cd99a83b4e33.js  1.94 KiB       8  [emitted]  
+819c28704a84308cd0f6.js     1 KiB       9  [emitted]  
+5ea68201264e1d2b28e9.js  1.94 KiB      10  [emitted]  
+ba9fedb7aa0c69201639.js  1.94 KiB      11  [emitted]  
+Entrypoint main = 3d7e118b7fada40e804e.js
+chunk    {0} 2736cf9d79233cd0a9b6.js 1.76 KiB <{4}> ={1}= ={2}= ={3}= ={9}= ={10}= [recorded] aggressive splitted
     > ./b ./d ./e ./f ./g [11] ./index.js 5:0-44
     > ./b ./d ./e ./f ./g ./h ./i ./j ./k [11] ./index.js 6:0-72
- [0] ./b.js 899 bytes {0} {5} [built]
+ [0] ./b.js 899 bytes {0} {6} [built]
  [1] ./d.js 899 bytes {0} {8} [built]
-chunk    {1} d6418937dfae4b3ee922.js 899 bytes <{10}> ={0}= ={2}= ={8}=
+chunk    {1} 29de52df747b400f6177.js 899 bytes <{4}> ={0}= ={2}= ={8}=
     > ./c ./d ./e [11] ./index.js 3:0-30
     > ./b ./d ./e ./f ./g [11] ./index.js 5:0-44
  [2] ./e.js 899 bytes {1} {3} [built]
-chunk    {2} 79c527bb5bf9cba1dc12.js 1.76 KiB <{10}> ={0}= ={1}= ={11}= ={3}= ={6}= ={7}= ={9}= [recorded] aggressive splitted
+chunk    {2} 7f83e5c2f4e52435dd2c.js 1.76 KiB <{4}> ={0}= ={1}= ={3}= ={7}= ={9}= ={10}= ={11}= [recorded] aggressive splitted
     > ./f ./g ./h ./i ./j ./k [11] ./index.js 4:0-51
     > ./b ./d ./e ./f ./g [11] ./index.js 5:0-44
     > ./b ./d ./e ./f ./g ./h ./i ./j ./k [11] ./index.js 6:0-72
  [3] ./f.js 899 bytes {2} [built]
  [4] ./g.js 901 bytes {2} [built]
-chunk    {3} e9d82e81fefd7353e8df.js 1.76 KiB <{10}> ={0}= ={2}= ={7}= ={9}= [rendered] [recorded] aggressive splitted
+chunk    {3} 43c1ac24102c075ecb2d.js 1.76 KiB <{4}> ={0}= ={2}= ={9}= ={10}= [rendered] [recorded] aggressive splitted
     > ./b ./d ./e ./f ./g ./h ./i ./j ./k [11] ./index.js 6:0-72
  [2] ./e.js 899 bytes {1} {3} [built]
  [6] ./h.js 899 bytes {3} {11} [built]
-chunk    {4} ae76098eeb55b9c448f2.js 899 bytes <{10}>
+chunk    {4} 3d7e118b7fada40e804e.js (main) 248 bytes >{0}< >{1}< >{2}< >{3}< >{5}< >{6}< >{7}< >{8}< >{9}< >{10}< >{11}< [entry] [rendered]
+    > ./index main
+ [11] ./index.js 248 bytes {4} [built]
+chunk    {5} 6a80fd33f274d3117a32.js 899 bytes <{4}>
     > ./a [11] ./index.js 1:0-16
- [10] ./a.js 899 bytes {4} [built]
-chunk    {5} 05d92aaacfbffa4b7e56.js 1.76 KiB <{10}>
+ [10] ./a.js 899 bytes {5} [built]
+chunk    {6} a2fea791e74e99836233.js 1.76 KiB <{4}>
     > ./b ./c [11] ./index.js 2:0-23
- [0] ./b.js 899 bytes {0} {5} [built]
- [5] ./c.js 899 bytes {5} {8} [built]
-chunk    {6} cf8697fa2c994f39a5d4.js 1.76 KiB <{10}> ={11}= ={2}=
+ [0] ./b.js 899 bytes {0} {6} [built]
+ [5] ./c.js 899 bytes {6} {8} [built]
+chunk    {7} a9463ba36646aa40b97c.js 1.76 KiB <{4}> ={2}= ={11}=
     > ./f ./g ./h ./i ./j ./k [11] ./index.js 4:0-51
- [8] ./j.js 901 bytes {6} {9} [built]
- [9] ./k.js 899 bytes {6} {7} [built]
-chunk    {7} 685acdc95ff4af957f47.js 899 bytes <{10}> ={0}= ={2}= ={3}= ={9}=
-    > ./b ./d ./e ./f ./g ./h ./i ./j ./k [11] ./index.js 6:0-72
- [9] ./k.js 899 bytes {6} {7} [built]
-chunk    {8} 606f48c13070850338b1.js 1.76 KiB <{10}> ={1}= [recorded] aggressive splitted
+ [8] ./j.js 901 bytes {7} {10} [built]
+ [9] ./k.js 899 bytes {7} {9} [built]
+chunk    {8} 5bc7f208cd99a83b4e33.js 1.76 KiB <{4}> ={1}= [recorded] aggressive splitted
     > ./c ./d ./e [11] ./index.js 3:0-30
  [1] ./d.js 899 bytes {0} {8} [built]
- [5] ./c.js 899 bytes {5} {8} [built]
-chunk    {9} c5a8eae840969538f450.js 1.76 KiB <{10}> ={0}= ={2}= ={3}= ={7}= [rendered] [recorded] aggressive splitted
+ [5] ./c.js 899 bytes {6} {8} [built]
+chunk    {9} 819c28704a84308cd0f6.js 899 bytes <{4}> ={0}= ={2}= ={3}= ={10}=
     > ./b ./d ./e ./f ./g ./h ./i ./j ./k [11] ./index.js 6:0-72
- [7] ./i.js 899 bytes {9} {11} [built]
- [8] ./j.js 901 bytes {6} {9} [built]
-chunk   {10} 7bf22146f3e40919bde5.js (main) 248 bytes >{0}< >{1}< >{11}< >{2}< >{3}< >{4}< >{5}< >{6}< >{7}< >{8}< >{9}< [entry] [rendered]
-    > ./index main
- [11] ./index.js 248 bytes {10} [built]
-chunk   {11} fcdf398c8972e4dcf788.js 1.76 KiB <{10}> ={2}= ={6}= [rendered] [recorded] aggressive splitted
+ [9] ./k.js 899 bytes {7} {9} [built]
+chunk   {10} 5ea68201264e1d2b28e9.js 1.76 KiB <{4}> ={0}= ={2}= ={3}= ={9}= [rendered] [recorded] aggressive splitted
+    > ./b ./d ./e ./f ./g ./h ./i ./j ./k [11] ./index.js 6:0-72
+ [7] ./i.js 899 bytes {10} {11} [built]
+ [8] ./j.js 901 bytes {7} {10} [built]
+chunk   {11} ba9fedb7aa0c69201639.js 1.76 KiB <{4}> ={2}= ={7}= [rendered] [recorded] aggressive splitted
     > ./f ./g ./h ./i ./j ./k [11] ./index.js 4:0-51
  [6] ./h.js 899 bytes {3} {11} [built]
- [7] ./i.js 899 bytes {9} {11} [built]"
+ [7] ./i.js 899 bytes {10} {11} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for async-commons-chunk 1`] = `
 "Entrypoint main = main.js
-chunk    {0} 0.js 21 bytes <{3}> ={1}= ={2}= [rendered] reused as split chunk (cache group: default)
-    > [3] ./index.js 17:1-21:3
-    > [3] ./index.js 2:1-5:3
-    > ./a ./b [3] ./index.js 9:1-13:3
+chunk    {0} 0.js 21 bytes <{1}> ={2}= ={3}= [rendered] reused as split chunk (cache group: default)
+    > [1] ./index.js 17:1-21:3
+    > [1] ./index.js 2:1-5:3
+    > ./a ./b [1] ./index.js 9:1-13:3
  [0] ./a.js 21 bytes {0} [built]
-chunk    {1} 1.js 21 bytes <{3}> ={0}= [rendered]
-    > ./a ./b [3] ./index.js 9:1-13:3
- [1] ./b.js 21 bytes {1} [built]
-chunk    {2} 2.js 21 bytes <{3}> ={0}= [rendered]
-    > [3] ./index.js 17:1-21:3
- [2] ./c.js 21 bytes {2} [built]
-chunk    {3} main.js (main) 515 bytes >{0}< >{1}< >{2}< [entry] [rendered]
+chunk    {1} main.js (main) 515 bytes >{0}< >{2}< >{3}< [entry] [rendered]
     > ./ main
- [3] ./index.js 515 bytes {3} [built]"
+ [1] ./index.js 515 bytes {1} [built]
+chunk    {2} 2.js 21 bytes <{1}> ={0}= [rendered]
+    > ./a ./b [1] ./index.js 9:1-13:3
+ [2] ./b.js 21 bytes {2} [built]
+chunk    {3} 3.js 21 bytes <{1}> ={0}= [rendered]
+    > [1] ./index.js 17:1-21:3
+ [3] ./c.js 21 bytes {3} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for async-commons-chunk-auto 1`] = `
@@ -148,192 +148,192 @@ exports[`StatsTestCases should print correct stats for async-commons-chunk-auto
     Entrypoint a = disabled/a.js
     Entrypoint b = disabled/b.js
     Entrypoint c = disabled/c.js
-    chunk    {0} disabled/async-g.js (async-g) 54 bytes <{1}> <{5}> [rendered]
-        > ./g [] 6:0-47
-        > ./g [] 6:0-47
-     [2] ./f.js 20 bytes {0} {2} {3} {6} {7} [built]
-     [8] ./g.js 34 bytes {0} [built]
-    chunk    {1} disabled/async-a.js (async-a) 216 bytes <{4}> >{0}< [rendered]
-        > ./a [7] ./index.js 1:0-47
-     [0] ./d.js 20 bytes {1} {2} {3} {5} {6} {7} [built]
-     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {5} {6} {7} [built]
-     [3] ./node_modules/y.js 20 bytes {1} {2} {5} {6} [built]
-     [5] ./a.js + 1 modules 156 bytes {1} {5} [built]
-         | ./a.js 121 bytes [built]
-         | ./e.js 20 bytes [built]
-    chunk    {2} disabled/async-b.js (async-b) 152 bytes <{4}> [rendered]
-        > ./b [7] ./index.js 2:0-47
-     [0] ./d.js 20 bytes {1} {2} {3} {5} {6} {7} [built]
-     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {5} {6} {7} [built]
-     [2] ./f.js 20 bytes {0} {2} {3} {6} {7} [built]
-     [3] ./node_modules/y.js 20 bytes {1} {2} {5} {6} [built]
-     [4] ./b.js 72 bytes {2} {6} [built]
-    chunk    {3} disabled/async-c.js (async-c) 167 bytes <{4}> [rendered]
-        > ./c [7] ./index.js 3:0-47
-     [0] ./d.js 20 bytes {1} {2} {3} {5} {6} {7} [built]
-     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {5} {6} {7} [built]
-     [2] ./f.js 20 bytes {0} {2} {3} {6} {7} [built]
-     [6] ./c.js + 1 modules 107 bytes {3} {7} [built]
-         | ./c.js 72 bytes [built]
-         | ./node_modules/z.js 20 bytes [built]
-    chunk    {4} disabled/main.js (main) 147 bytes >{1}< >{2}< >{3}< [entry] [rendered]
+    chunk    {0} disabled/main.js (main) 147 bytes >{4}< >{5}< >{6}< [entry] [rendered]
         > ./ main
-     [7] ./index.js 147 bytes {4} [built]
-    chunk    {5} disabled/a.js (a) 216 bytes >{0}< [entry] [rendered]
+     [7] ./index.js 147 bytes {0} [built]
+    chunk    {1} disabled/a.js (a) 216 bytes >{7}< [entry] [rendered]
         > ./a a
-     [0] ./d.js 20 bytes {1} {2} {3} {5} {6} {7} [built]
-     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {5} {6} {7} [built]
-     [3] ./node_modules/y.js 20 bytes {1} {2} {5} {6} [built]
-     [5] ./a.js + 1 modules 156 bytes {1} {5} [built]
+     [0] ./d.js 20 bytes {1} {2} {3} {4} {5} {6} [built]
+     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {4} {5} {6} [built]
+     [3] ./node_modules/y.js 20 bytes {1} {2} {4} {5} [built]
+     [5] ./a.js + 1 modules 156 bytes {1} {4} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk    {6} disabled/b.js (b) 152 bytes [entry] [rendered]
+    chunk    {2} disabled/b.js (b) 152 bytes [entry] [rendered]
         > ./b b
-     [0] ./d.js 20 bytes {1} {2} {3} {5} {6} {7} [built]
-     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {5} {6} {7} [built]
-     [2] ./f.js 20 bytes {0} {2} {3} {6} {7} [built]
-     [3] ./node_modules/y.js 20 bytes {1} {2} {5} {6} [built]
-     [4] ./b.js 72 bytes {2} {6} [built]
-    chunk    {7} disabled/c.js (c) 167 bytes [entry] [rendered]
+     [0] ./d.js 20 bytes {1} {2} {3} {4} {5} {6} [built]
+     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {4} {5} {6} [built]
+     [2] ./f.js 20 bytes {2} {3} {5} {6} {7} [built]
+     [3] ./node_modules/y.js 20 bytes {1} {2} {4} {5} [built]
+     [4] ./b.js 72 bytes {2} {5} [built]
+    chunk    {3} disabled/c.js (c) 167 bytes [entry] [rendered]
         > ./c c
-     [0] ./d.js 20 bytes {1} {2} {3} {5} {6} {7} [built]
-     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {5} {6} {7} [built]
-     [2] ./f.js 20 bytes {0} {2} {3} {6} {7} [built]
-     [6] ./c.js + 1 modules 107 bytes {3} {7} [built]
+     [0] ./d.js 20 bytes {1} {2} {3} {4} {5} {6} [built]
+     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {4} {5} {6} [built]
+     [2] ./f.js 20 bytes {2} {3} {5} {6} {7} [built]
+     [6] ./c.js + 1 modules 107 bytes {3} {6} [built]
+         | ./c.js 72 bytes [built]
+         | ./node_modules/z.js 20 bytes [built]
+    chunk    {4} disabled/async-a.js (async-a) 216 bytes <{0}> >{7}< [rendered]
+        > ./a [7] ./index.js 1:0-47
+     [0] ./d.js 20 bytes {1} {2} {3} {4} {5} {6} [built]
+     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {4} {5} {6} [built]
+     [3] ./node_modules/y.js 20 bytes {1} {2} {4} {5} [built]
+     [5] ./a.js + 1 modules 156 bytes {1} {4} [built]
+         | ./a.js 121 bytes [built]
+         | ./e.js 20 bytes [built]
+    chunk    {5} disabled/async-b.js (async-b) 152 bytes <{0}> [rendered]
+        > ./b [7] ./index.js 2:0-47
+     [0] ./d.js 20 bytes {1} {2} {3} {4} {5} {6} [built]
+     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {4} {5} {6} [built]
+     [2] ./f.js 20 bytes {2} {3} {5} {6} {7} [built]
+     [3] ./node_modules/y.js 20 bytes {1} {2} {4} {5} [built]
+     [4] ./b.js 72 bytes {2} {5} [built]
+    chunk    {6} disabled/async-c.js (async-c) 167 bytes <{0}> [rendered]
+        > ./c [7] ./index.js 3:0-47
+     [0] ./d.js 20 bytes {1} {2} {3} {4} {5} {6} [built]
+     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {4} {5} {6} [built]
+     [2] ./f.js 20 bytes {2} {3} {5} {6} {7} [built]
+     [6] ./c.js + 1 modules 107 bytes {3} {6} [built]
          | ./c.js 72 bytes [built]
          | ./node_modules/z.js 20 bytes [built]
+    chunk    {7} disabled/async-g.js (async-g) 54 bytes <{1}> <{4}> [rendered]
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+     [2] ./f.js 20 bytes {2} {3} {5} {6} {7} [built]
+     [8] ./g.js 34 bytes {7} [built]
 Child default:
     Entrypoint main = default/main.js
     Entrypoint a = default/a.js
     Entrypoint b = default/b.js
     Entrypoint c = default/c.js
-    chunk    {0} default/vendors~async-a~async-b~async-c.js (vendors~async-a~async-b~async-c) 20 bytes <{9}> ={1}= ={2}= ={3}= ={5}= ={6}= ={7}= ={8}= >{2}< >{4}< [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b~async-c)
+    chunk    {0} default/vendors~async-a~async-b~async-c.js (vendors~async-a~async-b~async-c) 20 bytes <{4}> ={1}= ={2}= ={3}= ={8}= ={9}= ={10}= ={12}= >{2}< >{11}< [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b~async-c)
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [1] ./node_modules/x.js 20 bytes {0} {10} {11} {12} [built]
-    chunk    {1} default/async-a~async-b~async-c.js (async-a~async-b~async-c) 20 bytes <{9}> ={0}= ={2}= ={3}= ={5}= ={6}= ={7}= ={8}= >{2}< >{4}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
+     [1] ./node_modules/x.js 20 bytes {0} {5} {6} {7} [built]
+    chunk    {1} default/async-a~async-b~async-c.js (async-a~async-b~async-c) 20 bytes <{4}> ={0}= ={2}= ={3}= ={8}= ={9}= ={10}= ={12}= >{2}< >{11}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-    chunk    {2} default/async-b~async-c~async-g.js (async-b~async-c~async-g) 20 bytes <{0}> <{1}> <{10}> <{3}> <{5}> <{9}> ={0}= ={1}= ={3}= ={4}= ={6}= ={7}= ={8}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g)
+     [0] ./d.js 20 bytes {1} {5} {6} {7} [built]
+    chunk    {2} default/async-b~async-c~async-g.js (async-b~async-c~async-g) 20 bytes <{0}> <{1}> <{3}> <{4}> <{5}> <{8}> ={0}= ={1}= ={3}= ={9}= ={10}= ={11}= ={12}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g)
         > ./g [] 6:0-47
         > ./g [] 6:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [2] ./f.js 20 bytes {2} {11} {12} [built]
-    chunk    {3} default/vendors~async-a~async-b.js (vendors~async-a~async-b) 20 bytes <{9}> ={0}= ={1}= ={2}= ={5}= ={6}= >{2}< >{4}< [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b)
+     [2] ./f.js 20 bytes {2} {6} {7} [built]
+    chunk    {3} default/vendors~async-a~async-b.js (vendors~async-a~async-b) 20 bytes <{4}> ={0}= ={1}= ={2}= ={8}= ={9}= >{2}< >{11}< [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b)
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
-     [3] ./node_modules/y.js 20 bytes {3} {10} {11} [built]
-    chunk    {4} default/async-g.js (async-g) 34 bytes <{0}> <{1}> <{10}> <{3}> <{5}> ={2}= [rendered]
-        > ./g [] 6:0-47
-        > ./g [] 6:0-47
-     [9] ./g.js 34 bytes {4} [built]
-    chunk    {5} default/async-a.js (async-a) 156 bytes <{9}> ={0}= ={1}= ={3}= >{2}< >{4}< [rendered]
-        > ./a [8] ./index.js 1:0-47
-     [7] ./a.js + 1 modules 156 bytes {5} {10} [built]
-         | ./a.js 121 bytes [built]
-         | ./e.js 20 bytes [built]
-    chunk    {6} default/async-b.js (async-b) 72 bytes <{9}> ={0}= ={1}= ={2}= ={3}= [rendered]
-        > ./b [8] ./index.js 2:0-47
-     [5] ./b.js 72 bytes {6} {11} [built]
-    chunk    {7} default/async-c.js (async-c) 72 bytes <{9}> ={0}= ={1}= ={2}= ={8}= [rendered]
-        > ./c [8] ./index.js 3:0-47
-     [6] ./c.js 72 bytes {7} {12} [built]
-    chunk    {8} default/vendors~async-c.js (vendors~async-c) 20 bytes <{9}> ={0}= ={1}= ={2}= ={7}= [rendered] split chunk (cache group: vendors) (name: vendors~async-c)
-        > ./c [8] ./index.js 3:0-47
-     [4] ./node_modules/z.js 20 bytes {8} {12} [built]
-    chunk    {9} default/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{5}< >{6}< >{7}< >{8}< [entry] [rendered]
+     [3] ./node_modules/y.js 20 bytes {3} {5} {6} [built]
+    chunk    {4} default/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{8}< >{9}< >{10}< >{12}< [entry] [rendered]
         > ./ main
-     [8] ./index.js 147 bytes {9} [built]
-    chunk   {10} default/a.js (a) 216 bytes >{2}< >{4}< [entry] [rendered]
+     [8] ./index.js 147 bytes {4} [built]
+    chunk    {5} default/a.js (a) 216 bytes >{2}< >{11}< [entry] [rendered]
         > ./a a
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./node_modules/x.js 20 bytes {0} {10} {11} {12} [built]
-     [3] ./node_modules/y.js 20 bytes {3} {10} {11} [built]
-     [7] ./a.js + 1 modules 156 bytes {5} {10} [built]
+     [0] ./d.js 20 bytes {1} {5} {6} {7} [built]
+     [1] ./node_modules/x.js 20 bytes {0} {5} {6} {7} [built]
+     [3] ./node_modules/y.js 20 bytes {3} {5} {6} [built]
+     [6] ./a.js + 1 modules 156 bytes {5} {8} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk   {11} default/b.js (b) 152 bytes [entry] [rendered]
+    chunk    {6} default/b.js (b) 152 bytes [entry] [rendered]
         > ./b b
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./node_modules/x.js 20 bytes {0} {10} {11} {12} [built]
-     [2] ./f.js 20 bytes {2} {11} {12} [built]
-     [3] ./node_modules/y.js 20 bytes {3} {10} {11} [built]
-     [5] ./b.js 72 bytes {6} {11} [built]
-    chunk   {12} default/c.js (c) 152 bytes [entry] [rendered]
+     [0] ./d.js 20 bytes {1} {5} {6} {7} [built]
+     [1] ./node_modules/x.js 20 bytes {0} {5} {6} {7} [built]
+     [2] ./f.js 20 bytes {2} {6} {7} [built]
+     [3] ./node_modules/y.js 20 bytes {3} {5} {6} [built]
+     [4] ./b.js 72 bytes {6} {9} [built]
+    chunk    {7} default/c.js (c) 152 bytes [entry] [rendered]
         > ./c c
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./node_modules/x.js 20 bytes {0} {10} {11} {12} [built]
-     [2] ./f.js 20 bytes {2} {11} {12} [built]
-     [4] ./node_modules/z.js 20 bytes {8} {12} [built]
-     [6] ./c.js 72 bytes {7} {12} [built]
-Child vendors:
-    Entrypoint main = vendors/main.js
-    Entrypoint a = vendors/vendors.js vendors/a.js
-    Entrypoint b = vendors/vendors.js vendors/b.js
-    Entrypoint c = vendors/vendors.js vendors/c.js
-    chunk    {0} vendors/async-g.js (async-g) 54 bytes <{1}> <{4}> <{6}> [rendered]
-        > ./g [] 6:0-47
-        > ./g [] 6:0-47
-     [2] ./f.js 20 bytes {0} {2} {3} {7} {8} [built]
-     [9] ./g.js 34 bytes {0} [built]
-    chunk    {1} vendors/async-a.js (async-a) 216 bytes <{5}> >{0}< [rendered]
+     [0] ./d.js 20 bytes {1} {5} {6} {7} [built]
+     [1] ./node_modules/x.js 20 bytes {0} {5} {6} {7} [built]
+     [2] ./f.js 20 bytes {2} {6} {7} [built]
+     [5] ./c.js 72 bytes {7} {10} [built]
+     [7] ./node_modules/z.js 20 bytes {7} {12} [built]
+    chunk    {8} default/async-a.js (async-a) 156 bytes <{4}> ={0}= ={1}= ={3}= >{2}< >{11}< [rendered]
         > ./a [8] ./index.js 1:0-47
-     [0] ./d.js 20 bytes {1} {2} {3} {6} {7} {8} [built]
-     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {4} [built]
-     [3] ./node_modules/y.js 20 bytes {1} {2} {4} [built]
-     [7] ./a.js + 1 modules 156 bytes {1} {6} [built]
+     [6] ./a.js + 1 modules 156 bytes {5} {8} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk    {2} vendors/async-b.js (async-b) 152 bytes <{5}> [rendered]
+    chunk    {9} default/async-b.js (async-b) 72 bytes <{4}> ={0}= ={1}= ={2}= ={3}= [rendered]
         > ./b [8] ./index.js 2:0-47
-     [0] ./d.js 20 bytes {1} {2} {3} {6} {7} {8} [built]
-     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {4} [built]
-     [2] ./f.js 20 bytes {0} {2} {3} {7} {8} [built]
-     [3] ./node_modules/y.js 20 bytes {1} {2} {4} [built]
-     [5] ./b.js 72 bytes {2} {7} [built]
-    chunk    {3} vendors/async-c.js (async-c) 152 bytes <{5}> [rendered]
+     [4] ./b.js 72 bytes {6} {9} [built]
+    chunk   {10} default/async-c.js (async-c) 72 bytes <{4}> ={0}= ={1}= ={2}= ={12}= [rendered]
         > ./c [8] ./index.js 3:0-47
-     [0] ./d.js 20 bytes {1} {2} {3} {6} {7} {8} [built]
-     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {4} [built]
-     [2] ./f.js 20 bytes {0} {2} {3} {7} {8} [built]
-     [4] ./node_modules/z.js 20 bytes {3} {4} [built]
-     [6] ./c.js 72 bytes {3} {8} [built]
-    chunk    {4} vendors/vendors.js (vendors) 60 bytes ={6}= ={7}= ={8}= >{0}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors)
+     [5] ./c.js 72 bytes {7} {10} [built]
+    chunk   {11} default/async-g.js (async-g) 34 bytes <{0}> <{1}> <{3}> <{5}> <{8}> ={2}= [rendered]
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+     [9] ./g.js 34 bytes {11} [built]
+    chunk   {12} default/vendors~async-c.js (vendors~async-c) 20 bytes <{4}> ={0}= ={1}= ={2}= ={10}= [rendered] split chunk (cache group: vendors) (name: vendors~async-c)
+        > ./c [8] ./index.js 3:0-47
+     [7] ./node_modules/z.js 20 bytes {7} {12} [built]
+Child vendors:
+    Entrypoint main = vendors/main.js
+    Entrypoint a = vendors/vendors.js vendors/a.js
+    Entrypoint b = vendors/vendors.js vendors/b.js
+    Entrypoint c = vendors/vendors.js vendors/c.js
+    chunk    {0} vendors/vendors.js (vendors) 60 bytes ={2}= ={3}= ={4}= >{8}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors)
         > ./a a
         > ./b b
         > ./c c
-     [1] ./node_modules/x.js 20 bytes {1} {2} {3} {4} [built]
-     [3] ./node_modules/y.js 20 bytes {1} {2} {4} [built]
-     [4] ./node_modules/z.js 20 bytes {3} {4} [built]
-    chunk    {5} vendors/main.js (main) 147 bytes >{1}< >{2}< >{3}< [entry] [rendered]
+     [1] ./node_modules/x.js 20 bytes {0} {5} {6} {7} [built]
+     [3] ./node_modules/y.js 20 bytes {0} {5} {6} [built]
+     [7] ./node_modules/z.js 20 bytes {0} {7} [built]
+    chunk    {1} vendors/main.js (main) 147 bytes >{5}< >{6}< >{7}< [entry] [rendered]
         > ./ main
-     [8] ./index.js 147 bytes {5} [built]
-    chunk    {6} vendors/a.js (a) 176 bytes ={4}= >{0}< [entry] [rendered]
+     [8] ./index.js 147 bytes {1} [built]
+    chunk    {2} vendors/a.js (a) 176 bytes ={0}= >{8}< [entry] [rendered]
         > ./a a
-     [0] ./d.js 20 bytes {1} {2} {3} {6} {7} {8} [built]
-     [7] ./a.js + 1 modules 156 bytes {1} {6} [built]
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [6] ./a.js + 1 modules 156 bytes {2} {5} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk    {7} vendors/b.js (b) 112 bytes ={4}= [entry] [rendered]
+    chunk    {3} vendors/b.js (b) 112 bytes ={0}= [entry] [rendered]
         > ./b b
-     [0] ./d.js 20 bytes {1} {2} {3} {6} {7} {8} [built]
-     [2] ./f.js 20 bytes {0} {2} {3} {7} {8} [built]
-     [5] ./b.js 72 bytes {2} {7} [built]
-    chunk    {8} vendors/c.js (c) 112 bytes ={4}= [entry] [rendered]
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [2] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [4] ./b.js 72 bytes {3} {6} [built]
+    chunk    {4} vendors/c.js (c) 112 bytes ={0}= [entry] [rendered]
         > ./c c
-     [0] ./d.js 20 bytes {1} {2} {3} {6} {7} {8} [built]
-     [2] ./f.js 20 bytes {0} {2} {3} {7} {8} [built]
-     [6] ./c.js 72 bytes {3} {8} [built]
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [2] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [5] ./c.js 72 bytes {4} {7} [built]
+    chunk    {5} vendors/async-a.js (async-a) 216 bytes <{1}> >{8}< [rendered]
+        > ./a [8] ./index.js 1:0-47
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [1] ./node_modules/x.js 20 bytes {0} {5} {6} {7} [built]
+     [3] ./node_modules/y.js 20 bytes {0} {5} {6} [built]
+     [6] ./a.js + 1 modules 156 bytes {2} {5} [built]
+         | ./a.js 121 bytes [built]
+         | ./e.js 20 bytes [built]
+    chunk    {6} vendors/async-b.js (async-b) 152 bytes <{1}> [rendered]
+        > ./b [8] ./index.js 2:0-47
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [1] ./node_modules/x.js 20 bytes {0} {5} {6} {7} [built]
+     [2] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [3] ./node_modules/y.js 20 bytes {0} {5} {6} [built]
+     [4] ./b.js 72 bytes {3} {6} [built]
+    chunk    {7} vendors/async-c.js (async-c) 152 bytes <{1}> [rendered]
+        > ./c [8] ./index.js 3:0-47
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [1] ./node_modules/x.js 20 bytes {0} {5} {6} {7} [built]
+     [2] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [5] ./c.js 72 bytes {4} {7} [built]
+     [7] ./node_modules/z.js 20 bytes {0} {7} [built]
+    chunk    {8} vendors/async-g.js (async-g) 54 bytes <{0}> <{2}> <{5}> [rendered]
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+     [2] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [9] ./g.js 34 bytes {8} [built]
 Child multiple-vendors:
     Entrypoint main = multiple-vendors/main.js
     Entrypoint a = multiple-vendors/libs-x.js multiple-vendors/vendors~a~async-a~async-b~b.js multiple-vendors/a.js
     Entrypoint b = multiple-vendors/libs-x.js multiple-vendors/vendors~a~async-a~async-b~b.js multiple-vendors/b.js
     Entrypoint c = multiple-vendors/libs-x.js multiple-vendors/vendors~async-c~c.js multiple-vendors/c.js
-    chunk    {0} multiple-vendors/libs-x.js (libs-x) 20 bytes <{9}> ={1}= ={10}= ={11}= ={12}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: libs) (name: libs-x)
+    chunk    {0} multiple-vendors/libs-x.js (libs-x) 20 bytes <{5}> ={1}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= ={9}= ={10}= ={11}= >{3}< >{12}< [initial] [rendered] split chunk (cache group: libs) (name: libs-x)
         > ./a a
         > ./b b
         > ./c c
@@ -341,67 +341,67 @@ Child multiple-vendors:
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
      [2] ./node_modules/x.js 20 bytes {0} [built]
-    chunk    {1} multiple-vendors/async-a~async-b~async-c.js (async-a~async-b~async-c) 20 bytes <{9}> ={0}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
+    chunk    {1} multiple-vendors/vendors~a~async-a~async-b~b.js (vendors~a~async-a~async-b~b) 20 bytes <{5}> ={0}= ={2}= ={3}= ={6}= ={7}= ={9}= ={10}= >{3}< >{12}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~b)
+        > ./a a
+        > ./b b
+        > ./a [8] ./index.js 1:0-47
+        > ./b [8] ./index.js 2:0-47
+     [3] ./node_modules/y.js 20 bytes {1} [built]
+    chunk    {2} multiple-vendors/async-a~async-b~async-c.js (async-a~async-b~async-c) 20 bytes <{5}> ={0}= ={1}= ={3}= ={4}= ={9}= ={10}= ={11}= >{3}< >{12}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-    chunk    {2} multiple-vendors/async-b~async-c~async-g.js (async-b~async-c~async-g) 20 bytes <{0}> <{1}> <{10}> <{3}> <{6}> <{9}> ={0}= ={1}= ={3}= ={4}= ={5}= ={7}= ={8}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g)
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+    chunk    {3} multiple-vendors/async-b~async-c~async-g.js (async-b~async-c~async-g) 20 bytes <{0}> <{1}> <{2}> <{5}> <{6}> <{9}> ={0}= ={1}= ={2}= ={4}= ={10}= ={11}= ={12}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g)
         > ./g [] 6:0-47
         > ./g [] 6:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-    chunk    {3} multiple-vendors/vendors~a~async-a~async-b~b.js (vendors~a~async-a~async-b~b) 20 bytes <{9}> ={0}= ={1}= ={10}= ={11}= ={2}= ={6}= ={7}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~b)
-        > ./a a
-        > ./b b
-        > ./a [8] ./index.js 1:0-47
-        > ./b [8] ./index.js 2:0-47
-     [3] ./node_modules/y.js 20 bytes {3} [built]
-    chunk    {4} multiple-vendors/vendors~async-c~c.js (vendors~async-c~c) 20 bytes <{9}> ={0}= ={1}= ={12}= ={2}= ={8}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~c)
+     [1] ./f.js 20 bytes {3} {7} {8} [built]
+    chunk    {4} multiple-vendors/vendors~async-c~c.js (vendors~async-c~c) 20 bytes <{5}> ={0}= ={2}= ={3}= ={8}= ={11}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~c)
         > ./c c
         > ./c [8] ./index.js 3:0-47
      [7] ./node_modules/z.js 20 bytes {4} [built]
-    chunk    {5} multiple-vendors/async-g.js (async-g) 34 bytes <{0}> <{1}> <{10}> <{3}> <{6}> ={2}= [rendered]
-        > ./g [] 6:0-47
-        > ./g [] 6:0-47
-     [9] ./g.js 34 bytes {5} [built]
-    chunk    {6} multiple-vendors/async-a.js (async-a) 156 bytes <{9}> ={0}= ={1}= ={3}= >{2}< >{5}< [rendered]
-        > ./a [8] ./index.js 1:0-47
-     [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
-         | ./a.js 121 bytes [built]
-         | ./e.js 20 bytes [built]
-    chunk    {7} multiple-vendors/async-b.js (async-b) 72 bytes <{9}> ={0}= ={1}= ={2}= ={3}= [rendered]
-        > ./b [8] ./index.js 2:0-47
-     [4] ./b.js 72 bytes {7} {11} [built]
-    chunk    {8} multiple-vendors/async-c.js (async-c) 72 bytes <{9}> ={0}= ={1}= ={2}= ={4}= [rendered]
-        > ./c [8] ./index.js 3:0-47
-     [5] ./c.js 72 bytes {8} {12} [built]
-    chunk    {9} multiple-vendors/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{6}< >{7}< >{8}< [entry] [rendered]
+    chunk    {5} multiple-vendors/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{9}< >{10}< >{11}< [entry] [rendered]
         > ./ main
-     [8] ./index.js 147 bytes {9} [built]
-    chunk   {10} multiple-vendors/a.js (a) 176 bytes ={0}= ={3}= >{2}< >{5}< [entry] [rendered]
+     [8] ./index.js 147 bytes {5} [built]
+    chunk    {6} multiple-vendors/a.js (a) 176 bytes ={0}= ={1}= >{3}< >{12}< [entry] [rendered]
         > ./a a
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+     [6] ./a.js + 1 modules 156 bytes {6} {9} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk   {11} multiple-vendors/b.js (b) 112 bytes ={0}= ={3}= [entry] [rendered]
+    chunk    {7} multiple-vendors/b.js (b) 112 bytes ={0}= ={1}= [entry] [rendered]
         > ./b b
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-     [4] ./b.js 72 bytes {7} {11} [built]
-    chunk   {12} multiple-vendors/c.js (c) 112 bytes ={0}= ={4}= [entry] [rendered]
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+     [1] ./f.js 20 bytes {3} {7} {8} [built]
+     [4] ./b.js 72 bytes {7} {10} [built]
+    chunk    {8} multiple-vendors/c.js (c) 112 bytes ={0}= ={4}= [entry] [rendered]
         > ./c c
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-     [5] ./c.js 72 bytes {8} {12} [built]
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+     [1] ./f.js 20 bytes {3} {7} {8} [built]
+     [5] ./c.js 72 bytes {8} {11} [built]
+    chunk    {9} multiple-vendors/async-a.js (async-a) 156 bytes <{5}> ={0}= ={1}= ={2}= >{3}< >{12}< [rendered]
+        > ./a [8] ./index.js 1:0-47
+     [6] ./a.js + 1 modules 156 bytes {6} {9} [built]
+         | ./a.js 121 bytes [built]
+         | ./e.js 20 bytes [built]
+    chunk   {10} multiple-vendors/async-b.js (async-b) 72 bytes <{5}> ={0}= ={1}= ={2}= ={3}= [rendered]
+        > ./b [8] ./index.js 2:0-47
+     [4] ./b.js 72 bytes {7} {10} [built]
+    chunk   {11} multiple-vendors/async-c.js (async-c) 72 bytes <{5}> ={0}= ={2}= ={3}= ={4}= [rendered]
+        > ./c [8] ./index.js 3:0-47
+     [5] ./c.js 72 bytes {8} {11} [built]
+    chunk   {12} multiple-vendors/async-g.js (async-g) 34 bytes <{0}> <{1}> <{2}> <{6}> <{9}> ={3}= [rendered]
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+     [9] ./g.js 34 bytes {12} [built]
 Child all:
     Entrypoint main = all/main.js
     Entrypoint a = all/vendors~a~async-a~async-b~async-c~b~c.js all/vendors~a~async-a~async-b~b.js all/a.js
     Entrypoint b = all/vendors~a~async-a~async-b~async-c~b~c.js all/vendors~a~async-a~async-b~b.js all/b.js
     Entrypoint c = all/vendors~a~async-a~async-b~async-c~b~c.js all/vendors~async-c~c.js all/c.js
-    chunk    {0} all/vendors~a~async-a~async-b~async-c~b~c.js (vendors~a~async-a~async-b~async-c~b~c) 20 bytes <{9}> ={1}= ={10}= ={11}= ={12}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~async-c~b~c)
+    chunk    {0} all/vendors~a~async-a~async-b~async-c~b~c.js (vendors~a~async-a~async-b~async-c~b~c) 20 bytes <{5}> ={1}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= ={9}= ={10}= ={11}= >{3}< >{12}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~async-c~b~c)
         > ./a a
         > ./b b
         > ./c c
@@ -409,65 +409,65 @@ Child all:
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
      [2] ./node_modules/x.js 20 bytes {0} [built]
-    chunk    {1} all/async-a~async-b~async-c.js (async-a~async-b~async-c) 20 bytes <{9}> ={0}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
+    chunk    {1} all/vendors~a~async-a~async-b~b.js (vendors~a~async-a~async-b~b) 20 bytes <{5}> ={0}= ={2}= ={3}= ={6}= ={7}= ={9}= ={10}= >{3}< >{12}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~b)
+        > ./a a
+        > ./b b
+        > ./a [8] ./index.js 1:0-47
+        > ./b [8] ./index.js 2:0-47
+     [3] ./node_modules/y.js 20 bytes {1} [built]
+    chunk    {2} all/async-a~async-b~async-c.js (async-a~async-b~async-c) 20 bytes <{5}> ={0}= ={1}= ={3}= ={4}= ={9}= ={10}= ={11}= >{3}< >{12}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-    chunk    {2} all/async-b~async-c~async-g.js (async-b~async-c~async-g) 20 bytes <{0}> <{1}> <{10}> <{3}> <{6}> <{9}> ={0}= ={1}= ={3}= ={4}= ={5}= ={7}= ={8}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g)
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+    chunk    {3} all/async-b~async-c~async-g.js (async-b~async-c~async-g) 20 bytes <{0}> <{1}> <{2}> <{5}> <{6}> <{9}> ={0}= ={1}= ={2}= ={4}= ={10}= ={11}= ={12}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g)
         > ./g [] 6:0-47
         > ./g [] 6:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-    chunk    {3} all/vendors~a~async-a~async-b~b.js (vendors~a~async-a~async-b~b) 20 bytes <{9}> ={0}= ={1}= ={10}= ={11}= ={2}= ={6}= ={7}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~b)
-        > ./a a
-        > ./b b
-        > ./a [8] ./index.js 1:0-47
-        > ./b [8] ./index.js 2:0-47
-     [3] ./node_modules/y.js 20 bytes {3} [built]
-    chunk    {4} all/vendors~async-c~c.js (vendors~async-c~c) 20 bytes <{9}> ={0}= ={1}= ={12}= ={2}= ={8}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~c)
+     [1] ./f.js 20 bytes {3} {7} {8} [built]
+    chunk    {4} all/vendors~async-c~c.js (vendors~async-c~c) 20 bytes <{5}> ={0}= ={2}= ={3}= ={8}= ={11}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~c)
         > ./c c
         > ./c [8] ./index.js 3:0-47
      [7] ./node_modules/z.js 20 bytes {4} [built]
-    chunk    {5} all/async-g.js (async-g) 34 bytes <{0}> <{1}> <{10}> <{3}> <{6}> ={2}= [rendered]
-        > ./g [] 6:0-47
-        > ./g [] 6:0-47
-     [9] ./g.js 34 bytes {5} [built]
-    chunk    {6} all/async-a.js (async-a) 156 bytes <{9}> ={0}= ={1}= ={3}= >{2}< >{5}< [rendered]
-        > ./a [8] ./index.js 1:0-47
-     [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
-         | ./a.js 121 bytes [built]
-         | ./e.js 20 bytes [built]
-    chunk    {7} all/async-b.js (async-b) 72 bytes <{9}> ={0}= ={1}= ={2}= ={3}= [rendered]
-        > ./b [8] ./index.js 2:0-47
-     [4] ./b.js 72 bytes {7} {11} [built]
-    chunk    {8} all/async-c.js (async-c) 72 bytes <{9}> ={0}= ={1}= ={2}= ={4}= [rendered]
-        > ./c [8] ./index.js 3:0-47
-     [5] ./c.js 72 bytes {8} {12} [built]
-    chunk    {9} all/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{6}< >{7}< >{8}< [entry] [rendered]
+    chunk    {5} all/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{9}< >{10}< >{11}< [entry] [rendered]
         > ./ main
-     [8] ./index.js 147 bytes {9} [built]
-    chunk   {10} all/a.js (a) 176 bytes ={0}= ={3}= >{2}< >{5}< [entry] [rendered]
+     [8] ./index.js 147 bytes {5} [built]
+    chunk    {6} all/a.js (a) 176 bytes ={0}= ={1}= >{3}< >{12}< [entry] [rendered]
         > ./a a
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+     [6] ./a.js + 1 modules 156 bytes {6} {9} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk   {11} all/b.js (b) 112 bytes ={0}= ={3}= [entry] [rendered]
+    chunk    {7} all/b.js (b) 112 bytes ={0}= ={1}= [entry] [rendered]
         > ./b b
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-     [4] ./b.js 72 bytes {7} {11} [built]
-    chunk   {12} all/c.js (c) 112 bytes ={0}= ={4}= [entry] [rendered]
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+     [1] ./f.js 20 bytes {3} {7} {8} [built]
+     [4] ./b.js 72 bytes {7} {10} [built]
+    chunk    {8} all/c.js (c) 112 bytes ={0}= ={4}= [entry] [rendered]
         > ./c c
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-     [5] ./c.js 72 bytes {8} {12} [built]"
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+     [1] ./f.js 20 bytes {3} {7} {8} [built]
+     [5] ./c.js 72 bytes {8} {11} [built]
+    chunk    {9} all/async-a.js (async-a) 156 bytes <{5}> ={0}= ={1}= ={2}= >{3}< >{12}< [rendered]
+        > ./a [8] ./index.js 1:0-47
+     [6] ./a.js + 1 modules 156 bytes {6} {9} [built]
+         | ./a.js 121 bytes [built]
+         | ./e.js 20 bytes [built]
+    chunk   {10} all/async-b.js (async-b) 72 bytes <{5}> ={0}= ={1}= ={2}= ={3}= [rendered]
+        > ./b [8] ./index.js 2:0-47
+     [4] ./b.js 72 bytes {7} {10} [built]
+    chunk   {11} all/async-c.js (async-c) 72 bytes <{5}> ={0}= ={2}= ={3}= ={4}= [rendered]
+        > ./c [8] ./index.js 3:0-47
+     [5] ./c.js 72 bytes {8} {11} [built]
+    chunk   {12} all/async-g.js (async-g) 34 bytes <{0}> <{1}> <{2}> <{6}> <{9}> ={3}= [rendered]
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+     [9] ./g.js 34 bytes {12} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for chunk-module-id-range 1`] = `
-"Hash: 7d8eb8b4418c6ae6a262
+"Hash: 88889d87c9bc8eba9a2b
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
    Asset      Size  Chunks             Chunk Names
@@ -477,111 +477,111 @@ Entrypoint main1 = main1.js
 Entrypoint main2 = main2.js
 chunk    {0} main2.js (main2) 136 bytes [entry] [rendered]
     > ./main2 main2
-   [0] ./e.js 20 bytes {0} [built]
-   [1] ./f.js 20 bytes {0} [built]
-   [2] ./main2.js 56 bytes {0} [built]
- [100] ./d.js 20 bytes {0} {1} [built]
+   [0] ./d.js 20 bytes {0} {1} [built]
+   [1] ./e.js 20 bytes {0} [built]
+   [2] ./f.js 20 bytes {0} [built]
+   [3] ./main2.js 56 bytes {0} [built]
  [101] ./a.js 20 bytes {0} {1} [built]
 chunk    {1} main1.js (main1) 136 bytes [entry] [rendered]
     > ./main1 main1
-   [3] ./b.js 20 bytes {1} [built]
-   [4] ./main1.js 56 bytes {1} [built]
- [100] ./d.js 20 bytes {0} {1} [built]
+   [0] ./d.js 20 bytes {0} {1} [built]
+   [4] ./c.js 20 bytes {1} [built]
+ [100] ./main1.js 56 bytes {1} [built]
  [101] ./a.js 20 bytes {0} {1} [built]
- [102] ./c.js 20 bytes {1} [built]"
+ [102] ./b.js 20 bytes {1} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for chunks 1`] = `
-"Hash: 7762656cf5adce7c4f04
+"Hash: 62e77b66c0f7180797cd
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
       Asset       Size  Chunks             Chunk Names
-0.bundle.js  152 bytes       0  [emitted]  
-1.bundle.js  289 bytes       1  [emitted]  
-  bundle.js   8.29 KiB       2  [emitted]  main
-3.bundle.js  227 bytes       3  [emitted]  
+  bundle.js   8.28 KiB       0  [emitted]  main
+1.bundle.js  152 bytes       1  [emitted]  
+2.bundle.js  289 bytes       2  [emitted]  
+3.bundle.js  232 bytes       3  [emitted]  
 Entrypoint main = bundle.js
-chunk    {0} 0.bundle.js 22 bytes <{2}> [rendered]
-    > ./b [4] ./index.js 2:0-16
- [2] ./b.js 22 bytes {0} [built]
-     amd require ./b [4] ./index.js 2:0-16
-     [4] Xms -> factory:Xms building:Xms = Xms
-chunk    {1} 1.bundle.js 54 bytes <{2}> >{3}< [rendered]
-    > ./c [4] ./index.js 3:0-16
- [3] ./c.js 54 bytes {1} [built]
-     amd require ./c [4] ./index.js 3:0-16
-     [4] Xms -> factory:Xms building:Xms = Xms
-chunk    {2} bundle.js (main) 73 bytes >{0}< >{1}< [entry] [rendered]
+chunk    {0} bundle.js (main) 73 bytes >{1}< >{2}< [entry] [rendered]
     > ./index main
- [4] ./index.js 51 bytes {2} [built]
+ [0] ./index.js 51 bytes {0} [built]
      single entry ./index  main
      factory:Xms building:Xms = Xms
- [5] ./a.js 22 bytes {2} [built]
-     cjs require ./a [4] ./index.js 1:0-14
-     [4] Xms -> factory:Xms building:Xms = Xms
-chunk    {3} 3.bundle.js 44 bytes <{1}> [rendered]
+ [1] ./a.js 22 bytes {0} [built]
+     cjs require ./a [0] ./index.js 1:0-14
+     [0] Xms -> factory:Xms building:Xms = Xms
+chunk    {1} 1.bundle.js 22 bytes <{0}> [rendered]
+    > ./b [0] ./index.js 2:0-16
+ [2] ./b.js 22 bytes {1} [built]
+     amd require ./b [0] ./index.js 2:0-16
+     [0] Xms -> factory:Xms building:Xms = Xms
+chunk    {2} 2.bundle.js 54 bytes <{0}> >{3}< [rendered]
+    > ./c [0] ./index.js 3:0-16
+ [3] ./c.js 54 bytes {2} [built]
+     amd require ./c [0] ./index.js 3:0-16
+     [0] Xms -> factory:Xms building:Xms = Xms
+chunk    {3} 3.bundle.js 44 bytes <{2}> [rendered]
     > [3] ./c.js 1:0-52
- [0] ./d.js 22 bytes {3} [built]
+ [4] ./d.js 22 bytes {3} [built]
      require.ensure item ./d [3] ./c.js 1:0-52
-     [4] Xms -> [3] Xms -> factory:Xms building:Xms = Xms
- [1] ./e.js 22 bytes {3} [built]
+     [0] Xms -> [3] Xms -> factory:Xms building:Xms = Xms
+ [5] ./e.js 22 bytes {3} [built]
      require.ensure item ./e [3] ./c.js 1:0-52
-     [4] Xms -> [3] Xms -> factory:Xms building:Xms = Xms"
+     [0] Xms -> [3] Xms -> factory:Xms building:Xms = Xms"
 `;
 
 exports[`StatsTestCases should print correct stats for chunks-development 1`] = `
-"Hash: e9e5a35c80318dd22050
+"Hash: 9a9796938cdbaf0dd270
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
       Asset       Size  Chunks             Chunk Names
-0.bundle.js  433 bytes       0  [emitted]  
-1.bundle.js  297 bytes       1  [emitted]  
-2.bundle.js  588 bytes       2  [emitted]  
   bundle.js   8.67 KiB    main  [emitted]  main
+0.bundle.js  297 bytes       0  [emitted]  
+1.bundle.js  433 bytes       1  [emitted]  
+2.bundle.js  588 bytes       2  [emitted]  
 Entrypoint main = bundle.js
-chunk {main} bundle.js (main) 73 bytes >{0}< >{1}< [entry] [rendered]
-    > ./index main
- [./a.js] 22 bytes {main} [built]
-     cjs require ./a [./index.js] 1:0-14
-     cjs require ./a [./e.js] 1:0-14
+chunk    {0} 0.bundle.js 22 bytes <{main}> [rendered]
+    > ./b [./index.js] ./index.js 2:0-16
+ [./b.js] 22 bytes {0} [built]
+     amd require ./b [./index.js] 2:0-16
      [./index.js] Xms -> factory:Xms building:Xms = Xms
- [./index.js] 51 bytes {main} [built]
-     single entry ./index  main
-     factory:Xms building:Xms = Xms
-chunk    {0} 0.bundle.js 54 bytes <{main}> >{2}< [rendered]
+chunk    {1} 1.bundle.js 54 bytes <{main}> >{2}< [rendered]
     > ./c [./index.js] ./index.js 3:0-16
- [./c.js] 54 bytes {0} [built]
+ [./c.js] 54 bytes {1} [built]
      amd require ./c [./index.js] 3:0-16
      [./index.js] Xms -> factory:Xms building:Xms = Xms
-chunk    {1} 1.bundle.js 22 bytes <{main}> [rendered]
-    > ./b [./index.js] ./index.js 2:0-16
- [./b.js] 22 bytes {1} [built]
-     amd require ./b [./index.js] 2:0-16
-     [./index.js] Xms -> factory:Xms building:Xms = Xms
-chunk    {2} 2.bundle.js 60 bytes <{0}> [rendered]
+chunk    {2} 2.bundle.js 60 bytes <{1}> [rendered]
     > [./c.js] ./c.js 1:0-52
  [./d.js] 22 bytes {2} [built]
      require.ensure item ./d [./c.js] 1:0-52
      [./index.js] Xms -> [./c.js] Xms -> factory:Xms building:Xms = Xms
  [./e.js] 38 bytes {2} [built]
      require.ensure item ./e [./c.js] 1:0-52
-     [./index.js] Xms -> [./c.js] Xms -> factory:Xms building:Xms = Xms"
+     [./index.js] Xms -> [./c.js] Xms -> factory:Xms building:Xms = Xms
+chunk {main} bundle.js (main) 73 bytes >{0}< >{1}< [entry] [rendered]
+    > ./index main
+ [./a.js] 22 bytes {main} [built]
+     cjs require ./a [./e.js] 1:0-14
+     cjs require ./a [./index.js] 1:0-14
+     [./index.js] Xms -> factory:Xms building:Xms = Xms
+ [./index.js] 51 bytes {main} [built]
+     single entry ./index  main
+     factory:Xms building:Xms = Xms"
 `;
 
 exports[`StatsTestCases should print correct stats for circular-correctness 1`] = `
 "Entrypoint main = bundle.js
-chunk    {0} 0.bundle.js (a) 49 bytes <{2}> <{3}> >{3}< [rendered]
- [1] ./module-a.js 49 bytes {0} [built]
-chunk    {1} 1.bundle.js (b) 49 bytes <{2}> <{3}> >{3}< [rendered]
- [2] ./module-b.js 49 bytes {1} [built]
-chunk    {2} bundle.js (main) 98 bytes >{0}< >{1}< [entry] [rendered]
- [3] ./index.js 98 bytes {2} [built]
-chunk    {3} 3.bundle.js (c) 98 bytes <{0}> <{1}> >{0}< >{1}< [rendered]
- [0] ./module-c.js 98 bytes {3} [built]"
+chunk    {0} bundle.js (main) 98 bytes >{1}< >{2}< [entry] [rendered]
+ [0] ./index.js 98 bytes {0} [built]
+chunk    {1} 1.bundle.js (a) 49 bytes <{0}> <{3}> >{3}< [rendered]
+ [1] ./module-a.js 49 bytes {1} [built]
+chunk    {2} 2.bundle.js (b) 49 bytes <{0}> <{3}> >{3}< [rendered]
+ [2] ./module-b.js 49 bytes {2} [built]
+chunk    {3} 3.bundle.js (c) 98 bytes <{1}> <{2}> >{1}< >{2}< [rendered]
+ [3] ./module-c.js 98 bytes {3} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for color-disabled 1`] = `
-"Hash: c5ad40363e9aee54c089
+"Hash: aa5b75cccf66cd9b1ffa
 Time: Xms
 Built at: Thu Jan 01 1970 <CLR=BOLD>00:00:00</CLR> GMT
   Asset      Size  Chunks             Chunk Names
@@ -591,7 +591,7 @@ Entrypoint main = main.js
 `;
 
 exports[`StatsTestCases should print correct stats for color-enabled 1`] = `
-"Hash: <CLR=BOLD>c5ad40363e9aee54c089</CLR>
+"Hash: <CLR=BOLD>aa5b75cccf66cd9b1ffa</CLR>
 Time: <CLR=BOLD>X</CLR>ms
 Built at: Thu Jan 01 1970 <CLR=BOLD>00:00:00</CLR> GMT
   <CLR=BOLD>Asset</CLR>      <CLR=BOLD>Size</CLR>  <CLR=BOLD>Chunks</CLR>  <CLR=39,BOLD><CLR=22>           <CLR=39,BOLD><CLR=22><CLR=BOLD>Chunk Names</CLR>
@@ -601,7 +601,7 @@ Entrypoint <CLR=BOLD>main</CLR> = <CLR=32,BOLD>main.js</CLR>
 `;
 
 exports[`StatsTestCases should print correct stats for color-enabled-custom 1`] = `
-"Hash: <CLR=BOLD>c5ad40363e9aee54c089</CLR>
+"Hash: <CLR=BOLD>aa5b75cccf66cd9b1ffa</CLR>
 Time: <CLR=BOLD>X</CLR>ms
 Built at: Thu Jan 01 1970 <CLR=BOLD>00:00:00</CLR> GMT
   <CLR=BOLD>Asset</CLR>      <CLR=BOLD>Size</CLR>  <CLR=BOLD>Chunks</CLR>  <CLR=39,BOLD><CLR=22>           <CLR=39,BOLD><CLR=22><CLR=BOLD>Chunk Names</CLR>
@@ -611,7 +611,7 @@ Entrypoint <CLR=BOLD>main</CLR> = <CLR=32>main.js</CLR>
 `;
 
 exports[`StatsTestCases should print correct stats for commons-chunk-min-size-0 1`] = `
-"Hash: bace8077f1ed02050b2f
+"Hash: 578e4c7a1795861b0a9c
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
               Asset       Size  Chunks             Chunk Names
@@ -628,7 +628,7 @@ Entrypoint entry-1 = vendor-1~entry-1.js entry-1.js
 `;
 
 exports[`StatsTestCases should print correct stats for commons-chunk-min-size-Infinity 1`] = `
-"Hash: cb8c4bb6c365b0a67d67
+"Hash: 8d92f1bebd2cb6793d22
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
       Asset       Size  Chunks             Chunk Names
@@ -645,28 +645,28 @@ Entrypoint entry-1 = vendor-1.js entry-1.js
 `;
 
 exports[`StatsTestCases should print correct stats for commons-plugin-issue-4980 1`] = `
-"Hash: 707868320b2a03412b3fe3b00ef4ecd794b284d6
+"Hash: 159313d738428f44ef68a283ef191845660a080d
 Child
-    Hash: 707868320b2a03412b3f
+    Hash: 159313d738428f44ef68
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
                              Asset       Size  Chunks             Chunk Names
                             app.js   6.69 KiB       0  [emitted]  app
-    vendor.6a3bdffda9f0de672978.js  619 bytes       1  [emitted]  vendor
-    Entrypoint app = vendor.6a3bdffda9f0de672978.js app.js
+    vendor.aa94f0c872c214f6cb2e.js  619 bytes       1  [emitted]  vendor
+    Entrypoint app = vendor.aa94f0c872c214f6cb2e.js app.js
     [./constants.js] 87 bytes {1} [built]
     [./entry-1.js] ./entry-1.js + 2 modules 190 bytes {0} [built]
         | ./entry-1.js 67 bytes [built]
         | ./submodule-a.js 59 bytes [built]
         | ./submodule-b.js 59 bytes [built]
 Child
-    Hash: e3b00ef4ecd794b284d6
+    Hash: a283ef191845660a080d
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
                              Asset       Size  Chunks             Chunk Names
                             app.js    6.7 KiB       0  [emitted]  app
-    vendor.6a3bdffda9f0de672978.js  619 bytes       1  [emitted]  vendor
-    Entrypoint app = vendor.6a3bdffda9f0de672978.js app.js
+    vendor.aa94f0c872c214f6cb2e.js  619 bytes       1  [emitted]  vendor
+    Entrypoint app = vendor.aa94f0c872c214f6cb2e.js app.js
     [./constants.js] 87 bytes {1} [built]
     [./entry-2.js] ./entry-2.js + 2 modules 197 bytes {0} [built]
         | ./entry-2.js 67 bytes [built]
@@ -693,9 +693,17 @@ exports[`StatsTestCases should print correct stats for concat-and-sideeffects 1`
 `;
 
 exports[`StatsTestCases should print correct stats for define-plugin 1`] = `
-"Hash: cfe08d4450db77f81610f4228fcb997ec81e2aa6
+"Hash: 97d5f15cb3086ba8eb8878ce8186fd9442bfeb83c3284590614d84a86804
+Child
+    Hash: 97d5f15cb3086ba8eb88
+    Time: Xms
+    Built at: Thu Jan 01 1970 00:00:00 GMT
+      Asset     Size  Chunks             Chunk Names
+    main.js  3.6 KiB       0  [emitted]  main
+    Entrypoint main = main.js
+    [0] ./index.js 24 bytes {0} [built]
 Child
-    Hash: cfe08d4450db77f81610
+    Hash: 78ce8186fd9442bfeb83
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
       Asset     Size  Chunks             Chunk Names
@@ -703,7 +711,7 @@ Child
     Entrypoint main = main.js
     [0] ./index.js 24 bytes {0} [built]
 Child
-    Hash: f4228fcb997ec81e2aa6
+    Hash: c3284590614d84a86804
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
       Asset     Size  Chunks             Chunk Names
@@ -712,8 +720,31 @@ Child
     [0] ./index.js 24 bytes {0} [built]"
 `;
 
+exports[`StatsTestCases should print correct stats for dll-reference-plugin-issue-7624 1`] = `
+"Hash: 5a94740543bfdf73ae19
+Time: Xms
+Built at: Thu Jan 01 1970 00:00:00 GMT
+    Asset     Size  Chunks             Chunk Names
+bundle.js  3.6 KiB       0  [emitted]  main
+Entrypoint main = bundle.js
+[0] ./entry.js 29 bytes {0} [built]"
+`;
+
+exports[`StatsTestCases should print correct stats for dll-reference-plugin-issue-7624-error 1`] = `
+"Hash: 85ed2c36acb938b99695
+Time: Xms
+Built at: Thu Jan 01 1970 00:00:00 GMT
+    Asset     Size  Chunks  Chunk Names
+bundle.js  3.6 KiB       0  main
+Entrypoint main = bundle.js
+[0] ./entry.js 29 bytes {0} [built]
+
+ERROR in Dll manifest blank-manifest.json
+Unexpected end of JSON input while parsing near ''"
+`;
+
 exports[`StatsTestCases should print correct stats for exclude-with-loader 1`] = `
-"Hash: 52eadc5de721f000106b
+"Hash: b79137b5927646440aa7
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
     Asset      Size  Chunks             Chunk Names
@@ -726,7 +757,7 @@ Entrypoint main = bundle.js
 `;
 
 exports[`StatsTestCases should print correct stats for external 1`] = `
-"Hash: 7a4bb5500ee0eddeee44
+"Hash: ce617e255d7a82e9e1e3
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
   Asset      Size  Chunks             Chunk Names
@@ -737,248 +768,311 @@ Entrypoint main = main.js
 `;
 
 exports[`StatsTestCases should print correct stats for filter-warnings 1`] = `
-"Hash: 4269d427a8c1110386b44269d427a8c1110386b44269d427a8c1110386b44269d427a8c1110386b44269d427a8c1110386b44269d427a8c1110386b44269d427a8c1110386b44269d427a8c1110386b44269d427a8c1110386b44269d427a8c1110386b44269d427a8c1110386b44269d427a8c1110386b44269d427a8c1110386b4
-Child
-    Hash: 4269d427a8c1110386b4
+"Hash: 8d381ad7d9791ae0d2ff8d381ad7d9791ae0d2ff8d381ad7d9791ae0d2ff8d381ad7d9791ae0d2ff8d381ad7d9791ae0d2ff8d381ad7d9791ae0d2ff8d381ad7d9791ae0d2ff8d381ad7d9791ae0d2ff8d381ad7d9791ae0d2ff8d381ad7d9791ae0d2ff8d381ad7d9791ae0d2ff8d381ad7d9791ae0d2ff8d381ad7d9791ae0d2ff
+Child undefined:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
     
-    WARNING in bundle.js from UglifyJs
-    Dropping side-effect-free statement [./index.js:6,0]
-    Dropping unused function someUnUsedFunction1 [./index.js:8,0]
-    Dropping unused function someUnUsedFunction2 [./index.js:9,0]
-    Dropping unused function someUnUsedFunction3 [./index.js:10,0]
-    Dropping unused function someUnUsedFunction4 [./index.js:11,0]
-    Dropping unused function someUnUsedFunction5 [./index.js:12,0]
-    Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0]
-    Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0]
-    Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0]
-    Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0]
-    Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]
-Child
-    Hash: 4269d427a8c1110386b4
+    WARNING in UglifyJs Plugin: Dropping side-effect-free statement [./index.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction1 [./index.js:8,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction2 [./index.js:9,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction3 [./index.js:10,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction4 [./index.js:11,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction5 [./index.js:12,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0] in bundle.js
+Child UglifyJs:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
-Child
-    Hash: 4269d427a8c1110386b4
+Child /UglifyJs/:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
-Child
-    Hash: 4269d427a8c1110386b4
+Child warnings => true:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
-Child
-    Hash: 4269d427a8c1110386b4
+Child [UglifyJs]:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
-Child
-    Hash: 4269d427a8c1110386b4
+Child [/UglifyJs/]:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
-Child
-    Hash: 4269d427a8c1110386b4
+Child [warnings => true]:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
-Child
-    Hash: 4269d427a8c1110386b4
+Child should not filter:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
     
-    WARNING in bundle.js from UglifyJs
-    Dropping side-effect-free statement [./index.js:6,0]
-    Dropping unused function someUnUsedFunction1 [./index.js:8,0]
-    Dropping unused function someUnUsedFunction2 [./index.js:9,0]
-    Dropping unused function someUnUsedFunction3 [./index.js:10,0]
-    Dropping unused function someUnUsedFunction4 [./index.js:11,0]
-    Dropping unused function someUnUsedFunction5 [./index.js:12,0]
-    Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0]
-    Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0]
-    Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0]
-    Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0]
-    Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]
-Child
-    Hash: 4269d427a8c1110386b4
+    WARNING in UglifyJs Plugin: Dropping side-effect-free statement [./index.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction1 [./index.js:8,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction2 [./index.js:9,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction3 [./index.js:10,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction4 [./index.js:11,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction5 [./index.js:12,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0] in bundle.js
+Child /should not filter/:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
     
-    WARNING in bundle.js from UglifyJs
-    Dropping side-effect-free statement [./index.js:6,0]
-    Dropping unused function someUnUsedFunction1 [./index.js:8,0]
-    Dropping unused function someUnUsedFunction2 [./index.js:9,0]
-    Dropping unused function someUnUsedFunction3 [./index.js:10,0]
-    Dropping unused function someUnUsedFunction4 [./index.js:11,0]
-    Dropping unused function someUnUsedFunction5 [./index.js:12,0]
-    Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0]
-    Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0]
-    Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0]
-    Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0]
-    Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]
-Child
-    Hash: 4269d427a8c1110386b4
+    WARNING in UglifyJs Plugin: Dropping side-effect-free statement [./index.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction1 [./index.js:8,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction2 [./index.js:9,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction3 [./index.js:10,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction4 [./index.js:11,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction5 [./index.js:12,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0] in bundle.js
+Child warnings => false:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
     
-    WARNING in bundle.js from UglifyJs
-    Dropping side-effect-free statement [./index.js:6,0]
-    Dropping unused function someUnUsedFunction1 [./index.js:8,0]
-    Dropping unused function someUnUsedFunction2 [./index.js:9,0]
-    Dropping unused function someUnUsedFunction3 [./index.js:10,0]
-    Dropping unused function someUnUsedFunction4 [./index.js:11,0]
-    Dropping unused function someUnUsedFunction5 [./index.js:12,0]
-    Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0]
-    Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0]
-    Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0]
-    Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0]
-    Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]
-Child
-    Hash: 4269d427a8c1110386b4
+    WARNING in UglifyJs Plugin: Dropping side-effect-free statement [./index.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction1 [./index.js:8,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction2 [./index.js:9,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction3 [./index.js:10,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction4 [./index.js:11,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction5 [./index.js:12,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0] in bundle.js
+Child [should not filter]:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
     
-    WARNING in bundle.js from UglifyJs
-    Dropping side-effect-free statement [./index.js:6,0]
-    Dropping unused function someUnUsedFunction1 [./index.js:8,0]
-    Dropping unused function someUnUsedFunction2 [./index.js:9,0]
-    Dropping unused function someUnUsedFunction3 [./index.js:10,0]
-    Dropping unused function someUnUsedFunction4 [./index.js:11,0]
-    Dropping unused function someUnUsedFunction5 [./index.js:12,0]
-    Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0]
-    Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0]
-    Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0]
-    Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0]
-    Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]
-Child
-    Hash: 4269d427a8c1110386b4
+    WARNING in UglifyJs Plugin: Dropping side-effect-free statement [./index.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction1 [./index.js:8,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction2 [./index.js:9,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction3 [./index.js:10,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction4 [./index.js:11,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction5 [./index.js:12,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0] in bundle.js
+Child [/should not filter/]:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
     
-    WARNING in bundle.js from UglifyJs
-    Dropping side-effect-free statement [./index.js:6,0]
-    Dropping unused function someUnUsedFunction1 [./index.js:8,0]
-    Dropping unused function someUnUsedFunction2 [./index.js:9,0]
-    Dropping unused function someUnUsedFunction3 [./index.js:10,0]
-    Dropping unused function someUnUsedFunction4 [./index.js:11,0]
-    Dropping unused function someUnUsedFunction5 [./index.js:12,0]
-    Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0]
-    Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0]
-    Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0]
-    Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0]
-    Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]
-Child
-    Hash: 4269d427a8c1110386b4
+    WARNING in UglifyJs Plugin: Dropping side-effect-free statement [./index.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction1 [./index.js:8,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction2 [./index.js:9,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction3 [./index.js:10,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction4 [./index.js:11,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction5 [./index.js:12,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0] in bundle.js
+Child [warnings => false]:
+    Hash: 8d381ad7d9791ae0d2ff
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
     bundle.js  2.89 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
     
-    WARNING in bundle.js from UglifyJs
-    Dropping side-effect-free statement [./index.js:6,0]
-    Dropping unused function someUnUsedFunction1 [./index.js:8,0]
-    Dropping unused function someUnUsedFunction2 [./index.js:9,0]
-    Dropping unused function someUnUsedFunction3 [./index.js:10,0]
-    Dropping unused function someUnUsedFunction4 [./index.js:11,0]
-    Dropping unused function someUnUsedFunction5 [./index.js:12,0]
-    Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0]
-    Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0]
-    Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0]
-    Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0]
-    Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0]"
+    WARNING in UglifyJs Plugin: Dropping side-effect-free statement [./index.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction1 [./index.js:8,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction2 [./index.js:9,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction3 [./index.js:10,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction4 [./index.js:11,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someUnUsedFunction5 [./index.js:12,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction1 [./a.js:3,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction2 [./a.js:4,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction3 [./a.js:5,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction4 [./a.js:6,0] in bundle.js
+    
+    WARNING in UglifyJs Plugin: Dropping unused function someRemoteUnUsedFunction5 [./a.js:7,0] in bundle.js"
 `;
 
 exports[`StatsTestCases should print correct stats for graph-correctness-entries 1`] = `
 "Entrypoint e1 = e1.js
 Entrypoint e2 = e2.js
-chunk    {0} c.js (c) 49 bytes <{3}> <{4}> >{1}< [rendered]
- [1] ./module-c.js 49 bytes {0} [built]
-     import() ./module-c [2] ./module-b.js 1:0-47
-     import() ./module-c [4] ./e2.js 1:0-47
-chunk    {1} a.js (a) 49 bytes <{0}> <{2}> >{4}< [rendered]
- [0] ./module-a.js 49 bytes {1} [built]
-     import() ./module-a [1] ./module-c.js 1:0-47
-     import() ./module-a [3] ./e1.js 1:0-47
-chunk    {2} e1.js (e1) 49 bytes >{1}< [entry] [rendered]
- [3] ./e1.js 49 bytes {2} [built]
+chunk    {0} e1.js (e1) 49 bytes >{2}< [entry] [rendered]
+ [0] ./e1.js 49 bytes {0} [built]
      single entry ./e1  e1
-chunk    {3} e2.js (e2) 49 bytes >{0}< [entry] [rendered]
- [4] ./e2.js 49 bytes {3} [built]
+chunk    {1} e2.js (e2) 49 bytes >{3}< [entry] [rendered]
+ [1] ./e2.js 49 bytes {1} [built]
      single entry ./e2  e2
-chunk    {4} b.js (b) 49 bytes <{1}> >{0}< [rendered]
- [2] ./module-b.js 49 bytes {4} [built]
-     import() ./module-b [0] ./module-a.js 1:0-47"
+chunk    {2} a.js (a) 49 bytes <{0}> <{3}> >{4}< [rendered]
+ [2] ./module-a.js 49 bytes {2} [built]
+     import() ./module-a [0] ./e1.js 1:0-47
+     import() ./module-a [3] ./module-c.js 1:0-47
+chunk    {3} c.js (c) 49 bytes <{1}> <{4}> >{2}< [rendered]
+ [3] ./module-c.js 49 bytes {3} [built]
+     import() ./module-c [1] ./e2.js 1:0-47
+     import() ./module-c [4] ./module-b.js 1:0-47
+chunk    {4} b.js (b) 49 bytes <{2}> >{3}< [rendered]
+ [4] ./module-b.js 49 bytes {4} [built]
+     import() ./module-b [2] ./module-a.js 1:0-47"
 `;
 
 exports[`StatsTestCases should print correct stats for graph-correctness-modules 1`] = `
 "Entrypoint e1 = e1.js
 Entrypoint e2 = e2.js
-chunk    {0} y.js (y) 0 bytes <{3}> <{4}> [rendered]
- [3] ./module-y.js 0 bytes {0} [built]
-     import() ./module-y [0] ./module-x.js 1:0-47
-chunk    {1} c.js (c) 49 bytes <{4}> <{5}> >{2}< [rendered]
- [2] ./module-c.js 49 bytes {1} [built]
-     import() ./module-c [4] ./module-b.js 1:0-47
-     import() ./module-c [6] ./e2.js 2:0-47
-chunk    {2} a.js (a) 49 bytes <{1}> <{3}> >{5}< [rendered]
- [1] ./module-a.js 49 bytes {2} [built]
-     import() ./module-a [2] ./module-c.js 1:0-47
-     import() ./module-a [5] ./e1.js 2:0-47
-chunk    {3} e1.js (e1) 119 bytes >{0}< >{2}< [entry] [rendered]
- [0] ./module-x.js 49 bytes {3} {4} [built]
-     import() ./module-x [4] ./module-b.js 2:0-20
-     harmony side effect evaluation ./module-x [5] ./e1.js 1:0-20
-     harmony side effect evaluation ./module-x [6] ./e2.js 1:0-20
- [5] ./e1.js 70 bytes {3} [built]
+chunk    {0} e1.js (e1) 119 bytes >{2}< >{3}< [entry] [rendered]
+ [0] ./module-x.js 49 bytes {0} {1} [built]
+     harmony side effect evaluation ./module-x [2] ./e1.js 1:0-20
+     harmony side effect evaluation ./module-x [3] ./e2.js 1:0-20
+     import() ./module-x [6] ./module-b.js 2:0-20
+ [2] ./e1.js 70 bytes {0} [built]
      single entry ./e1  e1
-chunk    {4} e2.js (e2) 119 bytes >{0}< >{1}< [entry] [rendered]
- [0] ./module-x.js 49 bytes {3} {4} [built]
-     import() ./module-x [4] ./module-b.js 2:0-20
-     harmony side effect evaluation ./module-x [5] ./e1.js 1:0-20
-     harmony side effect evaluation ./module-x [6] ./e2.js 1:0-20
- [6] ./e2.js 70 bytes {4} [built]
+chunk    {1} e2.js (e2) 119 bytes >{3}< >{4}< [entry] [rendered]
+ [0] ./module-x.js 49 bytes {0} {1} [built]
+     harmony side effect evaluation ./module-x [2] ./e1.js 1:0-20
+     harmony side effect evaluation ./module-x [3] ./e2.js 1:0-20
+     import() ./module-x [6] ./module-b.js 2:0-20
+ [3] ./e2.js 70 bytes {1} [built]
      single entry ./e2  e2
-chunk    {5} b.js (b) 179 bytes <{2}> >{1}< [rendered]
- [4] ./module-b.js 179 bytes {5} [built]
-     import() ./module-b [1] ./module-a.js 1:0-47"
+chunk    {2} a.js (a) 49 bytes <{0}> <{4}> >{5}< [rendered]
+ [4] ./module-a.js 49 bytes {2} [built]
+     import() ./module-a [2] ./e1.js 2:0-47
+     import() ./module-a [5] ./module-c.js 1:0-47
+chunk    {3} y.js (y) 0 bytes <{0}> <{1}> [rendered]
+ [1] ./module-y.js 0 bytes {3} [built]
+     import() ./module-y [0] ./module-x.js 1:0-47
+chunk    {4} c.js (c) 49 bytes <{1}> <{5}> >{2}< [rendered]
+ [5] ./module-c.js 49 bytes {4} [built]
+     import() ./module-c [3] ./e2.js 2:0-47
+     import() ./module-c [6] ./module-b.js 1:0-47
+chunk    {5} b.js (b) 179 bytes <{2}> >{4}< [rendered]
+ [6] ./module-b.js 179 bytes {5} [built]
+     import() ./module-b [4] ./module-a.js 1:0-47"
 `;
 
 exports[`StatsTestCases should print correct stats for import-context-filter 1`] = `
-"Hash: 2a0d654db3e185182232
+"Hash: d39dc3e897607f3244b3
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
    Asset       Size  Chunks             Chunk Names
@@ -995,26 +1089,26 @@ Entrypoint entry = entry.js
 `;
 
 exports[`StatsTestCases should print correct stats for import-weak 1`] = `
-"Hash: 34cdd6c85db0facc427a
+"Hash: 807d3c251eedaf29fae4
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
    Asset       Size  Chunks             Chunk Names
-    0.js  149 bytes       0  [emitted]  
-entry.js   8.53 KiB       1  [emitted]  entry
+entry.js   8.53 KiB       0  [emitted]  entry
+    1.js  149 bytes       1  [emitted]  
 Entrypoint entry = entry.js
-[0] ./modules/b.js 22 bytes {0} [built]
-[1] ./entry.js 120 bytes {1} [built]
+[0] ./modules/b.js 22 bytes {1} [built]
+[1] ./entry.js 120 bytes {0} [built]
 [2] ./modules/a.js 37 bytes [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for import-with-invalid-options-comments 1`] = `
 "Built at: Thu Jan 01 1970 00:00:00 GMT
-[0] ./chunk-a.js 27 bytes {2} [built]
-[1] ./chunk-b.js 27 bytes {3} [built]
-[2] ./chunk-c.js 27 bytes {4} [built]
-[3] ./chunk-d.js 27 bytes {5} [built]
-[4] ./chunk.js 401 bytes {0} [built] [3 warnings]
-[5] ./index.js 50 bytes {1} [built]
+[0] ./index.js 50 bytes {0} [built]
+[1] ./chunk.js 401 bytes {1} [built] [3 warnings]
+[2] ./chunk-a.js 27 bytes {2} [built]
+[3] ./chunk-b.js 27 bytes {3} [built]
+[4] ./chunk-c.js 27 bytes {4} [built]
+[5] ./chunk-d.js 27 bytes {5} [built]
 
 WARNING in ./chunk.js 4:11-77
 Compilation error while processing magic comment(-s): /* webpack Prefetch: 0, webpackChunkName: \\"notGoingToCompile-c\\" */: Unexpected identifier
@@ -1029,14 +1123,54 @@ Compilation error while processing magic comment(-s): /* webpackPrefetch: true,
  @ ./index.js 1:0-49"
 `;
 
+exports[`StatsTestCases should print correct stats for issue-7577 1`] = `
+"Hash: 3a382f7c6759b0401b6ff9bcd7c310309db5b68c3fc9dff03980f45a3a3a
+Child
+    Hash: 3a382f7c6759b0401b6f
+    Time: Xms
+    Built at: Thu Jan 01 1970 00:00:00 GMT
+                                     Asset       Size        Chunks             Chunk Names
+        a-all~main-0034bb84916bcade4cc7.js  154 bytes      all~main  [emitted]  all~main
+            a-main-14ee9c594789bd77b887.js  108 bytes          main  [emitted]  main
+    a-runtime~main-7b4918090cfe19b7778a.js   6.05 KiB  runtime~main  [emitted]  runtime~main
+    Entrypoint main = a-runtime~main-7b4918090cfe19b7778a.js a-all~main-0034bb84916bcade4cc7.js a-main-14ee9c594789bd77b887.js
+    [0] ./a.js 18 bytes {all~main} [built]
+Child
+    Hash: f9bcd7c310309db5b68c
+    Time: Xms
+    Built at: Thu Jan 01 1970 00:00:00 GMT
+                                     Asset       Size        Chunks             Chunk Names
+        b-all~main-3f0b62a9e243706ccaf8.js  468 bytes      all~main  [emitted]  all~main
+            b-main-09f4ddfc4098d7f3f188.js  123 bytes          main  [emitted]  main
+    b-runtime~main-7b4918090cfe19b7778a.js   6.05 KiB  runtime~main  [emitted]  runtime~main
+    b-vendors~main-f7664221ad5d986cf06a.js  163 bytes  vendors~main  [emitted]  vendors~main
+    Entrypoint main = b-runtime~main-7b4918090cfe19b7778a.js b-vendors~main-f7664221ad5d986cf06a.js b-all~main-3f0b62a9e243706ccaf8.js b-main-09f4ddfc4098d7f3f188.js
+    [0] ./node_modules/vendor.js 23 bytes {vendors~main} [built]
+    [1] ./b.js 17 bytes {all~main} [built]
+Child
+    Hash: 3fc9dff03980f45a3a3a
+    Time: Xms
+    Built at: Thu Jan 01 1970 00:00:00 GMT
+                                     Asset       Size        Chunks             Chunk Names
+            c-main-a7197f03f8f2dfea0fa5.js  114 bytes          main  [emitted]  main
+               c-0-775a18a4f14e4483daf8.js  153 bytes             0  [emitted]  
+               c-1-f0767101f6e51d910fd6.js  450 bytes             1  [emitted]  
+        c-all~main-7b1b86e650f3856c17c9.js  305 bytes      all~main  [emitted]  all~main
+    c-runtime~main-10749c8178106eae88dd.js   8.84 KiB  runtime~main  [emitted]  runtime~main
+    Entrypoint main = c-runtime~main-10749c8178106eae88dd.js c-all~main-7b1b86e650f3856c17c9.js c-main-a7197f03f8f2dfea0fa5.js (prefetch: c-0-775a18a4f14e4483daf8.js c-1-f0767101f6e51d910fd6.js)
+    [0] ./b.js 17 bytes {1} [built]
+    [1] ./c.js 61 bytes {all~main} [built]
+    [2] ./node_modules/vendor.js 23 bytes {0} [built]"
+`;
+
 exports[`StatsTestCases should print correct stats for limit-chunk-count-plugin 1`] = `
-"Hash: 3f682d19df3a78cc355b84831557db9bd7a90e1a059dbb5576e98cee97e4f44eff82b7d35dbb5021
+"Hash: eb610b429c869eba72876747d3a05d57aba4ed011c34e7c25ef408f41e6c4d70e3d24b67ba636024
 Child 1 chunks:
-    Hash: 3f682d19df3a78cc355b
+    Hash: eb610b429c869eba7287
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
         Asset      Size  Chunks             Chunk Names
-    bundle.js  6.39 KiB       0  [emitted]  main
+    bundle.js  6.67 KiB       0  [emitted]  main
     Entrypoint main = bundle.js
     chunk    {0} bundle.js (main) 191 bytes <{0}> >{0}< [entry] [rendered]
      [0] ./index.js 73 bytes {0} [built]
@@ -1046,63 +1180,63 @@ Child 1 chunks:
      [4] ./d.js 22 bytes {0} [built]
      [5] ./e.js 22 bytes {0} [built]
 Child 2 chunks:
-    Hash: 84831557db9bd7a90e1a
+    Hash: 6747d3a05d57aba4ed01
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
           Asset       Size  Chunks             Chunk Names
-    0.bundle.js  632 bytes       0  [emitted]  
+    0.bundle.js  641 bytes       0  [emitted]  
       bundle.js   8.28 KiB       1  [emitted]  main
     Entrypoint main = bundle.js
     chunk    {0} 0.bundle.js 118 bytes <{0}> <{1}> >{0}< [rendered]
-     [0] ./d.js 22 bytes {0} [built]
-     [1] ./e.js 22 bytes {0} [built]
-     [2] ./a.js 22 bytes {0} [built]
-     [3] ./b.js 22 bytes {0} [built]
-     [4] ./c.js 30 bytes {0} [built]
+     [1] ./a.js 22 bytes {0} [built]
+     [2] ./b.js 22 bytes {0} [built]
+     [3] ./c.js 30 bytes {0} [built]
+     [4] ./d.js 22 bytes {0} [built]
+     [5] ./e.js 22 bytes {0} [built]
     chunk    {1} bundle.js (main) 73 bytes >{0}< [entry] [rendered]
-     [5] ./index.js 73 bytes {1} [built]
+     [0] ./index.js 73 bytes {1} [built]
 Child 3 chunks:
-    Hash: 059dbb5576e98cee97e4
+    Hash: 1c34e7c25ef408f41e6c
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
           Asset       Size  Chunks             Chunk Names
     0.bundle.js  494 bytes       0  [emitted]  
-    1.bundle.js  245 bytes       1  [emitted]  
+    1.bundle.js  232 bytes       1  [emitted]  
       bundle.js   8.28 KiB       2  [emitted]  main
     Entrypoint main = bundle.js
     chunk    {0} 0.bundle.js 74 bytes <{0}> <{2}> >{0}< >{1}< [rendered]
-     [0] ./d.js 22 bytes {0} [built]
-     [2] ./a.js 22 bytes {0} [built]
-     [4] ./c.js 30 bytes {0} [built]
+     [1] ./a.js 22 bytes {0} [built]
+     [3] ./c.js 30 bytes {0} [built]
+     [4] ./d.js 22 bytes {0} [built]
     chunk    {1} 1.bundle.js 44 bytes <{0}> <{2}> [rendered]
-     [1] ./e.js 22 bytes {1} [built]
-     [3] ./b.js 22 bytes {1} [built]
+     [2] ./b.js 22 bytes {1} [built]
+     [5] ./e.js 22 bytes {1} [built]
     chunk    {2} bundle.js (main) 73 bytes >{0}< >{1}< [entry] [rendered]
-     [5] ./index.js 73 bytes {2} [built]
+     [0] ./index.js 73 bytes {2} [built]
 Child 4 chunks:
-    Hash: f44eff82b7d35dbb5021
+    Hash: 4d70e3d24b67ba636024
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
           Asset       Size  Chunks             Chunk Names
-    0.bundle.js  236 bytes       0  [emitted]  
-    1.bundle.js  245 bytes       1  [emitted]  
-    2.bundle.js  323 bytes       2  [emitted]  
-      bundle.js   8.28 KiB       3  [emitted]  main
+    0.bundle.js  254 bytes       0  [emitted]  
+    1.bundle.js  232 bytes       1  [emitted]  
+      bundle.js   8.28 KiB       2  [emitted]  main
+    3.bundle.js  323 bytes       3  [emitted]  
     Entrypoint main = bundle.js
     chunk    {0} 0.bundle.js 44 bytes <{2}> <{3}> [rendered]
-     [0] ./d.js 22 bytes {0} [built]
-     [2] ./a.js 22 bytes {0} [built]
+     [1] ./a.js 22 bytes {0} [built]
+     [4] ./d.js 22 bytes {0} [built]
     chunk    {1} 1.bundle.js 44 bytes <{2}> <{3}> [rendered]
-     [1] ./e.js 22 bytes {1} [built]
-     [3] ./b.js 22 bytes {1} [built]
-    chunk    {2} 2.bundle.js 30 bytes <{3}> >{0}< >{1}< [rendered]
-     [4] ./c.js 30 bytes {2} [built]
-    chunk    {3} bundle.js (main) 73 bytes >{0}< >{1}< >{2}< [entry] [rendered]
-     [5] ./index.js 73 bytes {3} [built]"
+     [2] ./b.js 22 bytes {1} [built]
+     [5] ./e.js 22 bytes {1} [built]
+    chunk    {2} bundle.js (main) 73 bytes >{0}< >{1}< >{3}< [entry] [rendered]
+     [0] ./index.js 73 bytes {2} [built]
+    chunk    {3} 3.bundle.js 30 bytes <{2}> >{0}< >{1}< [rendered]
+     [3] ./c.js 30 bytes {3} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for max-modules 1`] = `
-"Hash: 8e1f6d7b7886c5f4617d
+"Hash: d0b29852af8ccc4949b7
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
   Asset      Size  Chunks             Chunk Names
@@ -1132,7 +1266,7 @@ Entrypoint main = main.js
 `;
 
 exports[`StatsTestCases should print correct stats for max-modules-default 1`] = `
-"Hash: 8e1f6d7b7886c5f4617d
+"Hash: d0b29852af8ccc4949b7
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
   Asset      Size  Chunks             Chunk Names
@@ -1157,107 +1291,107 @@ Entrypoint main = main.js
 `;
 
 exports[`StatsTestCases should print correct stats for module-assets 1`] = `
-"Hash: e1ecf80df7148b69327b
+"Hash: 4680d6f3aea97a1ad4e0
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
 Entrypoint main = main.js
-chunk    {0} 0.js 68 bytes <{1}> [rendered]
- [0] ./node_modules/a/1.png 51 bytes {0} [built] [1 asset]
- [1] ./node_modules/a/index.js 17 bytes {0} [built]
-chunk    {1} main.js (main) 12 bytes >{0}< [entry] [rendered]
- [2] ./index.js 12 bytes {1} [built]
-[0] ./node_modules/a/1.png 51 bytes {0} [built] [1 asset]
-[1] ./node_modules/a/index.js 17 bytes {0} [built]
-[2] ./index.js 12 bytes {1} [built]"
+chunk    {0} main.js (main) 12 bytes >{1}< [entry] [rendered]
+ [0] ./index.js 12 bytes {0} [built]
+chunk    {1} 1.js 68 bytes <{0}> [rendered]
+ [1] ./node_modules/a/index.js 17 bytes {1} [built]
+ [2] ./node_modules/a/1.png 51 bytes {1} [built] [1 asset]
+[0] ./index.js 12 bytes {0} [built]
+[1] ./node_modules/a/index.js 17 bytes {1} [built]
+[2] ./node_modules/a/1.png 51 bytes {1} [built] [1 asset]"
 `;
 
 exports[`StatsTestCases should print correct stats for module-deduplication 1`] = `
 "Asset       Size  Chunks             Chunk Names
- 0.js  730 bytes    0, 5  [emitted]  
- 1.js  730 bytes    1, 4  [emitted]  
- 2.js  730 bytes    2, 3  [emitted]  
- 3.js  661 bytes       3  [emitted]  
- 4.js  661 bytes       4  [emitted]  
- 5.js  661 bytes       5  [emitted]  
-e1.js   9.42 KiB       6  [emitted]  e1
-e2.js   9.44 KiB       7  [emitted]  e2
-e3.js   9.46 KiB       8  [emitted]  e3
-Entrypoint e1 = e1.js
-Entrypoint e2 = e2.js
-Entrypoint e3 = e3.js
-chunk    {0} 0.js 37 bytes <{7}> <{8}> [rendered]
- [2] ./d.js 9 bytes {0} {6} [built]
- [5] ./async1.js 28 bytes {0} {5} [built]
-chunk    {1} 1.js 37 bytes <{6}> <{8}> [rendered]
- [3] ./f.js 9 bytes {1} {7} [built]
- [6] ./async2.js 28 bytes {1} {4} [built]
-chunk    {2} 2.js 37 bytes <{6}> <{7}> [rendered]
- [4] ./h.js 9 bytes {2} {8} [built]
- [7] ./async3.js 28 bytes {2} {3} [built]
-chunk    {3} 3.js 28 bytes <{8}> [rendered]
- [7] ./async3.js 28 bytes {2} {3} [built]
-chunk    {4} 4.js 28 bytes <{7}> [rendered]
- [6] ./async2.js 28 bytes {1} {4} [built]
-chunk    {5} 5.js 28 bytes <{6}> [rendered]
- [5] ./async1.js 28 bytes {0} {5} [built]
-chunk    {6} e1.js (e1) 152 bytes >{1}< >{2}< >{5}< [entry] [rendered]
- [0] ./b.js 9 bytes {6} {7} {8} [built]
- [1] ./a.js 9 bytes {6} {7} {8} [built]
- [2] ./d.js 9 bytes {0} {6} [built]
- [8] ./e1.js 116 bytes {6} [built]
- [9] ./c.js 9 bytes {6} [built]
-chunk    {7} e2.js (e2) 152 bytes >{0}< >{2}< >{4}< [entry] [rendered]
-  [0] ./b.js 9 bytes {6} {7} {8} [built]
-  [1] ./a.js 9 bytes {6} {7} {8} [built]
-  [3] ./f.js 9 bytes {1} {7} [built]
- [10] ./e2.js 116 bytes {7} [built]
- [11] ./e.js 9 bytes {7} [built]
-chunk    {8} e3.js (e3) 152 bytes >{0}< >{1}< >{3}< [entry] [rendered]
-  [0] ./b.js 9 bytes {6} {7} {8} [built]
-  [1] ./a.js 9 bytes {6} {7} {8} [built]
-  [4] ./h.js 9 bytes {2} {8} [built]
- [12] ./e3.js 116 bytes {8} [built]
- [13] ./g.js 9 bytes {8} [built]"
-`;
-
-exports[`StatsTestCases should print correct stats for module-deduplication-named 1`] = `
-"    Asset       Size  Chunks             Chunk Names
-async3.js  818 bytes       0  [emitted]  async3
-async1.js  818 bytes       1  [emitted]  async1
-async2.js  818 bytes       2  [emitted]  async2
-    e1.js   9.31 KiB       3  [emitted]  e1
-    e2.js   9.33 KiB       4  [emitted]  e2
-    e3.js   9.35 KiB       5  [emitted]  e3
+ 0.js  730 bytes    0, 7  [emitted]  
+ 1.js  730 bytes    1, 8  [emitted]  
+ 2.js  730 bytes    2, 6  [emitted]  
+e1.js   9.42 KiB       3  [emitted]  e1
+e2.js   9.44 KiB       4  [emitted]  e2
+e3.js   9.46 KiB       5  [emitted]  e3
+ 6.js  661 bytes       6  [emitted]  
+ 7.js  661 bytes       7  [emitted]  
+ 8.js  661 bytes       8  [emitted]  
 Entrypoint e1 = e1.js
 Entrypoint e2 = e2.js
 Entrypoint e3 = e3.js
-chunk    {0} async3.js (async3) 89 bytes <{2}> <{5}> >{1}< [rendered]
- [4] ./h.js 9 bytes {0} {5} [built]
- [7] ./async3.js 80 bytes {0} [built]
-chunk    {1} async1.js (async1) 89 bytes <{0}> <{3}> >{2}< [rendered]
- [2] ./d.js 9 bytes {1} {3} [built]
- [5] ./async1.js 80 bytes {1} [built]
-chunk    {2} async2.js (async2) 89 bytes <{1}> <{4}> >{0}< [rendered]
- [3] ./f.js 9 bytes {2} {4} [built]
- [6] ./async2.js 80 bytes {2} [built]
-chunk    {3} e1.js (e1) 144 bytes >{1}< [entry] [rendered]
+chunk    {0} 0.js 37 bytes <{3}> <{5}> [rendered]
+ [3] ./async2.js 28 bytes {0} {7} [built]
+ [6] ./f.js 9 bytes {0} {4} [built]
+chunk    {1} 1.js 37 bytes <{3}> <{4}> [rendered]
+ [4] ./async3.js 28 bytes {1} {8} [built]
+ [7] ./h.js 9 bytes {1} {5} [built]
+chunk    {2} 2.js 37 bytes <{4}> <{5}> [rendered]
+ [2] ./async1.js 28 bytes {2} {6} [built]
+ [5] ./d.js 9 bytes {2} {3} [built]
+chunk    {3} e1.js (e1) 152 bytes >{0}< >{1}< >{6}< [entry] [rendered]
  [0] ./b.js 9 bytes {3} {4} {5} [built]
  [1] ./a.js 9 bytes {3} {4} {5} [built]
- [2] ./d.js 9 bytes {1} {3} [built]
- [8] ./e1.js 108 bytes {3} [built]
+ [5] ./d.js 9 bytes {2} {3} [built]
+ [8] ./e1.js 116 bytes {3} [built]
  [9] ./c.js 9 bytes {3} [built]
-chunk    {4} e2.js (e2) 144 bytes >{2}< [entry] [rendered]
+chunk    {4} e2.js (e2) 152 bytes >{1}< >{2}< >{7}< [entry] [rendered]
   [0] ./b.js 9 bytes {3} {4} {5} [built]
   [1] ./a.js 9 bytes {3} {4} {5} [built]
-  [3] ./f.js 9 bytes {2} {4} [built]
- [10] ./e2.js 108 bytes {4} [built]
+  [6] ./f.js 9 bytes {0} {4} [built]
+ [10] ./e2.js 116 bytes {4} [built]
  [11] ./e.js 9 bytes {4} [built]
-chunk    {5} e3.js (e3) 144 bytes >{0}< [entry] [rendered]
+chunk    {5} e3.js (e3) 152 bytes >{0}< >{2}< >{8}< [entry] [rendered]
   [0] ./b.js 9 bytes {3} {4} {5} [built]
   [1] ./a.js 9 bytes {3} {4} {5} [built]
-  [4] ./h.js 9 bytes {0} {5} [built]
- [12] ./e3.js 108 bytes {5} [built]
- [13] ./g.js 9 bytes {5} [built]"
+  [7] ./h.js 9 bytes {1} {5} [built]
+ [12] ./e3.js 116 bytes {5} [built]
+ [13] ./g.js 9 bytes {5} [built]
+chunk    {6} 6.js 28 bytes <{3}> [rendered]
+ [2] ./async1.js 28 bytes {2} {6} [built]
+chunk    {7} 7.js 28 bytes <{4}> [rendered]
+ [3] ./async2.js 28 bytes {0} {7} [built]
+chunk    {8} 8.js 28 bytes <{5}> [rendered]
+ [4] ./async3.js 28 bytes {1} {8} [built]"
+`;
+
+exports[`StatsTestCases should print correct stats for module-deduplication-named 1`] = `
+"    Asset       Size  Chunks             Chunk Names
+    e1.js   9.28 KiB       0  [emitted]  e1
+    e2.js    9.3 KiB       1  [emitted]  e2
+    e3.js   9.32 KiB       2  [emitted]  e3
+async1.js  820 bytes       3  [emitted]  async1
+async2.js  820 bytes       4  [emitted]  async2
+async3.js  820 bytes       5  [emitted]  async3
+Entrypoint e1 = e1.js
+Entrypoint e2 = e2.js
+Entrypoint e3 = e3.js
+chunk    {0} e1.js (e1) 144 bytes >{3}< [entry] [rendered]
+ [0] ./b.js 9 bytes {0} {1} {2} [built]
+ [1] ./a.js 9 bytes {0} {1} {2} [built]
+ [2] ./d.js 9 bytes {0} {3} [built]
+ [5] ./e1.js 108 bytes {0} [built]
+ [6] ./c.js 9 bytes {0} [built]
+chunk    {1} e2.js (e2) 144 bytes >{4}< [entry] [rendered]
+ [0] ./b.js 9 bytes {0} {1} {2} [built]
+ [1] ./a.js 9 bytes {0} {1} {2} [built]
+ [3] ./f.js 9 bytes {1} {4} [built]
+ [7] ./e2.js 108 bytes {1} [built]
+ [8] ./e.js 9 bytes {1} [built]
+chunk    {2} e3.js (e3) 144 bytes >{5}< [entry] [rendered]
+  [0] ./b.js 9 bytes {0} {1} {2} [built]
+  [1] ./a.js 9 bytes {0} {1} {2} [built]
+  [4] ./h.js 9 bytes {2} {5} [built]
+  [9] ./e3.js 108 bytes {2} [built]
+ [10] ./g.js 9 bytes {2} [built]
+chunk    {3} async1.js (async1) 89 bytes <{0}> <{5}> >{4}< [rendered]
+  [2] ./d.js 9 bytes {0} {3} [built]
+ [11] ./async1.js 80 bytes {3} [built]
+chunk    {4} async2.js (async2) 89 bytes <{1}> <{3}> >{5}< [rendered]
+  [3] ./f.js 9 bytes {1} {4} [built]
+ [12] ./async2.js 80 bytes {4} [built]
+chunk    {5} async3.js (async3) 89 bytes <{2}> <{4}> >{3}< [rendered]
+  [4] ./h.js 9 bytes {2} {5} [built]
+ [13] ./async3.js 80 bytes {5} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for module-trace-disabled-in-error 1`] = `
@@ -1291,55 +1425,55 @@ exports[`StatsTestCases should print correct stats for named-chunk-groups 1`] =
     Chunk Group async-a = async-a~async-b.js async-a.js
     Chunk Group async-b = async-a~async-b.js async-b.js
     Chunk Group async-c = vendors.js async-c.js
-    chunk    {0} async-a~async-b.js (async-a~async-b) 133 bytes <{5}> ={1}= ={2}= [rendered] split chunk (cache group: default) (name: async-a~async-b)
-        > ./a [6] ./index.js 1:0-47
-        > ./b [6] ./index.js 2:0-47
-     [0] ./shared.js 133 bytes {0} [built]
-    chunk    {1} async-a.js (async-a) 40 bytes <{5}> ={0}= [rendered]
-        > ./a [6] ./index.js 1:0-47
-     [3] ./a.js 40 bytes {1} [built]
-    chunk    {2} async-b.js (async-b) 40 bytes <{5}> ={0}= [rendered]
-        > ./b [6] ./index.js 2:0-47
-     [4] ./b.js 40 bytes {2} [built]
-    chunk    {3} async-c.js (async-c) 45 bytes <{5}> ={4}= [rendered]
-        > ./c [6] ./index.js 3:0-47
-     [5] ./c.js 45 bytes {3} [built]
-    chunk    {4} vendors.js (vendors) 40 bytes <{5}> ={3}= [rendered] split chunk (cache group: vendors) (name: vendors)
-        > ./c [6] ./index.js 3:0-47
-     [1] ./node_modules/x.js 20 bytes {4} [built]
-     [2] ./node_modules/y.js 20 bytes {4} [built]
-    chunk    {5} main.js (main) 146 bytes >{0}< >{1}< >{2}< >{3}< >{4}< [entry] [rendered]
+    chunk    {0} async-a~async-b.js (async-a~async-b) 133 bytes <{1}> ={2}= ={3}= [rendered] split chunk (cache group: default) (name: async-a~async-b)
+        > ./a [0] ./index.js 1:0-47
+        > ./b [0] ./index.js 2:0-47
+     [4] ./shared.js 133 bytes {0} [built]
+    chunk    {1} main.js (main) 146 bytes >{0}< >{2}< >{3}< >{4}< >{5}< [entry] [rendered]
         > ./ main
-     [6] ./index.js 146 bytes {5} [built]
+     [0] ./index.js 146 bytes {1} [built]
+    chunk    {2} async-a.js (async-a) 40 bytes <{1}> ={0}= [rendered]
+        > ./a [0] ./index.js 1:0-47
+     [1] ./a.js 40 bytes {2} [built]
+    chunk    {3} async-b.js (async-b) 40 bytes <{1}> ={0}= [rendered]
+        > ./b [0] ./index.js 2:0-47
+     [2] ./b.js 40 bytes {3} [built]
+    chunk    {4} async-c.js (async-c) 45 bytes <{1}> ={5}= [rendered]
+        > ./c [0] ./index.js 3:0-47
+     [3] ./c.js 45 bytes {4} [built]
+    chunk    {5} vendors.js (vendors) 40 bytes <{1}> ={4}= [rendered] split chunk (cache group: vendors) (name: vendors)
+        > ./c [0] ./index.js 3:0-47
+     [5] ./node_modules/x.js 20 bytes {5} [built]
+     [6] ./node_modules/y.js 20 bytes {5} [built]
 Child
     Entrypoint main = main.js
     Chunk Group async-a = async-a~async-b.js async-a.js
     Chunk Group async-b = async-a~async-b.js async-b.js
     Chunk Group async-c = vendors.js async-c.js
-    chunk    {0} async-a~async-b.js (async-a~async-b) 133 bytes <{5}> ={1}= ={2}= [rendered] split chunk (cache group: default) (name: async-a~async-b)
-        > ./a [6] ./index.js 1:0-47
-        > ./b [6] ./index.js 2:0-47
-     [0] ./shared.js 133 bytes {0} [built]
-    chunk    {1} async-a.js (async-a) 40 bytes <{5}> ={0}= [rendered]
-        > ./a [6] ./index.js 1:0-47
-     [3] ./a.js 40 bytes {1} [built]
-    chunk    {2} async-b.js (async-b) 40 bytes <{5}> ={0}= [rendered]
-        > ./b [6] ./index.js 2:0-47
-     [4] ./b.js 40 bytes {2} [built]
-    chunk    {3} async-c.js (async-c) 45 bytes <{5}> ={4}= [rendered]
-        > ./c [6] ./index.js 3:0-47
-     [5] ./c.js 45 bytes {3} [built]
-    chunk    {4} vendors.js (vendors) 40 bytes <{5}> ={3}= [rendered] split chunk (cache group: vendors) (name: vendors)
-        > ./c [6] ./index.js 3:0-47
-     [1] ./node_modules/x.js 20 bytes {4} [built]
-     [2] ./node_modules/y.js 20 bytes {4} [built]
-    chunk    {5} main.js (main) 146 bytes >{0}< >{1}< >{2}< >{3}< >{4}< [entry] [rendered]
+    chunk    {0} async-a~async-b.js (async-a~async-b) 133 bytes <{1}> ={2}= ={3}= [rendered] split chunk (cache group: default) (name: async-a~async-b)
+        > ./a [0] ./index.js 1:0-47
+        > ./b [0] ./index.js 2:0-47
+     [4] ./shared.js 133 bytes {0} [built]
+    chunk    {1} main.js (main) 146 bytes >{0}< >{2}< >{3}< >{4}< >{5}< [entry] [rendered]
         > ./ main
-     [6] ./index.js 146 bytes {5} [built]"
+     [0] ./index.js 146 bytes {1} [built]
+    chunk    {2} async-a.js (async-a) 40 bytes <{1}> ={0}= [rendered]
+        > ./a [0] ./index.js 1:0-47
+     [1] ./a.js 40 bytes {2} [built]
+    chunk    {3} async-b.js (async-b) 40 bytes <{1}> ={0}= [rendered]
+        > ./b [0] ./index.js 2:0-47
+     [2] ./b.js 40 bytes {3} [built]
+    chunk    {4} async-c.js (async-c) 45 bytes <{1}> ={5}= [rendered]
+        > ./c [0] ./index.js 3:0-47
+     [3] ./c.js 45 bytes {4} [built]
+    chunk    {5} vendors.js (vendors) 40 bytes <{1}> ={4}= [rendered] split chunk (cache group: vendors) (name: vendors)
+        > ./c [0] ./index.js 3:0-47
+     [5] ./node_modules/x.js 20 bytes {5} [built]
+     [6] ./node_modules/y.js 20 bytes {5} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for named-chunks-plugin 1`] = `
-"Hash: ae58e4539a3d3b521cc7
+"Hash: deb7cd22c634f1c52662
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
     Asset       Size  Chunks             Chunk Names
@@ -1353,21 +1487,21 @@ Entrypoint entry = vendor.js entry.js
 `;
 
 exports[`StatsTestCases should print correct stats for named-chunks-plugin-async 1`] = `
-"Hash: b6aa15eeabc33e889828
+"Hash: 7025495eaa1925d67e0d
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
                      Asset       Size                   Chunks             Chunk Names
-chunk-containing-__a_js.js  313 bytes  chunk-containing-__a_js  [emitted]  
-chunk-containing-__b_js.js  173 bytes  chunk-containing-__b_js  [emitted]  
+chunk-containing-__a_js.js  307 bytes  chunk-containing-__a_js  [emitted]  
+chunk-containing-__b_js.js  182 bytes  chunk-containing-__b_js  [emitted]  
                   entry.js   8.18 KiB                    entry  [emitted]  entry
 Entrypoint entry = entry.js
-[0] ./modules/b.js 22 bytes {chunk-containing-__b_js} [built]
-[1] ./modules/a.js 37 bytes {chunk-containing-__a_js} [built]
-[2] ./entry.js 47 bytes {entry} [built]"
+[0] ./entry.js 47 bytes {entry} [built]
+[1] ./modules/b.js 22 bytes {chunk-containing-__b_js} [built]
+[2] ./modules/a.js 37 bytes {chunk-containing-__a_js} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for no-emit-on-errors-plugin-with-child-error 1`] = `
-"Hash: 6a246e5dec75240f30bf
+"Hash: c07d925d7e60129ffc69
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
     Asset      Size  Chunks  Chunk Names
@@ -1389,53 +1523,53 @@ Child child:
 `;
 
 exports[`StatsTestCases should print correct stats for optimize-chunks 1`] = `
-"Hash: c52867ded6f77bcf50cc
+"Hash: 7334e6496a3996c90638
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
             Asset       Size  Chunks             Chunk Names
           cir1.js  299 bytes       0  [emitted]  cir1
-            ab.js  183 bytes       1  [emitted]  ab
-           abd.js  277 bytes    2, 1  [emitted]  abd
-          cir2.js  299 bytes       3  [emitted]  cir2
-          main.js   9.09 KiB       4  [emitted]  main
-cir2 from cir1.js  359 bytes    5, 3  [emitted]  cir2 from cir1
-         chunk.js  190 bytes    6, 7  [emitted]  chunk
-      ac in ab.js  130 bytes       7  [emitted]  ac in ab
+          main.js   9.09 KiB       1  [emitted]  main
+            ab.js  183 bytes       2  [emitted]  ab
+           abd.js  250 bytes    3, 2  [emitted]  abd
+          cir2.js  299 bytes       4  [emitted]  cir2
+      ac in ab.js  130 bytes       5  [emitted]  ac in ab
+         chunk.js  212 bytes    6, 5  [emitted]  chunk
+cir2 from cir1.js  359 bytes    7, 4  [emitted]  cir2 from cir1
 Entrypoint main = main.js
-chunk    {0} cir1.js (cir1) 81 bytes <{3}> <{4}> >{5}< [rendered]
-    > [3] ./circular2.js 1:0-79
-    > [3] ./circular2.js 1:0-79
-    > [8] ./index.js 13:0-54
- [2] ./circular1.js 81 bytes {0} [built]
-chunk    {1} ab.js (ab) 0 bytes <{4}> >{7}< [rendered]
-    > [8] ./index.js 1:0-6:8
- [0] ./modules/a.js 0 bytes {1} {2} [built]
- [1] ./modules/b.js 0 bytes {1} {2} [built]
-chunk    {2} abd.js (abd) 0 bytes <{4}> >{6}< [rendered]
-    > [8] ./index.js 8:0-11:9
- [0] ./modules/a.js 0 bytes {1} {2} [built]
- [1] ./modules/b.js 0 bytes {1} {2} [built]
- [6] ./modules/d.js 0 bytes {2} {6} [built]
-chunk    {3} cir2.js (cir2) 81 bytes <{4}> >{0}< [rendered]
-    > [8] ./index.js 14:0-54
- [3] ./circular2.js 81 bytes {3} {5} [built]
-chunk    {4} main.js (main) 523 bytes >{0}< >{1}< >{2}< >{3}< [entry] [rendered]
+chunk    {0} cir1.js (cir1) 81 bytes <{1}> <{4}> >{7}< [rendered]
+    > [5] ./index.js 13:0-54
+    > [7] ./circular2.js 1:0-79
+    > [7] ./circular2.js 1:0-79
+ [6] ./circular1.js 81 bytes {0} [built]
+chunk    {1} main.js (main) 523 bytes >{0}< >{2}< >{3}< >{4}< [entry] [rendered]
     > ./index main
- [4] ./modules/f.js 0 bytes {4} [built]
- [8] ./index.js 523 bytes {4} [built]
-chunk    {5} cir2 from cir1.js (cir2 from cir1) 81 bytes <{0}> [rendered]
-    > [2] ./circular1.js 1:0-79
-    > [2] ./circular1.js 1:0-79
- [3] ./circular2.js 81 bytes {3} {5} [built]
- [7] ./modules/e.js 0 bytes {5} [built]
-chunk    {6} chunk.js (chunk) 0 bytes <{2}> <{7}> [rendered]
-    > [8] ./index.js 3:2-4:13
-    > [8] ./index.js 9:1-10:12
- [5] ./modules/c.js 0 bytes {6} {7} [built]
- [6] ./modules/d.js 0 bytes {2} {6} [built]
-chunk    {7} ac in ab.js (ac in ab) 0 bytes <{1}> >{6}< [rendered]
-    > [8] ./index.js 2:1-5:15
- [5] ./modules/c.js 0 bytes {6} {7} [built]"
+ [2] ./modules/f.js 0 bytes {1} [built]
+ [5] ./index.js 523 bytes {1} [built]
+chunk    {2} ab.js (ab) 0 bytes <{1}> >{5}< [rendered]
+    > [5] ./index.js 1:0-6:8
+ [0] ./modules/a.js 0 bytes {2} {3} [built]
+ [1] ./modules/b.js 0 bytes {2} {3} [built]
+chunk    {3} abd.js (abd) 0 bytes <{1}> >{6}< [rendered]
+    > [5] ./index.js 8:0-11:9
+ [0] ./modules/a.js 0 bytes {2} {3} [built]
+ [1] ./modules/b.js 0 bytes {2} {3} [built]
+ [3] ./modules/d.js 0 bytes {3} {6} [built]
+chunk    {4} cir2.js (cir2) 81 bytes <{1}> >{0}< [rendered]
+    > [5] ./index.js 14:0-54
+ [7] ./circular2.js 81 bytes {4} {7} [built]
+chunk    {5} ac in ab.js (ac in ab) 0 bytes <{2}> >{6}< [rendered]
+    > [5] ./index.js 2:1-5:15
+ [4] ./modules/c.js 0 bytes {5} {6} [built]
+chunk    {6} chunk.js (chunk) 0 bytes <{3}> <{5}> [rendered]
+    > [5] ./index.js 3:2-4:13
+    > [5] ./index.js 9:1-10:12
+ [3] ./modules/d.js 0 bytes {3} {6} [built]
+ [4] ./modules/c.js 0 bytes {5} {6} [built]
+chunk    {7} cir2 from cir1.js (cir2 from cir1) 81 bytes <{0}> [rendered]
+    > [6] ./circular1.js 1:0-79
+    > [6] ./circular1.js 1:0-79
+ [7] ./circular2.js 81 bytes {4} {7} [built]
+ [8] ./modules/e.js 0 bytes {7} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for parse-error 1`] = `
@@ -1460,9 +1594,9 @@ You may need an appropriate loader to handle this file type.
 `;
 
 exports[`StatsTestCases should print correct stats for performance-different-mode-and-target 1`] = `
-"Hash: b27a7019f90a13ead012bb84b396eb1e98365d94fb930f6aa3329ab03a278deb0030bfebe86abb37a1cddcae25eb52f3112b62c8b61bc84829d26b13ae06efe5f0099a11af36
+"Hash: fdd848419e60e2d013b0259ddac6a2fc2be16d5d2ff383e3c2c0c58d07840c13a912a795f6e4940364a02963586e6b6811420c13a912a795f6e494032ff383e3c2c0c58d0784
 Child
-    Hash: b27a7019f90a13ead012
+    Hash: fdd848419e60e2d013b0
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
                  Asset     Size  Chunks                    Chunk Names
@@ -1485,7 +1619,7 @@ Child
     You can limit the size of your bundles by using import() or require.ensure to lazy load some parts of your application.
     For more info visit https://webpack.js.org/guides/code-splitting/
 Child
-    Hash: bb84b396eb1e98365d94
+    Hash: 259ddac6a2fc2be16d5d
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
                        Asset     Size  Chunks                    Chunk Names
@@ -1508,7 +1642,7 @@ Child
     You can limit the size of your bundles by using import() or require.ensure to lazy load some parts of your application.
     For more info visit https://webpack.js.org/guides/code-splitting/
 Child
-    Hash: fb930f6aa3329ab03a27
+    Hash: 2ff383e3c2c0c58d0784
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
                      Asset     Size  Chunks             Chunk Names
@@ -1516,7 +1650,7 @@ Child
     Entrypoint main = no-warning.pro-node.js
     [0] ./index.js 293 KiB {0} [built]
 Child
-    Hash: 8deb0030bfebe86abb37
+    Hash: 0c13a912a795f6e49403
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
                     Asset      Size  Chunks             Chunk Names
@@ -1524,7 +1658,7 @@ Child
     Entrypoint main = no-warning.dev-web.js
     [./index.js] 293 KiB {main} [built]
 Child
-    Hash: a1cddcae25eb52f3112b
+    Hash: 64a02963586e6b681142
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
                      Asset      Size  Chunks             Chunk Names
@@ -1532,7 +1666,7 @@ Child
     Entrypoint main = no-warning.dev-node.js
     [./index.js] 293 KiB {main} [built]
 Child
-    Hash: 62c8b61bc84829d26b13
+    Hash: 0c13a912a795f6e49403
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
                                    Asset      Size  Chunks                    Chunk Names
@@ -1540,7 +1674,7 @@ Child
     Entrypoint main [big] = no-warning.dev-web-with-limit-set.js
     [./index.js] 293 KiB {main} [built]
 Child
-    Hash: ae06efe5f0099a11af36
+    Hash: 2ff383e3c2c0c58d0784
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
                                  Asset     Size  Chunks                    Chunk Names
@@ -1568,34 +1702,34 @@ exports[`StatsTestCases should print correct stats for performance-disabled 1`]
 "Time: <CLR=BOLD>X</CLR>ms
 Built at: Thu Jan 01 1970 <CLR=BOLD>00:00:00</CLR> GMT
   <CLR=BOLD>Asset</CLR>       <CLR=BOLD>Size</CLR>  <CLR=BOLD>Chunks</CLR>  <CLR=39,BOLD><CLR=22>           <CLR=39,BOLD><CLR=22><CLR=BOLD>Chunk Names</CLR>
-   <CLR=32,BOLD>0.js</CLR>  152 bytes       <CLR=BOLD>0</CLR>  <CLR=32,BOLD>[emitted]</CLR>  
-   <CLR=32,BOLD>1.js</CLR>  289 bytes       <CLR=BOLD>1</CLR>  <CLR=32,BOLD>[emitted]</CLR>  
-<CLR=32,BOLD>main.js</CLR>    301 KiB       <CLR=BOLD>2</CLR>  <CLR=32,BOLD>[emitted]</CLR>  main
-   <CLR=32,BOLD>3.js</CLR>  227 bytes       <CLR=BOLD>3</CLR>  <CLR=32,BOLD>[emitted]</CLR>  
+<CLR=32,BOLD>main.js</CLR>    301 KiB       <CLR=BOLD>0</CLR>  <CLR=32,BOLD>[emitted]</CLR>  main
+   <CLR=32,BOLD>1.js</CLR>  152 bytes       <CLR=BOLD>1</CLR>  <CLR=32,BOLD>[emitted]</CLR>  
+   <CLR=32,BOLD>2.js</CLR>  289 bytes       <CLR=BOLD>2</CLR>  <CLR=32,BOLD>[emitted]</CLR>  
+   <CLR=32,BOLD>3.js</CLR>  232 bytes       <CLR=BOLD>3</CLR>  <CLR=32,BOLD>[emitted]</CLR>  
 Entrypoint <CLR=BOLD>main</CLR> = <CLR=32,BOLD>main.js</CLR>
-[0] <CLR=BOLD>./d.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
-[1] <CLR=BOLD>./e.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
-[2] <CLR=BOLD>./b.js</CLR> 22 bytes {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
-[3] <CLR=BOLD>./c.js</CLR> 54 bytes {<CLR=33,BOLD>1</CLR>}<CLR=32,BOLD> [built]</CLR>
-[4] <CLR=BOLD>./index.js</CLR> 52 bytes {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
-[5] <CLR=BOLD>./a.js</CLR> 293 KiB {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>"
+[0] <CLR=BOLD>./index.js</CLR> 52 bytes {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
+[1] <CLR=BOLD>./a.js</CLR> 293 KiB {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
+[2] <CLR=BOLD>./b.js</CLR> 22 bytes {<CLR=33,BOLD>1</CLR>}<CLR=32,BOLD> [built]</CLR>
+[3] <CLR=BOLD>./c.js</CLR> 54 bytes {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
+[4] <CLR=BOLD>./d.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
+[5] <CLR=BOLD>./e.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>"
 `;
 
 exports[`StatsTestCases should print correct stats for performance-error 1`] = `
 "Time: <CLR=BOLD>X</CLR>ms
 Built at: Thu Jan 01 1970 <CLR=BOLD>00:00:00</CLR> GMT
   <CLR=BOLD>Asset</CLR>       <CLR=BOLD>Size</CLR>  <CLR=BOLD>Chunks</CLR>  <CLR=39,BOLD><CLR=22>           <CLR=39,BOLD><CLR=22>       <CLR=BOLD>Chunk Names</CLR>
-   <CLR=32,BOLD>0.js</CLR>  152 bytes       <CLR=BOLD>0</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
-   <CLR=32,BOLD>1.js</CLR>  289 bytes       <CLR=BOLD>1</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
-<CLR=33,BOLD>main.js</CLR>    <CLR=33,BOLD>301 KiB</CLR>       <CLR=BOLD>2</CLR>  <CLR=32,BOLD>[emitted]</CLR>  <CLR=33,BOLD>[big]</CLR>  main
-   <CLR=32,BOLD>3.js</CLR>  227 bytes       <CLR=BOLD>3</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+<CLR=33,BOLD>main.js</CLR>    <CLR=33,BOLD>301 KiB</CLR>       <CLR=BOLD>0</CLR>  <CLR=32,BOLD>[emitted]</CLR>  <CLR=33,BOLD>[big]</CLR>  main
+   <CLR=32,BOLD>1.js</CLR>  152 bytes       <CLR=BOLD>1</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+   <CLR=32,BOLD>2.js</CLR>  289 bytes       <CLR=BOLD>2</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+   <CLR=32,BOLD>3.js</CLR>  232 bytes       <CLR=BOLD>3</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
 Entrypoint <CLR=BOLD>main</CLR> <CLR=33,BOLD>[big]</CLR> = <CLR=32,BOLD>main.js</CLR>
-[0] <CLR=BOLD>./d.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
-[1] <CLR=BOLD>./e.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
-[2] <CLR=BOLD>./b.js</CLR> 22 bytes {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
-[3] <CLR=BOLD>./c.js</CLR> 54 bytes {<CLR=33,BOLD>1</CLR>}<CLR=32,BOLD> [built]</CLR>
-[4] <CLR=BOLD>./index.js</CLR> 52 bytes {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
-[5] <CLR=BOLD>./a.js</CLR> 293 KiB {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
+[0] <CLR=BOLD>./index.js</CLR> 52 bytes {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
+[1] <CLR=BOLD>./a.js</CLR> 293 KiB {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
+[2] <CLR=BOLD>./b.js</CLR> 22 bytes {<CLR=33,BOLD>1</CLR>}<CLR=32,BOLD> [built]</CLR>
+[3] <CLR=BOLD>./c.js</CLR> 54 bytes {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
+[4] <CLR=BOLD>./d.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
+[5] <CLR=BOLD>./e.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
 
 <CLR=31,BOLD>ERROR in asset size limit: The following asset(s) exceed the recommended size limit (244 KiB).
 This can impact web performance.
@@ -1644,17 +1778,17 @@ exports[`StatsTestCases should print correct stats for performance-no-hints 1`]
 "Time: <CLR=BOLD>X</CLR>ms
 Built at: Thu Jan 01 1970 <CLR=BOLD>00:00:00</CLR> GMT
   <CLR=BOLD>Asset</CLR>       <CLR=BOLD>Size</CLR>  <CLR=BOLD>Chunks</CLR>  <CLR=39,BOLD><CLR=22>           <CLR=39,BOLD><CLR=22>       <CLR=BOLD>Chunk Names</CLR>
-   <CLR=32,BOLD>0.js</CLR>  152 bytes       <CLR=BOLD>0</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
-   <CLR=32,BOLD>1.js</CLR>  289 bytes       <CLR=BOLD>1</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
-<CLR=33,BOLD>main.js</CLR>    <CLR=33,BOLD>301 KiB</CLR>       <CLR=BOLD>2</CLR>  <CLR=32,BOLD>[emitted]</CLR>  <CLR=33,BOLD>[big]</CLR>  main
-   <CLR=32,BOLD>3.js</CLR>  227 bytes       <CLR=BOLD>3</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+<CLR=33,BOLD>main.js</CLR>    <CLR=33,BOLD>301 KiB</CLR>       <CLR=BOLD>0</CLR>  <CLR=32,BOLD>[emitted]</CLR>  <CLR=33,BOLD>[big]</CLR>  main
+   <CLR=32,BOLD>1.js</CLR>  152 bytes       <CLR=BOLD>1</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+   <CLR=32,BOLD>2.js</CLR>  289 bytes       <CLR=BOLD>2</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+   <CLR=32,BOLD>3.js</CLR>  232 bytes       <CLR=BOLD>3</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
 Entrypoint <CLR=BOLD>main</CLR> <CLR=33,BOLD>[big]</CLR> = <CLR=32,BOLD>main.js</CLR>
-[0] <CLR=BOLD>./d.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
-[1] <CLR=BOLD>./e.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
-[2] <CLR=BOLD>./b.js</CLR> 22 bytes {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
-[3] <CLR=BOLD>./c.js</CLR> 54 bytes {<CLR=33,BOLD>1</CLR>}<CLR=32,BOLD> [built]</CLR>
-[4] <CLR=BOLD>./index.js</CLR> 52 bytes {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
-[5] <CLR=BOLD>./a.js</CLR> 293 KiB {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>"
+[0] <CLR=BOLD>./index.js</CLR> 52 bytes {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
+[1] <CLR=BOLD>./a.js</CLR> 293 KiB {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
+[2] <CLR=BOLD>./b.js</CLR> 22 bytes {<CLR=33,BOLD>1</CLR>}<CLR=32,BOLD> [built]</CLR>
+[3] <CLR=BOLD>./c.js</CLR> 54 bytes {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
+[4] <CLR=BOLD>./d.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
+[5] <CLR=BOLD>./e.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>"
 `;
 
 exports[`StatsTestCases should print correct stats for performance-oversize-limit-error 1`] = `
@@ -1690,85 +1824,85 @@ For more info visit https://webpack.js.org/guides/code-splitting/</CLR>"
 
 exports[`StatsTestCases should print correct stats for prefetch 1`] = `
 "         Asset       Size  Chunks             Chunk Names
- prefetched.js  475 bytes       0  [emitted]  prefetched
-     normal.js  130 bytes       1  [emitted]  normal
-prefetched2.js  127 bytes       2  [emitted]  prefetched2
-prefetched3.js  130 bytes       3  [emitted]  prefetched3
-       main.js   9.66 KiB       4  [emitted]  main
-      inner.js  136 bytes       5  [emitted]  inner
-     inner2.js  201 bytes       6  [emitted]  inner2
+       main.js   9.66 KiB       0  [emitted]  main
+ prefetched.js  475 bytes       1  [emitted]  prefetched
+     normal.js  130 bytes       2  [emitted]  normal
+prefetched2.js  127 bytes       3  [emitted]  prefetched2
+prefetched3.js  130 bytes       4  [emitted]  prefetched3
+      inner.js  130 bytes       5  [emitted]  inner
+     inner2.js  188 bytes       6  [emitted]  inner2
 Entrypoint main = main.js (prefetch: prefetched2.js prefetched.js prefetched3.js)
-chunk    {0} prefetched.js (prefetched) 228 bytes <{4}> >{5}< >{6}< (prefetch: {6} {5}) [rendered]
-chunk    {1} normal.js (normal) 0 bytes <{4}> [rendered]
-chunk    {2} prefetched2.js (prefetched2) 0 bytes <{4}> [rendered]
-chunk    {3} prefetched3.js (prefetched3) 0 bytes <{4}> [rendered]
-chunk    {4} main.js (main) 436 bytes >{0}< >{1}< >{2}< >{3}< (prefetch: {2} {0} {3}) [entry] [rendered]
-chunk    {5} inner.js (inner) 0 bytes <{0}> [rendered]
-chunk    {6} inner2.js (inner2) 0 bytes <{0}> [rendered]"
+chunk    {0} main.js (main) 436 bytes >{1}< >{2}< >{3}< >{4}< (prefetch: {3} {1} {4}) [entry] [rendered]
+chunk    {1} prefetched.js (prefetched) 228 bytes <{0}> >{5}< >{6}< (prefetch: {6} {5}) [rendered]
+chunk    {2} normal.js (normal) 0 bytes <{0}> [rendered]
+chunk    {3} prefetched2.js (prefetched2) 0 bytes <{0}> [rendered]
+chunk    {4} prefetched3.js (prefetched3) 0 bytes <{0}> [rendered]
+chunk    {5} inner.js (inner) 0 bytes <{1}> [rendered]
+chunk    {6} inner2.js (inner2) 0 bytes <{1}> [rendered]"
 `;
 
 exports[`StatsTestCases should print correct stats for prefetch-preload-mixed 1`] = `
-"chunk    {0} a.js (a) 136 bytes <{3}> >{10}< >{9}< (prefetch: {9} {10}) [rendered]
-chunk    {1} b.js (b) 203 bytes <{3}> >{6}< >{7}< >{8}< (prefetch: {6} {8}) (preload: {7}) [rendered]
-chunk    {2} c.js (c) 134 bytes <{3}> >{4}< >{5}< (preload: {4} {5}) [rendered]
-chunk    {3} main.js (main) 195 bytes >{0}< >{1}< >{2}< (prefetch: {0} {1} {2}) [entry] [rendered]
-chunk    {4} c1.js (c1) 0 bytes <{2}> [rendered]
-chunk    {5} c2.js (c2) 0 bytes <{2}> [rendered]
-chunk    {6} b1.js (b1) 0 bytes <{1}> [rendered]
-chunk    {7} b2.js (b2) 0 bytes <{1}> [rendered]
-chunk    {8} b3.js (b3) 0 bytes <{1}> [rendered]
-chunk    {9} a1.js (a1) 0 bytes <{0}> [rendered]
-chunk   {10} a2.js (a2) 0 bytes <{0}> [rendered]"
+"chunk    {0} main.js (main) 195 bytes >{1}< >{2}< >{3}< (prefetch: {1} {2} {3}) [entry] [rendered]
+chunk    {1} a.js (a) 136 bytes <{0}> >{4}< >{5}< (prefetch: {4} {5}) [rendered]
+chunk    {2} b.js (b) 203 bytes <{0}> >{6}< >{7}< >{8}< (prefetch: {6} {8}) (preload: {7}) [rendered]
+chunk    {3} c.js (c) 134 bytes <{0}> >{9}< >{10}< (preload: {9} {10}) [rendered]
+chunk    {4} a1.js (a1) 0 bytes <{1}> [rendered]
+chunk    {5} a2.js (a2) 0 bytes <{1}> [rendered]
+chunk    {6} b1.js (b1) 0 bytes <{2}> [rendered]
+chunk    {7} b2.js (b2) 0 bytes <{2}> [rendered]
+chunk    {8} b3.js (b3) 0 bytes <{2}> [rendered]
+chunk    {9} c1.js (c1) 0 bytes <{3}> [rendered]
+chunk   {10} c2.js (c2) 0 bytes <{3}> [rendered]"
 `;
 
 exports[`StatsTestCases should print correct stats for preload 1`] = `
 "        Asset       Size  Chunks             Chunk Names
- preloaded.js  467 bytes       0  [emitted]  preloaded
-    normal.js  130 bytes       1  [emitted]  normal
-preloaded2.js  127 bytes       2  [emitted]  preloaded2
-preloaded3.js  130 bytes       3  [emitted]  preloaded3
-      main.js   9.87 KiB       4  [emitted]  main
-     inner.js  136 bytes       5  [emitted]  inner
-    inner2.js  201 bytes       6  [emitted]  inner2
+      main.js   9.87 KiB       0  [emitted]  main
+ preloaded.js  467 bytes       1  [emitted]  preloaded
+    normal.js  130 bytes       2  [emitted]  normal
+preloaded2.js  127 bytes       3  [emitted]  preloaded2
+preloaded3.js  130 bytes       4  [emitted]  preloaded3
+     inner.js  130 bytes       5  [emitted]  inner
+    inner2.js  188 bytes       6  [emitted]  inner2
 Entrypoint main = main.js (preload: preloaded2.js preloaded.js preloaded3.js)
-chunk    {0} preloaded.js (preloaded) 226 bytes <{4}> >{5}< >{6}< (preload: {6} {5}) [rendered]
-chunk    {1} normal.js (normal) 0 bytes <{4}> [rendered]
-chunk    {2} preloaded2.js (preloaded2) 0 bytes <{4}> [rendered]
-chunk    {3} preloaded3.js (preloaded3) 0 bytes <{4}> [rendered]
-chunk    {4} main.js (main) 424 bytes >{0}< >{1}< >{2}< >{3}< (preload: {2} {0} {3}) [entry] [rendered]
-chunk    {5} inner.js (inner) 0 bytes <{0}> [rendered]
-chunk    {6} inner2.js (inner2) 0 bytes <{0}> [rendered]"
+chunk    {0} main.js (main) 424 bytes >{1}< >{2}< >{3}< >{4}< (preload: {3} {1} {4}) [entry] [rendered]
+chunk    {1} preloaded.js (preloaded) 226 bytes <{0}> >{5}< >{6}< (preload: {6} {5}) [rendered]
+chunk    {2} normal.js (normal) 0 bytes <{0}> [rendered]
+chunk    {3} preloaded2.js (preloaded2) 0 bytes <{0}> [rendered]
+chunk    {4} preloaded3.js (preloaded3) 0 bytes <{0}> [rendered]
+chunk    {5} inner.js (inner) 0 bytes <{1}> [rendered]
+chunk    {6} inner2.js (inner2) 0 bytes <{1}> [rendered]"
 `;
 
 exports[`StatsTestCases should print correct stats for preset-detailed 1`] = `
-"Hash: 2eb3274d0272da6a7a14
+"Hash: c85b33cafbe774edeafb
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
   Asset       Size  Chunks             Chunk Names
-   0.js  152 bytes       0  [emitted]  
-   1.js  289 bytes       1  [emitted]  
-main.js   8.29 KiB       2  [emitted]  main
-   3.js  227 bytes       3  [emitted]  
+main.js   8.29 KiB       0  [emitted]  main
+   1.js  152 bytes       1  [emitted]  
+   2.js  289 bytes       2  [emitted]  
+   3.js  232 bytes       3  [emitted]  
 Entrypoint main = main.js
-chunk    {0} 0.js 22 bytes <{2}> [rendered]
-    > ./b [4] ./index.js 2:0-16
-chunk    {1} 1.js 54 bytes <{2}> >{3}< [rendered]
-    > ./c [4] ./index.js 3:0-16
-chunk    {2} main.js (main) 73 bytes >{0}< >{1}< [entry] [rendered]
+chunk    {0} main.js (main) 73 bytes >{1}< >{2}< [entry] [rendered]
     > ./index main
-chunk    {3} 3.js 44 bytes <{1}> [rendered]
+chunk    {1} 1.js 22 bytes <{0}> [rendered]
+    > ./b [0] ./index.js 2:0-16
+chunk    {2} 2.js 54 bytes <{0}> >{3}< [rendered]
+    > ./c [0] ./index.js 3:0-16
+chunk    {3} 3.js 44 bytes <{2}> [rendered]
     > [3] ./c.js 1:0-52
-[0] ./d.js 22 bytes {3} [depth 2] [built]
+[0] ./index.js 51 bytes {0} [depth 0] [built]
     ModuleConcatenation bailout: Module is not an ECMAScript module
-[1] ./e.js 22 bytes {3} [depth 2] [built]
+[1] ./a.js 22 bytes {0} [depth 1] [built]
     ModuleConcatenation bailout: Module is not an ECMAScript module
-[2] ./b.js 22 bytes {0} [depth 1] [built]
+[2] ./b.js 22 bytes {1} [depth 1] [built]
     ModuleConcatenation bailout: Module is not an ECMAScript module
-[3] ./c.js 54 bytes {1} [depth 1] [built]
+[3] ./c.js 54 bytes {2} [depth 1] [built]
     ModuleConcatenation bailout: Module is not an ECMAScript module
-[4] ./index.js 51 bytes {2} [depth 0] [built]
+[4] ./d.js 22 bytes {3} [depth 2] [built]
     ModuleConcatenation bailout: Module is not an ECMAScript module
-[5] ./a.js 22 bytes {2} [depth 1] [built]
+[5] ./e.js 22 bytes {3} [depth 2] [built]
     ModuleConcatenation bailout: Module is not an ECMAScript module"
 `;
 
@@ -1800,38 +1934,38 @@ exports[`StatsTestCases should print correct stats for preset-none-array 1`] = `
 exports[`StatsTestCases should print correct stats for preset-none-error 1`] = `""`;
 
 exports[`StatsTestCases should print correct stats for preset-normal 1`] = `
-"Hash: 2eb3274d0272da6a7a14
+"Hash: c85b33cafbe774edeafb
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
   Asset       Size  Chunks             Chunk Names
-   0.js  152 bytes       0  [emitted]  
-   1.js  289 bytes       1  [emitted]  
-main.js   8.29 KiB       2  [emitted]  main
-   3.js  227 bytes       3  [emitted]  
+main.js   8.29 KiB       0  [emitted]  main
+   1.js  152 bytes       1  [emitted]  
+   2.js  289 bytes       2  [emitted]  
+   3.js  232 bytes       3  [emitted]  
 Entrypoint main = main.js
-[0] ./d.js 22 bytes {3} [built]
-[1] ./e.js 22 bytes {3} [built]
-[2] ./b.js 22 bytes {0} [built]
-[3] ./c.js 54 bytes {1} [built]
-[4] ./index.js 51 bytes {2} [built]
-[5] ./a.js 22 bytes {2} [built]"
+[0] ./index.js 51 bytes {0} [built]
+[1] ./a.js 22 bytes {0} [built]
+[2] ./b.js 22 bytes {1} [built]
+[3] ./c.js 54 bytes {2} [built]
+[4] ./d.js 22 bytes {3} [built]
+[5] ./e.js 22 bytes {3} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for preset-normal-performance 1`] = `
 "Time: <CLR=BOLD>X</CLR>ms
 Built at: Thu Jan 01 1970 <CLR=BOLD>00:00:00</CLR> GMT
   <CLR=BOLD>Asset</CLR>       <CLR=BOLD>Size</CLR>  <CLR=BOLD>Chunks</CLR>  <CLR=39,BOLD><CLR=22>           <CLR=39,BOLD><CLR=22>       <CLR=BOLD>Chunk Names</CLR>
-   <CLR=32,BOLD>0.js</CLR>  152 bytes       <CLR=BOLD>0</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
-   <CLR=32,BOLD>1.js</CLR>  289 bytes       <CLR=BOLD>1</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
-<CLR=33,BOLD>main.js</CLR>    <CLR=33,BOLD>301 KiB</CLR>       <CLR=BOLD>2</CLR>  <CLR=32,BOLD>[emitted]</CLR>  <CLR=33,BOLD>[big]</CLR>  main
-   <CLR=32,BOLD>3.js</CLR>  227 bytes       <CLR=BOLD>3</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+<CLR=33,BOLD>main.js</CLR>    <CLR=33,BOLD>301 KiB</CLR>       <CLR=BOLD>0</CLR>  <CLR=32,BOLD>[emitted]</CLR>  <CLR=33,BOLD>[big]</CLR>  main
+   <CLR=32,BOLD>1.js</CLR>  152 bytes       <CLR=BOLD>1</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+   <CLR=32,BOLD>2.js</CLR>  289 bytes       <CLR=BOLD>2</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+   <CLR=32,BOLD>3.js</CLR>  232 bytes       <CLR=BOLD>3</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
 Entrypoint <CLR=BOLD>main</CLR> <CLR=33,BOLD>[big]</CLR> = <CLR=32,BOLD>main.js</CLR>
-[0] <CLR=BOLD>./d.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
-[1] <CLR=BOLD>./e.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
-[2] <CLR=BOLD>./b.js</CLR> 22 bytes {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
-[3] <CLR=BOLD>./c.js</CLR> 54 bytes {<CLR=33,BOLD>1</CLR>}<CLR=32,BOLD> [built]</CLR>
-[4] <CLR=BOLD>./index.js</CLR> 52 bytes {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
-[5] <CLR=BOLD>./a.js</CLR> 293 KiB {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
+[0] <CLR=BOLD>./index.js</CLR> 52 bytes {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
+[1] <CLR=BOLD>./a.js</CLR> 293 KiB {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
+[2] <CLR=BOLD>./b.js</CLR> 22 bytes {<CLR=33,BOLD>1</CLR>}<CLR=32,BOLD> [built]</CLR>
+[3] <CLR=BOLD>./c.js</CLR> 54 bytes {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
+[4] <CLR=BOLD>./d.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
+[5] <CLR=BOLD>./e.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
 
 <CLR=33,BOLD>WARNING in asset size limit: The following asset(s) exceed the recommended size limit (244 KiB).
 This can impact web performance.
@@ -1849,21 +1983,21 @@ exports[`StatsTestCases should print correct stats for preset-normal-performance
 "Time: <CLR=BOLD>X</CLR>ms
 Built at: Thu Jan 01 1970 <CLR=BOLD>00:00:00</CLR> GMT
       <CLR=BOLD>Asset</CLR>       <CLR=BOLD>Size</CLR>  <CLR=BOLD>Chunks</CLR>  <CLR=39,BOLD><CLR=22>           <CLR=39,BOLD><CLR=22>       <CLR=BOLD>Chunk Names</CLR>
-       <CLR=32,BOLD>0.js</CLR>  182 bytes       <CLR=BOLD>0</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
-       <CLR=32,BOLD>1.js</CLR>  319 bytes       <CLR=BOLD>1</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
-    <CLR=33,BOLD>main.js</CLR>    <CLR=33,BOLD>301 KiB</CLR>       <CLR=BOLD>2</CLR>  <CLR=32,BOLD>[emitted]</CLR>  <CLR=33,BOLD>[big]</CLR>  main
-       <CLR=32,BOLD>3.js</CLR>  257 bytes       <CLR=BOLD>3</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
-   <CLR=32,BOLD>0.js.map</CLR>  156 bytes       <CLR=BOLD>0</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
-   <CLR=32,BOLD>1.js.map</CLR>  197 bytes       <CLR=BOLD>1</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
-<CLR=32,BOLD>main.js.map</CLR>   1.72 MiB       <CLR=BOLD>2</CLR>  <CLR=32,BOLD>[emitted]</CLR>         main
-   <CLR=32,BOLD>3.js.map</CLR>  214 bytes       <CLR=BOLD>3</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+    <CLR=33,BOLD>main.js</CLR>    <CLR=33,BOLD>301 KiB</CLR>       <CLR=BOLD>0</CLR>  <CLR=32,BOLD>[emitted]</CLR>  <CLR=33,BOLD>[big]</CLR>  main
+       <CLR=32,BOLD>1.js</CLR>  182 bytes       <CLR=BOLD>1</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+       <CLR=32,BOLD>2.js</CLR>  319 bytes       <CLR=BOLD>2</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+       <CLR=32,BOLD>3.js</CLR>  262 bytes       <CLR=BOLD>3</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+<CLR=32,BOLD>main.js.map</CLR>   1.72 MiB       <CLR=BOLD>0</CLR>  <CLR=32,BOLD>[emitted]</CLR>         main
+   <CLR=32,BOLD>1.js.map</CLR>  156 bytes       <CLR=BOLD>1</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+   <CLR=32,BOLD>2.js.map</CLR>  210 bytes       <CLR=BOLD>2</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
+   <CLR=32,BOLD>3.js.map</CLR>  216 bytes       <CLR=BOLD>3</CLR>  <CLR=32,BOLD>[emitted]</CLR>         
 Entrypoint <CLR=BOLD>main</CLR> <CLR=33,BOLD>[big]</CLR> = <CLR=32,BOLD>main.js</CLR> <CLR=32,BOLD>main.js.map</CLR>
-[0] <CLR=BOLD>./d.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
-[1] <CLR=BOLD>./e.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
-[2] <CLR=BOLD>./b.js</CLR> 22 bytes {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
-[3] <CLR=BOLD>./c.js</CLR> 54 bytes {<CLR=33,BOLD>1</CLR>}<CLR=32,BOLD> [built]</CLR>
-[4] <CLR=BOLD>./index.js</CLR> 52 bytes {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
-[5] <CLR=BOLD>./a.js</CLR> 293 KiB {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
+[0] <CLR=BOLD>./index.js</CLR> 52 bytes {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
+[1] <CLR=BOLD>./a.js</CLR> 293 KiB {<CLR=33,BOLD>0</CLR>}<CLR=32,BOLD> [built]</CLR>
+[2] <CLR=BOLD>./b.js</CLR> 22 bytes {<CLR=33,BOLD>1</CLR>}<CLR=32,BOLD> [built]</CLR>
+[3] <CLR=BOLD>./c.js</CLR> 54 bytes {<CLR=33,BOLD>2</CLR>}<CLR=32,BOLD> [built]</CLR>
+[4] <CLR=BOLD>./d.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
+[5] <CLR=BOLD>./e.js</CLR> 22 bytes {<CLR=33,BOLD>3</CLR>}<CLR=32,BOLD> [built]</CLR>
 
 <CLR=33,BOLD>WARNING in asset size limit: The following asset(s) exceed the recommended size limit (244 KiB).
 This can impact web performance.
@@ -1878,51 +2012,51 @@ Entrypoints:
 `;
 
 exports[`StatsTestCases should print correct stats for preset-verbose 1`] = `
-"Hash: 2eb3274d0272da6a7a14
+"Hash: c85b33cafbe774edeafb
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
   Asset       Size  Chunks             Chunk Names
-   0.js  152 bytes       0  [emitted]  
-   1.js  289 bytes       1  [emitted]  
-main.js   8.29 KiB       2  [emitted]  main
-   3.js  227 bytes       3  [emitted]  
+main.js   8.29 KiB       0  [emitted]  main
+   1.js  152 bytes       1  [emitted]  
+   2.js  289 bytes       2  [emitted]  
+   3.js  232 bytes       3  [emitted]  
 Entrypoint main = main.js
-chunk    {0} 0.js 22 bytes <{2}> [rendered]
-    > ./b [4] ./index.js 2:0-16
- [2] ./b.js 22 bytes {0} [depth 1] [built]
-     ModuleConcatenation bailout: Module is not an ECMAScript module
-     amd require ./b [4] ./index.js 2:0-16
-     [4] Xms -> factory:Xms building:Xms = Xms
-chunk    {1} 1.js 54 bytes <{2}> >{3}< [rendered]
-    > ./c [4] ./index.js 3:0-16
- [3] ./c.js 54 bytes {1} [depth 1] [built]
-     ModuleConcatenation bailout: Module is not an ECMAScript module
-     amd require ./c [4] ./index.js 3:0-16
-     [4] Xms -> factory:Xms building:Xms = Xms
-chunk    {2} main.js (main) 73 bytes >{0}< >{1}< [entry] [rendered]
+chunk    {0} main.js (main) 73 bytes >{1}< >{2}< [entry] [rendered]
     > ./index main
- [4] ./index.js 51 bytes {2} [depth 0] [built]
+ [0] ./index.js 51 bytes {0} [depth 0] [built]
      ModuleConcatenation bailout: Module is not an ECMAScript module
      single entry ./index  main
      factory:Xms building:Xms = Xms
- [5] ./a.js 22 bytes {2} [depth 1] [built]
+ [1] ./a.js 22 bytes {0} [depth 1] [built]
+     ModuleConcatenation bailout: Module is not an ECMAScript module
+     cjs require ./a [0] ./index.js 1:0-14
+     [0] Xms -> factory:Xms building:Xms = Xms
+chunk    {1} 1.js 22 bytes <{0}> [rendered]
+    > ./b [0] ./index.js 2:0-16
+ [2] ./b.js 22 bytes {1} [depth 1] [built]
      ModuleConcatenation bailout: Module is not an ECMAScript module
-     cjs require ./a [4] ./index.js 1:0-14
-     [4] Xms -> factory:Xms building:Xms = Xms
-chunk    {3} 3.js 44 bytes <{1}> [rendered]
+     amd require ./b [0] ./index.js 2:0-16
+     [0] Xms -> factory:Xms building:Xms = Xms
+chunk    {2} 2.js 54 bytes <{0}> >{3}< [rendered]
+    > ./c [0] ./index.js 3:0-16
+ [3] ./c.js 54 bytes {2} [depth 1] [built]
+     ModuleConcatenation bailout: Module is not an ECMAScript module
+     amd require ./c [0] ./index.js 3:0-16
+     [0] Xms -> factory:Xms building:Xms = Xms
+chunk    {3} 3.js 44 bytes <{2}> [rendered]
     > [3] ./c.js 1:0-52
- [0] ./d.js 22 bytes {3} [depth 2] [built]
+ [4] ./d.js 22 bytes {3} [depth 2] [built]
      ModuleConcatenation bailout: Module is not an ECMAScript module
      require.ensure item ./d [3] ./c.js 1:0-52
-     [4] Xms -> [3] Xms -> factory:Xms building:Xms = Xms
- [1] ./e.js 22 bytes {3} [depth 2] [built]
+     [0] Xms -> [3] Xms -> factory:Xms building:Xms = Xms
+ [5] ./e.js 22 bytes {3} [depth 2] [built]
      ModuleConcatenation bailout: Module is not an ECMAScript module
      require.ensure item ./e [3] ./c.js 1:0-52
-     [4] Xms -> [3] Xms -> factory:Xms building:Xms = Xms"
+     [0] Xms -> [3] Xms -> factory:Xms building:Xms = Xms"
 `;
 
 exports[`StatsTestCases should print correct stats for resolve-plugin-context 1`] = `
-"Hash: f866085f4874b382c7c6
+"Hash: d16253da1f9a8f6c689f
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
     Asset      Size  Chunks             Chunk Names
@@ -1936,7 +2070,7 @@ Entrypoint main = bundle.js
 `;
 
 exports[`StatsTestCases should print correct stats for reverse-sort-modules 1`] = `
-"Hash: 8e1f6d7b7886c5f4617d
+"Hash: d0b29852af8ccc4949b7
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
   Asset      Size  Chunks             Chunk Names
@@ -1973,26 +2107,26 @@ Entrypoint e2 = runtime~e2.js e2.js"
 exports[`StatsTestCases should print correct stats for runtime-chunk-integration 1`] = `
 "Child base:
          Asset       Size  Chunks             Chunk Names
-          0.js  719 bytes       0  [emitted]  
-      main1.js  542 bytes       1  [emitted]  main1
+          0.js  728 bytes       0  [emitted]  
+      main1.js  539 bytes       1  [emitted]  main1
     runtime.js   8.75 KiB       2  [emitted]  runtime
     Entrypoint main1 = runtime.js main1.js
-    [0] ./b.js 20 bytes {0} [built]
-    [1] ./c.js 20 bytes {0} [built]
-    [2] ./d.js 20 bytes {0} [built]
-    [3] ./main1.js 66 bytes {1} [built]
+    [0] ./main1.js 66 bytes {1} [built]
+    [1] ./b.js 20 bytes {0} [built]
+    [2] ./c.js 20 bytes {0} [built]
+    [3] ./d.js 20 bytes {0} [built]
 Child manifest is named entry:
           Asset       Size  Chunks             Chunk Names
-           0.js  719 bytes       0  [emitted]  
+           0.js  737 bytes       0  [emitted]  
     manifest.js   9.06 KiB       1  [emitted]  manifest
-       main1.js  542 bytes       2  [emitted]  main1
+       main1.js  539 bytes       2  [emitted]  main1
     Entrypoint main1 = manifest.js main1.js
     Entrypoint manifest = manifest.js
-    [0] ./b.js 20 bytes {0} [built]
-    [1] ./c.js 20 bytes {0} [built]
-    [2] ./d.js 20 bytes {0} [built]
-    [3] ./main1.js 66 bytes {2} [built]
-    [4] ./f.js 20 bytes {1} [built]"
+    [0] ./main1.js 66 bytes {2} [built]
+    [1] ./f.js 20 bytes {1} [built]
+    [2] ./b.js 20 bytes {0} [built]
+    [3] ./c.js 20 bytes {0} [built]
+    [4] ./d.js 20 bytes {0} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for runtime-chunk-issue-7382 1`] = `
@@ -2006,135 +2140,135 @@ Entrypoint e2 = runtime.js e2.js"
 `;
 
 exports[`StatsTestCases should print correct stats for scope-hoisting-bailouts 1`] = `
-"Hash: df49e15bdf57c432360e
+"Hash: d7e4799958b26e135578
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
 Entrypoint index = index.js
 Entrypoint entry = entry.js
-[0] ./entry.js 32 bytes {1} {2} [built]
+[0] ./entry.js 32 bytes {0} {1} [built]
     ModuleConcatenation bailout: Module is an entry point
-[1] ./ref-from-cjs.js 45 bytes {1} [built]
+[1] ./ref-from-cjs.js 45 bytes {0} [built]
     ModuleConcatenation bailout: Module is referenced from these modules with unsupported syntax: ./cjs.js (referenced with cjs require)
-[2] external \\"external\\" 42 bytes {1} [built]
-    ModuleConcatenation bailout: Module is not an ECMAScript module
-[3] ./concatenated.js + 2 modules 116 bytes {0} [built]
-    ModuleConcatenation bailout: Cannot concat with external \\"external\\" (<- Module is not an ECMAScript module)
-    | ./concatenated.js 26 bytes [built]
-    |     ModuleConcatenation bailout: Module is referenced from these modules with unsupported syntax: ./index.js (referenced with import())
-    | ./concatenated1.js 37 bytes [built]
-    | ./concatenated2.js 48 bytes [built]
-[4] ./index.js 176 bytes {1} [built]
+[2] ./index.js 176 bytes {0} [built]
     ModuleConcatenation bailout: Module is an entry point
-[5] ./cjs.js 59 bytes {1} [built]
+[3] ./cjs.js 59 bytes {0} [built]
     ModuleConcatenation bailout: Module is not an ECMAScript module
-[6] ./eval.js 35 bytes {1} [built]
+[4] ./eval.js 35 bytes {0} [built]
     ModuleConcatenation bailout: Module uses eval()
-[7] ./injected-vars.js 40 bytes {1} [built]
+[5] ./injected-vars.js 40 bytes {0} [built]
     ModuleConcatenation bailout: Module uses injected variables (__dirname, __filename)
-[8] ./module-id.js 26 bytes {1} [built]
+[6] ./module-id.js 26 bytes {0} [built]
     ModuleConcatenation bailout: Module uses module.id
-[9] ./module-loaded.js 30 bytes {1} [built]
-    ModuleConcatenation bailout: Module uses module.loaded"
+[7] ./module-loaded.js 30 bytes {0} [built]
+    ModuleConcatenation bailout: Module uses module.loaded
+[8] external \\"external\\" 42 bytes {0} [built]
+    ModuleConcatenation bailout: Module is not an ECMAScript module
+[9] ./concatenated.js + 2 modules 116 bytes {2} [built]
+    ModuleConcatenation bailout: Cannot concat with external \\"external\\" (<- Module is not an ECMAScript module)
+    | ./concatenated.js 26 bytes [built]
+    |     ModuleConcatenation bailout: Module is referenced from these modules with unsupported syntax: ./index.js (referenced with import())
+    | ./concatenated1.js 37 bytes [built]
+    | ./concatenated2.js 48 bytes [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for scope-hoisting-multi 1`] = `
-"Hash: f47bea8ea571296b32b82a4cd6b69820dd6e8c36
+"Hash: 02301c60b99f76e0864b7ec4f288d7e597e59716
 Child
-    Hash: f47bea8ea571296b32b8
+    Hash: 02301c60b99f76e0864b
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
     Entrypoint first = vendor.js first.js
     Entrypoint second = vendor.js second.js
-     [0] ./common_lazy_shared.js 25 bytes {0} {1} {2} [built]
-     [1] ./common2.js 25 bytes {4} {5} [built]
-     [2] ./common_lazy.js 25 bytes {1} {2} [built]
-     [3] ./common.js 37 bytes {4} {5} [built]
-     [4] ./lazy_shared.js 31 bytes {0} [built]
-     [5] ./vendor.js 25 bytes {3} [built]
-     [6] ./lazy_first.js 55 bytes {2} [built]
-     [7] ./lazy_second.js 55 bytes {1} [built]
-     [8] ./first.js 207 bytes {4} [built]
-     [9] ./module_first.js 31 bytes {4} [built]
-    [10] ./second.js 177 bytes {5} [built]
+     [0] ./common2.js 25 bytes {1} {2} [built]
+     [1] ./common.js 37 bytes {1} {2} [built]
+     [2] ./vendor.js 25 bytes {0} [built]
+     [3] ./lazy_shared.js 31 bytes {4} [built]
+     [4] ./first.js 207 bytes {1} [built]
+     [5] ./module_first.js 31 bytes {1} [built]
+     [6] ./second.js 177 bytes {2} [built]
+     [7] ./lazy_first.js 55 bytes {3} [built]
+     [8] ./lazy_second.js 55 bytes {5} [built]
+     [9] ./common_lazy_shared.js 25 bytes {3} {4} {5} [built]
+    [10] ./common_lazy.js 25 bytes {3} {5} [built]
 Child
-    Hash: 2a4cd6b69820dd6e8c36
+    Hash: 7ec4f288d7e597e59716
     Time: Xms
     Built at: Thu Jan 01 1970 00:00:00 GMT
     Entrypoint first = vendor.js first.js
     Entrypoint second = vendor.js second.js
-    [0] ./common_lazy_shared.js 25 bytes {0} {1} {2} [built]
-    [1] ./common_lazy.js 25 bytes {1} {2} [built]
-    [2] ./common.js + 1 modules 62 bytes {4} {5} [built]
+    [0] ./common.js + 1 modules 62 bytes {1} {2} [built]
         | ./common.js 37 bytes [built]
         | ./common2.js 25 bytes [built]
-    [3] ./vendor.js 25 bytes {3} [built]
-    [4] ./lazy_shared.js 31 bytes {0} [built]
-        ModuleConcatenation bailout: Module is referenced from these modules with unsupported syntax: ./first.js (referenced with import()), ./second.js (referenced with import())
-    [5] ./lazy_second.js 55 bytes {1} [built]
-        ModuleConcatenation bailout: Module is referenced from these modules with unsupported syntax: ./second.js (referenced with import())
-    [6] ./second.js 177 bytes {5} [built]
+    [1] ./vendor.js 25 bytes {0} [built]
+    [2] ./second.js 177 bytes {2} [built]
         ModuleConcatenation bailout: Module is an entry point
-    [7] ./first.js + 1 modules 248 bytes {4} [built]
+    [3] ./common_lazy_shared.js 25 bytes {3} {4} {5} [built]
+    [4] ./common_lazy.js 25 bytes {3} {5} [built]
+    [5] ./lazy_shared.js 31 bytes {4} [built]
+        ModuleConcatenation bailout: Module is referenced from these modules with unsupported syntax: ./first.js (referenced with import()), ./second.js (referenced with import())
+    [6] ./first.js + 1 modules 248 bytes {1} [built]
         ModuleConcatenation bailout: Cannot concat with ./common.js
         ModuleConcatenation bailout: Cannot concat with ./vendor.js
         | ./first.js 207 bytes [built]
         |     ModuleConcatenation bailout: Module is an entry point
         | ./module_first.js 31 bytes [built]
-    [8] ./lazy_first.js 55 bytes {2} [built]
+    [7] ./lazy_second.js 55 bytes {5} [built]
+        ModuleConcatenation bailout: Module is referenced from these modules with unsupported syntax: ./second.js (referenced with import())
+    [8] ./lazy_first.js 55 bytes {3} [built]
         ModuleConcatenation bailout: Module is referenced from these modules with unsupported syntax: ./first.js (referenced with import())"
 `;
 
 exports[`StatsTestCases should print correct stats for side-effects-issue-7428 1`] = `
-"Hash: b1ef68bcfacb3ad18417
+"Hash: 3e32955fb068eb4a3d22
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
   Asset       Size  Chunks             Chunk Names
-   0.js  481 bytes       0  [emitted]  
-main.js   9.32 KiB       1  [emitted]  main
+main.js   9.35 KiB       0  [emitted]  main
+   1.js  481 bytes       1  [emitted]  
 Entrypoint main = main.js
-[0] ./components/src/CompAB/utils.js 97 bytes {1} [built]
-    harmony side effect evaluation ./utils [1] ./main.js + 1 modules 1:0-30
-    harmony import specifier ./utils [1] ./main.js + 1 modules 5:2-5
+[0] ./components/src/CompAB/index.js 87 bytes [built]
+    [no exports used]
+    harmony side effect evaluation ./CompAB [3] ./components/src/index.js 1:0-40
+    harmony export imported specifier ./CompAB [3] ./components/src/index.js 1:0-40
+    harmony export imported specifier ./CompAB [3] ./components/src/index.js 1:0-40
+[1] ./components/src/CompC/CompC.js 33 bytes [built]
+    [no exports used]
+    harmony side effect evaluation ./CompC [2] ./components/src/CompC/index.js 1:0-34
+    harmony export imported specifier ./CompC [2] ./components/src/CompC/index.js 1:0-34
+[2] ./components/src/CompC/index.js 34 bytes [built]
+    [no exports used]
+    harmony side effect evaluation ./CompC [3] ./components/src/index.js 2:0-43
+    harmony export imported specifier ./CompC [3] ./components/src/index.js 2:0-43
+[3] ./components/src/index.js 84 bytes [built]
+    [no exports used]
+    harmony side effect evaluation ./components [6] ./foo.js 1:0-37
+    harmony side effect evaluation ./components [7] ./main.js + 1 modules 1:0-44
+[4] ./components/src/CompAB/CompA.js 89 bytes {0} [built]
+    [only some exports used: default]
+    harmony side effect evaluation ./CompA [0] ./components/src/CompAB/index.js 1:0-43
+    harmony export imported specifier ./CompA [0] ./components/src/CompAB/index.js 1:0-43
+    harmony import specifier ./components  ./main.js 3:15-20 (skipped side-effect-free modules)
+    harmony import specifier ./components [6] ./foo.js 3:20-25 (skipped side-effect-free modules)
+[5] ./components/src/CompAB/utils.js 97 bytes {0} [built]
     harmony side effect evaluation ./utils [4] ./components/src/CompAB/CompA.js 1:0-35
     harmony import specifier ./utils [4] ./components/src/CompAB/CompA.js 5:5-12
-[1] ./main.js + 1 modules 231 bytes {1} [built]
+    harmony side effect evaluation ./utils [7] ./main.js + 1 modules 1:0-30
+    harmony import specifier ./utils [7] ./main.js + 1 modules 5:2-5
+[6] ./foo.js 101 bytes {1} [built]
+    import() ./foo  ./main.js 6:0-15
+[7] ./main.js + 1 modules 231 bytes {0} [built]
     single entry ./main.js  main
     | ./main.js 144 bytes [built]
     |     single entry ./main.js  main
     | ./components/src/CompAB/CompB.js 77 bytes [built]
     |     [only some exports used: default]
-    |     harmony import specifier ./components  ./main.js 4:15-20 (skipped side-effect-free modules)
-    |     harmony side effect evaluation ./CompB [7] ./components/src/CompAB/index.js 2:0-43
-    |     harmony export imported specifier ./CompB [7] ./components/src/CompAB/index.js 2:0-43
-[2] ./components/src/index.js 84 bytes [built]
-    [no exports used]
-    harmony side effect evaluation ./components [1] ./main.js + 1 modules 1:0-44
-    harmony side effect evaluation ./components [3] ./foo.js 1:0-37
-[3] ./foo.js 101 bytes {0} [built]
-    import() ./foo  ./main.js 6:0-15
-[4] ./components/src/CompAB/CompA.js 89 bytes {1} [built]
-    [only some exports used: default]
-    harmony import specifier ./components  ./main.js 3:15-20 (skipped side-effect-free modules)
-    harmony import specifier ./components [3] ./foo.js 3:20-25 (skipped side-effect-free modules)
-    harmony side effect evaluation ./CompA [7] ./components/src/CompAB/index.js 1:0-43
-    harmony export imported specifier ./CompA [7] ./components/src/CompAB/index.js 1:0-43
-[5] ./components/src/CompC/CompC.js 33 bytes [built]
-    [no exports used]
-    harmony side effect evaluation ./CompC [6] ./components/src/CompC/index.js 1:0-34
-    harmony export imported specifier ./CompC [6] ./components/src/CompC/index.js 1:0-34
-[6] ./components/src/CompC/index.js 34 bytes [built]
-    [no exports used]
-    harmony side effect evaluation ./CompC [2] ./components/src/index.js 2:0-43
-    harmony export imported specifier ./CompC [2] ./components/src/index.js 2:0-43
-[7] ./components/src/CompAB/index.js 87 bytes [built]
-    [no exports used]
-    harmony side effect evaluation ./CompAB [2] ./components/src/index.js 1:0-40
-    harmony export imported specifier ./CompAB [2] ./components/src/index.js 1:0-40
-    harmony export imported specifier ./CompAB [2] ./components/src/index.js 1:0-40"
+    |     harmony side effect evaluation ./CompB [0] ./components/src/CompAB/index.js 2:0-43
+    |     harmony export imported specifier ./CompB [0] ./components/src/CompAB/index.js 2:0-43
+    |     harmony import specifier ./components  ./main.js 4:15-20 (skipped side-effect-free modules)"
 `;
 
 exports[`StatsTestCases should print correct stats for side-effects-simple-unused 1`] = `
-"Hash: 98f9f698f299e2fa69de
+"Hash: 518ad50555bd6e64c28b
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
   Asset     Size  Chunks             Chunk Names
@@ -2153,7 +2287,7 @@ Entrypoint main = main.js
 `;
 
 exports[`StatsTestCases should print correct stats for simple 1`] = `
-"Hash: 06cc914b885215f96c5a
+"Hash: dae46aaa6722cda9498d
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
     Asset      Size  Chunks             Chunk Names
@@ -2163,7 +2297,7 @@ Entrypoint main = bundle.js
 `;
 
 exports[`StatsTestCases should print correct stats for simple-more-info 1`] = `
-"Hash: c8c226a954f967e61630
+"Hash: 008517b920c1aeb23c7e
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
     Asset      Size  Chunks             Chunk Names
@@ -2180,75 +2314,75 @@ exports[`StatsTestCases should print correct stats for split-chunks 1`] = `
     Entrypoint a = default/a.js
     Entrypoint b = default/b.js
     Entrypoint c = default/c.js
-    chunk    {0} default/vendors~async-a~async-b~async-c.js (vendors~async-a~async-b~async-c) 20 bytes <{9}> ={1}= ={2}= ={3}= ={5}= ={6}= ={7}= ={8}= >{2}< >{4}< [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b~async-c)
+    chunk    {0} default/vendors~async-a~async-b~async-c.js (vendors~async-a~async-b~async-c) 20 bytes <{4}> ={1}= ={2}= ={3}= ={8}= ={9}= ={10}= ={12}= >{2}< >{11}< [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b~async-c)
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [1] ./node_modules/x.js 20 bytes {0} {10} {11} {12} [built]
-    chunk    {1} default/async-a~async-b~async-c.js (async-a~async-b~async-c) 20 bytes <{9}> ={0}= ={2}= ={3}= ={5}= ={6}= ={7}= ={8}= >{2}< >{4}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
+     [1] ./node_modules/x.js 20 bytes {0} {5} {6} {7} [built]
+    chunk    {1} default/async-a~async-b~async-c.js (async-a~async-b~async-c) 20 bytes <{4}> ={0}= ={2}= ={3}= ={8}= ={9}= ={10}= ={12}= >{2}< >{11}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-    chunk    {2} default/async-b~async-c~async-g.js (async-b~async-c~async-g) 20 bytes <{0}> <{1}> <{10}> <{3}> <{5}> <{9}> ={0}= ={1}= ={3}= ={4}= ={6}= ={7}= ={8}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g)
+     [0] ./d.js 20 bytes {1} {5} {6} {7} [built]
+    chunk    {2} default/async-b~async-c~async-g.js (async-b~async-c~async-g) 20 bytes <{0}> <{1}> <{3}> <{4}> <{5}> <{8}> ={0}= ={1}= ={3}= ={9}= ={10}= ={11}= ={12}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g)
         > ./g [] 6:0-47
         > ./g [] 6:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [2] ./f.js 20 bytes {2} {11} {12} [built]
-    chunk    {3} default/vendors~async-a~async-b.js (vendors~async-a~async-b) 20 bytes <{9}> ={0}= ={1}= ={2}= ={5}= ={6}= >{2}< >{4}< [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b)
+     [2] ./f.js 20 bytes {2} {6} {7} [built]
+    chunk    {3} default/vendors~async-a~async-b.js (vendors~async-a~async-b) 20 bytes <{4}> ={0}= ={1}= ={2}= ={8}= ={9}= >{2}< >{11}< [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b)
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
-     [3] ./node_modules/y.js 20 bytes {3} {10} {11} [built]
-    chunk    {4} default/async-g.js (async-g) 34 bytes <{0}> <{1}> <{10}> <{3}> <{5}> ={2}= [rendered]
-        > ./g [] 6:0-47
-        > ./g [] 6:0-47
-     [9] ./g.js 34 bytes {4} [built]
-    chunk    {5} default/async-a.js (async-a) 156 bytes <{9}> ={0}= ={1}= ={3}= >{2}< >{4}< [rendered]
-        > ./a [8] ./index.js 1:0-47
-     [7] ./a.js + 1 modules 156 bytes {5} {10} [built]
-         | ./a.js 121 bytes [built]
-         | ./e.js 20 bytes [built]
-    chunk    {6} default/async-b.js (async-b) 72 bytes <{9}> ={0}= ={1}= ={2}= ={3}= [rendered]
-        > ./b [8] ./index.js 2:0-47
-     [5] ./b.js 72 bytes {6} {11} [built]
-    chunk    {7} default/async-c.js (async-c) 72 bytes <{9}> ={0}= ={1}= ={2}= ={8}= [rendered]
-        > ./c [8] ./index.js 3:0-47
-     [6] ./c.js 72 bytes {7} {12} [built]
-    chunk    {8} default/vendors~async-c.js (vendors~async-c) 20 bytes <{9}> ={0}= ={1}= ={2}= ={7}= [rendered] split chunk (cache group: vendors) (name: vendors~async-c)
-        > ./c [8] ./index.js 3:0-47
-     [4] ./node_modules/z.js 20 bytes {8} {12} [built]
-    chunk    {9} default/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{5}< >{6}< >{7}< >{8}< [entry] [rendered]
+     [3] ./node_modules/y.js 20 bytes {3} {5} {6} [built]
+    chunk    {4} default/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{8}< >{9}< >{10}< >{12}< [entry] [rendered]
         > ./ main
-     [8] ./index.js 147 bytes {9} [built]
-    chunk   {10} default/a.js (a) 216 bytes >{2}< >{4}< [entry] [rendered]
+     [8] ./index.js 147 bytes {4} [built]
+    chunk    {5} default/a.js (a) 216 bytes >{2}< >{11}< [entry] [rendered]
         > ./a a
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./node_modules/x.js 20 bytes {0} {10} {11} {12} [built]
-     [3] ./node_modules/y.js 20 bytes {3} {10} {11} [built]
-     [7] ./a.js + 1 modules 156 bytes {5} {10} [built]
+     [0] ./d.js 20 bytes {1} {5} {6} {7} [built]
+     [1] ./node_modules/x.js 20 bytes {0} {5} {6} {7} [built]
+     [3] ./node_modules/y.js 20 bytes {3} {5} {6} [built]
+     [6] ./a.js + 1 modules 156 bytes {5} {8} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk   {11} default/b.js (b) 152 bytes [entry] [rendered]
+    chunk    {6} default/b.js (b) 152 bytes [entry] [rendered]
         > ./b b
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./node_modules/x.js 20 bytes {0} {10} {11} {12} [built]
-     [2] ./f.js 20 bytes {2} {11} {12} [built]
-     [3] ./node_modules/y.js 20 bytes {3} {10} {11} [built]
-     [5] ./b.js 72 bytes {6} {11} [built]
-    chunk   {12} default/c.js (c) 152 bytes [entry] [rendered]
+     [0] ./d.js 20 bytes {1} {5} {6} {7} [built]
+     [1] ./node_modules/x.js 20 bytes {0} {5} {6} {7} [built]
+     [2] ./f.js 20 bytes {2} {6} {7} [built]
+     [3] ./node_modules/y.js 20 bytes {3} {5} {6} [built]
+     [4] ./b.js 72 bytes {6} {9} [built]
+    chunk    {7} default/c.js (c) 152 bytes [entry] [rendered]
         > ./c c
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./node_modules/x.js 20 bytes {0} {10} {11} {12} [built]
-     [2] ./f.js 20 bytes {2} {11} {12} [built]
-     [4] ./node_modules/z.js 20 bytes {8} {12} [built]
-     [6] ./c.js 72 bytes {7} {12} [built]
+     [0] ./d.js 20 bytes {1} {5} {6} {7} [built]
+     [1] ./node_modules/x.js 20 bytes {0} {5} {6} {7} [built]
+     [2] ./f.js 20 bytes {2} {6} {7} [built]
+     [5] ./c.js 72 bytes {7} {10} [built]
+     [7] ./node_modules/z.js 20 bytes {7} {12} [built]
+    chunk    {8} default/async-a.js (async-a) 156 bytes <{4}> ={0}= ={1}= ={3}= >{2}< >{11}< [rendered]
+        > ./a [8] ./index.js 1:0-47
+     [6] ./a.js + 1 modules 156 bytes {5} {8} [built]
+         | ./a.js 121 bytes [built]
+         | ./e.js 20 bytes [built]
+    chunk    {9} default/async-b.js (async-b) 72 bytes <{4}> ={0}= ={1}= ={2}= ={3}= [rendered]
+        > ./b [8] ./index.js 2:0-47
+     [4] ./b.js 72 bytes {6} {9} [built]
+    chunk   {10} default/async-c.js (async-c) 72 bytes <{4}> ={0}= ={1}= ={2}= ={12}= [rendered]
+        > ./c [8] ./index.js 3:0-47
+     [5] ./c.js 72 bytes {7} {10} [built]
+    chunk   {11} default/async-g.js (async-g) 34 bytes <{0}> <{1}> <{3}> <{5}> <{8}> ={2}= [rendered]
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+     [9] ./g.js 34 bytes {11} [built]
+    chunk   {12} default/vendors~async-c.js (vendors~async-c) 20 bytes <{4}> ={0}= ={1}= ={2}= ={10}= [rendered] split chunk (cache group: vendors) (name: vendors~async-c)
+        > ./c [8] ./index.js 3:0-47
+     [7] ./node_modules/z.js 20 bytes {7} {12} [built]
 Child all-chunks:
     Entrypoint main = default/main.js
     Entrypoint a = default/vendors~a~async-a~async-b~async-c~b~c.js default/vendors~a~async-a~async-b~b.js default/a.js
     Entrypoint b = default/vendors~a~async-a~async-b~async-c~b~c.js default/vendors~a~async-a~async-b~b.js default/b.js
     Entrypoint c = default/vendors~a~async-a~async-b~async-c~b~c.js default/vendors~async-c~c.js default/c.js
-    chunk    {0} default/vendors~a~async-a~async-b~async-c~b~c.js (vendors~a~async-a~async-b~async-c~b~c) 20 bytes <{9}> ={1}= ={10}= ={11}= ={12}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~async-c~b~c)
+    chunk    {0} default/vendors~a~async-a~async-b~async-c~b~c.js (vendors~a~async-a~async-b~async-c~b~c) 20 bytes <{5}> ={1}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= ={9}= ={10}= ={11}= >{3}< >{12}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~async-c~b~c)
         > ./a a
         > ./b b
         > ./c c
@@ -2256,437 +2390,621 @@ Child all-chunks:
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
      [2] ./node_modules/x.js 20 bytes {0} [built]
-    chunk    {1} default/async-a~async-b~async-c.js (async-a~async-b~async-c) 20 bytes <{9}> ={0}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
+    chunk    {1} default/vendors~a~async-a~async-b~b.js (vendors~a~async-a~async-b~b) 20 bytes <{5}> ={0}= ={2}= ={3}= ={6}= ={7}= ={9}= ={10}= >{3}< >{12}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~b)
+        > ./a a
+        > ./b b
+        > ./a [8] ./index.js 1:0-47
+        > ./b [8] ./index.js 2:0-47
+     [3] ./node_modules/y.js 20 bytes {1} [built]
+    chunk    {2} default/async-a~async-b~async-c.js (async-a~async-b~async-c) 20 bytes <{5}> ={0}= ={1}= ={3}= ={4}= ={9}= ={10}= ={11}= >{3}< >{12}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-    chunk    {2} default/async-b~async-c~async-g.js (async-b~async-c~async-g) 20 bytes <{0}> <{1}> <{10}> <{3}> <{6}> <{9}> ={0}= ={1}= ={3}= ={4}= ={5}= ={7}= ={8}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g)
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+    chunk    {3} default/async-b~async-c~async-g.js (async-b~async-c~async-g) 20 bytes <{0}> <{1}> <{2}> <{5}> <{6}> <{9}> ={0}= ={1}= ={2}= ={4}= ={10}= ={11}= ={12}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g)
         > ./g [] 6:0-47
         > ./g [] 6:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-    chunk    {3} default/vendors~a~async-a~async-b~b.js (vendors~a~async-a~async-b~b) 20 bytes <{9}> ={0}= ={1}= ={10}= ={11}= ={2}= ={6}= ={7}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~b)
-        > ./a a
-        > ./b b
-        > ./a [8] ./index.js 1:0-47
-        > ./b [8] ./index.js 2:0-47
-     [3] ./node_modules/y.js 20 bytes {3} [built]
-    chunk    {4} default/vendors~async-c~c.js (vendors~async-c~c) 20 bytes <{9}> ={0}= ={1}= ={12}= ={2}= ={8}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~c)
+     [1] ./f.js 20 bytes {3} {7} {8} [built]
+    chunk    {4} default/vendors~async-c~c.js (vendors~async-c~c) 20 bytes <{5}> ={0}= ={2}= ={3}= ={8}= ={11}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~c)
         > ./c c
         > ./c [8] ./index.js 3:0-47
      [7] ./node_modules/z.js 20 bytes {4} [built]
-    chunk    {5} default/async-g.js (async-g) 34 bytes <{0}> <{1}> <{10}> <{3}> <{6}> ={2}= [rendered]
-        > ./g [] 6:0-47
-        > ./g [] 6:0-47
-     [9] ./g.js 34 bytes {5} [built]
-    chunk    {6} default/async-a.js (async-a) 156 bytes <{9}> ={0}= ={1}= ={3}= >{2}< >{5}< [rendered]
-        > ./a [8] ./index.js 1:0-47
-     [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
-         | ./a.js 121 bytes [built]
-         | ./e.js 20 bytes [built]
-    chunk    {7} default/async-b.js (async-b) 72 bytes <{9}> ={0}= ={1}= ={2}= ={3}= [rendered]
-        > ./b [8] ./index.js 2:0-47
-     [4] ./b.js 72 bytes {7} {11} [built]
-    chunk    {8} default/async-c.js (async-c) 72 bytes <{9}> ={0}= ={1}= ={2}= ={4}= [rendered]
-        > ./c [8] ./index.js 3:0-47
-     [5] ./c.js 72 bytes {8} {12} [built]
-    chunk    {9} default/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{6}< >{7}< >{8}< [entry] [rendered]
+    chunk    {5} default/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{9}< >{10}< >{11}< [entry] [rendered]
         > ./ main
-     [8] ./index.js 147 bytes {9} [built]
-    chunk   {10} default/a.js (a) 176 bytes ={0}= ={3}= >{2}< >{5}< [entry] [rendered]
+     [8] ./index.js 147 bytes {5} [built]
+    chunk    {6} default/a.js (a) 176 bytes ={0}= ={1}= >{3}< >{12}< [entry] [rendered]
         > ./a a
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+     [6] ./a.js + 1 modules 156 bytes {6} {9} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk   {11} default/b.js (b) 112 bytes ={0}= ={3}= [entry] [rendered]
+    chunk    {7} default/b.js (b) 112 bytes ={0}= ={1}= [entry] [rendered]
         > ./b b
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-     [4] ./b.js 72 bytes {7} {11} [built]
-    chunk   {12} default/c.js (c) 112 bytes ={0}= ={4}= [entry] [rendered]
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+     [1] ./f.js 20 bytes {3} {7} {8} [built]
+     [4] ./b.js 72 bytes {7} {10} [built]
+    chunk    {8} default/c.js (c) 112 bytes ={0}= ={4}= [entry] [rendered]
         > ./c c
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-     [5] ./c.js 72 bytes {8} {12} [built]
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+     [1] ./f.js 20 bytes {3} {7} {8} [built]
+     [5] ./c.js 72 bytes {8} {11} [built]
+    chunk    {9} default/async-a.js (async-a) 156 bytes <{5}> ={0}= ={1}= ={2}= >{3}< >{12}< [rendered]
+        > ./a [8] ./index.js 1:0-47
+     [6] ./a.js + 1 modules 156 bytes {6} {9} [built]
+         | ./a.js 121 bytes [built]
+         | ./e.js 20 bytes [built]
+    chunk   {10} default/async-b.js (async-b) 72 bytes <{5}> ={0}= ={1}= ={2}= ={3}= [rendered]
+        > ./b [8] ./index.js 2:0-47
+     [4] ./b.js 72 bytes {7} {10} [built]
+    chunk   {11} default/async-c.js (async-c) 72 bytes <{5}> ={0}= ={2}= ={3}= ={4}= [rendered]
+        > ./c [8] ./index.js 3:0-47
+     [5] ./c.js 72 bytes {8} {11} [built]
+    chunk   {12} default/async-g.js (async-g) 34 bytes <{0}> <{1}> <{2}> <{6}> <{9}> ={3}= [rendered]
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+     [9] ./g.js 34 bytes {12} [built]
 Child manual:
     Entrypoint main = default/main.js
     Entrypoint a = default/vendors.js default/a.js
     Entrypoint b = default/vendors.js default/b.js
     Entrypoint c = default/vendors.js default/c.js
-    chunk    {0} default/vendors.js (vendors) 112 bytes <{5}> ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{1}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors)
+    chunk    {0} default/vendors.js (vendors) 112 bytes <{1}> ={2}= ={3}= ={4}= ={5}= ={6}= ={7}= >{8}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors)
         > ./a a
         > ./b b
         > ./c c
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-      [2] ./node_modules/x.js 20 bytes {0} [built]
-      [3] ./node_modules/y.js 20 bytes {0} [built]
-      [6] ./node_modules/z.js 20 bytes {0} [built]
-     [10] multi x y z 52 bytes {0} [built]
-    chunk    {1} default/async-g.js (async-g) 54 bytes <{0}> <{2}> <{6}> [rendered]
-        > ./g [] 6:0-47
-        > ./g [] 6:0-47
-     [1] ./f.js 20 bytes {1} {3} {4} {7} {8} [built]
-     [9] ./g.js 34 bytes {1} [built]
-    chunk    {2} default/async-a.js (async-a) 176 bytes <{5}> ={0}= >{1}< [rendered]
-        > ./a [8] ./index.js 1:0-47
-     [0] ./d.js 20 bytes {2} {3} {4} {6} {7} {8} [built]
-     [7] ./a.js + 1 modules 156 bytes {2} {6} [built]
-         | ./a.js 121 bytes [built]
-         | ./e.js 20 bytes [built]
-    chunk    {3} default/async-b.js (async-b) 112 bytes <{5}> ={0}= [rendered]
-        > ./b [8] ./index.js 2:0-47
-     [0] ./d.js 20 bytes {2} {3} {4} {6} {7} {8} [built]
-     [1] ./f.js 20 bytes {1} {3} {4} {7} {8} [built]
-     [4] ./b.js 72 bytes {3} {7} [built]
-    chunk    {4} default/async-c.js (async-c) 112 bytes <{5}> ={0}= [rendered]
-        > ./c [8] ./index.js 3:0-47
-     [0] ./d.js 20 bytes {2} {3} {4} {6} {7} {8} [built]
-     [1] ./f.js 20 bytes {1} {3} {4} {7} {8} [built]
-     [5] ./c.js 72 bytes {4} {8} [built]
-    chunk    {5} default/main.js (main) 147 bytes >{0}< >{2}< >{3}< >{4}< [entry] [rendered]
+     [1] ./node_modules/x.js 20 bytes {0} [built]
+     [3] ./node_modules/y.js 20 bytes {0} [built]
+     [6] ./node_modules/z.js 20 bytes {0} [built]
+     [9] multi x y z 52 bytes {0} [built]
+    chunk    {1} default/main.js (main) 147 bytes >{0}< >{5}< >{6}< >{7}< [entry] [rendered]
         > ./ main
-     [8] ./index.js 147 bytes {5} [built]
-    chunk    {6} default/a.js (a) 176 bytes ={0}= >{1}< [entry] [rendered]
+     [8] ./index.js 147 bytes {1} [built]
+    chunk    {2} default/a.js (a) 176 bytes ={0}= >{8}< [entry] [rendered]
         > ./a a
-     [0] ./d.js 20 bytes {2} {3} {4} {6} {7} {8} [built]
-     [7] ./a.js + 1 modules 156 bytes {2} {6} [built]
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [7] ./a.js + 1 modules 156 bytes {2} {5} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk    {7} default/b.js (b) 112 bytes ={0}= [entry] [rendered]
+    chunk    {3} default/b.js (b) 112 bytes ={0}= [entry] [rendered]
         > ./b b
-     [0] ./d.js 20 bytes {2} {3} {4} {6} {7} {8} [built]
-     [1] ./f.js 20 bytes {1} {3} {4} {7} {8} [built]
-     [4] ./b.js 72 bytes {3} {7} [built]
-    chunk    {8} default/c.js (c) 112 bytes ={0}= [entry] [rendered]
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [2] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [4] ./b.js 72 bytes {3} {6} [built]
+    chunk    {4} default/c.js (c) 112 bytes ={0}= [entry] [rendered]
         > ./c c
-     [0] ./d.js 20 bytes {2} {3} {4} {6} {7} {8} [built]
-     [1] ./f.js 20 bytes {1} {3} {4} {7} {8} [built]
-     [5] ./c.js 72 bytes {4} {8} [built]
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [2] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [5] ./c.js 72 bytes {4} {7} [built]
+    chunk    {5} default/async-a.js (async-a) 176 bytes <{1}> ={0}= >{8}< [rendered]
+        > ./a [8] ./index.js 1:0-47
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [7] ./a.js + 1 modules 156 bytes {2} {5} [built]
+         | ./a.js 121 bytes [built]
+         | ./e.js 20 bytes [built]
+    chunk    {6} default/async-b.js (async-b) 112 bytes <{1}> ={0}= [rendered]
+        > ./b [8] ./index.js 2:0-47
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [2] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [4] ./b.js 72 bytes {3} {6} [built]
+    chunk    {7} default/async-c.js (async-c) 112 bytes <{1}> ={0}= [rendered]
+        > ./c [8] ./index.js 3:0-47
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [2] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [5] ./c.js 72 bytes {4} {7} [built]
+    chunk    {8} default/async-g.js (async-g) 54 bytes <{0}> <{2}> <{5}> [rendered]
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+      [2] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [10] ./g.js 34 bytes {8} [built]
 Child name-too-long:
     Entrypoint main = main.js
     Entrypoint aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccc~50ebc41f.js vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.js aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccc~18066793.js async-a.js aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.js
     Entrypoint bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb = vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccc~50ebc41f.js vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.js aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccc~18066793.js async-b~async-c~async-g~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccccccccccccccccccc.js async-b.js bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.js
     Entrypoint cccccccccccccccccccccccccccccc = vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccc~50ebc41f.js vendors~async-c~cccccccccccccccccccccccccccccc.js aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccc~18066793.js async-b~async-c~async-g~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccccccccccccccccccc.js async-c.js cccccccccccccccccccccccccccccc.js
-    chunk    {0} vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccc~50ebc41f.js (vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccc~50ebc41f) 20 bytes <{9}> ={1}= ={10}= ={11}= ={12}= ={2}= ={3}= ={4}= ={5}= ={6}= ={7}= >{2}< >{8}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccc~50ebc41f)
+    chunk    {0} vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccc~50ebc41f.js (vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccc~50ebc41f) 20 bytes <{8}> ={1}= ={2}= ={3}= ={4}= ={5}= ={6}= ={7}= ={9}= ={10}= ={11}= >{2}< >{12}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccc~50ebc41f)
         > ./a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
         > ./b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
         > ./c cccccccccccccccccccccccccccccc
         > ./a [4] ./index.js 1:0-47
         > ./b [4] ./index.js 2:0-47
         > ./c [4] ./index.js 3:0-47
-     [2] ./node_modules/x.js 20 bytes {0} [built]
-    chunk    {1} aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccc~18066793.js (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccc~18066793) 20 bytes <{9}> ={0}= ={10}= ={11}= ={12}= ={2}= ={3}= ={4}= ={5}= ={6}= ={7}= >{2}< >{8}< [initial] [rendered] split chunk (cache group: default) (name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccc~18066793)
+     [1] ./node_modules/x.js 20 bytes {0} [built]
+    chunk    {1} aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccc~18066793.js (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccc~18066793) 20 bytes <{8}> ={0}= ={2}= ={3}= ={4}= ={5}= ={6}= ={7}= ={9}= ={10}= ={11}= >{2}< >{12}< [initial] [rendered] split chunk (cache group: default) (name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccc~18066793)
         > ./a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
         > ./b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
         > ./c cccccccccccccccccccccccccccccc
         > ./a [4] ./index.js 1:0-47
         > ./b [4] ./index.js 2:0-47
         > ./c [4] ./index.js 3:0-47
-     [1] ./d.js 20 bytes {1} [built]
-    chunk    {2} async-b~async-c~async-g~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccccccccccccccccccc.js (async-b~async-c~async-g~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccccccccccccccccccc) 20 bytes <{0}> <{1}> <{10}> <{3}> <{4}> <{9}> ={0}= ={1}= ={11}= ={12}= ={3}= ={5}= ={6}= ={7}= ={8}= [initial] [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccccccccccccccccccc)
+     [0] ./d.js 20 bytes {1} [built]
+    chunk    {2} async-b~async-c~async-g~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccccccccccccccccccc.js (async-b~async-c~async-g~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccccccccccccccccccc) 20 bytes <{0}> <{1}> <{3}> <{4}> <{8}> <{9}> ={0}= ={1}= ={3}= ={5}= ={6}= ={7}= ={10}= ={11}= ={12}= [initial] [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccccccccccccccccccc)
         > ./g [] 6:0-47
         > ./g [] 6:0-47
         > ./b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
         > ./c cccccccccccccccccccccccccccccc
         > ./b [4] ./index.js 2:0-47
         > ./c [4] ./index.js 3:0-47
-     [0] ./f.js 20 bytes {2} [built]
-    chunk    {3} vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.js (vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) 20 bytes <{9}> ={0}= ={1}= ={10}= ={11}= ={2}= ={4}= ={5}= >{2}< >{8}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb)
+     [2] ./f.js 20 bytes {2} [built]
+    chunk    {3} vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.js (vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) 20 bytes <{8}> ={0}= ={1}= ={2}= ={4}= ={5}= ={9}= ={10}= >{2}< >{12}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb)
         > ./a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
         > ./b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
         > ./a [4] ./index.js 1:0-47
         > ./b [4] ./index.js 2:0-47
      [3] ./node_modules/y.js 20 bytes {3} [built]
-    chunk    {4} async-a.js (async-a) 156 bytes <{9}> ={0}= ={1}= ={10}= ={3}= >{2}< >{8}< [initial] [rendered] reused as split chunk (cache group: default)
+    chunk    {4} async-a.js (async-a) 156 bytes <{8}> ={0}= ={1}= ={3}= ={9}= >{2}< >{12}< [initial] [rendered] reused as split chunk (cache group: default)
         > ./a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
         > ./a [4] ./index.js 1:0-47
      [8] ./a.js + 1 modules 156 bytes {4} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk    {5} async-b.js (async-b) 72 bytes <{9}> ={0}= ={1}= ={11}= ={2}= ={3}= [initial] [rendered] reused as split chunk (cache group: default)
+    chunk    {5} async-b.js (async-b) 72 bytes <{8}> ={0}= ={1}= ={2}= ={3}= ={10}= [initial] [rendered] reused as split chunk (cache group: default)
         > ./b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
         > ./b [4] ./index.js 2:0-47
      [5] ./b.js 72 bytes {5} [built]
-    chunk    {6} async-c.js (async-c) 72 bytes <{9}> ={0}= ={1}= ={12}= ={2}= ={7}= [initial] [rendered] reused as split chunk (cache group: default)
+    chunk    {6} async-c.js (async-c) 72 bytes <{8}> ={0}= ={1}= ={2}= ={7}= ={11}= [initial] [rendered] reused as split chunk (cache group: default)
         > ./c cccccccccccccccccccccccccccccc
         > ./c [4] ./index.js 3:0-47
      [6] ./c.js 72 bytes {6} [built]
-    chunk    {7} vendors~async-c~cccccccccccccccccccccccccccccc.js (vendors~async-c~cccccccccccccccccccccccccccccc) 20 bytes <{9}> ={0}= ={1}= ={12}= ={2}= ={6}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~cccccccccccccccccccccccccccccc)
+    chunk    {7} vendors~async-c~cccccccccccccccccccccccccccccc.js (vendors~async-c~cccccccccccccccccccccccccccccc) 20 bytes <{8}> ={0}= ={1}= ={2}= ={6}= ={11}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~cccccccccccccccccccccccccccccc)
         > ./c cccccccccccccccccccccccccccccc
         > ./c [4] ./index.js 3:0-47
      [7] ./node_modules/z.js 20 bytes {7} [built]
-    chunk    {8} async-g.js (async-g) 34 bytes <{0}> <{1}> <{10}> <{3}> <{4}> ={2}= [rendered]
-        > ./g [] 6:0-47
-        > ./g [] 6:0-47
-     [9] ./g.js 34 bytes {8} [built]
-    chunk    {9} main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{5}< >{6}< >{7}< [entry] [rendered]
+    chunk    {8} main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{5}< >{6}< >{7}< [entry] [rendered]
         > ./ main
-     [4] ./index.js 147 bytes {9} [built]
-    chunk   {10} aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.js (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) 0 bytes ={0}= ={1}= ={3}= ={4}= >{2}< >{8}< [entry] [rendered]
+     [4] ./index.js 147 bytes {8} [built]
+    chunk    {9} aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.js (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) 0 bytes ={0}= ={1}= ={3}= ={4}= >{2}< >{12}< [entry] [rendered]
         > ./a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    chunk   {11} bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.js (bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) 0 bytes ={0}= ={1}= ={2}= ={3}= ={5}= [entry] [rendered]
+    chunk   {10} bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.js (bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) 0 bytes ={0}= ={1}= ={2}= ={3}= ={5}= [entry] [rendered]
         > ./b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-    chunk   {12} cccccccccccccccccccccccccccccc.js (cccccccccccccccccccccccccccccc) 0 bytes ={0}= ={1}= ={2}= ={6}= ={7}= [entry] [rendered]
+    chunk   {11} cccccccccccccccccccccccccccccc.js (cccccccccccccccccccccccccccccc) 0 bytes ={0}= ={1}= ={2}= ={6}= ={7}= [entry] [rendered]
         > ./c cccccccccccccccccccccccccccccc
+    chunk   {12} async-g.js (async-g) 34 bytes <{0}> <{1}> <{3}> <{4}> <{9}> ={2}= [rendered]
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+     [9] ./g.js 34 bytes {12} [built]
 Child custom-chunks-filter:
     Entrypoint main = default/main.js
     Entrypoint a = default/a.js
     Entrypoint b = default/vendors~async-a~async-b~async-c~b~c.js default/vendors~async-a~async-b~b.js default/b.js
     Entrypoint c = default/vendors~async-a~async-b~async-c~b~c.js default/vendors~async-c~c.js default/c.js
-    chunk    {0} default/vendors~async-a~async-b~async-c~b~c.js (vendors~async-a~async-b~async-c~b~c) 20 bytes <{9}> ={1}= ={11}= ={12}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b~async-c~b~c)
+    chunk    {0} default/vendors~async-a~async-b~async-c~b~c.js (vendors~async-a~async-b~async-c~b~c) 20 bytes <{5}> ={1}= ={2}= ={3}= ={4}= ={7}= ={8}= ={9}= ={10}= ={11}= >{3}< >{12}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b~async-c~b~c)
         > ./b b
         > ./c c
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [2] ./node_modules/x.js 20 bytes {0} {10} [built]
-    chunk    {1} default/async-a~async-b~async-c.js (async-a~async-b~async-c) 20 bytes <{9}> ={0}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
+     [1] ./node_modules/x.js 20 bytes {0} {6} [built]
+    chunk    {1} default/vendors~async-a~async-b~b.js (vendors~async-a~async-b~b) 20 bytes <{5}> ={0}= ={2}= ={3}= ={7}= ={9}= ={10}= >{3}< >{12}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b~b)
+        > ./b b
+        > ./a [8] ./index.js 1:0-47
+        > ./b [8] ./index.js 2:0-47
+     [3] ./node_modules/y.js 20 bytes {1} {6} [built]
+    chunk    {2} default/async-a~async-b~async-c.js (async-a~async-b~async-c) 20 bytes <{5}> ={0}= ={1}= ={3}= ={4}= ={9}= ={10}= ={11}= >{3}< >{12}< [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-    chunk    {2} default/async-b~async-c~async-g.js (async-b~async-c~async-g) 20 bytes <{0}> <{1}> <{10}> <{3}> <{6}> <{9}> ={0}= ={1}= ={3}= ={4}= ={5}= ={7}= ={8}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g)
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+    chunk    {3} default/async-b~async-c~async-g.js (async-b~async-c~async-g) 20 bytes <{0}> <{1}> <{2}> <{5}> <{6}> <{9}> ={0}= ={1}= ={2}= ={4}= ={10}= ={11}= ={12}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g)
         > ./g [] 6:0-47
         > ./g [] 6:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-    chunk    {3} default/vendors~async-a~async-b~b.js (vendors~async-a~async-b~b) 20 bytes <{9}> ={0}= ={1}= ={11}= ={2}= ={6}= ={7}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b~b)
-        > ./b b
-        > ./a [8] ./index.js 1:0-47
-        > ./b [8] ./index.js 2:0-47
-     [3] ./node_modules/y.js 20 bytes {3} {10} [built]
-    chunk    {4} default/vendors~async-c~c.js (vendors~async-c~c) 20 bytes <{9}> ={0}= ={1}= ={12}= ={2}= ={8}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~c)
+     [2] ./f.js 20 bytes {3} {7} {8} [built]
+    chunk    {4} default/vendors~async-c~c.js (vendors~async-c~c) 20 bytes <{5}> ={0}= ={2}= ={3}= ={8}= ={11}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~c)
         > ./c c
         > ./c [8] ./index.js 3:0-47
      [7] ./node_modules/z.js 20 bytes {4} [built]
-    chunk    {5} default/async-g.js (async-g) 34 bytes <{0}> <{1}> <{10}> <{3}> <{6}> ={2}= [rendered]
-        > ./g [] 6:0-47
-        > ./g [] 6:0-47
-     [9] ./g.js 34 bytes {5} [built]
-    chunk    {6} default/async-a.js (async-a) 156 bytes <{9}> ={0}= ={1}= ={3}= >{2}< >{5}< [rendered]
-        > ./a [8] ./index.js 1:0-47
-     [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
-         | ./a.js 121 bytes [built]
-         | ./e.js 20 bytes [built]
-    chunk    {7} default/async-b.js (async-b) 72 bytes <{9}> ={0}= ={1}= ={2}= ={3}= [rendered]
-        > ./b [8] ./index.js 2:0-47
-     [4] ./b.js 72 bytes {7} {11} [built]
-    chunk    {8} default/async-c.js (async-c) 72 bytes <{9}> ={0}= ={1}= ={2}= ={4}= [rendered]
-        > ./c [8] ./index.js 3:0-47
-     [5] ./c.js 72 bytes {8} {12} [built]
-    chunk    {9} default/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{6}< >{7}< >{8}< [entry] [rendered]
+    chunk    {5} default/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{9}< >{10}< >{11}< [entry] [rendered]
         > ./ main
-     [8] ./index.js 147 bytes {9} [built]
-    chunk   {10} default/a.js (a) 216 bytes >{2}< >{5}< [entry] [rendered]
+     [8] ./index.js 147 bytes {5} [built]
+    chunk    {6} default/a.js (a) 216 bytes >{3}< >{12}< [entry] [rendered]
         > ./a a
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [2] ./node_modules/x.js 20 bytes {0} {10} [built]
-     [3] ./node_modules/y.js 20 bytes {3} {10} [built]
-     [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+     [1] ./node_modules/x.js 20 bytes {0} {6} [built]
+     [3] ./node_modules/y.js 20 bytes {1} {6} [built]
+     [6] ./a.js + 1 modules 156 bytes {6} {9} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk   {11} default/b.js (b) 112 bytes ={0}= ={3}= [entry] [rendered]
+    chunk    {7} default/b.js (b) 112 bytes ={0}= ={1}= [entry] [rendered]
         > ./b b
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-     [4] ./b.js 72 bytes {7} {11} [built]
-    chunk   {12} default/c.js (c) 112 bytes ={0}= ={4}= [entry] [rendered]
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+     [2] ./f.js 20 bytes {3} {7} {8} [built]
+     [4] ./b.js 72 bytes {7} {10} [built]
+    chunk    {8} default/c.js (c) 112 bytes ={0}= ={4}= [entry] [rendered]
         > ./c c
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-     [5] ./c.js 72 bytes {8} {12} [built]
+     [0] ./d.js 20 bytes {2} {6} {7} {8} [built]
+     [2] ./f.js 20 bytes {3} {7} {8} [built]
+     [5] ./c.js 72 bytes {8} {11} [built]
+    chunk    {9} default/async-a.js (async-a) 156 bytes <{5}> ={0}= ={1}= ={2}= >{3}< >{12}< [rendered]
+        > ./a [8] ./index.js 1:0-47
+     [6] ./a.js + 1 modules 156 bytes {6} {9} [built]
+         | ./a.js 121 bytes [built]
+         | ./e.js 20 bytes [built]
+    chunk   {10} default/async-b.js (async-b) 72 bytes <{5}> ={0}= ={1}= ={2}= ={3}= [rendered]
+        > ./b [8] ./index.js 2:0-47
+     [4] ./b.js 72 bytes {7} {10} [built]
+    chunk   {11} default/async-c.js (async-c) 72 bytes <{5}> ={0}= ={2}= ={3}= ={4}= [rendered]
+        > ./c [8] ./index.js 3:0-47
+     [5] ./c.js 72 bytes {8} {11} [built]
+    chunk   {12} default/async-g.js (async-g) 34 bytes <{0}> <{1}> <{2}> <{6}> <{9}> ={3}= [rendered]
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+     [9] ./g.js 34 bytes {12} [built]
 Child custom-chunks-filter-in-cache-groups:
     Entrypoint main = default/main.js
     Entrypoint a = default/a.js
     Entrypoint b = default/vendors.js default/b.js
     Entrypoint c = default/vendors.js default/c.js
-    chunk    {0} default/vendors.js (vendors) 112 bytes <{5}> ={2}= ={3}= ={4}= ={7}= ={8}= >{1}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors)
+    chunk    {0} default/vendors.js (vendors) 112 bytes <{1}> ={3}= ={4}= ={5}= ={6}= ={7}= >{8}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors)
         > ./b b
         > ./c c
         > ./a [8] ./index.js 1:0-47
         > ./b [8] ./index.js 2:0-47
         > ./c [8] ./index.js 3:0-47
-      [2] ./node_modules/x.js 20 bytes {0} {6} [built]
-      [3] ./node_modules/y.js 20 bytes {0} {6} [built]
-      [6] ./node_modules/z.js 20 bytes {0} [built]
-     [10] multi x y z 52 bytes {0} [built]
-    chunk    {1} default/async-g.js (async-g) 54 bytes <{0}> <{2}> <{6}> [rendered]
-        > ./g [] 6:0-47
-        > ./g [] 6:0-47
-     [1] ./f.js 20 bytes {1} {3} {4} {7} {8} [built]
-     [9] ./g.js 34 bytes {1} [built]
-    chunk    {2} default/async-a.js (async-a) 176 bytes <{5}> ={0}= >{1}< [rendered]
-        > ./a [8] ./index.js 1:0-47
-     [0] ./d.js 20 bytes {2} {3} {4} {6} {7} {8} [built]
-     [7] ./a.js + 1 modules 156 bytes {2} {6} [built]
-         | ./a.js 121 bytes [built]
-         | ./e.js 20 bytes [built]
-    chunk    {3} default/async-b.js (async-b) 112 bytes <{5}> ={0}= [rendered]
-        > ./b [8] ./index.js 2:0-47
-     [0] ./d.js 20 bytes {2} {3} {4} {6} {7} {8} [built]
-     [1] ./f.js 20 bytes {1} {3} {4} {7} {8} [built]
-     [4] ./b.js 72 bytes {3} {7} [built]
-    chunk    {4} default/async-c.js (async-c) 112 bytes <{5}> ={0}= [rendered]
-        > ./c [8] ./index.js 3:0-47
-     [0] ./d.js 20 bytes {2} {3} {4} {6} {7} {8} [built]
-     [1] ./f.js 20 bytes {1} {3} {4} {7} {8} [built]
-     [5] ./c.js 72 bytes {4} {8} [built]
-    chunk    {5} default/main.js (main) 147 bytes >{0}< >{2}< >{3}< >{4}< [entry] [rendered]
+     [1] ./node_modules/x.js 20 bytes {0} {2} [built]
+     [2] ./node_modules/y.js 20 bytes {0} {2} [built]
+     [6] ./node_modules/z.js 20 bytes {0} [built]
+     [9] multi x y z 52 bytes {0} [built]
+    chunk    {1} default/main.js (main) 147 bytes >{0}< >{5}< >{6}< >{7}< [entry] [rendered]
         > ./ main
-     [8] ./index.js 147 bytes {5} [built]
-    chunk    {6} default/a.js (a) 216 bytes >{1}< [entry] [rendered]
+     [8] ./index.js 147 bytes {1} [built]
+    chunk    {2} default/a.js (a) 216 bytes >{8}< [entry] [rendered]
         > ./a a
-     [0] ./d.js 20 bytes {2} {3} {4} {6} {7} {8} [built]
-     [2] ./node_modules/x.js 20 bytes {0} {6} [built]
-     [3] ./node_modules/y.js 20 bytes {0} {6} [built]
-     [7] ./a.js + 1 modules 156 bytes {2} {6} [built]
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [1] ./node_modules/x.js 20 bytes {0} {2} [built]
+     [2] ./node_modules/y.js 20 bytes {0} {2} [built]
+     [7] ./a.js + 1 modules 156 bytes {2} {5} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk    {7} default/b.js (b) 112 bytes ={0}= [entry] [rendered]
+    chunk    {3} default/b.js (b) 112 bytes ={0}= [entry] [rendered]
         > ./b b
-     [0] ./d.js 20 bytes {2} {3} {4} {6} {7} {8} [built]
-     [1] ./f.js 20 bytes {1} {3} {4} {7} {8} [built]
-     [4] ./b.js 72 bytes {3} {7} [built]
-    chunk    {8} default/c.js (c) 112 bytes ={0}= [entry] [rendered]
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [3] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [4] ./b.js 72 bytes {3} {6} [built]
+    chunk    {4} default/c.js (c) 112 bytes ={0}= [entry] [rendered]
         > ./c c
-     [0] ./d.js 20 bytes {2} {3} {4} {6} {7} {8} [built]
-     [1] ./f.js 20 bytes {1} {3} {4} {7} {8} [built]
-     [5] ./c.js 72 bytes {4} {8} [built]"
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [3] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [5] ./c.js 72 bytes {4} {7} [built]
+    chunk    {5} default/async-a.js (async-a) 176 bytes <{1}> ={0}= >{8}< [rendered]
+        > ./a [8] ./index.js 1:0-47
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [7] ./a.js + 1 modules 156 bytes {2} {5} [built]
+         | ./a.js 121 bytes [built]
+         | ./e.js 20 bytes [built]
+    chunk    {6} default/async-b.js (async-b) 112 bytes <{1}> ={0}= [rendered]
+        > ./b [8] ./index.js 2:0-47
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [3] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [4] ./b.js 72 bytes {3} {6} [built]
+    chunk    {7} default/async-c.js (async-c) 112 bytes <{1}> ={0}= [rendered]
+        > ./c [8] ./index.js 3:0-47
+     [0] ./d.js 20 bytes {2} {3} {4} {5} {6} {7} [built]
+     [3] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [5] ./c.js 72 bytes {4} {7} [built]
+    chunk    {8} default/async-g.js (async-g) 54 bytes <{0}> <{2}> <{5}> [rendered]
+        > ./g [] 6:0-47
+        > ./g [] 6:0-47
+      [3] ./f.js 20 bytes {3} {4} {6} {7} {8} [built]
+     [10] ./g.js 34 bytes {8} [built]"
+`;
+
+exports[`StatsTestCases should print correct stats for split-chunks-automatic-name 1`] = `
+"Entrypoint main = main.js
+chunk    {0} common~async-a~async-b~async-c.js (common~async-a~async-b~async-c) 40 bytes <{3}> ={1}= ={2}= ={4}= ={5}= ={6}= ={7}= [rendered] split chunk (cache group: vendors) (name: common~async-a~async-b~async-c)
+    > ./a [0] ./index.js 1:0-47
+    > ./b [0] ./index.js 2:0-47
+    > ./c [0] ./index.js 3:0-47
+ [4] ./d.js 20 bytes {0} [built]
+ [5] ./node_modules/x.js 20 bytes {0} [built]
+chunk    {1} common~async-b~async-c.js (common~async-b~async-c) 20 bytes <{3}> ={0}= ={2}= ={5}= ={6}= ={7}= [rendered] split chunk (cache group: vendors) (name: common~async-b~async-c)
+    > ./b [0] ./index.js 2:0-47
+    > ./c [0] ./index.js 3:0-47
+ [7] ./f.js 20 bytes {1} [built]
+chunk    {2} common~async-a~async-b.js (common~async-a~async-b) 20 bytes <{3}> ={0}= ={1}= ={4}= ={5}= [rendered] split chunk (cache group: vendors) (name: common~async-a~async-b)
+    > ./a [0] ./index.js 1:0-47
+    > ./b [0] ./index.js 2:0-47
+ [6] ./node_modules/y.js 20 bytes {2} [built]
+chunk    {3} main.js (main) 147 bytes >{0}< >{1}< >{2}< >{4}< >{5}< >{6}< >{7}< [entry] [rendered]
+    > ./ main
+ [0] ./index.js 147 bytes {3} [built]
+chunk    {4} async-a.js (async-a) 107 bytes <{3}> ={0}= ={2}= [rendered]
+    > ./a [0] ./index.js 1:0-47
+ [3] ./a.js + 1 modules 107 bytes {4} [built]
+     | ./a.js 72 bytes [built]
+     | ./e.js 20 bytes [built]
+chunk    {5} async-b.js (async-b) 72 bytes <{3}> ={0}= ={1}= ={2}= [rendered]
+    > ./b [0] ./index.js 2:0-47
+ [1] ./b.js 72 bytes {5} [built]
+chunk    {6} async-c.js (async-c) 72 bytes <{3}> ={0}= ={1}= ={7}= [rendered]
+    > ./c [0] ./index.js 3:0-47
+ [2] ./c.js 72 bytes {6} [built]
+chunk    {7} common~async-c.js (common~async-c) 20 bytes <{3}> ={0}= ={1}= ={6}= [rendered] split chunk (cache group: vendors) (name: common~async-c)
+    > ./c [0] ./index.js 3:0-47
+ [8] ./node_modules/z.js 20 bytes {7} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for split-chunks-combinations 1`] = `
 "Entrypoint main = main.js
-chunk    {0} async-a~async-b.js (async-a~async-b) 134 bytes <{8}> ={1}= ={2}= [rendered] split chunk (cache group: default) (name: async-a~async-b)
-    > ./a [9] ./index.js 1:0-47
-    > ./b [9] ./index.js 2:0-47
- [0] ./x.js 67 bytes {0} {3} {4} {5} {6} {7} [built]
- [1] ./y.js 67 bytes {0} [built]
-chunk    {1} async-a.js (async-a) 48 bytes <{8}> ={0}= [rendered]
-    > ./a [9] ./index.js 1:0-47
- [2] ./a.js 48 bytes {1} [built]
-chunk    {2} async-b.js (async-b) 48 bytes <{8}> ={0}= [rendered]
-    > ./b [9] ./index.js 2:0-47
- [3] ./b.js 48 bytes {2} [built]
-chunk    {3} async-c.js (async-c) 101 bytes <{8}> [rendered]
-    > ./c [9] ./index.js 3:0-47
- [0] ./x.js 67 bytes {0} {3} {4} {5} {6} {7} [built]
- [4] ./c.js 34 bytes {3} [built]
-chunk    {4} async-d.js (async-d) 101 bytes <{8}> [rendered]
-    > ./d [9] ./index.js 4:0-47
- [0] ./x.js 67 bytes {0} {3} {4} {5} {6} {7} [built]
- [5] ./d.js 34 bytes {4} [built]
-chunk    {5} async-e.js (async-e) 101 bytes <{8}> [rendered]
-    > ./e [9] ./index.js 5:0-47
- [0] ./x.js 67 bytes {0} {3} {4} {5} {6} {7} [built]
- [6] ./e.js 34 bytes {5} [built]
-chunk    {6} async-f.js (async-f) 101 bytes <{8}> [rendered]
-    > ./f [9] ./index.js 6:0-47
- [0] ./x.js 67 bytes {0} {3} {4} {5} {6} {7} [built]
- [7] ./f.js 34 bytes {6} [built]
-chunk    {7} async-g.js (async-g) 101 bytes <{8}> [rendered]
-    > ./g [9] ./index.js 7:0-47
- [0] ./x.js 67 bytes {0} {3} {4} {5} {6} {7} [built]
- [8] ./g.js 34 bytes {7} [built]
-chunk    {8} main.js (main) 343 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{5}< >{6}< >{7}< [entry] [rendered]
+chunk    {0} async-a~async-b.js (async-a~async-b) 134 bytes <{1}> ={2}= ={3}= [rendered] split chunk (cache group: default) (name: async-a~async-b)
+    > ./a [0] ./index.js 1:0-47
+    > ./b [0] ./index.js 2:0-47
+ [8] ./x.js 67 bytes {0} {4} {5} {6} {7} {8} [built]
+ [9] ./y.js 67 bytes {0} [built]
+chunk    {1} main.js (main) 343 bytes >{0}< >{2}< >{3}< >{4}< >{5}< >{6}< >{7}< >{8}< [entry] [rendered]
     > ./ main
- [9] ./index.js 343 bytes {8} [built]"
+ [0] ./index.js 343 bytes {1} [built]
+chunk    {2} async-a.js (async-a) 48 bytes <{1}> ={0}= [rendered]
+    > ./a [0] ./index.js 1:0-47
+ [1] ./a.js 48 bytes {2} [built]
+chunk    {3} async-b.js (async-b) 48 bytes <{1}> ={0}= [rendered]
+    > ./b [0] ./index.js 2:0-47
+ [2] ./b.js 48 bytes {3} [built]
+chunk    {4} async-c.js (async-c) 101 bytes <{1}> [rendered]
+    > ./c [0] ./index.js 3:0-47
+ [3] ./c.js 34 bytes {4} [built]
+ [8] ./x.js 67 bytes {0} {4} {5} {6} {7} {8} [built]
+chunk    {5} async-d.js (async-d) 101 bytes <{1}> [rendered]
+    > ./d [0] ./index.js 4:0-47
+ [4] ./d.js 34 bytes {5} [built]
+ [8] ./x.js 67 bytes {0} {4} {5} {6} {7} {8} [built]
+chunk    {6} async-e.js (async-e) 101 bytes <{1}> [rendered]
+    > ./e [0] ./index.js 5:0-47
+ [5] ./e.js 34 bytes {6} [built]
+ [8] ./x.js 67 bytes {0} {4} {5} {6} {7} {8} [built]
+chunk    {7} async-f.js (async-f) 101 bytes <{1}> [rendered]
+    > ./f [0] ./index.js 6:0-47
+ [6] ./f.js 34 bytes {7} [built]
+ [8] ./x.js 67 bytes {0} {4} {5} {6} {7} {8} [built]
+chunk    {8} async-g.js (async-g) 101 bytes <{1}> [rendered]
+    > ./g [0] ./index.js 7:0-47
+ [7] ./g.js 34 bytes {8} [built]
+ [8] ./x.js 67 bytes {0} {4} {5} {6} {7} {8} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for split-chunks-issue-6413 1`] = `
 "Entrypoint main = main.js
-chunk    {0} vendors~async-a~async-b~async-c.js (vendors~async-a~async-b~async-c) 20 bytes <{5}> ={1}= ={2}= ={3}= ={4}= [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b~async-c)
-    > ./a [5] ./index.js 1:0-47
-    > ./b [5] ./index.js 2:0-47
-    > ./c [5] ./index.js 3:0-47
- [1] ./node_modules/x.js 20 bytes {0} [built]
-chunk    {1} async-a~async-b~async-c.js (async-a~async-b~async-c) 11 bytes <{5}> ={0}= ={2}= ={3}= ={4}= [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
-    > ./a [5] ./index.js 1:0-47
-    > ./b [5] ./index.js 2:0-47
-    > ./c [5] ./index.js 3:0-47
- [0] ./common.js 11 bytes {1} [built]
-chunk    {2} async-a.js (async-a) 19 bytes <{5}> ={0}= ={1}= [rendered]
-    > ./a [5] ./index.js 1:0-47
- [2] ./a.js 19 bytes {2} [built]
-chunk    {3} async-b.js (async-b) 19 bytes <{5}> ={0}= ={1}= [rendered]
-    > ./b [5] ./index.js 2:0-47
- [3] ./b.js 19 bytes {3} [built]
-chunk    {4} async-c.js (async-c) 19 bytes <{5}> ={0}= ={1}= [rendered]
-    > ./c [5] ./index.js 3:0-47
- [4] ./c.js 19 bytes {4} [built]
-chunk    {5} main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< [entry] [rendered]
+chunk    {0} vendors~async-a~async-b~async-c.js (vendors~async-a~async-b~async-c) 20 bytes <{2}> ={1}= ={3}= ={4}= ={5}= [rendered] split chunk (cache group: vendors) (name: vendors~async-a~async-b~async-c)
+    > ./a [0] ./index.js 1:0-47
+    > ./b [0] ./index.js 2:0-47
+    > ./c [0] ./index.js 3:0-47
+ [5] ./node_modules/x.js 20 bytes {0} [built]
+chunk    {1} async-a~async-b~async-c.js (async-a~async-b~async-c) 11 bytes <{2}> ={0}= ={3}= ={4}= ={5}= [rendered] split chunk (cache group: default) (name: async-a~async-b~async-c)
+    > ./a [0] ./index.js 1:0-47
+    > ./b [0] ./index.js 2:0-47
+    > ./c [0] ./index.js 3:0-47
+ [4] ./common.js 11 bytes {1} [built]
+chunk    {2} main.js (main) 147 bytes >{0}< >{1}< >{3}< >{4}< >{5}< [entry] [rendered]
     > ./ main
- [5] ./index.js 147 bytes {5} [built]"
+ [0] ./index.js 147 bytes {2} [built]
+chunk    {3} async-a.js (async-a) 19 bytes <{2}> ={0}= ={1}= [rendered]
+    > ./a [0] ./index.js 1:0-47
+ [1] ./a.js 19 bytes {3} [built]
+chunk    {4} async-b.js (async-b) 19 bytes <{2}> ={0}= ={1}= [rendered]
+    > ./b [0] ./index.js 2:0-47
+ [2] ./b.js 19 bytes {4} [built]
+chunk    {5} async-c.js (async-c) 19 bytes <{2}> ={0}= ={1}= [rendered]
+    > ./c [0] ./index.js 3:0-47
+ [3] ./c.js 19 bytes {5} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for split-chunks-issue-6696 1`] = `
 "Entrypoint main = vendors.js main.js
-chunk    {0} async-a.js (async-a) 32 bytes <{2}> <{3}> [rendered]
-    > ./a [3] ./index.js 2:0-47
- [0] ./node_modules/x.js 20 bytes {0} {1} [built]
- [1] ./a.js 12 bytes {0} [built]
-chunk    {1} async-b.js (async-b) 32 bytes <{2}> <{3}> [rendered]
-    > ./b [3] ./index.js 3:0-47
- [0] ./node_modules/x.js 20 bytes {0} {1} [built]
- [2] ./b.js 12 bytes {1} [built]
-chunk    {2} main.js (main) 110 bytes ={3}= >{0}< >{1}< [entry] [rendered]
+chunk    {0} main.js (main) 110 bytes ={3}= >{1}< >{2}< [entry] [rendered]
     > ./ main
- [3] ./index.js 110 bytes {2} [built]
-chunk    {3} vendors.js (vendors) 20 bytes ={2}= >{0}< >{1}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors)
+ [0] ./index.js 110 bytes {0} [built]
+chunk    {1} async-a.js (async-a) 32 bytes <{0}> <{3}> [rendered]
+    > ./a [0] ./index.js 2:0-47
+ [2] ./a.js 12 bytes {1} [built]
+ [4] ./node_modules/x.js 20 bytes {1} {2} [built]
+chunk    {2} async-b.js (async-b) 32 bytes <{0}> <{3}> [rendered]
+    > ./b [0] ./index.js 3:0-47
+ [3] ./b.js 12 bytes {2} [built]
+ [4] ./node_modules/x.js 20 bytes {1} {2} [built]
+chunk    {3} vendors.js (vendors) 20 bytes ={0}= >{1}< >{2}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors)
     > ./ main
- [4] ./node_modules/y.js 20 bytes {3} [built]"
+ [1] ./node_modules/y.js 20 bytes {3} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for split-chunks-issue-7401 1`] = `
 "Entrypoint a = vendors~a~c.js a.js
 Entrypoint b = b.js
 Chunk Group c = vendors~a~c.js c.js
-chunk    {0} vendors~a~c.js (vendors~a~c) 20 bytes <{3}> ={1}= ={2}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~c)
+chunk    {0} vendors~a~c.js (vendors~a~c) 20 bytes <{2}> ={1}= ={3}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~c)
     > ./a a
-    > ./c [3] ./b.js 1:0-41
+    > ./c [2] ./b.js 1:0-41
  [0] ./node_modules/x.js 20 bytes {0} [built]
-chunk    {1} c.js (c) 12 bytes <{3}> ={0}= [rendered]
-    > ./c [3] ./b.js 1:0-41
- [1] ./c.js 12 bytes {1} [built]
-chunk    {2} a.js (a) 12 bytes ={0}= [entry] [rendered]
+chunk    {1} a.js (a) 12 bytes ={0}= [entry] [rendered]
     > ./a a
- [2] ./a.js 12 bytes {2} [built]
-chunk    {3} b.js (b) 43 bytes >{0}< >{1}< [entry] [rendered]
+ [1] ./a.js 12 bytes {1} [built]
+chunk    {2} b.js (b) 43 bytes >{0}< >{3}< [entry] [rendered]
     > ./b b
- [3] ./b.js 43 bytes {3} [built]"
+ [2] ./b.js 43 bytes {2} [built]
+chunk    {3} c.js (c) 12 bytes <{2}> ={0}= [rendered]
+    > ./c [2] ./b.js 1:0-41
+ [3] ./c.js 12 bytes {3} [built]"
+`;
+
+exports[`StatsTestCases should print correct stats for split-chunks-max-size 1`] = `
+"Child production:
+    Entrypoint main = prod-vendors~main~7274e1de.js prod-vendors~main~0feae4ad.js prod-main~6e7ead72.js prod-main~6a2ae26b.js prod-main~17acad98.js prod-main~b2c7414a.js prod-main~75f09de8.js prod-main~052b3814.js prod-main~3ff27526.js prod-main~11485824.js prod-main~c6931360.js prod-main~cd7c5bfc.js prod-main~02369f19.js
+    chunk    {0} prod-main~02369f19.js (main~02369f19) 1.57 KiB ={1}= ={2}= ={3}= ={4}= ={5}= ={6}= ={7}= ={8}= ={9}= ={10}= ={11}= ={12}= [entry] [rendered]
+        > ./ main
+     [11] ./very-big.js?1 1.57 KiB {0} [built]
+    chunk    {1} prod-vendors~main~0feae4ad.js (vendors~main~0feae4ad) 1.57 KiB ={0}= ={2}= ={3}= ={4}= ={5}= ={6}= ={7}= ={8}= ={9}= ={10}= ={11}= ={12}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~main)
+        > ./ main
+     [43] ./node_modules/very-big.js?1 1.57 KiB {1} [built]
+    chunk    {2} prod-main~6e7ead72.js (main~6e7ead72) 536 bytes ={0}= ={1}= ={3}= ={4}= ={5}= ={6}= ={7}= ={8}= ={9}= ={10}= ={11}= ={12}= [initial] [rendered]
+        > ./ main
+     [0] ./big.js?1 268 bytes {2} [built]
+     [1] ./big.js?2 268 bytes {2} [built]
+    chunk    {3} prod-main~6a2ae26b.js (main~6a2ae26b) 536 bytes ={0}= ={1}= ={2}= ={4}= ={5}= ={6}= ={7}= ={8}= ={9}= ={10}= ={11}= ={12}= [initial] [rendered]
+        > ./ main
+     [34] ./in-some-directory/big.js?1 268 bytes {3} [built]
+     [35] ./in-some-directory/small.js?1 67 bytes {3} [built]
+     [36] ./in-some-directory/small.js?2 67 bytes {3} [built]
+     [37] ./in-some-directory/small.js?3 67 bytes {3} [built]
+     [38] ./in-some-directory/small.js?4 67 bytes {3} [built]
+    chunk    {4} prod-main~17acad98.js (main~17acad98) 1.57 KiB ={0}= ={1}= ={2}= ={3}= ={5}= ={6}= ={7}= ={8}= ={9}= ={10}= ={11}= ={12}= [initial] [rendered]
+        > ./ main
+     [39] ./in-some-directory/very-big.js?1 1.57 KiB {4} [built]
+    chunk    {5} prod-main~b2c7414a.js (main~b2c7414a) 1.19 KiB ={0}= ={1}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= ={9}= ={10}= ={11}= ={12}= [initial] [rendered]
+        > ./ main
+     [44] ./index.js 1.19 KiB {5} [built]
+    chunk    {6} prod-main~75f09de8.js (main~75f09de8) 603 bytes ={0}= ={1}= ={2}= ={3}= ={4}= ={5}= ={7}= ={8}= ={9}= ={10}= ={11}= ={12}= [initial] [rendered]
+        > ./ main
+     [25] ./inner-module/small.js?1 67 bytes {6} [built]
+     [26] ./inner-module/small.js?2 67 bytes {6} [built]
+     [27] ./inner-module/small.js?3 67 bytes {6} [built]
+     [28] ./inner-module/small.js?4 67 bytes {6} [built]
+     [29] ./inner-module/small.js?5 67 bytes {6} [built]
+     [30] ./inner-module/small.js?6 67 bytes {6} [built]
+     [31] ./inner-module/small.js?7 67 bytes {6} [built]
+     [32] ./inner-module/small.js?8 67 bytes {6} [built]
+     [33] ./inner-module/small.js?9 67 bytes {6} [built]
+    chunk    {7} prod-main~052b3814.js (main~052b3814) 603 bytes ={0}= ={1}= ={2}= ={3}= ={4}= ={5}= ={6}= ={8}= ={9}= ={10}= ={11}= ={12}= [initial] [rendered]
+        > ./ main
+      [2] ./small.js?1 67 bytes {7} [built]
+      [3] ./small.js?2 67 bytes {7} [built]
+      [4] ./small.js?3 67 bytes {7} [built]
+      [5] ./small.js?4 67 bytes {7} [built]
+      [6] ./small.js?5 67 bytes {7} [built]
+      [7] ./small.js?6 67 bytes {7} [built]
+      [8] ./small.js?7 67 bytes {7} [built]
+      [9] ./small.js?8 67 bytes {7} [built]
+     [10] ./small.js?9 67 bytes {7} [built]
+    chunk    {8} prod-main~3ff27526.js (main~3ff27526) 536 bytes ={0}= ={1}= ={2}= ={3}= ={4}= ={5}= ={6}= ={7}= ={9}= ={10}= ={11}= ={12}= [initial] [rendered]
+        > ./ main
+     [14] ./subfolder/big.js?1 268 bytes {8} [built]
+     [15] ./subfolder/big.js?2 268 bytes {8} [built]
+    chunk    {9} prod-main~11485824.js (main~11485824) 603 bytes ={0}= ={1}= ={2}= ={3}= ={4}= ={5}= ={6}= ={7}= ={8}= ={10}= ={11}= ={12}= [initial] [rendered]
+        > ./ main
+     [16] ./subfolder/small.js?1 67 bytes {9} [built]
+     [17] ./subfolder/small.js?2 67 bytes {9} [built]
+     [18] ./subfolder/small.js?3 67 bytes {9} [built]
+     [19] ./subfolder/small.js?4 67 bytes {9} [built]
+     [20] ./subfolder/small.js?5 67 bytes {9} [built]
+     [21] ./subfolder/small.js?6 67 bytes {9} [built]
+     [22] ./subfolder/small.js?7 67 bytes {9} [built]
+     [23] ./subfolder/small.js?8 67 bytes {9} [built]
+     [24] ./subfolder/small.js?9 67 bytes {9} [built]
+    chunk   {10} prod-main~c6931360.js (main~c6931360) 1.57 KiB ={0}= ={1}= ={2}= ={3}= ={4}= ={5}= ={6}= ={7}= ={8}= ={9}= ={11}= ={12}= [initial] [rendered]
+        > ./ main
+     [12] ./very-big.js?2 1.57 KiB {10} [built]
+    chunk   {11} prod-main~cd7c5bfc.js (main~cd7c5bfc) 1.57 KiB ={0}= ={1}= ={2}= ={3}= ={4}= ={5}= ={6}= ={7}= ={8}= ={9}= ={10}= ={12}= [initial] [rendered]
+        > ./ main
+     [13] ./very-big.js?3 1.57 KiB {11} [built]
+    chunk   {12} prod-vendors~main~7274e1de.js (vendors~main~7274e1de) 402 bytes ={0}= ={1}= ={2}= ={3}= ={4}= ={5}= ={6}= ={7}= ={8}= ={9}= ={10}= ={11}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~main)
+        > ./ main
+     [40] ./node_modules/big.js?1 268 bytes {12} [built]
+     [41] ./node_modules/small.js?1 67 bytes {12} [built]
+     [42] ./node_modules/small.js?2 67 bytes {12} [built]
+Child development:
+    Entrypoint main = dev-vendors~main~._node_modules_b.js dev-vendors~main~._node_modules_very-big.js~6bdbed7b.js dev-main~._big.js~1.js dev-main~._in-some-directory_b.js dev-main~._in-some-directory_very-big.js~8d76cf03.js dev-main~._index.js~41f5a26e.js dev-main~._inner-module_small.js~3.js dev-main~._small.js~1.js dev-main~._subfolder_big.js~b.js dev-main~._subfolder_small.js~1.js dev-main~._very-big.js~08cf55cf.js dev-main~._very-big.js~4647fb9d.js dev-main~._very-big.js~62f7f644.js
+    chunk {main~._big.js~1} dev-main~._big.js~1.js (main~._big.js~1) 536 bytes ={main~._in-some-directory_b}= ={main~._in-some-directory_very-big.js~8d76cf03}= ={main~._index.js~41f5a26e}= ={main~._inner-module_small.js~3}= ={main~._small.js~1}= ={main~._subfolder_big.js~b}= ={main~._subfolder_small.js~1}= ={main~._very-big.js~08cf55cf}= ={main~._very-big.js~4647fb9d}= ={main~._very-big.js~62f7f644}= ={vendors~main~._node_modules_b}= ={vendors~main~._node_modules_very-big.js~6bdbed7b}= [initial] [rendered]
+        > ./ main
+     [./big.js?1] 268 bytes {main~._big.js~1} [built]
+     [./big.js?2] 268 bytes {main~._big.js~1} [built]
+    chunk {main~._in-some-directory_b} dev-main~._in-some-directory_b.js (main~._in-some-directory_b) 536 bytes ={main~._big.js~1}= ={main~._in-some-directory_very-big.js~8d76cf03}= ={main~._index.js~41f5a26e}= ={main~._inner-module_small.js~3}= ={main~._small.js~1}= ={main~._subfolder_big.js~b}= ={main~._subfolder_small.js~1}= ={main~._very-big.js~08cf55cf}= ={main~._very-big.js~4647fb9d}= ={main~._very-big.js~62f7f644}= ={vendors~main~._node_modules_b}= ={vendors~main~._node_modules_very-big.js~6bdbed7b}= [initial] [rendered]
+        > ./ main
+     [./in-some-directory/big.js?1] 268 bytes {main~._in-some-directory_b} [built]
+     [./in-some-directory/small.js?1] 67 bytes {main~._in-some-directory_b} [built]
+     [./in-some-directory/small.js?2] 67 bytes {main~._in-some-directory_b} [built]
+     [./in-some-directory/small.js?3] 67 bytes {main~._in-some-directory_b} [built]
+     [./in-some-directory/small.js?4] 67 bytes {main~._in-some-directory_b} [built]
+    chunk {main~._in-some-directory_very-big.js~8d76cf03} dev-main~._in-some-directory_very-big.js~8d76cf03.js (main~._in-some-directory_very-big.js~8d76cf03) 1.57 KiB ={main~._big.js~1}= ={main~._in-some-directory_b}= ={main~._index.js~41f5a26e}= ={main~._inner-module_small.js~3}= ={main~._small.js~1}= ={main~._subfolder_big.js~b}= ={main~._subfolder_small.js~1}= ={main~._very-big.js~08cf55cf}= ={main~._very-big.js~4647fb9d}= ={main~._very-big.js~62f7f644}= ={vendors~main~._node_modules_b}= ={vendors~main~._node_modules_very-big.js~6bdbed7b}= [initial] [rendered]
+        > ./ main
+     [./in-some-directory/very-big.js?1] 1.57 KiB {main~._in-some-directory_very-big.js~8d76cf03} [built]
+    chunk {main~._index.js~41f5a26e} dev-main~._index.js~41f5a26e.js (main~._index.js~41f5a26e) 1.19 KiB ={main~._big.js~1}= ={main~._in-some-directory_b}= ={main~._in-some-directory_very-big.js~8d76cf03}= ={main~._inner-module_small.js~3}= ={main~._small.js~1}= ={main~._subfolder_big.js~b}= ={main~._subfolder_small.js~1}= ={main~._very-big.js~08cf55cf}= ={main~._very-big.js~4647fb9d}= ={main~._very-big.js~62f7f644}= ={vendors~main~._node_modules_b}= ={vendors~main~._node_modules_very-big.js~6bdbed7b}= [initial] [rendered]
+        > ./ main
+     [./index.js] 1.19 KiB {main~._index.js~41f5a26e} [built]
+    chunk {main~._inner-module_small.js~3} dev-main~._inner-module_small.js~3.js (main~._inner-module_small.js~3) 603 bytes ={main~._big.js~1}= ={main~._in-some-directory_b}= ={main~._in-some-directory_very-big.js~8d76cf03}= ={main~._index.js~41f5a26e}= ={main~._small.js~1}= ={main~._subfolder_big.js~b}= ={main~._subfolder_small.js~1}= ={main~._very-big.js~08cf55cf}= ={main~._very-big.js~4647fb9d}= ={main~._very-big.js~62f7f644}= ={vendors~main~._node_modules_b}= ={vendors~main~._node_modules_very-big.js~6bdbed7b}= [initial] [rendered]
+        > ./ main
+     [./inner-module/small.js?1] 67 bytes {main~._inner-module_small.js~3} [built]
+     [./inner-module/small.js?2] 67 bytes {main~._inner-module_small.js~3} [built]
+     [./inner-module/small.js?3] 67 bytes {main~._inner-module_small.js~3} [built]
+     [./inner-module/small.js?4] 67 bytes {main~._inner-module_small.js~3} [built]
+     [./inner-module/small.js?5] 67 bytes {main~._inner-module_small.js~3} [built]
+     [./inner-module/small.js?6] 67 bytes {main~._inner-module_small.js~3} [built]
+     [./inner-module/small.js?7] 67 bytes {main~._inner-module_small.js~3} [built]
+     [./inner-module/small.js?8] 67 bytes {main~._inner-module_small.js~3} [built]
+     [./inner-module/small.js?9] 67 bytes {main~._inner-module_small.js~3} [built]
+    chunk {main~._small.js~1} dev-main~._small.js~1.js (main~._small.js~1) 603 bytes ={main~._big.js~1}= ={main~._in-some-directory_b}= ={main~._in-some-directory_very-big.js~8d76cf03}= ={main~._index.js~41f5a26e}= ={main~._inner-module_small.js~3}= ={main~._subfolder_big.js~b}= ={main~._subfolder_small.js~1}= ={main~._very-big.js~08cf55cf}= ={main~._very-big.js~4647fb9d}= ={main~._very-big.js~62f7f644}= ={vendors~main~._node_modules_b}= ={vendors~main~._node_modules_very-big.js~6bdbed7b}= [initial] [rendered]
+        > ./ main
+     [./small.js?1] 67 bytes {main~._small.js~1} [built]
+     [./small.js?2] 67 bytes {main~._small.js~1} [built]
+     [./small.js?3] 67 bytes {main~._small.js~1} [built]
+     [./small.js?4] 67 bytes {main~._small.js~1} [built]
+     [./small.js?5] 67 bytes {main~._small.js~1} [built]
+     [./small.js?6] 67 bytes {main~._small.js~1} [built]
+     [./small.js?7] 67 bytes {main~._small.js~1} [built]
+     [./small.js?8] 67 bytes {main~._small.js~1} [built]
+     [./small.js?9] 67 bytes {main~._small.js~1} [built]
+    chunk {main~._subfolder_big.js~b} dev-main~._subfolder_big.js~b.js (main~._subfolder_big.js~b) 536 bytes ={main~._big.js~1}= ={main~._in-some-directory_b}= ={main~._in-some-directory_very-big.js~8d76cf03}= ={main~._index.js~41f5a26e}= ={main~._inner-module_small.js~3}= ={main~._small.js~1}= ={main~._subfolder_small.js~1}= ={main~._very-big.js~08cf55cf}= ={main~._very-big.js~4647fb9d}= ={main~._very-big.js~62f7f644}= ={vendors~main~._node_modules_b}= ={vendors~main~._node_modules_very-big.js~6bdbed7b}= [initial] [rendered]
+        > ./ main
+     [./subfolder/big.js?1] 268 bytes {main~._subfolder_big.js~b} [built]
+     [./subfolder/big.js?2] 268 bytes {main~._subfolder_big.js~b} [built]
+    chunk {main~._subfolder_small.js~1} dev-main~._subfolder_small.js~1.js (main~._subfolder_small.js~1) 603 bytes ={main~._big.js~1}= ={main~._in-some-directory_b}= ={main~._in-some-directory_very-big.js~8d76cf03}= ={main~._index.js~41f5a26e}= ={main~._inner-module_small.js~3}= ={main~._small.js~1}= ={main~._subfolder_big.js~b}= ={main~._very-big.js~08cf55cf}= ={main~._very-big.js~4647fb9d}= ={main~._very-big.js~62f7f644}= ={vendors~main~._node_modules_b}= ={vendors~main~._node_modules_very-big.js~6bdbed7b}= [initial] [rendered]
+        > ./ main
+     [./subfolder/small.js?1] 67 bytes {main~._subfolder_small.js~1} [built]
+     [./subfolder/small.js?2] 67 bytes {main~._subfolder_small.js~1} [built]
+     [./subfolder/small.js?3] 67 bytes {main~._subfolder_small.js~1} [built]
+     [./subfolder/small.js?4] 67 bytes {main~._subfolder_small.js~1} [built]
+     [./subfolder/small.js?5] 67 bytes {main~._subfolder_small.js~1} [built]
+     [./subfolder/small.js?6] 67 bytes {main~._subfolder_small.js~1} [built]
+     [./subfolder/small.js?7] 67 bytes {main~._subfolder_small.js~1} [built]
+     [./subfolder/small.js?8] 67 bytes {main~._subfolder_small.js~1} [built]
+     [./subfolder/small.js?9] 67 bytes {main~._subfolder_small.js~1} [built]
+    chunk {main~._very-big.js~08cf55cf} dev-main~._very-big.js~08cf55cf.js (main~._very-big.js~08cf55cf) 1.57 KiB ={main~._big.js~1}= ={main~._in-some-directory_b}= ={main~._in-some-directory_very-big.js~8d76cf03}= ={main~._index.js~41f5a26e}= ={main~._inner-module_small.js~3}= ={main~._small.js~1}= ={main~._subfolder_big.js~b}= ={main~._subfolder_small.js~1}= ={main~._very-big.js~4647fb9d}= ={main~._very-big.js~62f7f644}= ={vendors~main~._node_modules_b}= ={vendors~main~._node_modules_very-big.js~6bdbed7b}= [initial] [rendered]
+        > ./ main
+     [./very-big.js?2] 1.57 KiB {main~._very-big.js~08cf55cf} [built]
+    chunk {main~._very-big.js~4647fb9d} dev-main~._very-big.js~4647fb9d.js (main~._very-big.js~4647fb9d) 1.57 KiB ={main~._big.js~1}= ={main~._in-some-directory_b}= ={main~._in-some-directory_very-big.js~8d76cf03}= ={main~._index.js~41f5a26e}= ={main~._inner-module_small.js~3}= ={main~._small.js~1}= ={main~._subfolder_big.js~b}= ={main~._subfolder_small.js~1}= ={main~._very-big.js~08cf55cf}= ={main~._very-big.js~62f7f644}= ={vendors~main~._node_modules_b}= ={vendors~main~._node_modules_very-big.js~6bdbed7b}= [initial] [rendered]
+        > ./ main
+     [./very-big.js?3] 1.57 KiB {main~._very-big.js~4647fb9d} [built]
+    chunk {main~._very-big.js~62f7f644} dev-main~._very-big.js~62f7f644.js (main~._very-big.js~62f7f644) 1.57 KiB ={main~._big.js~1}= ={main~._in-some-directory_b}= ={main~._in-some-directory_very-big.js~8d76cf03}= ={main~._index.js~41f5a26e}= ={main~._inner-module_small.js~3}= ={main~._small.js~1}= ={main~._subfolder_big.js~b}= ={main~._subfolder_small.js~1}= ={main~._very-big.js~08cf55cf}= ={main~._very-big.js~4647fb9d}= ={vendors~main~._node_modules_b}= ={vendors~main~._node_modules_very-big.js~6bdbed7b}= [entry] [rendered]
+        > ./ main
+     [./very-big.js?1] 1.57 KiB {main~._very-big.js~62f7f644} [built]
+    chunk {vendors~main~._node_modules_b} dev-vendors~main~._node_modules_b.js (vendors~main~._node_modules_b) 402 bytes ={main~._big.js~1}= ={main~._in-some-directory_b}= ={main~._in-some-directory_very-big.js~8d76cf03}= ={main~._index.js~41f5a26e}= ={main~._inner-module_small.js~3}= ={main~._small.js~1}= ={main~._subfolder_big.js~b}= ={main~._subfolder_small.js~1}= ={main~._very-big.js~08cf55cf}= ={main~._very-big.js~4647fb9d}= ={main~._very-big.js~62f7f644}= ={vendors~main~._node_modules_very-big.js~6bdbed7b}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~main)
+        > ./ main
+     [./node_modules/big.js?1] 268 bytes {vendors~main~._node_modules_b} [built]
+     [./node_modules/small.js?1] 67 bytes {vendors~main~._node_modules_b} [built]
+     [./node_modules/small.js?2] 67 bytes {vendors~main~._node_modules_b} [built]
+    chunk {vendors~main~._node_modules_very-big.js~6bdbed7b} dev-vendors~main~._node_modules_very-big.js~6bdbed7b.js (vendors~main~._node_modules_very-big.js~6bdbed7b) 1.57 KiB ={main~._big.js~1}= ={main~._in-some-directory_b}= ={main~._in-some-directory_very-big.js~8d76cf03}= ={main~._index.js~41f5a26e}= ={main~._inner-module_small.js~3}= ={main~._small.js~1}= ={main~._subfolder_big.js~b}= ={main~._subfolder_small.js~1}= ={main~._very-big.js~08cf55cf}= ={main~._very-big.js~4647fb9d}= ={main~._very-big.js~62f7f644}= ={vendors~main~._node_modules_b}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~main)
+        > ./ main
+     [./node_modules/very-big.js?1] 1.57 KiB {vendors~main~._node_modules_very-big.js~6bdbed7b} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for split-chunks-prefer-bigger-splits 1`] = `
 "Entrypoint main = default/main.js
-chunk    {0} default/async-b~async-c.js (async-b~async-c) 110 bytes <{4}> ={2}= ={3}= [rendered] split chunk (cache group: default) (name: async-b~async-c)
-    > ./b [6] ./index.js 2:0-47
-    > ./c [6] ./index.js 3:0-47
- [0] ./d.js 43 bytes {0} {1} [built]
- [2] ./f.js 67 bytes {0} [built]
-chunk    {1} default/async-a.js (async-a) 134 bytes <{4}> [rendered]
-    > ./a [6] ./index.js 1:0-47
- [0] ./d.js 43 bytes {0} {1} [built]
- [1] ./e.js 43 bytes {1} {2} [built]
- [3] ./a.js 48 bytes {1} [built]
-chunk    {2} default/async-b.js (async-b) 105 bytes <{4}> ={0}= [rendered]
-    > ./b [6] ./index.js 2:0-47
- [1] ./e.js 43 bytes {1} {2} [built]
- [4] ./b.js 62 bytes {2} [built]
-chunk    {3} default/async-c.js (async-c) 48 bytes <{4}> ={0}= [rendered]
-    > ./c [6] ./index.js 3:0-47
- [5] ./c.js 48 bytes {3} [built]
-chunk    {4} default/main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< [entry] [rendered]
+chunk    {0} default/async-b~async-c.js (async-b~async-c) 110 bytes <{1}> ={3}= ={4}= [rendered] split chunk (cache group: default) (name: async-b~async-c)
+    > ./b [0] ./index.js 2:0-47
+    > ./c [0] ./index.js 3:0-47
+ [4] ./d.js 43 bytes {0} {2} [built]
+ [6] ./f.js 67 bytes {0} [built]
+chunk    {1} default/main.js (main) 147 bytes >{0}< >{2}< >{3}< >{4}< [entry] [rendered]
     > ./ main
- [6] ./index.js 147 bytes {4} [built]"
+ [0] ./index.js 147 bytes {1} [built]
+chunk    {2} default/async-a.js (async-a) 134 bytes <{1}> [rendered]
+    > ./a [0] ./index.js 1:0-47
+ [1] ./a.js 48 bytes {2} [built]
+ [4] ./d.js 43 bytes {0} {2} [built]
+ [5] ./e.js 43 bytes {2} {3} [built]
+chunk    {3} default/async-b.js (async-b) 105 bytes <{1}> ={0}= [rendered]
+    > ./b [0] ./index.js 2:0-47
+ [2] ./b.js 62 bytes {3} [built]
+ [5] ./e.js 43 bytes {2} {3} [built]
+chunk    {4} default/async-c.js (async-c) 48 bytes <{1}> ={0}= [rendered]
+    > ./c [0] ./index.js 3:0-47
+ [3] ./c.js 48 bytes {4} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for tree-shaking 1`] = `
-"Hash: 7664ceef8f3f695c9688
+"Hash: ecca8f58566e08b05b03
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
     Asset      Size  Chunks             Chunk Names
@@ -2700,13 +3018,13 @@ Entrypoint main = bundle.js
      [no exports used]
  [2] ./unknown.js 0 bytes {0} [built]
      [only some exports used: c]
- [3] ./unknown2.js 0 bytes {0} [built]
+ [3] ./reexport-unknown.js 83 bytes {0} [built]
+     [exports: a, b, c, d]
+     [only some exports used: a, c]
+ [4] ./reexport-star-unknown.js 68 bytes {0} [built]
+     [only some exports used: a, c]
+ [5] ./unknown2.js 0 bytes {0} [built]
      [only some exports used: y]
- [4] ./index.js 315 bytes {0} [built]
-     [no exports]
- [5] ./require.include.js 36 bytes {0} [built]
-     [exports: a, default]
-     [no exports used]
  [6] ./reexport-known.js 49 bytes {0} [built]
      [exports: a, b]
      [only some exports used: a]
@@ -2715,15 +3033,15 @@ Entrypoint main = bundle.js
      [only some exports used: a]
  [8] ./edge.js 45 bytes {0} [built]
      [only some exports used: y]
- [9] ./reexport-unknown.js 83 bytes {0} [built]
-     [exports: a, b, c, d]
-     [only some exports used: a, c]
-[10] ./reexport-star-unknown.js 68 bytes {0} [built]
-     [only some exports used: a, c]"
+ [9] ./index.js 315 bytes {0} [built]
+     [no exports]
+[10] ./require.include.js 36 bytes {0} [built]
+     [exports: a, default]
+     [no exports used]"
 `;
 
 exports[`StatsTestCases should print correct stats for warnings-uglifyjs 1`] = `
-"Hash: 1325fb5a846745d7ae89
+"Hash: 5ddef8e3e0b2f2c278c4
 Time: Xms
 Built at: Thu Jan 01 1970 00:00:00 GMT
     Asset      Size  Chunks             Chunk Names
@@ -2733,10 +3051,13 @@ Entrypoint main = bundle.js
 [1] ./a.js 249 bytes {0} [built]
 [2] (webpack)/buildin/module.js 497 bytes {0} [built]
 
-WARNING in bundle.js from UglifyJs
-Dropping unused function someUnRemoteUsedFunction1 [./a.js:3,0]
-Dropping unused function someUnRemoteUsedFunction2 [./a.js:4,0]
-Dropping unused function someUnRemoteUsedFunction3 [./a.js:5,0]
-Dropping unused function someUnRemoteUsedFunction4 [./a.js:6,0]
-Dropping unused function someUnRemoteUsedFunction5 [./a.js:7,0]"
+WARNING in UglifyJs Plugin: Dropping unused function someUnRemoteUsedFunction1 [./a.js:3,0] in bundle.js
+
+WARNING in UglifyJs Plugin: Dropping unused function someUnRemoteUsedFunction2 [./a.js:4,0] in bundle.js
+
+WARNING in UglifyJs Plugin: Dropping unused function someUnRemoteUsedFunction3 [./a.js:5,0] in bundle.js
+
+WARNING in UglifyJs Plugin: Dropping unused function someUnRemoteUsedFunction4 [./a.js:6,0] in bundle.js
+
+WARNING in UglifyJs Plugin: Dropping unused function someUnRemoteUsedFunction5 [./a.js:7,0] in bundle.js"
 `;
diff --git a/test/cases/chunks/import-context/index.js b/test/cases/chunks/import-context/index.js
index 9392c88775f..3f5e41d5ad6 100644
--- a/test/cases/chunks/import-context/index.js
+++ b/test/cases/chunks/import-context/index.js
@@ -23,10 +23,9 @@ function testCase(load, done) {
 it("should be able to use expressions in import", function(done) {
 	function load(name, expected, callback) {
 		import("./dir/" + name).then(function(result) {
-			expect(result).toEqual({
-				default: expected,
-				[Symbol.toStringTag]: "Module"
-			});
+			expect(result).toEqual(nsObj({
+				default: expected
+			}));
 			callback();
 		}).catch(function(err) {
 			done(err);
diff --git a/test/cases/chunks/import/index.js b/test/cases/chunks/import/index.js
index e9bbf35d5df..0810e5c7e88 100644
--- a/test/cases/chunks/import/index.js
+++ b/test/cases/chunks/import/index.js
@@ -1,9 +1,8 @@
 it("should be able to use import", function(done) {
 	import("./two").then(function(two) {
-		expect(two).toEqual({
-			default: 2,
-			[Symbol.toStringTag]: "Module"
-		});
+		expect(two).toEqual(nsObj({
+			default: 2
+		}));
 		done();
 	}).catch(function(err) {
 		done(err);
diff --git a/test/cases/chunks/inline-options/index.js b/test/cases/chunks/inline-options/index.js
index 23c60da711a..def7f37a3bf 100644
--- a/test/cases/chunks/inline-options/index.js
+++ b/test/cases/chunks/inline-options/index.js
@@ -110,17 +110,15 @@ function testChunkLoading(load, expectedSyncInitial, expectedSyncRequested) {
 		sync = true;
 		var p = Promise.all([
 			load("a").then(function(a) {
-				expect(a).toEqual({
-					default: "a",
-					[Symbol.toStringTag]: "Module"
-				});
+				expect(a).toEqual(nsObj({
+					default: "a"
+				}));
 				expect(sync).toBe(true);
 			}),
 			load("c").then(function(c) {
-				expect(c).toEqual({
-					default: "c",
-					[Symbol.toStringTag]: "Module"
-				});
+				expect(c).toEqual(nsObj({
+					default: "c"
+				}));
 				expect(sync).toBe(expectedSyncRequested);
 			})
 		]);
diff --git a/test/cases/chunks/issue-2443/index.js b/test/cases/chunks/issue-2443/index.js
index 76388fef631..731b88a8128 100644
--- a/test/cases/chunks/issue-2443/index.js
+++ b/test/cases/chunks/issue-2443/index.js
@@ -1,10 +1,9 @@
 it("should be able to use expressions in import (directory)", function(done) {
 	function load(name, expected, callback) {
 		import("./dir/" + name + "/file.js").then(function(result) {
-			expect(result).toEqual({
-				default: expected,
-				[Symbol.toStringTag]: "Module"
-			});
+			expect(result).toEqual(nsObj({
+				default: expected
+			}));
 			callback();
 		}).catch(function(err) {
 			done(err);
diff --git a/test/cases/chunks/nested-in-empty/a.js b/test/cases/chunks/nested-in-empty/a.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/cases/chunks/nested-in-empty/b.js b/test/cases/chunks/nested-in-empty/b.js
new file mode 100644
index 00000000000..888cae37af9
--- /dev/null
+++ b/test/cases/chunks/nested-in-empty/b.js
@@ -0,0 +1 @@
+module.exports = 42;
diff --git a/test/cases/chunks/nested-in-empty/index.js b/test/cases/chunks/nested-in-empty/index.js
new file mode 100644
index 00000000000..968e02795ca
--- /dev/null
+++ b/test/cases/chunks/nested-in-empty/index.js
@@ -0,0 +1,13 @@
+it("should include a chunk nested in an empty chunk", (done) => {
+	require.ensure(["./a"], () => {
+		require.ensure([], () => {
+			require.ensure(["./a"], () => {
+				require.ensure([], () => {
+					const b = require("./b");
+					expect(b).toBe(42);
+					done();
+				});
+			});
+		});
+	});
+});
diff --git a/test/cases/json/import-lazy/index.js b/test/cases/json/import-lazy/index.js
index 2f01d1b61fa..2837ad304e6 100644
--- a/test/cases/json/import-lazy/index.js
+++ b/test/cases/json/import-lazy/index.js
@@ -9,27 +9,23 @@ it("should be possible to import json data async", function() {
 		import("../data/f.json"),
 		import("../data/g.json")
 	]).then(([a, b, c, d, e, f, g]) => {
-		expect(a).toEqual({
-			default: null,
-			[Symbol.toStringTag]: "Module"
-		});
-		expect(b).toEqual({
-			default: 123,
-			[Symbol.toStringTag]: "Module"
-		});
-		expect(c).toEqual({
+		expect(a).toEqual(nsObj({
+			default: null
+		}));
+		expect(b).toEqual(nsObj({
+			default: 123
+		}));
+		expect(c).toEqual(nsObj({
 			0: 1,
 			1: 2,
 			2: 3,
 			3: 4,
-			default: [1, 2, 3, 4],
-			[Symbol.toStringTag]: "Module"
-		});
-		expect(d).toEqual({
-			default: {},
-			[Symbol.toStringTag]: "Module"
-		});
-		expect(e).toEqual({
+			default: [1, 2, 3, 4]
+		}));
+		expect(d).toEqual(nsObj({
+			default: {}
+		}));
+		expect(e).toEqual(nsObj({
 			aa: 1,
 			bb: 2,
 			1: "x",
@@ -37,25 +33,22 @@ it("should be possible to import json data async", function() {
 				aa: 1,
 				bb: 2,
 				"1": "x"
-			},
-			[Symbol.toStringTag]: "Module"
-		});
-		expect(f).toEqual({
+			}
+		}));
+		expect(f).toEqual(nsObj({
 			named: "named",
 			default: {
 				named: "named",
 				"default": "default",
 				__esModule: true
-			},
-			[Symbol.toStringTag]: "Module"
-		});
-		expect(g).toEqual({
+			}
+		}));
+		expect(g).toEqual(nsObj({
 			named: {},
 			default: {
 				named: {}
-			},
-			[Symbol.toStringTag]: "Module"
-		});
+			}
+		}));
 		expect(g.named).toBe(g.default.named);
 	});
 });
diff --git a/test/cases/mjs/cjs-import-default/index.mjs b/test/cases/mjs/cjs-import-default/index.mjs
index 2094d704219..1168325a807 100644
--- a/test/cases/mjs/cjs-import-default/index.mjs
+++ b/test/cases/mjs/cjs-import-default/index.mjs
@@ -17,33 +17,30 @@ it("should get correct values when importing named exports from a CommonJs modul
 			default: "default"
 		}
 	});
-	expect(star).toEqual({
+	expect(star).toEqual(nsObj({
 		default: {
 			data: "ok",
 			default: "default"
-		},
-		[Symbol.toStringTag]: "Module"
-	});
+		}
+	}));
 	expect({ star }).toEqual({
-		star: {
+		star: nsObj({
 			default: {
 				data: "ok",
 				default: "default"
-			},
-			[Symbol.toStringTag]: "Module"
-		}
+			}
+		})
 	});
 	expect(star.default).toEqual({
 		data: "ok",
 		default: "default"
 	});
-	expect(ns).toEqual({
+	expect(ns).toEqual(nsObj({
 		default: {
 			data: "ok",
 			default: "default"
-		},
-		[Symbol.toStringTag]: "Module"
-	});
+		}
+	}));
 	expect(def1).toEqual({
 		data: "ok",
 		default: "default"
@@ -53,14 +50,13 @@ it("should get correct values when importing named exports from a CommonJs modul
 		default: "default"
 	});
 	expect((typeof data2)).toBe("undefined");
-	expect(reexport).toEqual({
-		ns: {
+	expect(reexport).toEqual(nsObj({
+		ns: nsObj({
 			default: {
 				data: "ok",
 				default: "default"
-			},
-			[Symbol.toStringTag]: "Module"
-		},
+			}
+		}),
 		default: {
 			data: "ok",
 			default: "default"
@@ -69,7 +65,6 @@ it("should get correct values when importing named exports from a CommonJs modul
 			data: "ok",
 			default: "default"
 		},
-		data: undefined,
-		[Symbol.toStringTag]: "Module"
-	});
+		data: undefined
+	}));
 });
diff --git a/test/cases/mjs/namespace-object-lazy/index.mjs b/test/cases/mjs/namespace-object-lazy/index.mjs
index 539e66910d8..daf92e19219 100644
--- a/test/cases/mjs/namespace-object-lazy/index.mjs
+++ b/test/cases/mjs/namespace-object-lazy/index.mjs
@@ -1,13 +1,13 @@
 it("should receive a namespace object when importing commonjs", function(done) {
 	import("./cjs.js").then(function(result) {
-		expect(result).toEqual({ default: { named: "named", default: "default" }, [Symbol.toStringTag]: "Module" });
+		expect(result).toEqual(nsObj({ default: { named: "named", default: "default" } }));
 		done();
 	}).catch(done);
 });
 
 it("should receive a namespace object when importing commonjs with __esModule", function(done) {
 	import("./cjs-esmodule.js").then(function(result) {
-		expect(result).toEqual({ default: { __esModule: true, named: "named", default: "default" }, [Symbol.toStringTag]: "Module" });
+		expect(result).toEqual(nsObj({ default: { __esModule: true, named: "named", default: "default" } }));
 		done();
 	}).catch(done);
 });
@@ -60,27 +60,27 @@ function promiseTest(promise, equalsTo) {
 
 it("should receive a namespace object when importing commonjs via context", function() {
 	return Promise.all([
-		promiseTest(contextCJS("one"), { default: { named: "named", default: "default" }, [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextCJS("two"), { default: { __esModule: true, named: "named", default: "default" }, [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextCJS("three"), { default: { named: "named", default: "default" }, [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextCJS("null"), { default: null, [Symbol.toStringTag]: "Module" })
+		promiseTest(contextCJS("one"), nsObj({ default: { named: "named", default: "default" } })),
+		promiseTest(contextCJS("two"), nsObj({ default: { __esModule: true, named: "named", default: "default" } })),
+		promiseTest(contextCJS("three"), nsObj({ default: { named: "named", default: "default" } })),
+		promiseTest(contextCJS("null"), nsObj({ default: null }))
 	]);
 });
 
 it("should receive a namespace object when importing harmony via context", function() {
 	return Promise.all([
-		promiseTest(contextHarmony("one"), { named: "named", default: "default", [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextHarmony("two"), { named: "named", default: "default", [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextHarmony("three"), { named: "named", default: "default", [Symbol.toStringTag]: "Module" })
+		promiseTest(contextHarmony("one"), nsObj({ named: "named", default: "default" })),
+		promiseTest(contextHarmony("two"), nsObj({ named: "named", default: "default" })),
+		promiseTest(contextHarmony("three"), nsObj({ named: "named", default: "default" }))
 	]);
 });
 
 it("should receive a namespace object when importing mixed content via context", function() {
 	return Promise.all([
-		promiseTest(contextMixed("one"), { default: { named: "named", default: "default" }, [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextMixed("two"), { default: { __esModule: true, named: "named", default: "default" }, [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextMixed("three"), { named: "named", default: "default", [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextMixed("null"), { default: null, [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextMixed("json.json"), { named: "named", default: { named: "named", default: "default" }, [Symbol.toStringTag]: "Module" })
+		promiseTest(contextMixed("one"), nsObj({ default: { named: "named", default: "default" } })),
+		promiseTest(contextMixed("two"), nsObj({ default: { __esModule: true, named: "named", default: "default" } })),
+		promiseTest(contextMixed("three"), nsObj({ named: "named", default: "default" })),
+		promiseTest(contextMixed("null"), nsObj({ default: null })),
+		promiseTest(contextMixed("json.json"), nsObj({ named: "named", default: { named: "named", default: "default" } }))
 	]);
 });
diff --git a/test/cases/mjs/non-mjs-namespace-object-lazy/index.js b/test/cases/mjs/non-mjs-namespace-object-lazy/index.js
index 936032eb9b6..1059b4dc9d4 100644
--- a/test/cases/mjs/non-mjs-namespace-object-lazy/index.js
+++ b/test/cases/mjs/non-mjs-namespace-object-lazy/index.js
@@ -1,6 +1,6 @@
 it("should receive a namespace object when importing commonjs", function(done) {
 	import("./cjs").then(function(result) {
-		expect(result).toEqual({ named: "named", default: { named: "named", default: "default" }, [Symbol.toStringTag]: "Module" });
+		expect(result).toEqual(nsObj({ named: "named", default: { named: "named", default: "default" } }));
 		done();
 	}).catch(done);
 });
@@ -60,27 +60,27 @@ function promiseTest(promise, equalsTo) {
 
 it("should receive a namespace object when importing commonjs via context", function() {
 	return Promise.all([
-		promiseTest(contextCJS("one"), { named: "named", default: { named: "named", default: "default" }, [Symbol.toStringTag]: "Module" }),
+		promiseTest(contextCJS("one"), nsObj({ named: "named", default: { named: "named", default: "default" } })),
 		promiseTest(contextCJS("two"), { __esModule: true, named: "named", default: "default" }),
-		promiseTest(contextCJS("three"), { named: "named", default: { named: "named", default: "default" }, [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextCJS("null"), { default: null, [Symbol.toStringTag]: "Module" })
+		promiseTest(contextCJS("three"), nsObj({ named: "named", default: { named: "named", default: "default" } })),
+		promiseTest(contextCJS("null"), nsObj({ default: null }))
 	]);
 });
 
 it("should receive a namespace object when importing harmony via context", function() {
 	return Promise.all([
-		promiseTest(contextHarmony("one"), { named: "named", default: "default", [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextHarmony("two"), { named: "named", default: "default", [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextHarmony("three"), { named: "named", default: "default", [Symbol.toStringTag]: "Module" })
+		promiseTest(contextHarmony("one"), nsObj({ named: "named", default: "default" })),
+		promiseTest(contextHarmony("two"), nsObj({ named: "named", default: "default" })),
+		promiseTest(contextHarmony("three"), nsObj({ named: "named", default: "default" }))
 	]);
 });
 
 it("should receive a namespace object when importing mixed content via context", function() {
 	return Promise.all([
-		promiseTest(contextMixed("one"), { named: "named", default: { named: "named", default: "default" }, [Symbol.toStringTag]: "Module" }),
+		promiseTest(contextMixed("one"), nsObj({ named: "named", default: { named: "named", default: "default" } })),
 		promiseTest(contextMixed("two"), { __esModule: true, named: "named", default: "default" }),
-		promiseTest(contextMixed("three"), { named: "named", default: "default", [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextMixed("null"), { default: null, [Symbol.toStringTag]: "Module" }),
-		promiseTest(contextMixed("json.json"), { named: "named", default: { named: "named", default: "default" }, [Symbol.toStringTag]: "Module" })
+		promiseTest(contextMixed("three"), nsObj({ named: "named", default: "default" })),
+		promiseTest(contextMixed("null"), nsObj({ default: null })),
+		promiseTest(contextMixed("json.json"), nsObj({ named: "named", default: { named: "named", default: "default" } }))
 	]);
 });
diff --git a/test/cases/optimize/side-effects-reexport-start-unknown/index.js b/test/cases/optimize/side-effects-reexport-start-unknown/index.js
index 4c1a54309e3..2bdff81530b 100644
--- a/test/cases/optimize/side-effects-reexport-start-unknown/index.js
+++ b/test/cases/optimize/side-effects-reexport-start-unknown/index.js
@@ -2,5 +2,5 @@ import * as m from "m";
 
 it("should handle unknown exports fine", function() {
 	var x = m;
-	expect(x).toEqual({ foo: "foo", [Symbol.toStringTag]: "Module" });
+	expect(x).toEqual(nsObj({ foo: "foo" }));
 });
diff --git a/test/cases/optimize/tree-shaking-star2/index.js b/test/cases/optimize/tree-shaking-star2/index.js
index 676392638a8..0d1e070818d 100644
--- a/test/cases/optimize/tree-shaking-star2/index.js
+++ b/test/cases/optimize/tree-shaking-star2/index.js
@@ -6,9 +6,8 @@ it("should correctly tree shake star exports", function() {
 	expect(aa).toBe("aa");
 	expect(aa2).toBe("aa");
 	expect(d).toBe("d");
-	expect(root6).toEqual({
+	expect(root6).toEqual(nsObj({
 		aa: "aa",
-		c: "c",
-		[Symbol.toStringTag]: "Module"
-	});
+		c: "c"
+	}));
 });
diff --git a/test/cases/parsing/harmony-commonjs-mix/index.js b/test/cases/parsing/harmony-commonjs-mix/index.js
index 7947bbf08a2..745a4323c78 100644
--- a/test/cases/parsing/harmony-commonjs-mix/index.js
+++ b/test/cases/parsing/harmony-commonjs-mix/index.js
@@ -1,7 +1,6 @@
 it("should result in a warning when using module.exports in harmony module", function() {
 	var x = require("./module1");
-	expect(x).toEqual({
-		default: 1234,
-		[Symbol.toStringTag]: "Module"
-	});
+	expect(x).toEqual(nsObj({
+		default: 1234
+	}));
 });
diff --git a/test/cases/parsing/issue-2050/index.js b/test/cases/parsing/issue-2050/index.js
index 4c28c4bac3e..6b05b3d8066 100644
--- a/test/cases/parsing/issue-2050/index.js
+++ b/test/cases/parsing/issue-2050/index.js
@@ -1,9 +1,8 @@
 it("should support multiple reexports", function() {
-	expect(require("./x")).toEqual({
+	expect(require("./x")).toEqual(nsObj({
 		xa: "a",
 		xb: "b",
 		xc: "c",
-		xd: "d",
-		[Symbol.toStringTag]: "Module"
-	});
+		xd: "d"
+	}));
 });
diff --git a/test/cases/parsing/issue-2522/index.js b/test/cases/parsing/issue-2522/index.js
index a727d989f25..e28c668496e 100644
--- a/test/cases/parsing/issue-2522/index.js
+++ b/test/cases/parsing/issue-2522/index.js
@@ -13,10 +13,9 @@ it("should import into object shorthand", function() {
 		a: 123,
 		aa: 123,
 		b: 456,
-		c: {
+		c: nsObj({
 			a: 123,
-			default: 456,
-			[Symbol.toStringTag]: "Module"
-		}
+			default: 456
+		})
 	});
 })
diff --git a/test/cases/parsing/issue-3964/index.js b/test/cases/parsing/issue-3964/index.js
index 9671c573578..f5765f4be7f 100644
--- a/test/cases/parsing/issue-3964/index.js
+++ b/test/cases/parsing/issue-3964/index.js
@@ -1,4 +1,4 @@
 it("should be possible to export default an imported name", function() {
 	var x = require("./module");
-	expect(x).toEqual({ default: 1234, [Symbol.toStringTag]: "Module" });
+	expect(x).toEqual(nsObj({ default: 1234 }));
 });
diff --git a/test/cases/parsing/issue-4179/index.js b/test/cases/parsing/issue-4179/index.js
index 475b9e1ee1e..ff5224b2338 100644
--- a/test/cases/parsing/issue-4179/index.js
+++ b/test/cases/parsing/issue-4179/index.js
@@ -2,7 +2,7 @@ import def from "./module?harmony";
 import * as mod from "./module?harmony-start"
 
 it("should export a sequence expression correctly", function() {
-	expect(require("./module?cjs")).toEqual({ default: 2, [Symbol.toStringTag]: "Module" });
+	expect(require("./module?cjs")).toEqual(nsObj({ default: 2 }));
 	expect(def).toBe(2);
 	expect(mod.default).toBe(2);
 });
diff --git a/test/cases/parsing/issue-7728/a.js b/test/cases/parsing/issue-7728/a.js
new file mode 100644
index 00000000000..e6a3f0e24c7
--- /dev/null
+++ b/test/cases/parsing/issue-7728/a.js
@@ -0,0 +1,3 @@
+export default function test() {
+  return "OK";
+}
diff --git a/test/cases/parsing/issue-7728/index.js b/test/cases/parsing/issue-7728/index.js
new file mode 100644
index 00000000000..f685c315367
--- /dev/null
+++ b/test/cases/parsing/issue-7728/index.js
@@ -0,0 +1,4 @@
+it("should detect module.require dependency", function () {
+	var test1 = module.require('./a').default;
+	expect(test1()).toBe("OK");
+});
diff --git a/test/cases/parsing/issue-7778/a.js b/test/cases/parsing/issue-7778/a.js
new file mode 100644
index 00000000000..aa67bc111bf
--- /dev/null
+++ b/test/cases/parsing/issue-7778/a.js
@@ -0,0 +1,3 @@
+export default function a() {
+    return 'a' + __resourceQuery
+}
diff --git a/test/cases/parsing/issue-7778/abc.js b/test/cases/parsing/issue-7778/abc.js
new file mode 100644
index 00000000000..0b6145ef755
--- /dev/null
+++ b/test/cases/parsing/issue-7778/abc.js
@@ -0,0 +1,3 @@
+export default function abc() {
+    return 'abc' + __resourceQuery
+}
diff --git a/test/cases/parsing/issue-7778/index.js b/test/cases/parsing/issue-7778/index.js
new file mode 100644
index 00000000000..0f8dda218e5
--- /dev/null
+++ b/test/cases/parsing/issue-7778/index.js
@@ -0,0 +1,57 @@
+it("should detect query strings in dynamic import as a static value 1 ", function() {
+	return Promise.all([
+		import("./a").then(({ default: a }) => {
+			expect(a()).toBe("a");
+		}),
+		import("./abc").then(({ default: a }) => {
+			expect(a()).toBe("abc");
+		}),
+		import("./a?queryString").then(({ default: a }) => {
+			expect(a()).toBe("a?queryString");
+		}),
+		import("./abc?query?String").then(({ default: a }) => {
+			expect(a()).toBe("abc?query?String");
+		}),
+	]);
+});
+
+it("should detect query strings in dynamic import as a static value 2", function() {
+	var testFileName = "a";
+
+	return Promise.all([
+		import(`./${testFileName}`).then(({ default: a }) => {
+			expect(a()).toBe("a");
+		}),
+		import(`./${testFileName}bc`).then(({ default: a }) => {
+			expect(a()).toBe("abc");
+		}),
+		import(`./${testFileName}?queryString`).then(({ default: a }) => {
+			expect(a()).toBe("a?queryString");
+		}),
+		import(`./${testFileName}bc?query?String`).then(({ default: a }) => {
+			expect(a()).toBe("abc?query?String");
+		})
+	]);
+});
+
+it("should detect query strings in dynamic import as a static value 2", function() {
+	var testFileName = "a";
+
+	return Promise.all([
+		import("./" + testFileName).then(({ default: a }) => {
+			expect(a()).toBe("a");
+		}),
+		import("./" + testFileName + "").then(({ default: a }) => {
+			expect(a()).toBe("a");
+		}),
+		import("./" + testFileName + "bc").then(({ default: a }) => {
+			expect(a()).toBe("abc");
+		}),
+		import("./" + testFileName + "?queryString").then(({ default: a }) => {
+			expect(a()).toBe("a?queryString");
+		}),
+		import("./" + testFileName + "bc?query?String").then(({ default: a }) => {
+			expect(a()).toBe("abc?query?String");
+		})
+	]);
+});
diff --git a/test/cases/scope-hoisting/export-namespace/index.js b/test/cases/scope-hoisting/export-namespace/index.js
index f551d349e83..8020f45e589 100644
--- a/test/cases/scope-hoisting/export-namespace/index.js
+++ b/test/cases/scope-hoisting/export-namespace/index.js
@@ -2,17 +2,15 @@ import { ns as ns1 } from "./module1";
 const ns2 = require("./module2").ns;
 
 it("should allow to export a namespace object (concated)", function() {
-	expect(ns1).toEqual({
+	expect(ns1).toEqual(nsObj({
 		a: "a",
-		b: "b",
-		[Symbol.toStringTag]: "Module"
-	});
+		b: "b"
+	}));
 });
 
 it("should allow to export a namespace object (exposed)", function() {
-	expect(ns2).toEqual({
+	expect(ns2).toEqual(nsObj({
 		a: "a",
-		b: "b",
-		[Symbol.toStringTag]: "Module"
-	});
+		b: "b"
+	}));
 });
diff --git a/test/cases/scope-hoisting/issue-5020-minimal/index.js b/test/cases/scope-hoisting/issue-5020-minimal/index.js
index c664793105a..cd70d349d65 100644
--- a/test/cases/scope-hoisting/issue-5020-minimal/index.js
+++ b/test/cases/scope-hoisting/issue-5020-minimal/index.js
@@ -1,14 +1,13 @@
 var testData = require("./src/index.js");
 
 it("should export the correct values", function() {
-	expect(testData).toEqual({
-		icon: {
-			svg: {
-				default: 1,
-				[Symbol.toStringTag]: "Module"
-			},
-			[Symbol.toStringTag]: "Module"
-		},
-		[Symbol.toStringTag]: "Module"
-	});
+	expect(testData).toEqual(
+		nsObj({
+			icon: nsObj({
+				svg: nsObj({
+					default: 1
+				})
+			})
+		})
+	);
 });
diff --git a/test/cases/scope-hoisting/issue-5020/index.js b/test/cases/scope-hoisting/issue-5020/index.js
index df60a977d4e..a841b19370a 100644
--- a/test/cases/scope-hoisting/issue-5020/index.js
+++ b/test/cases/scope-hoisting/issue-5020/index.js
@@ -1,31 +1,28 @@
 var testData = require("./src/index.js");
 
 it("should export the correct values", function() {
-	expect(testData).toEqual({
-		svg5: {
-			svg: {
-				clinical1: {
-					svg1: 1
-				},
-				clinical2: {
-					svg2: 2
-				},
-				[Symbol.toStringTag]: "Module"
-			},
-			[Symbol.toStringTag]: "Module"
-		},
-		svg6: {
-			svg: {
-				test: {
-					svg1: 10
-				},
-				clinical2: {
-					svg2: 20
-				},
-				[Symbol.toStringTag]: "Module"
-			},
-			[Symbol.toStringTag]: "Module"
-		},
-		[Symbol.toStringTag]: "Module"
-	});
+	expect(testData).toEqual(
+		nsObj({
+			svg5: nsObj({
+				svg: nsObj({
+					clinical1: {
+						svg1: 1
+					},
+					clinical2: {
+						svg2: 2
+					}
+				})
+			}),
+			svg6: nsObj({
+				svg: nsObj({
+					test: {
+						svg1: 10
+					},
+					clinical2: {
+						svg2: 20
+					}
+				})
+			})
+		})
+	);
 })
diff --git a/test/cases/scope-hoisting/issue-5443/index.js b/test/cases/scope-hoisting/issue-5443/index.js
index 30c2bdb7de3..f6d76307bc0 100644
--- a/test/cases/scope-hoisting/issue-5443/index.js
+++ b/test/cases/scope-hoisting/issue-5443/index.js
@@ -1,9 +1,8 @@
 import { module } from "./reexport";
 
 it("should have the correct values", function() {
-	expect(module).toEqual({
+	expect(module).toEqual(nsObj({
 		default: "default",
-		named: "named",
-		[Symbol.toStringTag]: "Module"
-	});
+		named: "named"
+	}));
 });
diff --git a/test/cases/scope-hoisting/issue-7930/export.js b/test/cases/scope-hoisting/issue-7930/export.js
new file mode 100644
index 00000000000..02fdba6f51e
--- /dev/null
+++ b/test/cases/scope-hoisting/issue-7930/export.js
@@ -0,0 +1,5 @@
+export var a = 1;
+
+var value = 42;
+
+export { value };
diff --git a/test/cases/scope-hoisting/issue-7930/index.js b/test/cases/scope-hoisting/issue-7930/index.js
new file mode 100644
index 00000000000..fae3343e4d2
--- /dev/null
+++ b/test/cases/scope-hoisting/issue-7930/index.js
@@ -0,0 +1,10 @@
+import { value } from "./module";
+
+it("should export the correct value", () => {
+	expect(value).toBe(42);
+});
+
+// prevent scope hoisting
+if(Math.random() < -1) {
+	console.log(module.id);
+}
diff --git a/test/cases/scope-hoisting/issue-7930/module.js b/test/cases/scope-hoisting/issue-7930/module.js
new file mode 100644
index 00000000000..ffea9c3cfea
--- /dev/null
+++ b/test/cases/scope-hoisting/issue-7930/module.js
@@ -0,0 +1 @@
+export * from "./export";
diff --git a/test/cases/side-effects/missing-module-7499/example/constants.js b/test/cases/side-effects/missing-module-7499/example/constants.js
new file mode 100644
index 00000000000..9b857576f70
--- /dev/null
+++ b/test/cases/side-effects/missing-module-7499/example/constants.js
@@ -0,0 +1 @@
+export const hello = 'world'
diff --git a/test/cases/side-effects/missing-module-7499/example/index.js b/test/cases/side-effects/missing-module-7499/example/index.js
new file mode 100644
index 00000000000..a06738b7396
--- /dev/null
+++ b/test/cases/side-effects/missing-module-7499/example/index.js
@@ -0,0 +1,2 @@
+import * as constants from './constants'
+export { constants }
diff --git a/test/cases/side-effects/missing-module-7499/example/package.json b/test/cases/side-effects/missing-module-7499/example/package.json
new file mode 100644
index 00000000000..a43829151e1
--- /dev/null
+++ b/test/cases/side-effects/missing-module-7499/example/package.json
@@ -0,0 +1,3 @@
+{
+  "sideEffects": false
+}
diff --git a/test/cases/side-effects/missing-module-7499/index.js b/test/cases/side-effects/missing-module-7499/index.js
new file mode 100644
index 00000000000..fea57ceb0c5
--- /dev/null
+++ b/test/cases/side-effects/missing-module-7499/index.js
@@ -0,0 +1,9 @@
+import './example'
+
+it("should run correctly", function() {
+	return import('./lazy').then(lazy => {
+		expect(lazy.default()).toEqual(nsObj({
+			hello: "world"
+		}));
+	})
+});
diff --git a/test/cases/side-effects/missing-module-7499/lazy.js b/test/cases/side-effects/missing-module-7499/lazy.js
new file mode 100644
index 00000000000..f916eaa5b10
--- /dev/null
+++ b/test/cases/side-effects/missing-module-7499/lazy.js
@@ -0,0 +1,5 @@
+import { constants } from './example'
+
+export default function getConstants() {
+	return constants;
+}
diff --git a/test/cases/side-effects/order-issue-7665/index.js b/test/cases/side-effects/order-issue-7665/index.js
new file mode 100644
index 00000000000..378de0e896e
--- /dev/null
+++ b/test/cases/side-effects/order-issue-7665/index.js
@@ -0,0 +1,7 @@
+import array from "./tracker";
+import { b } from "./module";
+
+it("should evaulate modules in the correct order", () => {
+	expect(b).toEqual("b");
+	expect(array).toEqual(["b", "a"]);
+})
diff --git a/test/cases/side-effects/order-issue-7665/module/a.js b/test/cases/side-effects/order-issue-7665/module/a.js
new file mode 100644
index 00000000000..635f930d2ac
--- /dev/null
+++ b/test/cases/side-effects/order-issue-7665/module/a.js
@@ -0,0 +1,5 @@
+import array from "../tracker";
+
+array.push("a");
+
+export default "a";
diff --git a/test/cases/side-effects/order-issue-7665/module/b.js b/test/cases/side-effects/order-issue-7665/module/b.js
new file mode 100644
index 00000000000..3c47022b329
--- /dev/null
+++ b/test/cases/side-effects/order-issue-7665/module/b.js
@@ -0,0 +1,5 @@
+import array from "../tracker";
+
+array.push("b");
+
+export default "b";
diff --git a/test/cases/side-effects/order-issue-7665/module/index.js b/test/cases/side-effects/order-issue-7665/module/index.js
new file mode 100644
index 00000000000..6303d91ada7
--- /dev/null
+++ b/test/cases/side-effects/order-issue-7665/module/index.js
@@ -0,0 +1,4 @@
+import b from './b';
+import './a';
+
+export { b };
diff --git a/test/cases/side-effects/order-issue-7665/module/package.json b/test/cases/side-effects/order-issue-7665/module/package.json
new file mode 100644
index 00000000000..a4ec69bc4ab
--- /dev/null
+++ b/test/cases/side-effects/order-issue-7665/module/package.json
@@ -0,0 +1,6 @@
+{
+  "sideEffects": [
+    "./index.js",
+    "./a.js"
+  ]
+}
diff --git a/test/cases/side-effects/order-issue-7665/tracker.js b/test/cases/side-effects/order-issue-7665/tracker.js
new file mode 100644
index 00000000000..d6d1738de67
--- /dev/null
+++ b/test/cases/side-effects/order-issue-7665/tracker.js
@@ -0,0 +1 @@
+export default [];
diff --git a/test/configCases/chunk-index/order-multiple-entries/a.js b/test/configCases/chunk-index/order-multiple-entries/a.js
new file mode 100644
index 00000000000..7777e2e08e5
--- /dev/null
+++ b/test/configCases/chunk-index/order-multiple-entries/a.js
@@ -0,0 +1 @@
+import "./shared";
\ No newline at end of file
diff --git a/test/configCases/chunk-index/order-multiple-entries/async.js b/test/configCases/chunk-index/order-multiple-entries/async.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/configCases/chunk-index/order-multiple-entries/b.js b/test/configCases/chunk-index/order-multiple-entries/b.js
new file mode 100644
index 00000000000..7777e2e08e5
--- /dev/null
+++ b/test/configCases/chunk-index/order-multiple-entries/b.js
@@ -0,0 +1 @@
+import "./shared";
\ No newline at end of file
diff --git a/test/configCases/chunk-index/order-multiple-entries/c.js b/test/configCases/chunk-index/order-multiple-entries/c.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/configCases/chunk-index/order-multiple-entries/entry1.js b/test/configCases/chunk-index/order-multiple-entries/entry1.js
new file mode 100644
index 00000000000..32a5fa8c867
--- /dev/null
+++ b/test/configCases/chunk-index/order-multiple-entries/entry1.js
@@ -0,0 +1,6 @@
+import "./a";
+import(/* webpackChunkName: "async" */ "./async");
+import "./b";
+import "./c";
+
+it("should compile", () => {});
diff --git a/test/configCases/chunk-index/order-multiple-entries/entry2.js b/test/configCases/chunk-index/order-multiple-entries/entry2.js
new file mode 100644
index 00000000000..aa9ec2317ed
--- /dev/null
+++ b/test/configCases/chunk-index/order-multiple-entries/entry2.js
@@ -0,0 +1,6 @@
+import "./c";
+import(/* webpackChunkName: "async" */ "./async");
+import "./b";
+import "./a";
+
+it("should compile", () => {});
diff --git a/test/configCases/chunk-index/order-multiple-entries/shared.js b/test/configCases/chunk-index/order-multiple-entries/shared.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/configCases/chunk-index/order-multiple-entries/test.config.js b/test/configCases/chunk-index/order-multiple-entries/test.config.js
new file mode 100644
index 00000000000..65c1791bce3
--- /dev/null
+++ b/test/configCases/chunk-index/order-multiple-entries/test.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	findBundle: function(i, options) {
+		return ["entry1.js", "entry2.js"];
+	}
+};
diff --git a/test/configCases/chunk-index/order-multiple-entries/webpack.config.js b/test/configCases/chunk-index/order-multiple-entries/webpack.config.js
new file mode 100644
index 00000000000..29d22978153
--- /dev/null
+++ b/test/configCases/chunk-index/order-multiple-entries/webpack.config.js
@@ -0,0 +1,99 @@
+/** @typedef {import("../../../../lib/Compilation")} Compilation */
+/** @typedef {import("../../../../lib/Module")} Module */
+
+module.exports = {
+	entry: {
+		entry1: "./entry1",
+		entry2: "./entry2"
+	},
+	output: {
+		filename: "[name].js"
+	},
+	plugins: [
+		function() {
+			/**
+			 * @param {Compilation} compilation compilation
+			 * @returns {void}
+			 */
+			const handler = compilation => {
+				compilation.hooks.afterSeal.tap("testcase", () => {
+					const data = {};
+					for (const [name, group] of compilation.namedChunkGroups) {
+						/** @type {Map<Module, number>} */
+						const modules = new Map();
+						const modules2 = new Map();
+						for (const chunk of group.chunks) {
+							for (const module of chunk.modulesIterable) {
+								modules.set(module, group.getModuleIndex(module));
+								modules2.set(module, group.getModuleIndex2(module));
+							}
+						}
+						const sortedModules = Array.from(modules).sort((a, b) => {
+							return a[1] - b[1];
+						});
+						const sortedModules2 = Array.from(modules2).sort((a, b) => {
+							return a[1] - b[1];
+						});
+						const text = sortedModules
+							.map(
+								([m, index]) =>
+									`${index}: ${m.readableIdentifier(
+										compilation.requestShortener
+									)}`
+							)
+							.join(", ");
+						const text2 = sortedModules2
+							.map(
+								([m, index]) =>
+									`${index}: ${m.readableIdentifier(
+										compilation.requestShortener
+									)}`
+							)
+							.join(", ");
+						data[name + "Index"] = text;
+						data[name + "Index2"] = text2;
+					}
+					expect(data).toEqual({
+						entry1Index:
+							"0: ./entry1.js, 1: ./a.js, 2: ./shared.js, 3: ./b.js, 4: ./c.js",
+						entry1Index2:
+							"0: ./shared.js, 1: ./a.js, 2: ./b.js, 3: ./c.js, 4: ./entry1.js",
+						entry2Index:
+							"0: ./entry2.js, 1: ./c.js, 2: ./b.js, 3: ./shared.js, 4: ./a.js",
+						entry2Index2:
+							"0: ./c.js, 1: ./shared.js, 2: ./b.js, 3: ./a.js, 4: ./entry2.js",
+						asyncIndex: "0: ./async.js",
+						asyncIndex2: "0: ./async.js"
+					});
+					const indicies = compilation.modules
+						.slice()
+						.sort((a, b) => a.index - b.index)
+						.map(
+							m =>
+								`${m.index}: ${m.readableIdentifier(
+									compilation.requestShortener
+								)}`
+						)
+						.join(", ");
+					const indicies2 = compilation.modules
+						.slice()
+						.sort((a, b) => a.index2 - b.index2)
+						.map(
+							m =>
+								`${m.index2}: ${m.readableIdentifier(
+									compilation.requestShortener
+								)}`
+						)
+						.join(", ");
+					expect(indicies).toEqual(
+						"0: ./entry1.js, 1: ./a.js, 2: ./shared.js, 3: ./b.js, 4: ./c.js, 5: ./entry2.js, 6: ./async.js"
+					);
+					expect(indicies2).toEqual(
+						"0: ./shared.js, 1: ./a.js, 2: ./b.js, 3: ./c.js, 4: ./entry1.js, 5: ./entry2.js, 6: ./async.js"
+					);
+				});
+			};
+			this.hooks.compilation.tap("testcase", handler);
+		}
+	]
+};
diff --git a/test/configCases/code-generation/harmony-pure-default/index.js b/test/configCases/code-generation/harmony-pure-default/index.js
new file mode 100644
index 00000000000..118a3f377a4
--- /dev/null
+++ b/test/configCases/code-generation/harmony-pure-default/index.js
@@ -0,0 +1,11 @@
+import { value as v1 } from "./module1";
+import { value as v2 } from "./module2";
+import { value as v3 } from "./module3";
+import { value as v4 } from "./module4";
+
+it("should not execute exports when annotated with pure comment", () => {
+	expect(v1).toBe(42);
+	expect(v2).toBe(42);
+	expect(v3).toBe(42);
+	expect(v4).toBe(42);
+});
diff --git a/test/configCases/code-generation/harmony-pure-default/module1.js b/test/configCases/code-generation/harmony-pure-default/module1.js
new file mode 100644
index 00000000000..ff5746bdac4
--- /dev/null
+++ b/test/configCases/code-generation/harmony-pure-default/module1.js
@@ -0,0 +1,9 @@
+let value = 42;
+
+const inc = () => {
+	value++;
+};
+
+export default /*#__PURE__*/inc();
+
+export { value };
diff --git a/test/configCases/code-generation/harmony-pure-default/module2.js b/test/configCases/code-generation/harmony-pure-default/module2.js
new file mode 100644
index 00000000000..cf69c28f83d
--- /dev/null
+++ b/test/configCases/code-generation/harmony-pure-default/module2.js
@@ -0,0 +1,9 @@
+let value = 42;
+
+const inc = () => {
+	value++;
+};
+
+export default (/*#__PURE__*/inc());
+
+export { value };
diff --git a/test/configCases/code-generation/harmony-pure-default/module3.js b/test/configCases/code-generation/harmony-pure-default/module3.js
new file mode 100644
index 00000000000..e7e874cd6d3
--- /dev/null
+++ b/test/configCases/code-generation/harmony-pure-default/module3.js
@@ -0,0 +1,9 @@
+let value = 42;
+
+const inc = () => {
+	value++;
+};
+
+export default /*#__PURE__*/(inc());
+
+export { value };
diff --git a/test/configCases/code-generation/harmony-pure-default/module4.js b/test/configCases/code-generation/harmony-pure-default/module4.js
new file mode 100644
index 00000000000..c312ca1772a
--- /dev/null
+++ b/test/configCases/code-generation/harmony-pure-default/module4.js
@@ -0,0 +1,15 @@
+let value = 42;
+
+const inc = () => {
+	value++;
+};
+
+export
+// hello
+default
+// world
+/*#__PURE__*/
+inc()
+;
+
+export { value };
diff --git a/test/configCases/code-generation/harmony-pure-default/webpack.config.js b/test/configCases/code-generation/harmony-pure-default/webpack.config.js
new file mode 100644
index 00000000000..94fea42dc99
--- /dev/null
+++ b/test/configCases/code-generation/harmony-pure-default/webpack.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+	mode: "production",
+	optimization: {
+		minimize: true,
+		concatenateModules: false
+	}
+};
diff --git a/test/configCases/code-generation/use-strict/index.js b/test/configCases/code-generation/use-strict/index.js
index cf05674bee8..8f132820682 100644
--- a/test/configCases/code-generation/use-strict/index.js
+++ b/test/configCases/code-generation/use-strict/index.js
@@ -15,12 +15,14 @@ it("should include only one use strict per module", function() {
 		match = regExp.exec(source);
 	}
 
+	matches.sort();
+
 	expect(matches).toEqual([
-		"__webpack_require__.r(__webpack_exports__);",
 		"/* unused harmony default export */ var _unused_webpack_default_export = (\"a\");",
 		"__webpack_require__.r(__webpack_exports__);",
 		"__webpack_require__.r(__webpack_exports__);",
 		"__webpack_require__.r(__webpack_exports__);",
+		"__webpack_require__.r(__webpack_exports__);",
 		"it(\"should include only one use strict per module\", function() {",
 	]);
 });
diff --git a/test/configCases/contenthash/include-chunk-id/chunk.js b/test/configCases/contenthash/include-chunk-id/chunk.js
new file mode 100644
index 00000000000..5ac3a600d4e
--- /dev/null
+++ b/test/configCases/contenthash/include-chunk-id/chunk.js
@@ -0,0 +1 @@
+module.exports = "chunk";
diff --git a/test/configCases/contenthash/include-chunk-id/index.js b/test/configCases/contenthash/include-chunk-id/index.js
new file mode 100644
index 00000000000..5d6e2d0a77d
--- /dev/null
+++ b/test/configCases/contenthash/include-chunk-id/index.js
@@ -0,0 +1,5 @@
+it("should compile and run the test", function () {});
+
+if(Math.random() < -1) {
+	import(/* webpackChunkName: "chunk" */ "./chunk");
+}
diff --git a/test/configCases/contenthash/include-chunk-id/test.config.js b/test/configCases/contenthash/include-chunk-id/test.config.js
new file mode 100644
index 00000000000..6aa0c3c30ca
--- /dev/null
+++ b/test/configCases/contenthash/include-chunk-id/test.config.js
@@ -0,0 +1,32 @@
+var fs = require("fs");
+
+var findFile = function(files, regex) {
+	return files.find(function(file) {
+		if (regex.test(file)) {
+			return true;
+		}
+	});
+};
+
+const allFilenameHashes = new Set();
+const allChunkHashes = new Set();
+
+module.exports = {
+	findBundle: function(i, options) {
+		var files = fs.readdirSync(options.output.path);
+
+		const filename = findFile(files, new RegExp(`^bundle${i}`));
+		const filenameHash = /\.([a-f0-9]+)\.js$/.exec(filename)[1];
+		allFilenameHashes.add(filenameHash);
+
+		const chunk = findFile(files, new RegExp(`^chunk${i}`));
+		const chunkHash = /\.([a-f0-9]+)\.js$/.exec(chunk)[1];
+		allChunkHashes.add(chunkHash);
+
+		return "./" + filename;
+	},
+	afterExecute: () => {
+		expect(allFilenameHashes.size).toBe(2);
+		expect(allChunkHashes.size).toBe(2);
+	}
+};
diff --git a/test/configCases/contenthash/include-chunk-id/webpack.config.js b/test/configCases/contenthash/include-chunk-id/webpack.config.js
new file mode 100644
index 00000000000..c5a898a9420
--- /dev/null
+++ b/test/configCases/contenthash/include-chunk-id/webpack.config.js
@@ -0,0 +1,26 @@
+module.exports = [
+	{
+		mode: "production",
+		name: "normal-ids",
+		output: {
+			filename: "bundle0.[contenthash:6].js",
+			chunkFilename: "chunk0.[contenthash:6].js"
+		},
+		optimization: {
+			chunkIds: "size",
+			moduleIds: "named"
+		}
+	},
+	{
+		mode: "production",
+		name: "normal-ids",
+		output: {
+			filename: "bundle1.[contenthash:6].js",
+			chunkFilename: "chunk1.[contenthash:6].js"
+		},
+		optimization: {
+			chunkIds: "named",
+			moduleIds: "named"
+		}
+	}
+];
diff --git a/test/configCases/context-replacement/System.import/index.js b/test/configCases/context-replacement/System.import/index.js
index c2afdd5a49e..c96946800d2 100644
--- a/test/configCases/context-replacement/System.import/index.js
+++ b/test/configCases/context-replacement/System.import/index.js
@@ -1,6 +1,6 @@
 it("should replace a async context with a manual map", function() {
 	var a = "a";
 	return import(a).then(function(a) {
-		expect(a).toEqual({ default: "b", [Symbol.toStringTag]: "Module" });
+		expect(a).toEqual(nsObj({ default: "b" }));
 	});
 });
diff --git a/test/configCases/crossorigin/set-crossorigin/empty.js b/test/configCases/crossorigin/set-crossorigin/empty.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/configCases/crossorigin/set-crossorigin/index.js b/test/configCases/crossorigin/set-crossorigin/index.js
new file mode 100644
index 00000000000..6330978d157
--- /dev/null
+++ b/test/configCases/crossorigin/set-crossorigin/index.js
@@ -0,0 +1,67 @@
+it("should load script without crossorigin attribute (default)", function() {
+	const promise = import("./empty?a" /* webpackChunkName: "crossorigin-default" */);
+
+	var script = document.head._children.pop();
+	__non_webpack_require__("./crossorigin-default.web.js");
+	expect(script.src).toBe("https://test.cases/path/crossorigin-default.web.js");
+	expect(script.crossOrigin).toBe(undefined);
+
+	return promise;
+});
+
+it("should load script without crossorigin attribute (relative)", function() {
+	var originalValue = __webpack_public_path__;
+	__webpack_public_path__ = "../";
+	const promise = import("./empty?b" /* webpackChunkName: "crossorigin-relative" */);
+	__webpack_public_path__ = originalValue;
+
+	var script = document.head._children.pop();
+	__non_webpack_require__("./crossorigin-relative.web.js");
+	expect(script.src).toBe("https://test.cases/crossorigin-relative.web.js");
+	expect(script.crossOrigin).toBe(undefined);
+
+	return promise;
+});
+
+it("should load script without crossorigin attribute (server relative)", function() {
+	var originalValue = __webpack_public_path__;
+	__webpack_public_path__ = "/server/";
+	const promise = import("./empty?c" /* webpackChunkName: "crossorigin-server-relative" */);
+	__webpack_public_path__ = originalValue;
+
+	var script = document.head._children.pop();
+	__non_webpack_require__("./crossorigin-server-relative.web.js");
+	expect(script.src).toBe("https://test.cases/server/crossorigin-server-relative.web.js");
+	expect(script.crossOrigin).toBe(undefined);
+
+	return promise;
+});
+
+it("should load script without crossorigin attribute (same origin)", function() {
+	var originalValue = __webpack_public_path__;
+	__webpack_public_path__ = "https://test.cases/";
+	const promise = import("./empty?d" /* webpackChunkName: "crossorigin-same-origin" */);
+	__webpack_public_path__ = originalValue;
+
+	var script = document.head._children.pop();
+	__non_webpack_require__("./crossorigin-same-origin.web.js");
+	expect(script.src).toBe("https://test.cases/crossorigin-same-origin.web.js");
+	expect(script.crossOrigin).toBe(undefined);
+
+	return promise;
+});
+
+it("should load script with crossorigin attribute anonymous (different origin)", function() {
+	var originalValue = __webpack_public_path__;
+	__webpack_public_path__ = "https://example.com/";
+	const promise = import("./empty?e" /* webpackChunkName: "crossorigin-different-origin" */);
+	__webpack_public_path__ = originalValue;
+
+
+	var script = document.head._children.pop();
+	__non_webpack_require__("./crossorigin-different-origin.web.js");
+	expect(script.src).toBe("https://example.com/crossorigin-different-origin.web.js");
+	expect(script.crossOrigin).toBe("anonymous");
+
+	return promise;
+});
diff --git a/test/configCases/crossorigin/set-crossorigin/webpack.config.js b/test/configCases/crossorigin/set-crossorigin/webpack.config.js
new file mode 100644
index 00000000000..68eeb96a523
--- /dev/null
+++ b/test/configCases/crossorigin/set-crossorigin/webpack.config.js
@@ -0,0 +1,13 @@
+module.exports = {
+	target: "web",
+	output: {
+		chunkFilename: "[name].web.js",
+		crossOriginLoading: "anonymous"
+	},
+	performance: {
+		hints: false
+	},
+	optimization: {
+		minimize: false
+	}
+};
diff --git a/test/configCases/deep-scope-analysis/remove-export-scope-hoisting/index.js b/test/configCases/deep-scope-analysis/remove-export-scope-hoisting/index.js
new file mode 100644
index 00000000000..be12281baf0
--- /dev/null
+++ b/test/configCases/deep-scope-analysis/remove-export-scope-hoisting/index.js
@@ -0,0 +1,9 @@
+import { test, unused } from "./module";
+
+it("should run the test", () => {
+	expect(test()).toEqual({
+		used: "used",
+		unused: undefined
+	});
+	expect(unused).toEqual(undefined);
+});
diff --git a/test/configCases/deep-scope-analysis/remove-export-scope-hoisting/module.js b/test/configCases/deep-scope-analysis/remove-export-scope-hoisting/module.js
new file mode 100644
index 00000000000..8d9ec8267b9
--- /dev/null
+++ b/test/configCases/deep-scope-analysis/remove-export-scope-hoisting/module.js
@@ -0,0 +1,10 @@
+import { used, unused } from "./reference";
+
+export function test() {
+	return {
+		used,
+		unused
+	};
+}
+
+export { unused }
diff --git a/test/configCases/deep-scope-analysis/remove-export-scope-hoisting/reference.js b/test/configCases/deep-scope-analysis/remove-export-scope-hoisting/reference.js
new file mode 100644
index 00000000000..725c814ac8f
--- /dev/null
+++ b/test/configCases/deep-scope-analysis/remove-export-scope-hoisting/reference.js
@@ -0,0 +1,3 @@
+export var used = "used";
+
+export var unused = "unused";
diff --git a/test/configCases/deep-scope-analysis/remove-export-scope-hoisting/webpack.config.js b/test/configCases/deep-scope-analysis/remove-export-scope-hoisting/webpack.config.js
new file mode 100644
index 00000000000..3c8519e2a44
--- /dev/null
+++ b/test/configCases/deep-scope-analysis/remove-export-scope-hoisting/webpack.config.js
@@ -0,0 +1,34 @@
+const DependencyReference = require("../../../../").dependencies
+	.DependencyReference;
+module.exports = {
+	optimization: {
+		usedExports: true,
+		concatenateModules: true
+	},
+	plugins: [
+		function() {
+			this.hooks.compilation.tap("Test", compilation => {
+				compilation.hooks.dependencyReference.tap(
+					"Test",
+					(ref, dep, module) => {
+						if (
+							module.identifier().endsWith("module.js") &&
+							ref.module &&
+							ref.module.identifier().endsWith("reference.js") &&
+							Array.isArray(ref.importedNames) &&
+							ref.importedNames.includes("unused")
+						) {
+							return new DependencyReference(
+								ref.module,
+								ref.importedNames.filter(item => item !== "unused"),
+								ref.weak,
+								ref.order
+							);
+						}
+						return ref;
+					}
+				);
+			});
+		}
+	]
+};
diff --git a/test/configCases/deep-scope-analysis/remove-export/index.js b/test/configCases/deep-scope-analysis/remove-export/index.js
new file mode 100644
index 00000000000..be12281baf0
--- /dev/null
+++ b/test/configCases/deep-scope-analysis/remove-export/index.js
@@ -0,0 +1,9 @@
+import { test, unused } from "./module";
+
+it("should run the test", () => {
+	expect(test()).toEqual({
+		used: "used",
+		unused: undefined
+	});
+	expect(unused).toEqual(undefined);
+});
diff --git a/test/configCases/deep-scope-analysis/remove-export/module.js b/test/configCases/deep-scope-analysis/remove-export/module.js
new file mode 100644
index 00000000000..8d9ec8267b9
--- /dev/null
+++ b/test/configCases/deep-scope-analysis/remove-export/module.js
@@ -0,0 +1,10 @@
+import { used, unused } from "./reference";
+
+export function test() {
+	return {
+		used,
+		unused
+	};
+}
+
+export { unused }
diff --git a/test/configCases/deep-scope-analysis/remove-export/reference.js b/test/configCases/deep-scope-analysis/remove-export/reference.js
new file mode 100644
index 00000000000..725c814ac8f
--- /dev/null
+++ b/test/configCases/deep-scope-analysis/remove-export/reference.js
@@ -0,0 +1,3 @@
+export var used = "used";
+
+export var unused = "unused";
diff --git a/test/configCases/deep-scope-analysis/remove-export/webpack.config.js b/test/configCases/deep-scope-analysis/remove-export/webpack.config.js
new file mode 100644
index 00000000000..1b15ba720d7
--- /dev/null
+++ b/test/configCases/deep-scope-analysis/remove-export/webpack.config.js
@@ -0,0 +1,34 @@
+const DependencyReference = require("../../../../").dependencies
+	.DependencyReference;
+module.exports = {
+	optimization: {
+		usedExports: true,
+		concatenateModules: false
+	},
+	plugins: [
+		function() {
+			this.hooks.compilation.tap("Test", compilation => {
+				compilation.hooks.dependencyReference.tap(
+					"Test",
+					(ref, dep, module) => {
+						if (
+							module.identifier().endsWith("module.js") &&
+							ref.module &&
+							ref.module.identifier().endsWith("reference.js") &&
+							Array.isArray(ref.importedNames) &&
+							ref.importedNames.includes("unused")
+						) {
+							return new DependencyReference(
+								ref.module,
+								ref.importedNames.filter(item => item !== "unused"),
+								ref.weak,
+								ref.order
+							);
+						}
+						return ref;
+					}
+				);
+			});
+		}
+	]
+};
diff --git a/test/configCases/dll-plugin-entry/1-use-dll/index.js b/test/configCases/dll-plugin-entry/1-use-dll/index.js
index ec66e9e5fd9..203fc2d122f 100644
--- a/test/configCases/dll-plugin-entry/1-use-dll/index.js
+++ b/test/configCases/dll-plugin-entry/1-use-dll/index.js
@@ -1,7 +1,7 @@
 import Answer, { bar } from "dll/index";
 
 it("should load a module from dll", function() {
-	expect(require("dll/index")).toEqual({ bar: "bar", default: 42, [Symbol.toStringTag]: "Module" });
+	expect(require("dll/index")).toEqual(nsObj({ bar: "bar", default: 42 }));
 });
 
 it("should load an harmony module from dll (default export)", function() {
diff --git a/test/configCases/dll-plugin/1-use-dll/index.js b/test/configCases/dll-plugin/1-use-dll/index.js
index 7f844261291..9d0f47340b7 100644
--- a/test/configCases/dll-plugin/1-use-dll/index.js
+++ b/test/configCases/dll-plugin/1-use-dll/index.js
@@ -12,7 +12,7 @@ it("should load a module of non-default type without extension from dll", functi
 
 it("should load an async module from dll", function(done) {
 	require("dll/b")().then(function(c) {
-		expect(c).toEqual({ default: "c", [Symbol.toStringTag]: "Module" });
+		expect(c).toEqual(nsObj({ default: "c" }));
 		done();
 	}).catch(done);
 });
diff --git a/test/configCases/dll-plugin/2-use-dll-without-scope/index.js b/test/configCases/dll-plugin/2-use-dll-without-scope/index.js
index 704f6b1589c..28f81259339 100644
--- a/test/configCases/dll-plugin/2-use-dll-without-scope/index.js
+++ b/test/configCases/dll-plugin/2-use-dll-without-scope/index.js
@@ -12,7 +12,7 @@ it("should load a module of non-default type without extension from dll", functi
 
 it("should load an async module from dll", function(done) {
 	require("../0-create-dll/b")().then(function(c) {
-		expect(c).toEqual({ default: "c", [Symbol.toStringTag]: "Module" });
+		expect(c).toEqual(nsObj({ default: "c" }));
 		done();
 	}).catch(done);
 });
diff --git a/test/configCases/dll-plugin/3-use-dll-with-hashid/index.js b/test/configCases/dll-plugin/3-use-dll-with-hashid/index.js
index 0967a518eea..224bc015e73 100644
--- a/test/configCases/dll-plugin/3-use-dll-with-hashid/index.js
+++ b/test/configCases/dll-plugin/3-use-dll-with-hashid/index.js
@@ -8,7 +8,7 @@ it("should load a module from dll", function() {
 
 it("should load an async module from dll", function(done) {
 	require("../0-create-dll/b")().then(function(c) {
-		expect(c).toEqual({ default: "c", [Symbol.toStringTag]: "Module" });
+		expect(c).toEqual(nsObj({ default: "c" }));
 		done();
 	}).catch(done);
 });
diff --git a/test/configCases/entry/issue-8110/a.js b/test/configCases/entry/issue-8110/a.js
new file mode 100644
index 00000000000..95aac3b5403
--- /dev/null
+++ b/test/configCases/entry/issue-8110/a.js
@@ -0,0 +1,8 @@
+import run from "./c";
+import "./d";
+
+it("should not crash", () => {
+	return run().then(result => {
+		expect(result.default).toBe("ok");
+	});
+})
diff --git a/test/configCases/entry/issue-8110/b.js b/test/configCases/entry/issue-8110/b.js
new file mode 100644
index 00000000000..b4c710a8275
--- /dev/null
+++ b/test/configCases/entry/issue-8110/b.js
@@ -0,0 +1,3 @@
+import run from "./c";
+
+run();
diff --git a/test/configCases/entry/issue-8110/c.js b/test/configCases/entry/issue-8110/c.js
new file mode 100644
index 00000000000..c8bc53d949b
--- /dev/null
+++ b/test/configCases/entry/issue-8110/c.js
@@ -0,0 +1,3 @@
+export default function run() {
+	return import("./d");
+}
diff --git a/test/configCases/entry/issue-8110/d.js b/test/configCases/entry/issue-8110/d.js
new file mode 100644
index 00000000000..5c6b89abfc8
--- /dev/null
+++ b/test/configCases/entry/issue-8110/d.js
@@ -0,0 +1 @@
+export default "ok";
diff --git a/test/configCases/entry/issue-8110/webpack.config.js b/test/configCases/entry/issue-8110/webpack.config.js
new file mode 100644
index 00000000000..ca8fd308d0a
--- /dev/null
+++ b/test/configCases/entry/issue-8110/webpack.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+	entry: {
+		bundle0: "./a",
+		other: "./b"
+	},
+	output: {
+		filename: "[name].js"
+	}
+};
diff --git a/test/configCases/entry/override-entry-point/fail.js b/test/configCases/entry/override-entry-point/fail.js
new file mode 100644
index 00000000000..bfab02f2fe4
--- /dev/null
+++ b/test/configCases/entry/override-entry-point/fail.js
@@ -0,0 +1,3 @@
+it("should load correct entry", function() {
+	throw new Error("This entrypoint should not be used");
+});
diff --git a/test/configCases/entry/override-entry-point/ok.js b/test/configCases/entry/override-entry-point/ok.js
new file mode 100644
index 00000000000..89e1169b2d5
--- /dev/null
+++ b/test/configCases/entry/override-entry-point/ok.js
@@ -0,0 +1,3 @@
+it("should load correct entry", function() {
+	// ok
+});
diff --git a/test/configCases/entry/override-entry-point/test.config.js b/test/configCases/entry/override-entry-point/test.config.js
new file mode 100644
index 00000000000..f7e765f2978
--- /dev/null
+++ b/test/configCases/entry/override-entry-point/test.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+	findBundle: function() {
+		return [
+			"./runtime~main.js",
+			"./main.chunk.js"
+		]
+	}
+};
diff --git a/test/configCases/entry/override-entry-point/webpack.config.js b/test/configCases/entry/override-entry-point/webpack.config.js
new file mode 100644
index 00000000000..2eb94ff79d8
--- /dev/null
+++ b/test/configCases/entry/override-entry-point/webpack.config.js
@@ -0,0 +1,16 @@
+const SingleEntryPlugin = require("../../../../lib/SingleEntryPlugin");
+module.exports = {
+	entry: () => ({}),
+	optimization: {
+		runtimeChunk: true
+	},
+	output: {
+		filename: "[name].js",
+		chunkFilename: "[name].chunk.js"
+	},
+	target: "web",
+	plugins: [
+		new SingleEntryPlugin(__dirname, "./fail", "main"),
+		new SingleEntryPlugin(__dirname, "./ok", "main")
+	]
+};
diff --git a/test/configCases/errors/exception-in-chunk-renderer/errors.js b/test/configCases/errors/exception-in-chunk-renderer/errors.js
new file mode 100644
index 00000000000..d9088af16b8
--- /dev/null
+++ b/test/configCases/errors/exception-in-chunk-renderer/errors.js
@@ -0,0 +1,4 @@
+module.exports = [
+	[/Test exception/],
+	[/Test exception/]
+];
diff --git a/test/configCases/errors/exception-in-chunk-renderer/index.js b/test/configCases/errors/exception-in-chunk-renderer/index.js
new file mode 100644
index 00000000000..d4f42bbdd05
--- /dev/null
+++ b/test/configCases/errors/exception-in-chunk-renderer/index.js
@@ -0,0 +1,3 @@
+it("should not crash when renderer throws exception", function(done) {
+	done();
+});
diff --git a/test/configCases/errors/exception-in-chunk-renderer/webpack.config.js b/test/configCases/errors/exception-in-chunk-renderer/webpack.config.js
new file mode 100644
index 00000000000..6a98bf6ebc8
--- /dev/null
+++ b/test/configCases/errors/exception-in-chunk-renderer/webpack.config.js
@@ -0,0 +1,16 @@
+class ThrowsExceptionInRender {
+	apply(compiler) {
+		compiler.hooks.compilation.tap("ThrowsException", compilation => {
+			compilation.mainTemplate.hooks.requireExtensions.tap(
+				"ThrowsException",
+				() => {
+					throw new Error("Test exception");
+				}
+			);
+		});
+	}
+}
+
+module.exports = {
+	plugins: [new ThrowsExceptionInRender()]
+};
diff --git a/test/configCases/errors/multi-entry-missing-module/webpack.config.js b/test/configCases/errors/multi-entry-missing-module/webpack.config.js
index 221fe4b45df..fd333896cb0 100644
--- a/test/configCases/errors/multi-entry-missing-module/webpack.config.js
+++ b/test/configCases/errors/multi-entry-missing-module/webpack.config.js
@@ -7,7 +7,11 @@ module.exports = {
 	output: {
 		filename: "[name].js"
 	},
-	plugins: [new IgnorePlugin(new RegExp(/intentionally-missing-module/))],
+	plugins: [
+		new IgnorePlugin({
+			resourceRegExp: new RegExp(/intentionally-missing-module/)
+		})
+	],
 	node: {
 		__dirname: false
 	}
diff --git a/test/configCases/externals/externals-array/index.js b/test/configCases/externals/externals-array/index.js
new file mode 100644
index 00000000000..a7dedba652b
--- /dev/null
+++ b/test/configCases/externals/externals-array/index.js
@@ -0,0 +1,4 @@
+it("should not fail on optional externals", function() {
+	const external = require("external");
+	expect(external).toBe(EXPECTED);
+});
diff --git a/test/configCases/externals/externals-array/webpack.config.js b/test/configCases/externals/externals-array/webpack.config.js
new file mode 100644
index 00000000000..af6b62d059c
--- /dev/null
+++ b/test/configCases/externals/externals-array/webpack.config.js
@@ -0,0 +1,26 @@
+const webpack = require("../../../../");
+module.exports = [
+	{
+		output: {
+			libraryTarget: "commonjs2"
+		},
+		externals: {
+			external: ["webpack", "version"]
+		},
+		plugins: [
+			new webpack.DefinePlugin({
+				EXPECTED: JSON.stringify(webpack.version)
+			})
+		]
+	},
+	{
+		externals: {
+			external: ["Array", "isArray"]
+		},
+		plugins: [
+			new webpack.DefinePlugin({
+				EXPECTED: "Array.isArray"
+			})
+		]
+	}
+];
diff --git a/test/configCases/hash-length/output-filename/test.config.js b/test/configCases/hash-length/output-filename/test.config.js
index c378cab5525..224a52035b7 100644
--- a/test/configCases/hash-length/output-filename/test.config.js
+++ b/test/configCases/hash-length/output-filename/test.config.js
@@ -18,7 +18,7 @@ module.exports = {
 
 		var bundleDetects = [
 			options.amd.expectedChunkFilenameLength && {
-				regex: new RegExp("^0.bundle" + i, "i"),
+				regex: new RegExp("^\\d+.bundle" + i, "i"),
 				expectedNameLength: options.amd.expectedChunkFilenameLength
 			},
 			{
diff --git a/test/configCases/ignore/checkContextFn/folder-a/ignored-module.js b/test/configCases/ignore/checkContextFn/folder-a/ignored-module.js
new file mode 100644
index 00000000000..4e015a52c59
--- /dev/null
+++ b/test/configCases/ignore/checkContextFn/folder-a/ignored-module.js
@@ -0,0 +1 @@
+module.exports = "ignored";
diff --git a/test/configCases/ignore/checkContextFn/folder-a/normal-module.js b/test/configCases/ignore/checkContextFn/folder-a/normal-module.js
new file mode 100644
index 00000000000..fbd72556b4f
--- /dev/null
+++ b/test/configCases/ignore/checkContextFn/folder-a/normal-module.js
@@ -0,0 +1 @@
+module.exports = require("./normal-module");
diff --git a/test/configCases/ignore/checkContextFn/folder-b/ignored-module.js b/test/configCases/ignore/checkContextFn/folder-b/ignored-module.js
new file mode 100644
index 00000000000..4e015a52c59
--- /dev/null
+++ b/test/configCases/ignore/checkContextFn/folder-b/ignored-module.js
@@ -0,0 +1 @@
+module.exports = "ignored";
diff --git a/test/configCases/ignore/checkContextFn/folder-b/normal-module.js b/test/configCases/ignore/checkContextFn/folder-b/normal-module.js
new file mode 100644
index 00000000000..83268eff2a0
--- /dev/null
+++ b/test/configCases/ignore/checkContextFn/folder-b/normal-module.js
@@ -0,0 +1 @@
+module.exports = require("./ignored-module");
diff --git a/test/configCases/ignore/checkContextFn/folder-b/only-context-match-require.js b/test/configCases/ignore/checkContextFn/folder-b/only-context-match-require.js
new file mode 100644
index 00000000000..29d7ef3b3dd
--- /dev/null
+++ b/test/configCases/ignore/checkContextFn/folder-b/only-context-match-require.js
@@ -0,0 +1 @@
+module.exports = "should be fine";
diff --git a/test/configCases/ignore/checkContextFn/folder-b/only-context-match.js b/test/configCases/ignore/checkContextFn/folder-b/only-context-match.js
new file mode 100644
index 00000000000..3625236da61
--- /dev/null
+++ b/test/configCases/ignore/checkContextFn/folder-b/only-context-match.js
@@ -0,0 +1 @@
+module.exports = require("./only-context-match-require");
diff --git a/test/configCases/ignore/checkContextFn/test.js b/test/configCases/ignore/checkContextFn/test.js
new file mode 100644
index 00000000000..ae4f1ae2c67
--- /dev/null
+++ b/test/configCases/ignore/checkContextFn/test.js
@@ -0,0 +1,20 @@
+/* globals it */
+"use strict";
+
+it("should ignore resources that match resource regex and context", function() {
+	expect(function() {
+		require("./folder-b/normal-module");
+	}).toThrowError();
+});
+
+it("should not ignore resources that match resource but not context", function() {
+	expect(function() {
+		require("./folder-a/normal-module");
+	}).not.toThrowError();
+});
+
+it("should not ignore resources that do not match resource but do match context", function() {
+	expect(function() {
+		require("./folder-b/only-context-match");
+	}).not.toThrowError();
+});
diff --git a/test/configCases/ignore/checkContextFn/webpack.config.js b/test/configCases/ignore/checkContextFn/webpack.config.js
new file mode 100644
index 00000000000..edc3422df24
--- /dev/null
+++ b/test/configCases/ignore/checkContextFn/webpack.config.js
@@ -0,0 +1,17 @@
+"use strict";
+
+const IgnorePlugin = require("../../../../lib/IgnorePlugin");
+
+module.exports = {
+	entry: "./test.js",
+	plugins: [
+		new IgnorePlugin({
+			checkResource: function(resource) {
+				return /ignored-module/.test(resource);
+			},
+			checkContext: function(context) {
+				return /folder-b/.test(context);
+			}
+		})
+	]
+};
diff --git a/test/configCases/ignore/checkResourceFn/ignored-module.js b/test/configCases/ignore/checkResourceFn/ignored-module.js
new file mode 100644
index 00000000000..4e015a52c59
--- /dev/null
+++ b/test/configCases/ignore/checkResourceFn/ignored-module.js
@@ -0,0 +1 @@
+module.exports = "ignored";
diff --git a/test/configCases/ignore/checkResourceFn/normal-module.js b/test/configCases/ignore/checkResourceFn/normal-module.js
new file mode 100644
index 00000000000..f5f8a087f72
--- /dev/null
+++ b/test/configCases/ignore/checkResourceFn/normal-module.js
@@ -0,0 +1 @@
+module.exports = "normal";
diff --git a/test/configCases/ignore/checkResourceFn/test.js b/test/configCases/ignore/checkResourceFn/test.js
new file mode 100644
index 00000000000..93ce8146bd8
--- /dev/null
+++ b/test/configCases/ignore/checkResourceFn/test.js
@@ -0,0 +1,13 @@
+/* globals it */
+"use strict";
+
+it("should ignore ignored resources", function() {
+	expect(function() {
+		require("./ignored-module");
+	}).toThrowError();
+});
+it("should not ignore resources that do not match", function() {
+	expect(function() {
+		require("./normal-module");
+	}).not.toThrowError();
+});
diff --git a/test/configCases/ignore/checkResourceFn/webpack.config.js b/test/configCases/ignore/checkResourceFn/webpack.config.js
new file mode 100644
index 00000000000..9fad700187e
--- /dev/null
+++ b/test/configCases/ignore/checkResourceFn/webpack.config.js
@@ -0,0 +1,14 @@
+"use strict";
+
+const IgnorePlugin = require("../../../../lib/IgnorePlugin");
+
+module.exports = {
+	entry: "./test.js",
+	plugins: [
+		new IgnorePlugin({
+			checkResource: function(resource) {
+				return /ignored-module/.test(resource);
+			}
+		})
+	]
+};
diff --git a/test/configCases/ignore/compatibilityLayer/folder-a/ignored-module.js b/test/configCases/ignore/compatibilityLayer/folder-a/ignored-module.js
new file mode 100644
index 00000000000..4e015a52c59
--- /dev/null
+++ b/test/configCases/ignore/compatibilityLayer/folder-a/ignored-module.js
@@ -0,0 +1 @@
+module.exports = "ignored";
diff --git a/test/configCases/ignore/compatibilityLayer/folder-a/normal-module.js b/test/configCases/ignore/compatibilityLayer/folder-a/normal-module.js
new file mode 100644
index 00000000000..fbd72556b4f
--- /dev/null
+++ b/test/configCases/ignore/compatibilityLayer/folder-a/normal-module.js
@@ -0,0 +1 @@
+module.exports = require("./normal-module");
diff --git a/test/configCases/ignore/compatibilityLayer/folder-b/ignored-module.js b/test/configCases/ignore/compatibilityLayer/folder-b/ignored-module.js
new file mode 100644
index 00000000000..4e015a52c59
--- /dev/null
+++ b/test/configCases/ignore/compatibilityLayer/folder-b/ignored-module.js
@@ -0,0 +1 @@
+module.exports = "ignored";
diff --git a/test/configCases/ignore/compatibilityLayer/folder-b/normal-module.js b/test/configCases/ignore/compatibilityLayer/folder-b/normal-module.js
new file mode 100644
index 00000000000..83268eff2a0
--- /dev/null
+++ b/test/configCases/ignore/compatibilityLayer/folder-b/normal-module.js
@@ -0,0 +1 @@
+module.exports = require("./ignored-module");
diff --git a/test/configCases/ignore/compatibilityLayer/folder-b/only-context-match-require.js b/test/configCases/ignore/compatibilityLayer/folder-b/only-context-match-require.js
new file mode 100644
index 00000000000..29d7ef3b3dd
--- /dev/null
+++ b/test/configCases/ignore/compatibilityLayer/folder-b/only-context-match-require.js
@@ -0,0 +1 @@
+module.exports = "should be fine";
diff --git a/test/configCases/ignore/compatibilityLayer/folder-b/only-context-match.js b/test/configCases/ignore/compatibilityLayer/folder-b/only-context-match.js
new file mode 100644
index 00000000000..3625236da61
--- /dev/null
+++ b/test/configCases/ignore/compatibilityLayer/folder-b/only-context-match.js
@@ -0,0 +1 @@
+module.exports = require("./only-context-match-require");
diff --git a/test/configCases/ignore/compatibilityLayer/test.js b/test/configCases/ignore/compatibilityLayer/test.js
new file mode 100644
index 00000000000..97bfa83d013
--- /dev/null
+++ b/test/configCases/ignore/compatibilityLayer/test.js
@@ -0,0 +1,36 @@
+/* globals it */
+"use strict";
+
+// TODO: remove in webpack 5
+it("should ignore context modules that match resource regex and context (compat-layer)", function() {
+	const folderBContext = function(mod) {
+		require("./folder-b/" + mod);
+	};
+
+	expect(function() {
+		folderBContext("normal-module");
+	}).toThrowError();
+});
+
+it("should not ignore context modules that dont match the resource (compat-layer)", function() {
+	const folderBContext = function(mod) {
+		require("./folder-b/" + mod);
+	};
+
+	expect(function() {
+		folderBContext("only-context-match");
+	}).not.toThrowError();
+});
+
+it("should not ignore context modules that dont match the context (compat-layer)", function() {
+	const folderBContext = function(mod) {
+		require("./folder-a/" + mod);
+	};
+
+	expect(function() {
+		folderBContext("normal-module");
+	}).not.toThrowError();
+	expect(function() {
+		folderBContext("ignored-module");
+	}).not.toThrowError();
+});
diff --git a/test/configCases/ignore/compatibilityLayer/webpack.config.js b/test/configCases/ignore/compatibilityLayer/webpack.config.js
new file mode 100644
index 00000000000..7151dfc88a2
--- /dev/null
+++ b/test/configCases/ignore/compatibilityLayer/webpack.config.js
@@ -0,0 +1,8 @@
+"use strict";
+
+const IgnorePlugin = require("../../../../lib/IgnorePlugin");
+
+module.exports = {
+	entry: "./test.js",
+	plugins: [new IgnorePlugin(/ignored-module/, /folder-b/)]
+};
diff --git a/test/configCases/ignore/only-resource-context/webpack.config.js b/test/configCases/ignore/only-resource-context/webpack.config.js
index d766ec02490..7f9ba4ea372 100644
--- a/test/configCases/ignore/only-resource-context/webpack.config.js
+++ b/test/configCases/ignore/only-resource-context/webpack.config.js
@@ -4,5 +4,9 @@ const IgnorePlugin = require("../../../../lib/IgnorePlugin");
 
 module.exports = {
 	entry: "./test.js",
-	plugins: [new IgnorePlugin(/ignored-module/)]
+	plugins: [
+		new IgnorePlugin({
+			resourceRegExp: /ignored-module/
+		})
+	]
 };
diff --git a/test/configCases/ignore/only-resource/webpack.config.js b/test/configCases/ignore/only-resource/webpack.config.js
index d766ec02490..7f9ba4ea372 100644
--- a/test/configCases/ignore/only-resource/webpack.config.js
+++ b/test/configCases/ignore/only-resource/webpack.config.js
@@ -4,5 +4,9 @@ const IgnorePlugin = require("../../../../lib/IgnorePlugin");
 
 module.exports = {
 	entry: "./test.js",
-	plugins: [new IgnorePlugin(/ignored-module/)]
+	plugins: [
+		new IgnorePlugin({
+			resourceRegExp: /ignored-module/
+		})
+	]
 };
diff --git a/test/configCases/ignore/resource-and-context-contextmodule/webpack.config.js b/test/configCases/ignore/resource-and-context-contextmodule/webpack.config.js
index 7151dfc88a2..27fe5b63d87 100644
--- a/test/configCases/ignore/resource-and-context-contextmodule/webpack.config.js
+++ b/test/configCases/ignore/resource-and-context-contextmodule/webpack.config.js
@@ -4,5 +4,10 @@ const IgnorePlugin = require("../../../../lib/IgnorePlugin");
 
 module.exports = {
 	entry: "./test.js",
-	plugins: [new IgnorePlugin(/ignored-module/, /folder-b/)]
+	plugins: [
+		new IgnorePlugin({
+			resourceRegExp: /ignored-module/,
+			contextRegExp: /folder-b/
+		})
+	]
 };
diff --git a/test/configCases/ignore/resource-and-context/webpack.config.js b/test/configCases/ignore/resource-and-context/webpack.config.js
index 7151dfc88a2..27fe5b63d87 100644
--- a/test/configCases/ignore/resource-and-context/webpack.config.js
+++ b/test/configCases/ignore/resource-and-context/webpack.config.js
@@ -4,5 +4,10 @@ const IgnorePlugin = require("../../../../lib/IgnorePlugin");
 
 module.exports = {
 	entry: "./test.js",
-	plugins: [new IgnorePlugin(/ignored-module/, /folder-b/)]
+	plugins: [
+		new IgnorePlugin({
+			resourceRegExp: /ignored-module/,
+			contextRegExp: /folder-b/
+		})
+	]
 };
diff --git a/test/configCases/issues/issue-7563/index.js b/test/configCases/issues/issue-7563/index.js
new file mode 100644
index 00000000000..9e0bf87e832
--- /dev/null
+++ b/test/configCases/issues/issue-7563/index.js
@@ -0,0 +1,3 @@
+it("should compile without error", function() {
+	return import(/* webpackChunkName: "one" */ "./one");
+});
diff --git a/test/configCases/issues/issue-7563/one.js b/test/configCases/issues/issue-7563/one.js
new file mode 100644
index 00000000000..bd816eaba4c
--- /dev/null
+++ b/test/configCases/issues/issue-7563/one.js
@@ -0,0 +1 @@
+module.exports = 1;
diff --git a/test/configCases/issues/issue-7563/test.config.js b/test/configCases/issues/issue-7563/test.config.js
new file mode 100644
index 00000000000..dee26555271
--- /dev/null
+++ b/test/configCases/issues/issue-7563/test.config.js
@@ -0,0 +1,22 @@
+var fs = require('fs');
+
+module.exports = {
+	noTests: true,
+	findBundle: function(i, options) {
+		var regex = new RegExp("^bundle\." + options.name, "i");
+		var files = fs.readdirSync(options.output.path);
+		var bundle = files.find(function (file) {
+			return regex.test(file);
+		});
+
+		if (!bundle) {
+			throw new Error(
+				`No file found with correct name (regex: ${
+					regex.source
+				}, files: ${files.join(", ")})`
+			);
+		}
+
+		return "./" + bundle;
+	}
+};
diff --git a/test/configCases/issues/issue-7563/webpack.config.js b/test/configCases/issues/issue-7563/webpack.config.js
new file mode 100644
index 00000000000..09164011712
--- /dev/null
+++ b/test/configCases/issues/issue-7563/webpack.config.js
@@ -0,0 +1,65 @@
+"use strict";
+
+// Have to test [hash] and [chunkhash] separately to avoid
+// "Cannot use [chunkhash] or [contenthash] for chunk in 'bundle1.[hash].[hash:16].[chunkhash].[chunkhash:16].[name].[id].[query].js' (use [hash] instead)"
+var testAllButHash = "[chunkhash].[chunkhash:16].[name].[id].[query]";
+var testHash = "[hash].[hash:16]";
+
+module.exports = [
+	{
+		name: "webworker-all",
+		target: "webworker",
+		output: {
+			filename: "bundle.webworker-all." + testAllButHash + ".js"
+		}
+	},
+	{
+		name: "webworker-hash",
+		target: "webworker",
+		output: {
+			filename: "bundle.webworker-hash." + testHash + ".js"
+		}
+	},
+	{
+		name: "node-all",
+		target: "node",
+		output: {
+			filename: "bundle.node-all." + testAllButHash + ".js"
+		}
+	},
+	{
+		name: "node",
+		target: "node",
+		output: {
+			filename: "bundle.node-hash." + testHash + ".js"
+		}
+	},
+	{
+		name: "async-node-all",
+		target: "async-node",
+		output: {
+			filename: "bundle.async-node-all." + testAllButHash + ".js"
+		}
+	},
+	{
+		name: "async-node-hash",
+		target: "async-node",
+		output: {
+			filename: "bundle.async-node-hash." + testHash + ".js"
+		}
+	},
+	{
+		name: "web-all",
+		target: "web",
+		output: {
+			filename: "bundle.web-all." + testAllButHash + ".js"
+		}
+	},
+	{
+		name: "web-hash",
+		target: "web",
+		output: {
+			filename: "bundle.web-hash." + testHash + ".js"
+		}
+	}
+];
diff --git a/test/configCases/library/array-global/index.js b/test/configCases/library/array-global/index.js
new file mode 100644
index 00000000000..274e87f90a3
--- /dev/null
+++ b/test/configCases/library/array-global/index.js
@@ -0,0 +1,3 @@
+it("should define global object with property", function() {
+	expect(a["b"]).toBeDefined();
+});
diff --git a/test/configCases/library/array-global/webpack.config.js b/test/configCases/library/array-global/webpack.config.js
new file mode 100644
index 00000000000..bc177f6b567
--- /dev/null
+++ b/test/configCases/library/array-global/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	output: {
+		library: ["a", "b"]
+	}
+};
diff --git a/test/configCases/library/array-window/index.js b/test/configCases/library/array-window/index.js
new file mode 100644
index 00000000000..6c539d7a342
--- /dev/null
+++ b/test/configCases/library/array-window/index.js
@@ -0,0 +1,3 @@
+it("should define property in 'window' object", function() {
+	expect(window["a"]["b"]).toBeDefined();
+});
diff --git a/test/configCases/library/array-window/webpack.config.js b/test/configCases/library/array-window/webpack.config.js
new file mode 100644
index 00000000000..010ed97f19c
--- /dev/null
+++ b/test/configCases/library/array-window/webpack.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+	target: "web",
+	output: {
+		library: ["a", "b"],
+		libraryTarget: "window"
+	}
+};
diff --git a/test/configCases/optimization/hashed-module-ids/files/file1.js b/test/configCases/optimization/hashed-module-ids/files/file1.js
new file mode 100644
index 00000000000..3cec1b77aad
--- /dev/null
+++ b/test/configCases/optimization/hashed-module-ids/files/file1.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/optimization/hashed-module-ids/files/file2.js b/test/configCases/optimization/hashed-module-ids/files/file2.js
new file mode 100644
index 00000000000..3cec1b77aad
--- /dev/null
+++ b/test/configCases/optimization/hashed-module-ids/files/file2.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/optimization/hashed-module-ids/files/file3.js b/test/configCases/optimization/hashed-module-ids/files/file3.js
new file mode 100644
index 00000000000..3cec1b77aad
--- /dev/null
+++ b/test/configCases/optimization/hashed-module-ids/files/file3.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/optimization/hashed-module-ids/files/file4.js b/test/configCases/optimization/hashed-module-ids/files/file4.js
new file mode 100644
index 00000000000..3cec1b77aad
--- /dev/null
+++ b/test/configCases/optimization/hashed-module-ids/files/file4.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/optimization/hashed-module-ids/files/file5.js b/test/configCases/optimization/hashed-module-ids/files/file5.js
new file mode 100644
index 00000000000..3cec1b77aad
--- /dev/null
+++ b/test/configCases/optimization/hashed-module-ids/files/file5.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/optimization/hashed-module-ids/index.js b/test/configCases/optimization/hashed-module-ids/index.js
new file mode 100644
index 00000000000..93aeb5474b8
--- /dev/null
+++ b/test/configCases/optimization/hashed-module-ids/index.js
@@ -0,0 +1,7 @@
+it("should have named modules ids", function() {
+	for (var i = 1; i <= 5; i++) {
+		var moduleId = require("./files/file" + i + ".js");
+
+		expect(moduleId).toMatch(/^[/=a-zA-Z0-9]{4,5}$/);
+	}
+});
diff --git a/test/configCases/optimization/hashed-module-ids/webpack.config.js b/test/configCases/optimization/hashed-module-ids/webpack.config.js
new file mode 100644
index 00000000000..19d544d1dbe
--- /dev/null
+++ b/test/configCases/optimization/hashed-module-ids/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	optimization: {
+		hashedModuleIds: true
+	}
+};
diff --git a/test/configCases/optimization/named-modules/files/file1.js b/test/configCases/optimization/named-modules/files/file1.js
new file mode 100644
index 00000000000..3cec1b77aad
--- /dev/null
+++ b/test/configCases/optimization/named-modules/files/file1.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/optimization/named-modules/files/file2.js b/test/configCases/optimization/named-modules/files/file2.js
new file mode 100644
index 00000000000..3cec1b77aad
--- /dev/null
+++ b/test/configCases/optimization/named-modules/files/file2.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/optimization/named-modules/files/file3.js b/test/configCases/optimization/named-modules/files/file3.js
new file mode 100644
index 00000000000..3cec1b77aad
--- /dev/null
+++ b/test/configCases/optimization/named-modules/files/file3.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/optimization/named-modules/files/file4.js b/test/configCases/optimization/named-modules/files/file4.js
new file mode 100644
index 00000000000..3cec1b77aad
--- /dev/null
+++ b/test/configCases/optimization/named-modules/files/file4.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/optimization/named-modules/files/file5.js b/test/configCases/optimization/named-modules/files/file5.js
new file mode 100644
index 00000000000..3cec1b77aad
--- /dev/null
+++ b/test/configCases/optimization/named-modules/files/file5.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/optimization/named-modules/index.js b/test/configCases/optimization/named-modules/index.js
new file mode 100644
index 00000000000..082bc1bda00
--- /dev/null
+++ b/test/configCases/optimization/named-modules/index.js
@@ -0,0 +1,10 @@
+var path = require("path");
+
+it("should have named modules ids", function() {
+	for (var i = 1; i <= 5; i++) {
+		var expectedModuleId = "file" + i + ".js";
+		var moduleId = require("./files/file" + i + ".js");
+
+		expect(path.basename(moduleId)).toBe(expectedModuleId);
+	}
+});
diff --git a/test/configCases/optimization/named-modules/webpack.config.js b/test/configCases/optimization/named-modules/webpack.config.js
new file mode 100644
index 00000000000..10572c1da34
--- /dev/null
+++ b/test/configCases/optimization/named-modules/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	optimization: {
+		namedModules: true
+	}
+};
diff --git a/test/configCases/parsing/system.import/index.js b/test/configCases/parsing/system.import/index.js
index 754a325d9f3..8310bbaf461 100644
--- a/test/configCases/parsing/system.import/index.js
+++ b/test/configCases/parsing/system.import/index.js
@@ -22,7 +22,7 @@ it("should be able to use System.import()", done => {
 			if(__SYSTEM__ === false) {
 				done(new Error("System.import should not be parsed"));
 			} else {
-				expect(mod).toEqual({ default: "ok", [Symbol.toStringTag]: "Module" });
+				expect(mod).toEqual(nsObj({ default: "ok" }));
 				done();
 			}
 		});
diff --git a/test/configCases/plugins/banner-plugin/index.js b/test/configCases/plugins/banner-plugin/index.js
index 105a1f91b12..02653b73aeb 100644
--- a/test/configCases/plugins/banner-plugin/index.js
+++ b/test/configCases/plugins/banner-plugin/index.js
@@ -6,7 +6,7 @@ it("should contain banner in bundle0 chunk", () => {
 	expect(source).toMatch("A test value");
 	expect(source).toMatch("banner is a string");
 	expect(source).toMatch("banner is a function");
-	expect(source).toMatch("/*!\n * multiline\n * banner\n * 1\n */");
+	expect(source).toMatch("/*!\n * multiline\n * banner\n * bundle0\n */");
 });
 
 it("should not contain banner in vendors chunk", () => {
diff --git a/test/configCases/plugins/banner-plugin/webpack.config.js b/test/configCases/plugins/banner-plugin/webpack.config.js
index fcaaee27a46..ed4baebb4d1 100644
--- a/test/configCases/plugins/banner-plugin/webpack.config.js
+++ b/test/configCases/plugins/banner-plugin/webpack.config.js
@@ -19,7 +19,7 @@ module.exports = {
 			exclude: ["vendors.js"]
 		}),
 		new webpack.BannerPlugin({
-			banner: ({ chunk }) => `multiline\nbanner\n${chunk.id}`
+			banner: ({ chunk }) => `multiline\nbanner\n${chunk.name}`
 		})
 	]
 };
diff --git a/test/configCases/scope-hoisting/export-global/index.js b/test/configCases/scope-hoisting/export-global/index.js
new file mode 100644
index 00000000000..54650d45fd3
--- /dev/null
+++ b/test/configCases/scope-hoisting/export-global/index.js
@@ -0,0 +1,7 @@
+import { process as p } from "./module";
+import { process as p2 } from "./module2";
+
+it("should export globals correctly", () => {
+	expect(p).toBe(42);
+	expect(p2).toBe(process);
+});
diff --git a/test/configCases/scope-hoisting/export-global/module.js b/test/configCases/scope-hoisting/export-global/module.js
new file mode 100644
index 00000000000..f57b982f308
--- /dev/null
+++ b/test/configCases/scope-hoisting/export-global/module.js
@@ -0,0 +1,2 @@
+const process = 42;
+export { process };
diff --git a/test/configCases/scope-hoisting/export-global/module2.js b/test/configCases/scope-hoisting/export-global/module2.js
new file mode 100644
index 00000000000..78c685a2591
--- /dev/null
+++ b/test/configCases/scope-hoisting/export-global/module2.js
@@ -0,0 +1 @@
+export { process };
diff --git a/test/configCases/scope-hoisting/export-global/webpack.config.js b/test/configCases/scope-hoisting/export-global/webpack.config.js
new file mode 100644
index 00000000000..59e948b1212
--- /dev/null
+++ b/test/configCases/scope-hoisting/export-global/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	optimization: {
+		concatenateModules: true
+	}
+};
diff --git a/test/configCases/scope-hoisting/harmony-pure-default/index.js b/test/configCases/scope-hoisting/harmony-pure-default/index.js
new file mode 100644
index 00000000000..9aa10c3e9fb
--- /dev/null
+++ b/test/configCases/scope-hoisting/harmony-pure-default/index.js
@@ -0,0 +1,15 @@
+import x1, { value as v1 } from "./module1";
+import x2, { value as v2 } from "./module2";
+import { value as v3 } from "./module3";
+import x4, { value as v4 } from "./module4";
+
+it("should not execute exports when annotated with pure comment", () => {
+	expect(v1).toBe(42);
+	expect(v2).toBe(42);
+	expect(v3).toBe(42);
+	expect(v4).toBe(42);
+});
+
+var x = /*#__PURE__*/(function() {
+	return x1 + x2 + x4;
+});
diff --git a/test/configCases/scope-hoisting/harmony-pure-default/module1.js b/test/configCases/scope-hoisting/harmony-pure-default/module1.js
new file mode 100644
index 00000000000..ff5746bdac4
--- /dev/null
+++ b/test/configCases/scope-hoisting/harmony-pure-default/module1.js
@@ -0,0 +1,9 @@
+let value = 42;
+
+const inc = () => {
+	value++;
+};
+
+export default /*#__PURE__*/inc();
+
+export { value };
diff --git a/test/configCases/scope-hoisting/harmony-pure-default/module2.js b/test/configCases/scope-hoisting/harmony-pure-default/module2.js
new file mode 100644
index 00000000000..cf69c28f83d
--- /dev/null
+++ b/test/configCases/scope-hoisting/harmony-pure-default/module2.js
@@ -0,0 +1,9 @@
+let value = 42;
+
+const inc = () => {
+	value++;
+};
+
+export default (/*#__PURE__*/inc());
+
+export { value };
diff --git a/test/configCases/scope-hoisting/harmony-pure-default/module3.js b/test/configCases/scope-hoisting/harmony-pure-default/module3.js
new file mode 100644
index 00000000000..e7e874cd6d3
--- /dev/null
+++ b/test/configCases/scope-hoisting/harmony-pure-default/module3.js
@@ -0,0 +1,9 @@
+let value = 42;
+
+const inc = () => {
+	value++;
+};
+
+export default /*#__PURE__*/(inc());
+
+export { value };
diff --git a/test/configCases/scope-hoisting/harmony-pure-default/module4.js b/test/configCases/scope-hoisting/harmony-pure-default/module4.js
new file mode 100644
index 00000000000..c312ca1772a
--- /dev/null
+++ b/test/configCases/scope-hoisting/harmony-pure-default/module4.js
@@ -0,0 +1,15 @@
+let value = 42;
+
+const inc = () => {
+	value++;
+};
+
+export
+// hello
+default
+// world
+/*#__PURE__*/
+inc()
+;
+
+export { value };
diff --git a/test/configCases/scope-hoisting/harmony-pure-default/webpack.config.js b/test/configCases/scope-hoisting/harmony-pure-default/webpack.config.js
new file mode 100644
index 00000000000..e963f03420a
--- /dev/null
+++ b/test/configCases/scope-hoisting/harmony-pure-default/webpack.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+	mode: "production",
+	optimization: {
+		minimize: true,
+		concatenateModules: true
+	}
+};
diff --git a/test/configCases/source-map/array-as-output-library-in-object-output/index.js b/test/configCases/source-map/array-as-output-library-in-object-output/index.js
new file mode 100644
index 00000000000..e0b8201c32b
--- /dev/null
+++ b/test/configCases/source-map/array-as-output-library-in-object-output/index.js
@@ -0,0 +1 @@
+it("should compile successfully when output.library.root is an array of strings", function () { });
diff --git a/test/configCases/source-map/array-as-output-library-in-object-output/webpack.config.js b/test/configCases/source-map/array-as-output-library-in-object-output/webpack.config.js
new file mode 100644
index 00000000000..d9c8900e51f
--- /dev/null
+++ b/test/configCases/source-map/array-as-output-library-in-object-output/webpack.config.js
@@ -0,0 +1,11 @@
+module.exports = {
+	devtool: "source-map",
+	output: {
+		library: {
+			root: ["Foo", "[name]"],
+			amd: "[name]",
+			commonjs: "[name]"
+		},
+		libraryTarget: "umd"
+	}
+};
diff --git a/test/configCases/source-map/default-filename-extensions-css/index.js b/test/configCases/source-map/default-filename-extensions-css/index.js
new file mode 100644
index 00000000000..55d51278fd2
--- /dev/null
+++ b/test/configCases/source-map/default-filename-extensions-css/index.js
@@ -0,0 +1,6 @@
+it("creates source maps for .css output files by default", function() {
+  var fs = require("fs");
+  var source = fs.readFileSync(__filename, "utf-8");
+  var match = /sourceMappingURL\s*=\s*(.*)\*\//.exec(source);
+  expect(match[1]).toBe("bundle0.css.map");
+});
\ No newline at end of file
diff --git a/test/configCases/source-map/default-filename-extensions-css/test.js b/test/configCases/source-map/default-filename-extensions-css/test.js
new file mode 100644
index 00000000000..d336df4c821
--- /dev/null
+++ b/test/configCases/source-map/default-filename-extensions-css/test.js
@@ -0,0 +1,3 @@
+var foo = {};
+
+module.exports = foo;
\ No newline at end of file
diff --git a/test/configCases/source-map/default-filename-extensions-css/webpack.config.js b/test/configCases/source-map/default-filename-extensions-css/webpack.config.js
new file mode 100644
index 00000000000..1b969d38d1f
--- /dev/null
+++ b/test/configCases/source-map/default-filename-extensions-css/webpack.config.js
@@ -0,0 +1,11 @@
+module.exports = {
+	mode: "development",
+	output: {
+		filename: "bundle0.css"
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	devtool: "source-map"
+};
diff --git a/test/configCases/source-map/default-filename-extensions-js/index.js b/test/configCases/source-map/default-filename-extensions-js/index.js
new file mode 100644
index 00000000000..dd399bd0fbc
--- /dev/null
+++ b/test/configCases/source-map/default-filename-extensions-js/index.js
@@ -0,0 +1,6 @@
+it("creates source maps for .js output files by default", function() {
+  var fs = require("fs");
+  var source = fs.readFileSync(__filename, "utf-8");
+  var match = /sourceMappingURL\s*=\s*(.*)/.exec(source);
+  expect(match[1]).toBe("bundle0.js.map");
+});
\ No newline at end of file
diff --git a/test/configCases/source-map/default-filename-extensions-js/test.js b/test/configCases/source-map/default-filename-extensions-js/test.js
new file mode 100644
index 00000000000..d336df4c821
--- /dev/null
+++ b/test/configCases/source-map/default-filename-extensions-js/test.js
@@ -0,0 +1,3 @@
+var foo = {};
+
+module.exports = foo;
\ No newline at end of file
diff --git a/test/configCases/source-map/default-filename-extensions-js/webpack.config.js b/test/configCases/source-map/default-filename-extensions-js/webpack.config.js
new file mode 100644
index 00000000000..597a81501f0
--- /dev/null
+++ b/test/configCases/source-map/default-filename-extensions-js/webpack.config.js
@@ -0,0 +1,11 @@
+module.exports = {
+	mode: "development",
+	output: {
+		filename: "bundle0.js"
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	devtool: "source-map"
+};
diff --git a/test/configCases/source-map/default-filename-extensions-mjs/index.js b/test/configCases/source-map/default-filename-extensions-mjs/index.js
new file mode 100644
index 00000000000..b7d62986081
--- /dev/null
+++ b/test/configCases/source-map/default-filename-extensions-mjs/index.js
@@ -0,0 +1,6 @@
+it("creates source maps for .mjs output files by default", function() {
+	var fs = require("fs");
+	var source = fs.readFileSync(__filename, "utf-8");
+	var match = /sourceMappingURL\s*=\s*(.*)/.exec(source);
+	expect(match[1]).toBe("bundle0.mjs.map");
+});
diff --git a/test/configCases/source-map/default-filename-extensions-mjs/test.js b/test/configCases/source-map/default-filename-extensions-mjs/test.js
new file mode 100644
index 00000000000..d336df4c821
--- /dev/null
+++ b/test/configCases/source-map/default-filename-extensions-mjs/test.js
@@ -0,0 +1,3 @@
+var foo = {};
+
+module.exports = foo;
\ No newline at end of file
diff --git a/test/configCases/source-map/default-filename-extensions-mjs/webpack.config.js b/test/configCases/source-map/default-filename-extensions-mjs/webpack.config.js
new file mode 100644
index 00000000000..9f5b271c0bd
--- /dev/null
+++ b/test/configCases/source-map/default-filename-extensions-mjs/webpack.config.js
@@ -0,0 +1,11 @@
+module.exports = {
+	mode: "development",
+	output: {
+		filename: "bundle0.mjs"
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	devtool: "source-map"
+};
diff --git a/test/configCases/split-chunks/runtime-chunk/a.js b/test/configCases/split-chunks/runtime-chunk/a.js
index e135684891b..fcae9162325 100644
--- a/test/configCases/split-chunks/runtime-chunk/a.js
+++ b/test/configCases/split-chunks/runtime-chunk/a.js
@@ -2,7 +2,7 @@ it("should be able to load the split chunk on demand", () => {
 	const promise = import(/* webpackChunkName: "shared" */ "./shared");
 
 	const script = document.head._children[0];
-	expect(script.src).toBe("dep~b~shared.js");
+	expect(script.src).toBe("https://test.cases/path/dep~b~shared.js");
 
 	__non_webpack_require__("./dep~b~shared.js");
 
diff --git a/test/configCases/target/amd-named/index.js b/test/configCases/target/amd-named/index.js
new file mode 100644
index 00000000000..0d9cc474b4f
--- /dev/null
+++ b/test/configCases/target/amd-named/index.js
@@ -0,0 +1,10 @@
+it("should run", function() {
+
+});
+
+it("should name define", function() {
+	var fs = require("fs");
+	var source = fs.readFileSync(__filename, "utf-8");
+
+	expect(source).toMatch("define(\"NamedLibrary\",");
+});
diff --git a/test/configCases/target/amd-named/webpack.config.js b/test/configCases/target/amd-named/webpack.config.js
new file mode 100644
index 00000000000..f80f8f3a0d2
--- /dev/null
+++ b/test/configCases/target/amd-named/webpack.config.js
@@ -0,0 +1,17 @@
+const webpack = require("../../../../");
+module.exports = {
+	output: {
+		library: "NamedLibrary",
+		libraryTarget: "amd"
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	plugins: [
+		new webpack.BannerPlugin({
+			raw: true,
+			banner: "function define(name, deps, fn) { fn(); }\n"
+		})
+	]
+};
diff --git a/test/configCases/target/amd-require/index.js b/test/configCases/target/amd-require/index.js
new file mode 100644
index 00000000000..16e30876019
--- /dev/null
+++ b/test/configCases/target/amd-require/index.js
@@ -0,0 +1,10 @@
+it("should run", function() {
+
+});
+
+it("should name require", function() {
+	var fs = nodeRequire("fs");
+	var source = fs.readFileSync(__filename, "utf-8");
+
+	expect(source).toMatch(/require\(\[[^\]]*\], function\(/);
+});
diff --git a/test/configCases/target/amd-require/webpack.config.js b/test/configCases/target/amd-require/webpack.config.js
new file mode 100644
index 00000000000..1bb3b0ac283
--- /dev/null
+++ b/test/configCases/target/amd-require/webpack.config.js
@@ -0,0 +1,17 @@
+const webpack = require("../../../../");
+module.exports = {
+	output: {
+		libraryTarget: "amd-require"
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	plugins: [
+		new webpack.BannerPlugin({
+			raw: true,
+			banner:
+				"var nodeRequire = require;\nvar require = function(deps, fn) { fn(); }\n"
+		})
+	]
+};
diff --git a/test/configCases/target/amd-unnamed/index.js b/test/configCases/target/amd-unnamed/index.js
new file mode 100644
index 00000000000..1341eea61b2
--- /dev/null
+++ b/test/configCases/target/amd-unnamed/index.js
@@ -0,0 +1,10 @@
+it("should run", function() {
+
+});
+
+it("should name define", function() {
+	var fs = require("fs");
+	var source = fs.readFileSync(__filename, "utf-8");
+
+	expect(source).toMatch(/define\(\[[^\]]*\], function\(/);
+});
diff --git a/test/configCases/target/amd-unnamed/webpack.config.js b/test/configCases/target/amd-unnamed/webpack.config.js
new file mode 100644
index 00000000000..494051b75af
--- /dev/null
+++ b/test/configCases/target/amd-unnamed/webpack.config.js
@@ -0,0 +1,16 @@
+const webpack = require("../../../../");
+module.exports = {
+	output: {
+		libraryTarget: "amd"
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	plugins: [
+		new webpack.BannerPlugin({
+			raw: true,
+			banner: "function define(deps, fn) { fn(); }\n"
+		})
+	]
+};
diff --git a/test/configCases/target/node-dynamic-import/index.js b/test/configCases/target/node-dynamic-import/index.js
index 2c354b52920..43f1453b418 100644
--- a/test/configCases/target/node-dynamic-import/index.js
+++ b/test/configCases/target/node-dynamic-import/index.js
@@ -23,10 +23,9 @@ function testCase(load, done) {
 it("should be able to use expressions in import", function(done) {
 	function load(name, expected, callback) {
 		import("./dir/" + name + '.js')
-			.then((result) => {expect(result).toEqual({
-				default: expected,
-				[Symbol.toStringTag]: "Module"
-			}); callback()})
+			.then((result) => {expect(result).toEqual(nsObj({
+				default: expected
+			})); callback()})
 			.catch((err) => {done(err)});
 	}
 	testCase(load, done);
@@ -35,10 +34,9 @@ it("should be able to use expressions in import", function(done) {
 it("should be able to use expressions in lazy-once import", function(done) {
 	function load(name, expected, callback) {
 		import(/* webpackMode: "lazy-once" */ "./dir/" + name + '.js')
-			.then((result) => {expect(result).toEqual({
-				default: expected,
-				[Symbol.toStringTag]: "Module"
-			}); callback()})
+			.then((result) => {expect(result).toEqual(nsObj({
+				default: expected
+			})); callback()})
 			.catch((err) => {done(err)});
 	}
 	testCase(load, done);
@@ -47,10 +45,9 @@ it("should be able to use expressions in lazy-once import", function(done) {
 it("should be able to use expressions in import", function(done) {
 	function load(name, expected, callback) {
 		import("./dir2/" + name).then((result) => {
-			expect(result).toEqual({
-				default: expected,
-				[Symbol.toStringTag]: "Module"
-			});
+			expect(result).toEqual(nsObj({
+				default: expected
+			}));
 			callback();
 		}).catch((err) => {
 			done(err);
@@ -65,10 +62,9 @@ it("should convert to function in node", function() {
 
 it("should be able to use import", function(done) {
 	import("./two").then((two) => {
-		expect(two).toEqual({
-			default: 2,
-			[Symbol.toStringTag]: "Module"
-		});
+		expect(two).toEqual(nsObj({
+			default: 2
+		}));
 		done();
 	}).catch(function(err) {
 		done(err);
diff --git a/test/configCases/wasm/identical/index.js b/test/configCases/wasm/identical/index.js
new file mode 100644
index 00000000000..178e4d2b979
--- /dev/null
+++ b/test/configCases/wasm/identical/index.js
@@ -0,0 +1,13 @@
+it("should allow reference the same wasm multiple times", function() {
+	return import("./module").then(function(module) {
+		const result = module.run();
+		expect(result).toEqual(84);
+	});
+});
+
+it("should allow reference the same wasm multiple times (other chunk)", function() {
+	return import("./module?2").then(function(module) {
+		const result = module.run();
+		expect(result).toEqual(84);
+	});
+});
diff --git a/test/configCases/wasm/identical/module.js b/test/configCases/wasm/identical/module.js
new file mode 100644
index 00000000000..14eb8ae2f07
--- /dev/null
+++ b/test/configCases/wasm/identical/module.js
@@ -0,0 +1,6 @@
+import { getNumber } from "./wasm.wat?1";
+import { getNumber as getNumber2 } from "./wasm.wat?2";
+
+export function run() {
+	return getNumber() + getNumber2();
+};
diff --git a/test/configCases/wasm/identical/test.filter.js b/test/configCases/wasm/identical/test.filter.js
new file mode 100644
index 00000000000..23177349638
--- /dev/null
+++ b/test/configCases/wasm/identical/test.filter.js
@@ -0,0 +1,5 @@
+var supportsWebAssembly = require("../../../helpers/supportsWebAssembly");
+
+module.exports = function(config) {
+	return supportsWebAssembly();
+};
diff --git a/test/configCases/wasm/identical/wasm.wat b/test/configCases/wasm/identical/wasm.wat
new file mode 100644
index 00000000000..3a135271020
--- /dev/null
+++ b/test/configCases/wasm/identical/wasm.wat
@@ -0,0 +1,10 @@
+(module
+  (type $t0 (func (param i32 i32) (result i32)))
+  (type $t1 (func (result i32)))
+  (func $add (export "add") (type $t0) (param $p0 i32) (param $p1 i32) (result i32)
+    (i32.add
+      (get_local $p0)
+      (get_local $p1)))
+  (func $getNumber (export "getNumber") (type $t1) (result i32)
+    (i32.const 42)))
+
diff --git a/test/configCases/wasm/identical/webpack.config.js b/test/configCases/wasm/identical/webpack.config.js
new file mode 100644
index 00000000000..2081ec1207c
--- /dev/null
+++ b/test/configCases/wasm/identical/webpack.config.js
@@ -0,0 +1,35 @@
+const { CachedSource } = require("webpack-sources");
+
+/** @typedef {import("../../../lib/Compilation")} Compilation */
+
+module.exports = {
+	module: {
+		rules: [
+			{
+				test: /\.wat$/,
+				loader: "wast-loader",
+				type: "webassembly/experimental"
+			}
+		]
+	},
+	plugins: [
+		function() {
+			this.hooks.compilation.tap(
+				"Test",
+				/**
+				 * @param {Compilation} compilation Compilation
+				 * @returns {void}
+				 */
+				compilation => {
+					compilation.moduleTemplates.webassembly.hooks.package.tap(
+						"Test",
+						source => {
+							// this is important to make each returned value a new instance
+							return new CachedSource(source);
+						}
+					);
+				}
+			);
+		}
+	]
+};
diff --git a/test/configCases/wasm/wasm-in-initial-chunk-error/async.js b/test/configCases/wasm/wasm-in-initial-chunk-error/async.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/configCases/wasm/wasm-in-initial-chunk-error/errors.js b/test/configCases/wasm/wasm-in-initial-chunk-error/errors.js
new file mode 100644
index 00000000000..1a501f8505e
--- /dev/null
+++ b/test/configCases/wasm/wasm-in-initial-chunk-error/errors.js
@@ -0,0 +1,14 @@
+module.exports = [
+	[
+		/\.\/wasm.wat/,
+		/WebAssembly module is included in initial chunk/,
+		/\* \.\/index.js --> \.\/module.js --> \.\/wasm.wat/,
+		/\* \.\.\. --> \.\/module.js --> \.\/module2.js --> \.\/wasm.wat/,
+		/\* \.\.\. --> \.\/module2.js --> \.\/module3.js --> \.\/wasm.wat/
+	],
+	[
+		/\.\/wasm2\.wat/,
+		/WebAssembly module is included in initial chunk/,
+		/\* \.\/index.js --> \.\/module.js --> \.\/module2.js --> \.\/module3.js --> \.\/wasm2.wat/
+	]
+];
diff --git a/test/configCases/wasm/wasm-in-initial-chunk-error/index.js b/test/configCases/wasm/wasm-in-initial-chunk-error/index.js
new file mode 100644
index 00000000000..78b4fb26bba
--- /dev/null
+++ b/test/configCases/wasm/wasm-in-initial-chunk-error/index.js
@@ -0,0 +1 @@
+import "./module";
diff --git a/test/configCases/wasm/wasm-in-initial-chunk-error/module.js b/test/configCases/wasm/wasm-in-initial-chunk-error/module.js
new file mode 100644
index 00000000000..8f207aeccd7
--- /dev/null
+++ b/test/configCases/wasm/wasm-in-initial-chunk-error/module.js
@@ -0,0 +1,7 @@
+import { getNumber } from "./wasm.wat";
+
+import("./async.js");
+
+require("./module2");
+
+getNumber();
diff --git a/test/configCases/wasm/wasm-in-initial-chunk-error/module2.js b/test/configCases/wasm/wasm-in-initial-chunk-error/module2.js
new file mode 100644
index 00000000000..becf9480ced
--- /dev/null
+++ b/test/configCases/wasm/wasm-in-initial-chunk-error/module2.js
@@ -0,0 +1,2 @@
+require("./wasm.wat");
+require("./module3");
diff --git a/test/configCases/wasm/wasm-in-initial-chunk-error/module3.js b/test/configCases/wasm/wasm-in-initial-chunk-error/module3.js
new file mode 100644
index 00000000000..8974b1b8d2c
--- /dev/null
+++ b/test/configCases/wasm/wasm-in-initial-chunk-error/module3.js
@@ -0,0 +1,2 @@
+require("./wasm.wat");
+require("./wasm2.wat");
diff --git a/test/configCases/wasm/wasm-in-initial-chunk-error/test.filter.js b/test/configCases/wasm/wasm-in-initial-chunk-error/test.filter.js
new file mode 100644
index 00000000000..0e71c44cb38
--- /dev/null
+++ b/test/configCases/wasm/wasm-in-initial-chunk-error/test.filter.js
@@ -0,0 +1,5 @@
+var supportsWebAssembly = require("../../../helpers/supportsWebAssembly");
+
+module.exports = function() {
+	return supportsWebAssembly();
+};
diff --git a/test/configCases/wasm/wasm-in-initial-chunk-error/wasm.wat b/test/configCases/wasm/wasm-in-initial-chunk-error/wasm.wat
new file mode 100644
index 00000000000..d8081e18c3b
--- /dev/null
+++ b/test/configCases/wasm/wasm-in-initial-chunk-error/wasm.wat
@@ -0,0 +1,4 @@
+(module
+  (func $getNumber (export "getNumber") (result i32)
+    (i32.const 42)))
+
diff --git a/test/configCases/wasm/wasm-in-initial-chunk-error/wasm2.wat b/test/configCases/wasm/wasm-in-initial-chunk-error/wasm2.wat
new file mode 100644
index 00000000000..d8081e18c3b
--- /dev/null
+++ b/test/configCases/wasm/wasm-in-initial-chunk-error/wasm2.wat
@@ -0,0 +1,4 @@
+(module
+  (func $getNumber (export "getNumber") (result i32)
+    (i32.const 42)))
+
diff --git a/test/configCases/wasm/wasm-in-initial-chunk-error/webpack.config.js b/test/configCases/wasm/wasm-in-initial-chunk-error/webpack.config.js
new file mode 100644
index 00000000000..c673c27b334
--- /dev/null
+++ b/test/configCases/wasm/wasm-in-initial-chunk-error/webpack.config.js
@@ -0,0 +1,12 @@
+module.exports = {
+	entry: "./index",
+	module: {
+		rules: [
+			{
+				test: /\.wat$/,
+				loader: "wast-loader",
+				type: "webassembly/experimental"
+			}
+		]
+	}
+};
diff --git a/test/configCases/web/prefetch-preload/index.js b/test/configCases/web/prefetch-preload/index.js
index 2d393f55a6b..dba5b0575ad 100644
--- a/test/configCases/web/prefetch-preload/index.js
+++ b/test/configCases/web/prefetch-preload/index.js
@@ -2,19 +2,21 @@
 let oldNonce;
 let oldPublicPath;
 
-beforeEach(() => {
+beforeEach(done => {
 	oldNonce = __webpack_nonce__;
 	oldPublicPath = __webpack_public_path__;
+	done();
 });
 
-afterEach(() => {
+afterEach(done => {
 	__webpack_nonce__ = oldNonce;
 	__webpack_public_path__ = oldPublicPath;
-})
+	done();
+});
 
 it("should prefetch and preload child chunks on chunk load", () => {
 	__webpack_nonce__ = "nonce";
-	__webpack_public_path__ = "/public/path/";
+	__webpack_public_path__ = "https://example.com/public/path/";
 
 	let link, script;
 
diff --git a/test/fixtures/count-loader.js b/test/fixtures/count-loader.js
new file mode 100644
index 00000000000..ced2018eef9
--- /dev/null
+++ b/test/fixtures/count-loader.js
@@ -0,0 +1,5 @@
+let counter = 0;
+
+module.exports = function() {
+	return `module.exports = ${counter++};`;
+};
diff --git a/test/fixtures/errors/module.parent.require.js b/test/fixtures/errors/module.parent.require.js
new file mode 100644
index 00000000000..f13326a68e1
--- /dev/null
+++ b/test/fixtures/errors/module.parent.require.js
@@ -0,0 +1 @@
+module.parent.require('./file');
diff --git a/test/fixtures/errors/require.main.require.js b/test/fixtures/errors/require.main.require.js
new file mode 100644
index 00000000000..b29827f3ed4
--- /dev/null
+++ b/test/fixtures/errors/require.main.require.js
@@ -0,0 +1 @@
+require.main.require('./file');
diff --git a/test/helpers/FakeDocument.js b/test/helpers/FakeDocument.js
index 0c9d80de06f..680c5157640 100644
--- a/test/helpers/FakeDocument.js
+++ b/test/helpers/FakeDocument.js
@@ -20,6 +20,8 @@ class FakeElement {
 		this._type = type;
 		this._children = [];
 		this._attributes = Object.create(null);
+		this._src = undefined;
+		this._href = undefined;
 	}
 
 	appendChild(node) {
@@ -33,4 +35,40 @@ class FakeElement {
 	getAttribute(name) {
 		return this._attributes[name];
 	}
+
+	_toRealUrl(value) {
+		if (/^\//.test(value)) {
+			return `https://test.cases${value}`;
+		} else if (/^\.\.\//.test(value)) {
+			return `https://test.cases${value.substr(2)}`;
+		} else if (/^\.\//.test(value)) {
+			return `https://test.cases/path${value.substr(1)}`;
+		} else if (/^\w+:\/\//.test(value)) {
+			return value;
+		} else if (/^\/\//.test(value)) {
+			return `https:${value}`;
+		} else {
+			return `https://test.cases/path/${value}`;
+		}
+	}
+
+	set src(value) {
+		if (this._type === "script") {
+			this._src = this._toRealUrl(value);
+		}
+	}
+
+	get src() {
+		return this._src;
+	}
+
+	set href(value) {
+		if (this._type === "link") {
+			this._href = this._toRealUrl(value);
+		}
+	}
+
+	get href() {
+		return this._href;
+	}
 }
diff --git a/test/helpers/createLazyTestEnv.js b/test/helpers/createLazyTestEnv.js
new file mode 100644
index 00000000000..ad77365ba13
--- /dev/null
+++ b/test/helpers/createLazyTestEnv.js
@@ -0,0 +1,64 @@
+module.exports = (env, globalTimeout = 2000, nameSuffix = "") => {
+	const suite = env.describe(
+		nameSuffix ? `exported tests ${nameSuffix}` : "exported tests",
+		() => {
+			// this must have a child to be handled correctly
+			env.it("should run the exported tests", () => {});
+		}
+	);
+	let numberOfTests = 0;
+	const beforeAndAfterFns = () => {
+		let currentSuite = suite;
+		let afters = [];
+		let befores = [];
+
+		while (currentSuite) {
+			befores = befores.concat(currentSuite.beforeFns);
+			afters = afters.concat(currentSuite.afterFns);
+
+			currentSuite = currentSuite.parentSuite;
+		}
+
+		return {
+			befores: befores.reverse(),
+			afters: afters
+		};
+	};
+	return {
+		setDefaultTimeout(time) {
+			globalTimeout = time;
+		},
+		getNumberOfTests() {
+			return numberOfTests;
+		},
+		it(title, fn, timeout = globalTimeout) {
+			numberOfTests++;
+			let spec;
+			if(fn) {
+				spec = env.fit(title, fn, timeout);
+			} else {
+				spec = env.fit(title, () => {});
+				spec.pend("Skipped");
+			}
+			suite.addChild(spec);
+			spec.disabled = false;
+			spec.getSpecName = () => {
+				return `${suite.getFullName()} ${spec.description}`;
+			};
+			spec.beforeAndAfterFns = beforeAndAfterFns;
+			spec.result.fullName = spec.getFullName();
+		},
+		beforeEach(fn, timeout = globalTimeout) {
+			suite.beforeEach({
+				fn,
+				timeout: () => timeout
+			});
+		},
+		afterEach(fn, timeout = globalTimeout) {
+			suite.afterEach({
+				fn,
+				timeout: () => timeout
+			});
+		}
+	};
+};
diff --git a/test/hotCases/concat/reload-compat-flag/index.js b/test/hotCases/concat/reload-compat-flag/index.js
index 495849e609e..ddb2584ebb0 100644
--- a/test/hotCases/concat/reload-compat-flag/index.js
+++ b/test/hotCases/concat/reload-compat-flag/index.js
@@ -1,16 +1,14 @@
 var x = require("./module");
 
 it("should allow to hot replace modules in a ConcatenatedModule", (done) => {
-	expect(x).toEqual({
-		default: "ok1",
-		[Symbol.toStringTag]: "Module"
-	});
+	expect(x).toEqual(nsObj({
+		default: "ok1"
+	}));
 	module.hot.accept("./module", () => {
 		x = require("./module");
-		expect(x).toEqual({
-			default: "ok2",
-			[Symbol.toStringTag]: "Module"
-		});
+		expect(x).toEqual(nsObj({
+			default: "ok2"
+		}));
 		done();
 	});
 	NEXT(require("../../update")(done));
diff --git a/test/hotCases/fake-update-loader.js b/test/hotCases/fake-update-loader.js
index abbffa4cac0..e2b1884bd74 100644
--- a/test/hotCases/fake-update-loader.js
+++ b/test/hotCases/fake-update-loader.js
@@ -1,6 +1,8 @@
 module.exports = function(source) {
-	this.cacheable(false);
 	var idx = this.updateIndex;
 	var items = source.split(/---+\r?\n/g);
+	if (items.length > 1) {
+		this.cacheable(false);
+	}
 	return items[idx] || items[items.length - 1];
-}
+};
diff --git a/test/hotCases/json/error-in-json/data.json b/test/hotCases/json/error-in-json/data.json
new file mode 100644
index 00000000000..c6e904ba9e5
--- /dev/null
+++ b/test/hotCases/json/error-in-json/data.json
@@ -0,0 +1,3 @@
+error
+---
+42
diff --git a/test/hotCases/json/error-in-json/errors.js b/test/hotCases/json/error-in-json/errors.js
new file mode 100644
index 00000000000..534e9facc4c
--- /dev/null
+++ b/test/hotCases/json/error-in-json/errors.js
@@ -0,0 +1 @@
+module.exports = [[/Module parse failed/]];
diff --git a/test/hotCases/json/error-in-json/index.js b/test/hotCases/json/error-in-json/index.js
new file mode 100644
index 00000000000..5b6a25ab2be
--- /dev/null
+++ b/test/hotCases/json/error-in-json/index.js
@@ -0,0 +1,8 @@
+it("should be able to recover from json error", function(done) {
+	expect(() => require("./data.json")).toThrowError();
+	module.hot.accept("./data.json", function() {
+		expect(require("./data.json")).toBe(42);
+		done();
+	});
+	NEXT(require("../../update")(done));
+});
diff --git a/test/hotCases/update.js b/test/hotCases/update.js
index e85933acc2b..d6993d2cc3f 100644
--- a/test/hotCases/update.js
+++ b/test/hotCases/update.js
@@ -1,7 +1,8 @@
 module.exports = function(done, options, callback) {
-	return function(stats) {
+	return function(err, stats) {
+		if (err) return done(err);
 		module.hot.check(options || true).then(() => {
-			if(callback)
+			if (callback)
 				callback(stats);
 		}).catch((err) => {
 			done(err);
diff --git a/test/statsCases/define-plugin/123.txt b/test/statsCases/define-plugin/123.txt
new file mode 100644
index 00000000000..190a18037c6
--- /dev/null
+++ b/test/statsCases/define-plugin/123.txt
@@ -0,0 +1 @@
+123
diff --git a/test/statsCases/define-plugin/321.txt b/test/statsCases/define-plugin/321.txt
new file mode 100644
index 00000000000..3ae0b938fa8
--- /dev/null
+++ b/test/statsCases/define-plugin/321.txt
@@ -0,0 +1 @@
+321
diff --git a/test/statsCases/define-plugin/webpack.config.js b/test/statsCases/define-plugin/webpack.config.js
index 999dc282d1d..e5b72f1d595 100644
--- a/test/statsCases/define-plugin/webpack.config.js
+++ b/test/statsCases/define-plugin/webpack.config.js
@@ -1,4 +1,13 @@
 var webpack = require("../../../");
+var fs = require("fs");
+var join = require("path").join;
+
+function read(path) {
+	return JSON.stringify(
+		fs.readFileSync(join(__dirname, path), "utf8").replace(/\r\n/g, "\n")
+	);
+}
+
 module.exports = [
 	{
 		mode: "production",
@@ -18,5 +27,22 @@ module.exports = [
 				VALUE: "321"
 			})
 		]
+	},
+
+	{
+		mode: "production",
+		entry: "./index",
+		plugins: [
+			new webpack.DefinePlugin({
+				VALUE: webpack.DefinePlugin.runtimeValue(() => read("123.txt"), [
+					"./123.txt"
+				])
+			}),
+			new webpack.DefinePlugin({
+				VALUE: webpack.DefinePlugin.runtimeValue(() => read("321.txt"), [
+					"./321.txt"
+				])
+			})
+		]
 	}
 ];
diff --git a/test/statsCases/dll-reference-plugin-issue-7624-error/blank-manifest.json b/test/statsCases/dll-reference-plugin-issue-7624-error/blank-manifest.json
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/statsCases/dll-reference-plugin-issue-7624-error/entry.js b/test/statsCases/dll-reference-plugin-issue-7624-error/entry.js
new file mode 100644
index 00000000000..7215576fcc1
--- /dev/null
+++ b/test/statsCases/dll-reference-plugin-issue-7624-error/entry.js
@@ -0,0 +1 @@
+// Intentionally left blank.
diff --git a/test/statsCases/dll-reference-plugin-issue-7624-error/webpack.config.js b/test/statsCases/dll-reference-plugin-issue-7624-error/webpack.config.js
new file mode 100644
index 00000000000..aa0403c269b
--- /dev/null
+++ b/test/statsCases/dll-reference-plugin-issue-7624-error/webpack.config.js
@@ -0,0 +1,15 @@
+var webpack = require("../../../");
+
+module.exports = {
+	mode: "production",
+	entry: "./entry.js",
+	output: {
+		filename: "bundle.js"
+	},
+	plugins: [
+		new webpack.DllReferencePlugin({
+			manifest: __dirname + "/blank-manifest.json",
+			name: "blank-manifest"
+		})
+	]
+};
diff --git a/test/statsCases/dll-reference-plugin-issue-7624/entry.js b/test/statsCases/dll-reference-plugin-issue-7624/entry.js
new file mode 100644
index 00000000000..7215576fcc1
--- /dev/null
+++ b/test/statsCases/dll-reference-plugin-issue-7624/entry.js
@@ -0,0 +1 @@
+// Intentionally left blank.
diff --git a/test/statsCases/dll-reference-plugin-issue-7624/non-blank-manifest.json b/test/statsCases/dll-reference-plugin-issue-7624/non-blank-manifest.json
new file mode 100644
index 00000000000..6f0100bea85
--- /dev/null
+++ b/test/statsCases/dll-reference-plugin-issue-7624/non-blank-manifest.json
@@ -0,0 +1,11 @@
+{
+  "name": "foo",
+  "content": {
+    "./foo.js": {
+      "id": 0,
+      "buildMeta": {
+        "providedExports": true
+      }
+    }
+  }
+}
diff --git a/test/statsCases/dll-reference-plugin-issue-7624/webpack.config.js b/test/statsCases/dll-reference-plugin-issue-7624/webpack.config.js
new file mode 100644
index 00000000000..cfd2bfe9301
--- /dev/null
+++ b/test/statsCases/dll-reference-plugin-issue-7624/webpack.config.js
@@ -0,0 +1,15 @@
+var webpack = require("../../../");
+
+module.exports = {
+	mode: "production",
+	entry: "./entry.js",
+	output: {
+		filename: "bundle.js"
+	},
+	plugins: [
+		new webpack.DllReferencePlugin({
+			manifest: __dirname + "/non-blank-manifest.json",
+			name: "non-blank-manifest"
+		})
+	]
+};
diff --git a/test/statsCases/filter-warnings/webpack.config.js b/test/statsCases/filter-warnings/webpack.config.js
index aad74a38865..ae23fcd948d 100644
--- a/test/statsCases/filter-warnings/webpack.config.js
+++ b/test/statsCases/filter-warnings/webpack.config.js
@@ -48,6 +48,7 @@ module.exports = [
 	[warnings => false]
 ].map(filter =>
 	Object.assign({}, baseConfig, {
+		name: Array.isArray(filter) ? `[${filter}]` : `${filter}`,
 		stats: Object.assign({}, baseConfig.stats, {
 			warningsFilter: filter
 		})
diff --git a/test/statsCases/issue-7577/a.js b/test/statsCases/issue-7577/a.js
new file mode 100644
index 00000000000..7b2a3460115
--- /dev/null
+++ b/test/statsCases/issue-7577/a.js
@@ -0,0 +1 @@
+console.log("a");
diff --git a/test/statsCases/issue-7577/b.js b/test/statsCases/issue-7577/b.js
new file mode 100644
index 00000000000..e08a1b185c2
--- /dev/null
+++ b/test/statsCases/issue-7577/b.js
@@ -0,0 +1 @@
+import "vendor";
diff --git a/test/statsCases/issue-7577/c.js b/test/statsCases/issue-7577/c.js
new file mode 100644
index 00000000000..a483cc728df
--- /dev/null
+++ b/test/statsCases/issue-7577/c.js
@@ -0,0 +1,2 @@
+console.log("c");
+import(/* webpackPrefetch: true */ "./b");
diff --git a/test/statsCases/issue-7577/node_modules/vendor.js b/test/statsCases/issue-7577/node_modules/vendor.js
new file mode 100644
index 00000000000..d9e298f6dc9
--- /dev/null
+++ b/test/statsCases/issue-7577/node_modules/vendor.js
@@ -0,0 +1 @@
+console.log("vendor");
diff --git a/test/statsCases/issue-7577/webpack.config.js b/test/statsCases/issue-7577/webpack.config.js
new file mode 100644
index 00000000000..50e73e91765
--- /dev/null
+++ b/test/statsCases/issue-7577/webpack.config.js
@@ -0,0 +1,45 @@
+const base = {
+	mode: "production",
+	optimization: {
+		runtimeChunk: true,
+		namedChunks: true,
+		splitChunks: {
+			minSize: 0,
+			chunks: "all",
+			cacheGroups: {
+				all: {
+					priority: -30
+				}
+			}
+		}
+	}
+};
+module.exports = [
+	Object.assign(
+		{
+			entry: "./a.js",
+			output: {
+				filename: "a-[name]-[chunkhash].js"
+			}
+		},
+		base
+	),
+	Object.assign(
+		{
+			entry: "./b.js",
+			output: {
+				filename: "b-[name]-[chunkhash].js"
+			}
+		},
+		base
+	),
+	Object.assign(
+		{
+			entry: "./c.js",
+			output: {
+				filename: "c-[name]-[chunkhash].js"
+			}
+		},
+		base
+	)
+];
diff --git a/test/statsCases/split-chunks-automatic-name/a.js b/test/statsCases/split-chunks-automatic-name/a.js
new file mode 100644
index 00000000000..1fcabdcfdc0
--- /dev/null
+++ b/test/statsCases/split-chunks-automatic-name/a.js
@@ -0,0 +1,5 @@
+import "./d";
+import "./e";
+import "x";
+import "y";
+export default "a";
diff --git a/test/statsCases/split-chunks-automatic-name/b.js b/test/statsCases/split-chunks-automatic-name/b.js
new file mode 100644
index 00000000000..fd909a7b63b
--- /dev/null
+++ b/test/statsCases/split-chunks-automatic-name/b.js
@@ -0,0 +1,5 @@
+import "./d";
+import "./f";
+import "x";
+import "y";
+export default "b";
diff --git a/test/statsCases/split-chunks-automatic-name/c.js b/test/statsCases/split-chunks-automatic-name/c.js
new file mode 100644
index 00000000000..6bbf24bfe50
--- /dev/null
+++ b/test/statsCases/split-chunks-automatic-name/c.js
@@ -0,0 +1,5 @@
+import "./d";
+import "./f";
+import "x";
+import "z";
+export default "c";
diff --git a/test/statsCases/split-chunks-automatic-name/d.js b/test/statsCases/split-chunks-automatic-name/d.js
new file mode 100644
index 00000000000..987d6d7e401
--- /dev/null
+++ b/test/statsCases/split-chunks-automatic-name/d.js
@@ -0,0 +1 @@
+export default "d";
diff --git a/test/statsCases/split-chunks-automatic-name/e.js b/test/statsCases/split-chunks-automatic-name/e.js
new file mode 100644
index 00000000000..d97e38b22f5
--- /dev/null
+++ b/test/statsCases/split-chunks-automatic-name/e.js
@@ -0,0 +1 @@
+export default "e";
diff --git a/test/statsCases/split-chunks-automatic-name/f.js b/test/statsCases/split-chunks-automatic-name/f.js
new file mode 100644
index 00000000000..657d4dee8a8
--- /dev/null
+++ b/test/statsCases/split-chunks-automatic-name/f.js
@@ -0,0 +1 @@
+export default "f";
diff --git a/test/statsCases/split-chunks-automatic-name/index.js b/test/statsCases/split-chunks-automatic-name/index.js
new file mode 100644
index 00000000000..5dfec91bc71
--- /dev/null
+++ b/test/statsCases/split-chunks-automatic-name/index.js
@@ -0,0 +1,3 @@
+import(/* webpackChunkName: "async-a" */ "./a");
+import(/* webpackChunkName: "async-b" */ "./b");
+import(/* webpackChunkName: "async-c" */ "./c");
diff --git a/test/statsCases/split-chunks-automatic-name/node_modules/x.js b/test/statsCases/split-chunks-automatic-name/node_modules/x.js
new file mode 100644
index 00000000000..3fd5ecc7a40
--- /dev/null
+++ b/test/statsCases/split-chunks-automatic-name/node_modules/x.js
@@ -0,0 +1 @@
+export default "x";
diff --git a/test/statsCases/split-chunks-automatic-name/node_modules/y.js b/test/statsCases/split-chunks-automatic-name/node_modules/y.js
new file mode 100644
index 00000000000..413e7c09da6
--- /dev/null
+++ b/test/statsCases/split-chunks-automatic-name/node_modules/y.js
@@ -0,0 +1 @@
+export default "y";
diff --git a/test/statsCases/split-chunks-automatic-name/node_modules/z.js b/test/statsCases/split-chunks-automatic-name/node_modules/z.js
new file mode 100644
index 00000000000..0b388750767
--- /dev/null
+++ b/test/statsCases/split-chunks-automatic-name/node_modules/z.js
@@ -0,0 +1 @@
+export default "z";
diff --git a/test/statsCases/split-chunks-automatic-name/webpack.config.js b/test/statsCases/split-chunks-automatic-name/webpack.config.js
new file mode 100644
index 00000000000..8216c7312c7
--- /dev/null
+++ b/test/statsCases/split-chunks-automatic-name/webpack.config.js
@@ -0,0 +1,37 @@
+const stats = {
+	hash: false,
+	timings: false,
+	builtAt: false,
+	assets: false,
+	chunks: true,
+	chunkOrigins: true,
+	entrypoints: true,
+	modules: false
+};
+module.exports = {
+	name: "production",
+	mode: "production",
+	entry: {
+		main: "./"
+	},
+	optimization: {
+		splitChunks: {
+			chunks: "all",
+			minSize: 1,
+			cacheGroups: {
+				default: {
+					automaticNamePrefix: "common",
+					reuseExistingChunk: true,
+					minChunks: 2,
+					priority: -20
+				},
+				vendors: {
+					automaticNamePrefix: "common",
+					test: /[\\/]node_modules[\\/]/,
+					priority: -10
+				}
+			}
+		}
+	},
+	stats
+};
diff --git a/test/statsCases/split-chunks-max-size/big.js b/test/statsCases/split-chunks-max-size/big.js
new file mode 100644
index 00000000000..40380e42352
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/big.js
@@ -0,0 +1,4 @@
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/in-some-directory/big.js b/test/statsCases/split-chunks-max-size/in-some-directory/big.js
new file mode 100644
index 00000000000..40380e42352
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/in-some-directory/big.js
@@ -0,0 +1,4 @@
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/in-some-directory/small.js b/test/statsCases/split-chunks-max-size/in-some-directory/small.js
new file mode 100644
index 00000000000..1f44b439eae
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/in-some-directory/small.js
@@ -0,0 +1 @@
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/in-some-directory/very-big.js b/test/statsCases/split-chunks-max-size/in-some-directory/very-big.js
new file mode 100644
index 00000000000..4c943771c37
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/in-some-directory/very-big.js
@@ -0,0 +1,24 @@
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/index.js b/test/statsCases/split-chunks-max-size/index.js
new file mode 100644
index 00000000000..28dd561398c
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/index.js
@@ -0,0 +1,48 @@
+import "./big?1";
+import "./big?2";
+import "./small?1";
+import "./small?2";
+import "./small?3";
+import "./small?4";
+import "./small?5";
+import "./small?6";
+import "./small?7";
+import "./small?8";
+import "./small?9";
+import "./very-big?1";
+import "./very-big?2";
+import "./very-big?3";
+
+import "./subfolder/big?1";
+import "./subfolder/big?2";
+import "./subfolder/small?1";
+import "./subfolder/small?2";
+import "./subfolder/small?3";
+import "./subfolder/small?4";
+import "./subfolder/small?5";
+import "./subfolder/small?6";
+import "./subfolder/small?7";
+import "./subfolder/small?8";
+import "./subfolder/small?9";
+
+import "./inner-module/small?1";
+import "./inner-module/small?2";
+import "./inner-module/small?3";
+import "./inner-module/small?4";
+import "./inner-module/small?5";
+import "./inner-module/small?6";
+import "./inner-module/small?7";
+import "./inner-module/small?8";
+import "./inner-module/small?9";
+
+import "./in-some-directory/big?1";
+import "./in-some-directory/small?1";
+import "./in-some-directory/small?2";
+import "./in-some-directory/small?3";
+import "./in-some-directory/small?4";
+import "./in-some-directory/very-big?1";
+
+import "big?1";
+import "small?1";
+import "small?2";
+import "very-big?1";
diff --git a/test/statsCases/split-chunks-max-size/inner-module/big.js b/test/statsCases/split-chunks-max-size/inner-module/big.js
new file mode 100644
index 00000000000..40380e42352
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/inner-module/big.js
@@ -0,0 +1,4 @@
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/inner-module/small.js b/test/statsCases/split-chunks-max-size/inner-module/small.js
new file mode 100644
index 00000000000..1f44b439eae
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/inner-module/small.js
@@ -0,0 +1 @@
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/inner-module/very-big.js b/test/statsCases/split-chunks-max-size/inner-module/very-big.js
new file mode 100644
index 00000000000..4c943771c37
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/inner-module/very-big.js
@@ -0,0 +1,24 @@
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/node_modules/big.js b/test/statsCases/split-chunks-max-size/node_modules/big.js
new file mode 100644
index 00000000000..40380e42352
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/node_modules/big.js
@@ -0,0 +1,4 @@
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/node_modules/small.js b/test/statsCases/split-chunks-max-size/node_modules/small.js
new file mode 100644
index 00000000000..1f44b439eae
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/node_modules/small.js
@@ -0,0 +1 @@
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/node_modules/very-big.js b/test/statsCases/split-chunks-max-size/node_modules/very-big.js
new file mode 100644
index 00000000000..4c943771c37
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/node_modules/very-big.js
@@ -0,0 +1,24 @@
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/small.js b/test/statsCases/split-chunks-max-size/small.js
new file mode 100644
index 00000000000..1f44b439eae
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/small.js
@@ -0,0 +1 @@
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/subfolder/big.js b/test/statsCases/split-chunks-max-size/subfolder/big.js
new file mode 100644
index 00000000000..40380e42352
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/subfolder/big.js
@@ -0,0 +1,4 @@
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/subfolder/small.js b/test/statsCases/split-chunks-max-size/subfolder/small.js
new file mode 100644
index 00000000000..1f44b439eae
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/subfolder/small.js
@@ -0,0 +1 @@
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/subfolder/very-big.js b/test/statsCases/split-chunks-max-size/subfolder/very-big.js
new file mode 100644
index 00000000000..4c943771c37
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/subfolder/very-big.js
@@ -0,0 +1,24 @@
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/very-big.js b/test/statsCases/split-chunks-max-size/very-big.js
new file mode 100644
index 00000000000..4c943771c37
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/very-big.js
@@ -0,0 +1,24 @@
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
+// content content content content content content content content
diff --git a/test/statsCases/split-chunks-max-size/webpack.config.js b/test/statsCases/split-chunks-max-size/webpack.config.js
new file mode 100644
index 00000000000..d153a580913
--- /dev/null
+++ b/test/statsCases/split-chunks-max-size/webpack.config.js
@@ -0,0 +1,48 @@
+const stats = {
+	hash: false,
+	timings: false,
+	builtAt: false,
+	assets: false,
+	chunks: true,
+	chunkOrigins: true,
+	entrypoints: true,
+	modules: false
+};
+module.exports = [
+	{
+		name: "production",
+		mode: "production",
+		entry: {
+			main: "./"
+		},
+		output: {
+			filename: "prod-[name].js"
+		},
+		optimization: {
+			splitChunks: {
+				minSize: 100,
+				maxSize: 1000,
+				chunks: "all"
+			}
+		},
+		stats
+	},
+	{
+		name: "development",
+		mode: "development",
+		entry: {
+			main: "./"
+		},
+		output: {
+			filename: "dev-[name].js"
+		},
+		optimization: {
+			splitChunks: {
+				minSize: 100,
+				maxSize: 1000,
+				chunks: "all"
+			}
+		},
+		stats
+	}
+];
diff --git a/test/watchCases/plugins/define-plugin/0/index.js b/test/watchCases/plugins/define-plugin/0/index.js
new file mode 100644
index 00000000000..0a53ea7ddc2
--- /dev/null
+++ b/test/watchCases/plugins/define-plugin/0/index.js
@@ -0,0 +1,15 @@
+it("should be able to use dynamic defines in watch mode", function() {
+	const module = require("./module");
+	expect(module).toEqual(nsObj({
+		default: WATCH_STEP,
+		type: "string"
+	}));
+});
+
+it("should not update a define when dependencies list is missing", function() {
+	const module2 = require("./module2");
+	expect(module2).toEqual(nsObj({
+		default: "0",
+		type: "string"
+	}));
+});
diff --git a/test/watchCases/plugins/define-plugin/0/module.js b/test/watchCases/plugins/define-plugin/0/module.js
new file mode 100644
index 00000000000..272cd4deaa4
--- /dev/null
+++ b/test/watchCases/plugins/define-plugin/0/module.js
@@ -0,0 +1,2 @@
+export default TEST_VALUE;
+export const type = typeof TEST_VALUE;
diff --git a/test/watchCases/plugins/define-plugin/0/module2.js b/test/watchCases/plugins/define-plugin/0/module2.js
new file mode 100644
index 00000000000..4bac8477803
--- /dev/null
+++ b/test/watchCases/plugins/define-plugin/0/module2.js
@@ -0,0 +1,2 @@
+export default TEST_VALUE2;
+export const type = typeof TEST_VALUE2;
diff --git a/test/watchCases/plugins/define-plugin/0/value.txt b/test/watchCases/plugins/define-plugin/0/value.txt
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/test/watchCases/plugins/define-plugin/0/value.txt
@@ -0,0 +1 @@
+0
diff --git a/test/watchCases/plugins/define-plugin/1/value.txt b/test/watchCases/plugins/define-plugin/1/value.txt
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/test/watchCases/plugins/define-plugin/1/value.txt
@@ -0,0 +1 @@
+1
diff --git a/test/watchCases/plugins/define-plugin/webpack.config.js b/test/watchCases/plugins/define-plugin/webpack.config.js
new file mode 100644
index 00000000000..113eb10e5b3
--- /dev/null
+++ b/test/watchCases/plugins/define-plugin/webpack.config.js
@@ -0,0 +1,22 @@
+const path = require("path");
+const fs = require("fs");
+const webpack = require("../../../../");
+const valueFile = path.resolve(
+	__dirname,
+	"../../../js/watch-src/plugins/define-plugin/value.txt"
+);
+module.exports = {
+	plugins: [
+		new webpack.DefinePlugin({
+			TEST_VALUE: webpack.DefinePlugin.runtimeValue(
+				() => {
+					return JSON.stringify(fs.readFileSync(valueFile, "utf-8").trim());
+				},
+				[valueFile]
+			),
+			TEST_VALUE2: webpack.DefinePlugin.runtimeValue(() => {
+				return JSON.stringify(fs.readFileSync(valueFile, "utf-8").trim());
+			}, [])
+		})
+	]
+};
diff --git a/tooling/compile-to-definitions.js b/tooling/compile-to-definitions.js
new file mode 100644
index 00000000000..a19aca0c5f4
--- /dev/null
+++ b/tooling/compile-to-definitions.js
@@ -0,0 +1,79 @@
+const fs = require("fs");
+const path = require("path");
+const mkdirp = require("mkdirp");
+const prettierrc = require("../.prettierrc.js"); // eslint-disable-line
+const { compileFromFile } = require("json-schema-to-typescript");
+
+const schemasDir = path.resolve(__dirname, "../schemas");
+const style = {
+	printWidth: prettierrc.printWidth,
+	useTabs: prettierrc.useTabs,
+	tabWidth: prettierrc.tabWidth
+};
+
+// When --write is set, files will be written in place
+// Elsewise it only prints outdated files
+const doWrite = process.argv.includes("--write");
+
+const makeSchemas = () => {
+	// include the top level folder "./schemas" by default
+	const dirs = new Set([schemasDir]);
+
+	// search for all nestedDirs inside of this folder
+	for (let dirWithSchemas of dirs) {
+		for (let item of fs.readdirSync(dirWithSchemas)) {
+			const absPath = path.resolve(dirWithSchemas, item);
+			if (fs.statSync(absPath).isDirectory()) {
+				dirs.add(absPath);
+			} else if (item.endsWith(".json")) {
+				makeDefinitionsForSchema(absPath);
+			}
+		}
+	}
+};
+
+const makeDefinitionsForSchema = absSchemaPath => {
+	const basename = path
+		.relative(schemasDir, absSchemaPath)
+		.replace(/\.json$/i, "");
+	const filename = path.resolve(__dirname, `../declarations/${basename}.d.ts`);
+	compileFromFile(absSchemaPath, {
+		bannerComment:
+			"/**\n * This file was automatically generated.\n * DO NOT MODIFY BY HAND.\n * Run `yarn special-lint-fix` to update\n */",
+		unreachableDefinitions: true,
+		style
+	}).then(
+		ts => {
+			let normalizedContent = "";
+			try {
+				const content = fs.readFileSync(filename, "utf-8");
+				normalizedContent = content.replace(/\r\n?/g, "\n");
+			} catch (e) {
+				// ignore
+			}
+			if (normalizedContent.trim() !== ts.trim()) {
+				if (doWrite) {
+					mkdirp.sync(path.dirname(filename));
+					fs.writeFileSync(filename, ts, "utf-8");
+					console.error(
+						`declarations/${basename.replace(/\\/g, "/")}.d.ts updated`
+					);
+				} else {
+					console.error(
+						`declarations/${basename.replace(
+							/\\/g,
+							"/"
+						)}.d.ts need to be updated`
+					);
+					process.exitCode = 1;
+				}
+			}
+		},
+		err => {
+			console.error(err);
+			process.exitCode = 1;
+		}
+	);
+};
+
+makeSchemas();
diff --git a/tooling/format-schemas.js b/tooling/format-schemas.js
new file mode 100644
index 00000000000..803acd5a1da
--- /dev/null
+++ b/tooling/format-schemas.js
@@ -0,0 +1,146 @@
+const fs = require("fs");
+const path = require("path");
+const prettier = require("prettier");
+
+const schemasDir = path.resolve(__dirname, "../schemas");
+
+// When --write is set, files will be written in place
+// Elsewise it only prints outdated files
+const doWrite = process.argv.includes("--write");
+
+const sortObjectAlphabetically = obj => {
+	const keys = Object.keys(obj).sort();
+	const newObj = {};
+	for (const key of keys) {
+		newObj[key] = obj[key];
+	}
+	return newObj;
+};
+
+const sortObjectWithList = (obj, props) => {
+	const keys = Object.keys(obj)
+		.filter(p => !props.includes(p))
+		.sort();
+	const newObj = {};
+	for (const key of props) {
+		if (key in obj) {
+			newObj[key] = obj[key];
+		}
+	}
+	for (const key of keys) {
+		newObj[key] = obj[key];
+	}
+	return newObj;
+};
+
+const PROPERTIES = [
+	"$ref",
+	"definitions",
+
+	"$id",
+	"id",
+	"title",
+	"description",
+	"type",
+
+	"items",
+	"minItems",
+	"uniqueItems",
+
+	"additionalProperties",
+	"properties",
+	"required",
+	"minProperties",
+
+	"oneOf",
+	"anyOf",
+	"allOf",
+	"enum",
+
+	"absolutePath",
+	"minLength",
+
+	"minimum",
+
+	"instanceof",
+
+	"tsType"
+];
+
+const NESTED_WITH_NAME = ["definitions", "properties"];
+
+const NESTED_DIRECT = ["items", "additionalProperties"];
+
+const NESTED_ARRAY = ["oneOf", "anyOf", "allOf"];
+
+const processJson = json => {
+	json = sortObjectWithList(json, PROPERTIES);
+
+	for (const name of NESTED_WITH_NAME) {
+		if (name in json && json[name] && typeof json[name] === "object") {
+			json[name] = sortObjectAlphabetically(json[name]);
+			for (const key in json[name]) {
+				json[name][key] = processJson(json[name][key]);
+			}
+		}
+	}
+	for (const name of NESTED_DIRECT) {
+		if (name in json && json[name] && typeof json[name] === "object") {
+			json[name] = processJson(json[name]);
+		}
+	}
+	for (const name of NESTED_ARRAY) {
+		if (name in json && Array.isArray(json[name])) {
+			for (let i = 0; i < json[name].length; i++) {
+				json[name][i] = processJson(json[name][i]);
+			}
+		}
+	}
+
+	return json;
+};
+
+const formatSchema = schemaPath => {
+	const json = require(schemaPath);
+	const processedJson = processJson(json);
+	const rawString = JSON.stringify(processedJson, null, 2);
+	prettier.resolveConfig(schemaPath).then(config => {
+		config.filepath = schemaPath;
+		config.parser = "json";
+		const prettyString = prettier.format(rawString, config);
+		let normalizedContent = "";
+		try {
+			const content = fs.readFileSync(schemaPath, "utf-8");
+			normalizedContent = content.replace(/\r\n?/g, "\n");
+		} catch (e) {
+			// ignore
+		}
+		if (normalizedContent.trim() !== prettyString.trim()) {
+			const basename = path.relative(schemasDir, schemaPath);
+			if (doWrite) {
+				fs.writeFileSync(schemaPath, prettyString, "utf-8");
+				console.error(`schemas/${basename.replace(/\\/g, "/")} updated`);
+			} else {
+				console.error(
+					`schemas/${basename.replace(/\\/g, "/")} need to be updated`
+				);
+				process.exitCode = 1;
+			}
+		}
+	});
+};
+
+// include the top level folder "./schemas" by default
+const dirs = new Set([schemasDir]);
+
+// search for all nestedDirs inside of this folder
+for (let dirWithSchemas of dirs) {
+	for (let item of fs.readdirSync(dirWithSchemas)) {
+		const absPath = path.resolve(dirWithSchemas, item);
+		if (fs.statSync(absPath).isDirectory()) {
+			dirs.add(absPath);
+		} else if (item.endsWith(".json")) {
+			formatSchema(absPath);
+		}
+	}
+}
diff --git a/tooling/inherit-types.js b/tooling/inherit-types.js
new file mode 100644
index 00000000000..03963b5a45a
--- /dev/null
+++ b/tooling/inherit-types.js
@@ -0,0 +1,144 @@
+const path = require("path");
+const fs = require("fs");
+const ts = require("typescript");
+const program = require("./typescript-program");
+
+// When --override is set, base jsdoc will override sub class jsdoc
+// Elsewise on a conflict it will create a merge conflict in the file
+const override = process.argv.includes("--override");
+
+// When --write is set, files will be written in place
+// Elsewise it only prints outdated files
+const doWrite = process.argv.includes("--write");
+
+const typeChecker = program.getTypeChecker();
+
+/**
+ * @param {ts.ClassDeclaration} node the class declaration
+ * @returns {Set<ts.ClassDeclaration>} the base class declarations
+ */
+const getBaseClasses = node => {
+	/** @type {Set<ts.ClassDeclaration>} */
+	const decls = new Set();
+	if (node.heritageClauses) {
+		for (const clause of node.heritageClauses) {
+			for (const clauseType of clause.types) {
+				const type = typeChecker.getTypeAtLocation(clauseType);
+				if (ts.isClassDeclaration(type.symbol.valueDeclaration))
+					decls.add(type.symbol.valueDeclaration);
+			}
+		}
+	}
+	return decls;
+};
+
+/**
+ * @param {ts.ClassDeclaration} classNode the class declaration
+ * @param {string} memberName name of the member
+ * @returns {ts.MethodDeclaration | null} base class member declaration when found
+ */
+const findDeclarationInBaseClass = (classNode, memberName) => {
+	for (const baseClass of getBaseClasses(classNode)) {
+		for (const node of baseClass.members) {
+			if (ts.isMethodDeclaration(node)) {
+				if (node.name.getText() === memberName) {
+					return node;
+				}
+			}
+		}
+		const result = findDeclarationInBaseClass(baseClass, memberName);
+		if (result) return result;
+	}
+	return null;
+};
+
+const libPath = path.resolve(__dirname, "../lib");
+
+for (const sourceFile of program.getSourceFiles()) {
+	let file = sourceFile.fileName;
+	if (
+		file.toLowerCase().startsWith(libPath.replace(/\\/g, "/").toLowerCase())
+	) {
+		const updates = [];
+		sourceFile.forEachChild(node => {
+			if (ts.isClassDeclaration(node)) {
+				for (const member of node.members) {
+					if (ts.isMethodDeclaration(member)) {
+						const baseDecl = findDeclarationInBaseClass(
+							node,
+							member.name.getText()
+						);
+						if (baseDecl) {
+							const memberAsAny = /** @type {any} */ (member);
+							const baseDeclAsAny = /** @type {any} */ (baseDecl);
+							const currentJsDoc = memberAsAny.jsDoc && memberAsAny.jsDoc[0];
+							const baseJsDoc = baseDeclAsAny.jsDoc && baseDeclAsAny.jsDoc[0];
+							const currentJsDocText = currentJsDoc && currentJsDoc.getText();
+							let baseJsDocText = baseJsDoc && baseJsDoc.getText();
+							if (baseJsDocText) {
+								baseJsDocText = baseJsDocText.replace(
+									/\t \* @abstract\r?\n/g,
+									""
+								);
+								if (!currentJsDocText) {
+									// add js doc
+									updates.push({
+										member: member.name.getText(),
+										start: member.getStart(),
+										end: member.getStart(),
+										content: baseJsDocText + "\n\t"
+									});
+								} else if (
+									baseJsDocText &&
+									currentJsDocText !== baseJsDocText
+								) {
+									// update js doc
+									if (override || !doWrite) {
+										updates.push({
+											member: member.name.getText(),
+											start: currentJsDoc.getStart(),
+											end: currentJsDoc.getEnd(),
+											content: baseJsDocText
+										});
+									} else {
+										updates.push({
+											member: member.name.getText(),
+											start: currentJsDoc.getStart() - 1,
+											end: currentJsDoc.getEnd(),
+											content: `<<<<<<< original comment\n\t${currentJsDocText}\n=======\n\t${baseJsDocText}\n>>>>>>> comment from base class`
+										});
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		});
+		if (updates.length > 0) {
+			if (doWrite) {
+				let fileContent = fs.readFileSync(file, "utf-8");
+				updates.sort((a, b) => {
+					return b.start - a.start;
+				});
+				for (const update of updates) {
+					fileContent =
+						fileContent.substr(0, update.start) +
+						update.content +
+						fileContent.substr(update.end);
+				}
+				console.log(`${file} ${updates.length} JSDoc comments added/updated`);
+				fs.writeFileSync(file, fileContent, "utf-8");
+			} else {
+				console.log(file);
+				for (const update of updates) {
+					console.log(
+						`* ${update.member} should have this JSDoc:\n\t${update.content}`
+					);
+				}
+				console.log();
+				process.exitCode = 1;
+			}
+		}
+	}
+}
diff --git a/tooling/typescript-program.js b/tooling/typescript-program.js
new file mode 100644
index 00000000000..bd9413ab6ae
--- /dev/null
+++ b/tooling/typescript-program.js
@@ -0,0 +1,17 @@
+const path = require("path");
+const fs = require("fs");
+const ts = require("typescript");
+
+const rootPath = path.resolve(__dirname, "..");
+const configPath = path.resolve(__dirname, "../tsconfig.json");
+const configContent = fs.readFileSync(configPath, "utf-8");
+const configJsonFile = ts.parseJsonText(configPath, configContent);
+const parsedConfig = ts.parseJsonSourceFileConfigFileContent(
+	configJsonFile,
+	ts.sys,
+	rootPath,
+	{ noEmit: true }
+);
+const { fileNames, options } = parsedConfig;
+
+module.exports = ts.createProgram(fileNames, options);
diff --git a/tsconfig.json b/tsconfig.json
index c55aa8145a3..3df37338ce8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,62 +1,22 @@
 {
   "compilerOptions": {
-    /* Basic Options */
-    "target": "ES2017",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-    "lib": ["es2017", "dom"],                 /* Specify library files to be included in the compilation. */
-    "allowJs": true,                          /* Allow javascript files to be compiled. */
-    "checkJs": true,                          /* Report errors in .js files. */
-    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
-    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
-    // "outFile": "./",                       /* Concatenate and emit output to single file. */
-    // "outDir": "./",                        /* Redirect output structure to the directory. */
-    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-    // "removeComments": true,                /* Do not emit comments to output. */
-    "noEmit": true,                           /* Do not emit outputs. */
-    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
-    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
-    /* Strict Type-Checking Options */
-    "strict": false,                          /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,              /* Enable strict null checks. */
-    "strictFunctionTypes": true,              /* Enable strict checking of function types. */
-    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
-    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
-    "alwaysStrict": true,                     /* Parse in strict mode and emit "use strict" for each source file. */
-
-    /* Additional Checks */
-    // "noUnusedLocals": true,                /* Report errors on unused locals. */
-    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
-    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
-    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
-
-    /* Module Resolution Options */
-    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
-    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "typeRoots": [],                       /* List of folders to include type definitions from. */
-    "types": ["node"],                        /* Type declaration files to be included in compilation. */
-    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
-
-    /* Source Map Options */
-    // "sourceRoot": "./",                    /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-    // "mapRoot": "./",                       /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
-    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
-    /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
-    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+    "target": "ES2017",
+    "module": "commonjs",
+    "lib": ["es2017", "dom"],
+    "allowJs": true,
+    "checkJs": true,
+    "noEmit": true,
+    "strict": false,
+    "noImplicitThis": true,
+    "alwaysStrict": true,
+    "types": ["node"],
+    "esModuleInterop": true
   },
   "include": [
     "declarations.d.ts",
+    "declarations/*.d.ts",
     "bin/*.js",
-    "lib/**/*.js"
+    "lib/**/*.js",
+    "tooling/**/*.js"
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index 6ba485decb3..e1619fcdfb4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,188 +3,278 @@
 
 
 "@babel/code-frame@^7.0.0-beta.35":
-  version "7.0.0-beta.47"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.47.tgz#d18c2f4c4ba8d093a2bcfab5616593bfe2441a27"
+  version "7.0.0-beta.54"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.54.tgz#0024f96fdf7028a21d68e273afd4e953214a1ead"
+  integrity sha1-ACT5b99wKKIdaOJzr9TpUyFKHq0=
   dependencies:
-    "@babel/highlight" "7.0.0-beta.47"
+    "@babel/highlight" "7.0.0-beta.54"
 
-"@babel/highlight@7.0.0-beta.47":
-  version "7.0.0-beta.47"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.47.tgz#8fbc83fb2a21f0bd2b95cdbeb238cf9689cad494"
+"@babel/highlight@7.0.0-beta.54":
+  version "7.0.0-beta.54"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.54.tgz#155d507358329b8e7068970017c3fd74a9b08584"
+  integrity sha1-FV1Qc1gym45waJcAF8P9dKmwhYQ=
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
+"@samverschueren/stream-to-observable@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
+  integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
+  dependencies:
+    any-observable "^0.3.0"
+
 "@types/babel-types@*", "@types/babel-types@^7.0.0":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.2.tgz#63dc3e5e7f6367e1819d2bba5213783cd926c5d5"
+  integrity sha512-ylggu8DwwxT6mk3jVoJeohWAePWMNWEYm06MSoJ19kwp3hT9eY2Z4NNZn3oevzgFmClgNQ2GQF500hPDvNsGHg==
 
 "@types/babylon@^6.16.2":
   version "6.16.2"
   resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.2.tgz#062ce63b693d9af1c246f5aedf928bc9c30589c8"
+  integrity sha512-+Jty46mPaWe1VAyZbfvgJM4BAdklLWxrT5tc/RjvCgLrtk6gzRY6AOnoWFv4p6hVxhJshDdr2hGVn56alBp97Q==
   dependencies:
     "@types/babel-types" "*"
 
-"@types/node@^9.6.4":
-  version "9.6.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.6.tgz#439b91f9caf3983cad2eef1e11f6bedcbf9431d2"
-
-"@types/tapable@^1.0.1":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
-
-"@webassemblyjs/ast@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.12.tgz#a9acbcb3f25333c4edfa1fdf3186b1ccf64e6664"
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.5.12"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
-    "@webassemblyjs/wast-parser" "1.5.12"
-    debug "^3.1.0"
-    mamacro "^0.0.3"
-
-"@webassemblyjs/floating-point-hex-parser@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.12.tgz#0f36044ffe9652468ce7ae5a08716a4eeff9cd9c"
+"@types/cli-color@^0.3.29":
+  version "0.3.29"
+  resolved "https://registry.yarnpkg.com/@types/cli-color/-/cli-color-0.3.29.tgz#c83a71fe02c8c7e1ccec048dd6a2458d1f6c96ea"
+  integrity sha1-yDpx/gLIx+HM7ASN1qJFjR9sluo=
 
-"@webassemblyjs/helper-api-error@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.12.tgz#05466833ff2f9d8953a1a327746e1d112ea62aaf"
-
-"@webassemblyjs/helper-buffer@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.12.tgz#1f0de5aaabefef89aec314f7f970009cd159c73d"
-  dependencies:
-    debug "^3.1.0"
+"@types/json-schema@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.0.tgz#5a2b780fec9f2cf851e1b5e0a29a4cac6c9686c5"
+  integrity sha512-vKFTUFiUOLIoe80UE1l3ZvnlDYxgNCrpa/KEesJoTMIvWuI4zA6pxNlOBHR81ghVpyx3M4CRf0LPTd9HivK7Mg==
 
-"@webassemblyjs/helper-code-frame@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.12.tgz#3cdc1953093760d1c0f0caf745ccd62bdb6627c7"
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.5.12"
+"@types/lodash@^4.14.116":
+  version "4.14.116"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.116.tgz#5ccf215653e3e8c786a58390751033a9adca0eb9"
+  integrity sha512-lRnAtKnxMXcYYXqOiotTmJd74uawNWuPnsnPrrO7HiFuE3npE2iQhfABatbYDyxTNqZNuXzcKGhw37R7RjBFLg==
 
-"@webassemblyjs/helper-fsm@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.12.tgz#6bc1442b037f8e30f2e57b987cee5c806dd15027"
+"@types/minimist@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
+  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
-"@webassemblyjs/helper-module-context@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.12.tgz#b5588ca78b33b8a0da75f9ab8c769a3707baa861"
+"@types/mz@0.0.32":
+  version "0.0.32"
+  resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.32.tgz#e8248b4e41424c052edc1725dd33650c313a3659"
+  integrity sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g==
   dependencies:
-    debug "^3.1.0"
-    mamacro "^0.0.3"
+    "@types/node" "*"
 
-"@webassemblyjs/helper-wasm-bytecode@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.12.tgz#d12a3859db882a448891a866a05d0be63785b616"
+"@types/node@*":
+  version "10.5.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.1.tgz#d578446f4abff5c0b49ade9b4e5274f6badaadfc"
+  integrity sha512-AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ==
 
-"@webassemblyjs/helper-wasm-section@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.12.tgz#ff9fe1507d368ad437e7969d25e8c1693dac1884"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.12"
-    "@webassemblyjs/helper-buffer" "1.5.12"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
-    "@webassemblyjs/wasm-gen" "1.5.12"
-    debug "^3.1.0"
+"@types/node@^10.9.4":
+  version "10.10.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.10.1.tgz#d5c96ca246a418404914d180b7fdd625ad18eca6"
+  integrity sha512-nzsx28VwfaIykfzMAG9TB3jxF5Nn+1/WMKnmVZc8TsB+LMIVvwUscVn7PAq+LFaY5ng5u4jp5mRROSswo76PPA==
 
-"@webassemblyjs/ieee754@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.12.tgz#ee9574bc558888f13097ce3e7900dff234ea19a4"
-  dependencies:
-    ieee754 "^1.1.11"
+"@types/node@^9.6.4":
+  version "9.6.30"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.30.tgz#1ecf83eaf7ac2d0dada7a9d61a1e4e7a6183ac06"
+  integrity sha512-mFkVM9yFexPPKm0sidVyEzM8F0O06W3vZ8QnjHYa3AB1uvtPOayGKLrXlXIKOdJ7LOE+zilhxYbGPy/34QTgrw==
 
-"@webassemblyjs/leb128@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.12.tgz#0308eec652765ee567d8a5fa108b4f0b25b458e1"
-  dependencies:
-    leb "^0.3.0"
+"@types/prettier@^1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.13.2.tgz#ffe96278e712a8d4e467e367a338b05e22872646"
+  integrity sha512-k6MCN8WuDiCj6O+UJsVMbrreZxkbrhQbO02oDj6yuRu8UAkp0MDdEcDKif8/gBKuJbT84kkO+VHQAqXkumEklg==
 
-"@webassemblyjs/utf8@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.5.12.tgz#d5916222ef314bf60d6806ed5ac045989bfd92ce"
+"@types/source-list-map@*":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
-"@webassemblyjs/wasm-edit@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.12.tgz#821c9358e644a166f2c910e5af1b46ce795a17aa"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.12"
-    "@webassemblyjs/helper-buffer" "1.5.12"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
-    "@webassemblyjs/helper-wasm-section" "1.5.12"
-    "@webassemblyjs/wasm-gen" "1.5.12"
-    "@webassemblyjs/wasm-opt" "1.5.12"
-    "@webassemblyjs/wasm-parser" "1.5.12"
-    "@webassemblyjs/wast-printer" "1.5.12"
-    debug "^3.1.0"
+"@types/tapable@^1.0.1":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370"
+  integrity sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==
 
-"@webassemblyjs/wasm-gen@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.12.tgz#0b7ccfdb93dab902cc0251014e2e18bae3139bcb"
+"@types/webpack-sources@^0.1.4":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92"
+  integrity sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==
   dependencies:
-    "@webassemblyjs/ast" "1.5.12"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
-    "@webassemblyjs/ieee754" "1.5.12"
-    "@webassemblyjs/leb128" "1.5.12"
-    "@webassemblyjs/utf8" "1.5.12"
+    "@types/node" "*"
+    "@types/source-list-map" "*"
+    source-map "^0.6.1"
 
-"@webassemblyjs/wasm-opt@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.12.tgz#bd758a8bc670f585ff1ae85f84095a9e0229cbc9"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.12"
-    "@webassemblyjs/helper-buffer" "1.5.12"
-    "@webassemblyjs/wasm-gen" "1.5.12"
-    "@webassemblyjs/wasm-parser" "1.5.12"
-    debug "^3.1.0"
+"@webassemblyjs/ast@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.8.tgz#f31f480debeef957f01b623f27eabc695fa4fe8f"
+  integrity sha512-dOrtdtEyB8sInpl75yLPNksY4sRl0j/+t6aHyB/YA+ab9hV3Fo7FmG12FHzP+2MvWVAJtDb+6eXR5EZbZJ+uVg==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.7.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
+    "@webassemblyjs/wast-parser" "1.7.8"
+
+"@webassemblyjs/floating-point-hex-parser@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.8.tgz#1b3ed0e27e384032254e9322fc646dd3e70ef1b9"
+  integrity sha512-kn2zNKGsbql5i56VAgRYkpG+VazqHhQQZQycT2uXAazrAEDs23gy+Odkh5VblybjnwX2/BITkDtNmSO76hdIvQ==
+
+"@webassemblyjs/helper-api-error@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.8.tgz#a2b49c11f615e736f815ec927f035dcfa690d572"
+  integrity sha512-xUwxDXsd1dUKArJEP5wWM5zxgCSwZApSOJyP1XO7M8rNUChUDblcLQ4FpzTpWG2YeylMwMl1MlP5Ztryiz1x4g==
+
+"@webassemblyjs/helper-buffer@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.8.tgz#3fc66bfa09c1c60e824cf3d5887826fac062877d"
+  integrity sha512-WXiIMnuvuwlhWvVOm8xEXU9DnHaa3AgAU0ZPfvY8vO1cSsmYb2WbGbHnMLgs43vXnA7XAob9b56zuZaMkxpCBg==
+
+"@webassemblyjs/helper-code-frame@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.8.tgz#cc5a7e9522b70e7580df056dfd34020cf29645b0"
+  integrity sha512-TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.7.8"
+
+"@webassemblyjs/helper-fsm@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.8.tgz#fe4607430af466912797c21acafd3046080182ea"
+  integrity sha512-TjK0CnD8hAPkV5mbSp5aWl6SO1+H3WFcjWtixWoy8EMA99YnNzYhpc/WSYWhf7yrhpzkq5tZB0tvLK3Svr3IXA==
+
+"@webassemblyjs/helper-module-context@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.8.tgz#3c2e7ee93d14ff4768ba66fb1be42fdc9dc7160a"
+  integrity sha512-uCutAKR7Nm0VsFixcvnB4HhAyHouNbj0Dx1p7eRjFjXGGZ+N7ftTaG1ZbWCasAEbtwGj54LP8+lkBZdTCPmLGg==
+
+"@webassemblyjs/helper-wasm-bytecode@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.8.tgz#89bdb78cd6dd5209ae2ed2925de78d0f0e00b6f0"
+  integrity sha512-AdCCE3BMW6V34WYaKUmPgVHa88t2Z14P4/0LjLwuGkI0X6pf7nzp0CehzVVk51cKm2ymVXjl9dCG+gR1yhITIQ==
+
+"@webassemblyjs/helper-wasm-section@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.8.tgz#c68ef7d26a6fc12421b2e6e56f9bc810dfb33e87"
+  integrity sha512-BkBhYQuzyl4hgTGOKo87Vdw6f9nj8HhI7WYpI0MCC5qFa5ahrAPOGgyETVdnRbv+Rjukl9MxxfDmVcVC435lDg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/helper-buffer" "1.7.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
+    "@webassemblyjs/wasm-gen" "1.7.8"
+
+"@webassemblyjs/ieee754@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.8.tgz#1f37974b13cb486a9237e73ce04cac7a2f1265ed"
+  integrity sha512-tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.8.tgz#1bee83426819192db2ea1a234b84c7ebc6d34c1f"
+  integrity sha512-GCYeGPgUFWJiZuP4NICbcyUQNxNLJIf476Ei+K+jVuuebtLpfvwkvYT6iTUE7oZYehhkor4Zz2g7SJ/iZaPudQ==
+  dependencies:
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/utf8@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.8.tgz#2b489d5cf43e0aebb93d8e2d792aff9879c61f05"
+  integrity sha512-9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA==
+
+"@webassemblyjs/wasm-edit@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.8.tgz#f8bdbe7088718eca27b1c349bb7c06b8a457950c"
+  integrity sha512-6D3Hm2gFixrfyx9XjSON4ml1FZTugqpkIz5Awvrou8fnpyprVzcm4X8pyGRtA2Piixjl3DqmX/HB1xdWyE097A==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/helper-buffer" "1.7.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
+    "@webassemblyjs/helper-wasm-section" "1.7.8"
+    "@webassemblyjs/wasm-gen" "1.7.8"
+    "@webassemblyjs/wasm-opt" "1.7.8"
+    "@webassemblyjs/wasm-parser" "1.7.8"
+    "@webassemblyjs/wast-printer" "1.7.8"
+
+"@webassemblyjs/wasm-gen@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.8.tgz#7e8abf1545eae74ac6781d545c034af3cfd0c7d5"
+  integrity sha512-a7O/wE6eBeVKKUYgpMK7NOHmMADD85rSXLe3CqrWRDwWff5y3cSVbzpN6Qv3z6C4hdkpq9qyij1Ga1kemOZGvQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
+    "@webassemblyjs/ieee754" "1.7.8"
+    "@webassemblyjs/leb128" "1.7.8"
+    "@webassemblyjs/utf8" "1.7.8"
+
+"@webassemblyjs/wasm-opt@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.8.tgz#7ada6e211914728fce02ff0ff9c344edc6d41f26"
+  integrity sha512-3lbQ0PT81NHCdi1sR/7+SNpZadM4qYcTSr62nFFAA7e5lFwJr14M1Gi+A/Y3PgcDWOHYjsaNGPpPU0H03N6Blg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/helper-buffer" "1.7.8"
+    "@webassemblyjs/wasm-gen" "1.7.8"
+    "@webassemblyjs/wasm-parser" "1.7.8"
+
+"@webassemblyjs/wasm-parser@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.8.tgz#dac47c291fb6a3e63529aecd647592cd34afbf94"
+  integrity sha512-rZ/zlhp9DHR/05zh1MbAjT2t624sjrPP/OkJCjXqzm7ynH+nIdNcn9Ixc+qzPMFXhIrk0rBoQ3to6sEIvHh9jQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/helper-api-error" "1.7.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
+    "@webassemblyjs/ieee754" "1.7.8"
+    "@webassemblyjs/leb128" "1.7.8"
+    "@webassemblyjs/utf8" "1.7.8"
+
+"@webassemblyjs/wast-parser@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.8.tgz#f8aab9a450c048c1f9537695c89faeb92fabfba5"
+  integrity sha512-Q/zrvtUvzWuSiJMcSp90fi6gp2nraiHXjTV2VgAluVdVapM4gy1MQn7akja2p6eSBDQpKJPJ6P4TxRkghRS5dg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/floating-point-hex-parser" "1.7.8"
+    "@webassemblyjs/helper-api-error" "1.7.8"
+    "@webassemblyjs/helper-code-frame" "1.7.8"
+    "@webassemblyjs/helper-fsm" "1.7.8"
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/wast-printer@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.8.tgz#e7e965782c1912f6a965f14a53ff43d8ad0403a5"
+  integrity sha512-GllIthRtwTxRDAURRNXscu7Napzmdf1jt1gpiZiK/QN4fH0lSGs3OTmvdfsMNP7tqI4B3ZtfaaWRlNIQug6Xyg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/wast-parser" "1.7.8"
+    "@xtuc/long" "4.2.1"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
-"@webassemblyjs/wasm-parser@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.12.tgz#7b10b4388ecf98bd7a22e702aa62ec2f46d0c75e"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.12"
-    "@webassemblyjs/helper-api-error" "1.5.12"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.12"
-    "@webassemblyjs/ieee754" "1.5.12"
-    "@webassemblyjs/leb128" "1.5.12"
-    "@webassemblyjs/utf8" "1.5.12"
-
-"@webassemblyjs/wast-parser@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.12.tgz#9cf5ae600ecae0640437b5d4de5dd6b6088d0d8b"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.12"
-    "@webassemblyjs/floating-point-hex-parser" "1.5.12"
-    "@webassemblyjs/helper-api-error" "1.5.12"
-    "@webassemblyjs/helper-code-frame" "1.5.12"
-    "@webassemblyjs/helper-fsm" "1.5.12"
-    long "^3.2.0"
-    mamacro "^0.0.3"
-
-"@webassemblyjs/wast-printer@1.5.12":
-  version "1.5.12"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz#563ca4d01b22d21640b2463dc5e3d7f7d9dac520"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.12"
-    "@webassemblyjs/wast-parser" "1.5.12"
-    long "^3.2.0"
+"@xtuc/long@4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
+  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
 
 abab@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
+  integrity sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=
 
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+  integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU=
 
 accepts@~1.2.12:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.2.13.tgz#e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"
+  integrity sha1-5fHzkoxtlf2WVYw27D2dDeSm7Oo=
   dependencies:
     mime-types "~2.1.6"
     negotiator "0.5.3"
@@ -192,89 +282,105 @@ accepts@~1.2.12:
 acorn-dynamic-import@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
   dependencies:
     acorn "^5.0.0"
 
 acorn-globals@^1.0.3:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf"
+  integrity sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=
   dependencies:
     acorn "^2.1.0"
 
 acorn-globals@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+  integrity sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=
   dependencies:
     acorn "^4.0.4"
 
 acorn-globals@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.1.0.tgz#ab716025dbe17c54d3ef81d32ece2b2d99fe2538"
+  integrity sha512-KjZwU26uG3u6eZcfGbTULzFcsoz6pegNKtHPksZPOUsiKo5bUmiBPa38FuHZ/Eun+XYh/JCCkS9AS3Lu4McQOQ==
   dependencies:
     acorn "^5.0.0"
 
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+acorn-jsx@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e"
+  integrity sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==
   dependencies:
-    acorn "^3.0.4"
+    acorn "^5.0.3"
 
 acorn@^1.0.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-1.2.2.tgz#c8ce27de0acc76d896d2b1fad3df588d9e82f014"
+  integrity sha1-yM4n3grMdtiW0rH6099YjZ6C8BQ=
 
 acorn@^2.1.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
+  integrity sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=
 
-acorn@^3.0.4, acorn@^3.1.0:
+acorn@^3.1.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
 
 acorn@^4.0.4, acorn@~4.0.2:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+  integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
 
-acorn@^5.0.0, acorn@^5.3.0, acorn@^5.5.0, acorn@^5.6.2:
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.2.tgz#b1da1d7be2ac1b4a327fb9eab851702c5045b4e7"
+acorn@^5.0.0, acorn@^5.3.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8"
+  integrity sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==
 
-ajv-keywords@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
+acorn@^5.0.3, acorn@^5.6.0, acorn@^5.6.2:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.2.tgz#91fa871883485d06708800318404e72bfb26dcc5"
+  integrity sha512-cJrKCNcr2kv8dlDnbw+JPUGjHZzo4myaxOLmpOX8a+rgX94YeTcTMv/LFJUSByRpc+i4GgVnnhLxvMu/2Y+rqw==
 
-ajv-keywords@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
+ajv-keywords@^3.0.0, ajv-keywords@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
 ajv@^4.9.1:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  integrity sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6"
+ajv@^6.0.1, ajv@^6.1.0, ajv@^6.5.0:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
+  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
   dependencies:
-    fast-deep-equal "^1.0.0"
+    fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-    uri-js "^3.0.2"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
   dependencies:
     kind-of "^3.0.2"
     longest "^1.0.1"
@@ -283,53 +389,84 @@ align-text@^0.1.1, align-text@^0.1.3:
 alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+  integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
+ansi-escapes@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+  integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
 
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
 
-ansi-regex@^2.0.0:
+ansi-regex@^2.0.0, ansi-regex@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
-ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
+any-observable@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
+  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
+
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-append-transform@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+app-root-path@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46"
+  integrity sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y=
+
+append-transform@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
+  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
   dependencies:
-    default-require-extensions "^1.0.0"
+    default-require-extensions "^2.0.0"
 
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 are-we-there-yet@~1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -337,68 +474,83 @@ are-we-there-yet@~1.1.2:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/asap/-/asap-1.0.0.tgz#b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"
+  integrity sha1-sqRdpf36ILBJb8N2jMJ8EvqRan0=
 
 asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -407,58 +559,71 @@ asn1.js@^4.0.0:
 asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+  integrity sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
 
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
   dependencies:
     util "0.10.3"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
 
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
 async@1.x, async@^1.4.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
 async@^2.1.4:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
-    lodash "^4.14.0"
+    lodash "^4.17.10"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
+  integrity sha1-ri1acpR38onWDdf5amMUoi3Wwio=
 
 autoprefixer@^6.3.1:
   version "6.7.7"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  integrity sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=
   dependencies:
     browserslist "^1.7.6"
     caniuse-db "^1.0.30000634"
@@ -470,18 +635,27 @@ autoprefixer@^6.3.1:
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
 
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.2.1, aws4@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
+  integrity sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==
+
+aws4@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
-babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -490,6 +664,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
 babel-core@^6.0.0, babel-core@^6.26.0:
   version "6.26.3"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+  integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
   dependencies:
     babel-code-frame "^6.26.0"
     babel-generator "^6.26.0"
@@ -514,6 +689,7 @@ babel-core@^6.0.0, babel-core@^6.26.0:
 babel-generator@^6.18.0, babel-generator@^6.26.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.26.0"
@@ -527,50 +703,58 @@ babel-generator@^6.18.0, babel-generator@^6.26.0:
 babel-helpers@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
   dependencies:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-jest@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.0.1.tgz#bbad3bf523fb202da05ed0a6540b48c84eed13a6"
+babel-jest@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.4.0.tgz#22c34c392e2176f6a4c367992a7fcff69d2e8557"
+  integrity sha1-IsNMOS4hdvakw2eZKn/P9p0uhVc=
   dependencies:
     babel-plugin-istanbul "^4.1.6"
-    babel-preset-jest "^23.0.1"
+    babel-preset-jest "^23.2.0"
 
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-istanbul@^4.1.6:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
+  integrity sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.13.0"
     find-up "^2.1.0"
     istanbul-lib-instrument "^1.10.1"
     test-exclude "^4.2.1"
 
-babel-plugin-jest-hoist@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.0.1.tgz#eaa11c964563aea9c21becef2bdf7853f7f3c148"
+babel-plugin-jest-hoist@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
+  integrity sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=
 
 babel-plugin-syntax-object-rest-spread@^6.13.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+  integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
 
-babel-preset-jest@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.0.1.tgz#631cc545c6cf021943013bcaf22f45d87fe62198"
+babel-preset-jest@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
+  integrity sha1-jsegOhOPABoaj7HoETZSvxpV2kY=
   dependencies:
-    babel-plugin-jest-hoist "^23.0.1"
+    babel-plugin-jest-hoist "^23.2.0"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
 
 babel-register@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
   dependencies:
     babel-core "^6.26.0"
     babel-runtime "^6.26.0"
@@ -583,6 +767,7 @@ babel-register@^6.26.0:
 babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
@@ -590,6 +775,7 @@ babel-runtime@^6.22.0, babel-runtime@^6.26.0:
 babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
   dependencies:
     babel-runtime "^6.26.0"
     babel-traverse "^6.26.0"
@@ -597,9 +783,10 @@ babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-traverse@^6.18.0, babel-traverse@^6.26.0:
+babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
   dependencies:
     babel-code-frame "^6.26.0"
     babel-messages "^6.23.0"
@@ -611,9 +798,10 @@ babel-traverse@^6.18.0, babel-traverse@^6.26.0:
     invariant "^2.2.2"
     lodash "^4.17.4"
 
-babel-types@^6.18.0, babel-types@^6.26.0:
+babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
   dependencies:
     babel-runtime "^6.26.0"
     esutils "^2.0.2"
@@ -623,22 +811,27 @@ babel-types@^6.18.0, babel-types@^6.26.0:
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+  integrity sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=
 
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-js@^1.0.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -649,14 +842,16 @@ base@^0.11.1:
     pascalcase "^0.1.1"
 
 bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
 benchmark@^2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629"
+  integrity sha1-CfPeMckWQl1JjMLuVloOvzwqVik=
   dependencies:
     lodash "^4.17.4"
     platform "^1.3.3"
@@ -664,40 +859,34 @@ benchmark@^2.1.1:
 big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
 
 binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+  integrity sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=
 
 bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.x:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+  integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
 boom@2.x.x:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
   dependencies:
     hoek "2.x.x"
 
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  dependencies:
-    hoek "4.x.x"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -705,6 +894,7 @@ brace-expansion@^1.1.7:
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -713,6 +903,7 @@ braces@^1.8.2:
 braces@^2.3.0, braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -728,20 +919,24 @@ braces@^2.3.0, braces@^2.3.1:
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
 browser-process-hrtime@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz#425d68a58d3447f02a04aa894187fce8af8b7b8e"
+  integrity sha1-Ql1opY00R/AqBKqJQYf86K+Le44=
 
-browser-resolve@^1.11.2:
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+browser-resolve@^1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
   dependencies:
     resolve "1.1.7"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -753,6 +948,7 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
 browserify-cipher@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
@@ -761,6 +957,7 @@ browserify-cipher@^1.0.0:
 browserify-des@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.1.tgz#3343124db6d7ad53e26a8826318712bdc8450f9c"
+  integrity sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -769,6 +966,7 @@ browserify-des@^1.0.0:
 browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
@@ -776,6 +974,7 @@ browserify-rsa@^4.0.0:
 browserify-sign@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -788,12 +987,14 @@ browserify-sign@^4.0.0:
 browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
     pako "~1.0.5"
 
 browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+  integrity sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=
   dependencies:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
@@ -801,20 +1002,24 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
+  integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=
   dependencies:
     node-int64 "^0.4.0"
 
 buffer-from@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
+  integrity sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==
 
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^4.3.0:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -823,20 +1028,24 @@ buffer@^4.3.0:
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 bundle-loader@~0.5.0:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/bundle-loader/-/bundle-loader-0.5.6.tgz#6c9042e62f1c89941458805a3a479d10f34c71fd"
+  integrity sha512-SUgX+u/LJzlJiuoIghuubZ66eflehnjmqSfh/ib9DTe08sxRJ5F/MhHSjp7GfSJivSp8NWgez4PVNAUuMg7vSg==
   dependencies:
     loader-utils "^1.1.0"
 
 cacache@^10.0.4:
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
@@ -855,6 +1064,7 @@ cacache@^10.0.4:
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -866,31 +1076,42 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
+
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
   dependencies:
     callsites "^0.2.0"
 
 callsites@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
 
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 caniuse-api@^1.5.2:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+  integrity sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=
   dependencies:
     browserslist "^1.3.6"
     caniuse-db "^1.0.30000529"
@@ -898,33 +1119,34 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000830"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000830.tgz#6e45255b345649fd15ff59072da1e12bb3de2f13"
+  version "1.0.30000840"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000840.tgz#68d5a0f0694c92180b0d82e720d70f8e61366604"
+  integrity sha1-aNWg8GlMkhgLDYLnINcPjmE2ZgQ=
 
 capture-exit@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
   dependencies:
     rsvp "^3.3.3"
 
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
   dependencies:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -932,25 +1154,19 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
-  dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
-
 chalk@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+  integrity sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -959,20 +1175,24 @@ chalk@^2.3.1:
 character-parser@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-1.2.1.tgz#c0dde4ab182713b919b970959a123ecc1a30fcd6"
+  integrity sha1-wN3kqxgnE7kZuXCVmhI+zBow/NY=
 
 character-parser@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  integrity sha1-x84o821LzZdE5f/CxfzeHHMmH8A=
   dependencies:
     is-regex "^1.0.3"
 
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+  integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
 
 chokidar@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
+  integrity sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.0"
@@ -991,20 +1211,24 @@ chokidar@^2.0.2:
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+  integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
 
 chrome-trace-event@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
+  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
   dependencies:
     tslib "^1.9.0"
 
 ci-info@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
+  integrity sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -1012,16 +1236,19 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
 circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
+  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
 
 clap@^1.0.9:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
+  integrity sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==
   dependencies:
     chalk "^1.1.3"
 
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
@@ -1031,6 +1258,7 @@ class-utils@^0.3.5:
 clean-css@^3.1.9:
   version "3.4.28"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
+  integrity sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=
   dependencies:
     commander "2.8.x"
     source-map "0.4.x"
@@ -1038,22 +1266,58 @@ clean-css@^3.1.9:
 clean-css@^4.1.11:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a"
+  integrity sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=
   dependencies:
     source-map "0.5.x"
 
+cli-color@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-1.3.0.tgz#cd2ec212efbd1a0eeb5b017f17d4e2d15e91420f"
+  integrity sha512-XmbLr8MzgOup/sPHF4nOZerCOcL7rD7vKWpEl0axUsMAY+AEimOhYva1ksskWqkLGY/bjR9h7Cfbr+RrJRfmTQ==
+  dependencies:
+    ansi-regex "^2.1.1"
+    d "1"
+    es5-ext "^0.10.46"
+    es6-iterator "^2.0.3"
+    memoizee "^0.4.14"
+    timers-ext "^0.1.5"
+
+cli-cursor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+  integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=
+  dependencies:
+    restore-cursor "^1.0.1"
+
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-spinners@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
+  integrity sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=
+
+cli-truncate@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
+  integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=
+  dependencies:
+    slice-ansi "0.0.4"
+    string-width "^1.0.1"
+
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
 cliui@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
   dependencies:
     center-align "^0.1.1"
     right-align "^0.1.1"
@@ -1062,6 +1326,7 @@ cliui@^2.1.0:
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -1070,24 +1335,29 @@ cliui@^4.0.0:
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
 clone@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 coa@~1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
+  integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=
   dependencies:
     q "^1.1.2"
 
 codacy-coverage@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/codacy-coverage/-/codacy-coverage-2.1.1.tgz#8d22a58ef6858602d01de2ff2563be06c57e29a3"
+  integrity sha512-MGMkPS5d9AqQEXTZ4grn/syl/7VvOehgWTeU2B41E22q767QolclfdfadKAndL287cIPEOEdwh9JBqCwQJLtFw==
   dependencies:
     bluebird "^3.5.x"
     commander "^2.x"
@@ -1101,43 +1371,58 @@ codacy-coverage@^2.0.1:
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 coffee-loader@^0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-0.9.0.tgz#6deabd336062ddc6d773da4dfd16367fc7107bd6"
+  integrity sha512-VSoQ5kWr6Yfjn4RDpVbba2XMs3XG1ZXtLakPRt8dNfUcNU9h+1pocpdUUEd7NK9rLDwrju4yonhxrL8aMr5tww==
   dependencies:
     loader-utils "^1.0.2"
 
 coffeescript@^1.10.0:
   version "1.12.7"
   resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27"
+  integrity sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA==
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.3.0, color-convert@^1.9.0:
+color-convert@^1.3.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+  integrity sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==
   dependencies:
     color-name "^1.1.1"
 
-color-name@^1.0.0, color-name@^1.1.1:
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-name@1.1.3, color-name@^1.0.0, color-name@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 color-string@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  integrity sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=
   dependencies:
     color-name "^1.0.0"
 
 color@^0.11.0:
   version "0.11.4"
   resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  integrity sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=
   dependencies:
     clone "^1.0.2"
     color-convert "^1.3.0"
@@ -1146,6 +1431,7 @@ color@^0.11.0:
 colormin@^1.0.5:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+  integrity sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=
   dependencies:
     color "^0.11.0"
     css-color-names "0.0.4"
@@ -1154,50 +1440,68 @@ colormin@^1.0.5:
 colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
 combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
+  dependencies:
+    delayed-stream "~1.0.0"
+
+combined-stream@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
   dependencies:
     delayed-stream "~1.0.0"
 
 commander@2.8.x:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.9.0, commander@^2.x:
+commander@^2.14.1, commander@^2.9.0, commander@^2.x:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
 
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
 
 commander@~2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
+  integrity sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=
 
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
 compare-versions@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.2.1.tgz#a49eb7689d4caaf0b6db5220173fd279614000f7"
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.3.0.tgz#af93ea705a96943f622ab309578b9b90586f39c3"
+  integrity sha512-MAAAIOdi2s4Gl6rZ76PNcUa9IOYB+5ICdT41o5uMRf09aEu/F9RK+qhe8RjXNPwcTjGV7KU7h2P/fljThFVqyQ==
 
 component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.6.0:
+concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
     inherits "^2.0.3"
@@ -1207,16 +1511,19 @@ concat-stream@^1.5.0, concat-stream@^1.6.0:
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
   dependencies:
     date-now "^0.1.4"
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 constantinople@^3.0.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz#d45ed724f57d3d10500017a7d3a889c1381ae647"
+  integrity sha512-yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw==
   dependencies:
     "@types/babel-types" "^7.0.0"
     "@types/babylon" "^6.16.2"
@@ -1226,36 +1533,44 @@ constantinople@^3.0.1:
 constantinople@~3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.0.2.tgz#4b945d9937907bcd98ee575122c3817516544141"
+  integrity sha1-S5RdmTeQe82Y7ldRIsOBdRZUQUE=
   dependencies:
     acorn "^2.1.0"
 
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
 content-disposition@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.1.tgz#87476c6a67c8daa87e32e87616df883ba7fb071b"
+  integrity sha1-h0dsamfI2qh+Muh2Ft+IO6f7Bxs=
 
 content-type@~1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 convert-source-map@^1.4.0, convert-source-map@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+  integrity sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=
 
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
 cookie@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.1.5.tgz#6ab9948a4b1ae21952cd2588530a4722d4044d7c"
+  integrity sha1-armUiksa4hlSzSWIUwpHItQETXw=
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
   dependencies:
     aproba "^1.1.1"
     fs-write-stream-atomic "^1.0.8"
@@ -1267,32 +1582,58 @@ copy-concurrently@^1.0.0:
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+  integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
 core-js@^2.4.0, core-js@^2.5.0:
-  version "2.5.6"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d"
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
+  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+cosmiconfig@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
+  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^4.0.0"
+    require-from-string "^2.0.1"
 
-coveralls@^2.11.2:
-  version "2.13.3"
-  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.13.3.tgz#9ad7c2ae527417f361e8b626483f48ee92dd2bc7"
+cosmiconfig@^5.0.2:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.5.tgz#a809e3c2306891ce17ab70359dc8bdf661fe2cd0"
+  integrity sha512-94j37OtvxS5w7qr7Ta6dt67tWdnOxigBVN4VnSxNXFez9o18PGQ0D33SchKP17r9LAcWVTYV72G6vDayAUBFIg==
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^4.0.0"
+
+coveralls@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.2.tgz#f5a0bcd90ca4e64e088b710fa8dda640aea4884f"
+  integrity sha512-Tv0LKe/MkBOilH2v7WBiTBdudg2ChfGbdXafc/s330djpF3zKOmuehTeRwjXWc7pzfj9FrDUTA7tEx6Div8NFw==
   dependencies:
-    js-yaml "3.6.1"
-    lcov-parse "0.0.10"
-    log-driver "1.2.5"
-    minimist "1.2.0"
-    request "2.79.0"
+    growl "~> 1.10.0"
+    js-yaml "^3.11.0"
+    lcov-parse "^0.0.10"
+    log-driver "^1.2.7"
+    minimist "^1.2.0"
+    request "^2.85.0"
 
 create-ecdh@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.1.tgz#44223dfed533193ba5ba54e0df5709b89acf1f82"
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -1300,6 +1641,7 @@ create-ecdh@^4.0.0:
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
@@ -1310,6 +1652,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -1321,34 +1664,43 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
 create-react-class@^15.6.0:
   version "15.6.3"
   resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
+  integrity sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==
   dependencies:
     fbjs "^0.8.9"
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
   dependencies:
     boom "2.x.x"
 
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  dependencies:
-    boom "5.x.x"
-
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -1365,10 +1717,12 @@ crypto-browserify@^3.11.0:
 css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
+  integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
 
 css-loader@^0.28.3:
   version "0.28.11"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.11.tgz#c3f9864a700be2711bb5a2462b2389b1a392dab7"
+  integrity sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==
   dependencies:
     babel-code-frame "^6.26.0"
     css-selector-tokenizer "^0.7.0"
@@ -1388,10 +1742,12 @@ css-loader@^0.28.3:
 css-parse@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.0.4.tgz#38b0503fbf9da9f54e9c1dbda60e145c77117bdd"
+  integrity sha1-OLBQP7+dqfVOnB29pg4UXHcRe90=
 
 css-selector-tokenizer@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  integrity sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
@@ -1400,10 +1756,12 @@ css-selector-tokenizer@^0.7.0:
 css-stringify@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/css-stringify/-/css-stringify-1.0.5.tgz#b0d042946db2953bb9d292900a6cb5f6d0122031"
+  integrity sha1-sNBClG2ylTu50pKQCmy19tASIDE=
 
 css@~1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/css/-/css-1.0.8.tgz#9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7"
+  integrity sha1-k4aBHKgrzMnuf7WnMrHioxfIo+c=
   dependencies:
     css-parse "1.0.4"
     css-stringify "1.0.5"
@@ -1411,10 +1769,12 @@ css@~1.0.8:
 cssesc@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
 
 cssnano@^3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+  integrity sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=
   dependencies:
     autoprefixer "^6.3.1"
     decamelize "^1.1.2"
@@ -1452,108 +1812,144 @@ cssnano@^3.10.0:
 csso@~2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=
   dependencies:
     clap "^1.0.9"
     source-map "^0.5.3"
 
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz#8cd52e8a3acfd68d3aed38ee0a640177d2f9d797"
+  integrity sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==
 
-"cssstyle@>= 0.2.37 < 0.3.0":
-  version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+"cssstyle@>= 0.3.1 < 0.4.0":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.3.1.tgz#6da9b4cff1bc5d716e6e5fe8e04fcb1b50a49adf"
+  integrity sha512-tNvaxM5blOnxanyxI6panOsnfiyLRj3HV4qjqqS45WPNS1usdYWRUQjqTEEELK73lpeP/1KoIGYUwrBn/VcECA==
   dependencies:
     cssom "0.3.x"
 
 cuint@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
+  integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
 
 cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
+
+d@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
+  dependencies:
+    es5-ext "^0.10.9"
 
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
 data-urls@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.0.0.tgz#24802de4e81c298ea8a9388bb0d8e461c774684f"
+  integrity sha512-ai40PPQR0Fn1lD2PPie79CibnlMN2AYiDhwFX/rZHVsxbs5kNJSjegqXIprhouGXlRdEnfybva7kqRGnB6mypA==
   dependencies:
     abab "^1.0.4"
     whatwg-mimetype "^2.0.0"
     whatwg-url "^6.4.0"
 
+date-fns@^1.27.2:
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
+  integrity sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
 debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
 debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
 debug@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  integrity sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=
   dependencies:
     ms "0.7.1"
 
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-deep-extend@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f"
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-default-require-extensions@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+default-require-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
+  integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=
   dependencies:
-    strip-bom "^2.0.0"
+    strip-bom "^3.0.0"
 
 define-properties@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
   dependencies:
-    foreach "^2.0.5"
-    object-keys "^1.0.8"
+    object-keys "^1.0.12"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -1561,10 +1957,12 @@ define-property@^2.0.2:
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
 
 del@^2.0.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
   dependencies:
     globby "^5.0.0"
     is-path-cwd "^1.0.0"
@@ -1577,18 +1975,22 @@ del@^2.0.2:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
 depd@~1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -1596,28 +1998,34 @@ des.js@^1.0.0:
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
   dependencies:
     repeating "^2.0.0"
 
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
 
 diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -1626,26 +2034,31 @@ diffie-hellman@^5.0.0:
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
   dependencies:
     esutils "^2.0.2"
 
 doctypes@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+  integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=
 
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
 domexception@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
   dependencies:
     webidl-conversions "^4.0.2"
 
-duplexify@^3.4.2, duplexify@^3.5.3:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4"
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
+  integrity sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -1655,20 +2068,29 @@ duplexify@^3.4.2, duplexify@^3.5.3:
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  integrity sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=
   dependencies:
     jsbn "~0.1.0"
 
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.2.7:
-  version "1.3.42"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9"
+  version "1.3.45"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.45.tgz#458ac1b1c5c760ce8811a16d2bfbd97ec30bafb8"
+  integrity sha1-RYrBscXHYM6IEaFtK/vZfsMLr7g=
+
+elegant-spinner@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
+  integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
 
 elliptic@^6.0.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
+  integrity sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -1681,22 +2103,26 @@ elliptic@^6.0.0:
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
   dependencies:
     iconv-lite "~0.4.13"
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a"
+enhanced-resolve@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -1705,18 +2131,28 @@ enhanced-resolve@^4.0.0:
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
   dependencies:
     prr "~1.0.1"
 
 error-ex@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  dependencies:
+    is-arrayish "^0.2.1"
+
+error-ex@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  integrity sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=
   dependencies:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.5.1:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681"
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
+  integrity sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.1"
@@ -1727,26 +2163,67 @@ es-abstract@^1.5.1:
 es-to-primitive@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+  integrity sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=
   dependencies:
     is-callable "^1.1.1"
     is-date-object "^1.0.1"
     is-symbol "^1.0.1"
 
+es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2:
+  version "0.10.46"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.46.tgz#efd99f67c5a7ec789baa3daa7f79870388f7f572"
+  integrity sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==
+  dependencies:
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.1"
+    next-tick "1"
+
+es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
 es6-promise-polyfill@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es6-promise-polyfill/-/es6-promise-polyfill-1.2.0.tgz#f38925f23cb3e3e8ce6cda8ff774fcebbb090cde"
+  integrity sha1-84kl8jyz4+jObNqP93T867sJDN4=
+
+es6-symbol@^3.1.1, es6-symbol@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+es6-weak-map@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  integrity sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=
+  dependencies:
+    d "1"
+    es5-ext "^0.10.14"
+    es6-iterator "^2.0.1"
+    es6-symbol "^3.1.1"
 
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@1.8.x:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
+  integrity sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=
   dependencies:
     esprima "^2.7.1"
     estraverse "^1.9.1"
@@ -1756,8 +2233,9 @@ escodegen@1.8.x:
     source-map "~0.2.0"
 
 escodegen@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
+  integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -1769,150 +2247,194 @@ escodegen@^1.9.0:
 eslint-config-prettier@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz#5ecd65174d486c22dff389fe036febf502d468a3"
+  integrity sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==
   dependencies:
     get-stdin "^5.0.1"
 
-eslint-plugin-jest@^21.17.0:
-  version "21.17.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.17.0.tgz#fdb00e2f9ff16987d6ebcf2c75c7add105760bbb"
+eslint-plugin-es@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.3.1.tgz#5acb2565db4434803d1d46a9b4cbc94b345bd028"
+  integrity sha512-9XcVyZiQRVeFjqHw8qHNDAZcQLqaHlOGGpeYqzYh8S4JYCWTCO3yzyen8yVmA5PratfzTRWDwCOFphtDEG+w/w==
+  dependencies:
+    eslint-utils "^1.3.0"
+    regexpp "^2.0.0"
 
-eslint-plugin-node@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz#bf19642298064379315d7a4b2a75937376fa05e4"
+eslint-plugin-jest@^21.18.0:
+  version "21.18.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-21.18.0.tgz#d7305969a9c1902f895468791d968fcf08b5c0b7"
+  integrity sha512-fhuJuehoMtuEQ3Klgx0629hDmbs0M0g4tSZ65Wq2NqpLWCK5UC7hQnGS1Wh4+Vc/9P4ss4HxqZ1XK7honqUZNg==
+
+eslint-plugin-node@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-7.0.1.tgz#a6e054e50199b2edd85518b89b4e7b323c9f36db"
+  integrity sha512-lfVw3TEqThwq0j2Ba/Ckn2ABdwmL5dkOgAux1rvOk6CO7A6yGyPI2+zIxN6FyNkp1X1X/BSvKOceD6mBWSj4Yw==
   dependencies:
-    ignore "^3.3.6"
+    eslint-plugin-es "^1.3.1"
+    eslint-utils "^1.3.1"
+    ignore "^4.0.2"
     minimatch "^3.0.4"
-    resolve "^1.3.3"
-    semver "^5.4.1"
+    resolve "^1.8.1"
+    semver "^5.5.0"
 
-eslint-plugin-prettier@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.0.tgz#33e4e228bdb06142d03c560ce04ec23f6c767dd7"
+eslint-plugin-prettier@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.2.tgz#71998c60aedfa2141f7bfcbf9d1c459bf98b4fad"
+  integrity sha512-tGek5clmW5swrAx1mdPYM8oThrBE83ePh7LeseZHBWfHVGrHPhKn7Y5zgRMbU/9D5Td9K4CEmUPjGxA7iw98Og==
   dependencies:
     fast-diff "^1.1.1"
     jest-docblock "^21.0.0"
 
-eslint-scope@^3.7.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
+eslint-scope@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
+  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-utils@^1.3.0, eslint-utils@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
+  integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
+
 eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
+  integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
 
-eslint@^4.19.1:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
+eslint@^5.2.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.4.0.tgz#d068ec03006bb9e06b429dc85f7e46c1b69fac62"
+  integrity sha512-UIpL91XGex3qtL6qwyCQJar2j3osKxK9e3ano3OcGEIRM4oWIpCkDg9x95AXEC2wMs7PnxzOkPZ2gq+tsMS9yg==
   dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
+    ajv "^6.5.0"
+    babel-code-frame "^6.26.0"
     chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
+    cross-spawn "^6.0.5"
     debug "^3.1.0"
     doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
+    eslint-scope "^4.0.0"
+    eslint-utils "^1.3.1"
     eslint-visitor-keys "^1.0.0"
-    espree "^3.5.4"
-    esquery "^1.0.0"
+    espree "^4.0.0"
+    esquery "^1.0.1"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
     functional-red-black-tree "^1.0.1"
     glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
+    globals "^11.7.0"
+    ignore "^4.0.2"
     imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
+    inquirer "^5.2.0"
+    is-resolvable "^1.1.0"
+    js-yaml "^3.11.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
+    lodash "^4.17.5"
+    minimatch "^3.0.4"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
     optionator "^0.8.2"
     path-is-inside "^1.0.2"
     pluralize "^7.0.0"
     progress "^2.0.0"
-    regexpp "^1.0.1"
+    regexpp "^2.0.0"
     require-uncached "^1.0.3"
-    semver "^5.3.0"
+    semver "^5.5.0"
     strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
+    strip-json-comments "^2.0.1"
+    table "^4.0.3"
+    text-table "^0.2.0"
 
-espree@^3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
+espree@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-4.0.0.tgz#253998f20a0f82db5d866385799d912a83a36634"
+  integrity sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==
   dependencies:
-    acorn "^5.5.0"
-    acorn-jsx "^3.0.0"
+    acorn "^5.6.0"
+    acorn-jsx "^4.1.1"
 
 esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
 
 esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
 esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.0:
+esquery@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
+  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
   dependencies:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
   dependencies:
     estraverse "^4.1.0"
 
 estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+  integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=
 
 estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
 etag@~1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz#03d30b5f67dd6e632d2945d30d6652731a34d5d8"
+  integrity sha1-A9MLX2fdbmMtKUXTDWZScxo01dg=
+
+event-emitter@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
 
 events@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
 exec-sh@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.1.tgz#163b98a6e89e6b65b47c2a28d215bc1f63989c38"
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
+  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
   dependencies:
-    merge "^1.1.3"
+    merge "^1.2.0"
 
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -1922,19 +2444,40 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01"
+  integrity sha512-BbUMBiX4hqiHZUA5+JujIjNb6TyAlp2D5KLheMjMluwOuzcnylDL4AxZYLLn1n2AGB49eSWwyKvvEQoRpnAtmA==
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+exit-hook@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+  integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -1947,23 +2490,26 @@ expand-brackets@^2.1.4:
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
   dependencies:
     fill-range "^2.1.0"
 
-expect@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-23.0.1.tgz#99131f2fd9115595f8cc3697401e7f0734d45fef"
+expect@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-23.4.0.tgz#6da4ecc99c1471253e7288338983ad1ebadb60c3"
+  integrity sha1-baTsyZwUcSU+cogziYOtHrrbYMM=
   dependencies:
     ansi-styles "^3.2.0"
-    jest-diff "^23.0.1"
+    jest-diff "^23.2.0"
     jest-get-type "^22.1.0"
-    jest-matcher-utils "^23.0.1"
-    jest-message-util "^23.0.0"
-    jest-regex-util "^23.0.0"
+    jest-matcher-utils "^23.2.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
 
 express@~4.13.1:
   version "4.13.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.13.4.tgz#3c0b76f3c77590c8345739061ec0bd3ba067ec24"
+  integrity sha1-PAt288d1kMg0VzkGHsC9O6Bn7CQ=
   dependencies:
     accepts "~1.2.12"
     array-flatten "1.1.1"
@@ -1994,23 +2540,32 @@ express@~4.13.1:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@~3.0.0, extend@~3.0.1:
+extend@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+  integrity sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=
 
-external-editor@^2.0.4:
+extend@~3.0.1, extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+external-editor@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
+  integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
   dependencies:
     chardet "^0.4.0"
     iconv-lite "^0.4.17"
@@ -2019,12 +2574,14 @@ external-editor@^2.0.4:
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
   dependencies:
     is-extglob "^1.0.0"
 
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -2038,40 +2595,54 @@ extglob@^2.0.4:
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
+
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
 fast-diff@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
+  integrity sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fastparse@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+  integrity sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=
 
 fb-watchman@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
+  integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=
   dependencies:
     bser "^2.0.0"
 
 fbjs@^0.8.16, fbjs@^0.8.9:
   version "0.8.16"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
+  integrity sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=
   dependencies:
     core-js "^1.0.0"
     isomorphic-fetch "^2.1.1"
@@ -2081,15 +2652,25 @@ fbjs@^0.8.16, fbjs@^0.8.9:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.9"
 
+figures@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-entry-cache@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
   dependencies:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
@@ -2097,6 +2678,7 @@ file-entry-cache@^2.0.0:
 file-loader@^1.1.6:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8"
+  integrity sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^0.4.5"
@@ -2104,10 +2686,12 @@ file-loader@^1.1.6:
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
 
 fileset@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
   dependencies:
     glob "^7.0.3"
     minimatch "^3.0.3"
@@ -2115,6 +2699,7 @@ fileset@^2.0.2:
 fill-range@^2.1.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -2125,6 +2710,7 @@ fill-range@^2.1.0:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -2134,6 +2720,7 @@ fill-range@^4.0.0:
 finalhandler@0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.4.1.tgz#85a17c6c59a94717d262d61230d4b0ebe3d4a14d"
+  integrity sha1-haF8bFmpRxfSYtYSMNSw6+PUoU0=
   dependencies:
     debug "~2.2.0"
     escape-html "~1.0.3"
@@ -2143,14 +2730,21 @@ finalhandler@0.4.1:
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
+find-parent-dir@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
+  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
@@ -2158,12 +2752,14 @@ find-up@^1.0.0:
 find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
 flat-cache@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+  integrity sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=
   dependencies:
     circular-json "^0.3.1"
     del "^2.0.2"
@@ -2173,10 +2769,12 @@ flat-cache@^1.2.1:
 flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+  integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=
 
 flush-write-stream@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+  integrity sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
@@ -2184,54 +2782,64 @@ flush-write-stream@^1.0.0:
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
   dependencies:
     for-in "^1.0.1"
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  integrity sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
-form-data@~2.3.1:
+form-data@~2.3.1, form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "1.0.6"
     mime-types "^2.1.12"
 
+format-util@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.3.tgz#032dca4a116262a12c43f4c3ec8566416c5b2d95"
+  integrity sha1-Ay3KShFiYqEsQ/TD7IVmQWxbLZU=
+
 forwarded@~0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f"
+  integrity sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=
 
 from2@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
@@ -2239,12 +2847,14 @@ from2@^2.1.0:
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
   dependencies:
     graceful-fs "^4.1.2"
     iferr "^0.1.5"
@@ -2254,10 +2864,12 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.1.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.2.tgz#4f598f0f69b273188ef4a62ca4e9e08ace314bbf"
+  integrity sha512-iownA+hC4uHFp+7gwP/y5SzaiUo7m2vpa0dhpzw8YuKtiZsz7cIXsFbXpLEeBM6WuCQyw1MH4RRe6XI8GFUctQ==
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.9.0"
@@ -2265,21 +2877,25 @@ fsevents@^1.1.2:
 fsevents@^1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
-function-bind@^1.0.2, function-bind@^1.1.1:
+function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -2290,41 +2906,42 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  dependencies:
-    is-property "^1.0.0"
-
 get-caller-file@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
+get-own-enumerable-property-symbols@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-2.0.1.tgz#5c4ad87f2834c4b9b4e84549dc1e0650fb38c24b"
+  integrity sha512-TtY/sbOemiMKPRUDDanGCSgBYe7Mf0vbRsWnBZ+9yghpZ1MvcpSpuZFjHdEeY/LZjZy0vdLjS77L6HosisFiug==
 
 get-stdin@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
+  integrity sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=
 
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
@@ -2332,12 +2949,14 @@ glob-base@^0.3.0:
 glob-parent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
   dependencies:
     is-glob "^2.0.0"
 
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
@@ -2345,6 +2964,7 @@ glob-parent@^3.1.0:
 glob@^5.0.15:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -2352,9 +2972,22 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+glob@^7.0.3, glob@^7.0.5:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -2363,17 +2996,20 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-globals@^11.0.1:
-  version "11.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.4.0.tgz#b85c793349561c16076a3c13549238a27945f1bc"
+globals@^11.7.0:
+  version "11.7.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
+  integrity sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==
 
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
 globby@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
   dependencies:
     array-union "^1.0.1"
     arrify "^1.0.0"
@@ -2385,18 +3021,27 @@ globby@^5.0.0:
 graceful-fs@^4.1.11, graceful-fs@^4.1.2:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
+
+"growl@~> 1.10.0":
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
 
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
 handlebars@^4.0.1, handlebars@^4.0.3:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
+  integrity sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=
   dependencies:
     async "^1.4.0"
     optimist "^0.6.1"
@@ -2407,23 +3052,17 @@ handlebars@^4.0.1, handlebars@^4.0.3:
 har-schema@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+  integrity sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=
 
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-
-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  integrity sha1-M0gdDxu/9gDdID11gSpqX7oALio=
   dependencies:
     ajv "^4.9.1"
     har-schema "^1.0.5"
@@ -2431,35 +3070,45 @@ har-validator@~4.2.1:
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
   dependencies:
     ajv "^5.1.0"
     har-schema "^2.0.0"
 
+har-validator@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
+  dependencies:
+    ajv "^5.3.0"
+    har-schema "^2.0.0"
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -2468,6 +3117,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -2476,23 +3126,27 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
 has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
-    function-bind "^1.0.2"
+    function-bind "^1.1.1"
 
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -2500,6 +3154,7 @@ hash-base@^3.0.0:
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
+  integrity sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
@@ -2507,24 +3162,17 @@ hash.js@^1.0.0, hash.js@^1.0.3:
 hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
   dependencies:
     boom "2.x.x"
     cryptiles "2.x.x"
     hoek "2.x.x"
     sntp "1.x.x"
 
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
@@ -2533,35 +3181,42 @@ hmac-drbg@^1.0.0:
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
 
 hoek@4.x.x:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
+  integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==
 
 home-or-tmp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
 html-comment-regex@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
+  integrity sha1-ZouTd26q5V696POtRkswekljYl4=
 
 html-encoding-sniffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
   dependencies:
     whatwg-encoding "^1.0.1"
 
 http-errors@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.3.1.tgz#197e22cdebd4198585e8694ef6786197b91ed942"
+  integrity sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=
   dependencies:
     inherits "~2.0.1"
     statuses "1"
@@ -2569,6 +3224,7 @@ http-errors@~1.3.1:
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
   dependencies:
     assert-plus "^0.2.0"
     jsprim "^1.2.2"
@@ -2577,6 +3233,7 @@ http-signature@~1.1.0:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -2585,62 +3242,97 @@ http-signature@~1.2.0:
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+
+husky@^1.0.0-rc.6:
+  version "1.0.0-rc.6"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-1.0.0-rc.6.tgz#000f5ffe671015ae8c48da5c52b3390bbba9770d"
+  integrity sha512-glraqjyMBNAOlAs1JJTxELJbrBT7v9VNiIDerywshHLDnzdC4iqwhHTkWXsY+L8Clt1Gade2/CppLcxEwY/HgQ==
+  dependencies:
+    cosmiconfig "^4.0.0"
+    execa "^0.9.0"
+    find-up "^2.1.0"
+    is-ci "^1.1.0"
+    pkg-dir "^2.0.0"
+    pupa "^1.0.0"
+    read-pkg "^3.0.0"
+    run-node "^1.0.0"
+    slash "^2.0.0"
 
 i18n-webpack-plugin@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/i18n-webpack-plugin/-/i18n-webpack-plugin-1.0.0.tgz#0ca12296ec937a4f94325cd0264d08f4e0549831"
+  integrity sha512-WMC2i05OuitjxYmeQU8XV4KJ+CrWnTOY5DwjygRz2dNByezfnTbVbV67qX4I53KHlscSnOsJyv6StuZxmm6J7w==
 
 iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
+  integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==
 
-iconv-lite@^0.4.17, iconv-lite@~0.4.13:
-  version "0.4.21"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
+iconv-lite@^0.4.17:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
-    safer-buffer "^2.1.0"
+    safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@^0.4.4:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@~0.4.13:
+  version "0.4.21"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
+  integrity sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==
+  dependencies:
+    safer-buffer "^2.1.0"
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+  integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
 
 icss-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+  integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
   dependencies:
     postcss "^6.0.1"
 
-ieee754@^1.1.11, ieee754@^1.1.4:
+ieee754@^1.1.4:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455"
+  integrity sha512-VhDzCKN7K8ufStx/CLj5/PDTMgph+qwN5Pkd5i0sGnVwk56zJ0lkT8Qzi1xqWLS0Wp29DgDtNeS7v8/wMoZeHg==
 
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.3.3, ignore@^3.3.6:
-  version "3.3.8"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.8.tgz#3f8e9c35d38708a3a7e0e9abb6c73e7ee7707b2b"
+ignore@^4.0.2:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
 import-local@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  integrity sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==
   dependencies:
     pkg-dir "^2.0.0"
     resolve-cwd "^2.0.0"
@@ -2648,18 +3340,34 @@ import-local@^1.0.0:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
+  dependencies:
+    repeating "^2.0.0"
+
+indent-string@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
 
 indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -2667,30 +3375,33 @@ inflight@^1.0.4:
 inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
 ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-inquirer@^3.0.6:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+inquirer@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
+  integrity sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^2.0.4"
+    external-editor "^2.1.0"
     figures "^2.0.0"
     lodash "^4.3.0"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
+    rxjs "^5.5.2"
     string-width "^2.1.0"
     strip-ansi "^4.0.0"
     through "^2.3.6"
@@ -2698,82 +3409,98 @@ inquirer@^3.0.6:
 invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
 ipaddr.js@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.0.5.tgz#5fa78cf301b825c78abc3042d812723049ea23c7"
+  integrity sha1-X6eM8wG4JceKvDBC2BJyMEnqI8c=
 
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
+  integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
   dependencies:
     builtin-modules "^1.0.0"
 
 is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
-is-ci@^1.0.10:
+is-ci@^1.0.10, is-ci@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
+  integrity sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==
   dependencies:
     ci-info "^1.0.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
 
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -2782,24 +3509,33 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
+
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
   dependencies:
     is-primitive "^2.0.0"
 
 is-expression@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
+  integrity sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8=
   dependencies:
     acorn "~4.0.2"
     object-assign "^4.0.1"
@@ -2807,204 +3543,234 @@ is-expression@^3.0.0:
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-generator-fn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
+  integrity sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
   dependencies:
     is-extglob "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
   dependencies:
     is-extglob "^2.1.1"
 
-is-my-ip-valid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
-
-is-my-json-valid@^2.12.4:
-  version "2.17.2"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    is-my-ip-valid "^1.0.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
-is-odd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
+is-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+
+is-observable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
+  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
   dependencies:
-    is-number "^4.0.0"
+    symbol-observable "^1.1.0"
 
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
   dependencies:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
   dependencies:
     path-is-inside "^1.0.1"
 
 is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
 
 is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
 
-is-promise@^2.0.0, is-promise@^2.1.0:
+is-promise@^2.0.0, is-promise@^2.1, is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
 is-promise@~1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-1.0.1.tgz#31573761c057e33c2e91aab9e96da08cefbe76e5"
-
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+  integrity sha1-MVc3YcBX4zwukaq56W2gjO++duU=
 
 is-regex@^1.0.3, is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
   dependencies:
     has "^1.0.1"
 
-is-resolvable@^1.0.0:
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+
+is-resolvable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
 is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-svg@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+  integrity sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=
   dependencies:
     html-comment-regex "^1.1.0"
 
 is-symbol@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+  integrity sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=
 
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isemail@3.x.x:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.1.2.tgz#937cf919002077999a73ea8b1951d590e84e01dd"
+  integrity sha512-zfRhJn9rFSGhzU5tGZqepRSAj3+g6oTOHxMGGriWNJZzyLPUK8H7VHpqKntegnW8KLyGA9zwuNaCoopl40LTpg==
   dependencies:
     punycode "2.x.x"
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isomorphic-fetch@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+  integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
   dependencies:
     node-fetch "^1.0.1"
     whatwg-fetch ">=0.10.0"
@@ -3012,10 +3778,12 @@ isomorphic-fetch@^2.1.1:
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-api@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954"
+  integrity sha512-duj6AlLcsWNwUpfyfHt0nWIeRiZpuShnP40YTxOGQgtaN8fd6JYSxsvxUphTDy8V5MfDXo4s/xVCIIvVCO808g==
   dependencies:
     async "^2.1.4"
     compare-versions "^3.1.0"
@@ -3033,16 +3801,19 @@ istanbul-api@^1.3.1:
 istanbul-lib-coverage@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
+  integrity sha512-GvgM/uXRwm+gLlvkWHTjDAvwynZkL9ns15calTrmhGgowlwJBbWMYzWbKqE2DT6JDP1AFXKa+Zi0EkqNCUqY0A==
 
 istanbul-lib-hook@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz#ae556fd5a41a6e8efa0b1002b1e416dfeaf9816c"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.1.tgz#f614ec45287b2a8fc4f07f5660af787575601805"
+  integrity sha512-eLAMkPG9FU0v5L02lIkcj/2/Zlz9OuluaXikdr5iStk8FDbSwAixTK9TkYxbF0eNnzAJTwM2fkV2A1tpsIp4Jg==
   dependencies:
-    append-transform "^0.4.0"
+    append-transform "^1.0.0"
 
 istanbul-lib-instrument@^1.10.1:
   version "1.10.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
+  integrity sha512-1dYuzkOCbuR5GRJqySuZdsmsNKPL3PTuyPevQfoCXJePT9C8y1ga75neU+Tuy9+yS3G/dgx8wgOmp2KLpgdoeQ==
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
@@ -3055,6 +3826,7 @@ istanbul-lib-instrument@^1.10.1:
 istanbul-lib-report@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5"
+  integrity sha512-Azqvq5tT0U09nrncK3q82e/Zjkxa4tkFZv7E6VcqP0QCPn6oNljDPfrZEC/umNXds2t7b8sRJfs6Kmpzt8m2kA==
   dependencies:
     istanbul-lib-coverage "^1.2.0"
     mkdirp "^0.5.1"
@@ -3062,8 +3834,9 @@ istanbul-lib-report@^1.1.4:
     supports-color "^3.1.2"
 
 istanbul-lib-source-maps@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz#cc7ccad61629f4efff8e2f78adb8c522c9976ec7"
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz#ffe6be4e7ab86d3603e4290d54990b14506fc9b1"
+  integrity sha512-8O2T/3VhrQHn0XcJbP1/GN7kXMiRAlPi+fj3uEHrjBD8Oz7Py0prSC25C09NuAZS6bgW1NNKAvCSHZXB0irSGA==
   dependencies:
     debug "^3.1.0"
     istanbul-lib-coverage "^1.2.0"
@@ -3074,12 +3847,14 @@ istanbul-lib-source-maps@^1.2.4:
 istanbul-reports@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554"
+  integrity sha512-y2Z2IMqE1gefWUaVjrBm0mSKvUkaBy9Vqz8iwr/r40Y9hBbIteH5wqHG/9DLTfJ9xUnUT2j7A3+VVJ6EaYBllA==
   dependencies:
     handlebars "^4.0.3"
 
 istanbul@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
+  integrity sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=
   dependencies:
     abbrev "1.0.x"
     async "1.x"
@@ -3099,12 +3874,14 @@ istanbul@^0.4.5:
 jade-loader@~0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/jade-loader/-/jade-loader-0.8.0.tgz#d1b09971a9bf90a2b298b0af5b1ad0300d109c2e"
+  integrity sha1-0bCZcam/kKKymLCvWxrQMA0QnC4=
   dependencies:
     loader-utils "~0.2.5"
 
 jade@^1.11.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/jade/-/jade-1.11.0.tgz#9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"
+  integrity sha1-nIDlOMEtP7lcjZu5VZ+gzAQEBf0=
   dependencies:
     character-parser "1.2.1"
     clean-css "^3.1.9"
@@ -3117,15 +3894,17 @@ jade@^1.11.0:
     void-elements "~2.0.1"
     with "~4.0.0"
 
-jest-changed-files@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.0.1.tgz#f79572d0720844ea5df84c2a448e862c2254f60c"
+jest-changed-files@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.0.tgz#f1b304f98c235af5d9a31ec524262c5e4de3c6ff"
+  integrity sha1-8bME+YwjWvXZox7FJCYsXk3jxv8=
   dependencies:
     throat "^4.0.0"
 
-jest-cli@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.0.1.tgz#351a5ba51cf28ecf20336d97a30b970d1f530a56"
+jest-cli@^23.4.1:
+  version "23.4.1"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.4.1.tgz#c1ffd33254caee376990aa2abe2963e0de4ca76b"
+  integrity sha512-Cmd7bex+kYmMGwGrIh/crwUieUFr+4PCTaK32tEA0dm0wklXV8zGgWh8n+8WbhsFPNzacolxdtcfBKIorcV5FQ==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
@@ -3138,22 +3917,24 @@ jest-cli@^23.0.1:
     istanbul-lib-coverage "^1.2.0"
     istanbul-lib-instrument "^1.10.1"
     istanbul-lib-source-maps "^1.2.4"
-    jest-changed-files "^23.0.1"
-    jest-config "^23.0.1"
-    jest-environment-jsdom "^23.0.1"
+    jest-changed-files "^23.4.0"
+    jest-config "^23.4.1"
+    jest-environment-jsdom "^23.4.0"
     jest-get-type "^22.1.0"
-    jest-haste-map "^23.0.1"
-    jest-message-util "^23.0.0"
-    jest-regex-util "^23.0.0"
-    jest-resolve-dependencies "^23.0.1"
-    jest-runner "^23.0.1"
-    jest-runtime "^23.0.1"
-    jest-snapshot "^23.0.1"
-    jest-util "^23.0.1"
-    jest-validate "^23.0.1"
-    jest-worker "^23.0.1"
+    jest-haste-map "^23.4.1"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve-dependencies "^23.4.1"
+    jest-runner "^23.4.1"
+    jest-runtime "^23.4.1"
+    jest-snapshot "^23.4.1"
+    jest-util "^23.4.0"
+    jest-validate "^23.4.0"
+    jest-watcher "^23.4.0"
+    jest-worker "^23.2.0"
     micromatch "^2.3.11"
     node-notifier "^5.2.1"
+    prompts "^0.1.9"
     realpath-native "^1.0.0"
     rimraf "^2.5.4"
     slash "^1.0.0"
@@ -3162,114 +3943,127 @@ jest-cli@^23.0.1:
     which "^1.2.12"
     yargs "^11.0.0"
 
-jest-config@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.0.1.tgz#6798bff1247c7a390b1327193305001582fc58fa"
+jest-config@^23.4.1:
+  version "23.4.1"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.4.1.tgz#3172fa21f0507d7f8a088ed1dbe4157057f201e9"
+  integrity sha512-OT29qlcw9Iw7u0PC04wD9tjLJL4vpGdMZrrHMFwYSO3HxOikbHywjmtQ7rntW4qvBcpbi7iCMTPPRmpDjImQEw==
   dependencies:
     babel-core "^6.0.0"
-    babel-jest "^23.0.1"
+    babel-jest "^23.4.0"
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^23.0.1"
-    jest-environment-node "^23.0.1"
+    jest-environment-jsdom "^23.4.0"
+    jest-environment-node "^23.4.0"
     jest-get-type "^22.1.0"
-    jest-jasmine2 "^23.0.1"
-    jest-regex-util "^23.0.0"
-    jest-resolve "^23.0.1"
-    jest-util "^23.0.1"
-    jest-validate "^23.0.1"
-    pretty-format "^23.0.1"
-
-jest-diff@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.0.1.tgz#3d49137cee12c320a4b4d2b4a6fa6e82d491a16a"
+    jest-jasmine2 "^23.4.1"
+    jest-regex-util "^23.3.0"
+    jest-resolve "^23.4.1"
+    jest-util "^23.4.0"
+    jest-validate "^23.4.0"
+    pretty-format "^23.2.0"
+
+jest-diff@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.2.0.tgz#9f2cf4b51e12c791550200abc16b47130af1062a"
+  integrity sha1-nyz0tR4Sx5FVAgCrwWtHEwrxBio=
   dependencies:
     chalk "^2.0.1"
     diff "^3.2.0"
     jest-get-type "^22.1.0"
-    pretty-format "^23.0.1"
+    pretty-format "^23.2.0"
 
 jest-docblock@^21.0.0:
   version "21.2.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
+  integrity sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==
 
-jest-docblock@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.0.1.tgz#deddd18333be5dc2415260a04ef3fce9276b5725"
+jest-docblock@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
+  integrity sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=
   dependencies:
     detect-newline "^2.1.0"
 
-jest-each@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.0.1.tgz#a6e5dbf530afc6bf9d74792dde69d8db70f84706"
+jest-each@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.4.0.tgz#2fa9edd89daa1a4edc9ff9bf6062a36b71345143"
+  integrity sha1-L6nt2J2qGk7cn/m/YGKja3E0UUM=
   dependencies:
     chalk "^2.0.1"
-    pretty-format "^23.0.1"
+    pretty-format "^23.2.0"
 
-jest-environment-jsdom@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.0.1.tgz#da689eb9358dc16e5708abb208f4eb26a439575c"
+jest-environment-jsdom@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
+  integrity sha1-BWp5UrP+pROsYqFAosNox52eYCM=
   dependencies:
-    jest-mock "^23.0.1"
-    jest-util "^23.0.1"
+    jest-mock "^23.2.0"
+    jest-util "^23.4.0"
     jsdom "^11.5.1"
 
-jest-environment-node@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.0.1.tgz#676b740e205f1f2be77241969e7812be824ee795"
+jest-environment-node@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
+  integrity sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA=
   dependencies:
-    jest-mock "^23.0.1"
-    jest-util "^23.0.1"
+    jest-mock "^23.2.0"
+    jest-util "^23.4.0"
 
 jest-get-type@^22.1.0:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
+  integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
 
-jest-haste-map@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.0.1.tgz#cd89052abfc8cba01f560bbec09d4f36aec25d4f"
+jest-haste-map@^23.4.1:
+  version "23.4.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.4.1.tgz#43a174ba7ac079ae1dd74eaf5a5fe78989474dd2"
+  integrity sha512-PGQxOEGAfRbTyJkmZeOKkVSs+KVeWgG625p89KUuq+sIIchY5P8iPIIc+Hw2tJJPBzahU3qopw1kF/qyhDdNBw==
   dependencies:
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.11"
-    jest-docblock "^23.0.1"
+    jest-docblock "^23.2.0"
     jest-serializer "^23.0.1"
-    jest-worker "^23.0.1"
+    jest-worker "^23.2.0"
     micromatch "^2.3.11"
     sane "^2.0.0"
 
-jest-jasmine2@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.0.1.tgz#16d875356e6360872bba48426f7d31fdc1b0bcea"
+jest-jasmine2@^23.4.1:
+  version "23.4.1"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.4.1.tgz#fa192262430d418e827636e4a98423e5e7ff0fce"
+  integrity sha512-nHmRgTtM9fuaK3RBz2z4j9mYVEJwB7FdoflQSvrwHV8mCT5z4DeHoKCvPp2R27F8fZTYJUYVMb36xn+ydg0tfA==
   dependencies:
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^23.0.1"
+    expect "^23.4.0"
     is-generator-fn "^1.0.0"
-    jest-diff "^23.0.1"
-    jest-each "^23.0.1"
-    jest-matcher-utils "^23.0.1"
-    jest-message-util "^23.0.0"
-    jest-snapshot "^23.0.1"
-    jest-util "^23.0.1"
-    pretty-format "^23.0.1"
-
-jest-leak-detector@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.0.1.tgz#9dba07505ac3495c39d3ec09ac1e564599e861a0"
-  dependencies:
-    pretty-format "^23.0.1"
-
-jest-matcher-utils@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.0.1.tgz#0c6c0daedf9833c2a7f36236069efecb4c3f6e5f"
+    jest-diff "^23.2.0"
+    jest-each "^23.4.0"
+    jest-matcher-utils "^23.2.0"
+    jest-message-util "^23.4.0"
+    jest-snapshot "^23.4.1"
+    jest-util "^23.4.0"
+    pretty-format "^23.2.0"
+
+jest-leak-detector@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.2.0.tgz#c289d961dc638f14357d4ef96e0431ecc1aa377d"
+  integrity sha1-wonZYdxjjxQ1fU75bgQx7MGqN30=
+  dependencies:
+    pretty-format "^23.2.0"
+
+jest-matcher-utils@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.2.0.tgz#4d4981f23213e939e3cedf23dc34c747b5ae1913"
+  integrity sha1-TUmB8jIT6Tnjzt8j3DTHR7WuGRM=
   dependencies:
     chalk "^2.0.1"
     jest-get-type "^22.1.0"
-    pretty-format "^23.0.1"
+    pretty-format "^23.2.0"
 
-jest-message-util@^23.0.0:
-  version "23.0.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.0.0.tgz#073f3d76c701f7c718a4b9af1eb7f138792c4796"
+jest-message-util@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
+  integrity sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8=
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.35"
     chalk "^2.0.1"
@@ -3277,50 +4071,56 @@ jest-message-util@^23.0.0:
     slash "^1.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.0.1.tgz#1569f477968c668fc728273a17c3767773b46357"
+jest-mock@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
+  integrity sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=
 
-jest-regex-util@^23.0.0:
-  version "23.0.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.0.0.tgz#dd5c1fde0c46f4371314cf10f7a751a23f4e8f76"
+jest-regex-util@^23.3.0:
+  version "23.3.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
+  integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=
 
-jest-resolve-dependencies@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.0.1.tgz#d01a10ddad9152c4cecdf5eac2b88571c4b6a64d"
+jest-resolve-dependencies@^23.4.1:
+  version "23.4.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.4.1.tgz#a1d85247e2963f8b3859f6b0ec61b741b359378e"
+  integrity sha512-Jp0wgNJg3OYPvXJfNVX4k4/niwGS6ARuKacum/vue48+4A1XPJ2H3aVFuNb3gUaiB/6Le7Zyl8AUb4MELBfcmg==
   dependencies:
-    jest-regex-util "^23.0.0"
-    jest-snapshot "^23.0.1"
+    jest-regex-util "^23.3.0"
+    jest-snapshot "^23.4.1"
 
-jest-resolve@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.0.1.tgz#3f8403462b10a34c2df1d47aab5574c4935bcd24"
+jest-resolve@^23.4.1:
+  version "23.4.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.4.1.tgz#7f3c17104732a2c0c940a01256025ed745814982"
+  integrity sha512-VNk4YRNR5gsHhNS0Lp46/DzTT11e+ecbUC61ikE593cKbtdrhrMO+zXkOJaE8YDD5sHxH9W6OfssNn4FkZBzZQ==
   dependencies:
-    browser-resolve "^1.11.2"
+    browser-resolve "^1.11.3"
     chalk "^2.0.1"
     realpath-native "^1.0.0"
 
-jest-runner@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.0.1.tgz#b176ae3ecf9e194aa4b84a7fcf70d1b8db231aa7"
+jest-runner@^23.4.1:
+  version "23.4.1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.4.1.tgz#d41fd1459b95d35d6df685f1468c09e617c8c260"
+  integrity sha512-78KyhObsx0VEuUQ74ikGt68NpP6PApTjGpJPSyZ7AvwOFRqFlxdHpCU/lFPQxW/fLEghl4irz9OHjRLGcGFNyQ==
   dependencies:
     exit "^0.1.2"
     graceful-fs "^4.1.11"
-    jest-config "^23.0.1"
-    jest-docblock "^23.0.1"
-    jest-haste-map "^23.0.1"
-    jest-jasmine2 "^23.0.1"
-    jest-leak-detector "^23.0.1"
-    jest-message-util "^23.0.0"
-    jest-runtime "^23.0.1"
-    jest-util "^23.0.1"
-    jest-worker "^23.0.1"
+    jest-config "^23.4.1"
+    jest-docblock "^23.2.0"
+    jest-haste-map "^23.4.1"
+    jest-jasmine2 "^23.4.1"
+    jest-leak-detector "^23.2.0"
+    jest-message-util "^23.4.0"
+    jest-runtime "^23.4.1"
+    jest-util "^23.4.0"
+    jest-worker "^23.2.0"
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runtime@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.0.1.tgz#b1d765fb03fb6d4043805af270676a693f504d57"
+jest-runtime@^23.4.1:
+  version "23.4.1"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.4.1.tgz#c1822eba5eb19294debe6b25b2760d0a8c532fd1"
+  integrity sha512-fnInrsEAbLpNctQa+RLnKZyQLMmb5u4YdoT9CbRKWhjMY7q6ledOu+x+ORZ3glQOK/vJIS701RaJRp1pc5ziaA==
   dependencies:
     babel-core "^6.0.0"
     babel-plugin-istanbul "^4.1.6"
@@ -3329,14 +4129,14 @@ jest-runtime@^23.0.1:
     exit "^0.1.2"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.1.11"
-    jest-config "^23.0.1"
-    jest-haste-map "^23.0.1"
-    jest-message-util "^23.0.0"
-    jest-regex-util "^23.0.0"
-    jest-resolve "^23.0.1"
-    jest-snapshot "^23.0.1"
-    jest-util "^23.0.1"
-    jest-validate "^23.0.1"
+    jest-config "^23.4.1"
+    jest-haste-map "^23.4.1"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve "^23.4.1"
+    jest-snapshot "^23.4.1"
+    jest-util "^23.4.0"
+    jest-validate "^23.4.0"
     micromatch "^2.3.11"
     realpath-native "^1.0.0"
     slash "^1.0.0"
@@ -3347,62 +4147,77 @@ jest-runtime@^23.0.1:
 jest-serializer@^23.0.1:
   version "23.0.1"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
+  integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=
 
-jest-silent-reporter@^0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/jest-silent-reporter/-/jest-silent-reporter-0.0.5.tgz#14139b7a991b7bcca880dd8a69c33a91723a8f1f"
-  dependencies:
-    chalk "^2.3.1"
-    jest-util "^23.0.0"
-
-jest-snapshot@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.0.1.tgz#6674fa19b9eb69a99cabecd415bddc42d6af3e7e"
+jest-snapshot@^23.4.1:
+  version "23.4.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.4.1.tgz#090de9acae927f6a3af3005bda40d912b83e9c96"
+  integrity sha512-oMjaQ4vB4uT211zx00X0R7hg+oLVRDvhVKiC6+vSg7Be9S/AmkDMCVUoaPcLRK/0NkZBTzrh4WCzrSZgUEZW3g==
   dependencies:
+    babel-traverse "^6.0.0"
+    babel-types "^6.0.0"
     chalk "^2.0.1"
-    jest-diff "^23.0.1"
-    jest-matcher-utils "^23.0.1"
+    jest-diff "^23.2.0"
+    jest-matcher-utils "^23.2.0"
+    jest-message-util "^23.4.0"
+    jest-resolve "^23.4.1"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^23.0.1"
+    pretty-format "^23.2.0"
+    semver "^5.5.0"
 
-jest-util@^23.0.0, jest-util@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.0.1.tgz#68ea5bd7edb177d3059f9797259f8e0dacce2f99"
+jest-util@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
+  integrity sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE=
   dependencies:
     callsites "^2.0.0"
     chalk "^2.0.1"
     graceful-fs "^4.1.11"
     is-ci "^1.0.10"
-    jest-message-util "^23.0.0"
+    jest-message-util "^23.4.0"
     mkdirp "^0.5.1"
+    slash "^1.0.0"
     source-map "^0.6.0"
 
-jest-validate@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.0.1.tgz#cd9f01a89d26bb885f12a8667715e9c865a5754f"
+jest-validate@^23.0.0, jest-validate@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.4.0.tgz#d96eede01ef03ac909c009e9c8e455197d48c201"
+  integrity sha1-2W7t4B7wOskJwAnpyORVGX1IwgE=
   dependencies:
     chalk "^2.0.1"
     jest-get-type "^22.1.0"
     leven "^2.1.0"
-    pretty-format "^23.0.1"
+    pretty-format "^23.2.0"
 
-jest-worker@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.0.1.tgz#9e649dd963ff4046026f91c4017f039a6aa4a7bc"
+jest-watcher@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
+  integrity sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    string-length "^2.0.0"
+
+jest-worker@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
+  integrity sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=
   dependencies:
     merge-stream "^1.0.1"
 
-jest@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-23.0.1.tgz#0d083290ee4112cecfb780df6ff81332ed373201"
+jest@^23.4.1:
+  version "23.4.1"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-23.4.1.tgz#39550c72f3237f63ae1b434d8d122cdf6fa007b6"
+  integrity sha512-HTOuA9epknN7RKdzhmp9qrbP0z3TibAMXI+sluLOcrEoF54ZCG8/urFB2DK/sOINcMeyX6epMUqka8i0+d0xOA==
   dependencies:
     import-local "^1.0.0"
-    jest-cli "^23.0.1"
+    jest-cli "^23.4.1"
 
 joi@^12.x:
   version "12.0.0"
   resolved "https://registry.yarnpkg.com/joi/-/joi-12.0.0.tgz#46f55e68f4d9628f01bbb695902c8b307ad8d33a"
+  integrity sha512-z0FNlV4NGgjQN1fdtHYXf5kmgludM65fG/JlXzU6+rwkt9U5UWuXVYnXa2FpK0u6+qBuCmrm5byPNuiiddAHvQ==
   dependencies:
     hoek "4.x.x"
     isemail "3.x.x"
@@ -3411,25 +4226,35 @@ joi@^12.x:
 js-base64@^2.1.9:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
+  integrity sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw==
 
 js-stringify@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+  integrity sha1-Fzb939lyTyijaCrcYjCufk6Weds=
 
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^2.6.0"
+"js-tokens@^3.0.0 || ^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@3.x, js-yaml@^3.7.0, js-yaml@^3.9.1:
+js-yaml@3.x, js-yaml@^3.9.0:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+  integrity sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.7.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -3437,6 +4262,7 @@ js-yaml@3.x, js-yaml@^3.7.0, js-yaml@^3.9.1:
 js-yaml@~3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+  integrity sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
@@ -3444,23 +4270,25 @@ js-yaml@~3.7.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsdom@^11.5.1:
-  version "11.10.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.10.0.tgz#a42cd54e88895dc765f03f15b807a474962ac3b5"
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.11.0.tgz#df486efad41aee96c59ad7a190e2449c7eb1110e"
+  integrity sha512-ou1VyfjwsSuWkudGxb03FotDajxAto6USAlmMZjE2lc0jCznt7sBWkhfRBRaWwbnmDqdMSTKTLT5d9sBFkkM7A==
   dependencies:
     abab "^1.0.4"
     acorn "^5.3.0"
     acorn-globals "^4.1.0"
     array-equal "^1.0.0"
     cssom ">= 0.3.2 < 0.4.0"
-    cssstyle ">= 0.2.37 < 0.3.0"
+    cssstyle ">= 0.3.1 < 0.4.0"
     data-urls "^1.0.0"
     domexception "^1.0.0"
     escodegen "^1.9.0"
     html-encoding-sniffer "^1.0.2"
     left-pad "^1.2.0"
-    nwmatcher "^1.4.3"
+    nwsapi "^2.0.0"
     parse5 "4.0.0"
     pn "^1.1.0"
     request "^2.83.0"
@@ -3472,63 +4300,107 @@ jsdom@^11.5.1:
     webidl-conversions "^4.0.2"
     whatwg-encoding "^1.0.3"
     whatwg-mimetype "^2.1.0"
-    whatwg-url "^6.4.0"
+    whatwg-url "^6.4.1"
     ws "^4.0.0"
     xml-name-validator "^3.0.0"
 
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
 json-loader@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
+  integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==
+
+json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
+json-schema-ref-parser@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-5.1.3.tgz#f86c5868f40898e69169e1bbc854725a4fd0e1ad"
+  integrity sha512-CpDFlBwz/6la78hZxyB9FECVKGYjIIl3Ms3KLqFj99W7IIb7D00/RDgc++IGB4BBALl0QRhh5m4q5WNSopvLtQ==
+  dependencies:
+    call-me-maybe "^1.0.1"
+    debug "^3.1.0"
+    js-yaml "^3.12.0"
+    ono "^4.0.6"
 
-json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+json-schema-to-typescript@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/json-schema-to-typescript/-/json-schema-to-typescript-6.0.1.tgz#31baac45a124b586d4021d12a5ea0ec07fddf294"
+  integrity sha512-IlR/sfKZ7Vb9+By4qQLFpegJQjTfqI7AXW5RBwjVm3D0EnvkHrSmGt2Bc95qL7XC/dWpx36ZvnMyKPazWwVe7g==
+  dependencies:
+    "@types/cli-color" "^0.3.29"
+    "@types/json-schema" "^7.0.0"
+    "@types/lodash" "^4.14.116"
+    "@types/minimist" "^1.2.0"
+    "@types/mz" "0.0.32"
+    "@types/node" "^10.9.4"
+    "@types/prettier" "^1.13.2"
+    cli-color "^1.3.0"
+    json-schema-ref-parser "^5.1.3"
+    json-stringify-safe "^5.0.1"
+    lodash "^4.17.11"
+    minimist "^1.2.0"
+    mz "^2.7.0"
+    prettier "^1.14.2"
+    stdin "0.0.1"
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
 json-stable-stringify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@~5.0.1:
+json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
@@ -3538,6 +4410,7 @@ jsprim@^1.2.2:
 jstransformer@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-0.0.2.tgz#7aae29a903d196cfa0973d885d3e47947ecd76ab"
+  integrity sha1-eq4pqQPRls+glz2IXT5HlH7Ndqs=
   dependencies:
     is-promise "^2.0.0"
     promise "^6.0.1"
@@ -3545,6 +4418,7 @@ jstransformer@0.0.2:
 jstransformer@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  integrity sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=
   dependencies:
     is-promise "^2.0.0"
     promise "^7.0.1"
@@ -3552,52 +4426,63 @@ jstransformer@1.0.0:
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+
+kleur@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-1.0.2.tgz#637f126d3cda40a423b1297da88cf753bd04ebdd"
+  integrity sha512-4u2TF1/mKmiawrkjzCxRKszdCvqRsPgTJwjmZZt0RE4OiZMzvFfb4kwqfFP/p0gvakH1lhQOfCMYXUOYI9dTgA==
 
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
-lcov-parse@0.0.10:
+lcov-parse@^0.0.10:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
+  integrity sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=
 
 lcov-parse@^1.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
-
-leb@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/leb/-/leb-0.3.0.tgz#32bee9fad168328d6aea8522d833f4180eed1da3"
+  integrity sha1-6w1GtUER68VhrLTECO+TY73I9+A=
 
 left-pad@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
+  integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
 
 less-loader@^4.0.3:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
+  integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==
   dependencies:
     clone "^2.1.1"
     loader-utils "^1.1.0"
@@ -3606,6 +4491,7 @@ less-loader@^4.0.3:
 less@^2.5.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b"
+  integrity sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==
   optionalDependencies:
     errno "^0.1.1"
     graceful-fs "^4.1.2"
@@ -3619,17 +4505,100 @@ less@^2.5.1:
 leven@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+  integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA=
 
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+lint-staged@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.2.0.tgz#bdf4bb7f2f37fe689acfaec9999db288a5b26888"
+  integrity sha512-jPoIMbmgtWMUrz/l0rhBVa1j6H71zr0rEoxDWBA333PZcaqBvELdg0Sf4tdGHlwrBM0GXaXMVgTRkLTm2vA7Jg==
+  dependencies:
+    app-root-path "^2.0.1"
+    chalk "^2.3.1"
+    commander "^2.14.1"
+    cosmiconfig "^5.0.2"
+    debug "^3.1.0"
+    dedent "^0.7.0"
+    execa "^0.9.0"
+    find-parent-dir "^0.3.0"
+    is-glob "^4.0.0"
+    is-windows "^1.0.2"
+    jest-validate "^23.0.0"
+    listr "^0.14.1"
+    lodash "^4.17.5"
+    log-symbols "^2.2.0"
+    micromatch "^3.1.8"
+    npm-which "^3.0.1"
+    p-map "^1.1.1"
+    path-is-inside "^1.0.2"
+    pify "^3.0.0"
+    please-upgrade-node "^3.0.2"
+    staged-git-files "1.1.1"
+    string-argv "^0.0.2"
+    stringify-object "^3.2.2"
+
+listr-silent-renderer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
+  integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
+
+listr-update-renderer@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.4.0.tgz#344d980da2ca2e8b145ba305908f32ae3f4cc8a7"
+  integrity sha1-NE2YDaLKLosUW6MFkI8yrj9MyKc=
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    elegant-spinner "^1.0.1"
+    figures "^1.7.0"
+    indent-string "^3.0.0"
+    log-symbols "^1.0.2"
+    log-update "^1.0.2"
+    strip-ansi "^3.0.1"
+
+listr-verbose-renderer@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35"
+  integrity sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=
+  dependencies:
+    chalk "^1.1.3"
+    cli-cursor "^1.0.2"
+    date-fns "^1.27.2"
+    figures "^1.7.0"
+
+listr@^0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.1.tgz#8a7afa4a7135cee4c921d128e0b7dfc6e522d43d"
+  integrity sha512-MSMUUVN1f8aRnPi4034RkOqdiUlpYW+FqwFE3aL0uYNPRavkt2S2SsSpDDofn8BDpqv2RNnsdOcCHWsChcq77A==
+  dependencies:
+    "@samverschueren/stream-to-observable" "^0.3.0"
+    cli-truncate "^0.2.1"
+    figures "^1.7.0"
+    indent-string "^2.1.0"
+    is-observable "^1.1.0"
+    is-promise "^2.1.0"
+    is-stream "^1.1.0"
+    listr-silent-renderer "^1.1.1"
+    listr-update-renderer "^0.4.0"
+    listr-verbose-renderer "^0.4.0"
+    log-symbols "^1.0.2"
+    log-update "^1.0.2"
+    ora "^0.2.3"
+    p-map "^1.1.1"
+    rxjs "^6.1.0"
+    strip-ansi "^3.0.1"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -3637,13 +4606,25 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
 loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+  integrity sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=
 
 loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
@@ -3652,6 +4633,7 @@ loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.1.0:
 loader-utils@~0.2.5:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
@@ -3661,6 +4643,7 @@ loader-utils@~0.2.5:
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -3668,100 +4651,139 @@ locate-path@^2.0.0:
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
 
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0:
+lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
-log-driver@1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"
+lodash@^4.17.11:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-log-driver@^1.x:
+log-driver@^1.2.7, log-driver@^1.x:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
+  integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==
 
-long@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
+log-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
+  dependencies:
+    chalk "^1.0.0"
+
+log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+  dependencies:
+    chalk "^2.0.1"
+
+log-update@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
+  integrity sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=
+  dependencies:
+    ansi-escapes "^1.0.0"
+    cli-cursor "^1.0.2"
 
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
+
+loose-envify@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
+loose-envify@^1.1.0, loose-envify@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  integrity sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=
   dependencies:
     js-tokens "^3.0.0"
 
-lru-cache@^4.0.1:
+lru-cache@^4.0.1, lru-cache@^4.1.1:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-lru-cache@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
+lru-queue@0.1:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
+  integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=
   dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
+    es5-ext "~0.10.2"
 
 macaddress@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+  integrity sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=
 
 make-dir@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   dependencies:
     pify "^3.0.0"
 
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
   dependencies:
     tmpl "1.0.x"
 
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
+  integrity sha1-3oGf282E3M2PrlnGrreWFbnSZqw=
 
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
 
 md5.js@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  integrity sha1-6b296UogpawYsENA/Fdk1bCdkB0=
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -3769,16 +4791,33 @@ md5.js@^1.3.4:
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
   dependencies:
     mimic-fn "^1.0.0"
 
+memoizee@^0.4.14:
+  version "0.4.14"
+  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.14.tgz#07a00f204699f9a95c2d9e77218271c7cd610d57"
+  integrity sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==
+  dependencies:
+    d "1"
+    es5-ext "^0.10.45"
+    es6-weak-map "^2.0.2"
+    event-emitter "^0.3.5"
+    is-promise "^2.1"
+    lru-queue "0.1"
+    next-tick "1"
+    timers-ext "^0.1.5"
+
 memory-fs@^0.4.0, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
@@ -3786,24 +4825,29 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
 merge-stream@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
   dependencies:
     readable-stream "^2.0.1"
 
-merge@^1.1.3:
+merge@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+  integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
 
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
 micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -3822,6 +4866,7 @@ micromatch@^2.3.11:
 micromatch@^3.1.4, micromatch@^3.1.8:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -3840,6 +4885,7 @@ micromatch@^3.1.4, micromatch@^3.1.8:
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
@@ -3847,67 +4893,105 @@ miller-rabin@^4.0.0:
 mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+  integrity sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.6, mime-types@~2.1.7:
+mime-db@~1.35.0:
+  version "1.35.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47"
+  integrity sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==
+
+mime-db@~1.36.0:
+  version "1.36.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
+
+mime-types@^2.1.12, mime-types@~2.1.17:
+  version "2.1.19"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.19.tgz#71e464537a7ef81c15f2db9d97e913fc0ff606f0"
+  integrity sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==
+  dependencies:
+    mime-db "~1.35.0"
+
+mime-types@~2.1.18, mime-types@~2.1.6, mime-types@~2.1.7:
   version "2.1.18"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  integrity sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==
   dependencies:
     mime-db "~1.33.0"
 
+mime-types@~2.1.19:
+  version "2.1.20"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
+  dependencies:
+    mime-db "~1.36.0"
+
 mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
+  integrity sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=
 
 mime@^1.2.11, mime@^1.4.1, mime@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 minimalistic-assert@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
 "minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0:
+minimist@^1.1.1, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.2.4:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.1.tgz#4e872b959131a672837ab3cb554962bc84b1537d"
+minipass@^2.2.1, minipass@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
+  integrity sha512-/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==
   dependencies:
-    safe-buffer "^5.1.1"
+    safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
 minizlib@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
   dependencies:
     minipass "^2.2.1"
 
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
+  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -3923,6 +5007,7 @@ mississippi@^2.0.0:
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -3930,12 +5015,14 @@ mixin-deep@^1.2.0:
 mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
   dependencies:
     aproba "^1.1.1"
     copy-concurrently "^1.0.0"
@@ -3947,29 +5034,42 @@ move-concurrently@^1.0.1:
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
+  integrity sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=
 
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
+mz@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
 
 nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+  integrity sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==
 
 nanomatch@^1.2.9:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
     fragment-cache "^0.2.1"
-    is-odd "^2.0.0"
     is-windows "^1.0.2"
     kind-of "^6.0.2"
     object.pick "^1.3.0"
@@ -3980,10 +5080,12 @@ nanomatch@^1.2.9:
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-needle@^2.2.0:
+needle@^2.2.0, needle@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
+  integrity sha512-t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==
   dependencies:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
@@ -3992,14 +5094,27 @@ needle@^2.2.0:
 negotiator@0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.5.3.tgz#269d5c476810ec92edbe7b6c2f28316384f9a7e8"
+  integrity sha1-Jp1cR2gQ7JLtvntsLygxY4T5p+g=
 
 neo-async@^2.5.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
+  integrity sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==
+
+next-tick@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
   dependencies:
     encoding "^0.1.11"
     is-stream "^1.0.1"
@@ -4007,10 +5122,12 @@ node-fetch@^1.0.1:
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
 node-libs-browser@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  integrity sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.2.0"
@@ -4039,6 +5156,7 @@ node-libs-browser@^2.0.0:
 node-notifier@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea"
+  integrity sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==
   dependencies:
     growly "^1.3.0"
     semver "^5.4.1"
@@ -4046,16 +5164,17 @@ node-notifier@^5.2.1:
     which "^1.3.0"
 
 node-pre-gyp@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz#6e4ef5bb5c5203c6552448828c852c40111aac46"
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
-    needle "^2.2.0"
+    needle "^2.2.1"
     nopt "^4.0.1"
     npm-packlist "^1.1.6"
     npmlog "^4.0.2"
-    rc "^1.1.7"
+    rc "^1.2.7"
     rimraf "^2.6.1"
     semver "^5.3.0"
     tar "^4"
@@ -4063,6 +5182,7 @@ node-pre-gyp@^0.10.0:
 node-pre-gyp@^0.9.0:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0"
+  integrity sha1-8RwHUW3ZL4cZnbx+GDjqt81WyeA=
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -4078,12 +5198,14 @@ node-pre-gyp@^0.9.0:
 nopt@3.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
@@ -4091,6 +5213,7 @@ nopt@^4.0.1:
 normalize-package-data@^2.3.2:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -4100,16 +5223,19 @@ normalize-package-data@^2.3.2:
 normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
 normalize-url@^1.4.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
   dependencies:
     object-assign "^4.0.1"
     prepend-http "^1.0.0"
@@ -4119,23 +5245,43 @@ normalize-url@^1.4.0:
 npm-bundled@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+  integrity sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==
 
 npm-packlist@^1.1.6:
   version "1.1.10"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
+  integrity sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
+npm-path@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
+  integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==
+  dependencies:
+    which "^1.2.10"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
+npm-which@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa"
+  integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=
+  dependencies:
+    commander "^2.9.0"
+    npm-path "^2.0.2"
+    which "^1.2.10"
+
 npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -4145,44 +5291,58 @@ npmlog@^4.0.2:
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-nwmatcher@^1.4.3:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
+nwsapi@^2.0.0:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.7.tgz#6fc54c254621f10cac5225b76e81c74120139b78"
+  integrity sha512-VZXniaaaORAXGCNsvUNefsKRQYk8zCzQZ57jalgrpHcU70OrAzKAiN/3plYtH/VPRmZeYyUzQiYfKzcMXC1g5Q==
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.8:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+object-keys@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
+  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
@@ -4190,6 +5350,7 @@ object.getownpropertydescriptors@^2.0.3:
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
@@ -4197,30 +5358,47 @@ object.omit@^2.0.0:
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
 once@1.x, once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
+onetime@^1.0.0:
+  version "1.1.0"
+  resolved "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
+
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
     mimic-fn "^1.0.0"
 
+ono@^4.0.6:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/ono/-/ono-4.0.8.tgz#d1b12e048cd8a9fe5d2fbf69d3ad42bf7b0feb5e"
+  integrity sha512-x7IM7JLrarP9WxfjDHTBs6io1D1ixEZnhKqnjMnwz+9waPZSapkGYe7jBAqnMTL+HAMfsN6rSHW3Pi+C/9dyjg==
+  dependencies:
+    format-util "^1.0.3"
+
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -4228,12 +5406,14 @@ optimist@^0.6.1:
 optimist@~0.3.5:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
+  integrity sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=
   dependencies:
     wordwrap "~0.0.2"
 
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -4242,17 +5422,30 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
+ora@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
+  integrity sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=
+  dependencies:
+    chalk "^1.1.1"
+    cli-cursor "^1.0.2"
+    cli-spinners "^0.1.2"
+    object-assign "^4.0.1"
+
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
   dependencies:
     execa "^0.7.0"
     lcid "^1.0.0"
@@ -4261,10 +5454,12 @@ os-locale@^2.0.0:
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -4272,30 +5467,41 @@ osenv@^0.1.4:
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-limit@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
+p-map@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
   dependencies:
     cyclist "~0.2.2"
     inherits "^2.0.3"
@@ -4304,6 +5510,7 @@ parallel-transform@^1.1.0:
 parse-asn1@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -4314,6 +5521,7 @@ parse-asn1@^5.0.0:
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -4323,70 +5531,100 @@ parse-glob@^3.0.4:
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
 parseurl@~1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
-path-key@^2.0.0:
+path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+  integrity sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=
 
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
+  dependencies:
+    pify "^3.0.0"
+
 pbkdf2@^3.0.3:
   version "3.0.16"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
+  integrity sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -4397,54 +5635,73 @@ pbkdf2@^3.0.3:
 performance-now@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+  integrity sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=
 
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
   dependencies:
     find-up "^2.1.0"
 
 platform@^1.3.3:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.5.tgz#fb6958c696e07e2918d2eeda0f0bc9448d733444"
+  integrity sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==
+
+please-upgrade-node@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.0.2.tgz#7b9eaeca35aa4a43d6ebdfd10616c042f9a83acc"
+  integrity sha512-bslfSeW+ksUbB/sYZeEdKFyTG4YWU9YKRvqfSRvZKE675khAuBUPqV5RUwJZaGuWmVQLweK45Q+lPHFVnSlSug==
+  dependencies:
+    semver-compare "^1.0.0"
 
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
 
 pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-calc@^5.2.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  integrity sha1-d7rnypKK2FcW4v2kLyYb98HWW14=
   dependencies:
     postcss "^5.0.2"
     postcss-message-helpers "^2.0.0"
@@ -4453,6 +5710,7 @@ postcss-calc@^5.2.0:
 postcss-colormin@^2.1.8:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
+  integrity sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=
   dependencies:
     colormin "^1.0.5"
     postcss "^5.0.13"
@@ -4461,6 +5719,7 @@ postcss-colormin@^2.1.8:
 postcss-convert-values@^2.3.4:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
+  integrity sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=
   dependencies:
     postcss "^5.0.11"
     postcss-value-parser "^3.1.2"
@@ -4468,30 +5727,35 @@ postcss-convert-values@^2.3.4:
 postcss-discard-comments@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+  integrity sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=
   dependencies:
     postcss "^5.0.14"
 
 postcss-discard-duplicates@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+  integrity sha1-uavye4isGIFYpesSq8riAmO5GTI=
   dependencies:
     postcss "^5.0.4"
 
 postcss-discard-empty@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+  integrity sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=
   dependencies:
     postcss "^5.0.14"
 
 postcss-discard-overridden@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
+  integrity sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=
   dependencies:
     postcss "^5.0.16"
 
 postcss-discard-unused@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
+  integrity sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=
   dependencies:
     postcss "^5.0.14"
     uniqs "^2.0.0"
@@ -4499,6 +5763,7 @@ postcss-discard-unused@^2.2.1:
 postcss-filter-plugins@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  integrity sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=
   dependencies:
     postcss "^5.0.4"
     uniqid "^4.0.0"
@@ -4506,6 +5771,7 @@ postcss-filter-plugins@^2.0.0:
 postcss-merge-idents@^2.1.5:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  integrity sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=
   dependencies:
     has "^1.0.1"
     postcss "^5.0.10"
@@ -4514,12 +5780,14 @@ postcss-merge-idents@^2.1.5:
 postcss-merge-longhand@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+  integrity sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=
   dependencies:
     postcss "^5.0.4"
 
 postcss-merge-rules@^2.0.3:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+  integrity sha1-0d9d+qexrMO+VT8OnhDofGG19yE=
   dependencies:
     browserslist "^1.5.2"
     caniuse-api "^1.5.2"
@@ -4530,10 +5798,12 @@ postcss-merge-rules@^2.0.3:
 postcss-message-helpers@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+  integrity sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=
 
 postcss-minify-font-values@^1.0.2:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+  integrity sha1-S1jttWZB66fIR0qzUmyv17vey2k=
   dependencies:
     object-assign "^4.0.1"
     postcss "^5.0.4"
@@ -4542,6 +5812,7 @@ postcss-minify-font-values@^1.0.2:
 postcss-minify-gradients@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+  integrity sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=
   dependencies:
     postcss "^5.0.12"
     postcss-value-parser "^3.3.0"
@@ -4549,6 +5820,7 @@ postcss-minify-gradients@^1.0.1:
 postcss-minify-params@^1.0.4:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
+  integrity sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=
   dependencies:
     alphanum-sort "^1.0.1"
     postcss "^5.0.2"
@@ -4558,6 +5830,7 @@ postcss-minify-params@^1.0.4:
 postcss-minify-selectors@^2.0.4:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
+  integrity sha1-ssapjAByz5G5MtGkllCBFDEXNb8=
   dependencies:
     alphanum-sort "^1.0.2"
     has "^1.0.1"
@@ -4567,12 +5840,14 @@ postcss-minify-selectors@^2.0.4:
 postcss-modules-extract-imports@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
+  integrity sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=
   dependencies:
     postcss "^6.0.1"
 
 postcss-modules-local-by-default@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
+  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
@@ -4580,6 +5855,7 @@ postcss-modules-local-by-default@^1.2.0:
 postcss-modules-scope@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
+  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
@@ -4587,6 +5863,7 @@ postcss-modules-scope@^1.1.0:
 postcss-modules-values@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
+  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
   dependencies:
     icss-replace-symbols "^1.1.0"
     postcss "^6.0.1"
@@ -4594,12 +5871,14 @@ postcss-modules-values@^1.3.0:
 postcss-normalize-charset@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+  integrity sha1-757nEhLX/nWceO0WL2HtYrXLk/E=
   dependencies:
     postcss "^5.0.5"
 
 postcss-normalize-url@^3.0.7:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+  integrity sha1-EI90s/L82viRov+j6kWSJ5/HgiI=
   dependencies:
     is-absolute-url "^2.0.0"
     normalize-url "^1.4.0"
@@ -4609,6 +5888,7 @@ postcss-normalize-url@^3.0.7:
 postcss-ordered-values@^2.1.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+  integrity sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=
   dependencies:
     postcss "^5.0.4"
     postcss-value-parser "^3.0.1"
@@ -4616,6 +5896,7 @@ postcss-ordered-values@^2.1.0:
 postcss-reduce-idents@^2.2.2:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+  integrity sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=
   dependencies:
     postcss "^5.0.4"
     postcss-value-parser "^3.0.2"
@@ -4623,12 +5904,14 @@ postcss-reduce-idents@^2.2.2:
 postcss-reduce-initial@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+  integrity sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=
   dependencies:
     postcss "^5.0.4"
 
 postcss-reduce-transforms@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+  integrity sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=
   dependencies:
     has "^1.0.1"
     postcss "^5.0.8"
@@ -4637,6 +5920,7 @@ postcss-reduce-transforms@^1.0.3:
 postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  integrity sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=
   dependencies:
     flatten "^1.0.2"
     indexes-of "^1.0.1"
@@ -4645,6 +5929,7 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
 postcss-svgo@^2.1.1:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+  integrity sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=
   dependencies:
     is-svg "^2.0.0"
     postcss "^5.0.14"
@@ -4654,6 +5939,7 @@ postcss-svgo@^2.1.1:
 postcss-unique-selectors@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+  integrity sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=
   dependencies:
     alphanum-sort "^1.0.1"
     postcss "^5.0.4"
@@ -4662,10 +5948,12 @@ postcss-unique-selectors@^2.0.2:
 postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+  integrity sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=
 
 postcss-zindex@^2.0.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+  integrity sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=
   dependencies:
     has "^1.0.1"
     postcss "^5.0.4"
@@ -4674,6 +5962,7 @@ postcss-zindex@^2.0.1:
 postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
   version "5.2.18"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
+  integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==
   dependencies:
     chalk "^1.1.3"
     js-base64 "^2.1.9"
@@ -4681,32 +5970,43 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     supports-color "^3.2.3"
 
 postcss@^6.0.1:
-  version "6.0.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.21.tgz#8265662694eddf9e9a5960db6da33c39e4cd069d"
+  version "6.0.22"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.22.tgz#e23b78314905c3b90cbd61702121e7a78848f2a3"
+  integrity sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==
   dependencies:
-    chalk "^2.3.2"
+    chalk "^2.4.1"
     source-map "^0.6.1"
-    supports-color "^5.3.0"
+    supports-color "^5.4.0"
 
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 prepend-http@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
-prettier@^1.13.5:
-  version "1.13.5"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.5.tgz#7ae2076998c8edce79d63834e9b7b09fead6bfd0"
+prettier@^1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.0.tgz#847c235522035fd988100f1f43cf20a7d24f9372"
+  integrity sha512-KtQ2EGaUwf2EyDfp1fxyEb0PqGKakVm0WyXwDt6u+cAoxbO2Z2CwKvOe3+b4+F2IlO9lYHi1kqFuRM70ddBnow==
 
-pretty-format@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.0.1.tgz#d61d065268e4c759083bccbca27a01ad7c7601f4"
+prettier@^1.14.2:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.2.tgz#0ac1c6e1a90baa22a62925f41963c841983282f9"
+  integrity sha512-McHPg0n1pIke+A/4VcaS2en+pTNjy4xF+Uuq86u/5dyDO59/TtFZtQ708QIRkEZ3qwKz3GVkVa6mpxK/CpB8Rg==
+
+pretty-format@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.2.0.tgz#3b0aaa63c018a53583373c1cb3a5d96cc5e83017"
+  integrity sha1-OwqqY8AYpTWDNzwcs6XZbMXoMBc=
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
@@ -4714,44 +6014,61 @@ pretty-format@^23.0.1:
 private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
+  integrity sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=
 
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/promise/-/promise-6.1.0.tgz#2ce729f6b94b45c26891ad0602c5c90e04c6eef6"
+  integrity sha1-LOcp9rlLRcJoka0GAsXJDgTG7vY=
   dependencies:
     asap "~1.0.0"
 
 promise@^7.0.1, promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
   dependencies:
     asap "~2.0.3"
 
 promise@~2.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/promise/-/promise-2.0.0.tgz#46648aa9d605af5d2e70c3024bf59436da02b80e"
+  integrity sha1-RmSKqdYFr10ucMMCS/WUNtoCuA4=
   dependencies:
     is-promise "~1"
 
+prompts@^0.1.9:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-0.1.12.tgz#39dc42de7d2f0ec3e2af76bf40713fcb8726090d"
+  integrity sha512-pgR1GE1JM8q8UsHVIgjdK62DPwvrf0kvaKWJ/mfMoCm2lwfIReX/giQ1p0AlMoUXNhQap/8UiOdqi3bOROm/eg==
+  dependencies:
+    kleur "^1.0.0"
+    sisteransi "^0.1.1"
+
 prop-types@^15.5.10:
   version "15.6.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
+  integrity sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.3.1"
@@ -4760,6 +6077,7 @@ prop-types@^15.5.10:
 proxy-addr@~1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.0.10.tgz#0d40a82f801fc355567d2ecb65efe3f077f121c5"
+  integrity sha1-DUCoL4Afw1VWfS7LZe/j8HfxIcU=
   dependencies:
     forwarded "~0.1.0"
     ipaddr.js "1.0.5"
@@ -4767,14 +6085,22 @@ proxy-addr@~1.0.10:
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+
+psl@^1.1.24:
+  version "1.1.28"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.28.tgz#4fb6ceb08a1e2214d4fd4de0ca22dae13740bc7b"
+  integrity sha512-+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw==
 
 public-encrypt@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
+  integrity sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
@@ -4785,6 +6111,7 @@ public-encrypt@^4.0.0:
 pug-attrs@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.3.tgz#a3095f970e64151f7bdad957eef55fb5d7905d15"
+  integrity sha1-owlflw5kFR972tlX7vVftdeQXRU=
   dependencies:
     constantinople "^3.0.1"
     js-stringify "^1.0.1"
@@ -4793,6 +6120,7 @@ pug-attrs@^2.0.3:
 pug-code-gen@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.1.tgz#0951ec83225d74d8cfc476a7f99a259b5f7d050c"
+  integrity sha1-CVHsgyJddNjPxHan+Zolm199BQw=
   dependencies:
     constantinople "^3.0.1"
     doctypes "^1.1.0"
@@ -4806,10 +6134,12 @@ pug-code-gen@^2.0.1:
 pug-error@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
+  integrity sha1-U659nSm7A89WRJOgJhCfVMR/XyY=
 
 pug-filters@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-3.1.0.tgz#27165555bc04c236e4aa2b0366246dfa021b626e"
+  integrity sha1-JxZVVbwEwjbkqisDZiRt+gIbYm4=
   dependencies:
     clean-css "^4.1.11"
     constantinople "^3.0.1"
@@ -4822,6 +6152,7 @@ pug-filters@^3.1.0:
 pug-lexer@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-4.0.0.tgz#210c18457ef2e1760242740c5e647bd794cec278"
+  integrity sha1-IQwYRX7y4XYCQnQMXmR715TOwng=
   dependencies:
     character-parser "^2.1.1"
     is-expression "^3.0.0"
@@ -4830,6 +6161,7 @@ pug-lexer@^4.0.0:
 pug-linker@^3.0.5:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.5.tgz#9e9a7ae4005682d027deeb96b000f88eeb83a02f"
+  integrity sha1-npp65ABWgtAn3uuWsAD4juuDoC8=
   dependencies:
     pug-error "^1.3.2"
     pug-walk "^1.1.7"
@@ -4837,6 +6169,7 @@ pug-linker@^3.0.5:
 pug-load@^2.0.11:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.11.tgz#e648e57ed113fe2c1f45d57858ea2bad6bc01527"
+  integrity sha1-5kjlftET/iwfRdV4WOorrWvAFSc=
   dependencies:
     object-assign "^4.1.0"
     pug-walk "^1.1.7"
@@ -4844,6 +6177,7 @@ pug-load@^2.0.11:
 pug-loader@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/pug-loader/-/pug-loader-2.4.0.tgz#18eebdda045d9c31c2856f1cc3ceb8d3df7ca49a"
+  integrity sha512-cD4bU2wmkZ1EEVyu0IfKOsh1F26KPva5oglO1Doc3knx8VpBIXmFHw16k9sITYIjQMCnRv1vb4vfQgy7VdR6eg==
   dependencies:
     loader-utils "^1.1.0"
     pug-walk "^1.0.0"
@@ -4852,6 +6186,7 @@ pug-loader@^2.4.0:
 pug-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-5.0.0.tgz#e394ad9b3fca93123940aff885c06e44ab7e68e4"
+  integrity sha1-45Stmz/KkxI5QK/4hcBuRKt+aOQ=
   dependencies:
     pug-error "^1.3.2"
     token-stream "0.0.1"
@@ -4859,20 +6194,24 @@ pug-parser@^5.0.0:
 pug-runtime@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.4.tgz#e178e1bda68ab2e8c0acfc9bced2c54fd88ceb58"
+  integrity sha1-4XjhvaaKsujArPybztLFT9iM61g=
 
 pug-strip-comments@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.3.tgz#f1559592206edc6f85310dacf4afb48a025af59f"
+  integrity sha1-8VWVkiBu3G+FMQ2s9K+0igJa9Z8=
   dependencies:
     pug-error "^1.3.2"
 
 pug-walk@^1.0.0, pug-walk@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.7.tgz#c00d5c5128bac5806bec15d2b7e7cdabe42531f3"
+  integrity sha1-wA1cUSi6xYBr7BXSt+fNq+QlMfM=
 
 pug@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.3.tgz#71cba82537c95a5eab7ed04696e4221f53aa878e"
+  integrity sha1-ccuoJTfJWl6rftBGluQiH1Oqh44=
   dependencies:
     pug-code-gen "^2.0.1"
     pug-filters "^3.1.0"
@@ -4886,53 +6225,69 @@ pug@^2.0.3:
 pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
 pumpify@^1.3.3:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
-    duplexify "^3.5.3"
+    duplexify "^3.6.0"
     inherits "^2.0.3"
     pump "^2.0.0"
 
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
-punycode@2.x.x, punycode@^2.1.0:
+punycode@2.x.x:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
+  integrity sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=
 
 punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+pupa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pupa/-/pupa-1.0.0.tgz#9a9568a5af7e657b8462a6e9d5328743560ceff6"
+  integrity sha1-mpVopa9+ZXuEYqbp1TKHQ1YM7/Y=
 
 q@^1.1.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qs@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-4.0.0.tgz#c31d9b74ec27df75e543a86c78728ed8d4623607"
-
-qs@~6.3.0:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
+  integrity sha1-wx2bdOwn33XlQ6hseHKO2NRiNgc=
 
 qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+  integrity sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=
 
-qs@~6.5.1:
+qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
   dependencies:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
@@ -4940,14 +6295,17 @@ query-string@^4.1.0:
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 randomatic@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
+  integrity sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==
   dependencies:
     is-number "^4.0.0"
     kind-of "^6.0.0"
@@ -4956,12 +6314,14 @@ randomatic@^3.0.0:
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
   dependencies:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
@@ -4969,20 +6329,24 @@ randomfill@^1.0.3:
 range-parser@^1.0.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
 range-parser@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.0.3.tgz#6872823535c692e2c2a0103826afd82c2e0ff175"
+  integrity sha1-aHKCNTXGkuLCoBA4Jq/YLC4P8XU=
 
 raw-loader@~0.5.0, raw-loader@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
+  integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
 
-rc@^1.1.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.7.tgz#8a10ca30d588d00464360372b890d06dacd02297"
+rc@^1.1.7, rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
-    deep-extend "^0.5.1"
+    deep-extend "^0.6.0"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
@@ -4990,6 +6354,7 @@ rc@^1.1.7:
 react-dom@^15.2.1:
   version "15.6.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
+  integrity sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=
   dependencies:
     fbjs "^0.8.9"
     loose-envify "^1.1.0"
@@ -4999,6 +6364,7 @@ react-dom@^15.2.1:
 react@^15.2.1:
   version "15.6.2"
   resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
+  integrity sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=
   dependencies:
     create-react-class "^15.6.0"
     fbjs "^0.8.9"
@@ -5009,6 +6375,7 @@ react@^15.2.1:
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -5016,14 +6383,25 @@ read-pkg-up@^1.0.1:
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3:
+read-pkg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
+  dependencies:
+    load-json-file "^4.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^3.0.0"
+
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -5036,6 +6414,7 @@ read-pkg@^1.0.0:
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  integrity sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=
   dependencies:
     graceful-fs "^4.1.2"
     minimatch "^3.0.2"
@@ -5043,14 +6422,16 @@ readdirp@^2.0.0:
     set-immediate-shim "^1.0.1"
 
 realpath-native@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.0.tgz#7885721a83b43bd5327609f0ddecb2482305fdf0"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.1.tgz#07f40a0cce8f8261e2e8b7ebebf5c95965d7b633"
+  integrity sha512-W14EcXuqUvKP8dkWkD7B95iMy77lpMnlFXbbk409bQtNCbeu0kvRE5reo+yIZ3JXxg6frbGsz2DLQ39lrCB40g==
   dependencies:
     util.promisify "^1.0.0"
 
 reduce-css-calc@^1.2.6:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
+  integrity sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=
   dependencies:
     balanced-match "^0.4.2"
     math-expression-evaluator "^1.2.14"
@@ -5059,37 +6440,44 @@ reduce-css-calc@^1.2.6:
 reduce-function-call@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
+  integrity sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=
   dependencies:
     balanced-match "^0.4.2"
 
 regenerate@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexpp@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
+regexpp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365"
+  integrity sha512-g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA==
 
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
@@ -5098,40 +6486,48 @@ regexpu-core@^1.0.0:
 regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
 
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
   dependencies:
     jsesc "~0.5.0"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+  integrity sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
 request-promise-core@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
+  integrity sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=
   dependencies:
     lodash "^4.13.1"
 
 request-promise-native@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
+  integrity sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=
   dependencies:
     request-promise-core "1.1.1"
     stealthy-require "^1.1.0"
@@ -5140,40 +6536,17 @@ request-promise-native@^1.0.5:
 request-promise@^4.x:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.2.tgz#d1ea46d654a6ee4f8ee6a4fea1018c22911904b4"
+  integrity sha1-0epG1lSm7k+O5qT+oQGMIpEZBLQ=
   dependencies:
     bluebird "^3.5.0"
     request-promise-core "1.1.1"
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request@2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
 request@2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  integrity sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=
   dependencies:
     aws-sign2 "~0.6.0"
     aws4 "^1.2.1"
@@ -5199,8 +6572,9 @@ request@2.81.0:
     uuid "^3.0.0"
 
 request@^2.83.0:
-  version "2.86.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.86.0.tgz#2b9497f449b0a32654c081a5cf426bbfb5bf5b69"
+  version "2.87.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
+  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -5210,7 +6584,6 @@ request@^2.83.0:
     forever-agent "~0.6.1"
     form-data "~2.3.1"
     har-validator "~5.0.3"
-    hawk "~6.0.2"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
@@ -5224,17 +6597,51 @@ request@^2.83.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
+request@^2.85.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-from-string@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 require-uncached@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
   dependencies:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
@@ -5242,34 +6649,56 @@ require-uncached@^1.0.3:
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
   dependencies:
     resolve-from "^3.0.0"
 
 resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
 
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@1.1.7, resolve@1.1.x:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.3:
+resolve@^1.1.6, resolve@^1.1.7:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
+  integrity sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==
+  dependencies:
+    path-parse "^1.0.5"
+
+resolve@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
+  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
   dependencies:
     path-parse "^1.0.5"
 
+restore-cursor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+  integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=
+  dependencies:
+    exit-hook "^1.0.0"
+    onetime "^1.0.0"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -5277,22 +6706,26 @@ restore-cursor@^2.0.0:
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
   dependencies:
     align-text "^0.1.1"
 
 rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -5300,46 +6733,62 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
 rsvp@^3.3.3:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
 
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
   dependencies:
     is-promise "^2.1.0"
 
+run-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
+  integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==
+
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
   dependencies:
     aproba "^1.1.1"
 
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+rxjs@^5.5.2:
+  version "5.5.11"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87"
+  integrity sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==
   dependencies:
-    rx-lite "*"
+    symbol-observable "1.0.1"
 
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+rxjs@^6.1.0:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9"
+  integrity sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==
+  dependencies:
+    tslib "^1.9.0"
 
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sane@^2.0.0:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
+  integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o=
   dependencies:
     anymatch "^2.0.0"
     capture-exit "^1.2.0"
@@ -5355,16 +6804,19 @@ sane@^2.0.0:
 sax@^1.2.4, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
 schema-utils@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=
   dependencies:
     ajv "^5.0.0"
 
 schema-utils@^0.4.0, schema-utils@^0.4.4, schema-utils@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
+  integrity sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==
   dependencies:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
@@ -5372,16 +6824,29 @@ schema-utils@^0.4.0, schema-utils@^0.4.4, schema-utils@^0.4.5:
 script-loader@~0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/script-loader/-/script-loader-0.7.2.tgz#2016db6f86f25f5cf56da38915d83378bb166ba7"
+  integrity sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA==
   dependencies:
     raw-loader "~0.5.1"
 
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+  integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
+
+semver@^5.5.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
 send@0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.13.1.tgz#a30d5f4c82c8a9bae9ad00a1d9b1bdbe6f199ed7"
+  integrity sha1-ow1fTILIqbrprQCh2bG9vm8Zntc=
   dependencies:
     debug "~2.2.0"
     depd "~1.1.0"
@@ -5399,6 +6864,7 @@ send@0.13.1:
 send@0.13.2:
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.13.2.tgz#765e7607c8055452bba6f0b052595350986036de"
+  integrity sha1-dl52B8gFVFK7pvCwUllTUJhgNt4=
   dependencies:
     debug "~2.2.0"
     depd "~1.1.0"
@@ -5416,10 +6882,12 @@ send@0.13.2:
 serialize-javascript@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
+  integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
 
 serve-static@~1.10.2:
   version "1.10.3"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.10.3.tgz#ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"
+  integrity sha1-zlpuzTEB/tXsCYJ9rCKpwpv7BTU=
   dependencies:
     escape-html "~1.0.3"
     parseurl "~1.3.1"
@@ -5428,14 +6896,17 @@ serve-static@~1.10.2:
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -5445,6 +6916,7 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -5454,10 +6926,12 @@ set-value@^2.0.0:
 setimmediate@^1.0.4, setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -5465,40 +6939,63 @@ sha.js@^2.4.0, sha.js@^2.4.8:
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
 simple-git@^1.65.0:
   version "1.92.0"
   resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.92.0.tgz#6061468eb7d19f0141078fc742e62457e910f547"
+  integrity sha1-YGFGjrfRnwFBB4/HQuYkV+kQ9Uc=
   dependencies:
     debug "^3.1.0"
 
+sisteransi@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
+  integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
 
 slice-ansi@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+  integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -5507,12 +7004,14 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -5526,28 +7025,26 @@ snapdragon@^0.8.1:
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
   dependencies:
     hoek "2.x.x"
 
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  dependencies:
-    hoek "4.x.x"
-
 sort-keys@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
   dependencies:
     is-plain-obj "^1.0.0"
 
 source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+  integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==
 
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -5558,12 +7055,14 @@ source-map-resolve@^0.5.0:
 source-map-support@^0.4.15:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
   dependencies:
     source-map "^0.5.6"
 
 source-map-support@^0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
+  integrity sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -5571,36 +7070,43 @@ source-map-support@^0.5.6:
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@0.4.x, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 source-map@~0.1.7:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
+  integrity sha1-2rc/vPwrqBm03gO9b26qSBZLP50=
   dependencies:
     amdefine ">=0.0.4"
 
 spdx-correct@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
+  integrity sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -5608,10 +7114,12 @@ spdx-correct@^3.0.0:
 spdx-exceptions@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+  integrity sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
@@ -5619,25 +7127,30 @@ spdx-expression-parse@^3.0.0:
 spdx-license-ids@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
+  integrity sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
     dashdash "^1.12.0"
     getpass "^0.1.1"
+    safer-buffer "^2.0.2"
   optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
     ecc-jsbn "~0.1.1"
@@ -5647,16 +7160,24 @@ sshpk@^1.7.0:
 ssri@^5.2.4:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
+  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
   dependencies:
     safe-buffer "^5.1.1"
 
 stack-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
+  integrity sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=
+
+staged-git-files@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.1.tgz#37c2218ef0d6d26178b1310719309a16a59f8f7b"
+  integrity sha512-H89UNKr1rQJvI1c/PIR3kiAMBV23yvR7LItZiV74HWZwzt7f3YHuujJ9nJZlt58WlFox7XQsOahexwk7nTe69A==
 
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -5664,18 +7185,27 @@ static-extend@^0.1.1:
 statuses@1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 statuses@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.2.1.tgz#dded45cc18256d51ed40aec142489d5c61026d28"
+  integrity sha1-3e1FzBglbVHtQK7BQkidXGECbSg=
+
+stdin@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/stdin/-/stdin-0.0.1.tgz#d3041981aaec3dfdbc77a1b38d6372e38f5fb71e"
+  integrity sha1-0wQZgarsPf28d6GzjWNy449ftx4=
 
 stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -5683,46 +7213,58 @@ stream-browserify@^2.0.1:
 stream-each@^1.1.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd"
+  integrity sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==
   dependencies:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
 
 stream-http@^2.7.2:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.1.tgz#d0441be1a457a73a733a8a7b53570bebd9ef66a4"
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.2.tgz#4126e8c6b107004465918aa2fc35549e77402c87"
+  integrity sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
-    readable-stream "^2.3.3"
+    readable-stream "^2.3.6"
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
+string-argv@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
+  integrity sha1-2sMECGkMIfPDYwo/86BYd73L1zY=
 
 string-length@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
+  integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=
   dependencies:
     astral-regex "^1.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^1.0.1, string-width@^1.0.2:
+string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
@@ -5730,46 +7272,64 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
 string_decoder@^1.0.0, string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-object@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.2.tgz#9853052e5a88fb605a44cd27445aa257ad7ffbcd"
+  integrity sha512-O696NF21oLiDy8PhpWu8AEqoZHw++QW6mUv0UvKZe8gWSdSvMXkiLufK7OmnP27Dro4GU5kb9U7JIO0mBuCRQg==
+  dependencies:
+    get-own-enumerable-property-symbols "^2.0.1"
+    is-obj "^1.0.1"
+    is-regexp "^1.0.0"
+
 stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+  integrity sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-bom@3.0.0:
+strip-bom@3.0.0, strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
-strip-json-comments@~2.0.1:
+strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 style-loader@^0.19.1:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.1.tgz#591ffc80bcefe268b77c5d9ebc0505d772619f85"
+  integrity sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^0.3.0"
@@ -5777,28 +7337,33 @@ style-loader@^0.19.1:
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
-    has-flag "^2.0.0"
+    has-flag "^3.0.0"
 
-supports-color@^5.3.0:
+supports-color@^5.4.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
   dependencies:
     has-flag "^3.0.0"
 
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=
   dependencies:
     coa "~1.0.1"
     colors "~1.1.2"
@@ -5808,32 +7373,46 @@ svgo@^0.7.0:
     sax "~1.2.1"
     whet.extend "~0.9.9"
 
+symbol-observable@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
+  integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
+
+symbol-observable@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
+
 symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+  integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=
 
-table@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
+table@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
+  integrity sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==
   dependencies:
-    ajv "^5.2.3"
-    ajv-keywords "^2.1.0"
+    ajv "^6.0.1"
+    ajv-keywords "^3.0.0"
     chalk "^2.1.0"
     lodash "^4.17.4"
     slice-ansi "1.0.0"
     string-width "^2.1.1"
 
-tapable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
+tapable@^1.0.0, tapable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
+  integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==
 
 tar@^4:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.2.tgz#60685211ba46b38847b1ae7ee1a24d744a2cd462"
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd"
+  integrity sha512-mq9ixIYfNF9SK0IS/h2HKMu8Q2iaCuhDDsZhdEag/FHv8fOaYld4vN7ouMgcSSt5WKZzPs8atclTcJm36OTh4w==
   dependencies:
     chownr "^1.0.1"
     fs-minipass "^1.2.5"
-    minipass "^2.2.4"
+    minipass "^2.3.3"
     minizlib "^1.1.0"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
@@ -5842,6 +7421,7 @@ tar@^4:
 test-exclude@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
+  integrity sha512-qpqlP/8Zl+sosLxBcVKl9vYy26T9NPalxSzzCP/OY6K7j938ui2oKgo+kRZYfxAeIpLqpbVnsHq1tyV70E4lWQ==
   dependencies:
     arrify "^1.0.1"
     micromatch "^3.1.8"
@@ -5849,17 +7429,34 @@ test-exclude@^4.2.1:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
-text-table@~0.2.0:
+text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
+  integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=
+  dependencies:
+    any-promise "^1.0.0"
 
 throat@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+  integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
 
 through2@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
@@ -5867,44 +7464,61 @@ through2@^2.0.0:
 through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 time-stamp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
+  integrity sha1-lcakRTDhW6jW9KPsuMOj+sRto1c=
 
 timers-browserify@^2.0.4:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
   dependencies:
     setimmediate "^1.0.4"
 
+timers-ext@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.5.tgz#77147dd4e76b660c2abb8785db96574cbbd12922"
+  integrity sha512-tsEStd7kmACHENhsUPaxb8Jf8/+GZZxyNFQbZD07HQOyooOa6At1rQqjffgvg7n+dxscQa9cjjMdWhJtsP2sxg==
+  dependencies:
+    es5-ext "~0.10.14"
+    next-tick "1"
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -5912,6 +7526,7 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
@@ -5921,28 +7536,41 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 token-stream@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
+  integrity sha1-zu78cXp2xDFvEm0LnbqlXX598Bo=
 
 topo@2.x.x:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/topo/-/topo-2.0.2.tgz#cd5615752539057c0dc0491a621c3bc6fbe1d182"
+  integrity sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=
   dependencies:
     hoek "4.x.x"
 
-tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+  dependencies:
+    psl "^1.1.24"
+    punycode "^1.4.1"
+
+tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
   dependencies:
     punycode "^1.4.1"
 
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
   dependencies:
     punycode "^2.1.0"
 
 transformers@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/transformers/-/transformers-2.1.0.tgz#5d23cb35561dd85dc67fb8482309b47d53cce9a7"
+  integrity sha1-XSPLNVYd2F3Gf7hIIwm0fVPM6ac=
   dependencies:
     css "~1.0.8"
     promise "~2.0"
@@ -5951,38 +7579,41 @@ transformers@2.1.0:
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
 tslib@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
+  integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==
 
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
 type-is@~1.6.6:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.18"
@@ -5990,18 +7621,22 @@ type-is@~1.6.6:
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^2.9.0-dev.20180518:
-  version "2.9.0-dev.20180518"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.0-dev.20180518.tgz#7c709cb5d59e60a5e346cc5856277fd7b8ced68c"
+typescript@^3.0.0-rc:
+  version "3.0.0-rc"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.0-rc.tgz#13553808426d393d3f92c054f4fa6f24589549c1"
+  integrity sha512-//6ivFupDRi+rtsivXnYNfXK7URxdvO18hhxgNpbiIVBE611+1NCiiEfgjjx53TU7fjxlhWPuv3RRj5hJF62/w==
 
 ua-parser-js@^0.7.9:
-  version "0.7.17"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
+  version "0.7.18"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
+  integrity sha512-LtzwHlVHwFGTptfNSgezHp7WUlwiqb0gA9AALRbKaERfxwJoiX0A73QbTToxteIAuIaFshhgIZfqK8s7clqgnA==
 
 uglify-es@^3.3.4:
   version "3.3.9"
   resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
+  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
   dependencies:
     commander "~2.13.0"
     source-map "~0.6.1"
@@ -6009,6 +7644,7 @@ uglify-es@^3.3.4:
 uglify-js@^2.4.19, uglify-js@^2.6, uglify-js@^2.6.1:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
   dependencies:
     source-map "~0.5.1"
     yargs "~3.10.0"
@@ -6018,6 +7654,7 @@ uglify-js@^2.4.19, uglify-js@^2.6, uglify-js@^2.6.1:
 uglify-js@~2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.2.5.tgz#a6e02a70d839792b9780488b7b8b184c095c99c7"
+  integrity sha1-puAqcNg5eSuXgEiLe4sYTAlcmcc=
   dependencies:
     optimist "~0.3.5"
     source-map "~0.1.7"
@@ -6025,10 +7662,12 @@ uglify-js@~2.2.5:
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
 
 uglifyjs-webpack-plugin@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz#5eec941b2e9b8538be0a20fc6eda25b14c7c1043"
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz#57638dd99c853a1ebfe9d97b42160a8a507f9d00"
+  integrity sha512-1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA==
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"
@@ -6042,6 +7681,7 @@ uglifyjs-webpack-plugin@^1.2.4:
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
@@ -6051,36 +7691,43 @@ union-value@^1.0.0:
 uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
 uniqid@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
+  integrity sha1-iSIN32t1GuUrX3JISGNShZa7hME=
   dependencies:
     macaddress "^0.2.8"
 
 uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+  integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
 
 unique-filename@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
+  integrity sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=
   dependencies:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
+  integrity sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=
   dependencies:
     imurmurhash "^0.1.4"
 
 unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -6088,20 +7735,24 @@ unset-value@^1.0.0:
 upath@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.5.tgz#02cab9ecebe95bbec6d5fc2566325725ab6d1a73"
+  integrity sha512-qbKn90aDQ0YEwvXoLqj0oiuUYroLX2lVHZ+b+xwjozFasAOC4GneDq5+OaIG5Zj+jFmbz/uO+f7a9qxjktJQww==
 
-uri-js@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-3.0.2.tgz#f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"
+uri-js@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-loader@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7"
+  integrity sha512-h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q==
   dependencies:
     loader-utils "^1.0.2"
     mime "^1.4.1"
@@ -6110,23 +7761,25 @@ url-loader@^0.6.2:
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
 
 use@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544"
-  dependencies:
-    kind-of "^6.0.2"
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util.promisify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
   dependencies:
     define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
@@ -6134,26 +7787,36 @@ util.promisify@^1.0.0:
 util@0.10.3, util@^0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
 utils-merge@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
+  integrity sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=
 
-uuid@^3.0.0, uuid@^3.1.0:
+uuid@^3.0.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+  integrity sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==
+
+uuid@^3.1.0, uuid@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
 val-loader@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/val-loader/-/val-loader-1.1.0.tgz#ed91537424d62a4ded98e846ccf07367756bf506"
+  integrity sha512-8m62XF42FcfrBBl02rtDY9hQhDcDczrEcr60/aSMxlzJiXAcbAimRPvsDoDa5QcGAusOgOmVTpFtK5EbfZdDwA==
   dependencies:
     loader-utils "^1.0.0"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
+  integrity sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -6161,14 +7824,17 @@ validate-npm-package-license@^3.0.1:
 vary@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.0.1.tgz#99e4981566a286118dfb2b817357df7993376d10"
+  integrity sha1-meSYFWaihhGN+yuBc1ffeZM3bRA=
 
 vendors@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"
+  integrity sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -6177,38 +7843,45 @@ verror@1.10.0:
 vm-browserify@0.0.4, vm-browserify@~0.0.0:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
   dependencies:
     indexof "0.0.1"
 
 void-elements@^2.0.1, void-elements@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
 w3c-hr-time@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
   dependencies:
     browser-process-hrtime "^0.1.2"
 
 wabt@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wabt/-/wabt-1.0.0.tgz#f33a5c4a6405370ec80ba97e782d092f1d599ff4"
+  integrity sha512-Apt7rylKNS2VWMMYgY43aYStopVpc9wCJ16y0CznaWcJC2vs7BLVGAV6pffBqn28BfWYeYVA92zRwBstaq1zaA==
 
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
   dependencies:
     makeerror "1.0.x"
 
 wast-loader@^1.5.5:
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/wast-loader/-/wast-loader-1.5.7.tgz#1b165cef7225c70a7e82a50e4f8bf0bc1ec9f2fd"
+  integrity sha512-0lEkuNchI7oHLv5unScE/v4qAz4JWoxEMbKbjZ8yQyyGe/qEWDIT5mPIdr2N44XHAWGB0k3WG5OVrDSRuEn0Ug==
   dependencies:
     wabt "^1.0.0"
 
 watch@~0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
+  integrity sha1-KAlUdsbffJDJYxOJkMClQj60uYY=
   dependencies:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
@@ -6216,6 +7889,7 @@ watch@~0.18.0:
 watchpack@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
   dependencies:
     chokidar "^2.0.2"
     graceful-fs "^4.1.2"
@@ -6224,10 +7898,12 @@ watchpack@^1.5.0:
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
 webpack-dev-middleware@^1.9.0:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
+  integrity sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==
   dependencies:
     memory-fs "~0.4.1"
     mime "^1.5.0"
@@ -6235,9 +7911,10 @@ webpack-dev-middleware@^1.9.0:
     range-parser "^1.0.3"
     time-stamp "^2.0.0"
 
-webpack-sources@^1.0.1, webpack-sources@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
+webpack-sources@^1.1.0, webpack-sources@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
+  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
@@ -6245,20 +7922,24 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
+  integrity sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==
   dependencies:
     iconv-lite "0.4.19"
 
 whatwg-fetch@>=0.10.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
+  integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
 
 whatwg-mimetype@^2.0.0, whatwg-mimetype@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz#f0f21d76cbba72362eb609dbed2a30cd17fcc7d4"
+  integrity sha512-FKxhYLytBQiUKjkYteN71fAUA3g6KpNXoho1isLiLSB3N1G4F35Q5vUxWfKFhBwi5IWF27VE6WxhrnnC+m0Mew==
 
-whatwg-url@^6.4.0:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.1.tgz#fdb94b440fd4ad836202c16e9737d511f012fd67"
+whatwg-url@^6.4.0, whatwg-url@^6.4.1:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
+  integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^1.0.1"
@@ -6267,30 +7948,43 @@ whatwg-url@^6.4.0:
 whet.extend@~0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
+  integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.1.1, which@^1.2.12, which@^1.2.9, which@^1.3.0:
+which@^1.1.1, which@^1.2.10:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+  integrity sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^1.2.12, which@^1.2.9, which@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
-    string-width "^1.0.2"
+    string-width "^1.0.2 || 2"
 
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
 with@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
+  integrity sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4=
   dependencies:
     acorn "^3.1.0"
     acorn-globals "^3.0.0"
@@ -6298,6 +7992,7 @@ with@^5.0.0:
 with@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/with/-/with-4.0.3.tgz#eefd154e9e79d2c8d3417b647a8f14d9fecce14e"
+  integrity sha1-7v0VTp550sjTQXtkeo8U2f7M4U4=
   dependencies:
     acorn "^1.0.1"
     acorn-globals "^1.0.3"
@@ -6305,24 +8000,29 @@ with@~4.0.0:
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+  integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 worker-farm@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
   dependencies:
     errno "~0.1.7"
 
 worker-loader@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-1.1.1.tgz#920d74ddac6816fc635392653ed8b4af1929fd92"
+  integrity sha512-qJZLVS/jMCBITDzPo/RuweYSIG8VJP5P67mP/71alGyTZRe1LYJFdwLjLalY3T5ifx0bMDRD3OB6P2p1escvlg==
   dependencies:
     loader-utils "^1.0.0"
     schema-utils "^0.4.0"
@@ -6330,6 +8030,7 @@ worker-loader@^1.1.1:
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -6337,10 +8038,12 @@ wrap-ansi@^2.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -6349,12 +8052,14 @@ write-file-atomic@^2.1.0:
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
   dependencies:
     mkdirp "^0.5.1"
 
 ws@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"
+  integrity sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
@@ -6362,42 +8067,51 @@ ws@^4.0.0:
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
 xxhashjs@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
+  integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
   dependencies:
     cuint "^0.2.2"
 
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
 y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
 
 yargs-parser@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+  integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=
   dependencies:
     camelcase "^4.1.0"
 
 yargs@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.0.0.tgz#c052931006c5eee74610e5fc0354bedfd08a201b"
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
+  integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==
   dependencies:
     cliui "^4.0.0"
     decamelize "^1.1.1"
@@ -6415,6 +8129,7 @@ yargs@^11.0.0:
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
   dependencies:
     camelcase "^1.0.2"
     cliui "^2.1.0"