diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7af602ab91a..8967c8f0169 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,9 @@
 <!-- Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. -->
+<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
+<!-- Try to link to an open issue for more information. -->
+
+
+<!-- In addition to that please answer these questions: -->
 
 **What kind of change does this PR introduce?**
 
@@ -8,17 +13,11 @@
 
 <!-- Note that we won't merge your changes if you don't add tests -->
 
-**If relevant, link to documentation update:**
-
-<!-- Link PR from webpack/webpack.js.org here, or N/A -->
-
-**Summary**
-
-<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
-<!-- Try to link to an open issue for more information. -->
-
 **Does this PR introduce a breaking change?**
 
 <!-- If this PR introduces a breaking change, please describe the impact and a migration path for existing applications. -->
 
-**Other information**
+**What needs to be documented once your changes are merged?**
+
+<!-- List all the information that needs to be added to the documentation after merge -->
+<!-- When your changes are merged you will be asked to contribute this to the documentation -->
diff --git a/.gitignore b/.gitignore
index f7a05a2b815..32814bb493a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@
 *.log
 .idea
 .vscode
+.eslintcache
 package-lock.json
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000000..1d89e6bbbc7
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,14 @@
+# Ignore all paths.
+**/*.*
+
+# Enable prettier for the following paths.
+!setup/**/*.js
+!lib/**/*.js
+!bin/*.js
+!hot/*.js
+!buildin/*.js
+!test/*.js
+!test/**/webpack.config.js
+!examples/**/webpack.config.js
+!schemas/**/*.js
+!declarations.d.ts
diff --git a/.travis.yml b/.travis.yml
index b1cc16a5835..184cf5ee220 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,42 +9,56 @@ branches:
 
 cache:
   yarn: true
+  directories:
+    - ".jest-cache"
+    - ".eslintcache"
+
+stages:
+ - basic
+ - advanced
+ - versions
 
 matrix:
   include:
     - os: linux
       node_js: "10"
-      env: NO_WATCH_TESTS=1 JOB_PART=lint
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=basic
+      stage: basic
     - os: linux
       node_js: "10"
-      env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
-    - os: linux
-      node_js: "8"
-      env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=lint-unit
+      stage: advanced
     - os: linux
       node_js: "10"
-      env: NO_WATCH_TESTS=1 JOB_PART=unit
-    - os: linux
-      node_js: "6"
-      env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
+      stage: advanced
     - os: osx
       node_js: "10"
-      env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
+      stage: versions
+    - os: linux
+      node_js: "8"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
+      stage: versions
+    - os: linux
+      node_js: "6"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
+      stage: versions
+  fast_finish: true
   allow_failures:
     - os: osx
-  fast_finish: true
 
 install:
   - yarn --frozen-lockfile
   - yarn link --frozen-lockfile || true
   - yarn link webpack --frozen-lockfile
 
-script: npm run travis:$JOB_PART
+script: yarn travis:$JOB_PART
 
 after_success:
   - cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose
   - bash <(curl -s https://codecov.io/bash) -F $JOB_PART -X gcov
-  - rm -rf ./coverage
+  - rm -f .jest-cache/haste-map* .jest-cache/perf-cache*
 
 notifications:
   slack:
diff --git a/README.md b/README.md
index 9a8c423f813..cb5e32d94ad 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,9 @@
 	<a href="https://npmcharts.com/compare/webpack?minimal=true">
 		<img src="https://img.shields.io/npm/dm/webpack.svg">
 	</a>
+	<a href="https://packagephobia.now.sh/result?p=webpack">
+		<img src="https://packagephobia.now.sh/badge?p=webpack" alt="install size">
+	</a>
 	<a href="https://opencollective.com/webpack#backer">
 		<img src="https://opencollective.com/webpack/backers/badge.svg">
 	</a>
@@ -84,25 +87,30 @@ interface](https://webpack.js.org/plugins/). Most of the features
 within webpack itself use this plugin interface. This makes webpack very
 **flexible**.
 
-|Name|Status|Description|
-|:--:|:----:|:----------|
-|[extract-text-webpack-plugin][extract]|![extract-npm]|Extracts Text (CSS) from your bundles into a separate file (app.bundle.css)|
-|[compression-webpack-plugin][compression]|![compression-npm]|Prepares compressed versions of assets to serve them with Content-Encoding|
-|[i18n-webpack-plugin][i18n]|![i18n-npm]|Adds i18n support to your bundles|
-|[html-webpack-plugin][html-plugin]|![html-plugin-npm]| Simplifies creation of HTML files (`index.html`) to serve your bundles|
+|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)|
+|[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|
 
 
 [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
 [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
 [compression]: https://github.com/webpack/compression-webpack-plugin
 [compression-npm]: https://img.shields.io/npm/v/compression-webpack-plugin.svg
+[compression-size]: https://packagephobia.now.sh/badge?p=compression-webpack-plugin
 [i18n]: https://github.com/webpack/i18n-webpack-plugin
 [i18n-npm]: https://img.shields.io/npm/v/i18n-webpack-plugin.svg
+[i18n-size]: https://packagephobia.now.sh/badge?p=i18n-webpack-plugin
 [html-plugin]: https://github.com/ampedandwired/html-webpack-plugin
 [html-plugin-npm]: https://img.shields.io/npm/v/html-webpack-plugin.svg
+[html-plugin-size]: https://packagephobia.now.sh/badge?p=html-webpack-plugin
 
 ### [Loaders](https://webpack.js.org/loaders/)
 
@@ -115,121 +123,154 @@ or are automatically applied via regex from your webpack configuration.
 
 #### Files
 
-|Name|Status|Description|
-|:--:|:----:|:----------|
-|[raw-loader][raw]|![raw-npm]|Loads raw content of a file (utf-8)|
-|[val-loader][val]|![val-npm]|Executes code as module and considers exports as JS code|
-|[url-loader][url]|![url-npm]|Works like the file loader, but can return a Data Url if the file is smaller than a limit|
-|[file-loader][file]|![file-npm]|Emits the file into the output folder and returns the (relative) url|
+|Name|Status|Install Size|Description|
+|:--:|:----:|:----------:|:----------|
+|[raw-loader][raw]|![raw-npm]|![raw-size]|Loads raw content of a file (utf-8)|
+|[val-loader][val]|![val-npm]|![val-size]|Executes code as module and considers exports as JS code|
+|[url-loader][url]|![url-npm]|![url-size]|Works like the file loader, but can return a Data Url if the file is smaller than a limit|
+|[file-loader][file]|![file-npm]|![file-size]|Emits the file into the output folder and returns the (relative) url|
 
 
 [raw]: https://github.com/webpack/raw-loader
 [raw-npm]: https://img.shields.io/npm/v/raw-loader.svg
+[raw-size]: https://packagephobia.now.sh/badge?p=raw-loader
 [val]: https://github.com/webpack/val-loader
 [val-npm]: https://img.shields.io/npm/v/val-loader.svg
+[val-size]: https://packagephobia.now.sh/badge?p=val-loader
 [url]: https://github.com/webpack/url-loader
 [url-npm]: https://img.shields.io/npm/v/url-loader.svg
+[url-size]: https://packagephobia.now.sh/badge?p=url-loader
 [file]: https://github.com/webpack/file-loader
 [file-npm]: https://img.shields.io/npm/v/file-loader.svg
+[file-size]: https://packagephobia.now.sh/badge?p=file-loader
 
 #### JSON
 
-|Name|Status|Description|
-|:--:|:----:|:----------|
-|<a href="https://github.com/webpack/json-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/json.svg"></a>|![json-npm]|Loads a JSON file (included by default)|
-|<a href="https://github.com/webpack/json5-loader"><img width="48" height="10.656" src="https://cdn.rawgit.com/json5/json5-logo/master/json5-logo.svg"></a>|![json5-npm]|Loads and transpiles a JSON 5 file|
-|<a href="https://github.com/awnist/cson-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/coffeescript.svg"></a>|![cson-npm]|Loads and transpiles a CSON file|
+|Name|Status|Install Size|Description|
+|:--:|:----:|:----------:|:----------|
+|<a href="https://github.com/webpack/json-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/json.svg"></a>|![json-npm]|![json-size]|Loads a JSON file (included by default)|
+|<a href="https://github.com/webpack/json5-loader"><img width="48" height="10.656" src="https://cdn.rawgit.com/json5/json5-logo/master/json5-logo.svg"></a>|![json5-npm]|![json5-size]|Loads and transpiles a JSON 5 file|
+|<a href="https://github.com/awnist/cson-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/coffeescript.svg"></a>|![cson-npm]|![cson-size]|Loads and transpiles a CSON file|
 
 
 [json-npm]: https://img.shields.io/npm/v/json-loader.svg
+[json-size]: https://packagephobia.now.sh/badge?p=json-loader
 [json5-npm]: https://img.shields.io/npm/v/json5-loader.svg
+[json5-size]: https://packagephobia.now.sh/badge?p=json5-loader
 [cson-npm]: https://img.shields.io/npm/v/cson-loader.svg
+[cson-size]: https://packagephobia.now.sh/badge?p=cson-loader
 
 #### Transpiling
 
-|Name|Status|Description|
-|:--:|:----:|:----------|
-|<a href="https://github.com/webpack/script-loader">`<script>`</a>|![script-npm]|Executes a JavaScript file once in global context (like in script tag), `require()`s are not parsed|
-|<a href="https://github.com/babel/babel-loader"><img width="48" height="48" title="babel-loader" src="https://worldvectorlogo.com/logos/babel-10.svg"></a>|![babel-npm]|Loads ES2015+ code and transpiles to ES5 using <a href="https://github.com/babel/babel">Babel</a>|
-|<a href="https://github.com/jupl/traceur-loader"><img width="48" height="48" src="https://google.github.com/traceur-compiler/logo/tc.svg"></a>|![traceur-npm]|Loads ES2015+ code and transpiles to ES5 using [Traceur](https://github.com/google/traceur-compiler)|
-|<a href="https://github.com/TypeStrong/ts-loader"><img width="48" height="48" src="https://cdn.rawgit.com/Microsoft/TypeScript/master/doc/logo.svg"></a>|![type-npm]|Loads TypeScript like JavaScript|
-|[`awesome-typescript-loader`](https://github.com/s-panferov/awesome-typescript-loader)|![awesome-typescript-npm]|Awesome TypeScript loader for webpack|
-|<a href="https://github.com/webpack/coffee-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/coffeescript.svg"></a>|![coffee-npm]|Loads CoffeeScript like JavaScript|
+|Name|Status|Install Size|Description|
+|:--:|:----:|:----------:|:----------|
+|<a href="https://github.com/webpack/script-loader">`<script>`</a>|![script-npm]|![script-size]|Executes a JavaScript file once in global context (like in script tag), `require()`s are not parsed|
+|<a href="https://github.com/babel/babel-loader"><img width="48" height="48" title="babel-loader" src="https://worldvectorlogo.com/logos/babel-10.svg"></a>|![babel-npm]|![babel-size]|Loads ES2015+ code and transpiles to ES5 using <a href="https://github.com/babel/babel">Babel</a>|
+|<a href="https://github.com/jupl/traceur-loader"><img width="48" height="48" src="https://google.github.com/traceur-compiler/logo/tc.svg"></a>|![traceur-npm]|![traceur-size]|Loads ES2015+ code and transpiles to ES5 using [Traceur](https://github.com/google/traceur-compiler)|
+|<a href="https://github.com/TypeStrong/ts-loader"><img width="48" height="48" src="https://cdn.rawgit.com/Microsoft/TypeScript/master/doc/logo.svg"></a>|![type-npm]|![type-size]|Loads TypeScript like JavaScript|
+|[`awesome-typescript-loader`](https://github.com/s-panferov/awesome-typescript-loader)|![awesome-typescript-npm]|![awesome-typescript-size]|Awesome TypeScript loader for webpack|
+|<a href="https://github.com/webpack/coffee-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/coffeescript.svg"></a>|![coffee-npm]|![coffee-size]|Loads CoffeeScript like JavaScript|
 
 
 [script-npm]: https://img.shields.io/npm/v/script-loader.svg
+[script-size]: https://packagephobia.now.sh/badge?p=script-loader
 [babel-npm]: https://img.shields.io/npm/v/babel-loader.svg
+[babel-size]: https://packagephobia.now.sh/badge?p=babel-loader
 [traceur-npm]: https://img.shields.io/npm/v/traceur-loader.svg
+[traceur-size]: https://packagephobia.now.sh/badge?p=traceur-loader
 [coffee-npm]: https://img.shields.io/npm/v/coffee-loader.svg
+[coffee-size]: https://packagephobia.now.sh/badge?p=coffee-loader
 [type-npm]: https://img.shields.io/npm/v/ts-loader.svg
+[type-size]: https://packagephobia.now.sh/badge?p=ts-loader
 [awesome-typescript-npm]: https://img.shields.io/npm/v/awesome-typescript-loader.svg
+[awesome-typescript-size]: https://packagephobia.now.sh/badge?p=awesome-typescript-loader
 
 #### Templating
 
-|Name|Status|Description|
-|:--:|:----:|:----------|
-|<a href="https://github.com/webpack/html-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/html5.svg"></a>|![html-npm]|Exports HTML as string, requires references to static resources|
-|<a href="https://github.com/pugjs/pug-loader"><img width="48" height="48" src="https://cdn.rawgit.com/pugjs/pug-logo/master/SVG/pug-final-logo-_-colour-128.svg"></a>|![pug-npm]|Loads Pug templates and returns a function|
-|<a href="https://github.com/webpack/jade-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/jade-3.svg"></a>|![jade-npm]|Loads Jade templates and returns a function|
-|<a href="https://github.com/peerigon/markdown-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/markdown.svg"></a>|![md-npm]|Compiles Markdown to HTML|
-|<a href="https://github.com/posthtml/posthtml-loader"><img width="48" height="48" src="http://posthtml.github.io/posthtml/logo.svg"></a>|![posthtml-npm]|Loads and transforms a HTML file using [PostHTML](https://github.com/posthtml/posthtml)|
-|<a href="https://github.com/altano/handlebars-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/handlebars-1.svg"></a>|![hbs-npm]| Compiles Handlebars to HTML|
+|Name|Status|Install Size|Description|
+|:--:|:----:|:----------:|:----------|
+|<a href="https://github.com/webpack/html-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/html5.svg"></a>|![html-npm]|![html-size]|Exports HTML as string, requires references to static resources|
+|<a href="https://github.com/pugjs/pug-loader"><img width="48" height="48" src="https://cdn.rawgit.com/pugjs/pug-logo/master/SVG/pug-final-logo-_-colour-128.svg"></a>|![pug-npm]|![pug-size]|Loads Pug templates and returns a function|
+|<a href="https://github.com/webpack/jade-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/jade-3.svg"></a>|![jade-npm]|![jade-size]|Loads Jade templates and returns a function|
+|<a href="https://github.com/peerigon/markdown-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/markdown.svg"></a>|![md-npm]|![md-size]|Compiles Markdown to HTML|
+|<a href="https://github.com/posthtml/posthtml-loader"><img width="48" height="48" src="http://posthtml.github.io/posthtml/logo.svg"></a>|![posthtml-npm]|![posthtml-size]|Loads and transforms a HTML file using [PostHTML](https://github.com/posthtml/posthtml)|
+|<a href="https://github.com/altano/handlebars-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/handlebars-1.svg"></a>|![hbs-npm]|![hbs-size]| Compiles Handlebars to HTML|
 
 
 [html-npm]: https://img.shields.io/npm/v/html-loader.svg
+[html-size]: https://packagephobia.now.sh/badge?p=html-loader
 [pug-npm]: https://img.shields.io/npm/v/pug-loader.svg
+[pug-size]: https://packagephobia.now.sh/badge?p=pug-loader
 [jade-npm]: https://img.shields.io/npm/v/jade-loader.svg
+[jade-size]: https://packagephobia.now.sh/badge?p=jade-loader
 [md-npm]: https://img.shields.io/npm/v/markdown-loader.svg
+[md-size]: https://packagephobia.now.sh/badge?p=markdown-loader
 [posthtml-npm]: https://img.shields.io/npm/v/posthtml-loader.svg
+[posthtml-size]: https://packagephobia.now.sh/badge?p=posthtml-loader
 [hbs-npm]: https://img.shields.io/npm/v/handlebars-loader.svg
+[hbs-size]: https://packagephobia.now.sh/badge?p=handlebars-loader
 
 #### Styling
 
-|Name|Status|Description|
-|:--:|:----:|:----------|
-|<a href="https://github.com/webpack/style-loader">`<style>`</a>|![style-npm]|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]|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]|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]|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]|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]|Loads and transforms a CSS/SSS file using [PostCSS](http://postcss.org)|
+|Name|Status|Install Size|Description|
+|:--:|:----:|:----------:|:----------|
+|<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/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)|
 
 
 [style-npm]: https://img.shields.io/npm/v/style-loader.svg
+[style-size]: https://packagephobia.now.sh/badge?p=style-loader
 [css-npm]: https://img.shields.io/npm/v/css-loader.svg
+[css-size]: https://packagephobia.now.sh/badge?p=css-loader
 [less-npm]: https://img.shields.io/npm/v/less-loader.svg
+[less-size]: https://packagephobia.now.sh/badge?p=less-loader
 [sass-npm]: https://img.shields.io/npm/v/sass-loader.svg
+[sass-size]: https://packagephobia.now.sh/badge?p=sass-loader
 [stylus-npm]: https://img.shields.io/npm/v/stylus-loader.svg
+[stylus-size]: https://packagephobia.now.sh/badge?p=stylus-loader
 [postcss-npm]: https://img.shields.io/npm/v/postcss-loader.svg
+[postcss-size]: https://packagephobia.now.sh/badge?p=postcss-loader
 
 #### Linting & Testing
 
-|Name|Status|Description|
-|:--:|:----:|:----------|
-|<a href="https://github.com/webpack/mocha-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/mocha.svg"></a>|![mocha-npm]|Tests with mocha (Browser/NodeJS)|
-|<a href="https://github.com/MoOx/eslint-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/eslint.svg"></a>|![eslint-npm]|PreLoader for linting code using ESLint|
-|<a href="https://github.com/webpack-contrib/jshint-loader"><img width="48" height="20.64" src="http://jshint.com/res/jshint-dark.png"></a>|![jshint-npm]|PreLoader for linting code using JSHint|
+|Name|Status|Install Size|Description|
+|:--:|:----:|:----------:|:----------|
+|<a href="https://github.com/webpack/mocha-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/mocha.svg"></a>|![mocha-npm]|![mocha-size]|Tests with mocha (Browser/NodeJS)|
+|<a href="https://github.com/MoOx/eslint-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/eslint.svg"></a>|![eslint-npm]|![eslint-size]|PreLoader for linting code using ESLint|
+|<a href="https://github.com/webpack-contrib/jshint-loader"><img width="48" height="20.64" src="http://jshint.com/res/jshint-dark.png"></a>|![jshint-npm]|![jshint-size]|PreLoader for linting code using JSHint|
 
 [mocha-npm]: https://img.shields.io/npm/v/mocha-loader.svg
+[mocha-size]: https://packagephobia.now.sh/badge?p=mocha-loader
 [eslint-npm]: https://img.shields.io/npm/v/eslint-loader.svg
+[eslint-size]: https://packagephobia.now.sh/badge?p=eslint-loader
 [jshint-npm]: https://img.shields.io/npm/v/jshint-loader.svg
+[jshint-size]: https://packagephobia.now.sh/badge?p=jshint-loader
 [jscs-npm]: https://img.shields.io/npm/v/jscs-loader.svg
+[jscs-size]: https://packagephobia.now.sh/badge?p=jscs-loader
 
 #### Frameworks
 
-|Name|Status|Description|
-|:--:|:----:|:----------|
-|<a href="https://github.com/vuejs/vue-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/vue-9.svg"></a>|![vue-npm]|Loads and compiles Vue Components|
-|<a href="https://github.com/webpack-contrib/polymer-webpack-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/polymer.svg"></a>|![polymer-npm]|Process HTML & CSS with preprocessor of choice and `require()` Web Components like first-class modules|
-|<a href="https://github.com/TheLarkInn/angular2-template-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/angular-icon-1.svg"></a>|![angular-npm]| Loads and compiles Angular 2 Components|
-|<a href="https://github.com/riot/tag-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/riot.svg"></a>|![riot-npm]| Riot official webpack loader|
+|Name|Status|Install Size|Description|
+|:--:|:----:|:----------:|:----------|
+|<a href="https://github.com/vuejs/vue-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/vue-9.svg"></a>|![vue-npm]|![vue-size]|Loads and compiles Vue Components|
+|<a href="https://github.com/webpack-contrib/polymer-webpack-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/polymer.svg"></a>|![polymer-npm]|![polymer-size]|Process HTML & CSS with preprocessor of choice and `require()` Web Components like first-class modules|
+|<a href="https://github.com/TheLarkInn/angular2-template-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/angular-icon-1.svg"></a>|![angular-npm]|![angular-size]| Loads and compiles Angular 2 Components|
+|<a href="https://github.com/riot/tag-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/riot.svg"></a>|![riot-npm]|![riot-size]| Riot official webpack loader|
 
 
 
 [vue-npm]: https://img.shields.io/npm/v/vue-loader.svg
+[vue-size]: https://packagephobia.now.sh/badge?p=vue-loader
 [polymer-npm]: https://img.shields.io/npm/v/polymer-webpack-loader.svg
+[polymer-size]: https://packagephobia.now.sh/badge?p=polymer-webpack-loader
 [angular-npm]: https://img.shields.io/npm/v/angular2-template-loader.svg
+[angular-size]: https://packagephobia.now.sh/badge?p=angular2-template-loader
 [riot-npm]: https://img.shields.io/npm/v/riot-tag-loader.svg
+[riot-size]: https://packagephobia.now.sh/badge?p=riot-tag-loader
 
 ### Performance
 
@@ -287,6 +328,8 @@ We consider webpack to be a low-level tool used not only individually but also l
 
 If you're just getting started, take a look at [our new docs and concepts page](https://webpack.js.org/concepts/). This has a high level overview that is great for beginners!!
 
+Looking for webpack 1 docs? Please check out the old [wiki](https://github.com/webpack/docs/wiki/contents), but note that this deprecated version is no longer supported.
+
 If you want to discuss something or just need help, [here is our Gitter room](https://gitter.im/webpack/webpack) where there are always individuals looking to help out!
 
 If you are still having difficulty, we would love for you to post
diff --git a/appveyor.yml b/appveyor.yml
index 0e9fc6f4fe2..bd61e1135c5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,24 +9,28 @@ branches:
 init:
   - git config --global core.autocrlf input
 
+cache:
+  - "..\\.yarn-cache"
+  - ".jest-cache"
+
 # what combinations to test
 environment:
   matrix:
-    - nodejs_version: 8
+    - nodejs_version: 10
       job_part: unit
-    - nodejs_version: 8
+      jest: --maxWorkers=2 --cacheDirectory .jest-cache
+    - nodejs_version: 10
       job_part: integration
-      jest: --maxWorkers=2
+      jest: --maxWorkers=2 --cacheDirectory .jest-cache
     - nodejs_version: 6
       job_part: integration
-      jest: --maxWorkers=2
+      jest: --maxWorkers=2 --cacheDirectory .jest-cache
 
 install:
   - ps: Install-Product node $env:nodejs_version x64
-  - npm install yarn -g
-  - yarn install --frozen-lockfile
-  - yarn link --frozen-lockfile || yarn link --frozen-lockfile
-  - yarn link webpack --frozen-lockfile
+  - 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
 
 build: off
 
@@ -38,5 +42,7 @@ test_script:
   - yarn --version
   - cmd: set JEST=%jest%
   - cmd: yarn appveyor:%job_part%
+  - cmd: yarn istanbul report --report lcovonly
   - cmd: yarn unlink webpack
   - cmd: yarn global add codecov && codecov -F %job_part% --disable=gcov
+  - cmd: del /F /Q .jest-cache\\haste-map* .jest-cache\\perf-cache* 2> null || Ver > null
diff --git a/bin/webpack.js b/bin/webpack.js
index 9d83f9bef43..389bc9527e7 100755
--- a/bin/webpack.js
+++ b/bin/webpack.js
@@ -1,8 +1,16 @@
 #!/usr/bin/env node
-function runCommand(command, options) {
+
+process.exitCode = 0;
+
+/**
+ * @param {string} command process to run
+ * @param {string[]} args commandline arguments
+ * @returns {Promise<void>} promise
+ */
+const runCommand = (command, args) => {
 	const cp = require("child_process");
 	return new Promise((resolve, reject) => {
-		const executedCommand = cp.spawn(command, options, {
+		const executedCommand = cp.spawn(command, args, {
 			stdio: "inherit",
 			shell: true
 		});
@@ -13,69 +21,146 @@ function runCommand(command, options) {
 
 		executedCommand.on("exit", code => {
 			if (code === 0) {
-				resolve(true);
+				resolve();
 			} else {
 				reject();
 			}
 		});
 	});
-}
+};
 
-let webpackCliInstalled = false;
-try {
-	require.resolve("webpack-cli");
-	webpackCliInstalled = true;
-} catch (err) {
-	webpackCliInstalled = false;
-}
+/**
+ * @param {string} packageName name of the package
+ * @returns {boolean} is the package installed?
+ */
+const isInstalled = packageName => {
+	try {
+		require.resolve(packageName);
 
-if (!webpackCliInstalled) {
+		return true;
+	} catch (err) {
+		return false;
+	}
+};
+
+/**
+ * @typedef {Object} CliOption
+ * @property {string} name display name
+ * @property {string} package npm package name
+ * @property {string} alias shortcut for choice
+ * @property {boolean} installed currently installed?
+ * @property {string} url homepage
+ * @property {string} description description
+ */
+
+/** @type {CliOption[]} */
+const CLIs = [
+	{
+		name: "webpack-cli",
+		package: "webpack-cli",
+		alias: "cli",
+		installed: isInstalled("webpack-cli"),
+		url: "https://github.com/webpack/webpack-cli",
+		description: "The original webpack full-featured CLI."
+	},
+	{
+		name: "webpack-command",
+		package: "webpack-command",
+		alias: "command",
+		installed: isInstalled("webpack-command"),
+		url: "https://github.com/webpack-contrib/webpack-command",
+		description: "A lightweight, opinionated webpack CLI."
+	}
+];
+
+const installedClis = CLIs.filter(cli => cli.installed);
+
+if (installedClis.length === 0) {
 	const path = require("path");
 	const fs = require("fs");
 	const readLine = require("readline");
-	const isYarn = fs.existsSync(path.resolve(process.cwd(), "yarn.lock"));
 
-	const packageManager = isYarn ? "yarn" : "npm";
-	const options = ["install", "-D", "webpack-cli"];
+	let notify =
+		"One CLI for webpack must be installed. These are recommended choices, delivered as separate packages:";
 
-	if (isYarn) {
-		options[0] = "add";
+	for (const item of CLIs) {
+		notify += `\n - ${item.name} (${item.url})\n   ${item.description}`;
 	}
 
-	const commandToBeRun = `${packageManager} ${options.join(" ")}`;
+	console.error(notify);
 
-	const question = `Would you like to install webpack-cli? (That will run ${commandToBeRun}) (yes/NO)`;
+	const isYarn = fs.existsSync(path.resolve(process.cwd(), "yarn.lock"));
+
+	const packageManager = isYarn ? "yarn" : "npm";
+	const installOptions = [isYarn ? "add" : "install", "-D"];
+
+	console.error(
+		`We will use "${packageManager}" to install the CLI via "${packageManager} ${installOptions.join(
+			" "
+		)}".`
+	);
+
+	let question = `Which one do you like to install (${CLIs.map(
+		item => item.name
+	).join("/")}):\n`;
 
-	console.error("The CLI moved into a separate package: webpack-cli");
 	const questionInterface = readLine.createInterface({
 		input: process.stdin,
-		output: process.stdout
+		output: process.stderr
 	});
 	questionInterface.question(question, answer => {
 		questionInterface.close();
-		switch (answer.toLowerCase()) {
-			case "y":
-			case "yes":
-			case "1": {
-				runCommand(packageManager, options)
-					.then(result => {
-						return require("webpack-cli"); //eslint-disable-line
-					})
-					.catch(error => {
-						console.error(error);
-						process.exitCode = 1;
-					});
-				break;
-			}
-			default: {
-				console.error(
-					"It needs to be installed alongside webpack to use the CLI"
-				);
-				process.exitCode = 1;
-				break;
-			}
+
+		const normalizedAnswer = answer.toLowerCase();
+		const selectedPackage = CLIs.find(item => {
+			return item.name === normalizedAnswer || item.alias === normalizedAnswer;
+		});
+
+		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."
+			);
+			process.exitCode = 1;
+
+			return;
 		}
+
+		const packageName = selectedPackage.package;
+
+		console.log(
+			`Installing '${
+				selectedPackage.name
+			}' (running '${packageManager} ${installOptions.join(
+				" "
+			)} ${packageName}')...`
+		);
+
+		runCommand(packageManager, installOptions.concat(packageName))
+			.then(() => {
+				require(packageName); //eslint-disable-line
+			})
+			.catch(error => {
+				console.error(error);
+				process.exitCode = 1;
+			});
 	});
+} else if (installedClis.length === 1) {
+	require(installedClis[0].package); // eslint-disable-line
 } else {
-	require("webpack-cli"); // eslint-disable-line
+	console.warn(
+		`You have installed ${installedClis
+			.map(item => item.name)
+			.join(
+				" 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.`
+	);
 }
diff --git a/codecov.yml b/codecov.yml
index 9359b370b8e..0ce74197d90 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -7,6 +7,9 @@ coverage:
   status:
     project:
       default: off
+      basic:
+        flags: basic
+        target: auto
       integration:
         flags: integration
         target: auto
@@ -15,6 +18,10 @@ coverage:
         target: 0%
     patch:
       default: off
+      integration:
+        flags: integration
+        target: 90%
+        base: pr
       integration:
         flags: integration
         target: 90%
@@ -25,6 +32,9 @@ coverage:
         base: pr
     changes:
       default: off
+      basic:
+        flags: basic
+        target: 0%
       integration:
         flags: integration
         target: 0%
@@ -32,3 +42,8 @@ coverage:
         flags: unit
         target: 0%
 comment: off
+flags:
+  basic:
+    joined: false
+  unit:
+    joined: false
diff --git a/declarations.d.ts b/declarations.d.ts
index 398a8973e49..bd64715943c 100644
--- a/declarations.d.ts
+++ b/declarations.d.ts
@@ -1,5 +1,4 @@
 declare module "*.json";
-declare module "webpack-cli";
 
 // Deprecated NodeJS API usages in Webpack
 declare namespace NodeJS {
@@ -33,29 +32,43 @@ declare module "chrome-trace-event" {
 declare module "@webassemblyjs/ast" {
 	export function traverse(
 		ast: any,
-		visitor: { [name: string]: (context: { node: Node }) => void }
+		visitor: {
+			ModuleImport?: (p: NodePath<ModuleImport>) => void;
+			ModuleExport?: (p: NodePath<ModuleExport>) => void;
+			Start?: (p: NodePath<Start>) => void;
+		}
 	);
-	export class Node {
-		index: number;
+	export class NodePath<T> {
+		node: T;
 	}
+	export class Node {}
 	export class Identifier extends Node {
 		value: string;
 	}
+	export class Start extends Node {
+		index: Identifier;
+	}
 	export class ModuleImport extends Node {
 		module: string;
 		descr: {
 			type: string;
-			valtype: string;
+			valtype?: string;
+			id?: Identifier;
+			signature?: Signature;
 		};
 		name: string;
 	}
 	export class ModuleExport extends Node {
 		name: string;
 	}
+	export class ModuleExportDescr extends Node {}
 	export class IndexLiteral extends Node {}
 	export class NumberLiteral extends Node {}
+	export class FloatLiteral extends Node {}
 	export class Global extends Node {}
-	export class FuncParam extends Node {}
+	export class FuncParam extends Node {
+		valtype: string;
+	}
 	export class Instruction extends Node {}
 	export class CallInstruction extends Instruction {}
 	export class ObjectInstruction extends Instruction {}
@@ -63,13 +76,14 @@ declare module "@webassemblyjs/ast" {
 		signature: Signature;
 	}
 	export class Signature {
-		params: any;
-		result: any;
+		params: FuncParam[];
+		results: string[];
 	}
-	export class TypeInstructionFunc extends Node {}
+	export class TypeInstruction extends Node {}
 	export class IndexInFuncSection extends Node {}
 	export function indexLiteral(index: number): IndexLiteral;
-	export function numberLiteral(num: number): NumberLiteral;
+	export function numberLiteralFromRaw(num: number): NumberLiteral;
+	export function floatLiteral(value: number, nan?: boolean, inf?: boolean, raw?: string): FloatLiteral;
 	export function global(globalType: string, nodes: Node[]): Global;
 	export function identifier(indentifier: string): Identifier;
 	export function funcParam(valType: string, id: Identifier): FuncParam;
@@ -80,13 +94,17 @@ declare module "@webassemblyjs/ast" {
 		type: string,
 		init: Node[]
 	): ObjectInstruction;
-	export function func(initFuncId, funcParams, funcResults, funcBody): Func;
-	export function typeInstructionFunc(params, result): TypeInstructionFunc;
+	export function signature(params: FuncParam[], results: string[]): Signature;
+	export function func(initFuncId, Signature, funcBody): Func;
+	export function typeInstruction(id: Identifier, functype: Signature): TypeInstruction;
 	export function indexInFuncSection(index: IndexLiteral): IndexInFuncSection;
 	export function moduleExport(
 		identifier: string,
+		descr: ModuleExportDescr
+	): ModuleExport;
+	export function moduleExportDescr(
 		type: string,
-		index: IndexLiteral
+		index: ModuleExportDescr
 	): ModuleExport;
 
 	export function getSectionMetadata(ast: any, section: string);
diff --git a/examples/README.md b/examples/README.md
index 3ab122edd5f..6407710e237 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -120,8 +120,9 @@
 If you think an example is missing, please report it as issue. :)
 
 # Building an Example
-1. Run `npm install` in the root of the project.
-2. Run `npm link webpack` in the root of the project.
-3. Run `node build.js` in the specific example directory. (Ex: `cd examples/commonjs && node build.js`)
+1. Run `yarn` in the root of the project.
+2. Run `yarn link webpack` in the root of the project.
+3. Run `yarn add --dev webpack-cli` in the root of the project.
+4. Run `node build.js` in the specific example directory. (Ex: `cd examples/commonjs && node build.js`)
 
 Note: To build all examples run `npm run build:examples`
diff --git a/examples/code-splitted-require.context-amd/README.md b/examples/code-splitted-require.context-amd/README.md
index 580e02fa0b3..07a7855e2d8 100644
--- a/examples/code-splitted-require.context-amd/README.md
+++ b/examples/code-splitted-require.context-amd/README.md
@@ -259,7 +259,7 @@ function webpackContext(req) {
 function webpackContextResolve(req) {
 	var id = map[req];
 	if(!(id + 1)) { // check for number or string
-		var e = new Error('Cannot find module "' + req + '".');
+		var e = new Error("Cannot find module '" + req + "'");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	}
diff --git a/examples/code-splitted-require.context/README.md b/examples/code-splitted-require.context/README.md
index ada390aca2e..c1251d65308 100644
--- a/examples/code-splitted-require.context/README.md
+++ b/examples/code-splitted-require.context/README.md
@@ -259,7 +259,7 @@ function webpackContext(req) {
 function webpackContextResolve(req) {
 	var id = map[req];
 	if(!(id + 1)) { // check for number or string
-		var e = new Error('Cannot find module "' + req + '".');
+		var e = new Error("Cannot find module '" + req + "'");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	}
diff --git a/examples/code-splitting-harmony/README.md b/examples/code-splitting-harmony/README.md
index 4db7024d8ce..c3e9e9d4c8d 100644
--- a/examples/code-splitting-harmony/README.md
+++ b/examples/code-splitting-harmony/README.md
@@ -248,7 +248,7 @@ function webpackAsyncContext(req) {
 	var ids = map[req];
 	if(!ids) {
 		return Promise.resolve().then(function() {
-			var e = new Error('Cannot find module "' + req + '".');
+			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		});
diff --git a/examples/code-splitting-native-import-context-filter/README.md b/examples/code-splitting-native-import-context-filter/README.md
index 50cced4f21a..86f2a9e9164 100644
--- a/examples/code-splitting-native-import-context-filter/README.md
+++ b/examples/code-splitting-native-import-context-filter/README.md
@@ -275,7 +275,7 @@ function webpackAsyncContext(req) {
 	var ids = map[req];
 	if(!ids) {
 		return Promise.resolve().then(function() {
-			var e = new Error('Cannot find module "' + req + '".');
+			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		});
diff --git a/examples/code-splitting-native-import-context/README.md b/examples/code-splitting-native-import-context/README.md
index f7405567ed3..f751eb9b227 100644
--- a/examples/code-splitting-native-import-context/README.md
+++ b/examples/code-splitting-native-import-context/README.md
@@ -264,7 +264,7 @@ function webpackAsyncContext(req) {
 	var ids = map[req];
 	if(!ids) {
 		return Promise.resolve().then(function() {
-			var e = new Error('Cannot find module "' + req + '".');
+			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		});
diff --git a/examples/code-splitting-specify-chunk-name/README.md b/examples/code-splitting-specify-chunk-name/README.md
index fc9d18ecb84..16638fad95a 100644
--- a/examples/code-splitting-specify-chunk-name/README.md
+++ b/examples/code-splitting-specify-chunk-name/README.md
@@ -256,7 +256,7 @@ function webpackAsyncContext(req) {
 	var ids = map[req];
 	if(!ids) {
 		return Promise.resolve().then(function() {
-			var e = new Error('Cannot find module "' + req + '".');
+			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		});
diff --git a/examples/dll-entry-only/README.md b/examples/dll-entry-only/README.md
new file mode 100644
index 00000000000..6a9f0b50d0a
--- /dev/null
+++ b/examples/dll-entry-only/README.md
@@ -0,0 +1,282 @@
+# Dll scope hoisting
+
+[DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin)
+
+This example demonstrates the usage of `entryOnly` option in combination with module concatenation / scope hoisting.
+
+By default `DllPlugin` exposes all the modules referenced in the bundle as separate entries.
+The manifest includes the individual modules available for use by `DllReferencePlugin`.
+Since all the modules are being accounted for, this prevents advanced optimizations such as tree shaking.
+
+The `entryOnly` flag tells `DllPlugin` to only expose the modules which are configured as entry points;
+this affects both the manifest and the resulting bundle.
+Since some of the modules are no longer included in the "public contract" of the Dll,
+they can be optimized by merging (concatenating) multiple modules together or removing unused code.
+This allows to take advantage of tree shaking (scope hoisting and dead code removal) optimizations.
+
+In this example only `example.js` module is exposed, since it's the entry point.
+Modules `a.js` and `b.js` are concatenated into `example.js`.
+Module `cjs.js` is left as is, since it's in CommonJS format.
+
+The manifest includes `example.js` as the only exposed module and lists the exports as `["a","b","c"]`
+from the corresponding modules `a.js`, `b.js` and `cjs.js`. None of the other modules are exposed.
+
+Also see [tree shaking](https://github.com/webpack/webpack/tree/master/examples/harmony-unused)
+and [scope hoisting example](https://github.com/webpack/webpack/tree/master/examples/scope-hoisting).
+
+
+# example.js
+
+``` javascript
+export { a, b } from "./a";
+export { c } from "./cjs";
+```
+
+# webpack.config.js
+
+``` javascript
+var path = require("path");
+var webpack = require("../../");
+
+module.exports = {
+	// mode: "development" || "production",
+	entry: {
+		dll: ["./example"]
+	},
+	output: {
+		path: path.join(__dirname, "dist"),
+		filename: "[name].js",
+		library: "[name]_[hash]"
+	},
+	optimization: {
+		concatenateModules: true // this is enabled by default in production mode
+	},
+	plugins: [
+		new webpack.DllPlugin({
+			path: path.join(__dirname, "dist", "[name]-manifest.json"),
+			name: "[name]_[hash]",
+			entryOnly: true
+		})
+	]
+};
+```
+
+# dist/dll.js
+
+``` javascript
+var dll_3392692e94d8b928900f =
+```
+<details><summary><code>/******/ (function(modules) { /* webpackBootstrap */ })</code></summary>
+
+``` js
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// 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
+/******/ 			});
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "dist/";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+```
+
+</details>
+
+``` js
+/******/ ([
+/* 0 */
+/*!***************!*\
+  !*** dll dll ***!
+  \***************/
+/*! no static exports found */
+/*! ModuleConcatenation bailout: Module is not an ECMAScript module */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__;
+
+/***/ }),
+/* 1 */
+/*!****************!*\
+  !*** ./cjs.js ***!
+  \****************/
+/*! no static exports found */
+/*! ModuleConcatenation bailout: Module is not an ECMAScript module */
+/***/ (function(module, exports) {
+
+// module cjs (commonjs)
+exports.c = "c";
+
+
+/***/ }),
+/* 2 */
+/*!********************************!*\
+  !*** ./example.js + 2 modules ***!
+  \********************************/
+/*! exports provided: a, b, c */
+/*! ModuleConcatenation bailout: Cannot concat with ./cjs.js (<- Module is not an ECMAScript module) */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+
+// CONCATENATED MODULE: ./b.js
+// module b
+function b() {
+	return "b";
+}
+
+// CONCATENATED MODULE: ./a.js
+// module a
+var a = "a";
+
+
+// EXTERNAL MODULE: ./cjs.js
+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"]; });
+
+
+
+
+/***/ })
+/******/ ]);
+```
+
+# dist/dll-manifest.json
+
+``` javascript
+{"name":"dll_3392692e94d8b928900f","content":{"./example.js":{"id":2,"buildMeta":{"exportsType":"namespace","providedExports":["a","b","c"]}}}}
+```
+
+# Info
+
+## Unoptimized
+
+```
+Hash: 0a1b2c3d4e5f6a7b8c9d
+Version: webpack 4.8.3
+ Asset      Size  Chunks             Chunk Names
+dll.js  4.01 KiB       0  [emitted]  dll
+Entrypoint dll = dll.js
+chunk    {0} dll.js (dll) 216 bytes [entry] [rendered]
+    > dll
+ [0] dll dll 12 bytes {0} [built]
+     dll entry 
+ [1] ./cjs.js 42 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
+ [2] ./example.js + 2 modules 162 bytes {0} [built]
+     [exports: a, b, c]
+     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
+     | ./a.js 53 bytes [built]
+     |     [exports: a, b]
+     |     harmony side effect evaluation ./a  ./example.js 1:0-27
+     |     harmony export imported specifier ./a  ./example.js 1:0-27
+     |     harmony export imported specifier ./a  ./example.js 1:0-27
+     | ./b.js 49 bytes [built]
+     |     [exports: b]
+     |     harmony side effect evaluation ./b  ./a.js 3:0-20
+     |     harmony export imported specifier ./b  ./a.js 3:0-20
+```
+
+## Production mode
+
+```
+Hash: 0a1b2c3d4e5f6a7b8c9d
+Version: webpack 4.8.3
+ Asset       Size  Chunks             Chunk Names
+dll.js  791 bytes       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]
+     [exports: a, b, c]
+     single entry ./example [2] dll dll dll:0
+     | ./example.js 55 bytes [built]
+     |     [exports: a, b, c]
+     |     single entry ./example [2] dll dll dll:0
+     | ./a.js 53 bytes [built]
+     |     [exports: a, b]
+     |     [all exports used]
+     |     harmony side effect evaluation ./a  ./example.js 1:0-27
+     |     harmony export imported specifier ./a  ./example.js 1:0-27
+     |     harmony export imported specifier ./a  ./example.js 1:0-27
+     | ./b.js 49 bytes [built]
+     |     [exports: b]
+     |     [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-entry-only/a.js b/examples/dll-entry-only/a.js
new file mode 100644
index 00000000000..07c5499cf77
--- /dev/null
+++ b/examples/dll-entry-only/a.js
@@ -0,0 +1,3 @@
+// module a
+export var a = "a";
+export * from "./b";
diff --git a/examples/dll-entry-only/b.js b/examples/dll-entry-only/b.js
new file mode 100644
index 00000000000..1029c7ce036
--- /dev/null
+++ b/examples/dll-entry-only/b.js
@@ -0,0 +1,4 @@
+// module b
+export function b() {
+	return "b";
+}
diff --git a/examples/dll-entry-only/build.js b/examples/dll-entry-only/build.js
new file mode 100644
index 00000000000..7492e9f9f71
--- /dev/null
+++ b/examples/dll-entry-only/build.js
@@ -0,0 +1,2 @@
+global.NO_TARGET_ARGS = true;
+require("../build-common");
diff --git a/examples/dll-entry-only/cjs.js b/examples/dll-entry-only/cjs.js
new file mode 100644
index 00000000000..1f42af93969
--- /dev/null
+++ b/examples/dll-entry-only/cjs.js
@@ -0,0 +1,2 @@
+// module cjs (commonjs)
+exports.c = "c";
diff --git a/examples/dll-entry-only/example.js b/examples/dll-entry-only/example.js
new file mode 100644
index 00000000000..6aaf2aa31be
--- /dev/null
+++ b/examples/dll-entry-only/example.js
@@ -0,0 +1,2 @@
+export { a, b } from "./a";
+export { c } from "./cjs";
diff --git a/examples/dll-entry-only/template.md b/examples/dll-entry-only/template.md
new file mode 100644
index 00000000000..1d207ed402c
--- /dev/null
+++ b/examples/dll-entry-only/template.md
@@ -0,0 +1,64 @@
+# Dll scope hoisting
+
+[DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin)
+
+This example demonstrates the usage of `entryOnly` option in combination with module concatenation / scope hoisting.
+
+By default `DllPlugin` exposes all the modules referenced in the bundle as separate entries.
+The manifest includes the individual modules available for use by `DllReferencePlugin`.
+Since all the modules are being accounted for, this prevents advanced optimizations such as tree shaking.
+
+The `entryOnly` flag tells `DllPlugin` to only expose the modules which are configured as entry points;
+this affects both the manifest and the resulting bundle.
+Since some of the modules are no longer included in the "public contract" of the Dll,
+they can be optimized by merging (concatenating) multiple modules together or removing unused code.
+This allows to take advantage of tree shaking (scope hoisting and dead code removal) optimizations.
+
+In this example only `example.js` module is exposed, since it's the entry point.
+Modules `a.js` and `b.js` are concatenated into `example.js`.
+Module `cjs.js` is left as is, since it's in CommonJS format.
+
+The manifest includes `example.js` as the only exposed module and lists the exports as `["a","b","c"]`
+from the corresponding modules `a.js`, `b.js` and `cjs.js`. None of the other modules are exposed.
+
+Also see [tree shaking](https://github.com/webpack/webpack/tree/master/examples/harmony-unused)
+and [scope hoisting example](https://github.com/webpack/webpack/tree/master/examples/scope-hoisting).
+
+
+# example.js
+
+``` javascript
+{{example.js}}
+```
+
+# webpack.config.js
+
+``` javascript
+{{webpack.config.js}}
+```
+
+# dist/dll.js
+
+``` javascript
+{{dist/dll.js}}
+```
+
+# dist/dll-manifest.json
+
+``` javascript
+{{dist/dll-manifest.json}}
+```
+
+# Info
+
+## Unoptimized
+
+```
+{{stdout}}
+```
+
+## Production mode
+
+```
+{{production:stdout}}
+```
diff --git a/examples/dll-entry-only/webpack.config.js b/examples/dll-entry-only/webpack.config.js
new file mode 100644
index 00000000000..768b81d76a7
--- /dev/null
+++ b/examples/dll-entry-only/webpack.config.js
@@ -0,0 +1,24 @@
+var path = require("path");
+var webpack = require("../../");
+
+module.exports = {
+	// mode: "development" || "production",
+	entry: {
+		dll: ["./example"]
+	},
+	output: {
+		path: path.join(__dirname, "dist"),
+		filename: "[name].js",
+		library: "[name]_[hash]"
+	},
+	optimization: {
+		concatenateModules: true // this is enabled by default in production mode
+	},
+	plugins: [
+		new webpack.DllPlugin({
+			path: path.join(__dirname, "dist", "[name]-manifest.json"),
+			name: "[name]_[hash]",
+			entryOnly: true
+		})
+	]
+};
diff --git a/examples/hybrid-routing/README.md b/examples/hybrid-routing/README.md
index 56e6b93201e..c529e057f59 100644
--- a/examples/hybrid-routing/README.md
+++ b/examples/hybrid-routing/README.md
@@ -153,7 +153,7 @@ function webpackAsyncContext(req) {
 	var ids = map[req];
 	if(!ids) {
 		return Promise.resolve().then(function() {
-			var e = new Error('Cannot find module "' + req + '".');
+			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		});
diff --git a/examples/many-pages/README.md b/examples/many-pages/README.md
new file mode 100644
index 00000000000..00d976fbc20
--- /dev/null
+++ b/examples/many-pages/README.md
@@ -0,0 +1,141 @@
+# Info
+
+This example illustrates webpack's algorthim 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.
+
+The following configuration is used:
+
+* `optimization.splitChunks.chunks: "all"` - This opt-in into automatic splitting of initial chunks which is off by default
+* `optimization.splitChunks.maxInitial/AsyncRequests: 20` - This opt-in into a HTTP2 optimized splitting mode by increasing the allowed amount of requests. Browser only supports 6 requests in parallel for HTTP1.1.
+
+# Interpreting the result
+
+* `pageA.js` the normal output files for the entrypoint `pageA`
+* `vendors~pageD~pageE~pageF~pageG.js` vendor libs shared by these pages extracted into a separate output file when larger then the threshold in size
+* `vendors~pageA.js` vendors only used by a single page but larger than the threshold in size
+* `pageA~pageD~pageF.js` application modules shared by these pages and larger than the threshold in size
+
+The threshold is here 40 bytes, but by default (in a real application) 30kb.
+
+Some modules are intentially duplicated, i. e. `./stuff/s4.js` is shared by `pageA` and `pageC`, but it's the only shared module so no separate output file is created because it would be smaller than the threshold. A separate request (which comes with an overhead and worsen gzipping) is not worth the extra bytes.
+
+Note: decreasing `maxInitial/AsyncRequest` will increase duplication further to reduce the number of requests. Duplication doesn't affect initial page load, it only affects download size of navigations to other pages of the application.
+
+## webpack.config.js
+
+```
+module.exports = {
+	// mode: "development || "production",
+	entry: {
+		pageA: "./pages/a",
+		pageB: "./pages/b",
+		pageC: "./pages/c",
+		pageD: "./pages/d",
+		pageE: "./pages/e",
+		pageF: "./pages/f",
+		pageG: "./pages/g"
+	},
+	optimization: {
+		splitChunks: {
+			chunks: "all",
+			maxInitialRequests: 20, // for HTTP2
+			maxAsyncRequests: 20, // for HTTP2
+			minSize: 40 // for example only: choosen to match 2 modules
+			// omit minSize in real use case to use the default of 30kb
+		}
+	}
+};
+```
+
+## Production mode
+
+```
+Hash: 0a1b2c3d4e5f6a7b8c9d
+Version: webpack 4.8.3
+                             Asset       Size  Chunks             Chunk Names
+                          pageG.js   1.15 KiB       7  [emitted]  pageG
+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
+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
+Entrypoint pageD = vendors~pageD~pageE~pageF~pageG.js vendors~pageD~pageE~pageF.js pageA~pageD~pageF.js pageD.js
+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)
+    > ./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)
+    > ./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/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)
+    > ./pages/a pageA
+    > ./pages/b pageB
+    > ./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
+    1 module
+chunk    {5} vendors~pageB.js (vendors~pageB) 43 bytes ={12}= ={3}= [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]
+    > ./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]
+```
\ No newline at end of file
diff --git a/examples/many-pages/build.js b/examples/many-pages/build.js
new file mode 100644
index 00000000000..6ae2decc566
--- /dev/null
+++ b/examples/many-pages/build.js
@@ -0,0 +1,3 @@
+global.NO_TARGET_ARGS = true;
+global.NO_REASONS = true;
+require("../build-common");
\ No newline at end of file
diff --git a/examples/many-pages/node_modules/m1.js b/examples/many-pages/node_modules/m1.js
new file mode 100644
index 00000000000..61c8f92a5c5
--- /dev/null
+++ b/examples/many-pages/node_modules/m1.js
@@ -0,0 +1 @@
+console.log("a module installed from npm");
\ No newline at end of file
diff --git a/examples/many-pages/node_modules/m2.js b/examples/many-pages/node_modules/m2.js
new file mode 100644
index 00000000000..61c8f92a5c5
--- /dev/null
+++ b/examples/many-pages/node_modules/m2.js
@@ -0,0 +1 @@
+console.log("a module installed from npm");
\ No newline at end of file
diff --git a/examples/many-pages/node_modules/m3.js b/examples/many-pages/node_modules/m3.js
new file mode 100644
index 00000000000..61c8f92a5c5
--- /dev/null
+++ b/examples/many-pages/node_modules/m3.js
@@ -0,0 +1 @@
+console.log("a module installed from npm");
\ No newline at end of file
diff --git a/examples/many-pages/node_modules/m4.js b/examples/many-pages/node_modules/m4.js
new file mode 100644
index 00000000000..61c8f92a5c5
--- /dev/null
+++ b/examples/many-pages/node_modules/m4.js
@@ -0,0 +1 @@
+console.log("a module installed from npm");
\ No newline at end of file
diff --git a/examples/many-pages/node_modules/m5.js b/examples/many-pages/node_modules/m5.js
new file mode 100644
index 00000000000..61c8f92a5c5
--- /dev/null
+++ b/examples/many-pages/node_modules/m5.js
@@ -0,0 +1 @@
+console.log("a module installed from npm");
\ No newline at end of file
diff --git a/examples/many-pages/node_modules/m6.js b/examples/many-pages/node_modules/m6.js
new file mode 100644
index 00000000000..61c8f92a5c5
--- /dev/null
+++ b/examples/many-pages/node_modules/m6.js
@@ -0,0 +1 @@
+console.log("a module installed from npm");
\ No newline at end of file
diff --git a/examples/many-pages/node_modules/m7.js b/examples/many-pages/node_modules/m7.js
new file mode 100644
index 00000000000..61c8f92a5c5
--- /dev/null
+++ b/examples/many-pages/node_modules/m7.js
@@ -0,0 +1 @@
+console.log("a module installed from npm");
\ No newline at end of file
diff --git a/examples/many-pages/node_modules/m8.js b/examples/many-pages/node_modules/m8.js
new file mode 100644
index 00000000000..61c8f92a5c5
--- /dev/null
+++ b/examples/many-pages/node_modules/m8.js
@@ -0,0 +1 @@
+console.log("a module installed from npm");
\ No newline at end of file
diff --git a/examples/many-pages/pages/a.js b/examples/many-pages/pages/a.js
new file mode 100644
index 00000000000..acad484d636
--- /dev/null
+++ b/examples/many-pages/pages/a.js
@@ -0,0 +1,7 @@
+import "m1";
+import "m2";
+import "m3";
+
+import "../stuff/s2";
+import "../stuff/s3";
+import "../stuff/s4";
diff --git a/examples/many-pages/pages/b.js b/examples/many-pages/pages/b.js
new file mode 100644
index 00000000000..a25a154677d
--- /dev/null
+++ b/examples/many-pages/pages/b.js
@@ -0,0 +1,7 @@
+import "m1";
+import "m2";
+import "m4";
+
+import "../stuff/s1";
+import "../stuff/s7";
+import "../stuff/s8";
diff --git a/examples/many-pages/pages/c.js b/examples/many-pages/pages/c.js
new file mode 100644
index 00000000000..cca60b6112f
--- /dev/null
+++ b/examples/many-pages/pages/c.js
@@ -0,0 +1,7 @@
+import "m1";
+import "m2";
+import "m5";
+
+import "../stuff/s4";
+import "../stuff/s5";
+import "../stuff/s6";
diff --git a/examples/many-pages/pages/d.js b/examples/many-pages/pages/d.js
new file mode 100644
index 00000000000..b3f8e2bcc1e
--- /dev/null
+++ b/examples/many-pages/pages/d.js
@@ -0,0 +1,7 @@
+import "m6";
+import "m7";
+import "m8";
+
+import "../stuff/s1";
+import "../stuff/s2";
+import "../stuff/s3";
diff --git a/examples/many-pages/pages/e.js b/examples/many-pages/pages/e.js
new file mode 100644
index 00000000000..05da267adf5
--- /dev/null
+++ b/examples/many-pages/pages/e.js
@@ -0,0 +1,5 @@
+import "m6";
+import "m7";
+import "m8";
+
+import "../stuff/s7";
diff --git a/examples/many-pages/pages/f.js b/examples/many-pages/pages/f.js
new file mode 100644
index 00000000000..b3f8e2bcc1e
--- /dev/null
+++ b/examples/many-pages/pages/f.js
@@ -0,0 +1,7 @@
+import "m6";
+import "m7";
+import "m8";
+
+import "../stuff/s1";
+import "../stuff/s2";
+import "../stuff/s3";
diff --git a/examples/many-pages/pages/g.js b/examples/many-pages/pages/g.js
new file mode 100644
index 00000000000..49f85a16b97
--- /dev/null
+++ b/examples/many-pages/pages/g.js
@@ -0,0 +1,3 @@
+import "m6";
+
+import "../stuff/s1";
diff --git a/examples/many-pages/stuff/s1.js b/examples/many-pages/stuff/s1.js
new file mode 100644
index 00000000000..b5c7e15f13a
--- /dev/null
+++ b/examples/many-pages/stuff/s1.js
@@ -0,0 +1 @@
+console.log("some own module");
\ No newline at end of file
diff --git a/examples/many-pages/stuff/s2.js b/examples/many-pages/stuff/s2.js
new file mode 100644
index 00000000000..b5c7e15f13a
--- /dev/null
+++ b/examples/many-pages/stuff/s2.js
@@ -0,0 +1 @@
+console.log("some own module");
\ No newline at end of file
diff --git a/examples/many-pages/stuff/s3.js b/examples/many-pages/stuff/s3.js
new file mode 100644
index 00000000000..b5c7e15f13a
--- /dev/null
+++ b/examples/many-pages/stuff/s3.js
@@ -0,0 +1 @@
+console.log("some own module");
\ No newline at end of file
diff --git a/examples/many-pages/stuff/s4.js b/examples/many-pages/stuff/s4.js
new file mode 100644
index 00000000000..b5c7e15f13a
--- /dev/null
+++ b/examples/many-pages/stuff/s4.js
@@ -0,0 +1 @@
+console.log("some own module");
\ No newline at end of file
diff --git a/examples/many-pages/stuff/s5.js b/examples/many-pages/stuff/s5.js
new file mode 100644
index 00000000000..b5c7e15f13a
--- /dev/null
+++ b/examples/many-pages/stuff/s5.js
@@ -0,0 +1 @@
+console.log("some own module");
\ No newline at end of file
diff --git a/examples/many-pages/stuff/s6.js b/examples/many-pages/stuff/s6.js
new file mode 100644
index 00000000000..b5c7e15f13a
--- /dev/null
+++ b/examples/many-pages/stuff/s6.js
@@ -0,0 +1 @@
+console.log("some own module");
\ No newline at end of file
diff --git a/examples/many-pages/stuff/s7.js b/examples/many-pages/stuff/s7.js
new file mode 100644
index 00000000000..b5c7e15f13a
--- /dev/null
+++ b/examples/many-pages/stuff/s7.js
@@ -0,0 +1 @@
+console.log("some own module");
\ No newline at end of file
diff --git a/examples/many-pages/stuff/s8.js b/examples/many-pages/stuff/s8.js
new file mode 100644
index 00000000000..b5c7e15f13a
--- /dev/null
+++ b/examples/many-pages/stuff/s8.js
@@ -0,0 +1 @@
+console.log("some own module");
\ No newline at end of file
diff --git a/examples/many-pages/template.md b/examples/many-pages/template.md
new file mode 100644
index 00000000000..7bbc7b0dd44
--- /dev/null
+++ b/examples/many-pages/template.md
@@ -0,0 +1,35 @@
+# Info
+
+This example illustrates webpack's algorthim 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.
+
+The following configuration is used:
+
+* `optimization.splitChunks.chunks: "all"` - This opt-in into automatic splitting of initial chunks which is off by default
+* `optimization.splitChunks.maxInitial/AsyncRequests: 20` - This opt-in into a HTTP2 optimized splitting mode by increasing the allowed amount of requests. Browser only supports 6 requests in parallel for HTTP1.1.
+
+# Interpreting the result
+
+* `pageA.js` the normal output files for the entrypoint `pageA`
+* `vendors~pageD~pageE~pageF~pageG.js` vendor libs shared by these pages extracted into a separate output file when larger then the threshold in size
+* `vendors~pageA.js` vendors only used by a single page but larger than the threshold in size
+* `pageA~pageD~pageF.js` application modules shared by these pages and larger than the threshold in size
+
+The threshold is here 40 bytes, but by default (in a real application) 30kb.
+
+Some modules are intentially duplicated, i. e. `./stuff/s4.js` is shared by `pageA` and `pageC`, but it's the only shared module so no separate output file is created because it would be smaller than the threshold. A separate request (which comes with an overhead and worsen gzipping) is not worth the extra bytes.
+
+Note: decreasing `maxInitial/AsyncRequest` will increase duplication further to reduce the number of requests. Duplication doesn't affect initial page load, it only affects download size of navigations to other pages of the application.
+
+## webpack.config.js
+
+```
+{{webpack.config.js}}
+```
+
+## Production mode
+
+```
+{{production:stdout}}
+```
\ No newline at end of file
diff --git a/examples/many-pages/webpack.config.js b/examples/many-pages/webpack.config.js
new file mode 100644
index 00000000000..f47598f6309
--- /dev/null
+++ b/examples/many-pages/webpack.config.js
@@ -0,0 +1,21 @@
+module.exports = {
+	// mode: "development || "production",
+	entry: {
+		pageA: "./pages/a",
+		pageB: "./pages/b",
+		pageC: "./pages/c",
+		pageD: "./pages/d",
+		pageE: "./pages/e",
+		pageF: "./pages/f",
+		pageG: "./pages/g"
+	},
+	optimization: {
+		splitChunks: {
+			chunks: "all",
+			maxInitialRequests: 20, // for HTTP2
+			maxAsyncRequests: 20, // for HTTP2
+			minSize: 40 // for example only: choosen 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 38a442ed640..56defcdc409 100644
--- a/examples/mixed/README.md
+++ b/examples/mixed/README.md
@@ -357,7 +357,7 @@ function webpackContext(req) {
 function webpackContextResolve(req) {
 	var id = map[req];
 	if(!(id + 1)) { // check for number or string
-		var e = new Error('Cannot find module "' + req + '".');
+		var e = new Error("Cannot find module '" + req + "'");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	}
diff --git a/examples/require.context/README.md b/examples/require.context/README.md
index 912cdcf684b..32b55404af1 100644
--- a/examples/require.context/README.md
+++ b/examples/require.context/README.md
@@ -143,7 +143,7 @@ function webpackContext(req) {
 function webpackContextResolve(req) {
 	var id = map[req];
 	if(!(id + 1)) { // check for number or string
-		var e = new Error('Cannot find module "' + req + '".');
+		var e = new Error("Cannot find module '" + req + "'");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	}
diff --git a/examples/web-worker/README.md b/examples/web-worker/README.md
index d267a214ab3..4ee25044ec5 100644
--- a/examples/web-worker/README.md
+++ b/examples/web-worker/README.md
@@ -284,7 +284,7 @@ function webpackContext(req) {
 function webpackContextResolve(req) {
 	var id = map[req];
 	if(!(id + 1)) { // check for number or string
-		var e = new Error('Cannot find module "' + req + '".');
+		var e = new Error("Cannot find module '" + req + "'");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	}
diff --git a/lib/AmdMainTemplatePlugin.js b/lib/AmdMainTemplatePlugin.js
index 72f23027d9d..b950ed5e08f 100644
--- a/lib/AmdMainTemplatePlugin.js
+++ b/lib/AmdMainTemplatePlugin.js
@@ -8,11 +8,21 @@
 const { ConcatSource } = require("webpack-sources");
 const Template = require("./Template");
 
+/** @typedef {import("./Compilation")} Compilation */
+
 class AmdMainTemplatePlugin {
+	/**
+	 * @param {string} name the library name
+	 */
 	constructor(name) {
+		/** @type {string} */
 		this.name = name;
 	}
 
+	/**
+	 * @param {Compilation} compilation the compilation instance
+	 * @returns {void}
+	 */
 	apply(compilation) {
 		const { mainTemplate, chunkTemplate } = compilation;
 
diff --git a/lib/AsyncDependencyToInitialChunkError.js b/lib/AsyncDependencyToInitialChunkError.js
index 723cf08bb92..78eeb81346c 100644
--- a/lib/AsyncDependencyToInitialChunkError.js
+++ b/lib/AsyncDependencyToInitialChunkError.js
@@ -6,7 +6,15 @@
 
 const WebpackError = require("./WebpackError");
 
-module.exports = class AsyncDependencyToInitialChunkError extends WebpackError {
+/** @typedef {import("./Module")} Module */
+
+class AsyncDependencyToInitialChunkError extends WebpackError {
+	/**
+	 * Creates an instance of AsyncDependencyToInitialChunkError.
+	 * @param {string} chunkName Name of Chunk
+	 * @param {Module} module module tied to dependency
+	 * @param {TODO} loc location of dependency
+	 */
 	constructor(chunkName, module, loc) {
 		super();
 
@@ -18,4 +26,6 @@ module.exports = class AsyncDependencyToInitialChunkError extends WebpackError {
 
 		Error.captureStackTrace(this, this.constructor);
 	}
-};
+}
+
+module.exports = AsyncDependencyToInitialChunkError;
diff --git a/lib/BannerPlugin.js b/lib/BannerPlugin.js
index dc1c46021f4..930990ad8d3 100644
--- a/lib/BannerPlugin.js
+++ b/lib/BannerPlugin.js
@@ -22,21 +22,33 @@ const wrapComment = str => {
 
 class BannerPlugin {
 	constructor(options) {
-		if (arguments.length > 1)
+		if (arguments.length > 1) {
 			throw new Error(
 				"BannerPlugin only takes one argument (pass an options object)"
 			);
+		}
 
 		validateOptions(schema, options, "Banner Plugin");
 
-		if (typeof options === "string")
+		if (typeof options === "string" || typeof options === "function") {
 			options = {
 				banner: options
 			};
+		}
+
 		this.options = options || {};
-		this.banner = this.options.raw
-			? options.banner
-			: wrapComment(options.banner);
+
+		if (typeof options.banner === "function") {
+			const getBanner = this.options.banner;
+			this.banner = this.options.raw
+				? getBanner
+				: data => wrapComment(getBanner(data));
+		} else {
+			const banner = this.options.raw
+				? this.options.banner
+				: wrapComment(this.options.banner);
+			this.banner = () => banner;
+		}
 	}
 
 	apply(compiler) {
@@ -78,13 +90,15 @@ class BannerPlugin {
 							basename = filename.substr(lastSlashIndex + 1);
 						}
 
-						const comment = compilation.getPath(banner, {
+						const data = {
 							hash,
 							chunk,
 							filename,
 							basename,
 							query
-						});
+						};
+
+						const comment = compilation.getPath(banner(data), data);
 
 						compilation.assets[file] = new ConcatSource(
 							comment,
diff --git a/lib/CaseSensitiveModulesWarning.js b/lib/CaseSensitiveModulesWarning.js
index 30802331c24..98237cfcb8d 100644
--- a/lib/CaseSensitiveModulesWarning.js
+++ b/lib/CaseSensitiveModulesWarning.js
@@ -6,7 +6,13 @@
 
 const WebpackError = require("./WebpackError");
 
-module.exports = class CaseSensitiveModulesWarning extends WebpackError {
+/** @typedef {import("./Module")} Module */
+
+class CaseSensitiveModulesWarning extends WebpackError {
+	/**
+	 * Creates an instance of CaseSensitiveModulesWarning.
+	 * @param {Module[]} modules modules that were detected
+	 */
 	constructor(modules) {
 		super();
 
@@ -23,6 +29,11 @@ ${modulesList}`;
 		Error.captureStackTrace(this, this.constructor);
 	}
 
+	/**
+	 * @private
+	 * @param {Module[]} modules the modules to be sorted
+	 * @returns {Module[]} sorted version of original modules
+	 */
 	_sort(modules) {
 		return modules.slice().sort((a, b) => {
 			a = a.identifier();
@@ -36,6 +47,11 @@ ${modulesList}`;
 		});
 	}
 
+	/**
+	 * @private
+	 * @param {Module[]} modules each module from throw
+	 * @returns {string} each message from provided moduels
+	 */
 	_moduleMessages(modules) {
 		return modules
 			.map(m => {
@@ -50,4 +66,6 @@ ${modulesList}`;
 			})
 			.join("\n");
 	}
-};
+}
+
+module.exports = CaseSensitiveModulesWarning;
diff --git a/lib/Chunk.js b/lib/Chunk.js
index 306697fd907..f0c6f3902dd 100644
--- a/lib/Chunk.js
+++ b/lib/Chunk.js
@@ -128,6 +128,7 @@ class Chunk {
 		this.chunkReason = undefined;
 		/** @type {boolean} */
 		this.extraAsync = false;
+		this.removedModules = undefined;
 	}
 
 	/**
diff --git a/lib/ChunkRenderError.js b/lib/ChunkRenderError.js
index 56395ebb211..0d0eb2cbc53 100644
--- a/lib/ChunkRenderError.js
+++ b/lib/ChunkRenderError.js
@@ -6,7 +6,15 @@
 
 const WebpackError = require("./WebpackError");
 
+/** @typedef {import("./Chunk")} Chunk */
+
 class ChunkRenderError extends WebpackError {
+	/**
+	 * Create a new ChunkRenderError
+	 * @param {Chunk} chunk A chunk
+	 * @param {string} file Related file
+	 * @param {Error} error Original error
+	 */
 	constructor(chunk, file, error) {
 		super();
 
diff --git a/lib/Compilation.js b/lib/Compilation.js
index 5f482ba3eb5..64e262559f6 100644
--- a/lib/Compilation.js
+++ b/lib/Compilation.js
@@ -865,7 +865,7 @@ class Compilation extends Tapable {
 			this.assignIndex(module);
 			this.assignDepth(module);
 		}
-		this.processDependenciesBlocksForChunkGroups(this.chunkGroups);
+		this.processDependenciesBlocksForChunkGroups(this.chunkGroups.slice());
 		this.sortModules(this.modules);
 		this.hooks.optimize.call();
 
diff --git a/lib/Compiler.js b/lib/Compiler.js
index e7805c4b394..23b5d8cca6d 100644
--- a/lib/Compiler.js
+++ b/lib/Compiler.js
@@ -4,6 +4,7 @@
 */
 "use strict";
 
+const parseJson = require("json-parse-better-errors");
 const asyncLib = require("neo-async");
 const path = require("path");
 const util = require("util");
@@ -350,7 +351,7 @@ class Compiler extends Tapable {
 				if (err) return callback(err);
 
 				try {
-					this.records = JSON.parse(content.toString("utf-8"));
+					this.records = parseJson(content.toString("utf-8"));
 				} catch (e) {
 					e.message = "Cannot parse records: " + e.message;
 					return callback(e);
diff --git a/lib/ContextModule.js b/lib/ContextModule.js
index be8c42fea67..e0009450b36 100644
--- a/lib/ContextModule.js
+++ b/lib/ContextModule.js
@@ -321,7 +321,7 @@ function webpackContext(req) {
 function webpackContextResolve(req) {
 	var id = map[req];
 	if(!(id + 1)) { // check for number or string
-		var e = new Error('Cannot find module "' + req + '".');
+		var e = new Error("Cannot find module '" + req + "'");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	}
@@ -355,7 +355,7 @@ function webpackContext(req) {
 function webpackContextResolve(req) {
 	var id = map[req];
 	if(!(id + 1)) { // check for number or string
-		var e = new Error('Cannot find module "' + req + '".');
+		var e = new Error("Cannot find module '" + req + "'");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	}
@@ -393,7 +393,7 @@ function webpackAsyncContextResolve(req) {
 	return Promise.resolve().then(function() {
 		var id = map[req];
 		if(!(id + 1)) { // check for number or string
-			var e = new Error('Cannot find module "' + req + '".');
+			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		}
@@ -429,7 +429,7 @@ function webpackAsyncContextResolve(req) {
 	return Promise.resolve().then(function() {
 		var id = map[req];
 		if(!(id + 1)) { // check for number or string
-			var e = new Error('Cannot find module "' + req + '".');
+			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		}
@@ -468,7 +468,7 @@ function webpackAsyncContextResolve(req) {
 	return ${promise}.then(function() {
 		var id = map[req];
 		if(!(id + 1)) { // check for number or string
-			var e = new Error('Cannot find module "' + req + '".');
+			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		}
@@ -527,7 +527,7 @@ function webpackAsyncContext(req) {
 	var ids = map[req];
 	if(!ids) {
 		return Promise.resolve().then(function() {
-			var e = new Error('Cannot find module "' + req + '".');
+			var e = new Error("Cannot find module '" + req + "'");
 			e.code = 'MODULE_NOT_FOUND';
 			throw e;
 		});
@@ -546,7 +546,7 @@ module.exports = webpackAsyncContext;`;
 
 	getSourceForEmptyContext(id) {
 		return `function webpackEmptyContext(req) {
-	var e = new Error('Cannot find module "' + req + '".');
+	var e = new Error("Cannot find module '" + req + "'");
 	e.code = 'MODULE_NOT_FOUND';
 	throw e;
 }
@@ -561,7 +561,7 @@ webpackEmptyContext.id = ${JSON.stringify(id)};`;
 	// Here Promise.resolve().then() is used instead of new Promise() to prevent
 	// uncaught exception popping up in devtools
 	return Promise.resolve().then(function() {
-		var e = new Error('Cannot find module "' + req + '".');
+		var e = new Error("Cannot find module '" + req + "'");
 		e.code = 'MODULE_NOT_FOUND';
 		throw e;
 	});
diff --git a/lib/DllPlugin.js b/lib/DllPlugin.js
index d56ade8d7f0..36fa4f84ce2 100644
--- a/lib/DllPlugin.js
+++ b/lib/DllPlugin.js
@@ -33,7 +33,9 @@ class DllPlugin {
 			return true;
 		});
 		new LibManifestPlugin(this.options).apply(compiler);
-		new FlagInitialModulesAsUsedPlugin("DllPlugin").apply(compiler);
+		if (!this.options.entryOnly) {
+			new FlagInitialModulesAsUsedPlugin("DllPlugin").apply(compiler);
+		}
 	}
 }
 
diff --git a/lib/DllReferencePlugin.js b/lib/DllReferencePlugin.js
index 1bbb9d8a27a..b8cf3013be3 100644
--- a/lib/DllReferencePlugin.js
+++ b/lib/DllReferencePlugin.js
@@ -4,6 +4,7 @@
 */
 "use strict";
 
+const parseJson = require("json-parse-better-errors");
 const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
 const DelegatedModuleFactoryPlugin = require("./DelegatedModuleFactoryPlugin");
 const ExternalModuleFactoryPlugin = require("./ExternalModuleFactoryPlugin");
@@ -42,7 +43,7 @@ class DllReferencePlugin {
 					params.compilationDependencies.add(manifest);
 					compiler.inputFileSystem.readFile(manifest, (err, result) => {
 						if (err) return callback(err);
-						params["dll reference " + manifest] = JSON.parse(
+						params["dll reference " + manifest] = parseJson(
 							result.toString("utf-8")
 						);
 						return callback();
diff --git a/lib/ExportPropertyMainTemplatePlugin.js b/lib/ExportPropertyMainTemplatePlugin.js
index 28d119e5f42..90df031aabb 100644
--- a/lib/ExportPropertyMainTemplatePlugin.js
+++ b/lib/ExportPropertyMainTemplatePlugin.js
@@ -6,15 +6,28 @@
 
 const { ConcatSource } = require("webpack-sources");
 
+/** @typedef {import("./Compilation")} Compilation */
+
+/**
+ * @param {string[]} accessor the accessor to convert to path
+ * @returns {string} the path
+ */
 const accessorToObjectAccess = accessor => {
 	return accessor.map(a => `[${JSON.stringify(a)}]`).join("");
 };
 
 class ExportPropertyMainTemplatePlugin {
+	/**
+	 * @param {string|string[]} property the name of the property to export
+	 */
 	constructor(property) {
 		this.property = property;
 	}
 
+	/**
+	 * @param {Compilation} compilation the compilation instance
+	 * @returns {void}
+	 */
 	apply(compilation) {
 		const { mainTemplate, chunkTemplate } = compilation;
 
diff --git a/lib/FlagDependencyUsagePlugin.js b/lib/FlagDependencyUsagePlugin.js
index 42dd4c0e2da..9531b4b9008 100644
--- a/lib/FlagDependencyUsagePlugin.js
+++ b/lib/FlagDependencyUsagePlugin.js
@@ -20,7 +20,7 @@ const isSubset = (biggerSet, subset) => {
 class FlagDependencyUsagePlugin {
 	apply(compiler) {
 		compiler.hooks.compilation.tap("FlagDependencyUsagePlugin", compilation => {
-			compilation.hooks.optimizeModulesAdvanced.tap(
+			compilation.hooks.optimizeDependencies.tap(
 				"FlagDependencyUsagePlugin",
 				modules => {
 					const processModule = (module, usedExports) => {
@@ -86,9 +86,9 @@ class FlagDependencyUsagePlugin {
 					}
 
 					const queue = [];
-					for (const chunk of compilation.chunks) {
-						if (chunk.entryModule) {
-							processModule(chunk.entryModule, true);
+					for (const preparedEntrypoint of compilation._preparedEntrypoints) {
+						if (preparedEntrypoint.module) {
+							processModule(preparedEntrypoint.module, true);
 						}
 					}
 
diff --git a/lib/JsonParser.js b/lib/JsonParser.js
index 0c67ff48dc2..6642fbbf109 100644
--- a/lib/JsonParser.js
+++ b/lib/JsonParser.js
@@ -4,6 +4,7 @@
 */
 "use strict";
 
+const parseJson = require("json-parse-better-errors");
 const JsonExportsDependency = require("./dependencies/JsonExportsDependency");
 
 class JsonParser {
@@ -12,7 +13,7 @@ class JsonParser {
 	}
 
 	parse(source, state) {
-		const data = JSON.parse(source);
+		const data = parseJson(source[0] === "\ufeff" ? source.slice(1) : source);
 		state.module.buildInfo.jsonData = data;
 		state.module.buildMeta.exportsType = "named";
 		if (typeof data === "object" && data)
diff --git a/lib/LibManifestPlugin.js b/lib/LibManifestPlugin.js
index 7faf79354e7..54dbf10a0fa 100644
--- a/lib/LibManifestPlugin.js
+++ b/lib/LibManifestPlugin.js
@@ -6,6 +6,7 @@
 
 const path = require("path");
 const asyncLib = require("neo-async");
+const SingleEntryDependency = require("./dependencies/SingleEntryDependency");
 
 class LibManifestPlugin {
 	constructor(options) {
@@ -37,6 +38,14 @@ class LibManifestPlugin {
 							name,
 							type: this.options.type,
 							content: Array.from(chunk.modulesIterable, module => {
+								if (
+									this.options.entryOnly &&
+									!module.reasons.some(
+										r => r.dependency instanceof SingleEntryDependency
+									)
+								) {
+									return;
+								}
 								if (module.libIdent) {
 									const ident = module.libIdent({
 										context: this.options.context || compiler.options.context
diff --git a/lib/LibraryTemplatePlugin.js b/lib/LibraryTemplatePlugin.js
index 88c342cffe8..cc7c828e180 100644
--- a/lib/LibraryTemplatePlugin.js
+++ b/lib/LibraryTemplatePlugin.js
@@ -6,30 +6,45 @@
 
 const SetVarMainTemplatePlugin = require("./SetVarMainTemplatePlugin");
 
+/** @typedef {import("./Compiler")} Compiler */
+
+/**
+ * @param {string[]} accessor the accessor to convert to path
+ * @returns {string} the path
+ */
 const accessorToObjectAccess = accessor => {
-	return accessor
-		.map(a => {
-			return `[${JSON.stringify(a)}]`;
-		})
-		.join("");
+	return accessor.map(a => `[${JSON.stringify(a)}]`).join("");
 };
 
-const accessorAccess = (base, accessor, joinWith) => {
-	accessor = [].concat(accessor);
-	return accessor
-		.map((a, idx) => {
-			a = base
-				? base + accessorToObjectAccess(accessor.slice(0, idx + 1))
-				: accessor[0] + accessorToObjectAccess(accessor.slice(1, idx + 1));
-			if (idx === accessor.length - 1) return a;
+/**
+ * @param {string=} base the path prefix
+ * @param {string|string[]} accessor the accessor
+ * @param {string=} joinWith the element separator
+ * @returns {string} the path
+ */
+const accessorAccess = (base, accessor, joinWith = "; ") => {
+	const accessors = Array.isArray(accessor) ? accessor : [accessor];
+	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")
 				return `${a} = typeof ${a} === "object" ? ${a} : {}`;
 			return `${a} = ${a} || {}`;
 		})
-		.join(joinWith || "; ");
+		.join(joinWith);
 };
 
 class LibraryTemplatePlugin {
+	/**
+	 * @param {string} 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
+	 * @param {string|string[]} exportProperty which export should be exposed as library
+	 */
 	constructor(name, target, umdNamedDefine, auxiliaryComment, exportProperty) {
 		this.name = name;
 		this.target = target;
@@ -38,10 +53,14 @@ class LibraryTemplatePlugin {
 		this.exportProperty = exportProperty;
 	}
 
+	/**
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.thisCompilation.tap("LibraryTemplatePlugin", compilation => {
 			if (this.exportProperty) {
-				var ExportPropertyMainTemplatePlugin = require("./ExportPropertyMainTemplatePlugin");
+				const ExportPropertyMainTemplatePlugin = require("./ExportPropertyMainTemplatePlugin");
 				new ExportPropertyMainTemplatePlugin(this.exportProperty).apply(
 					compilation
 				);
@@ -49,66 +68,80 @@ class LibraryTemplatePlugin {
 			switch (this.target) {
 				case "var":
 					new SetVarMainTemplatePlugin(
-						`var ${accessorAccess(false, this.name)}`
+						`var ${accessorAccess(undefined, this.name)}`,
+						false
 					).apply(compilation);
 					break;
 				case "assign":
 					new SetVarMainTemplatePlugin(
-						accessorAccess(undefined, this.name)
+						accessorAccess(undefined, this.name),
+						false
 					).apply(compilation);
 					break;
 				case "this":
 				case "self":
 				case "window":
-					if (this.name)
+					if (this.name) {
 						new SetVarMainTemplatePlugin(
-							accessorAccess(this.target, this.name)
+							accessorAccess(this.target, this.name),
+							false
 						).apply(compilation);
-					else
+					} else {
 						new SetVarMainTemplatePlugin(this.target, true).apply(compilation);
+					}
 					break;
 				case "global":
-					if (this.name)
+					if (this.name) {
 						new SetVarMainTemplatePlugin(
 							accessorAccess(
 								compilation.runtimeTemplate.outputOptions.globalObject,
 								this.name
-							)
+							),
+							false
 						).apply(compilation);
-					else
+					} else {
 						new SetVarMainTemplatePlugin(
 							compilation.runtimeTemplate.outputOptions.globalObject,
 							true
 						).apply(compilation);
+					}
 					break;
 				case "commonjs":
-					if (this.name)
+					if (this.name) {
 						new SetVarMainTemplatePlugin(
-							accessorAccess("exports", this.name)
+							accessorAccess("exports", this.name),
+							false
 						).apply(compilation);
-					else new SetVarMainTemplatePlugin("exports", true).apply(compilation);
+					} else {
+						new SetVarMainTemplatePlugin("exports", true).apply(compilation);
+					}
 					break;
 				case "commonjs2":
 				case "commonjs-module":
-					new SetVarMainTemplatePlugin("module.exports").apply(compilation);
+					new SetVarMainTemplatePlugin("module.exports", false).apply(
+						compilation
+					);
 					break;
-				case "amd":
-					var AmdMainTemplatePlugin = require("./AmdMainTemplatePlugin");
+				case "amd": {
+					const AmdMainTemplatePlugin = require("./AmdMainTemplatePlugin");
 					new AmdMainTemplatePlugin(this.name).apply(compilation);
 					break;
+				}
 				case "umd":
-				case "umd2":
-					var UmdMainTemplatePlugin = require("./UmdMainTemplatePlugin");
+				case "umd2": {
+					const UmdMainTemplatePlugin = require("./UmdMainTemplatePlugin");
 					new UmdMainTemplatePlugin(this.name, {
 						optionalAmdExternalAsGlobal: this.target === "umd2",
 						namedDefine: this.umdNamedDefine,
 						auxiliaryComment: this.auxiliaryComment
 					}).apply(compilation);
 					break;
-				case "jsonp":
-					var JsonpExportMainTemplatePlugin = require("./web/JsonpExportMainTemplatePlugin");
+				}
+				case "jsonp": {
+					const JsonpExportMainTemplatePlugin = require("./web/JsonpExportMainTemplatePlugin");
 					new JsonpExportMainTemplatePlugin(this.name).apply(compilation);
 					break;
+				}
 				default:
 					throw new Error(`${this.target} is not a valid Library target`);
 			}
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
index 1a995ab256c..1b0dba4d06b 100644
--- a/lib/MainTemplate.js
+++ b/lib/MainTemplate.js
@@ -47,7 +47,7 @@ const Template = require("./Template");
 // __webpack_require__.t = create a fake namespace object
 // __webpack_require__.n = compatibility get default export
 // __webpack_require__.h = the webpack hash
-// __webpack_require__.w = an object containing all installed WebAssembly.Modules keys by module id
+// __webpack_require__.w = an object containing all installed WebAssembly.Instance export objects keyed by module id
 // __webpack_require__.oe = the uncaught error handler for the webpack runtime
 // __webpack_require__.nc = the script nonce
 
diff --git a/lib/Module.js b/lib/Module.js
index 057e767bfac..72f25857225 100644
--- a/lib/Module.js
+++ b/lib/Module.js
@@ -11,8 +11,8 @@ const ModuleReason = require("./ModuleReason");
 const SortableSet = require("./util/SortableSet");
 const Template = require("./Template");
 
-/** @typedef {typeof import("./Chunk")} Chunk */
-/** @typedef {typeof import("./RequestShortener")} RequestShortener */
+/** @typedef {import("./Chunk")} Chunk */
+/** @typedef {import("./RequestShortener")} RequestShortener */
 
 const EMPTY_RESOLVE_OPTIONS = {};
 
@@ -69,7 +69,7 @@ class Module extends DependenciesBlock {
 		this._chunks = new SortableSet(undefined, sortById);
 
 		// Info from Compilation (per Compilation)
-		/** @type {number | string} */
+		/** @type {number|string} */
 		this.id = null;
 		/** @type {number} */
 		this.index = null;
diff --git a/lib/ModuleDependencyError.js b/lib/ModuleDependencyError.js
index 9133e14453d..f52092021a3 100644
--- a/lib/ModuleDependencyError.js
+++ b/lib/ModuleDependencyError.js
@@ -7,7 +7,15 @@
 const WebpackError = require("./WebpackError");
 const formatLocation = require("./formatLocation");
 
-module.exports = class ModuleDependencyError extends WebpackError {
+/** @typedef {import("./Module")} Module */
+
+class ModuleDependencyError extends WebpackError {
+	/**
+	 * Creates an instance of ModuleDependencyError.
+	 * @param {Module} module module tied to dependency
+	 * @param {Error} err error thrown
+	 * @param {TODO} loc location of dependency
+	 */
 	constructor(module, err, loc) {
 		super();
 
@@ -22,4 +30,6 @@ module.exports = class ModuleDependencyError extends WebpackError {
 
 		Error.captureStackTrace(this, this.constructor);
 	}
-};
+}
+
+module.exports = ModuleDependencyError;
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
index 9bee66d076d..91ef80baf29 100644
--- a/lib/NormalModuleFactory.js
+++ b/lib/NormalModuleFactory.js
@@ -46,6 +46,8 @@ const identToLoaderRequest = resultString => {
 	}
 };
 
+const dependencyCache = new WeakMap();
+
 class NormalModuleFactory extends Tapable {
 	constructor(context, resolverFactory, options) {
 		super();
@@ -329,7 +331,7 @@ class NormalModuleFactory extends Tapable {
 
 	create(data, callback) {
 		const dependencies = data.dependencies;
-		const cacheEntry = dependencies[0].__NormalModuleFactoryCache;
+		const cacheEntry = dependencyCache.get(dependencies[0]);
 		if (cacheEntry) return callback(null, cacheEntry);
 		const context = data.context || this.context;
 		const resolveOptions = data.resolveOptions || EMPTY_RESOLVE_OPTIONS;
@@ -359,7 +361,7 @@ class NormalModuleFactory extends Tapable {
 
 					if (module && this.cachePredicate(module)) {
 						for (const d of dependencies) {
-							d.__NormalModuleFactoryCache = module;
+							dependencyCache.set(d, module);
 						}
 					}
 
@@ -399,7 +401,7 @@ class NormalModuleFactory extends Tapable {
 											`                 You need to specify '${
 												item.loader
 											}-loader' instead of '${item.loader}',\n` +
-											"                 see https://webpack.js.org/guides/migrating/#automatic-loader-module-name-extension-removed";
+											"                 see https://webpack.js.org/migrate/3/#automatic-loader-module-name-extension-removed";
 									}
 									callback(err);
 								}
diff --git a/lib/Parser.js b/lib/Parser.js
index de2e9690b04..cb91cc2ea83 100644
--- a/lib/Parser.js
+++ b/lib/Parser.js
@@ -1030,23 +1030,28 @@ class Parser extends Tapable {
 	}
 
 	walkForInStatement(statement) {
-		if (statement.left.type === "VariableDeclaration")
+		if (statement.left.type === "VariableDeclaration") {
 			this.walkVariableDeclaration(statement.left);
-		else this.walkPattern(statement.left);
+		} else {
+			this.walkPattern(statement.left);
+		}
 		this.walkExpression(statement.right);
 		this.walkStatement(statement.body);
 	}
 
 	prewalkForOfStatement(statement) {
-		if (statement.left.type === "VariableDeclaration")
+		if (statement.left.type === "VariableDeclaration") {
 			this.prewalkVariableDeclaration(statement.left);
+		}
 		this.prewalkStatement(statement.body);
 	}
 
 	walkForOfStatement(statement) {
-		if (statement.left.type === "VariableDeclaration")
+		if (statement.left.type === "VariableDeclaration") {
 			this.walkVariableDeclaration(statement.left);
-		else this.walkPattern(statement.left);
+		} else {
+			this.walkPattern(statement.left);
+		}
 		this.walkExpression(statement.right);
 		this.walkStatement(statement.body);
 	}
@@ -1062,8 +1067,10 @@ class Parser extends Tapable {
 	walkFunctionDeclaration(statement) {
 		const wasTopLevel = this.scope.topLevelScope;
 		this.scope.topLevelScope = false;
-		for (const param of statement.params) this.walkPattern(param);
 		this.inScope(statement.params, () => {
+			for (const param of statement.params) {
+				this.walkPattern(param);
+			}
 			if (statement.body.type === "BlockStatement") {
 				this.detectStrictMode(statement.body.body);
 				this.prewalkStatement(statement.body);
@@ -1355,13 +1362,10 @@ class Parser extends Tapable {
 	}
 
 	walkExpressions(expressions) {
-		for (
-			let expressionsIndex = 0, len = expressions.length;
-			expressionsIndex < len;
-			expressionsIndex++
-		) {
-			const expression = expressions[expressionsIndex];
-			if (expression) this.walkExpression(expression);
+		for (const expression of expressions) {
+			if (expression) {
+				this.walkExpression(expression);
+			}
 		}
 	}
 
@@ -1469,8 +1473,10 @@ class Parser extends Tapable {
 	walkFunctionExpression(expression) {
 		const wasTopLevel = this.scope.topLevelScope;
 		this.scope.topLevelScope = false;
-		for (const param of expression.params) this.walkPattern(param);
 		this.inScope(expression.params, () => {
+			for (const param of expression.params) {
+				this.walkPattern(param);
+			}
 			if (expression.body.type === "BlockStatement") {
 				this.detectStrictMode(expression.body.body);
 				this.prewalkStatement(expression.body);
@@ -1483,8 +1489,10 @@ class Parser extends Tapable {
 	}
 
 	walkArrowFunctionExpression(expression) {
-		for (const param of expression.params) this.walkPattern(param);
 		this.inScope(expression.params, () => {
+			for (const param of expression.params) {
+				this.walkPattern(param);
+			}
 			if (expression.body.type === "BlockStatement") {
 				this.detectStrictMode(expression.body.body);
 				this.prewalkStatement(expression.body);
@@ -1640,7 +1648,9 @@ class Parser extends Tapable {
 			if (functionExpression.body.type === "BlockStatement") {
 				this.prewalkStatement(functionExpression.body);
 				this.walkStatement(functionExpression.body);
-			} else this.walkExpression(functionExpression.body);
+			} else {
+				this.walkExpression(functionExpression.body);
+			}
 		});
 		this.scope.topLevelScope = wasTopLevel;
 	}
@@ -1743,13 +1753,7 @@ class Parser extends Tapable {
 
 		this.scope.renames.set("this", null);
 
-		for (
-			let paramIndex = 0, len = params.length;
-			paramIndex < len;
-			paramIndex++
-		) {
-			const param = params[paramIndex];
-
+		for (const param of params) {
 			if (typeof param !== "string") {
 				this.enterPattern(param, param => {
 					this.scope.renames.set(param, null);
diff --git a/lib/ProgressPlugin.js b/lib/ProgressPlugin.js
index 713e8d9db26..137bb492ea5 100644
--- a/lib/ProgressPlugin.js
+++ b/lib/ProgressPlugin.js
@@ -83,7 +83,7 @@ class ProgressPlugin {
 			const states = new Array(compiler.compilers.length);
 			compiler.compilers.forEach((compiler, idx) => {
 				new ProgressPlugin((p, msg, ...args) => {
-					states[idx] = args;
+					states[idx] = [p, msg, ...args];
 					handler(
 						states
 							.map(state => (state && state[0]) || 0)
diff --git a/lib/RecordIdsPlugin.js b/lib/RecordIdsPlugin.js
index a2a3d6406d3..2fa78da9e3b 100644
--- a/lib/RecordIdsPlugin.js
+++ b/lib/RecordIdsPlugin.js
@@ -21,6 +21,7 @@ class RecordIdsPlugin {
 					if (!records.modules.byIdentifier) records.modules.byIdentifier = {};
 					if (!records.modules.usedIds) records.modules.usedIds = {};
 					for (const module of modules) {
+						if (typeof module.id !== "number") continue;
 						const identifier = portableIds
 							? identifierUtils.makePathsRelative(
 									compiler.context,
@@ -110,6 +111,7 @@ class RecordIdsPlugin {
 					if (!records.chunks.bySource) records.chunks.bySource = {};
 					const usedIds = new Set();
 					for (const chunk of chunks) {
+						if (typeof chunk.id !== "number") continue;
 						const name = chunk.name;
 						if (name) records.chunks.byName[name] = chunk.id;
 						const sources = getChunkSources(chunk);
@@ -118,7 +120,7 @@ class RecordIdsPlugin {
 						}
 						usedIds.add(chunk.id);
 					}
-					records.chunks.usedIds = Array.from(usedIds);
+					records.chunks.usedIds = Array.from(usedIds).sort();
 				}
 			);
 			compilation.hooks.reviveChunks.tap(
diff --git a/lib/RuntimeTemplate.js b/lib/RuntimeTemplate.js
index 70f8eeb1295..7e975437f7e 100644
--- a/lib/RuntimeTemplate.js
+++ b/lib/RuntimeTemplate.js
@@ -44,7 +44,7 @@ module.exports = class RuntimeTemplate {
 	}
 
 	throwMissingModuleErrorFunction({ request }) {
-		const err = `Cannot find module "${request}"`;
+		const err = `Cannot find module '${request}'`;
 		return `function webpackMissingModule() { var e = new Error(${JSON.stringify(
 			err
 		)}); e.code = 'MODULE_NOT_FOUND'; throw e; }`;
@@ -65,10 +65,16 @@ module.exports = class RuntimeTemplate {
 	}
 
 	moduleId({ module, request }) {
-		if (!module)
+		if (!module) {
 			return this.missingModule({
 				request
 			});
+		}
+		if (module.id === null) {
+			throw new Error(
+				`RuntimeTemplate.moduleId(): Module ${module.identifier()} has no id. This should not happen.`
+			);
+		}
 		return `${this.comment({ request })}${JSON.stringify(module.id)}`;
 	}
 
@@ -113,10 +119,16 @@ module.exports = class RuntimeTemplate {
 	}
 
 	moduleNamespacePromise({ block, module, request, message, strict, weak }) {
-		if (!module)
+		if (!module) {
 			return this.missingModulePromise({
 				request
 			});
+		}
+		if (module.id === null) {
+			throw new Error(
+				`RuntimeTemplate.moduleNamespacePromise(): Module ${module.identifier()} has no id. This should not happen.`
+			);
+		}
 		const promise = this.blockPromise({
 			block,
 			message
@@ -175,10 +187,11 @@ module.exports = class RuntimeTemplate {
 	}
 
 	importStatement({ update, module, request, importVar, originModule }) {
-		if (!module)
+		if (!module) {
 			return this.missingModuleStatement({
 				request
 			});
+		}
 		const moduleId = this.moduleId({
 			module,
 			request
diff --git a/lib/SetVarMainTemplatePlugin.js b/lib/SetVarMainTemplatePlugin.js
index 441a585d2c5..63db2821a54 100644
--- a/lib/SetVarMainTemplatePlugin.js
+++ b/lib/SetVarMainTemplatePlugin.js
@@ -6,12 +6,24 @@
 
 const { ConcatSource } = require("webpack-sources");
 
+/** @typedef {import("./Compilation")} Compilation */
+
 class SetVarMainTemplatePlugin {
+	/**
+	 * @param {string} varExpression the accessor where the library is exported
+	 * @param {boolean} copyObject specify copying the exports
+	 */
 	constructor(varExpression, copyObject) {
+		/** @type {string} */
 		this.varExpression = varExpression;
+		/** @type {boolean} */
 		this.copyObject = copyObject;
 	}
 
+	/**
+	 * @param {Compilation} compilation the compilation instance
+	 * @returns {void}
+	 */
 	apply(compilation) {
 		const { mainTemplate, chunkTemplate } = compilation;
 
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
index 6fd4408e35c..cb6e8b27131 100644
--- a/lib/SourceMapDevToolPlugin.js
+++ b/lib/SourceMapDevToolPlugin.js
@@ -18,12 +18,14 @@ const basename = name => {
 	return name.substr(name.lastIndexOf("/") + 1);
 };
 
+const assetsCache = new WeakMap();
+
 const getTaskForFile = (file, chunk, options, compilation) => {
 	const asset = compilation.assets[file];
-	if (asset.__SourceMapDevToolFile === file && asset.__SourceMapDevToolData) {
-		const data = asset.__SourceMapDevToolData;
-		for (const cachedFile in data) {
-			compilation.assets[cachedFile] = data[cachedFile];
+	const cache = assetsCache.get(asset);
+	if (cache && cache.file === file) {
+		for (const cachedFile in cache.assets) {
+			compilation.assets[cachedFile] = cache.assets[cachedFile];
 			if (cachedFile !== file) chunk.files.push(cachedFile);
 		}
 		return;
@@ -207,6 +209,7 @@ class SourceMapDevToolPlugin {
 							task.file,
 							"attach SourceMap"
 						);
+						const assets = Object.create(null);
 						const chunk = task.chunk;
 						const file = task.file;
 						const asset = task.asset;
@@ -222,8 +225,7 @@ class SourceMapDevToolPlugin {
 						}
 						sourceMap.sourceRoot = options.sourceRoot || "";
 						sourceMap.file = file;
-						asset.__SourceMapDevToolFile = file;
-						asset.__SourceMapDevToolData = {};
+						assetsCache.set(asset, { file, assets });
 						let currentSourceMappingURLComment = sourceMappingURLComment;
 						if (
 							currentSourceMappingURLComment !== false &&
@@ -260,9 +262,7 @@ class SourceMapDevToolPlugin {
 										.relative(path.dirname(file), sourceMapFile)
 										.replace(/\\/g, "/");
 							if (currentSourceMappingURLComment !== false) {
-								asset.__SourceMapDevToolData[file] = compilation.assets[
-									file
-								] = new ConcatSource(
+								assets[file] = compilation.assets[file] = new ConcatSource(
 									new RawSource(source),
 									currentSourceMappingURLComment.replace(
 										/\[url\]/g,
@@ -270,14 +270,12 @@ class SourceMapDevToolPlugin {
 									)
 								);
 							}
-							asset.__SourceMapDevToolData[sourceMapFile] = compilation.assets[
+							assets[sourceMapFile] = compilation.assets[
 								sourceMapFile
 							] = new RawSource(sourceMapString);
 							chunk.files.push(sourceMapFile);
 						} else {
-							asset.__SourceMapDevToolData[file] = compilation.assets[
-								file
-							] = new ConcatSource(
+							assets[file] = compilation.assets[file] = new ConcatSource(
 								new RawSource(source),
 								currentSourceMappingURLComment
 									.replace(/\[map\]/g, () => sourceMapString)
diff --git a/lib/Template.js b/lib/Template.js
index 440baf39a8e..92327ac49f0 100644
--- a/lib/Template.js
+++ b/lib/Template.js
@@ -44,10 +44,8 @@ const stringifyIdSortPredicate = (a, b) => {
 	return 0;
 };
 
-//TODO: Change type to Module when import works
-//https://github.com/Microsoft/TypeScript/issues/23375
 /**
- * @param {HasId} module the module to compare against
+ * @param {Module} module the module to compare against
  * @returns {boolean} return true if module.id is equal to type "number"
  */
 const moduleIdIsNumber = module => {
@@ -177,17 +175,19 @@ class Template {
 
 	/**
 	 *
-	 * @param {HasId[]} modules - a collection of modules to get array bounds for
+	 * @param {Module[]} 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;
 		for (const module of modules) {
-			if (maxId < module.id) maxId = module.id;
-			if (minId > module.id) minId = module.id;
+			if (maxId < module.id) maxId = /** @type {number} */ (module.id);
+			if (minId > module.id) minId = /** @type {number} */ (module.id);
 		}
 		if (minId < 16 + ("" + minId).length) {
 			// add minId x ',' instead of 'Array(minId).concat(…)'
@@ -206,7 +206,6 @@ class Template {
 	}
 
 	/**
-	 *
 	 * @param {Chunk} chunk chunk whose modules will be rendered
 	 * @param {ModuleFilterPredicate} filterFn function used to filter modules from chunk to render
 	 * @param {ModuleTemplate} moduleTemplate ModuleTemplate instance used to render modules
diff --git a/lib/UmdMainTemplatePlugin.js b/lib/UmdMainTemplatePlugin.js
index 8f1ea5799c4..5c794767f0a 100644
--- a/lib/UmdMainTemplatePlugin.js
+++ b/lib/UmdMainTemplatePlugin.js
@@ -7,22 +7,59 @@
 const { ConcatSource, OriginalSource } = require("webpack-sources");
 const Template = require("./Template");
 
-function accessorToObjectAccess(accessor) {
+/** @typedef {import("./Compilation")} Compilation */
+
+/**
+ * @param {string[]} accessor the accessor to convert to path
+ * @returns {string} the path
+ */
+const accessorToObjectAccess = accessor => {
 	return accessor.map(a => `[${JSON.stringify(a)}]`).join("");
-}
+};
 
-function accessorAccess(base, accessor) {
-	accessor = [].concat(accessor);
-	return accessor
-		.map((a, idx) => {
-			a = base + accessorToObjectAccess(accessor.slice(0, idx + 1));
-			if (idx === accessor.length - 1) return a;
+/**
+ * @param {string=} base the path prefix
+ * @param {string|string[]} accessor the accessor
+ * @param {string=} joinWith the element separator
+ * @returns {string} the path
+ */
+const accessorAccess = (base, accessor, joinWith = ", ") => {
+	const accessors = Array.isArray(accessor) ? accessor : [accessor];
+	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")
+				return `${a} = typeof ${a} === "object" ? ${a} : {}`;
 			return `${a} = ${a} || {}`;
 		})
-		.join(", ");
-}
+		.join(joinWith);
+};
+
+/** @typedef {string | string[] | Record<string, string | string[]>} UmdMainTemplatePluginName */
+
+/**
+ * @typedef {Object} AuxiliaryCommentObject
+ * @property {string} root
+ * @property {string} commonjs
+ * @property {string} commonjs2
+ * @property {string} amd
+ */
+
+/**
+ * @typedef {Object} UmdMainTemplatePluginOption
+ * @property {boolean=} optionalAmdExternalAsGlobal
+ * @property {boolean} namedDefine
+ * @property {string | AuxiliaryCommentObject} auxiliaryComment
+ */
 
 class UmdMainTemplatePlugin {
+	/**
+	 * @param {UmdMainTemplatePluginName} name the name of the UMD library
+	 * @param {UmdMainTemplatePluginOption} options the plugin option
+	 */
 	constructor(name, options) {
 		if (typeof name === "object" && !Array.isArray(name)) {
 			this.name = name.root || name.amd || name.commonjs;
@@ -40,6 +77,10 @@ class UmdMainTemplatePlugin {
 		this.auxiliaryComment = options.auxiliaryComment;
 	}
 
+	/**
+	 * @param {Compilation} compilation the compilation instance
+	 * @returns {void}
+	 */
 	apply(compilation) {
 		const { mainTemplate, chunkTemplate, runtimeTemplate } = compilation;
 
@@ -152,23 +193,27 @@ class UmdMainTemplatePlugin {
 				amdFactory = "factory";
 			}
 
+			const auxiliaryComment = this.auxiliaryComment;
+
+			const getAuxilaryComment = type => {
+				if (auxiliaryComment) {
+					if (typeof auxiliaryComment === "string")
+						return "\t//" + auxiliaryComment + "\n";
+					if (auxiliaryComment[type])
+						return "\t//" + auxiliaryComment[type] + "\n";
+				}
+				return "";
+			};
+
 			return new ConcatSource(
 				new OriginalSource(
 					"(function webpackUniversalModuleDefinition(root, factory) {\n" +
-						(this.auxiliaryComment && typeof this.auxiliaryComment === "string"
-							? "	//" + this.auxiliaryComment + "\n"
-							: this.auxiliaryComment.commonjs2
-								? "	//" + this.auxiliaryComment.commonjs2 + "\n"
-								: "") +
+						getAuxilaryComment("commonjs2") +
 						"	if(typeof exports === 'object' && typeof module === 'object')\n" +
 						"		module.exports = factory(" +
 						externalsRequireArray("commonjs2") +
 						");\n" +
-						(this.auxiliaryComment && typeof this.auxiliaryComment === "string"
-							? "	//" + this.auxiliaryComment + "\n"
-							: this.auxiliaryComment.amd
-								? "	//" + this.auxiliaryComment.amd + "\n"
-								: "") +
+						getAuxilaryComment("amd") +
 						"	else if(typeof define === 'function' && define.amd)\n" +
 						(requiredExternals.length > 0
 							? this.names.amd && this.namedDefine === true
@@ -192,24 +237,14 @@ class UmdMainTemplatePlugin {
 								  ");\n"
 								: "		define([], " + amdFactory + ");\n") +
 						(this.names.root || this.names.commonjs
-							? (this.auxiliaryComment &&
-							  typeof this.auxiliaryComment === "string"
-									? "	//" + this.auxiliaryComment + "\n"
-									: this.auxiliaryComment.commonjs
-										? "	//" + this.auxiliaryComment.commonjs + "\n"
-										: "") +
+							? getAuxilaryComment("commonjs") +
 							  "	else if(typeof exports === 'object')\n" +
 							  "		exports[" +
 							  libraryName(this.names.commonjs || this.names.root) +
 							  "] = factory(" +
 							  externalsRequireArray("commonjs") +
 							  ");\n" +
-							  (this.auxiliaryComment &&
-							  typeof this.auxiliaryComment === "string"
-									? "	//" + this.auxiliaryComment + "\n"
-									: this.auxiliaryComment.root
-										? "	//" + this.auxiliaryComment.root + "\n"
-										: "") +
+							  getAuxilaryComment("root") +
 							  "	else\n" +
 							  "		" +
 							  replaceKeys(
diff --git a/lib/WebpackError.js b/lib/WebpackError.js
index 4fd23388178..8451fcb7d74 100644
--- a/lib/WebpackError.js
+++ b/lib/WebpackError.js
@@ -4,7 +4,11 @@
 */
 "use strict";
 
-module.exports = class WebpackError extends Error {
+class WebpackError extends Error {
+	/**
+	 * Creates an instance of WebpackError.
+	 * @param {string=} message error message
+	 */
 	constructor(message) {
 		super(message);
 
@@ -16,4 +20,6 @@ module.exports = class WebpackError extends Error {
 	inspect() {
 		return this.stack + (this.details ? `\n${this.details}` : "");
 	}
-};
+}
+
+module.exports = WebpackError;
diff --git a/lib/compareLocations.js b/lib/compareLocations.js
index 51227f25463..7dce42bdb12 100644
--- a/lib/compareLocations.js
+++ b/lib/compareLocations.js
@@ -3,6 +3,26 @@
 	Author Tobias Koppers @sokra
 */
 "use strict";
+
+/**
+ * @typedef {Object} LineAndColumn
+ * @property {number=} line
+ * @property {number=} column
+ */
+
+/**
+ * @typedef {Object} NodeLocation
+ * @property {LineAndColumn=} start
+ * @property {LineAndColumn=} end
+ * @property {number=} index
+ */
+
+/**
+ * Compare two locations
+ * @param {string|NodeLocation} a A location node
+ * @param {string|NodeLocation} b A location node
+ * @returns {-1|0|1} sorting comparator value
+ */
 module.exports = (a, b) => {
 	if (typeof a === "string") {
 		if (typeof b === "string") {
diff --git a/lib/dependencies/HarmonyExportImportedSpecifierDependency.js b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
index 724d922fde4..2f7616080be 100644
--- a/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
+++ b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
@@ -9,14 +9,27 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 const Template = require("../Template");
 const HarmonyLinkingError = require("../HarmonyLinkingError");
 
+/** @typedef {import("../Module")} Module */
+
+/** @typedef {"missing"|"unused"|"empty-star"|"reexport-non-harmony-default"|"reexport-named-default"|"reexport-namespace-object"|"reexport-non-harmony-default-strict"|"reexport-fake-namespace-object"|"rexport-non-harmony-undefined"|"safe-reexport"|"checked-reexport"|"dynamic-reexport"} ExportModeType */
+
+/** @type {Map<string, string>} */
 const EMPTY_MAP = new Map();
 
 class ExportMode {
+	/**
+	 * @param {ExportModeType} type type of the mode
+	 */
 	constructor(type) {
+		/** @type {ExportModeType} */
 		this.type = type;
+		/** @type {string|null} */
 		this.name = null;
+		/** @type {Map<string, string>} */
 		this.map = EMPTY_MAP;
+		/** @type {Module|null} */
 		this.module = null;
+		/** @type {string|null} */
 		this.userRequest = null;
 	}
 }
@@ -51,7 +64,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		const name = this.name;
 		const id = this.id;
 		const used = this.originModule.isUsed(name);
-		const importedModule = this.module;
+		const importedModule = this._module;
 
 		if (!importedModule) {
 			const mode = new ExportMode("missing");
@@ -237,7 +250,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		const result = new Set();
 		// try to learn impossible exports from other star exports with provided exports
 		for (const otherStarExport of this.otherStarExports) {
-			const otherImportedModule = otherStarExport.module;
+			const otherImportedModule = otherStarExport._module;
 			if (
 				otherImportedModule &&
 				Array.isArray(otherImportedModule.buildMeta.providedExports)
@@ -310,7 +323,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	_getErrors() {
-		const importedModule = this.module;
+		const importedModule = this._module;
 		if (!importedModule) {
 			return;
 		}
@@ -354,7 +367,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 
 	updateHash(hash) {
 		super.updateHash(hash);
-		const hashValue = this.getHashValue(this.module);
+		const hashValue = this.getHashValue(this._module);
 		hash.update(hashValue);
 	}
 
@@ -387,7 +400,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 			const used = dep.originModule.isUsed(dep.name);
 			if (!used) return NaN;
 		} else {
-			const importedModule = dep.module;
+			const importedModule = dep._module;
 
 			const activeFromOtherStarExports = dep._discoverActiveExportsFromOtherStartExports();
 
@@ -424,7 +437,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	getContent(dep) {
 		const mode = dep.getMode(false);
 		const module = dep.originModule;
-		const importedModule = dep.module;
+		const importedModule = dep._module;
 		const importVar = dep.getImportVar();
 
 		switch (mode.type) {
diff --git a/lib/dependencies/HarmonyImportDependency.js b/lib/dependencies/HarmonyImportDependency.js
index 099318072ff..162c1030037 100644
--- a/lib/dependencies/HarmonyImportDependency.js
+++ b/lib/dependencies/HarmonyImportDependency.js
@@ -11,32 +11,37 @@ const Template = require("../Template");
 class HarmonyImportDependency extends ModuleDependency {
 	constructor(request, originModule, sourceOrder, parserScope) {
 		super(request);
+		this.redirectedModule = undefined;
 		this.originModule = originModule;
 		this.sourceOrder = sourceOrder;
 		this.parserScope = parserScope;
 	}
 
+	get _module() {
+		return this.redirectedModule || this.module;
+	}
+
 	getReference() {
-		if (!this.module) return null;
-		return new DependencyReference(this.module, false, this.weak);
+		if (!this._module) return null;
+		return new DependencyReference(this._module, false, this.weak);
 	}
 
 	getImportVar() {
 		let importVarMap = this.parserScope.importVarMap;
 		if (!importVarMap) this.parserScope.importVarMap = importVarMap = new Map();
-		let importVar = importVarMap.get(this.module);
+		let importVar = importVarMap.get(this._module);
 		if (importVar) return importVar;
 		importVar = `${Template.toIdentifier(
 			`${this.userRequest}`
 		)}__WEBPACK_IMPORTED_MODULE_${importVarMap.size}__`;
-		importVarMap.set(this.module, importVar);
+		importVarMap.set(this._module, importVar);
 		return importVar;
 	}
 
 	getImportStatement(update, runtime) {
 		return runtime.importStatement({
 			update,
-			module: this.module,
+			module: this._module,
 			importVar: this.getImportVar(),
 			request: this.request,
 			originModule: this.originModule
@@ -45,7 +50,7 @@ class HarmonyImportDependency extends ModuleDependency {
 
 	updateHash(hash) {
 		super.updateHash(hash);
-		const importedModule = this.module;
+		const importedModule = this._module;
 		hash.update(
 			(importedModule &&
 				(!importedModule.buildMeta || importedModule.buildMeta.exportsType)) +
@@ -53,6 +58,11 @@ class HarmonyImportDependency extends ModuleDependency {
 		);
 		hash.update((importedModule && importedModule.id) + "");
 	}
+
+	disconnect() {
+		super.disconnect();
+		this.redirectedModule = undefined;
+	}
 }
 
 module.exports = HarmonyImportDependency;
@@ -71,7 +81,7 @@ HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate {
 	static isImportEmitted(dep, source) {
 		let sourceInfo = importEmittedMap.get(source);
 		if (!sourceInfo) return false;
-		const key = dep.module || dep.request;
+		const key = dep._module || dep.request;
 		return key && sourceInfo.emittedImports.get(key);
 	}
 
@@ -85,7 +95,7 @@ HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate {
 				})
 			);
 		}
-		const key = dep.module || dep.request;
+		const key = dep._module || dep.request;
 		if (key && sourceInfo.emittedImports.get(key)) return;
 		sourceInfo.emittedImports.set(key, true);
 		const content = dep.getImportStatement(false, runtime);
diff --git a/lib/dependencies/HarmonyImportSideEffectDependency.js b/lib/dependencies/HarmonyImportSideEffectDependency.js
index dcfb52499a8..a41c1b95bc6 100644
--- a/lib/dependencies/HarmonyImportSideEffectDependency.js
+++ b/lib/dependencies/HarmonyImportSideEffectDependency.js
@@ -11,7 +11,7 @@ class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
 	}
 
 	getReference() {
-		if (this.module && this.module.factoryMeta.sideEffectFree) return null;
+		if (this._module && this._module.factoryMeta.sideEffectFree) return null;
 
 		return super.getReference();
 	}
@@ -23,7 +23,7 @@ class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
 
 HarmonyImportSideEffectDependency.Template = class HarmonyImportSideEffectDependencyTemplate extends HarmonyImportDependency.Template {
 	getHarmonyInitOrder(dep) {
-		if (dep.module && dep.module.factoryMeta.sideEffectFree) return NaN;
+		if (dep._module && dep._module.factoryMeta.sideEffectFree) return NaN;
 		return super.getHarmonyInitOrder(dep);
 	}
 };
diff --git a/lib/dependencies/HarmonyImportSpecifierDependency.js b/lib/dependencies/HarmonyImportSpecifierDependency.js
index b24ffe4fb2a..3a9ba5ae4ef 100644
--- a/lib/dependencies/HarmonyImportSpecifierDependency.js
+++ b/lib/dependencies/HarmonyImportSpecifierDependency.js
@@ -21,6 +21,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	) {
 		super(request, originModule, sourceOrder, parserScope);
 		this.id = id === null ? null : `${id}`;
+		this.redirectedId = undefined;
 		this.name = name;
 		this.range = range;
 		this.strictExportPresence = strictExportPresence;
@@ -35,11 +36,15 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 		return "harmony import specifier";
 	}
 
+	get _id() {
+		return this.redirectedId || this.id;
+	}
+
 	getReference() {
-		if (!this.module) return null;
+		if (!this._module) return null;
 		return new DependencyReference(
-			this.module,
-			this.id && !this.namespaceObjectAsContext ? [this.id] : true,
+			this._module,
+			this._id && !this.namespaceObjectAsContext ? [this._id] : true,
 			false
 		);
 	}
@@ -65,7 +70,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	}
 
 	_getErrors() {
-		const importedModule = this.module;
+		const importedModule = this._module;
 		if (!importedModule) {
 			return;
 		}
@@ -74,11 +79,11 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 			// It's not an harmony module
 			if (
 				this.originModule.buildMeta.strictHarmonyModule &&
-				this.id !== "default"
+				this._id !== "default"
 			) {
 				// In strict harmony modules we only support the default export
-				const exportName = this.id
-					? `the named export '${this.id}'`
+				const exportName = this._id
+					? `the named export '${this._id}'`
 					: "the namespace object";
 				return [
 					new HarmonyLinkingError(
@@ -89,20 +94,20 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 			return;
 		}
 
-		if (!this.id) {
+		if (!this._id) {
 			return;
 		}
 
-		if (importedModule.isProvided(this.id) !== false) {
+		if (importedModule.isProvided(this._id) !== false) {
 			// It's provided or we are not sure
 			return;
 		}
 
 		// We are sure that it's not provided
 		const idIsNotNameMessage =
-			this.id !== this.name ? ` (imported as '${this.name}')` : "";
+			this._id !== this.name ? ` (imported as '${this.name}')` : "";
 		const errorMessage = `"export '${
-			this.id
+			this._id
 		}'${idIsNotNameMessage} was not found in '${this.userRequest}'`;
 		return [new HarmonyLinkingError(errorMessage)];
 	}
@@ -114,10 +119,10 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 
 	updateHash(hash) {
 		super.updateHash(hash);
-		const importedModule = this.module;
-		hash.update((importedModule && this.id) + "");
+		const importedModule = this._module;
+		hash.update((importedModule && this._id) + "");
 		hash.update(
-			(importedModule && this.id && importedModule.isUsed(this.id)) + ""
+			(importedModule && this._id && importedModule.isUsed(this._id)) + ""
 		);
 		hash.update(
 			(importedModule &&
@@ -129,6 +134,11 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 				importedModule.used + JSON.stringify(importedModule.usedExports)) + ""
 		);
 	}
+
+	disconnect() {
+		super.disconnect();
+		this.redirectedId = undefined;
+	}
 }
 
 HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependencyTemplate extends HarmonyImportDependency.Template {
@@ -140,9 +150,9 @@ HarmonyImportSpecifierDependency.Template = class HarmonyImportSpecifierDependen
 
 	getContent(dep, runtime) {
 		const exportExpr = runtime.exportFromImport({
-			module: dep.module,
+			module: dep._module,
 			request: dep.request,
-			exportName: dep.id,
+			exportName: dep._id,
 			originModule: dep.originModule,
 			asiSafe: dep.shorthand,
 			isCall: dep.call,
diff --git a/lib/dependencies/WebAssemblyImportDependency.js b/lib/dependencies/WebAssemblyImportDependency.js
index 2f03978e2a0..ee1e60755ac 100644
--- a/lib/dependencies/WebAssemblyImportDependency.js
+++ b/lib/dependencies/WebAssemblyImportDependency.js
@@ -11,8 +11,11 @@ const UnsupportedWebAssemblyFeatureError = require("../wasm/UnsupportedWebAssemb
 class WebAssemblyImportDependency extends ModuleDependency {
 	constructor(request, name, description, onlyDirectImport) {
 		super(request);
+		/** @type {string} */
 		this.name = name;
+		/** @type {TODO} */
 		this.description = description;
+		/** @type {false | string} */
 		this.onlyDirectImport = onlyDirectImport;
 	}
 
@@ -27,10 +30,11 @@ class WebAssemblyImportDependency extends ModuleDependency {
 			this.module &&
 			!this.module.type.startsWith("webassembly")
 		) {
-			const type = this.description.type;
 			return [
 				new UnsupportedWebAssemblyFeatureError(
-					`${type} imports are only available for direct wasm to wasm dependencies`
+					`Import with ${
+						this.onlyDirectImport
+					} can only be used for direct wasm to wasm dependencies`
 				)
 			];
 		}
diff --git a/lib/dependencies/WebpackMissingModule.js b/lib/dependencies/WebpackMissingModule.js
index 826bba5a713..a55c9ec087f 100644
--- a/lib/dependencies/WebpackMissingModule.js
+++ b/lib/dependencies/WebpackMissingModule.js
@@ -10,11 +10,11 @@ exports.module = request =>
 	`!(function webpackMissingModule() { ${exports.moduleCode(request)} }())`;
 
 exports.promise = request => {
-	const errorCode = toErrorCode(`Cannot find module "${request}"`);
+	const errorCode = toErrorCode(`Cannot find module '${request}'`);
 	return `Promise.reject(function webpackMissingModule() { ${errorCode} return e; }())`;
 };
 
 exports.moduleCode = request => {
-	const errorCode = toErrorCode(`Cannot find module "${request}"`);
+	const errorCode = toErrorCode(`Cannot find module '${request}'`);
 	return `${errorCode} throw e;`;
 };
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
index a659604b68e..4c7ced9cc7c 100644
--- a/lib/optimize/ConcatenatedModule.js
+++ b/lib/optimize/ConcatenatedModule.js
@@ -308,7 +308,7 @@ class ConcatenatedModule extends Module {
 				for (const d of m.dependencies.filter(
 					dep =>
 						!(dep instanceof HarmonyImportDependency) ||
-						!modulesSet.has(dep.module)
+						!modulesSet.has(dep._module)
 				)) {
 					this.dependencies.push(d);
 				}
@@ -459,7 +459,7 @@ class ConcatenatedModule extends Module {
 						) {
 							const exportName = dep.name;
 							const importName = dep.id;
-							const importedModule = dep.module;
+							const importedModule = dep._module;
 							if (exportName && importName) {
 								if (!reexportMap.has(exportName)) {
 									reexportMap.set(exportName, {
@@ -1141,7 +1141,7 @@ class HarmonyImportSpecifierDependencyConcatenatedTemplate {
 	}
 
 	getHarmonyInitOrder(dep) {
-		const module = dep.module;
+		const module = dep._module;
 		const info = this.modulesMap.get(module);
 		if (!info) {
 			return this.originalTemplate.getHarmonyInitOrder(dep);
@@ -1150,7 +1150,7 @@ class HarmonyImportSpecifierDependencyConcatenatedTemplate {
 	}
 
 	harmonyInit(dep, source, runtimeTemplate, dependencyTemplates) {
-		const module = dep.module;
+		const module = dep._module;
 		const info = this.modulesMap.get(module);
 		if (!info) {
 			this.originalTemplate.harmonyInit(
@@ -1164,7 +1164,7 @@ class HarmonyImportSpecifierDependencyConcatenatedTemplate {
 	}
 
 	apply(dep, source, runtime, dependencyTemplates) {
-		const module = dep.module;
+		const module = dep._module;
 		const info = this.modulesMap.get(module);
 		if (!info) {
 			this.originalTemplate.apply(dep, source, runtime, dependencyTemplates);
@@ -1175,14 +1175,14 @@ class HarmonyImportSpecifierDependencyConcatenatedTemplate {
 		const strictFlag = dep.originModule.buildMeta.strictHarmonyModule
 			? "_strict"
 			: "";
-		if (dep.id === null) {
+		if (dep._id === null) {
 			content = `__WEBPACK_MODULE_REFERENCE__${info.index}_ns${strictFlag}__`;
 		} else if (dep.namespaceObjectAsContext) {
 			content = `__WEBPACK_MODULE_REFERENCE__${
 				info.index
-			}_ns${strictFlag}__[${JSON.stringify(dep.id)}]`;
+			}_ns${strictFlag}__[${JSON.stringify(dep._id)}]`;
 		} else {
-			const exportData = Buffer.from(dep.id, "utf-8").toString("hex");
+			const exportData = Buffer.from(dep._id, "utf-8").toString("hex");
 			content = `__WEBPACK_MODULE_REFERENCE__${
 				info.index
 			}_${exportData}${callFlag}${strictFlag}__`;
@@ -1201,7 +1201,7 @@ class HarmonyImportSideEffectDependencyConcatenatedTemplate {
 	}
 
 	getHarmonyInitOrder(dep) {
-		const module = dep.module;
+		const module = dep._module;
 		const info = this.modulesMap.get(module);
 		if (!info) {
 			return this.originalTemplate.getHarmonyInitOrder(dep);
@@ -1210,7 +1210,7 @@ class HarmonyImportSideEffectDependencyConcatenatedTemplate {
 	}
 
 	harmonyInit(dep, source, runtime, dependencyTemplates) {
-		const module = dep.module;
+		const module = dep._module;
 		const info = this.modulesMap.get(module);
 		if (!info) {
 			this.originalTemplate.harmonyInit(
@@ -1224,7 +1224,7 @@ class HarmonyImportSideEffectDependencyConcatenatedTemplate {
 	}
 
 	apply(dep, source, runtime, dependencyTemplates) {
-		const module = dep.module;
+		const module = dep._module;
 		const info = this.modulesMap.get(module);
 		if (!info) {
 			this.originalTemplate.apply(dep, source, runtime, dependencyTemplates);
@@ -1298,7 +1298,7 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 	}
 
 	getExports(dep) {
-		const importModule = dep.module;
+		const importModule = dep._module;
 		if (dep.id) {
 			// export { named } from "module"
 			return [
@@ -1332,7 +1332,7 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 	}
 
 	getHarmonyInitOrder(dep) {
-		const module = dep.module;
+		const module = dep._module;
 		const info = this.modulesMap.get(module);
 		if (!info) {
 			return this.originalTemplate.getHarmonyInitOrder(dep);
@@ -1341,7 +1341,7 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 	}
 
 	harmonyInit(dep, source, runtime, dependencyTemplates) {
-		const module = dep.module;
+		const module = dep._module;
 		const info = this.modulesMap.get(module);
 		if (!info) {
 			this.originalTemplate.harmonyInit(
@@ -1356,7 +1356,7 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 
 	apply(dep, source, runtime, dependencyTemplates) {
 		if (dep.originModule === this.rootModule) {
-			if (this.modulesMap.get(dep.module)) {
+			if (this.modulesMap.get(dep._module)) {
 				const exportDefs = this.getExports(dep);
 				for (const def of exportDefs) {
 					const info = this.modulesMap.get(def.module);
diff --git a/lib/optimize/RemoveEmptyChunksPlugin.js b/lib/optimize/RemoveEmptyChunksPlugin.js
index 458e5c318fb..42ba24a1574 100644
--- a/lib/optimize/RemoveEmptyChunksPlugin.js
+++ b/lib/optimize/RemoveEmptyChunksPlugin.js
@@ -8,15 +8,17 @@ class RemoveEmptyChunksPlugin {
 	apply(compiler) {
 		compiler.hooks.compilation.tap("RemoveEmptyChunksPlugin", compilation => {
 			const handler = chunks => {
-				chunks
-					.filter(
-						chunk =>
-							chunk.isEmpty() && !chunk.hasRuntime() && !chunk.hasEntryModule()
-					)
-					.forEach(chunk => {
+				for (let i = chunks.length - 1; i >= 0; i--) {
+					const chunk = chunks[i];
+					if (
+						chunk.isEmpty() &&
+						!chunk.hasRuntime() &&
+						!chunk.hasEntryModule()
+					) {
 						chunk.remove("empty");
-						chunks.splice(chunks.indexOf(chunk), 1);
-					});
+						chunks.splice(i, 1);
+					}
+				}
 			};
 			compilation.hooks.optimizeChunksBasic.tap(
 				"RemoveEmptyChunksPlugin",
diff --git a/lib/optimize/RuntimeChunkPlugin.js b/lib/optimize/RuntimeChunkPlugin.js
index 3c7d5b70fba..1325dfc7868 100644
--- a/lib/optimize/RuntimeChunkPlugin.js
+++ b/lib/optimize/RuntimeChunkPlugin.js
@@ -19,11 +19,15 @@ module.exports = class RuntimeChunkPlugin {
 			compilation.hooks.optimizeChunksAdvanced.tap("RuntimeChunkPlugin", () => {
 				for (const entrypoint of compilation.entrypoints.values()) {
 					const chunk = entrypoint.getRuntimeChunk();
-					if (chunk.getNumberOfModules() > 0) {
-						let name = this.options.name;
-						if (typeof name === "function") {
-							name = name(entrypoint);
-						}
+					let name = this.options.name;
+					if (typeof name === "function") {
+						name = name(entrypoint);
+					}
+					if (
+						chunk.getNumberOfModules() > 0 ||
+						!chunk.preventIntegration ||
+						chunk.name !== name
+					) {
 						const newChunk = compilation.addChunk(name);
 						newChunk.preventIntegration = true;
 						entrypoint.unshiftChunk(newChunk);
diff --git a/lib/optimize/SideEffectsFlagPlugin.js b/lib/optimize/SideEffectsFlagPlugin.js
index e503262a6ea..81a00e52402 100644
--- a/lib/optimize/SideEffectsFlagPlugin.js
+++ b/lib/optimize/SideEffectsFlagPlugin.js
@@ -9,6 +9,15 @@ const HarmonyExportImportedSpecifierDependency = require("../dependencies/Harmon
 const HarmonyImportSideEffectDependency = require("../dependencies/HarmonyImportSideEffectDependency");
 const HarmonyImportSpecifierDependency = require("../dependencies/HarmonyImportSpecifierDependency");
 
+/** @typedef {import("../Module")} Module */
+/** @typedef {import("../Dependency")} Dependency */
+
+/**
+ * @typedef {Object} ExportInModule
+ * @property {Module} module the module
+ * @property {string} exportName the name of the export
+ */
+
 class SideEffectsFlagPlugin {
 	apply(compiler) {
 		compiler.hooks.normalModuleFactory.tap("SideEffectsFlagPlugin", nmf => {
@@ -42,10 +51,12 @@ class SideEffectsFlagPlugin {
 			compilation.hooks.optimizeDependencies.tap(
 				"SideEffectsFlagPlugin",
 				modules => {
+					/** @type {Map<Module, Map<string, ExportInModule>>} */
 					const reexportMaps = new Map();
 
 					// Capture reexports of sideEffectFree modules
 					for (const module of modules) {
+						/** @type {Dependency[]} */
 						const removeDependencies = [];
 						for (const dep of module.dependencies) {
 							if (dep instanceof HarmonyImportSideEffectDependency) {
@@ -72,12 +83,6 @@ class SideEffectsFlagPlugin {
 								}
 							}
 						}
-						for (const dep of removeDependencies) {
-							module.removeDependency(dep);
-							dep.module.reasons = dep.module.reasons.filter(
-								r => r.dependency !== dep
-							);
-						}
 					}
 
 					// Flatten reexports
@@ -97,37 +102,23 @@ class SideEffectsFlagPlugin {
 					}
 
 					// Update imports along the reexports from sideEffectFree modules
-					const updates = [];
 					for (const pair of reexportMaps) {
 						const module = pair[0];
 						const map = pair[1];
 						for (const reason of module.reasons) {
 							const dep = reason.dependency;
-							if (dep instanceof HarmonyImportSpecifierDependency) {
+							if (
+								dep instanceof HarmonyImportSpecifierDependency &&
+								!dep.namespaceObjectAsContext
+							) {
 								const mapping = map.get(dep.id);
 								if (mapping) {
-									updates.push({
-										dep,
-										mapping,
-										module,
-										reason
-									});
+									dep.redirectedModule = mapping.module;
+									dep.redirectedId = mapping.exportName;
 								}
 							}
 						}
 					}
-
-					// Execute updates
-					for (const update of updates) {
-						const dep = update.dep;
-						const mapping = update.mapping;
-						const module = update.module;
-						const reason = update.reason;
-						dep.module = mapping.module;
-						dep.id = mapping.exportName;
-						module.removeReason(reason.module, dep);
-						mapping.module.addReason(reason.module, dep);
-					}
 				}
 			);
 		});
diff --git a/lib/optimize/SplitChunksPlugin.js b/lib/optimize/SplitChunksPlugin.js
index 202ec7766c5..84f1d31b63a 100644
--- a/lib/optimize/SplitChunksPlugin.js
+++ b/lib/optimize/SplitChunksPlugin.js
@@ -10,6 +10,7 @@ const GraphHelpers = require("../GraphHelpers");
 const { isSubset } = require("../util/SetHelpers");
 
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../Module")} Module */
 
 const hashFilename = name => {
 	return crypto
@@ -310,7 +311,6 @@ module.exports = class SplitChunksPlugin {
 
 					// Create a list of possible combinations
 					const combinationsCache = new Map(); // Map<string, Set<Chunk>[]>
-					const selectedChunksCacheByChunksSet = new WeakMap(); // WeakMap<Set<Chunk>, WeakMap<Function, {chunks: Chunk[], key: string}>>
 
 					const getCombinations = key => {
 						const chunksSet = chunkSetsInGraph.get(key);
@@ -330,14 +330,36 @@ module.exports = class SplitChunksPlugin {
 						return array;
 					};
 
+					/**
+					 * @typedef {Object} SelectedChunksResult
+					 * @property {Chunk[]} chunks the list of chunks
+					 * @property {string} key a key of the list
+					 */
+
+					/**
+					 * @typedef {function(Chunk): boolean} ChunkFilterFunction
+					 */
+
+					/** @type {WeakMap<Set<Chunk>, WeakMap<ChunkFilterFunction, SelectedChunksResult>>} */
+					const selectedChunksCacheByChunksSet = new WeakMap();
+
+					/**
+					 * get list and key by applying the filter function to the list
+					 * It is cached for performance reasons
+					 * @param {Set<Chunk>} chunks list of chunks
+					 * @param {ChunkFilterFunction} chunkFilter filter function for chunks
+					 * @returns {SelectedChunksResult} list and key
+					 */
 					const getSelectedChunks = (chunks, chunkFilter) => {
 						let entry = selectedChunksCacheByChunksSet.get(chunks);
 						if (entry === undefined) {
-							entry = new Map();
+							entry = new WeakMap();
 							selectedChunksCacheByChunksSet.set(chunks, entry);
 						}
+						/** @type {SelectedChunksResult} */
 						let entry2 = entry.get(chunkFilter);
 						if (entry2 === undefined) {
+							/** @type {Chunk[]} */
 							const selectedChunks = [];
 							for (const chunk of chunks) {
 								if (chunkFilter(chunk)) selectedChunks.push(chunk);
@@ -351,10 +373,76 @@ module.exports = class SplitChunksPlugin {
 						return entry2;
 					};
 
+					/**
+					 * @typedef {Object} ChunksInfoItem
+					 * @property {SortableSet} modules
+					 * @property {TODO} cacheGroup
+					 * @property {string} name
+					 * @property {number} size
+					 * @property {Map<Chunk, number>} chunks
+					 * @property {Set<Chunk>} reuseableChunks
+					 * @property {Set<string>} chunksKeys
+					 */
+
 					// Map a list of chunks to a list of modules
 					// For the key the chunk "index" is used, the value is a SortableSet of modules
+					/** @type {Map<string, ChunksInfoItem>} */
 					const chunksInfoMap = new Map();
 
+					/**
+					 * @param {TODO} cacheGroup the current cache group
+					 * @param {Chunk[]} selectedChunks chunks selected for this module
+					 * @param {string} selectedChunksKey a key of selectedChunks
+					 * @param {Module} module the current module
+					 * @returns {void}
+					 */
+					const addModuleToChunksInfoMap = (
+						cacheGroup,
+						selectedChunks,
+						selectedChunksKey,
+						module
+					) => {
+						// Break if minimum number of chunks is not reached
+						if (selectedChunks.length < cacheGroup.minChunks) return;
+						// Determine name for split chunk
+						const name = cacheGroup.getName(
+							module,
+							selectedChunks,
+							cacheGroup.key
+						);
+						// Create key for maps
+						// When it has a name we use the name as key
+						// Elsewise we create the key from chunks and cache group key
+						// This automatically merges equal names
+						const key =
+							(name && `name:${name}`) ||
+							`chunks:${selectedChunksKey} key:${cacheGroup.key}`;
+						// Add module to maps
+						let info = chunksInfoMap.get(key);
+						if (info === undefined) {
+							chunksInfoMap.set(
+								key,
+								(info = {
+									modules: new SortableSet(undefined, sortByIdentifier),
+									cacheGroup,
+									name,
+									size: 0,
+									chunks: new Map(),
+									reuseableChunks: new Set(),
+									chunksKeys: new Set()
+								})
+							);
+						}
+						info.modules.add(module);
+						info.size += module.size();
+						if (!info.chunksKeys.has(selectedChunksKey)) {
+							info.chunksKeys.add(selectedChunksKey);
+							for (const chunk of selectedChunks) {
+								info.chunks.set(chunk, chunk.getNumberOfModules());
+							}
+						}
+					};
+
 					// Walk through all modules
 					for (const module of compilation.modules) {
 						// Get cache group
@@ -422,55 +510,17 @@ module.exports = class SplitChunksPlugin {
 									chunkCombination,
 									cacheGroup.chunksFilter
 								);
-								// Break if minimum number of chunks is not reached
-								if (selectedChunks.length < cacheGroup.minChunks) continue;
-								// Determine name for split chunk
-								const name = cacheGroup.getName(
-									module,
+
+								addModuleToChunksInfoMap(
+									cacheGroup,
 									selectedChunks,
-									cacheGroup.key
+									selectedChunksKey,
+									module
 								);
-								// Create key for maps
-								// When it has a name we use the name as key
-								// Elsewise we create the key from chunks and cache group key
-								// This automatically merges equal names
-								const key =
-									(name && `name:${name}`) ||
-									`chunks:${selectedChunksKey} key:${cacheGroup.key}`;
-								// Add module to maps
-								let info = chunksInfoMap.get(key);
-								if (info === undefined) {
-									chunksInfoMap.set(
-										key,
-										(info = {
-											modules: new SortableSet(undefined, sortByIdentifier),
-											cacheGroup,
-											name,
-											size: 0,
-											chunks: new Map(),
-											reusedableChunks: new Set(),
-											chunksKeys: new Set()
-										})
-									);
-								}
-								info.modules.add(module);
-								info.size += module.size();
-								if (!info.chunksKeys.has(selectedChunksKey)) {
-									info.chunksKeys.add(selectedChunksKey);
-									for (const chunk of selectedChunks) {
-										info.chunks.set(chunk, chunk.getNumberOfModules());
-									}
-								}
 							}
 						}
 					}
 
-					for (const [key, info] of chunksInfoMap) {
-						// Get size of module lists
-						if (info.size < info.cacheGroup.minSize) {
-							chunksInfoMap.delete(key);
-						}
-					}
 					while (chunksInfoMap.size > 0) {
 						// Find best matching entry
 						let bestEntryKey;
@@ -478,15 +528,20 @@ module.exports = class SplitChunksPlugin {
 						for (const pair of chunksInfoMap) {
 							const key = pair[0];
 							const info = pair[1];
-							if (bestEntry === undefined) {
-								bestEntry = info;
-								bestEntryKey = key;
-							} else if (compareEntries(bestEntry, info) < 0) {
-								bestEntry = info;
-								bestEntryKey = key;
+							if (info.size >= info.cacheGroup.minSize) {
+								if (bestEntry === undefined) {
+									bestEntry = info;
+									bestEntryKey = key;
+								} else if (compareEntries(bestEntry, info) < 0) {
+									bestEntry = info;
+									bestEntryKey = key;
+								}
 							}
 						}
 
+						// No suitable item left
+						if (bestEntry === undefined) break;
+
 						const item = bestEntry;
 						chunksInfoMap.delete(bestEntryKey);
 
@@ -517,12 +572,19 @@ module.exports = class SplitChunksPlugin {
 								}
 							}
 						}
-						const usedChunks = [];
-						// Walk through all chunks
-						for (const chunk of item.chunks.keys()) {
+						// Check if maxRequests condition can be fullfilled
+
+						const usedChunks = Array.from(item.chunks.keys()).filter(chunk => {
 							// skip if we address ourself
-							if ((chunkName && chunk.name === chunkName) || chunk === newChunk)
-								continue;
+							return (
+								(!chunkName || chunk.name !== chunkName) && chunk !== newChunk
+							);
+						});
+
+						// Skip when no chunk selected
+						if (usedChunks.length === 0) continue;
+
+						const chunkInLimit = usedChunks.filter(chunk => {
 							// respect max requests when not enforced
 							const maxRequests = chunk.isOnlyInitial()
 								? item.cacheGroup.maxInitialRequests
@@ -532,88 +594,97 @@ module.exports = class SplitChunksPlugin {
 											item.cacheGroup.maxAsyncRequests
 									  )
 									: item.cacheGroup.maxAsyncRequests;
-							if (isFinite(maxRequests) && getRequests(chunk) >= maxRequests)
-								continue;
-							if (newChunk === undefined) {
-								// Create the new chunk
-								newChunk = compilation.addChunk(chunkName);
+							return !isFinite(maxRequests) || getRequests(chunk) < maxRequests;
+						});
+
+						if (chunkInLimit.length < usedChunks.length) {
+							for (const module of item.modules) {
+								addModuleToChunksInfoMap(
+									item.cacheGroup,
+									chunkInLimit,
+									getKey(chunkInLimit),
+									module
+								);
 							}
+							continue;
+						}
+
+						// Create the new chunk if not reusing one
+						if (!isReused) {
+							newChunk = compilation.addChunk(chunkName);
+						}
+						// Walk through all chunks
+						for (const chunk of usedChunks) {
 							// Add graph connections for splitted chunk
 							chunk.split(newChunk);
-							usedChunks.push(chunk);
 						}
 
-						// If we successfully created a new chunk or reused one
-						if (newChunk) {
-							// Add a note to the chunk
-							newChunk.chunkReason = isReused
-								? "reused as split chunk"
-								: "split chunk";
-							if (item.cacheGroup.key) {
-								newChunk.chunkReason += ` (cache group: ${
-									item.cacheGroup.key
-								})`;
+						// Add a note to the chunk
+						newChunk.chunkReason = isReused
+							? "reused as split chunk"
+							: "split chunk";
+						if (item.cacheGroup.key) {
+							newChunk.chunkReason += ` (cache group: ${item.cacheGroup.key})`;
+						}
+						if (chunkName) {
+							newChunk.chunkReason += ` (name: ${chunkName})`;
+							// If the chosen name is already an entry point we remove the entry point
+							const entrypoint = compilation.entrypoints.get(chunkName);
+							if (entrypoint) {
+								compilation.entrypoints.delete(chunkName);
+								entrypoint.remove();
+								newChunk.entryModule = undefined;
+							}
+						}
+						if (item.cacheGroup.filename) {
+							if (!newChunk.isOnlyInitial()) {
+								throw new Error(
+									"SplitChunksPlugin: You are trying to set a filename for a chunk which is (also) loaded on demand. " +
+										"The runtime can only handle loading of chunks which match the chunkFilename schema. " +
+										"Using a custom filename would fail at runtime. " +
+										`(cache group: ${item.cacheGroup.key})`
+								);
 							}
-							if (chunkName) {
-								newChunk.chunkReason += ` (name: ${chunkName})`;
-								// If the chosen name is already an entry point we remove the entry point
-								const entrypoint = compilation.entrypoints.get(chunkName);
-								if (entrypoint) {
-									compilation.entrypoints.delete(chunkName);
-									entrypoint.remove();
-									newChunk.entryModule = undefined;
+							newChunk.filenameTemplate = item.cacheGroup.filename;
+						}
+						if (!isReused) {
+							// Add all modules to the new chunk
+							for (const module of item.modules) {
+								if (typeof module.chunkCondition === "function") {
+									if (!module.chunkCondition(newChunk)) continue;
+								}
+								// Add module to new chunk
+								GraphHelpers.connectChunkAndModule(newChunk, module);
+								// Remove module from used chunks
+								for (const chunk of usedChunks) {
+									chunk.removeModule(module);
+									module.rewriteChunkInReasons(chunk, [newChunk]);
 								}
 							}
-							if (item.cacheGroup.filename) {
-								if (!newChunk.isOnlyInitial()) {
-									throw new Error(
-										"SplitChunksPlugin: You are trying to set a filename for a chunk which is (also) loaded on demand. " +
-											"The runtime can only handle loading of chunks which match the chunkFilename schema. " +
-											"Using a custom filename would fail at runtime. " +
-											`(cache group: ${item.cacheGroup.key})`
-									);
+						} else {
+							// Remove all modules from used chunks
+							for (const module of item.modules) {
+								for (const chunk of usedChunks) {
+									chunk.removeModule(module);
+									module.rewriteChunkInReasons(chunk, [newChunk]);
 								}
-								newChunk.filenameTemplate = item.cacheGroup.filename;
 							}
-							if (!isReused) {
-								// Add all modules to the new chunk
+						}
+						// remove all modules from other entries and update size
+						for (const [key, info] of chunksInfoMap) {
+							if (isOverlap(info.chunks, item.chunks)) {
+								const oldSize = info.modules.size;
 								for (const module of item.modules) {
-									if (typeof module.chunkCondition === "function") {
-										if (!module.chunkCondition(newChunk)) continue;
-									}
-									// Add module to new chunk
-									GraphHelpers.connectChunkAndModule(newChunk, module);
-									// Remove module from used chunks
-									for (const chunk of usedChunks) {
-										chunk.removeModule(module);
-										module.rewriteChunkInReasons(chunk, [newChunk]);
-									}
+									info.modules.delete(module);
 								}
-							} else {
-								// Remove all modules from used chunks
-								for (const module of item.modules) {
-									for (const chunk of usedChunks) {
-										chunk.removeModule(module);
-										module.rewriteChunkInReasons(chunk, [newChunk]);
-									}
+								if (info.modules.size === 0) {
+									chunksInfoMap.delete(key);
+									continue;
 								}
-							}
-							// remove all modules from other entries and update size
-							for (const [key, info] of chunksInfoMap) {
-								if (isOverlap(info.chunks, item.chunks)) {
-									const oldSize = info.modules.size;
-									for (const module of item.modules) {
-										info.modules.delete(module);
-									}
-									if (info.modules.size === 0) {
+								if (info.modules.size !== oldSize) {
+									info.size = getModulesSize(info.modules);
+									if (info.size < info.cacheGroup.minSize)
 										chunksInfoMap.delete(key);
-										continue;
-									}
-									if (info.modules.size !== oldSize) {
-										info.size = getModulesSize(info.modules);
-										if (info.size < info.cacheGroup.minSize)
-											chunksInfoMap.delete(key);
-									}
 								}
 							}
 						}
diff --git a/lib/util/cachedMerge.js b/lib/util/cachedMerge.js
index 863141e6b18..ff7b4426a62 100644
--- a/lib/util/cachedMerge.js
+++ b/lib/util/cachedMerge.js
@@ -6,6 +6,19 @@
 
 const mergeCache = new WeakMap();
 
+/**
+ * Merges two given objects and caches the result to avoid computation if same objects passed as arguements again.
+ * @example
+ * // performs Object.assign(first, second), stores the result in WeakMap and returns result
+ * cachedMerge({a: 1}, {a: 2})
+ * {a: 2}
+ *  // when same arguments passed, gets the result from WeakMap and returns it.
+ * cachedMerge({a: 1}, {a: 2})
+ * {a: 2}
+ * @param {object} first first object
+ * @param {object} second second object
+ * @returns {object} merged object of first and second object
+ */
 const cachedMerge = (first, second) => {
 	let innerCache = mergeCache.get(first);
 	if (innerCache === undefined) {
diff --git a/lib/util/identifier.js b/lib/util/identifier.js
index a6999665053..9176facd0fd 100644
--- a/lib/util/identifier.js
+++ b/lib/util/identifier.js
@@ -12,6 +12,11 @@ const path = require("path");
  * @returns {boolean} returns true if path is "Absolute Path"-like
  */
 const looksLikeAbsolutePath = maybeAbsolutePath => {
+	if (/^\/.*\/$/.test(maybeAbsolutePath)) {
+		// this 'path' is actually a regexp generated by dynamic requires.
+		// Don't treat it as an absolute path.
+		return false;
+	}
 	return /^(?:[a-z]:\\|\/)/i.test(maybeAbsolutePath);
 };
 
diff --git a/lib/wasm/WasmMainTemplatePlugin.js b/lib/wasm/WasmMainTemplatePlugin.js
index 6f4a23d41f7..1cec8f89600 100644
--- a/lib/wasm/WasmMainTemplatePlugin.js
+++ b/lib/wasm/WasmMainTemplatePlugin.js
@@ -5,7 +5,9 @@
 "use strict";
 
 const Template = require("../Template");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+const WebAssemblyUtils = require("./WebAssemblyUtils");
+
+/** @typedef {import("../Module")} Module */
 
 // Get all wasm modules
 function getAllWasmModules(chunk) {
@@ -22,96 +24,88 @@ function getAllWasmModules(chunk) {
 	return array;
 }
 
+/**
+ * generates the import object function for a module
+ * @param {Module} module the module
+ * @returns {string} source code
+ */
 function generateImportObject(module) {
-	const depsByRequest = new Map();
-	for (const dep of module.dependencies) {
-		if (dep instanceof WebAssemblyImportDependency) {
-			// Ignore global they will be handled later
-			if (dep.description.type === "GlobalType") {
-				continue;
-			}
+	const waitForInstances = new Map();
+	const properties = [];
+	const usedWasmDependencies = WebAssemblyUtils.getUsedDependencies(module);
+	for (const usedDep of usedWasmDependencies) {
+		const dep = usedDep.dependency;
+		const importedModule = dep.module;
+		const exportName = dep.name;
+		const usedName = importedModule && importedModule.isUsed(exportName);
+		const description = dep.description;
+		const direct = dep.onlyDirectImport;
 
-			const request = dep.request;
-			let array = depsByRequest.get(request);
-			if (!array) {
-				depsByRequest.set(request, (array = []));
-			}
-			const exportName = dep.name;
-			const usedName = dep.module && dep.module.isUsed(exportName);
+		const propertyName = usedDep.name;
 
-			if (dep.module === null) {
-				// Dependency was not found, an error will be thrown later
-				continue;
-			}
-
-			if (usedName !== false) {
-				array.push({
-					exportName,
-					usedName,
-					module: dep.module,
-					description: dep.description,
-					direct: dep.onlyDirectImport
-				});
-			}
-		}
-	}
-	const importsCode = [];
-	const waitForPromises = new Map();
-	for (const pair of depsByRequest) {
-		const properties = [];
-		for (const data of pair[1]) {
-			if (data.direct) {
-				const instanceVar = `m${waitForPromises.size}`;
-				waitForPromises.set(
-					instanceVar,
-					`installedWasmModules[${JSON.stringify(data.module.id)}]`
-				);
-				properties.push(
-					`${JSON.stringify(data.exportName)}: ${instanceVar}.exports` +
-						`[${JSON.stringify(data.exportName)}]`
-				);
-			} else {
-				const params = data.description.signature.params.map(
-					(param, k) => "p" + k + param.valtype
-				);
+		if (direct) {
+			const instanceVar = `m${waitForInstances.size}`;
+			waitForInstances.set(instanceVar, importedModule.id);
+			properties.push(
+				`${JSON.stringify(propertyName)}: ${instanceVar}` +
+					`[${JSON.stringify(usedName)}]`
+			);
+		} else {
+			const params = description.signature.params.map(
+				(param, k) => "p" + k + param.valtype
+			);
 
-				const result = `__webpack_require__(${JSON.stringify(
-					data.module.id
-				)})[${JSON.stringify(data.usedName)}](${params})`;
+			const mod = `installedModules[${JSON.stringify(importedModule.id)}]`;
+			const func = `${mod}.exports[${JSON.stringify(usedName)}]`;
 
-				properties.push(
-					Template.asString([
-						`${JSON.stringify(data.exportName)}: function(${params}) {`,
-						Template.indent([`return ${result};`]),
-						"}"
-					])
-				);
-			}
+			properties.push(
+				Template.asString([
+					`${JSON.stringify(propertyName)}: ` +
+						(importedModule.type.startsWith("webassembly")
+							? `${mod} ? ${func} : `
+							: "") +
+						`function(${params}) {`,
+					Template.indent([`return ${func}(${params});`]),
+					"}"
+				])
+			);
 		}
-
-		importsCode.push(
-			Template.asString([
-				`${JSON.stringify(pair[0])}: {`,
-				Template.indent([properties.join(",")]),
-				"}"
-			])
-		);
 	}
 
-	if (waitForPromises.size > 0) {
-		const promises = Array.from(waitForPromises.values()).join(", ");
+	if (waitForInstances.size === 1) {
+		const moduleId = Array.from(waitForInstances.values())[0];
+		const promise = `installedWasmModules[${JSON.stringify(moduleId)}]`;
+		const variable = Array.from(waitForInstances.keys())[0];
+		return Template.asString([
+			`${JSON.stringify(module.id)}: function() {`,
+			Template.indent([
+				`return promiseResolve().then(function() { return ${promise}; }).then(function(${variable}) {`,
+				Template.indent([
+					"return {",
+					Template.indent([properties.join(",\n")]),
+					"};"
+				]),
+				"});"
+			]),
+			"},"
+		]);
+	} else if (waitForInstances.size > 0) {
+		const promises = Array.from(
+			waitForInstances.values(),
+			id => `installedWasmModules[${JSON.stringify(id)}]`
+		).join(", ");
 		const variables = Array.from(
-			waitForPromises.keys(),
-			(name, i) => `var ${name} = array[${i}];`
-		).join("\n");
+			waitForInstances.keys(),
+			(name, i) => `${name} = array[${i}];`
+		).join(", ");
 		return Template.asString([
 			`${JSON.stringify(module.id)}: function() {`,
 			Template.indent([
-				`return Promise.resolve().then(function() { return Promise.all([${promises}]); }).then(function(array) {`,
+				`return promiseResolve().then(function() { return Promise.all([${promises}]); }).then(function(array) {`,
 				Template.indent([
-					variables,
+					`var ${variables};`,
 					"return {",
-					Template.indent([importsCode.join(",")]),
+					Template.indent([properties.join(",\n")]),
 					"};"
 				]),
 				"});"
@@ -123,7 +117,7 @@ function generateImportObject(module) {
 			`${JSON.stringify(module.id)}: function() {`,
 			Template.indent([
 				"return {",
-				Template.indent([importsCode.join(",")]),
+				Template.indent([properties.join(",\n")]),
 				"};"
 			]),
 			"},"
@@ -149,6 +143,12 @@ class WasmMainTemplatePlugin {
 					"// object to store loaded and loading wasm modules",
 					"var installedWasmModules = {};",
 					"",
+					// This function is used to delay reading the installed wasm module promises
+					// by a microtask. Sorting them doesn't help because there are egdecases where
+					// sorting is not possible (modules splitted into different chunks).
+					// So we not even trying and solve this by a microtask delay.
+					"function promiseResolve() { return Promise.resolve(); }",
+					"",
 					"var wasmImportObjects = {",
 					Template.indent(importObjects),
 					"};"
@@ -218,13 +218,15 @@ class WasmMainTemplatePlugin {
 										Template.indent([
 											"promise = Promise.all([WebAssembly.compileStreaming(req), importObject]).then(function(items) {",
 											Template.indent([
-												"return WebAssembly.instantiate(items[0], items[1]);"
+												"return WebAssembly.instantiate(items[0], " +
+													`{ ${WebAssemblyUtils.MANGLED_MODULE}: items[1] });`
 											]),
 											"});"
 										]),
 										"} else if(typeof WebAssembly.instantiateStreaming === 'function') {",
 										Template.indent([
-											"promise = WebAssembly.instantiateStreaming(req, importObject);"
+											"promise = WebAssembly.instantiateStreaming(req, " +
+												`{ ${WebAssemblyUtils.MANGLED_MODULE}: importObject });`
 										])
 								  ])
 								: Template.asString([
@@ -238,7 +240,8 @@ class WasmMainTemplatePlugin {
 											]),
 											"]).then(function(items) {",
 											Template.indent([
-												"return WebAssembly.instantiate(items[0], items[1]);"
+												"return WebAssembly.instantiate(items[0], " +
+													`{ ${WebAssemblyUtils.MANGLED_MODULE}: items[1] });`
 											]),
 											"});"
 										])
@@ -248,7 +251,8 @@ class WasmMainTemplatePlugin {
 								"var bytesPromise = req.then(function(x) { return x.arrayBuffer(); });",
 								"promise = bytesPromise.then(function(bytes) {",
 								Template.indent([
-									"return WebAssembly.instantiate(bytes, importObject);"
+									"return WebAssembly.instantiate(bytes, " +
+										`{ ${WebAssemblyUtils.MANGLED_MODULE}: importObject });`
 								]),
 								"});"
 							]),
@@ -257,7 +261,7 @@ class WasmMainTemplatePlugin {
 							Template.indent([
 								`return ${
 									mainTemplate.requireFn
-								}.w[wasmModuleId] = res.instance || res;`
+								}.w[wasmModuleId] = (res.instance || res).exports;`
 							]),
 							"}));"
 						]),
@@ -275,7 +279,7 @@ class WasmMainTemplatePlugin {
 				return Template.asString([
 					source,
 					"",
-					"// object with all WebAssembly.instance",
+					"// object with all WebAssembly.instance exports",
 					`${mainTemplate.requireFn}.w = {};`
 				]);
 			}
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index 852174799fb..9b19c51a2cd 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -5,28 +5,59 @@
 "use strict";
 
 const Generator = require("../Generator");
+const Template = require("../Template");
+const WebAssemblyUtils = require("./WebAssemblyUtils");
 const { RawSource } = require("webpack-sources");
 
-const { edit, add } = require("@webassemblyjs/wasm-edit");
+const { shrinkPaddedLEB128 } = require("@webassemblyjs/wasm-opt");
+const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
 const { decode } = require("@webassemblyjs/wasm-parser");
 const t = require("@webassemblyjs/ast");
 
+/** @typedef {import("../Module")} Module */
+/** @typedef {import("./WebAssemblyUtils").UsedWasmDependency} UsedWasmDependency */
+
+/**
+ * @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.reverse().reduce((prevFn, nextFn) => {
+	return fns.reduce((prevFn, nextFn) => {
 		return value => nextFn(prevFn(value));
 	}, value => value);
 }
 
 // Utility functions
-const isGlobalImport = moduleImport => moduleImport.descr.type === "GlobalType";
-const isFuncImport = moduleImport =>
-	moduleImport.descr.type === "FuncImportDescr";
-const initFuncId = t.identifier("__webpack_init__");
 
-// TODO replace with @callback
 /**
- * @typedef {(ArrayBuffer) => ArrayBuffer} ArrayBufferTransform
+ * @param {t.ModuleImport} n the import
+ * @returns {boolean} true, if a global was imported
  */
+const isGlobalImport = n => n.descr.type === "GlobalType";
+
+/**
+ * @param {t.ModuleImport} n the import
+ * @returns {boolean} true, if a func was imported
+ */
+const isFuncImport = n => n.descr.type === "FuncImportDescr";
+
+// TODO replace with @callback
 
 /**
  * Removes the start instruction
@@ -35,7 +66,7 @@ const initFuncId = t.identifier("__webpack_init__");
  * @returns {ArrayBufferTransform} transform
  */
 const removeStartFunc = state => bin => {
-	return edit(bin, {
+	return editWithAST(state.ast, bin, {
 		Start(path) {
 			path.remove();
 		}
@@ -149,18 +180,30 @@ function getNextFuncIndex(ast, countImportedFunc) {
 const rewriteImportedGlobals = state => bin => {
 	const newGlobals = [];
 
-	bin = edit(bin, {
+	bin = editWithAST(state.ast, bin, {
 		ModuleImport(path) {
 			if (isGlobalImport(path.node) === true) {
 				const globalType = path.node.descr;
 
 				globalType.mutability = "var";
 
-				newGlobals.push(
-					t.global(globalType, [
-						t.objectInstruction("const", "i32", [t.numberLiteral(0)])
-					])
-				);
+				let init;
+
+				if (globalType.valtype[0] === "i") {
+					// create NumberLiteral global initializer
+					init = t.objectInstruction("const", globalType.valtype, [
+						t.numberLiteralFromRaw(0)
+					]);
+				} else if (globalType.valtype[0] === "f") {
+					// create FloatLiteral global initializer
+					init = t.objectInstruction("const", globalType.valtype, [
+						t.floatLiteral(0, false, false, "0")
+					]);
+				} else {
+					throw new Error("unknown type: " + globalType.valtype);
+				}
+
+				newGlobals.push(t.global(globalType, [init]));
 
 				path.remove();
 			}
@@ -168,7 +211,50 @@ const rewriteImportedGlobals = state => bin => {
 	});
 
 	// Add global declaration instructions
-	return add(bin, newGlobals);
+	return addWithAST(state.ast, bin, newGlobals);
+};
+
+/**
+ * Rewrite the export names
+ * @param {Object} state state
+ * @param {Object} state.ast Module's ast
+ * @param {Object} state.module Module
+ * @returns {ArrayBufferTransform} transform
+ */
+const rewriteExportNames = ({ ast, module }) => bin => {
+	return editWithAST(ast, bin, {
+		ModuleExport(path) {
+			const usedName = module.isUsed(path.node.name);
+			if (usedName) {
+				path.node.name = usedName;
+			} else {
+				path.remove();
+			}
+		}
+	});
+};
+
+/**
+ * Mangle import names and modules
+ * @param {Object} state state
+ * @param {Object} state.ast Module's ast
+ * @param {Map<string, UsedWasmDependency>} state.usedDependencyMap mappings to mangle names
+ * @returns {ArrayBufferTransform} transform
+ */
+const rewriteImports = ({ ast, usedDependencyMap }) => bin => {
+	return editWithAST(ast, bin, {
+		ModuleImport(path) {
+			const result = usedDependencyMap.get(
+				path.node.module + ":" + path.node.name
+			);
+			if (result === undefined) {
+				path.remove();
+			} else {
+				path.node.module = WebAssemblyUtils.MANGLED_MODULE;
+				path.node.name = result.name;
+			}
+		}
+	});
 };
 
 /**
@@ -177,17 +263,19 @@ const rewriteImportedGlobals = state => bin => {
  * The init function fills the globals given input arguments.
  *
  * @param {Object} state transformation state
+ * @param {Object} state.ast - Module's ast
+ * @param {t.Identifier} state.initFuncId identifier of the init function
  * @param {t.IndexLiteral} state.startAtFuncIndex index of the start function
  * @param {t.ModuleImport[]} state.importedGlobals list of imported globals
- * @param {TODO} state.funcSectionMetadata ??
  * @param {t.IndexLiteral} state.nextFuncIndex index of the next function
  * @param {t.IndexLiteral} state.nextTypeIndex index of the next type
  * @returns {ArrayBufferTransform} transform
  */
 const addInitFunction = ({
+	ast,
+	initFuncId,
 	startAtFuncIndex,
 	importedGlobals,
-	funcSectionMetadata,
 	nextFuncIndex,
 	nextTypeIndex
 }) => bin => {
@@ -215,49 +303,85 @@ const addInitFunction = ({
 	const funcResults = [];
 
 	// Code section
-	const func = t.func(initFuncId, funcParams, funcResults, funcBody);
+	const funcSignature = t.signature(funcParams, funcResults);
+	const func = t.func(initFuncId, funcSignature, funcBody);
 
 	// Type section
-	const functype = t.typeInstructionFunc(
-		func.signature.params,
-		func.signature.result
-	);
+	const functype = t.typeInstruction(undefined, funcSignature);
 
 	// Func section
 	const funcindex = t.indexInFuncSection(nextTypeIndex);
 
 	// Export section
-	const moduleExport = t.moduleExport(initFuncId.value, "Func", nextFuncIndex);
+	const moduleExport = t.moduleExport(
+		initFuncId.value,
+		t.moduleExportDescr("Func", nextFuncIndex)
+	);
 
-	return add(bin, [func, moduleExport, funcindex, functype]);
+	return addWithAST(ast, bin, [func, moduleExport, funcindex, functype]);
+};
+
+/**
+ * Extract mangle mappings from module
+ * @param {Module} module current module
+ * @returns {Map<string, UsedWasmDependency>} mappings to mangled names
+ */
+const getUsedDependencyMap = module => {
+	/** @type {Map<string, UsedWasmDependency>} */
+	const map = new Map();
+	for (const usedDep of WebAssemblyUtils.getUsedDependencies(module)) {
+		const dep = usedDep.dependency;
+		const request = dep.request;
+		const exportName = dep.name;
+		map.set(request + ":" + exportName, usedDep);
+	}
+	return map;
 };
 
 class WebAssemblyGenerator extends Generator {
 	generate(module) {
-		const bin = module.originalSource().source();
+		let bin = module.originalSource().source();
+		bin = preprocess(bin);
+
+		const initFuncId = t.identifier(
+			Array.isArray(module.usedExports)
+				? Template.numberToIdentifer(module.usedExports.length)
+				: "__webpack_init__"
+		);
 
-		// FIXME(sven): this module is parsed twice, we could preserve the AST
-		// from wasm/WebAssemblyParser.js
 		const ast = decode(bin, {
 			ignoreDataSection: true,
-			ignoreCodeSection: true
+			ignoreCodeSection: true,
+			ignoreCustomNameSection: true
 		});
 
 		const importedGlobals = getImportedGlobals(ast);
-		const funcSectionMetadata = t.getSectionMetadata(ast, "func");
 		const countImportedFunc = getCountImportedFunc(ast);
 		const startAtFuncIndex = getStartFuncIndex(ast);
 		const nextFuncIndex = getNextFuncIndex(ast, countImportedFunc);
 		const nextTypeIndex = getNextTypeIndex(ast);
 
+		const usedDependencyMap = getUsedDependencyMap(module);
+
 		const transform = compose(
-			removeStartFunc({}),
+			rewriteExportNames({
+				ast,
+				module
+			}),
+
+			removeStartFunc({ ast }),
+
+			rewriteImportedGlobals({ ast }),
 
-			rewriteImportedGlobals({}),
+			rewriteImports({
+				ast,
+				usedDependencyMap
+			}),
 
 			addInitFunction({
+				ast,
+				initFuncId,
 				importedGlobals,
-				funcSectionMetadata,
 				startAtFuncIndex,
 				nextFuncIndex,
 				nextTypeIndex
diff --git a/lib/wasm/WebAssemblyJavascriptGenerator.js b/lib/wasm/WebAssemblyJavascriptGenerator.js
index aac4b3cd7cc..8bf15854fe4 100644
--- a/lib/wasm/WebAssemblyJavascriptGenerator.js
+++ b/lib/wasm/WebAssemblyJavascriptGenerator.js
@@ -39,29 +39,9 @@ function generateInitParams(module) {
 
 class WebAssemblyJavascriptGenerator extends Generator {
 	generate(module, dependencyTemplates, runtimeTemplate) {
-		const generateExports = () => {
-			if (
-				Array.isArray(module.buildMeta.providedExports) &&
-				Array.isArray(module.usedExports)
-			) {
-				// generate mangled exports
-				return Template.asString(
-					module.buildMeta.providedExports.map(exp => {
-						const usedName = module.isUsed(exp);
-						if (usedName) {
-							return `${module.exportsArgument}[${JSON.stringify(
-								usedName
-							)}] = instance.exports[${JSON.stringify(exp)}];`;
-						} else {
-							return `// unused ${JSON.stringify(exp)} export`;
-						}
-					})
-				);
-			} else {
-				// generate simple export
-				return `${module.moduleArgument}.exports = instance.exports;`;
-			}
-		};
+		const initIdentifer = Array.isArray(module.usedExports)
+			? Template.numberToIdentifer(module.usedExports.length)
+			: "__webpack_init__";
 
 		const generateImports = () => {
 			const modules = new Map();
@@ -87,17 +67,20 @@ class WebAssemblyJavascriptGenerator extends Generator {
 			[
 				'"use strict";',
 				"// Instantiate WebAssembly module",
-				"var instance = __webpack_require__.w[module.i];",
+				"var wasmExports = __webpack_require__.w[module.i];",
 
 				// this must be before import for circular dependencies
 				"// export exports from WebAssembly module",
-				generateExports(),
-
+				Array.isArray(module.usedExports)
+					? `${module.moduleArgument}.exports = wasmExports;`
+					: "for(var name in wasmExports) " +
+					  `if(name != ${JSON.stringify(initIdentifer)}) ` +
+					  `${module.exportsArgument}[name] = wasmExports[name];`,
 				"// exec imports from WebAssembly module (for esm order)",
 				generateImports(),
 
 				"// exec wasm module",
-				`instance.exports.__webpack_init__(${initParams})`
+				`wasmExports[${JSON.stringify(initIdentifer)}](${initParams})`
 			].join("\n")
 		);
 		return source;
diff --git a/lib/wasm/WebAssemblyParser.js b/lib/wasm/WebAssemblyParser.js
index cbb6167e05a..16103074491 100644
--- a/lib/wasm/WebAssemblyParser.js
+++ b/lib/wasm/WebAssemblyParser.js
@@ -10,17 +10,38 @@ const { decode } = require("@webassemblyjs/wasm-parser");
 const { Tapable } = require("tapable");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 
+/** @typedef {import("../Module")} Module */
+
 /**
- * @param {t.ModuleImport} moduleImport the import
+ * @param {t.ModuleImport} n the import
  * @returns {boolean} true, if a memory was imported
  */
-const isMemoryImport = moduleImport => moduleImport.descr.type === "Memory";
+const isMemoryImport = n => n.descr.type === "Memory";
 
 /**
- * @param {t.ModuleImport} moduleImport the import
+ * @param {t.ModuleImport} n the import
  * @returns {boolean} true, if a table was imported
  */
-const isTableImport = moduleImport => moduleImport.descr.type === "Table";
+const isTableImport = n => n.descr.type === "Table";
+
+const JS_COMPAT_TYPES = new Set(["i32", "f32", "f64"]);
+
+/**
+ * @param {t.ModuleImport} moduleImport the import
+ * @returns {null | string} the type incompatible with js types
+ */
+const getJsIncompatibleType = moduleImport => {
+	if (moduleImport.descr.type !== "FuncImportDescr") return null;
+	const signature = moduleImport.descr.signature;
+	for (const param of signature.params) {
+		if (!JS_COMPAT_TYPES.has(param.valtype))
+			return `${param.valtype} as parameter`;
+	}
+	for (const type of signature.results) {
+		if (!JS_COMPAT_TYPES.has(type)) return `${type} as result`;
+	}
+	return null;
+};
 
 const decoderOpts = {
 	ignoreCodeSection: true,
@@ -45,27 +66,28 @@ class WebAssemblyParser extends Tapable {
 		const exports = (state.module.buildMeta.providedExports = []);
 		t.traverse(ast, {
 			ModuleExport({ node }) {
-				const moduleExport = /** @type {t.ModuleExport} */ (node);
-				exports.push(moduleExport.name);
+				exports.push(node.name);
 			},
 
 			ModuleImport({ node }) {
-				const moduleImport = /** @type {t.ModuleImport} */ (node);
-
+				/** @type {false | string} */
 				let onlyDirectImport = false;
 
-				if (isMemoryImport(moduleImport) === true) {
-					onlyDirectImport = true;
-				}
-
-				if (isTableImport(moduleImport) === true) {
-					onlyDirectImport = true;
+				if (isMemoryImport(node) === true) {
+					onlyDirectImport = "Memory";
+				} else if (isTableImport(node) === true) {
+					onlyDirectImport = "Table";
+				} else {
+					const incompatibleType = getJsIncompatibleType(node);
+					if (incompatibleType) {
+						onlyDirectImport = `Non-JS-compatible Func Sigurature (${incompatibleType})`;
+					}
 				}
 
 				const dep = new WebAssemblyImportDependency(
-					moduleImport.module,
-					moduleImport.name,
-					moduleImport.descr,
+					node.module,
+					node.name,
+					node.descr,
 					onlyDirectImport
 				);
 
diff --git a/lib/wasm/WebAssemblyUtils.js b/lib/wasm/WebAssemblyUtils.js
new file mode 100644
index 00000000000..8514a855b86
--- /dev/null
+++ b/lib/wasm/WebAssemblyUtils.js
@@ -0,0 +1,48 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const Template = require("../Template");
+const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+
+/** @typedef {import("../Module")} Module */
+
+/** @typedef {Object} UsedWasmDependency
+ * @property {WebAssemblyImportDependency} dependency the dependency
+ * @property {string} name the export name
+ */
+
+const MANGLED_MODULE = "a";
+
+/**
+ * @param {Module} module the module
+ * @returns {UsedWasmDependency[]} used dependencies and mangled name
+ */
+const getUsedDependencies = module => {
+	/** @type {UsedWasmDependency[]} */
+	const array = [];
+	let importIndex = 0;
+	for (const dep of module.dependencies) {
+		if (dep instanceof WebAssemblyImportDependency) {
+			if (dep.description.type === "GlobalType" || dep.module === null) {
+				continue;
+			}
+
+			const importedModule = dep.module;
+			const exportName = dep.name;
+			const usedName = importedModule && importedModule.isUsed(exportName);
+			if (usedName !== false) {
+				array.push({
+					dependency: dep,
+					name: Template.numberToIdentifer(importIndex++)
+				});
+			}
+		}
+	}
+	return array;
+};
+
+exports.getUsedDependencies = getUsedDependencies;
+exports.MANGLED_MODULE = MANGLED_MODULE;
diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js
index 412e4d68ef5..ad069d5313b 100644
--- a/lib/web/JsonpMainTemplatePlugin.js
+++ b/lib/web/JsonpMainTemplatePlugin.js
@@ -173,7 +173,6 @@ class JsonpMainTemplatePlugin {
 						"onScriptComplete({ type: 'timeout', target: script });"
 					]),
 					`}, ${chunkLoadTimeout});`,
-					"script.onerror = script.onload = onScriptComplete;",
 					"function onScriptComplete(event) {",
 					Template.indent([
 						"// avoid mem leaks in IE.",
@@ -196,7 +195,8 @@ class JsonpMainTemplatePlugin {
 						]),
 						"}"
 					]),
-					"};"
+					"};",
+					"script.onerror = script.onload = onScriptComplete;"
 				]);
 			}
 		);
diff --git a/open-bot.yaml b/open-bot.yaml
index 46f693cba16..17efe8708c0 100644
--- a/open-bot.yaml
+++ b/open-bot.yaml
@@ -59,7 +59,7 @@ rules:
 
 
 
-# Report specific error message if mocha for integration tests fails
+# Report specific error message if jest for basic tests fails
 - filters:
     ensure:
       value: "{{report_ci}}"
@@ -71,33 +71,52 @@ rules:
       state: "failed"
       allow_failure: false
       config:
-        env: JOB_PART=integration
+        env: JOB_PART=basic
     fetch: travis_job.log
     string_cleanup:
       id: logResult
       value: "{{{fetch}}}"
       remove:
-        - "^[\\s\\S]+?\\d+\\s+pending\n+"
-        - "npm ERR!.*\n"
-        - "\n*=============================================================================\n[\\s\\S]*"
+        - "^[\\s\\S]+?\\$ yarn travis:\\$JOB_PART.*\n"
+        - "\\$ node --max-old-space-size=4096.*\n"
+        - "^yarn run.+\n"
+        - "\\(node:\\d+\\) \\[DEP0005\\].+\n"
+        - "\\$ yarn (cover|test):.+\n"
+        - "Ran all test suites.\n[\\s\\S]*"
+        - "PASS test/.*\n"
     string_cleanup_1:
       id: firstError
       value: "{{{logResult}}}"
       remove:
-        - "\\s2\\)\\s[\\s\\S]*"
+        - "\n\n  ●[\\s\\S]*"
+        - "Test Suites:[\\s\\S]*"
+        - "\\s+$"
     string_cleanup_2:
       id: remainingErrors
       value: "{{{logResult}}}"
       remove:
-        - "^[\\s\\S]+?(?=\\s2\\)\\s)"
+        - "^[\\s\\S]+?(?=\n\n  ●|$)"
+        - "^\n+"
+        - "Test Suites:[\\s\\S]*"
+        - "\\s+$"
+    string_cleanup_3:
+      id: summary
+      value: "{{{logResult}}}"
+      remove:
+        - "^[\\s\\S]+?(?=Test Suites:)"
+        - "\\s+$"
   actions:
     comment:
       identifier: "ci-result"
       message: |-
+        The basic integration tests failed.
+
         @{{commit.author.login}} Please review the following output log for errors:
+
         ```text
         {{{firstError}}}
         ```
+        {{#if remainingErrors}}
         <details>
           <summary>Show remaining errors</summary>
 
@@ -105,6 +124,11 @@ rules:
         {{{remainingErrors}}}
         ```
         </details>
+        {{/if}}
+
+        ```text
+        {{{summary}}}
+        ```
 
         See [complete report here]({{status.target_url}}).
     set:
@@ -113,7 +137,7 @@ rules:
 
 
 
-# Report specific error message if mocha for unit tests fails
+# Report specific error message if jest for integration tests fails
 - filters:
     ensure:
       value: "{{report_ci}}"
@@ -125,26 +149,64 @@ rules:
       state: "failed"
       allow_failure: false
       config:
-        env: JOB_PART=unit
+        env: JOB_PART=integration
     fetch: travis_job.log
     string_cleanup:
       id: logResult
       value: "{{{fetch}}}"
       remove:
-        - "^[\\s\\S]+?\\d+\\s+pending\n+"
-        - "npm ERR!.*\n"
-        - "\n*=============================================================================\n[\\s\\S]*"
+        - "^[\\s\\S]+?\\$ yarn travis:\\$JOB_PART.*\n"
+        - "\\$ node --max-old-space-size=4096.*\n"
+        - "^yarn run.+\n"
+        - "\\(node:\\d+\\) \\[DEP0005\\].+\n"
+        - "\\$ yarn (cover|test):.+\n"
+        - "The command \"yarn travis:\\$JOB_PART\" exited[\\s\\S]*"
+        - "PASS test/.*\n"
+    string_cleanup_1:
+      id: firstError
+      value: "{{{logResult}}}"
+      remove:
+        - "\n\n  ●[\\s\\S]*"
+        - "Test Suites:[\\s\\S]*"
+        - "\\s+$"
+    string_cleanup_2:
+      id: remainingErrors
+      value: "{{{logResult}}}"
+      remove:
+        - "^[\\s\\S]+?(?=\n\n  ●|$)"
+        - "^\n+"
+        - "Test Suites:[\\s\\S]*"
+        - "\\s+$"
+    string_cleanup_3:
+      id: summary
+      value: "{{{logResult}}}"
+      remove:
+        - "^[\\s\\S]+?(?=Test Suites:)"
+        - "\\s+$"
   actions:
     comment:
       identifier: "ci-result"
       message: |-
+        The basic integration tests succeeded, but the full suite failed.
+
         @{{commit.author.login}} Please review the following output log for errors:
 
-        ``` text
-        {{{logResult}}}
+        ```text
+        {{{firstError}}}
         ```
+        {{#if remainingErrors}}
+        <details>
+          <summary>Show remaining errors</summary>
 
-        Instead of updating these (outdated?) unit tests, you can choose to delete them and add integration tests instead. That would be great.
+        ```text
+        {{{remainingErrors}}}
+        ```
+        </details>
+        {{/if}}
+
+        ```text
+        {{{summary}}}
+        ```
 
         See [complete report here]({{status.target_url}}).
     set:
@@ -153,7 +215,7 @@ rules:
 
 
 
-# Report specific error message if linting fails
+# Report specific error message if jest for unit tests or liniting fails
 - filters:
     ensure:
       value: "{{report_ci}}"
@@ -163,26 +225,35 @@ rules:
       context: "continuous-integration/travis-ci/pr"
     travis_job:
       state: "failed"
+      allow_failure: false
       config:
-        env: JOB_PART=lint
+        env: JOB_PART=lint-unit
     fetch: travis_job.log
     string_cleanup:
       id: logResult
       value: "{{{fetch}}}"
       remove:
-        - "^[\\s\\S]+?npm run travis:\\$JOB_PART\n*"
-        - "npm ERR!.*\n"
-        - "\n*The command \"npm run travis:\\$JOB_PART\" exited [\\s\\S]*"
+        - "^[\\s\\S]+?\\$ yarn travis:\\$JOB_PART.*\n"
+        - "\\$ node --max-old-space-size=4096.*\n"
+        - "^yarn run.+\n"
+        - "\\(node:\\d+\\) \\[DEP0005\\].+\n"
+        - "\\$ yarn (unit|lint).+\n"
+        - "The command \"yarn travis:\\$JOB_PART\" exited[\\s\\S]*"
+        - "PASS test/.*\n"
   actions:
     comment:
       identifier: "ci-result"
       message: |-
-        @{{commit.author.login}} The tests look fine, but there are code style issue in your Pull Request. Please review the following:
+        The integration tests look fine, but there are code style issues or unit test failures in the Pull Request.
+
+        @{{commit.author.login}} Please review the following output log for errors:
 
         ``` text
         {{{logResult}}}
         ```
 
+        If the unit tests are outdated, you can choose to delete them and add integration tests instead. That would be great.
+
         See [complete report here]({{status.target_url}}).
     set:
       id: report_ci
@@ -397,18 +468,6 @@ rules:
 
 
 
-# add small label to small pull requests
-- filters:
-    open: true
-    pull_request:
-      additions: "<= 10"
-      deletions: "<= 10"
-      changed_files: "<= 2"
-  actions:
-    label: "PR: small"
-
-
-
 # add non-master label to pull request to other branch
 - filters:
     open: true
@@ -517,10 +576,57 @@ rules:
         If you think this is still a valid issue, please file a new issue with additional information.
 
 
+# Add action actions box to each pull request
+- filters:
+    pull_request: true
+    open: true
+    not:
+      comment:
+        matching: admin-actions
+        author: webpack-bot
+  actions:
+    comment:
+      identifier: admin-actions
+      message: |-
+        *For maintainers only:*
+
+        * [x] <!-- document --> This need to be documented (issue in webpack/webpack.js.org will be filed when merged)
+
+
+# When a pull request need to be documented, create an issue in webpack/webpack.js.org when merged
+- filters:
+    pull_request:
+      merged: true
+    comment:
+      author: webpack-bot
+      matching: "\\* \\[x\\] <!-- document -->"
+    not:
+      comment_1:
+        author: webpack-bot
+        matching: admin-action-document-executed
+  actions:
+    new_issue:
+      target: webpack/webpack.js.org
+      title: "Document webpack change: {{{pull_request.title}}}"
+      body: |-
+        <!-- documentation request from webpack/webpack -->
+
+        *A pull request by @{{pull_request.user.login}} was merged and maintainers requested a documentation change.*
+
+        See pull request: {{{pull_request.html_url}}}
+
+        ---
+
+        {{{pull_request.body}}}
+    comment:
+      identifier: admin-action-document-executed
+      message: |-
+        I've created an issue to document this in webpack/webpack.js.org.
+
 
 
 
-# Check issues every week
+# Check open issues and pull requests every day
 - filters:
     open: true
   actions:
diff --git a/package.json b/package.json
index 6b54e031949..64b64c67a13 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,14 @@
 {
   "name": "webpack",
-  "version": "4.8.1",
+  "version": "4.9.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.3.2",
-    "@webassemblyjs/wasm-edit": "1.3.2",
-    "@webassemblyjs/wasm-parser": "1.3.2",
+    "@webassemblyjs/ast": "1.5.8",
+    "@webassemblyjs/wasm-edit": "1.5.8",
+    "@webassemblyjs/wasm-opt": "1.5.8",
+    "@webassemblyjs/wasm-parser": "1.5.8",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
@@ -15,6 +16,7 @@
     "chrome-trace-event": "^0.1.1",
     "enhanced-resolve": "^4.0.0",
     "eslint-scope": "^3.7.1",
+    "json-parse-better-errors": "^1.0.2",
     "loader-runner": "^2.3.0",
     "loader-utils": "^1.1.0",
     "memory-fs": "~0.4.1",
@@ -51,13 +53,15 @@
     "istanbul": "^0.4.5",
     "jade": "^1.11.0",
     "jade-loader": "~0.8.0",
-    "jest": "23.0.0-alpha.5",
+    "jest": "23.0.0-charlie.3",
     "jest-silent-reporter": "0.0.4",
     "json-loader": "^0.5.7",
     "less": "^2.5.1",
     "less-loader": "^4.0.3",
     "lodash": "^4.17.4",
     "prettier": "^1.11.1",
+    "pug": "^2.0.3",
+    "pug-loader": "^2.4.0",
     "raw-loader": "~0.5.0",
     "react": "^15.2.1",
     "react-dom": "^15.2.1",
@@ -65,10 +69,11 @@
     "script-loader": "~0.7.0",
     "simple-git": "^1.65.0",
     "style-loader": "^0.19.1",
-    "typescript": "^2.9.0-dev.20180506",
+    "typescript": "^2.9.0-dev.20180518",
     "url-loader": "^0.6.2",
     "val-loader": "^1.0.2",
     "vm-browserify": "~0.0.0",
+    "wast-loader": "^1.5.5",
     "webpack-dev-middleware": "^1.9.0",
     "worker-loader": "^1.1.1",
     "xxhashjs": "^0.2.1"
@@ -97,13 +102,14 @@
     "setup": "node ./setup/setup.js",
     "test": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest",
     "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 --ci $JEST && yarn cover:report-min",
-    "travis:unit": "yarn cover:init && yarn cover:unit --ci",
-    "travis:lint": "yarn lint",
+    "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: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 --ci %JEST% && yarn cover:report-min",
-    "appveyor:unit": "yarn cover:init && yarn cover:unit --ci && yarn cover:report-min",
+    "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: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",
@@ -111,10 +117,10 @@
     "pretest": "yarn lint",
     "prelint": "yarn setup",
     "lint": "yarn code-lint && yarn schema-lint && yarn type-lint",
-    "code-lint": "eslint setup lib bin hot buildin \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\"",
+    "code-lint": "eslint --cache setup lib bin hot buildin \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\"",
     "type-lint": "tsc --pretty",
     "fix": "yarn code-lint --fix",
-    "pretty": "prettier \"setup/**/*.js\" \"lib/**/*.js\" \"bin/*.js\" \"hot/*.js\" \"buildin/*.js\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" \"declarations.d.ts\" --write",
+    "pretty": "prettier --write \"setup/**/*.js\" \"lib/**/*.js\" \"bin/*.js\" \"hot/*.js\" \"buildin/*.js\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" \"declarations.d.ts\"",
     "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",
@@ -122,8 +128,7 @@
     "cover:all": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --coverage",
     "cover:integration": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.test.js\" --coverage",
     "cover:unit": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.unittest.js\" --coverage",
-    "cover:report": "istanbul report",
-    "cover:report-min": "istanbul report --report lcovonly"
+    "cover:report": "istanbul report"
   },
   "jest": {
     "forceExit": true,
@@ -140,7 +145,8 @@
       "<rootDir>/test/fixtures/temp-",
       "<rootDir>/benchmark/",
       "<rootDir>/examples/*/dist",
-      "<rootDir>/coverage/"
+      "<rootDir>/coverage/",
+      "<rootDir>/.eslintcache/"
     ],
     "modulePathIgnorePatterns": [
       "<rootDir>/node_modules/webpack/node_modules/",
@@ -150,7 +156,8 @@
       "<rootDir>/test/fixtures/temp-",
       "<rootDir>/benchmark/",
       "<rootDir>/examples/*/dist",
-      "<rootDir>/coverage/"
+      "<rootDir>/coverage/",
+      "<rootDir>/.eslintcache/"
     ],
     "transformIgnorePatterns": [
       "<rootDir>/"
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
index 15b17c0461b..f8d94d68320 100644
--- a/schemas/WebpackOptions.json
+++ b/schemas/WebpackOptions.json
@@ -492,7 +492,14 @@
               "properties": {
                 "root": {
                   "description": "Name of the property exposed globally by a UMD library",
-                  "type": "string"
+                  "anyOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "$ref": "#/definitions/common.arrayOfStringValues"
+                    }
+                  ]
                 },
                 "amd": {
                   "description": "Name of the exposed AMD library in the UMD",
@@ -1672,6 +1679,10 @@
         }
       ]
     },
+    "serve": {
+      "description": "Options for webpack-serve",
+      "type": "object"
+    },
     "stats": {
       "description": "Used by the webpack CLI program to pass stats options.",
       "anyOf": [
diff --git a/schemas/plugins/BannerPlugin.json b/schemas/plugins/BannerPlugin.json
index f2e50213217..87e47903611 100644
--- a/schemas/plugins/BannerPlugin.json
+++ b/schemas/plugins/BannerPlugin.json
@@ -39,8 +39,15 @@
       ],
       "properties": {
         "banner": {
-          "description": "The banner as string, it will be wrapped in a comment",
-          "type": "string"
+          "description": "Specifies the banner",
+          "anyOf": [
+            {
+              "instanceof": "Function"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "raw": {
           "description": "If true, banner will not be wrapped in a comment",
@@ -76,6 +83,10 @@
         }
       }
     },
+    {
+      "description": "The banner as function, it will be wrapped in a comment",
+      "instanceof": "Function"
+    },
     {
       "description": "The banner as string, it will be wrapped in a comment",
       "minLength": 1,
diff --git a/schemas/plugins/DllPlugin.json b/schemas/plugins/DllPlugin.json
index 20c47588d30..940da62f155 100644
--- a/schemas/plugins/DllPlugin.json
+++ b/schemas/plugins/DllPlugin.json
@@ -23,6 +23,10 @@
       "description": "Absolute path to the manifest json file (output)",
       "minLength": 1,
       "type": "string"
+    },
+    "entryOnly": {
+      "description": "If true, only entry points will be exposed",
+      "type": "boolean"
     }
   }
 }
diff --git a/test/ConfigTestCases.test.js b/test/ConfigTestCases.test.js
index b0f58ddc86b..9273f2b9362 100644
--- a/test/ConfigTestCases.test.js
+++ b/test/ConfigTestCases.test.js
@@ -5,6 +5,7 @@ const path = require("path");
 const fs = require("fs");
 const vm = require("vm");
 const mkdirp = require("mkdirp");
+const rimraf = require("rimraf");
 const checkArrayExpectation = require("./checkArrayExpectation");
 
 const Stats = require("../lib/Stats");
@@ -15,6 +16,8 @@ describe("ConfigTestCases", () => {
 	const casesPath = path.join(__dirname, "configCases");
 	let categories = fs.readdirSync(casesPath);
 
+	jest.setTimeout(10000);
+
 	categories = categories.map(cat => {
 		return {
 			name: cat,
@@ -47,7 +50,6 @@ describe("ConfigTestCases", () => {
 						category.name,
 						testName
 					);
-					mkdirp.sync(outputDirectory);
 					const exportedTests = [];
 					const exportedBeforeEach = [];
 					const exportedAfterEach = [];
@@ -59,6 +61,8 @@ describe("ConfigTestCases", () => {
 									if (err) return reject(err);
 									resolve();
 								};
+								rimraf.sync(outputDirectory);
+								mkdirp.sync(outputDirectory);
 								const options = prepareOptions(
 									require(path.join(testDirectory, "webpack.config.js")),
 									{ testPath: outputDirectory }
@@ -260,7 +264,9 @@ describe("ConfigTestCases", () => {
 									if (exportedTests.length < filesCount)
 										return done(new Error("No tests exported by test case"));
 									if (testConfig.afterExecute) testConfig.afterExecute();
-									const asyncSuite = describe("exported tests", () => {
+									const asyncSuite = describe(`ConfigTestCases ${
+										category.name
+									} ${testName} exported tests`, () => {
 										exportedBeforeEach.forEach(beforeEach);
 										exportedAfterEach.forEach(afterEach);
 										exportedTests.forEach(
diff --git a/test/Errors.test.js b/test/Errors.test.js
index d67c746fb8c..a1432382b09 100644
--- a/test/Errors.test.js
+++ b/test/Errors.test.js
@@ -8,6 +8,8 @@ const webpack = require("../lib/webpack");
 const base = path.join(__dirname, "fixtures", "errors");
 
 describe("Errors", () => {
+	jest.setTimeout(20000);
+
 	function customOutputFilesystem(c) {
 		const files = {};
 		c.outputFileSystem = {
diff --git a/test/ExternalModule.unittest.js b/test/ExternalModule.unittest.js
index 14725a0b5f8..075c4600919 100644
--- a/test/ExternalModule.unittest.js
+++ b/test/ExternalModule.unittest.js
@@ -171,7 +171,7 @@ describe("ExternalModule", () => {
 			// 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;}
+			const expected = `if(typeof foo === 'undefined') {var e = new Error("Cannot find module 'bar'"); e.code = 'MODULE_NOT_FOUND'; throw e;}
 `;
 
 			// invoke
@@ -207,7 +207,7 @@ describe("ExternalModule", () => {
 				// 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;}
+				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
@@ -239,7 +239,7 @@ module.exports = __WEBPACK_EXTERNAL_MODULE_someId__;`;
 			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;}
+				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
diff --git a/test/HotTestCases.test.js b/test/HotTestCases.test.js
index b31b5321362..22a5f852eb2 100644
--- a/test/HotTestCases.test.js
+++ b/test/HotTestCases.test.js
@@ -177,13 +177,15 @@ describe("HotTestCases", () => {
 								if (exportedTests.length < 1)
 									return done(new Error("No tests exported by test case"));
 
-								const asyncSuite = describe("exported tests", () => {
-									exportedTests.forEach(
-										({ title, fn, timeout }) =>
-											fn
-												? fit(title, fn, timeout)
-												: fit(title, () => {}).pend("Skipped")
-									);
+								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;
diff --git a/test/MultiCompiler.test.js b/test/MultiCompiler.test.js
index a3e60aaaa0a..92ff2dc6848 100644
--- a/test/MultiCompiler.test.js
+++ b/test/MultiCompiler.test.js
@@ -21,6 +21,8 @@ const createMultiCompiler = () => {
 };
 
 describe("MultiCompiler", function() {
+	jest.setTimeout(20000);
+
 	it("should trigger 'run' for each child compiler", done => {
 		const compiler = createMultiCompiler();
 		let called = 0;
diff --git a/test/ProgressPlugin.test.js b/test/ProgressPlugin.test.js
new file mode 100644
index 00000000000..bfa2691591a
--- /dev/null
+++ b/test/ProgressPlugin.test.js
@@ -0,0 +1,40 @@
+"use strict";
+
+const path = require("path");
+const MemoryFs = require("memory-fs");
+const webpack = require("../");
+
+const createMultiCompiler = () => {
+	const compiler = webpack([
+		{
+			context: path.join(__dirname, "fixtures"),
+			entry: "./a.js"
+		},
+		{
+			context: path.join(__dirname, "fixtures"),
+			entry: "./b.js"
+		}
+	]);
+	compiler.outputFileSystem = new MemoryFs();
+	return compiler;
+};
+
+describe("ProgressPlugin", function() {
+	it("should not contain NaN as a percentage when it is applied to MultiCompiler", function(done) {
+		const compiler = createMultiCompiler();
+
+		let percentage = 0;
+		new webpack.ProgressPlugin((p, msg, ...args) => {
+			percentage += p;
+		}).apply(compiler);
+
+		compiler.run(err => {
+			if (err) {
+				throw err;
+			} else {
+				expect(percentage).not.toBe(NaN);
+				done();
+			}
+		});
+	});
+});
diff --git a/test/README.md b/test/README.md
index 05b25ccce10..97fb3320bff 100644
--- a/test/README.md
+++ b/test/README.md
@@ -4,16 +4,25 @@ Every pull request that you submit to webpack (besides README and spelling corre
 But don't give up hope!!! Although our tests may appear complex and overwhelming, once you become familiar with the test suite and structure, adding and creating tests will be fun and beneficial as you work inside the codebase! ❤
 
 ## tl;dr
-* Clone repo
-* Run tests (this automatically runs the setup)
-	* `yarn test`
+Run all tests (this automatically runs the setup):
+```sh
+yarn test
+```
 
-* To run an individual suite: (recommended during development for easier isolated diffs)
+Run an individual suite:
+```sh
+yarn jest ConfigTestCases
+```
 
-Example: `$(npm bin)/mocha --grep ConfigTestCases`
+Watch mode:
+```sh
+yarn jest --watch ConfigTestCases
+```
+
+See also: [Jest CLI docs](https://facebook.github.io/jest/docs/cli.html)
 
 ## Test suite overview
-We use MochaJS for our tests. For more information on Mocha you can visit their [homepage](https://mochajs.org/)!
+We use Jest for our tests. For more information on Jest you can visit their [homepage](https://facebook.github.io/jest/)!
 
 ### 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).
diff --git a/test/TestCases.template.js b/test/TestCases.template.js
index 8242c61dd6f..57dab3269db 100644
--- a/test/TestCases.template.js
+++ b/test/TestCases.template.js
@@ -52,6 +52,8 @@ const describeCases = config => {
 	describe(config.name, () => {
 		categories.forEach(category => {
 			describe(category.name, function() {
+				jest.setTimeout(20000);
+
 				category.tests
 					.filter(test => {
 						const testDirectory = path.join(casesPath, category.name, test);
@@ -139,8 +141,13 @@ const describeCases = config => {
 											loader: "coffee-loader"
 										},
 										{
-											test: /\.jade$/,
-											loader: "jade-loader"
+											test: /\.pug/,
+											loader: "pug-loader"
+										},
+										{
+											test: /\.wat$/i,
+											loader: "wast-loader",
+											type: "webassembly/experimental"
 										}
 									]
 								},
@@ -160,10 +167,10 @@ const describeCases = config => {
 									});
 								})
 							};
-							let exportedTests = [];
 							it(
 								testName + " should compile",
 								done => {
+									const exportedTests = [];
 									webpack(options, (err, stats) => {
 										if (err) done(err);
 										const statOptions = Stats.presetToOptions("verbose");
@@ -233,7 +240,9 @@ const describeCases = config => {
 										if (exportedTests.length === 0)
 											return done(new Error("No tests exported by test case"));
 
-										const asyncSuite = describe("exported tests", () => {
+										const asyncSuite = describe(`${config.name} ${
+											category.name
+										} ${testName} exported tests`, () => {
 											exportedTests.forEach(
 												({ title, fn, timeout }) =>
 													fn
diff --git a/test/Validation.test.js b/test/Validation.test.js
index f43b2c031be..6f29d6a9ee5 100644
--- a/test/Validation.test.js
+++ b/test/Validation.test.js
@@ -199,7 +199,7 @@ describe("Validation", () => {
 				" - 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?, stats?, target?, watch?, watchOptions? }",
+					"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.",
diff --git a/test/WatchTestCases.test.js b/test/WatchTestCases.test.js
index 339d3bcd221..a1d957aacbc 100644
--- a/test/WatchTestCases.test.js
+++ b/test/WatchTestCases.test.js
@@ -327,7 +327,9 @@ describe("WatchTestCases", () => {
 										};
 
 										// Run the tests
-										const asyncSuite = describe(`step ${run.name}`, () => {
+										const asyncSuite = describe(`WatchTestCases ${
+											category.name
+										} ${testName} step ${run.name}`, () => {
 											exportedTests.forEach(
 												({ title, fn, timeout }) =>
 													fn
diff --git a/test/WebpackMissingModule.unittest.js b/test/WebpackMissingModule.unittest.js
index b8e3c00942b..73ea0a790c8 100644
--- a/test/WebpackMissingModule.unittest.js
+++ b/test/WebpackMissingModule.unittest.js
@@ -8,7 +8,7 @@ describe("WebpackMissingModule", () => {
 		it("returns an error message based on given error message", () => {
 			const errorMessage = WebpackMissingModule.moduleCode("mock message");
 			expect(errorMessage).toBe(
-				'var e = new Error("Cannot find module \\"mock message\\""); e.code = \'MODULE_NOT_FOUND\'; throw e;'
+				"var e = new Error(\"Cannot find module 'mock message'\"); e.code = 'MODULE_NOT_FOUND'; throw e;"
 			);
 		});
 	});
@@ -17,7 +17,7 @@ describe("WebpackMissingModule", () => {
 		it("returns an error message based on given error message", () => {
 			const errorMessage = WebpackMissingModule.promise("mock message");
 			expect(errorMessage).toBe(
-				'Promise.reject(function webpackMissingModule() { var e = new Error("Cannot find module \\"mock message\\""); e.code = \'MODULE_NOT_FOUND\'; return e; }())'
+				"Promise.reject(function webpackMissingModule() { var e = new Error(\"Cannot find module 'mock message'\"); e.code = 'MODULE_NOT_FOUND'; return e; }())"
 			);
 		});
 	});
@@ -26,7 +26,7 @@ describe("WebpackMissingModule", () => {
 		it("returns an error message based on given error message", () => {
 			const errorMessage = WebpackMissingModule.module("mock message");
 			expect(errorMessage).toBe(
-				'!(function webpackMissingModule() { var e = new Error("Cannot find module \\"mock message\\""); e.code = \'MODULE_NOT_FOUND\'; throw e; }())'
+				"!(function webpackMissingModule() { var e = new Error(\"Cannot find module 'mock message'\"); e.code = 'MODULE_NOT_FOUND'; throw e; }())"
 			);
 		});
 	});
diff --git a/test/__snapshots__/ConfigTestCases.test.js.snap b/test/__snapshots__/ConfigTestCases.test.js.snap
new file mode 100644
index 00000000000..0dab29d9c95
--- /dev/null
+++ b/test/__snapshots__/ConfigTestCases.test.js.snap
@@ -0,0 +1,61 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ConfigTestCases records issue-2991 exported tests should write relative paths to records 1`] = `
+"{
+  \\"modules\\": {
+    \\"byIdentifier\\": {
+      \\"external \\\\\\"path\\\\\\"\\": 0,
+      \\"external \\\\\\"fs\\\\\\"\\": 1,
+      \\"ignored  pkgs/somepackage/foo\\": 2,
+      \\"test.js\\": 3
+    },
+    \\"usedIds\\": {
+      \\"0\\": 0,
+      \\"1\\": 1,
+      \\"2\\": 2,
+      \\"3\\": 3
+    }
+  },
+  \\"chunks\\": {
+    \\"byName\\": {
+      \\"main\\": 0
+    },
+    \\"bySource\\": {},
+    \\"usedIds\\": [
+      0
+    ]
+  }
+}"
+`;
+
+exports[`ConfigTestCases records issue-7339 exported tests should write relative dynamic-require paths to records 1`] = `
+"{
+  \\"modules\\": {
+    \\"byIdentifier\\": {
+      \\"dependencies/foo.js\\": 0,
+      \\"dependencies/bar.js\\": 1,
+      \\"external \\\\\\"path\\\\\\"\\": 2,
+      \\"external \\\\\\"fs\\\\\\"\\": 3,
+      \\"dependencies sync /^\\\\\\\\.\\\\\\\\/.*$/\\": 4,
+      \\"test.js\\": 5
+    },
+    \\"usedIds\\": {
+      \\"0\\": 0,
+      \\"1\\": 1,
+      \\"2\\": 2,
+      \\"3\\": 3,
+      \\"4\\": 4,
+      \\"5\\": 5
+    }
+  },
+  \\"chunks\\": {
+    \\"byName\\": {
+      \\"main\\": 0
+    },
+    \\"bySource\\": {},
+    \\"usedIds\\": [
+      0
+    ]
+  }
+}"
+`;
diff --git a/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
index a5025f6ac5e..096a3e16231 100644
--- a/test/__snapshots__/StatsTestCases.test.js.snap
+++ b/test/__snapshots__/StatsTestCases.test.js.snap
@@ -341,61 +341,61 @@ 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/a~async-a~async-b~async-c~b~c.js (a~async-a~async-b~async-c~b~c) 20 bytes <{9}> ={0}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: a~async-a~async-b~async-c~b~c)
+    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)
         > ./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~b~c.js (async-b~async-c~async-g~b~c) 20 bytes <{0}> <{1}> <{10}> <{3}> <{8}> <{9}> ={0}= ={1}= ={3}= ={4}= ={5}= ={6}= ={7}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g~b~c)
+    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)
         > ./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}= ={8}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~b)
+    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}= ={7}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~c)
+    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)
         > ./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}> <{8}> ={2}= [rendered]
+    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-b.js (async-b) 72 bytes <{9}> ={0}= ={1}= ={2}= ={3}= [rendered]
-        > ./b [8] ./index.js 2:0-47
-     [4] ./b.js 72 bytes {6} {11} [built]
-    chunk    {7} 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 {7} {12} [built]
-    chunk    {8} multiple-vendors/a~async-a.js (a~async-a) 156 bytes <{9}> ={0}= ={1}= ={3}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: a~async-a)
+    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 {8} {10} [built]
+     [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]
         > ./ main
      [8] ./index.js 147 bytes {9} [built]
     chunk   {10} multiple-vendors/a.js (a) 176 bytes ={0}= ={3}= >{2}< >{5}< [entry] [rendered]
         > ./a a
      [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [6] ./a.js + 1 modules 156 bytes {8} {10} [built]
+     [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
     chunk   {11} multiple-vendors/b.js (b) 112 bytes ={0}= ={3}= [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 {6} {11} [built]
+     [4] ./b.js 72 bytes {7} {11} [built]
     chunk   {12} 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 {7} {12} [built]
+     [5] ./c.js 72 bytes {8} {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
@@ -409,61 +409,61 @@ 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/a~async-a~async-b~async-c~b~c.js (a~async-a~async-b~async-c~b~c) 20 bytes <{9}> ={0}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: a~async-a~async-b~async-c~b~c)
+    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)
         > ./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~b~c.js (async-b~async-c~async-g~b~c) 20 bytes <{0}> <{1}> <{10}> <{3}> <{8}> <{9}> ={0}= ={1}= ={3}= ={4}= ={5}= ={6}= ={7}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g~b~c)
+    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)
         > ./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}= ={8}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~b)
+    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}= ={7}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~c)
+    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)
         > ./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}> <{8}> ={2}= [rendered]
+    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-b.js (async-b) 72 bytes <{9}> ={0}= ={1}= ={2}= ={3}= [rendered]
-        > ./b [8] ./index.js 2:0-47
-     [4] ./b.js 72 bytes {6} {11} [built]
-    chunk    {7} 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 {7} {12} [built]
-    chunk    {8} all/a~async-a.js (a~async-a) 156 bytes <{9}> ={0}= ={1}= ={3}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: a~async-a)
+    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 {8} {10} [built]
+     [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]
         > ./ main
      [8] ./index.js 147 bytes {9} [built]
     chunk   {10} all/a.js (a) 176 bytes ={0}= ={3}= >{2}< >{5}< [entry] [rendered]
         > ./a a
      [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [6] ./a.js + 1 modules 156 bytes {8} {10} [built]
+     [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
     chunk   {11} all/b.js (b) 112 bytes ={0}= ={3}= [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 {6} {11} [built]
+     [4] ./b.js 72 bytes {7} {11} [built]
     chunk   {12} 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 {7} {12} [built]"
+     [5] ./c.js 72 bytes {8} {12} [built]"
 `;
 
 exports[`StatsTestCases should print correct stats for chunk-module-id-range 1`] = `
@@ -680,15 +680,15 @@ exports[`StatsTestCases should print correct stats for concat-and-sideeffects 1`
     |     ModuleConcatenation bailout: Module is an entry point
     | ./node_modules/pmodule/a.js 49 bytes [built]
     | ./node_modules/pmodule/aa.js 24 bytes [built]
-[1] ./node_modules/pmodule/b.js 49 bytes [built]
+[1] ./node_modules/pmodule/index.js 63 bytes [built]
     ModuleConcatenation bailout: Module is not in any chunk
-[2] ./node_modules/pmodule/bb.js 24 bytes [built]
+[2] ./node_modules/pmodule/b.js 49 bytes [built]
     ModuleConcatenation bailout: Module is not in any chunk
-[3] ./node_modules/pmodule/c.js 49 bytes [built]
+[3] ./node_modules/pmodule/bb.js 24 bytes [built]
     ModuleConcatenation bailout: Module is not in any chunk
-[4] ./node_modules/pmodule/cc.js 24 bytes [built]
+[4] ./node_modules/pmodule/c.js 49 bytes [built]
     ModuleConcatenation bailout: Module is not in any chunk
-[5] ./node_modules/pmodule/index.js 63 bytes [built]
+[5] ./node_modules/pmodule/cc.js 24 bytes [built]
     ModuleConcatenation bailout: Module is not in any chunk"
 `;
 
@@ -1380,7 +1380,7 @@ 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
 Entrypoint main = main.js
-chunk    {0} cir1.js (cir1) 81 bytes <{3}> <{4}> <{5}> >{5}< [rendered]
+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
@@ -1401,7 +1401,7 @@ chunk    {4} main.js (main) 523 bytes >{0}< >{1}< >{2}< >{3}< [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}> >{0}< [rendered]
+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]
@@ -1973,6 +1973,11 @@ Child manifest is named entry:
     [4] ./f.js 20 bytes {1} [built]"
 `;
 
+exports[`StatsTestCases should print correct stats for runtime-chunk-issue-7382 1`] = `
+"Entrypoint e1 = runtime.js all.js e1.js
+Entrypoint e2 = runtime.js all.js e2.js"
+`;
+
 exports[`StatsTestCases should print correct stats for runtime-chunk-single 1`] = `
 "Entrypoint e1 = runtime.js e1.js
 Entrypoint e2 = runtime.js e2.js"
@@ -2057,6 +2062,25 @@ Child
         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-simple-unused 1`] = `
+"Hash: 0cb74fac5f3c1b7f2150
+Time: Xms
+Built at: Thu Jan 01 1970 00:00:00 GMT
+  Asset     Size  Chunks             Chunk Names
+main.js  3.9 KiB       0  [emitted]  main
+Entrypoint main = main.js
+[0] ./node_modules/pmodule/b.js 69 bytes [built]
+    [no exports used]
+[1] ./node_modules/pmodule/a.js 60 bytes [built]
+    [no exports used]
+[2] ./index.js + 2 modules 158 bytes {0} [built]
+    | ./index.js 55 bytes [built]
+    | ./node_modules/pmodule/index.js 75 bytes [built]
+    |     [only some exports used: default]
+    | ./node_modules/pmodule/c.js 28 bytes [built]
+    |     [only some exports used: z]"
+`;
+
 exports[`StatsTestCases should print correct stats for simple 1`] = `
 "Hash: 1843cc9aed8366594774
 Time: Xms
@@ -2161,61 +2185,61 @@ 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/a~async-a~async-b~async-c~b~c.js (a~async-a~async-b~async-c~b~c) 20 bytes <{9}> ={0}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: a~async-a~async-b~async-c~b~c)
+    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)
         > ./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~b~c.js (async-b~async-c~async-g~b~c) 20 bytes <{0}> <{1}> <{10}> <{3}> <{8}> <{9}> ={0}= ={1}= ={3}= ={4}= ={5}= ={6}= ={7}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g~b~c)
+    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)
         > ./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}= ={8}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~a~async-a~async-b~b)
+    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}= ={7}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~c)
+    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)
         > ./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}> <{8}> ={2}= [rendered]
+    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-b.js (async-b) 72 bytes <{9}> ={0}= ={1}= ={2}= ={3}= [rendered]
-        > ./b [8] ./index.js 2:0-47
-     [4] ./b.js 72 bytes {6} {11} [built]
-    chunk    {7} 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 {7} {12} [built]
-    chunk    {8} default/a~async-a.js (a~async-a) 156 bytes <{9}> ={0}= ={1}= ={3}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: a~async-a)
+    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 {8} {10} [built]
+     [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]
         > ./ main
      [8] ./index.js 147 bytes {9} [built]
     chunk   {10} default/a.js (a) 176 bytes ={0}= ={3}= >{2}< >{5}< [entry] [rendered]
         > ./a a
      [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [6] ./a.js + 1 modules 156 bytes {8} {10} [built]
+     [6] ./a.js + 1 modules 156 bytes {6} {10} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
     chunk   {11} default/b.js (b) 112 bytes ={0}= ={3}= [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 {6} {11} [built]
+     [4] ./b.js 72 bytes {7} {11} [built]
     chunk   {12} 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 {7} {12} [built]
+     [5] ./c.js 72 bytes {8} {12} [built]
 Child manual:
     Entrypoint main = default/main.js
     Entrypoint a = default/vendors.js default/a.js
@@ -2274,72 +2298,70 @@ Child manual:
      [5] ./c.js 72 bytes {4} {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.js
-    Entrypoint bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb = vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccc~50ebc41f.js vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.js bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.js
-    Entrypoint cccccccccccccccccccccccccccccc = vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccc~50ebc41f.js vendors~async-c~cccccccccccccccccccccccccccccc.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}= ={6}= ={7}= ={8}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccc~50ebc41f)
+    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 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~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 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 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}= ={7}= ={8}= >{2}< >{6}< [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 [8] ./index.js 1:0-47
-        > ./b [8] ./index.js 2:0-47
-        > ./c [8] ./index.js 3:0-47
+        > ./a [7] ./index.js 1:0-47
+        > ./b [7] ./index.js 2:0-47
+        > ./c [7] ./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}= ={2}= ={3}= ={4}= ={6}= ={7}= ={8}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~async-c~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccc~18066793)
-        > ./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} async-b~async-c~async-g~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccccccccccccccccccc.js (async-b~async-c~async-g~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccccccccccccccccccc) 20 bytes <{0}> <{1}> <{10}> <{3}> <{8}> <{9}> ={0}= ={1}= ={3}= ={4}= ={5}= ={6}= ={7}= [rendered] split chunk (cache group: default) (name: async-b~async-c~async-g~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb~cccccccccccccccccccccccccccccc)
+    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}= ={7}= ={8}= >{2}< >{6}< [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 [7] ./index.js 1:0-47
+        > ./b [7] ./index.js 2:0-47
+        > ./c [7] ./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}> <{5}> <{9}> ={0}= ={1}= ={11}= ={12}= ={3}= ={4}= ={6}= ={7}= ={8}= [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 [8] ./index.js 2:0-47
-        > ./c [8] ./index.js 3:0-47
-     [1] ./f.js 20 bytes {2} {11} {12} [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}= ={6}= ={8}= >{2}< >{5}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb)
+        > ./b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+        > ./c cccccccccccccccccccccccccccccc
+        > ./b [7] ./index.js 2:0-47
+        > ./c [7] ./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}= ={5}= ={7}= >{2}< >{6}< [initial] [rendered] split chunk (cache group: vendors) (name: vendors~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a~async-b~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb)
         > ./a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
         > ./b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-        > ./a [8] ./index.js 1:0-47
-        > ./b [8] ./index.js 2:0-47
+        > ./a [7] ./index.js 1:0-47
+        > ./b [7] ./index.js 2:0-47
      [3] ./node_modules/y.js 20 bytes {3} [built]
-    chunk    {4} vendors~async-c~cccccccccccccccccccccccccccccc.js (vendors~async-c~cccccccccccccccccccccccccccccc) 20 bytes <{9}> ={0}= ={1}= ={12}= ={2}= ={7}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~cccccccccccccccccccccccccccccc)
+    chunk    {4} vendors~async-c~cccccccccccccccccccccccccccccc.js (vendors~async-c~cccccccccccccccccccccccccccccc) 20 bytes <{9}> ={0}= ={1}= ={12}= ={2}= ={8}= [initial] [rendered] split chunk (cache group: vendors) (name: vendors~async-c~cccccccccccccccccccccccccccccc)
         > ./c cccccccccccccccccccccccccccccc
-        > ./c [8] ./index.js 3:0-47
-     [7] ./node_modules/z.js 20 bytes {4} [built]
-    chunk    {5} async-g.js (async-g) 34 bytes <{0}> <{1}> <{10}> <{3}> <{8}> ={2}= [rendered]
-        > ./g [] 6:0-47
-        > ./g [] 6:0-47
-     [9] ./g.js 34 bytes {5} [built]
-    chunk    {6} 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 {6} {11} [built]
-    chunk    {7} 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 {7} {12} [built]
-    chunk    {8} aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a.js (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a) 156 bytes <{9}> ={0}= ={1}= ={3}= >{2}< >{5}< [rendered] split chunk (cache group: default) (name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a)
-        > ./a [8] ./index.js 1:0-47
-     [6] ./a.js + 1 modules 156 bytes {8} {10} [built]
+        > ./c [7] ./index.js 3:0-47
+     [6] ./node_modules/z.js 20 bytes {4} [built]
+    chunk    {5} aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a.js (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a) 156 bytes <{9}> ={0}= ={1}= ={10}= ={3}= >{2}< >{6}< [initial] [rendered] split chunk (cache group: default) (name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~async-a)
+        > ./a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+        > ./a [7] ./index.js 1:0-47
+     [8] ./a.js + 1 modules 156 bytes {5} [built]
          | ./a.js 121 bytes [built]
          | ./e.js 20 bytes [built]
-    chunk    {9} main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{6}< >{7}< >{8}< [entry] [rendered]
+    chunk    {6} 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 {6} [built]
+    chunk    {7} async-b.js (async-b) 72 bytes <{9}> ={0}= ={1}= ={2}= ={3}= [rendered]
+        > ./b [7] ./index.js 2:0-47
+     [4] ./b.js 72 bytes {7} {11} [built]
+    chunk    {8} async-c.js (async-c) 72 bytes <{9}> ={0}= ={1}= ={2}= ={4}= [rendered]
+        > ./c [7] ./index.js 3:0-47
+     [5] ./c.js 72 bytes {8} {12} [built]
+    chunk    {9} main.js (main) 147 bytes >{0}< >{1}< >{2}< >{3}< >{4}< >{5}< >{7}< >{8}< [entry] [rendered]
         > ./ main
-     [8] ./index.js 147 bytes {9} [built]
-    chunk   {10} aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.js (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) 176 bytes ={0}= ={3}= >{2}< >{5}< [entry] [rendered]
+     [7] ./index.js 147 bytes {9} [built]
+    chunk   {10} aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.js (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) 0 bytes ={0}= ={1}= ={3}= ={5}= >{2}< >{6}< [entry] [rendered]
         > ./a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [6] ./a.js + 1 modules 156 bytes {8} {10} [built]
-         | ./a.js 121 bytes [built]
-         | ./e.js 20 bytes [built]
-    chunk   {11} bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.js (bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) 112 bytes ={0}= ={3}= [entry] [rendered]
+    chunk   {11} bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.js (bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) 72 bytes ={0}= ={1}= ={2}= ={3}= [entry] [rendered]
         > ./b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-     [4] ./b.js 72 bytes {6} {11} [built]
-    chunk   {12} cccccccccccccccccccccccccccccc.js (cccccccccccccccccccccccccccccc) 112 bytes ={0}= ={4}= [entry] [rendered]
+     [4] ./b.js 72 bytes {7} {11} [built]
+    chunk   {12} cccccccccccccccccccccccccccccc.js (cccccccccccccccccccccccccccccc) 72 bytes ={0}= ={1}= ={2}= ={4}= [entry] [rendered]
         > ./c cccccccccccccccccccccccccccccc
-     [0] ./d.js 20 bytes {1} {10} {11} {12} [built]
-     [1] ./f.js 20 bytes {2} {11} {12} [built]
-     [5] ./c.js 72 bytes {7} {12} [built]
+     [5] ./c.js 72 bytes {8} {12} [built]
 Child custom-chunks-filter:
     Entrypoint main = default/main.js
     Entrypoint a = default/a.js
@@ -2352,12 +2374,12 @@ Child custom-chunks-filter:
         > ./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~b~c.js (async-a~async-b~async-c~b~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~b~c)
+    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)
         > ./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~b~c.js (async-b~async-c~async-g~b~c) 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~b~c)
+    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)
         > ./g [] 6:0-47
         > ./g [] 6:0-47
         > ./b [8] ./index.js 2:0-47
diff --git a/test/cases/chunks/import-circle/index.js b/test/cases/chunks/import-circle/index.js
new file mode 100644
index 00000000000..feb7bc8b726
--- /dev/null
+++ b/test/cases/chunks/import-circle/index.js
@@ -0,0 +1,15 @@
+import leftHelix from './leftHelix';
+import rightHelix from './rightHelix';
+
+it("should import generate ensure function for this", () =>
+{
+	return Promise.all([
+		leftHelix.run(),
+		rightHelix.run()
+	]);
+});
+
+export default {
+  leftHelix,
+  rightHelix,
+};
diff --git a/test/cases/chunks/import-circle/leftHelix.js b/test/cases/chunks/import-circle/leftHelix.js
new file mode 100644
index 00000000000..455e0daebf8
--- /dev/null
+++ b/test/cases/chunks/import-circle/leftHelix.js
@@ -0,0 +1,6 @@
+import leftHelixPrime, { run } from './leftHelixPrime';
+
+export default {
+	leftHelixPrime,
+	run
+};
diff --git a/test/cases/chunks/import-circle/leftHelixPrime.js b/test/cases/chunks/import-circle/leftHelixPrime.js
new file mode 100644
index 00000000000..9b720f2d1fe
--- /dev/null
+++ b/test/cases/chunks/import-circle/leftHelixPrime.js
@@ -0,0 +1,9 @@
+import rightHelixPrime from './rightHelixPrime';
+
+export function run() {
+	return import(/* webpackChunkName: "left" */ './leftHelix');
+}
+
+export default {
+	rightHelixPrime,
+};
diff --git a/test/cases/chunks/import-circle/rightHelix.js b/test/cases/chunks/import-circle/rightHelix.js
new file mode 100644
index 00000000000..2fe50e79171
--- /dev/null
+++ b/test/cases/chunks/import-circle/rightHelix.js
@@ -0,0 +1,6 @@
+import rightHelixPrime, { run } from './rightHelixPrime';
+
+export default {
+	rightHelixPrime,
+	run
+}
diff --git a/test/cases/chunks/import-circle/rightHelixPrime.js b/test/cases/chunks/import-circle/rightHelixPrime.js
new file mode 100644
index 00000000000..5657a7127e5
--- /dev/null
+++ b/test/cases/chunks/import-circle/rightHelixPrime.js
@@ -0,0 +1,9 @@
+import leftHelixPrime from './leftHelixPrime';
+
+export function run() {
+	return import(/* webpackChunkName: "right" */ './rightHelix');
+}
+
+export default {
+    leftHelixPrime
+};
diff --git a/test/cases/loaders/_resources/included.jade b/test/cases/loaders/_resources/included.pug
similarity index 100%
rename from test/cases/loaders/_resources/included.jade
rename to test/cases/loaders/_resources/included.pug
diff --git a/test/cases/loaders/_resources/parent.jade b/test/cases/loaders/_resources/parent.pug
similarity index 100%
rename from test/cases/loaders/_resources/parent.jade
rename to test/cases/loaders/_resources/parent.pug
diff --git a/test/cases/loaders/_resources/template.jade b/test/cases/loaders/_resources/template.pug
similarity index 100%
rename from test/cases/loaders/_resources/template.jade
rename to test/cases/loaders/_resources/template.pug
diff --git a/test/cases/loaders/jade-loader/index.js b/test/cases/loaders/jade-loader/index.js
deleted file mode 100644
index ce442433985..00000000000
--- a/test/cases/loaders/jade-loader/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-it("should handle the jade loader correctly", function() {
-	expect(require("!jade-loader?self!../_resources/template.jade")({ abc: "abc" })).toBe("<p>selfabc</p><h1>included</h1>");
-	expect(require("../_resources/template.jade")({ abc: "abc" })).toBe("<p>abc</p><h1>included</h1>");
-});
diff --git a/test/cases/loaders/pug-loader/index.js b/test/cases/loaders/pug-loader/index.js
new file mode 100644
index 00000000000..7348ae7df16
--- /dev/null
+++ b/test/cases/loaders/pug-loader/index.js
@@ -0,0 +1,4 @@
+it("should handle the pug loader correctly", function() {
+	expect(require("!pug-loader?self!../_resources/template.pug")({ abc: "abc" })).toBe("<p>selfabc</p><h1>included</h1>");
+	expect(require("../_resources/template.pug")({ abc: "abc" })).toBe("<p>abc</p><h1>included</h1>");
+});
diff --git a/test/cases/parsing/bom/bomfile.json b/test/cases/parsing/bom/bomfile.json
new file mode 100644
index 00000000000..20de8bbdddd
--- /dev/null
+++ b/test/cases/parsing/bom/bomfile.json
@@ -0,0 +1 @@
+{ "message": "ok" }
\ No newline at end of file
diff --git a/test/cases/parsing/bom/index.js b/test/cases/parsing/bom/index.js
index a2bbda8eeec..f7d590e9d54 100644
--- a/test/cases/parsing/bom/index.js
+++ b/test/cases/parsing/bom/index.js
@@ -7,3 +7,8 @@ it("should load a css file with BOM", function() {
 	var css = require("!css-loader!./bomfile.css") + "";
 	expect(css).toBe("body{color:#abc}");
 });
+
+it("should load a json file with BOM", function() {
+	var result = require("./bomfile.json");
+	expect(result.message).toEqual("ok");
+});
diff --git a/test/cases/parsing/issue-2641/index.js b/test/cases/parsing/issue-2641/index.js
index f47681f8976..4626a3d9cda 100644
--- a/test/cases/parsing/issue-2641/index.js
+++ b/test/cases/parsing/issue-2641/index.js
@@ -11,7 +11,7 @@ it("should call error callback on missing module", function(done) {
 	require(['./file', './missingModule'], function(file){}, function(error) {
 		try {
 			expect(error).toBeInstanceOf(Error);
-			expect(error.message).toBe('Cannot find module "./missingModule"');
+			expect(error.message).toBe("Cannot find module './missingModule'");
 			done();
 		} catch(e) {
 			done(e);
@@ -24,7 +24,7 @@ it("should call error callback on missing module in context", function(done) {
 		require(['./' + module], function(file){}, function(error) {
 			try {
 				expect(error).toBeInstanceOf(Error);
-				expect(error.message).toBe("Cannot find module \"./missingModule\".");
+				expect(error.message).toBe("Cannot find module './missingModule'");
 				done();
 			} catch(e) { done(e); }
 		});
diff --git a/test/cases/parsing/issue-7318/index.js b/test/cases/parsing/issue-7318/index.js
new file mode 100644
index 00000000000..b99c6946803
--- /dev/null
+++ b/test/cases/parsing/issue-7318/index.js
@@ -0,0 +1,5 @@
+const type = require("./typeof");
+
+it("should not output invalid code", () => {
+	expect(type).toBe("number");
+});
diff --git a/test/cases/parsing/issue-7318/typeof.js b/test/cases/parsing/issue-7318/typeof.js
new file mode 100644
index 00000000000..e48d9ea1cd1
--- /dev/null
+++ b/test/cases/parsing/issue-7318/typeof.js
@@ -0,0 +1,2 @@
+typeof 1
+module.exports = "number"
diff --git a/test/cases/parsing/issue-7335/a.js b/test/cases/parsing/issue-7335/a.js
new file mode 100644
index 00000000000..2cf44cad69a
--- /dev/null
+++ b/test/cases/parsing/issue-7335/a.js
@@ -0,0 +1 @@
+export default 9;
diff --git a/test/cases/parsing/issue-7335/index.js b/test/cases/parsing/issue-7335/index.js
new file mode 100644
index 00000000000..93f603c860b
--- /dev/null
+++ b/test/cases/parsing/issue-7335/index.js
@@ -0,0 +1,27 @@
+import x from "./a";
+
+const sum1 = (x, y, total = x + y) => total;
+const id1 = (a = x) => a;
+
+function sum2(x, y, total = x + y) { return total; }
+function id2(a = x) { return a; }
+
+const sum3 = function(x, y, total = x + y) { return total; }
+const id3 = function(a = x) { return a; }
+
+it("should shadow imported bindings", () => {
+	// Arrow functions
+	expect(sum1(2, 3)).toBe(5);
+	expect(id1(1)).toBe(1);
+	expect(id1()).toBe(9);
+
+	// Function declarations
+	expect(sum2(2, 3)).toBe(5);
+	expect(id2(1)).toBe(1);
+	expect(id2()).toBe(9);
+
+	// Function expressions
+	expect(sum3(2, 3)).toBe(5);
+	expect(id3(1)).toBe(1);
+	expect(id3()).toBe(9);
+});
diff --git a/test/cases/parsing/issue-758/index.js b/test/cases/parsing/issue-758/index.js
index a01b9491ec0..01ac1344e2d 100644
--- a/test/cases/parsing/issue-758/index.js
+++ b/test/cases/parsing/issue-758/index.js
@@ -13,7 +13,7 @@ it("should call error callback on missing module", function(done) {
 		require('./missingModule');
 	}, function(error) {
 		expect(error).toBeInstanceOf(Error);
-		expect(error.message).toBe('Cannot find module "./missingModule"');
+		expect(error.message).toBe("Cannot find module './missingModule'");
 		done();
 	});
 });
@@ -24,7 +24,7 @@ it("should call error callback on missing module in context", function(done) {
 			require('./' + module);
 		}, function(error) {
 			expect(error).toBeInstanceOf(Error);
-			expect(error.message).toBe("Cannot find module \"./missingModule\".");
+			expect(error.message).toBe("Cannot find module './missingModule'");
 			done();
 		});
 	})('missingModule');
diff --git a/test/cases/resolving/context/index.js b/test/cases/resolving/context/index.js
index 89c944dc6e1..20708273069 100644
--- a/test/cases/resolving/context/index.js
+++ b/test/cases/resolving/context/index.js
@@ -5,7 +5,7 @@ it("should resolve loaders relative to require", function() {
 		query: "?query",
 		prev: "module.exports = \"error\";"
 	});
-	expect(require("!./loaders/queryloader?query!./node_modules/subcontent/" + test + ".jade")).toEqual({
+	expect(require("!./loaders/queryloader?query!./node_modules/subcontent/" + test + ".pug")).toEqual({
 		resourceQuery: "",
 		query: "?query",
 		prev: "xyz: abc"
diff --git a/test/cases/resolving/context/node_modules/subcontent/test.jade b/test/cases/resolving/context/node_modules/subcontent/test.pug
similarity index 100%
rename from test/cases/resolving/context/node_modules/subcontent/test.jade
rename to test/cases/resolving/context/node_modules/subcontent/test.pug
diff --git a/test/cases/wasm/import-wasm-wasm/index.js b/test/cases/wasm/import-wasm-wasm/index.js
index f73e0b89351..39971c03010 100644
--- a/test/cases/wasm/import-wasm-wasm/index.js
+++ b/test/cases/wasm/import-wasm-wasm/index.js
@@ -1,5 +1,5 @@
 it("should allow to run a WebAssembly module with imports", function() {
-	return import("./wasm.wasm").then(function(wasm) {
+	return import("./wasm.wat").then(function(wasm) {
 		const result = wasm.addNumber(20);
 		expect(result).toEqual(42);
 	});
diff --git a/test/cases/wasm/import-wasm-wasm/wasm.wasm b/test/cases/wasm/import-wasm-wasm/wasm.wasm
deleted file mode 100644
index a05b904f6fe..00000000000
Binary files a/test/cases/wasm/import-wasm-wasm/wasm.wasm and /dev/null differ
diff --git a/test/cases/wasm/import-wasm-wasm/wasm.wat b/test/cases/wasm/import-wasm-wasm/wasm.wat
new file mode 100644
index 00000000000..3c9f7ca0f83
--- /dev/null
+++ b/test/cases/wasm/import-wasm-wasm/wasm.wat
@@ -0,0 +1,9 @@
+(module
+  (type $t0 (func (result i32)))
+  (type $t1 (func (param i32) (result i32)))
+  (import "./wasm2.wat" "getNumber" (func $./wasm2.wasm.getNumber (type $t0)))
+  (func $addNumber (export "addNumber") (type $t1) (param $p0 i32) (result i32)
+    (i32.add
+      (get_local $p0)
+      (call $./wasm2.wasm.getNumber))))
+
diff --git a/test/cases/wasm/import-wasm-wasm/wasm2.wasm b/test/cases/wasm/import-wasm-wasm/wasm2.wasm
deleted file mode 100644
index 067de62c2d0..00000000000
Binary files a/test/cases/wasm/import-wasm-wasm/wasm2.wasm and /dev/null differ
diff --git a/test/cases/wasm/import-wasm-wasm/wasm2.wat b/test/cases/wasm/import-wasm-wasm/wasm2.wat
new file mode 100644
index 00000000000..0331fb4fc15
--- /dev/null
+++ b/test/cases/wasm/import-wasm-wasm/wasm2.wat
@@ -0,0 +1,5 @@
+(module
+  (type $t0 (func (result i32)))
+  (func $getNumber (export "getNumber") (type $t0) (result i32)
+    (i32.const 22)))
+
diff --git a/test/cases/wasm/imported-global-preserve-type/env.js b/test/cases/wasm/imported-global-preserve-type/env.js
new file mode 100644
index 00000000000..af1a64d99f5
--- /dev/null
+++ b/test/cases/wasm/imported-global-preserve-type/env.js
@@ -0,0 +1 @@
+export const number = 0xFFFFFFFFFF;
diff --git a/test/cases/wasm/imported-global-preserve-type/index.js b/test/cases/wasm/imported-global-preserve-type/index.js
new file mode 100644
index 00000000000..0b146de6671
--- /dev/null
+++ b/test/cases/wasm/imported-global-preserve-type/index.js
@@ -0,0 +1,5 @@
+it("should preserve the valtype of the imported global", function() {
+	return import("./module.wat").then(function({get}) {
+		expect(get()).toBe(0xFFFFFFFFFF);
+	});
+});
diff --git a/test/cases/wasm/imported-global-preserve-type/module.wat b/test/cases/wasm/imported-global-preserve-type/module.wat
new file mode 100644
index 00000000000..e8a590fe6ac
--- /dev/null
+++ b/test/cases/wasm/imported-global-preserve-type/module.wat
@@ -0,0 +1,7 @@
+(module
+  (import "./env.js" "number" (global f64))
+
+  (func (export "get") (result f64)
+    (get_global 0)
+  )
+)
diff --git a/test/cases/wasm/imported-global-preserve-type/test.filter.js b/test/cases/wasm/imported-global-preserve-type/test.filter.js
new file mode 100644
index 00000000000..23177349638
--- /dev/null
+++ b/test/cases/wasm/imported-global-preserve-type/test.filter.js
@@ -0,0 +1,5 @@
+var supportsWebAssembly = require("../../../helpers/supportsWebAssembly");
+
+module.exports = function(config) {
+	return supportsWebAssembly();
+};
diff --git a/test/cases/wasm/imports-circular/module.js b/test/cases/wasm/imports-circular/module.js
index fa8daba1094..eeede2a5a03 100644
--- a/test/cases/wasm/imports-circular/module.js
+++ b/test/cases/wasm/imports-circular/module.js
@@ -1,4 +1,4 @@
-import { addNumber } from "./wasm.wasm";
+import { addNumber } from "./wasm.wat";
 
 export var result = addNumber(22);
 
diff --git a/test/cases/wasm/imports-circular/wasm.wasm b/test/cases/wasm/imports-circular/wasm.wasm
deleted file mode 100644
index f5a703f15e1..00000000000
Binary files a/test/cases/wasm/imports-circular/wasm.wasm and /dev/null differ
diff --git a/test/cases/wasm/imports-circular/wasm.wat b/test/cases/wasm/imports-circular/wasm.wat
new file mode 100644
index 00000000000..2cf1e2f1c61
--- /dev/null
+++ b/test/cases/wasm/imports-circular/wasm.wat
@@ -0,0 +1,9 @@
+(module
+  (type $t0 (func (result i32)))
+  (type $t1 (func (param i32) (result i32)))
+  (import "./module" "getNumber" (func $./module.getNumber (type $t0)))
+  (func $addNumber (export "addNumber") (type $t1) (param $p0 i32) (result i32)
+    (i32.add
+      (get_local $p0)
+      (call $./module.getNumber))))
+
diff --git a/test/cases/wasm/imports-complex-types/index.js b/test/cases/wasm/imports-complex-types/index.js
new file mode 100644
index 00000000000..c2e0b23fead
--- /dev/null
+++ b/test/cases/wasm/imports-complex-types/index.js
@@ -0,0 +1,6 @@
+it("should allow to run a WebAssembly module with non-js-compatible imports", function() {
+	return import("./wasm.wasm").then(function(wasm) {
+		const result = wasm.testI64();
+		expect(result).toEqual(42);
+	});
+});
diff --git a/test/cases/wasm/imports-complex-types/other.wasm b/test/cases/wasm/imports-complex-types/other.wasm
new file mode 100644
index 00000000000..70c5aee0fa3
Binary files /dev/null and b/test/cases/wasm/imports-complex-types/other.wasm differ
diff --git a/test/cases/wasm/imports-complex-types/test.filter.js b/test/cases/wasm/imports-complex-types/test.filter.js
new file mode 100644
index 00000000000..23177349638
--- /dev/null
+++ b/test/cases/wasm/imports-complex-types/test.filter.js
@@ -0,0 +1,5 @@
+var supportsWebAssembly = require("../../../helpers/supportsWebAssembly");
+
+module.exports = function(config) {
+	return supportsWebAssembly();
+};
diff --git a/test/cases/wasm/imports-complex-types/wasm.wasm b/test/cases/wasm/imports-complex-types/wasm.wasm
new file mode 100644
index 00000000000..8374df1439f
Binary files /dev/null and b/test/cases/wasm/imports-complex-types/wasm.wasm differ
diff --git a/test/cases/wasm/imports-multiple/index.js b/test/cases/wasm/imports-multiple/index.js
new file mode 100644
index 00000000000..d33df356e44
--- /dev/null
+++ b/test/cases/wasm/imports-multiple/index.js
@@ -0,0 +1,5 @@
+it("should allow to run a WebAssembly module importing from multiple modules", function() {
+	return import("./module").then(function(mod) {
+		expect(mod.result).toBe(42);
+	});
+});
diff --git a/test/cases/wasm/imports-multiple/module.js b/test/cases/wasm/imports-multiple/module.js
new file mode 100644
index 00000000000..deccad21fe4
--- /dev/null
+++ b/test/cases/wasm/imports-multiple/module.js
@@ -0,0 +1,7 @@
+import { getResult } from "./wasm.wasm";
+
+export var result = getResult(1);
+
+export function getNumber() {
+	return 20;
+}
diff --git a/test/cases/wasm/imports-multiple/module2.js b/test/cases/wasm/imports-multiple/module2.js
new file mode 100644
index 00000000000..60b7eac0eab
--- /dev/null
+++ b/test/cases/wasm/imports-multiple/module2.js
@@ -0,0 +1,5 @@
+import { getNumber as getN } from "./wasm.wasm";
+
+export function getNumber() {
+	return getN();
+}
diff --git a/test/cases/wasm/imports-multiple/test.filter.js b/test/cases/wasm/imports-multiple/test.filter.js
new file mode 100644
index 00000000000..23177349638
--- /dev/null
+++ b/test/cases/wasm/imports-multiple/test.filter.js
@@ -0,0 +1,5 @@
+var supportsWebAssembly = require("../../../helpers/supportsWebAssembly");
+
+module.exports = function(config) {
+	return supportsWebAssembly();
+};
diff --git a/test/cases/wasm/imports-multiple/wasm.wasm b/test/cases/wasm/imports-multiple/wasm.wasm
new file mode 100644
index 00000000000..19fef4041f6
Binary files /dev/null and b/test/cases/wasm/imports-multiple/wasm.wasm differ
diff --git a/test/cases/wasm/imports/index.js b/test/cases/wasm/imports/index.js
index d71f2190c9c..d674c659db2 100644
--- a/test/cases/wasm/imports/index.js
+++ b/test/cases/wasm/imports/index.js
@@ -1,5 +1,5 @@
 it("should allow to run a WebAssembly module with imports", function() {
-	return import("./wasm.wasm?1").then(function(wasm) {
+	return import("./wasm.wat?1").then(function(wasm) {
 		const result = wasm.addNumber(3);
 		expect(result).toEqual(11);
 	});
diff --git a/test/cases/wasm/imports/wasm.wasm b/test/cases/wasm/imports/wasm.wasm
deleted file mode 100644
index f5a703f15e1..00000000000
Binary files a/test/cases/wasm/imports/wasm.wasm and /dev/null differ
diff --git a/test/cases/wasm/imports/wasm.wat b/test/cases/wasm/imports/wasm.wat
new file mode 100644
index 00000000000..2cf1e2f1c61
--- /dev/null
+++ b/test/cases/wasm/imports/wasm.wat
@@ -0,0 +1,9 @@
+(module
+  (type $t0 (func (result i32)))
+  (type $t1 (func (param i32) (result i32)))
+  (import "./module" "getNumber" (func $./module.getNumber (type $t0)))
+  (func $addNumber (export "addNumber") (type $t1) (param $p0 i32) (result i32)
+    (i32.add
+      (get_local $p0)
+      (call $./module.getNumber))))
+
diff --git a/test/cases/wasm/memory/mem-access.wasm b/test/cases/wasm/memory/mem-access.wasm
deleted file mode 100644
index 9150b70d0af..00000000000
Binary files a/test/cases/wasm/memory/mem-access.wasm and /dev/null differ
diff --git a/test/cases/wasm/memory/mem-access.wat b/test/cases/wasm/memory/mem-access.wat
new file mode 100644
index 00000000000..50870824331
--- /dev/null
+++ b/test/cases/wasm/memory/mem-access.wat
@@ -0,0 +1,11 @@
+(module
+  (type $t0 (func (result i32)))
+  (type $t1 (func (param i32)))
+  (import "./memory.wat" "memory" (memory $./memory.wasm.memory 1))
+  (func $get (export "get") (type $t0) (result i32)
+    (i32.load
+      (i32.const 0)))
+  (func $set (export "set") (type $t1) (param $p i32)
+    (i32.store
+      (i32.const 0)
+      (get_local $p))))
diff --git a/test/cases/wasm/memory/memory.wasm b/test/cases/wasm/memory/memory.wasm
deleted file mode 100644
index 4c09473966a..00000000000
Binary files a/test/cases/wasm/memory/memory.wasm and /dev/null differ
diff --git a/test/cases/wasm/memory/memory.wat b/test/cases/wasm/memory/memory.wat
new file mode 100644
index 00000000000..c9c59eb1589
--- /dev/null
+++ b/test/cases/wasm/memory/memory.wat
@@ -0,0 +1,4 @@
+(module
+  (memory $memory (export "memory") 1)
+  (data (i32.const 12) "\00\00\00\00"))
+
diff --git a/test/cases/wasm/memory/run.js b/test/cases/wasm/memory/run.js
index dd9f0136cf6..f4950c81303 100644
--- a/test/cases/wasm/memory/run.js
+++ b/test/cases/wasm/memory/run.js
@@ -1,5 +1,5 @@
-import * as a1 from "./mem-access.wasm?1";
-import * as a2 from "./mem-access.wasm?2";
+import * as a1 from "./mem-access.wat?1";
+import * as a2 from "./mem-access.wat?2";
 
 a1.set(42);
 export const x1 = a1.get();
diff --git a/test/cases/wasm/order/a.js b/test/cases/wasm/order/a.js
index 5c381c7f6a1..a77ec86343f 100644
--- a/test/cases/wasm/order/a.js
+++ b/test/cases/wasm/order/a.js
@@ -1,6 +1,6 @@
 import { trackA, results } from "./tracker";
 import "./b.js";
-import "./wasm.wasm";
+import "./wasm.wat";
 
 trackA();
 
diff --git a/test/cases/wasm/order/wasm.wasm b/test/cases/wasm/order/wasm.wasm
deleted file mode 100644
index 105c6a1a97f..00000000000
Binary files a/test/cases/wasm/order/wasm.wasm and /dev/null differ
diff --git a/test/cases/wasm/simple/index.js b/test/cases/wasm/simple/index.js
index b3069c705e0..b4dcd1014ed 100644
--- a/test/cases/wasm/simple/index.js
+++ b/test/cases/wasm/simple/index.js
@@ -6,7 +6,7 @@ it("should allow to run a WebAssembly module (indirect)", function() {
 });
 
 it("should allow to run a WebAssembly module (direct)", function() {
-	return import("./wasm.wasm?2").then(function(wasm) {
+	return import("./wasm.wat?2").then(function(wasm) {
 		const result = wasm.add(wasm.getNumber(), 2);
 		expect(result).toEqual(42);
 	});
diff --git a/test/cases/wasm/simple/module.js b/test/cases/wasm/simple/module.js
index aeeab03082b..75232dccede 100644
--- a/test/cases/wasm/simple/module.js
+++ b/test/cases/wasm/simple/module.js
@@ -1,4 +1,4 @@
-import { add, getNumber } from "./wasm.wasm?1";
+import { add, getNumber } from "./wasm.wat?1";
 
 export function run() {
 	return add(getNumber(), 2);
diff --git a/test/cases/wasm/simple/wasm.wasm b/test/cases/wasm/simple/wasm.wasm
deleted file mode 100644
index 5364a02e784..00000000000
Binary files a/test/cases/wasm/simple/wasm.wasm and /dev/null differ
diff --git a/test/cases/wasm/simple/wasm.wat b/test/cases/wasm/simple/wasm.wat
new file mode 100644
index 00000000000..477902e7f3c
--- /dev/null
+++ b/test/cases/wasm/simple/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 40)))
+
diff --git a/test/cases/wasm/table/index.js b/test/cases/wasm/table/index.js
index ccf56c52111..4d3d85a3b5b 100644
--- a/test/cases/wasm/table/index.js
+++ b/test/cases/wasm/table/index.js
@@ -2,7 +2,7 @@
 const UNKNOWN_FUNCTION_TABLE = /invalid index into function table|invalid function/;
 
 it("should support tables", function() {
-	return import("./wasm-table.wasm").then(function(wasm) {
+	return import("./wasm-table.wat").then(function(wasm) {
 		expect(wasm.callByIndex(0)).toEqual(42);
 		expect(wasm.callByIndex(1)).toEqual(13);
 		expect(() => wasm.callByIndex(2)).toThrow(UNKNOWN_FUNCTION_TABLE);
@@ -10,7 +10,7 @@ it("should support tables", function() {
 });
 
 it("should support exported tables", function() {
-	return import("./wasm-table-export.wasm").then(function(wasm) {
+	return import("./wasm-table-export.wat").then(function(wasm) {
 		expect(wasm.table).toBeInstanceOf(WebAssembly.Table);
 		expect(wasm.table.length).toBe(2);
 		const e0 = wasm.table.get(0);
@@ -23,7 +23,7 @@ it("should support exported tables", function() {
 });
 
 it("should support imported tables", function() {
-	return import("./wasm-table-imported.wasm").then(function(wasm) {
+	return import("./wasm-table-imported.wat").then(function(wasm) {
 		expect(wasm.callByIndex(0)).toEqual(42);
 		expect(wasm.callByIndex(1)).toEqual(13);
 		expect(() => wasm.callByIndex(2)).toThrow(UNKNOWN_FUNCTION_TABLE);
diff --git a/test/cases/wasm/table/wasm-table-export.wasm b/test/cases/wasm/table/wasm-table-export.wasm
deleted file mode 100644
index 29dba516860..00000000000
Binary files a/test/cases/wasm/table/wasm-table-export.wasm and /dev/null differ
diff --git a/test/cases/wasm/table/wasm-table-export.wat b/test/cases/wasm/table/wasm-table-export.wat
new file mode 100644
index 00000000000..1771a2b546f
--- /dev/null
+++ b/test/cases/wasm/table/wasm-table-export.wat
@@ -0,0 +1,9 @@
+(module
+  (type $t0 (func (result i32)))
+  (func $f1 (type $t0) (result i32)
+    (i32.const 42))
+  (func $f2 (type $t0) (result i32)
+    (i32.const 13))
+  (table $table (export "table") 2 anyfunc)
+  (elem (i32.const 0) $f1 $f2))
+
diff --git a/test/cases/wasm/table/wasm-table-imported.wasm b/test/cases/wasm/table/wasm-table-imported.wasm
deleted file mode 100644
index 446719fd6f2..00000000000
Binary files a/test/cases/wasm/table/wasm-table-imported.wasm and /dev/null differ
diff --git a/test/cases/wasm/table/wasm-table-imported.wat b/test/cases/wasm/table/wasm-table-imported.wat
new file mode 100644
index 00000000000..1ccabddd132
--- /dev/null
+++ b/test/cases/wasm/table/wasm-table-imported.wat
@@ -0,0 +1,8 @@
+(module
+  (type $t0 (func (result i32)))
+  (type $t1 (func (param i32) (result i32)))
+  (import "./wasm-table-export.wat" "table" (table $./wasm-table-export.wasm.table 2 anyfunc))
+  (func $callByIndex (export "callByIndex") (type $t1) (param $i i32) (result i32)
+    (call_indirect (type $t0)
+      (get_local $i))))
+
diff --git a/test/cases/wasm/table/wasm-table.wasm b/test/cases/wasm/table/wasm-table.wasm
deleted file mode 100644
index 157fe739c8f..00000000000
Binary files a/test/cases/wasm/table/wasm-table.wasm and /dev/null differ
diff --git a/test/cases/wasm/table/wasm-table.wat b/test/cases/wasm/table/wasm-table.wat
new file mode 100644
index 00000000000..6ddcde499a9
--- /dev/null
+++ b/test/cases/wasm/table/wasm-table.wat
@@ -0,0 +1,14 @@
+(module
+  (type $t0 (func (result i32)))
+  (type $t1 (func (result i32)))
+  (type $t2 (func (param i32) (result i32)))
+  (func $f0 (type $t0) (result i32)
+    (i32.const 42))
+  (func $f1 (type $t0) (result i32)
+    (i32.const 13))
+  (func $callByIndex (export "callByIndex") (type $t2) (param $p0 i32) (result i32)
+    (call_indirect (type $t1)
+      (get_local $p0)))
+  (table $T0 2 anyfunc)
+  (elem (i32.const 0) $f0 $f1))
+
diff --git a/test/cases/wasm/wasm-explorer-examples-async/Q_rsqrt.wasm b/test/cases/wasm/wasm-explorer-examples-async/Q_rsqrt.wasm
new file mode 100644
index 00000000000..e5c17c16d93
Binary files /dev/null and b/test/cases/wasm/wasm-explorer-examples-async/Q_rsqrt.wasm differ
diff --git a/test/cases/wasm/wasm-explorer-examples-async/duff.wasm b/test/cases/wasm/wasm-explorer-examples-async/duff.wasm
new file mode 100644
index 00000000000..0b75ea455a8
Binary files /dev/null and b/test/cases/wasm/wasm-explorer-examples-async/duff.wasm differ
diff --git a/test/cases/wasm/wasm-explorer-examples-async/fact.wasm b/test/cases/wasm/wasm-explorer-examples-async/fact.wasm
new file mode 100644
index 00000000000..50ce8c098a4
Binary files /dev/null and b/test/cases/wasm/wasm-explorer-examples-async/fact.wasm differ
diff --git a/test/cases/wasm/wasm-explorer-examples-async/fast-math.wasm b/test/cases/wasm/wasm-explorer-examples-async/fast-math.wasm
new file mode 100644
index 00000000000..1733deb9ba7
Binary files /dev/null and b/test/cases/wasm/wasm-explorer-examples-async/fast-math.wasm differ
diff --git a/test/cases/wasm/wasm-explorer-examples-async/index.js b/test/cases/wasm/wasm-explorer-examples-async/index.js
new file mode 100644
index 00000000000..d2eed3af85e
--- /dev/null
+++ b/test/cases/wasm/wasm-explorer-examples-async/index.js
@@ -0,0 +1,55 @@
+it("Q_rsqrt should work", function() {
+	return import("./Q_rsqrt.wasm").then(function(wasm) {
+		const result = wasm._Z7Q_rsqrtf(1/1764);
+		expect(result).toBeGreaterThan(41.9);
+		expect(result).toBeLessThan(42.1);
+	});
+});
+
+it("testFunction should work", function() {
+	return import("./testFunction.wasm").then(function(wasm) {
+		const view = new Int32Array(wasm.memory.buffer);
+		view[0] = 123;
+		view[1] = 1;
+		view[2] = 2;
+		view[3] = 3;
+		const result = wasm._Z12testFunctionPii(4, 3);
+		expect(result).toEqual(6);
+	});
+});
+
+it("fact should work", function() {
+	return import("./fact.wasm").then(function(wasm) {
+		const result = wasm._Z4facti(11);
+		expect(result).toEqual(39916800);
+	});
+});
+
+it("popcnt should work", function() {
+	return import("./popcnt.wasm").then(function(wasm) {
+		expect(wasm.main(0xF0F)).toEqual(16);
+		expect(wasm._Z5countj(0xF0F)).toEqual(8);
+	});
+});
+
+it("fast-math should work", function() {
+	return import("./fast-math.wasm").then(function(wasm) {
+		expect(wasm._Z3food(42)).toEqual(14);
+		expect(wasm._Z9maybe_mindd(42, 24)).toEqual(24);
+		expect(wasm._Z8call_powd(42)).toEqual(9682651996416);
+		expect(wasm._Z6do_powd(42)).toEqual(9682651996416);
+		expect(wasm._Z6factorddd(42, 42, 42)).toEqual(3528);
+	});
+});
+
+it("duff should work", function() {
+	return import("./duff.wasm").then(function(wasm) {
+		const view = new Uint8Array(wasm.memory.buffer);
+		view[0] = 123;
+		for(let i = 1; i < 100; i++)
+			view[i] = i;
+		const result = wasm._Z4sendPcS_m(200, 1, 100);
+		for(let i = 1; i < 100; i++)
+			expect(view[199 + i]).toEqual(i);
+	});
+});
diff --git a/test/cases/wasm/wasm-explorer-examples-async/node_modules/env.js b/test/cases/wasm/wasm-explorer-examples-async/node_modules/env.js
new file mode 100644
index 00000000000..bb82d984bdc
--- /dev/null
+++ b/test/cases/wasm/wasm-explorer-examples-async/node_modules/env.js
@@ -0,0 +1 @@
+export const _Z3powdd = Math.pow;
diff --git a/test/cases/wasm/wasm-explorer-examples-async/popcnt.wasm b/test/cases/wasm/wasm-explorer-examples-async/popcnt.wasm
new file mode 100644
index 00000000000..f605a5a95f7
Binary files /dev/null and b/test/cases/wasm/wasm-explorer-examples-async/popcnt.wasm differ
diff --git a/test/cases/wasm/wasm-explorer-examples-async/test.filter.js b/test/cases/wasm/wasm-explorer-examples-async/test.filter.js
new file mode 100644
index 00000000000..23177349638
--- /dev/null
+++ b/test/cases/wasm/wasm-explorer-examples-async/test.filter.js
@@ -0,0 +1,5 @@
+var supportsWebAssembly = require("../../../helpers/supportsWebAssembly");
+
+module.exports = function(config) {
+	return supportsWebAssembly();
+};
diff --git a/test/cases/wasm/wasm-explorer-examples-async/testFunction.wasm b/test/cases/wasm/wasm-explorer-examples-async/testFunction.wasm
new file mode 100644
index 00000000000..3be47ce57b4
Binary files /dev/null and b/test/cases/wasm/wasm-explorer-examples-async/testFunction.wasm differ
diff --git a/test/cases/wasm/wasm-explorer-examples-sync/Q_rsqrt.wasm b/test/cases/wasm/wasm-explorer-examples-sync/Q_rsqrt.wasm
new file mode 100644
index 00000000000..e5c17c16d93
Binary files /dev/null and b/test/cases/wasm/wasm-explorer-examples-sync/Q_rsqrt.wasm differ
diff --git a/test/cases/wasm/wasm-explorer-examples-sync/duff.wasm b/test/cases/wasm/wasm-explorer-examples-sync/duff.wasm
new file mode 100644
index 00000000000..0b75ea455a8
Binary files /dev/null and b/test/cases/wasm/wasm-explorer-examples-sync/duff.wasm differ
diff --git a/test/cases/wasm/wasm-explorer-examples-sync/fact.wasm b/test/cases/wasm/wasm-explorer-examples-sync/fact.wasm
new file mode 100644
index 00000000000..50ce8c098a4
Binary files /dev/null and b/test/cases/wasm/wasm-explorer-examples-sync/fact.wasm differ
diff --git a/test/cases/wasm/wasm-explorer-examples-sync/fast-math.wasm b/test/cases/wasm/wasm-explorer-examples-sync/fast-math.wasm
new file mode 100644
index 00000000000..1733deb9ba7
Binary files /dev/null and b/test/cases/wasm/wasm-explorer-examples-sync/fast-math.wasm differ
diff --git a/test/cases/wasm/wasm-explorer-examples-sync/index.js b/test/cases/wasm/wasm-explorer-examples-sync/index.js
new file mode 100644
index 00000000000..a9cfd3a36de
--- /dev/null
+++ b/test/cases/wasm/wasm-explorer-examples-sync/index.js
@@ -0,0 +1,23 @@
+it("Q_rsqrt should work", function() {
+	return import("./tests").then(t => t.run_Q_rsqrt());
+});
+
+it("testFunction should work", function() {
+	return import("./tests").then(t => t.run_testFunction());
+});
+
+it("fact should work", function() {
+	return import("./tests").then(t => t.run_fact());
+});
+
+it("popcnt should work", function() {
+	return import("./tests").then(t => t.run_popcnt());
+});
+
+it("fast-math should work", function() {
+	return import("./tests").then(t => t.run_fastMath());
+});
+
+it("duff should work", function() {
+	return import("./tests").then(t => t.run_duff());
+});
diff --git a/test/cases/wasm/wasm-explorer-examples-sync/node_modules/env.js b/test/cases/wasm/wasm-explorer-examples-sync/node_modules/env.js
new file mode 100644
index 00000000000..bb82d984bdc
--- /dev/null
+++ b/test/cases/wasm/wasm-explorer-examples-sync/node_modules/env.js
@@ -0,0 +1 @@
+export const _Z3powdd = Math.pow;
diff --git a/test/cases/wasm/wasm-explorer-examples-sync/popcnt.wasm b/test/cases/wasm/wasm-explorer-examples-sync/popcnt.wasm
new file mode 100644
index 00000000000..f605a5a95f7
Binary files /dev/null and b/test/cases/wasm/wasm-explorer-examples-sync/popcnt.wasm differ
diff --git a/test/cases/wasm/wasm-explorer-examples-sync/test.filter.js b/test/cases/wasm/wasm-explorer-examples-sync/test.filter.js
new file mode 100644
index 00000000000..23177349638
--- /dev/null
+++ b/test/cases/wasm/wasm-explorer-examples-sync/test.filter.js
@@ -0,0 +1,5 @@
+var supportsWebAssembly = require("../../../helpers/supportsWebAssembly");
+
+module.exports = function(config) {
+	return supportsWebAssembly();
+};
diff --git a/test/cases/wasm/wasm-explorer-examples-sync/testFunction.wasm b/test/cases/wasm/wasm-explorer-examples-sync/testFunction.wasm
new file mode 100644
index 00000000000..3be47ce57b4
Binary files /dev/null and b/test/cases/wasm/wasm-explorer-examples-sync/testFunction.wasm differ
diff --git a/test/cases/wasm/wasm-explorer-examples-sync/tests.js b/test/cases/wasm/wasm-explorer-examples-sync/tests.js
new file mode 100644
index 00000000000..c957248a967
--- /dev/null
+++ b/test/cases/wasm/wasm-explorer-examples-sync/tests.js
@@ -0,0 +1,50 @@
+import * as Q_rsqrt from "./Q_rsqrt.wasm";
+import * as testFunction from "./testFunction.wasm";
+import * as fact from "./fact.wasm";
+import * as popcnt from "./popcnt.wasm";
+import * as fastMath from "./fast-math.wasm";
+import * as duff from "./duff.wasm";
+
+export function run_Q_rsqrt() {
+	const result = Q_rsqrt._Z7Q_rsqrtf(1/1764);
+	expect(result).toBeGreaterThan(41.9);
+	expect(result).toBeLessThan(42.1);
+}
+
+export function run_testFunction() {
+	const view = new Int32Array(testFunction.memory.buffer);
+	view[0] = 123;
+	view[1] = 1;
+	view[2] = 2;
+	view[3] = 3;
+	const result = testFunction._Z12testFunctionPii(4, 3);
+	expect(result).toEqual(6);
+}
+
+export function run_fact() {
+	const result = fact._Z4facti(11);
+	expect(result).toEqual(39916800);
+}
+
+export function run_popcnt() {
+	expect(popcnt.main(0xF0F)).toEqual(16);
+	expect(popcnt._Z5countj(0xF0F)).toEqual(8);
+}
+
+export function run_fastMath() {
+	expect(fastMath._Z3food(42)).toEqual(14);
+	expect(fastMath._Z9maybe_mindd(42, 24)).toEqual(24);
+	expect(fastMath._Z8call_powd(42)).toEqual(9682651996416);
+	expect(fastMath._Z6do_powd(42)).toEqual(9682651996416);
+	expect(fastMath._Z6factorddd(42, 42, 42)).toEqual(3528);
+}
+
+export function run_duff() {
+	const view = new Uint8Array(duff.memory.buffer);
+	view[0] = 123;
+	for(let i = 1; i < 100; i++)
+		view[i] = i;
+	const result = duff._Z4sendPcS_m(200, 1, 100);
+	for(let i = 1; i < 100; i++)
+		expect(view[199 + i]).toEqual(i);
+}
diff --git a/test/configCases/context-exclusion/simple/index.js b/test/configCases/context-exclusion/simple/index.js
index a6b860bd585..47eb9afe063 100644
--- a/test/configCases/context-exclusion/simple/index.js
+++ b/test/configCases/context-exclusion/simple/index.js
@@ -9,9 +9,9 @@ it("should not exclude paths not matching the exclusion pattern", function() {
 });
 
 it("should exclude paths/files matching the exclusion pattern", function() {
-		expect(() => requireInContext("dont")).toThrowError(/Cannot find module ".\/dont"/);
+		expect(() => requireInContext("dont")).toThrowError(/Cannot find module '.\/dont'/);
 
-		expect(() => requireInContext("dont-check-here/file")).toThrowError(/Cannot find module ".\/dont-check-here\/file"/);
+		expect(() => requireInContext("dont-check-here/file")).toThrowError(/Cannot find module '.\/dont-check-here\/file'/);
 
-		expect(() => requireInContext("check-here/dont-check-here/file")).toThrowError(/Cannot find module ".\/check-here\/dont-check-here\/file"/);
+		expect(() => requireInContext("check-here/dont-check-here/file")).toThrowError(/Cannot find module '.\/check-here\/dont-check-here\/file'/);
 });
diff --git a/test/configCases/dll-plugin-entry/0-create-dll/dep.js b/test/configCases/dll-plugin-entry/0-create-dll/dep.js
new file mode 100644
index 00000000000..bca818d4d63
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/0-create-dll/dep.js
@@ -0,0 +1,5 @@
+export function foo() {
+	console.log("foo");
+}
+
+export const bar = "bar";
diff --git a/test/configCases/dll-plugin-entry/0-create-dll/dep2.js b/test/configCases/dll-plugin-entry/0-create-dll/dep2.js
new file mode 100644
index 00000000000..e7134e7006d
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/0-create-dll/dep2.js
@@ -0,0 +1 @@
+module.exports = "foo";
diff --git a/test/configCases/dll-plugin-entry/0-create-dll/index.js b/test/configCases/dll-plugin-entry/0-create-dll/index.js
new file mode 100644
index 00000000000..80cdc870f74
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/0-create-dll/index.js
@@ -0,0 +1,4 @@
+export { bar } from "./dep";
+export default 42;
+
+require("./dep2");
diff --git a/test/configCases/dll-plugin-entry/0-create-dll/test.config.js b/test/configCases/dll-plugin-entry/0-create-dll/test.config.js
new file mode 100644
index 00000000000..08ea6c319c8
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/0-create-dll/test.config.js
@@ -0,0 +1 @@
+exports.noTests = true;
diff --git a/test/configCases/dll-plugin-entry/0-create-dll/webpack.config.js b/test/configCases/dll-plugin-entry/0-create-dll/webpack.config.js
new file mode 100644
index 00000000000..6824e7f92bf
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/0-create-dll/webpack.config.js
@@ -0,0 +1,20 @@
+var path = require("path");
+var webpack = require("../../../../");
+
+module.exports = {
+	entry: ["."],
+	output: {
+		filename: "dll.js",
+		chunkFilename: "[id].dll.js",
+		libraryTarget: "commonjs2"
+	},
+	plugins: [
+		new webpack.DllPlugin({
+			path: path.resolve(
+				__dirname,
+				"../../../js/config/dll-plugin-entry/manifest0.json"
+			),
+			entryOnly: true
+		})
+	]
+};
diff --git a/test/configCases/dll-plugin-entry/1-use-dll/index.js b/test/configCases/dll-plugin-entry/1-use-dll/index.js
new file mode 100644
index 00000000000..ec66e9e5fd9
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/1-use-dll/index.js
@@ -0,0 +1,21 @@
+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" });
+});
+
+it("should load an harmony module from dll (default export)", function() {
+	expect(Answer).toBe(42);
+});
+
+it("should load an harmony module from dll (star export)", function() {
+	expect(bar).toBe("bar");
+});
+
+it("should give modules the correct ids", function() {
+	expect(Object.keys(__webpack_modules__).filter(m => !m.startsWith("../.."))).toEqual([
+		"./index.js",
+		"dll-reference ../0-create-dll/dll.js",
+		"dll/index.js"
+	]);
+});
diff --git a/test/configCases/dll-plugin-entry/1-use-dll/webpack.config.js b/test/configCases/dll-plugin-entry/1-use-dll/webpack.config.js
new file mode 100644
index 00000000000..c708464f132
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/1-use-dll/webpack.config.js
@@ -0,0 +1,13 @@
+var webpack = require("../../../../");
+
+module.exports = {
+	plugins: [
+		new webpack.DllReferencePlugin({
+			manifest: require("../../../js/config/dll-plugin-entry/manifest0.json"), // eslint-disable-line node/no-missing-require
+			name: "../0-create-dll/dll.js",
+			scope: "dll",
+			sourceType: "commonjs2"
+		}),
+		new webpack.NamedModulesPlugin()
+	]
+};
diff --git a/test/configCases/dll-plugin-entry/2-error-non-entry/errors.js b/test/configCases/dll-plugin-entry/2-error-non-entry/errors.js
new file mode 100644
index 00000000000..857282ec937
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/2-error-non-entry/errors.js
@@ -0,0 +1 @@
+module.exports = [[/Can't resolve 'dll\/dep2'/]];
diff --git a/test/configCases/dll-plugin-entry/2-error-non-entry/index.js b/test/configCases/dll-plugin-entry/2-error-non-entry/index.js
new file mode 100644
index 00000000000..901f17038f8
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/2-error-non-entry/index.js
@@ -0,0 +1 @@
+require("dll/dep2");
diff --git a/test/configCases/dll-plugin-entry/2-error-non-entry/webpack.config.js b/test/configCases/dll-plugin-entry/2-error-non-entry/webpack.config.js
new file mode 100644
index 00000000000..c708464f132
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/2-error-non-entry/webpack.config.js
@@ -0,0 +1,13 @@
+var webpack = require("../../../../");
+
+module.exports = {
+	plugins: [
+		new webpack.DllReferencePlugin({
+			manifest: require("../../../js/config/dll-plugin-entry/manifest0.json"), // eslint-disable-line node/no-missing-require
+			name: "../0-create-dll/dll.js",
+			scope: "dll",
+			sourceType: "commonjs2"
+		}),
+		new webpack.NamedModulesPlugin()
+	]
+};
diff --git a/test/configCases/errors/multi-entry-missing-module/index.js b/test/configCases/errors/multi-entry-missing-module/index.js
index 0ebf4cc2c7f..e4dec7f2285 100644
--- a/test/configCases/errors/multi-entry-missing-module/index.js
+++ b/test/configCases/errors/multi-entry-missing-module/index.js
@@ -2,9 +2,9 @@ it("Should use WebpackMissingModule when module is missing with multiple entry s
   var fs = require("fs");
   var path = require("path");
   var source = fs.readFileSync(path.join(__dirname, "b.js"), "utf-8");
-  expect(source).toMatch("!(function webpackMissingModule() { var e = new Error(\"Cannot find module \\\"./intentionally-missing-module.js\\\"\"); e.code = 'MODULE_NOT_FOUND'; throw e; }());");
+  expect(source).toMatch("!(function webpackMissingModule() { var e = new Error(\"Cannot find module './intentionally-missing-module.js'\"); e.code = 'MODULE_NOT_FOUND'; throw e; }());");
 
   expect(function() {
     require("./intentionally-missing-module");
-  }).toThrowError("Cannot find module \"./intentionally-missing-module\"");
+  }).toThrowError("Cannot find module './intentionally-missing-module'");
 });
diff --git a/test/configCases/library/umd-array/index.js b/test/configCases/library/umd-array/index.js
new file mode 100644
index 00000000000..9970130cc2c
--- /dev/null
+++ b/test/configCases/library/umd-array/index.js
@@ -0,0 +1,3 @@
+it("should run", function() {
+
+});
\ No newline at end of file
diff --git a/test/configCases/library/umd-array/webpack.config.js b/test/configCases/library/umd-array/webpack.config.js
new file mode 100644
index 00000000000..fba3d5e17a1
--- /dev/null
+++ b/test/configCases/library/umd-array/webpack.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+	output: {
+		libraryTarget: "umd",
+		library: {
+			root: ["test", "library"],
+			amd: "test-library",
+			commonjs: "test-library"
+		}
+	}
+};
diff --git a/test/configCases/plugins/banner-plugin/index.js b/test/configCases/plugins/banner-plugin/index.js
index 866cec14fab..105a1f91b12 100644
--- a/test/configCases/plugins/banner-plugin/index.js
+++ b/test/configCases/plugins/banner-plugin/index.js
@@ -1,13 +1,16 @@
-it("should contain banner in bundle0 chunk", function() {
-	var fs = require("fs");
-	var source = fs.readFileSync(__filename, "utf-8");
+const fs = require("fs");
+const path = require("path");
+
+it("should contain banner in bundle0 chunk", () => {
+	const source = fs.readFileSync(__filename, "utf-8");
 	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 */");
 });
 
-it("should not contain banner in vendors chunk", function() {
-	var fs = require("fs"),
-		path = require("path");
-	var source = fs.readFileSync(path.join(__dirname, "vendors.js"), "utf-8");
+it("should not contain banner in vendors chunk", () => {
+	const source = fs.readFileSync(path.join(__dirname, "vendors.js"), "utf-8");
 	expect(source).not.toMatch("A test value");
 });
 
diff --git a/test/configCases/plugins/banner-plugin/webpack.config.js b/test/configCases/plugins/banner-plugin/webpack.config.js
index f8dda4c4dcc..fcaaee27a46 100644
--- a/test/configCases/plugins/banner-plugin/webpack.config.js
+++ b/test/configCases/plugins/banner-plugin/webpack.config.js
@@ -12,9 +12,14 @@ module.exports = {
 		filename: "[name].js"
 	},
 	plugins: [
+		new webpack.BannerPlugin("banner is a string"),
+		new webpack.BannerPlugin(() => "banner is a function"),
 		new webpack.BannerPlugin({
 			banner: "A test value",
 			exclude: ["vendors.js"]
+		}),
+		new webpack.BannerPlugin({
+			banner: ({ chunk }) => `multiline\nbanner\n${chunk.id}`
 		})
 	]
 };
diff --git a/test/configCases/plugins/profiling-plugin/test.filter.js b/test/configCases/plugins/profiling-plugin/test.filter.js
new file mode 100644
index 00000000000..b36fb8fa768
--- /dev/null
+++ b/test/configCases/plugins/profiling-plugin/test.filter.js
@@ -0,0 +1,3 @@
+module.exports = function(config) {
+	return !process.env.CI;
+};
diff --git a/test/configCases/plugins/uglifyjs-plugin/webpack.config.js b/test/configCases/plugins/uglifyjs-plugin/webpack.config.js
index b8f7ec16798..bc737f8e767 100644
--- a/test/configCases/plugins/uglifyjs-plugin/webpack.config.js
+++ b/test/configCases/plugins/uglifyjs-plugin/webpack.config.js
@@ -18,13 +18,19 @@ module.exports = {
 		minimize: true,
 		minimizer: [
 			new UglifyJsPlugin({
+				cache: false,
+				parallel: false,
 				exclude: ["vendors.js", "extract.js"]
 			}),
 			new UglifyJsPlugin({
+				cache: false,
+				parallel: false,
 				extractComments: true,
 				include: ["extract.js"]
 			}),
 			new UglifyJsPlugin({
+				cache: false,
+				parallel: false,
 				uglifyOptions: {
 					compress: {
 						passes: 2
diff --git a/test/configCases/records/issue-2991/test.js b/test/configCases/records/issue-2991/test.js
index c2736c3f153..81673a393b9 100644
--- a/test/configCases/records/issue-2991/test.js
+++ b/test/configCases/records/issue-2991/test.js
@@ -1,34 +1,10 @@
 try {
 	require("pkgs/somepackage/foo");
-} catch(e){}
+} catch (e) {}
 
 it("should write relative paths to records", function() {
 	var fs = require("fs");
 	var path = require("path");
 	var content = fs.readFileSync(path.join(__dirname, "records.json"), "utf-8");
-	expect(content).toEqual(`{
-  "modules": {
-    "byIdentifier": {
-      "external \\"path\\"": 0,
-      "external \\"fs\\"": 1,
-      "ignored  pkgs/somepackage/foo": 2,
-      "test.js": 3
-    },
-    "usedIds": {
-      "0": 0,
-      "1": 1,
-      "2": 2,
-      "3": 3
-    }
-  },
-  "chunks": {
-    "byName": {
-      "main": 0
-    },
-    "bySource": {},
-    "usedIds": [
-      0
-    ]
-  }
-}`);
+	expect(content).toMatchSnapshot();
 });
diff --git a/test/configCases/records/issue-7339/dependencies/bar.js b/test/configCases/records/issue-7339/dependencies/bar.js
new file mode 100644
index 00000000000..f06bcb5d726
--- /dev/null
+++ b/test/configCases/records/issue-7339/dependencies/bar.js
@@ -0,0 +1 @@
+module.exports = "Bar"
\ No newline at end of file
diff --git a/test/configCases/records/issue-7339/dependencies/foo.js b/test/configCases/records/issue-7339/dependencies/foo.js
new file mode 100644
index 00000000000..ae748a84148
--- /dev/null
+++ b/test/configCases/records/issue-7339/dependencies/foo.js
@@ -0,0 +1 @@
+module.exports = "Foo"
\ No newline at end of file
diff --git a/test/configCases/records/issue-7339/test.js b/test/configCases/records/issue-7339/test.js
new file mode 100644
index 00000000000..98081ef1c8a
--- /dev/null
+++ b/test/configCases/records/issue-7339/test.js
@@ -0,0 +1,10 @@
+function loadDependency(dep) {
+	require("./dependencies/" + dep);
+}
+
+it("should write relative dynamic-require paths to records", function() {
+	var fs = require("fs");
+	var path = require("path");
+	var content = fs.readFileSync(path.join(__dirname, "records.json"), "utf-8");
+	expect(content).toMatchSnapshot();
+});
diff --git a/test/configCases/records/issue-7339/webpack.config.js b/test/configCases/records/issue-7339/webpack.config.js
new file mode 100644
index 00000000000..0d7b9410f4f
--- /dev/null
+++ b/test/configCases/records/issue-7339/webpack.config.js
@@ -0,0 +1,13 @@
+var path = require("path");
+
+module.exports = {
+	entry: "./test",
+	recordsOutputPath: path.resolve(
+		__dirname,
+		"../../../js/config/records/issue-7339/records.json"
+	),
+	target: "node",
+	node: {
+		__dirname: false
+	}
+};
diff --git a/test/configCases/records/stable-sort/split-2.js b/test/configCases/records/stable-sort/split-2.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/configCases/records/stable-sort/split.js b/test/configCases/records/stable-sort/split.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/configCases/records/stable-sort/test.js b/test/configCases/records/stable-sort/test.js
new file mode 100644
index 00000000000..9a7c63ce254
--- /dev/null
+++ b/test/configCases/records/stable-sort/test.js
@@ -0,0 +1,14 @@
+require.ensure([], function(require) {
+	require('./split.js')
+})
+
+require.ensure([], function(require) {
+	require('./split-2.js')
+}, "split")
+
+it("sorts the usedIds array to prevent churn", function() {
+	var fs = require("fs");
+	var path = require("path");
+	var records = JSON.parse(fs.readFileSync(path.join(__dirname, "records.json"), "utf-8"));
+	expect(records.chunks.usedIds).toEqual([0, 1, 2]);
+});
diff --git a/test/configCases/records/stable-sort/webpack.config.js b/test/configCases/records/stable-sort/webpack.config.js
new file mode 100644
index 00000000000..56c58a64209
--- /dev/null
+++ b/test/configCases/records/stable-sort/webpack.config.js
@@ -0,0 +1,17 @@
+var path = require("path");
+
+module.exports = {
+	mode: "development",
+	entry: "./test",
+	recordsOutputPath: path.resolve(
+		__dirname,
+		"../../../js/config/records/stable-sort/records.json"
+	),
+	optimization: {
+		namedChunks: false
+	},
+	target: "node",
+	node: {
+		__dirname: false
+	}
+};
diff --git a/test/configCases/source-map/source-map-with-profiling-plugin/test.filter.js b/test/configCases/source-map/source-map-with-profiling-plugin/test.filter.js
new file mode 100644
index 00000000000..b36fb8fa768
--- /dev/null
+++ b/test/configCases/source-map/source-map-with-profiling-plugin/test.filter.js
@@ -0,0 +1,3 @@
+module.exports = function(config) {
+	return !process.env.CI;
+};
diff --git a/test/statsCases/runtime-chunk-issue-7382/e1.js b/test/statsCases/runtime-chunk-issue-7382/e1.js
new file mode 100644
index 00000000000..d8e371ad463
--- /dev/null
+++ b/test/statsCases/runtime-chunk-issue-7382/e1.js
@@ -0,0 +1 @@
+module.exports = "entry1";
diff --git a/test/statsCases/runtime-chunk-issue-7382/e2.js b/test/statsCases/runtime-chunk-issue-7382/e2.js
new file mode 100644
index 00000000000..a5a3b0d8841
--- /dev/null
+++ b/test/statsCases/runtime-chunk-issue-7382/e2.js
@@ -0,0 +1 @@
+module.exports = "entry2";
diff --git a/test/statsCases/runtime-chunk-issue-7382/webpack.config.js b/test/statsCases/runtime-chunk-issue-7382/webpack.config.js
new file mode 100644
index 00000000000..ba14189a142
--- /dev/null
+++ b/test/statsCases/runtime-chunk-issue-7382/webpack.config.js
@@ -0,0 +1,31 @@
+module.exports = {
+	mode: "development",
+	entry: {
+		e1: "./e1",
+		e2: "./e2"
+	},
+	output: {
+		filename: "[name].js"
+	},
+	stats: {
+		hash: false,
+		timings: false,
+		builtAt: false,
+		assets: false,
+		modules: false,
+		reasons: true
+	},
+	optimization: {
+		runtimeChunk: "single",
+		splitChunks: {
+			cacheGroups: {
+				all: {
+					test: /./,
+					name: "all",
+					minSize: 0,
+					chunks: "initial"
+				}
+			}
+		}
+	}
+};
diff --git a/test/statsCases/side-effects-simple-unused/index.js b/test/statsCases/side-effects-simple-unused/index.js
new file mode 100644
index 00000000000..96f94da8d32
--- /dev/null
+++ b/test/statsCases/side-effects-simple-unused/index.js
@@ -0,0 +1,3 @@
+import def, { z } from "pmodule";
+
+console.log(def, z);
\ No newline at end of file
diff --git a/test/statsCases/side-effects-simple-unused/node_modules/pmodule/a.js b/test/statsCases/side-effects-simple-unused/node_modules/pmodule/a.js
new file mode 100644
index 00000000000..af715307e06
--- /dev/null
+++ b/test/statsCases/side-effects-simple-unused/node_modules/pmodule/a.js
@@ -0,0 +1,5 @@
+var a = "a";
+var b = "b";
+var c = "c";
+
+export { a, b, c };
diff --git a/test/statsCases/side-effects-simple-unused/node_modules/pmodule/b.js b/test/statsCases/side-effects-simple-unused/node_modules/pmodule/b.js
new file mode 100644
index 00000000000..1b982e25d2b
--- /dev/null
+++ b/test/statsCases/side-effects-simple-unused/node_modules/pmodule/b.js
@@ -0,0 +1,5 @@
+var x = "x";
+var y = "y";
+
+export { x, y };
+export { z } from "./c";
diff --git a/test/statsCases/side-effects-simple-unused/node_modules/pmodule/c.js b/test/statsCases/side-effects-simple-unused/node_modules/pmodule/c.js
new file mode 100644
index 00000000000..dab1b4426c4
--- /dev/null
+++ b/test/statsCases/side-effects-simple-unused/node_modules/pmodule/c.js
@@ -0,0 +1,3 @@
+var z = "z";
+
+export { z };
diff --git a/test/statsCases/side-effects-simple-unused/node_modules/pmodule/index.js b/test/statsCases/side-effects-simple-unused/node_modules/pmodule/index.js
new file mode 100644
index 00000000000..8048908d587
--- /dev/null
+++ b/test/statsCases/side-effects-simple-unused/node_modules/pmodule/index.js
@@ -0,0 +1,4 @@
+export * from "./a";
+export { x, y, z } from "./b";
+
+export default "def";
diff --git a/test/statsCases/side-effects-simple-unused/node_modules/pmodule/package.json b/test/statsCases/side-effects-simple-unused/node_modules/pmodule/package.json
new file mode 100644
index 00000000000..43c38c1bb03
--- /dev/null
+++ b/test/statsCases/side-effects-simple-unused/node_modules/pmodule/package.json
@@ -0,0 +1,3 @@
+{
+    "sideEffects": false
+}
diff --git a/test/statsCases/side-effects-simple-unused/webpack.config.js b/test/statsCases/side-effects-simple-unused/webpack.config.js
new file mode 100644
index 00000000000..d0c6c9883d9
--- /dev/null
+++ b/test/statsCases/side-effects-simple-unused/webpack.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+	mode: "production",
+	entry: "./index",
+	stats: {
+		nestedModules: true,
+		usedExports: true
+	}
+};
diff --git a/test/statsCases/split-chunks/webpack.config.js b/test/statsCases/split-chunks/webpack.config.js
index f69088f4c98..5172e72b58f 100644
--- a/test/statsCases/split-chunks/webpack.config.js
+++ b/test/statsCases/split-chunks/webpack.config.js
@@ -94,6 +94,7 @@ module.exports = [
 		optimization: {
 			splitChunks: {
 				minSize: 0,
+				maxInitialRequests: Infinity,
 				chunks: "all"
 			}
 		},
diff --git a/test/watchCases/side-effects/issue-7400/0/index.js b/test/watchCases/side-effects/issue-7400/0/index.js
new file mode 100644
index 00000000000..d8337fc74ad
--- /dev/null
+++ b/test/watchCases/side-effects/issue-7400/0/index.js
@@ -0,0 +1,6 @@
+import { doStuff } from "./require-me";
+
+it("should compile correctly", () => {
+    expect(doStuff()).toEqual(42);
+    expect(WATCH_STEP).toEqual("0");
+});
\ No newline at end of file
diff --git a/test/watchCases/side-effects/issue-7400/0/my-module/index.js b/test/watchCases/side-effects/issue-7400/0/my-module/index.js
new file mode 100644
index 00000000000..f4cbd0d4ca1
--- /dev/null
+++ b/test/watchCases/side-effects/issue-7400/0/my-module/index.js
@@ -0,0 +1 @@
+export { default as myFunction } from './myFunction'
diff --git a/test/watchCases/side-effects/issue-7400/0/my-module/myFunction.js b/test/watchCases/side-effects/issue-7400/0/my-module/myFunction.js
new file mode 100644
index 00000000000..2433d166ffa
--- /dev/null
+++ b/test/watchCases/side-effects/issue-7400/0/my-module/myFunction.js
@@ -0,0 +1,3 @@
+export default function myFunction() {
+    return 42;
+}
diff --git a/test/watchCases/side-effects/issue-7400/0/my-module/package.json b/test/watchCases/side-effects/issue-7400/0/my-module/package.json
new file mode 100644
index 00000000000..6cb57d98708
--- /dev/null
+++ b/test/watchCases/side-effects/issue-7400/0/my-module/package.json
@@ -0,0 +1,4 @@
+{
+  "module": "index.js",
+  "sideEffects": false
+}
diff --git a/test/watchCases/side-effects/issue-7400/0/require-me.js b/test/watchCases/side-effects/issue-7400/0/require-me.js
new file mode 100644
index 00000000000..b2eaf2c6b3d
--- /dev/null
+++ b/test/watchCases/side-effects/issue-7400/0/require-me.js
@@ -0,0 +1,5 @@
+import { myFunction } from "./my-module";
+
+export function doStuff() {
+    return myFunction();
+}
diff --git a/test/watchCases/side-effects/issue-7400/1/index.js b/test/watchCases/side-effects/issue-7400/1/index.js
new file mode 100644
index 00000000000..080df54a9c0
--- /dev/null
+++ b/test/watchCases/side-effects/issue-7400/1/index.js
@@ -0,0 +1,6 @@
+import { doStuff } from "./require-me";
+
+it("should compile correctly", () => {
+    expect(doStuff()).toEqual(42);
+    expect(WATCH_STEP).toEqual("1");
+});
\ No newline at end of file
diff --git a/test/watchCases/side-effects/issue-7400/webpack.config.js b/test/watchCases/side-effects/issue-7400/webpack.config.js
new file mode 100644
index 00000000000..2bd35aa7c7e
--- /dev/null
+++ b/test/watchCases/side-effects/issue-7400/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	optimization: {
+		sideEffects: true
+	}
+};
diff --git a/yarn.lock b/yarn.lock
index 011342076f5..6c0f32e901a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,13 +3,29 @@
 
 
 "@babel/code-frame@^7.0.0-beta.35":
-  version "7.0.0-beta.38"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.38.tgz#c0af5930617e55e050336838e3a3670983b0b2b2"
+  version "7.0.0-beta.47"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.47.tgz#d18c2f4c4ba8d093a2bcfab5616593bfe2441a27"
+  dependencies:
+    "@babel/highlight" "7.0.0-beta.47"
+
+"@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"
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^3.0.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"
+
+"@types/babylon@^6.16.2":
+  version "6.16.2"
+  resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.2.tgz#062ce63b693d9af1c246f5aedf928bc9c30589c8"
+  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"
@@ -18,115 +34,131 @@
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
 
-"@webassemblyjs/ast@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.3.2.tgz#3312d6f81aaaa1fe74d2e1a42264899fe802828e"
+"@webassemblyjs/ast@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.8.tgz#f75ac7e7602b7833abd5d53951baae8a07ebb5df"
   dependencies:
-    "@webassemblyjs/helper-wasm-bytecode" "1.3.2"
-    "@webassemblyjs/wast-parser" "1.3.2"
-    webassemblyjs "1.3.2"
+    "@webassemblyjs/helper-module-context" "1.5.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.8"
+    "@webassemblyjs/wast-parser" "1.5.8"
+    debug "^3.1.0"
+    mamacro "^0.0.3"
 
-"@webassemblyjs/floating-point-hex-parser@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.3.2.tgz#a749e630e6b78fab70dbeac5710038fba241548d"
+"@webassemblyjs/floating-point-hex-parser@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.8.tgz#e0604d34fab0c910e16113720a5a3c01f558fa54"
 
-"@webassemblyjs/helper-buffer@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.3.2.tgz#c5c36f8f158145403beb9e9f7ccf70fb6dc003fa"
+"@webassemblyjs/helper-api-error@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.8.tgz#f5570aff60090fae1b78a690a95d04cb021da9ca"
 
-"@webassemblyjs/helper-code-frame@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.3.2.tgz#a54b59bf586f91368c8675d20750a05df95c8f3a"
+"@webassemblyjs/helper-buffer@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.8.tgz#b1405e819a2c537964682fb70551796ab9602632"
   dependencies:
-    "@webassemblyjs/wast-printer" "1.3.2"
+    debug "^3.1.0"
 
-"@webassemblyjs/helper-fsm@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.3.2.tgz#05e31f4ca23634a8232b4295889b38df9360bb5b"
+"@webassemblyjs/helper-code-frame@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.8.tgz#6439de475720198a48fa8b4c38e41987798f73cc"
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.5.8"
 
-"@webassemblyjs/helper-wasm-bytecode@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.3.2.tgz#487c2f0165f1b25dde622bd5fe832307cadc4e45"
+"@webassemblyjs/helper-fsm@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.8.tgz#6169af3c9530cf9e89a8f3cf2970ed70e650ae4f"
 
-"@webassemblyjs/helper-wasm-section@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.3.2.tgz#b05ad3b21e2d94847242813ea2df6931413ddd70"
-  dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-    "@webassemblyjs/helper-buffer" "1.3.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.3.2"
-    "@webassemblyjs/wasm-gen" "1.3.2"
+"@webassemblyjs/helper-module-context@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.8.tgz#73d0de45cebb774d465b5a66fef061f834d6c23c"
 
-"@webassemblyjs/leb128@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.3.2.tgz#f0b0d7e3b711e17a8140e3475ac26292ac6f4245"
-  dependencies:
-    leb "^0.3.0"
+"@webassemblyjs/helper-wasm-bytecode@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.8.tgz#60df17f72d12b07e1398756e6ebfe59c03ab2e1a"
 
-"@webassemblyjs/validation@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.3.2.tgz#1a05dd9d7d7414d7a36d39649abf0981cead68f2"
+"@webassemblyjs/helper-wasm-section@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.8.tgz#cda7fdb6f3b7b0d215c8f92b7435d47726822f49"
   dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-
-"@webassemblyjs/wasm-edit@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.3.2.tgz#eaf8df33b4003f88426a34cd4981c60127db0a0d"
-  dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-    "@webassemblyjs/helper-buffer" "1.3.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.3.2"
-    "@webassemblyjs/helper-wasm-section" "1.3.2"
-    "@webassemblyjs/wasm-gen" "1.3.2"
-    "@webassemblyjs/wasm-opt" "1.3.2"
-    "@webassemblyjs/wasm-parser" "1.3.2"
-    "@webassemblyjs/wast-printer" "1.3.2"
+    "@webassemblyjs/ast" "1.5.8"
+    "@webassemblyjs/helper-buffer" "1.5.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.8"
+    "@webassemblyjs/wasm-gen" "1.5.8"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-gen@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.3.2.tgz#1f7baef9dc6c162b290639ea60f4cec9a971701d"
+"@webassemblyjs/ieee754@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.8.tgz#29383c7172e90121613d5614d532f22c19255c3b"
   dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.3.2"
-    "@webassemblyjs/leb128" "1.3.2"
+    ieee754 "^1.1.11"
 
-"@webassemblyjs/wasm-opt@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.3.2.tgz#3f72c0c59422fdc7511d77e97e5ec462dafe378f"
+"@webassemblyjs/leb128@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.8.tgz#657c48ef2537ea2921e897a50157be700bf24eac"
   dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-    "@webassemblyjs/helper-buffer" "1.3.2"
-    "@webassemblyjs/wasm-gen" "1.3.2"
-    "@webassemblyjs/wasm-parser" "1.3.2"
+    leb "^0.3.0"
 
-"@webassemblyjs/wasm-parser@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.3.2.tgz#351d368f4a0407afd8ac4454235bdeb2fb8a0913"
+"@webassemblyjs/wasm-edit@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.8.tgz#592d3678894eaa2ee7e7c2c6a13c2a697db1aa7e"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.8"
+    "@webassemblyjs/helper-buffer" "1.5.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.8"
+    "@webassemblyjs/helper-wasm-section" "1.5.8"
+    "@webassemblyjs/wasm-gen" "1.5.8"
+    "@webassemblyjs/wasm-opt" "1.5.8"
+    "@webassemblyjs/wasm-parser" "1.5.8"
+    "@webassemblyjs/wast-printer" "1.5.8"
+    debug "^3.1.0"
+
+"@webassemblyjs/wasm-gen@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.8.tgz#e94e034a45227aaa7c481b25c1aa9a0a00ab9488"
   dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.3.2"
-    "@webassemblyjs/leb128" "1.3.2"
-    "@webassemblyjs/wasm-parser" "1.3.2"
-    webassemblyjs "1.3.2"
+    "@webassemblyjs/ast" "1.5.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.8"
+    "@webassemblyjs/ieee754" "1.5.8"
+    "@webassemblyjs/leb128" "1.5.8"
 
-"@webassemblyjs/wast-parser@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.3.2.tgz#5b78bfaace0b13d38be36719931a8b22fd563a22"
+"@webassemblyjs/wasm-opt@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.8.tgz#a3a0d00d98dee0f3cf2ae41084eb62715a39242c"
   dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-    "@webassemblyjs/floating-point-hex-parser" "1.3.2"
-    "@webassemblyjs/helper-code-frame" "1.3.2"
-    "@webassemblyjs/helper-fsm" "1.3.2"
+    "@webassemblyjs/ast" "1.5.8"
+    "@webassemblyjs/helper-buffer" "1.5.8"
+    "@webassemblyjs/wasm-gen" "1.5.8"
+    "@webassemblyjs/wasm-parser" "1.5.8"
+    debug "^3.1.0"
+
+"@webassemblyjs/wasm-parser@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.8.tgz#a258a7fd15bd57597e4211d9068639807546555b"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.8"
+    "@webassemblyjs/helper-api-error" "1.5.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.8"
+    "@webassemblyjs/leb128" "1.5.8"
+    "@webassemblyjs/wasm-parser" "1.5.8"
+
+"@webassemblyjs/wast-parser@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.8.tgz#85705659e15d19b89af38a8d6803d720bb0493cf"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.8"
+    "@webassemblyjs/floating-point-hex-parser" "1.5.8"
+    "@webassemblyjs/helper-api-error" "1.5.8"
+    "@webassemblyjs/helper-code-frame" "1.5.8"
+    "@webassemblyjs/helper-fsm" "1.5.8"
     long "^3.2.0"
-    webassemblyjs "1.3.2"
+    mamacro "^0.0.3"
 
-"@webassemblyjs/wast-printer@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.3.2.tgz#6f3392bb9582bf7537e77704e7a2a84176305d20"
+"@webassemblyjs/wast-printer@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.8.tgz#0f83aa67eddf377dd1d6205d4a4ac976db60e1f6"
   dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-    "@webassemblyjs/wast-parser" "1.3.2"
+    "@webassemblyjs/ast" "1.5.8"
+    "@webassemblyjs/wast-parser" "1.5.8"
     long "^3.2.0"
 
 abab@^1.0.4:
@@ -160,6 +192,12 @@ acorn-globals@^1.0.3:
   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"
+  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"
@@ -180,18 +218,18 @@ acorn@^2.1.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
 
-acorn@^3.0.4:
+acorn@^3.0.4, acorn@^3.1.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^5.0.0, acorn@^5.5.0:
+acorn@^4.0.4, acorn@~4.0.2:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+
+acorn@^5.0.0, acorn@^5.3.0, acorn@^5.5.0:
   version "5.5.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
 
-acorn@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
-
 ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
@@ -257,25 +295,12 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.1.0, ansi-styles@^3.2.1:
+ansi-styles@^3.1.0, 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"
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
-  dependencies:
-    color-convert "^1.9.0"
-
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -418,9 +443,9 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
-atob@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.0.tgz#ab2b150e51d7b122b9efc8d7340c06b6c41076bc"
+atob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
 
 autoprefixer@^6.3.1:
   version "6.7.7"
@@ -454,8 +479,8 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
     js-tokens "^3.0.2"
 
 babel-core@^6.0.0, babel-core@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
+  version "6.26.3"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
   dependencies:
     babel-code-frame "^6.26.0"
     babel-generator "^6.26.0"
@@ -467,19 +492,19 @@ babel-core@^6.0.0, babel-core@^6.26.0:
     babel-traverse "^6.26.0"
     babel-types "^6.26.0"
     babylon "^6.18.0"
-    convert-source-map "^1.5.0"
-    debug "^2.6.8"
+    convert-source-map "^1.5.1"
+    debug "^2.6.9"
     json5 "^0.5.1"
     lodash "^4.17.4"
     minimatch "^3.0.4"
     path-is-absolute "^1.0.1"
-    private "^0.1.7"
+    private "^0.1.8"
     slash "^1.0.0"
-    source-map "^0.5.6"
+    source-map "^0.5.7"
 
 babel-generator@^6.18.0, babel-generator@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.26.0"
@@ -487,7 +512,7 @@ babel-generator@^6.18.0, babel-generator@^6.26.0:
     detect-indent "^4.0.0"
     jsesc "^1.3.0"
     lodash "^4.17.4"
-    source-map "^0.5.6"
+    source-map "^0.5.7"
     trim-right "^1.0.1"
 
 babel-helpers@^6.24.1:
@@ -497,12 +522,12 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-jest@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.0.0-alpha.5.tgz#acf85d6e69b96755fb8f89542251349718620615"
+babel-jest@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.0.0-charlie.3.tgz#65df097d046812d3ffbdd67b0e1906025382edc1"
   dependencies:
     babel-plugin-istanbul "^4.1.6"
-    babel-preset-jest "^23.0.0-alpha.5"
+    babel-preset-jest "^23.0.0-charlie.3"
 
 babel-messages@^6.23.0:
   version "6.23.0"
@@ -510,14 +535,6 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-istanbul@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e"
-  dependencies:
-    find-up "^2.1.0"
-    istanbul-lib-instrument "^1.7.5"
-    test-exclude "^4.1.1"
-
 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"
@@ -527,19 +544,19 @@ babel-plugin-istanbul@^4.1.6:
     istanbul-lib-instrument "^1.10.1"
     test-exclude "^4.2.1"
 
-babel-plugin-jest-hoist@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.0.0-alpha.5.tgz#d3ac1b55cfcf78d1418629b5cbd8f82d97f1545e"
+babel-plugin-jest-hoist@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.0.0-charlie.3.tgz#7b1547bb922d4e283a88063e910b67a73bd03738"
 
 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"
 
-babel-preset-jest@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.0.0-alpha.5.tgz#2acb14805bfcb73b4884e8fadc776bae26e30a50"
+babel-preset-jest@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.0.0-charlie.3.tgz#70783e26cee9a09d96090c49f0c991f7c3a51fac"
   dependencies:
-    babel-plugin-jest-hoist "^23.0.0-alpha.5"
+    babel-plugin-jest-hoist "^23.0.0-charlie.3"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
 
 babel-register@^6.26.0:
@@ -643,12 +660,6 @@ binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  dependencies:
-    inherits "~2.0.0"
-
 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"
@@ -881,6 +892,12 @@ 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"
 
+capture-exit@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+  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"
@@ -906,7 +923,7 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.3.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.2:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   dependencies:
@@ -914,7 +931,7 @@ chalk@^2.0.0, chalk@^2.3.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^2.0.1, chalk@^2.1.0:
+chalk@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
   dependencies:
@@ -934,6 +951,12 @@ character-parser@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-1.2.1.tgz#c0dde4ab182713b919b970959a123ecc1a30fcd6"
 
+character-parser@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  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"
@@ -965,8 +988,8 @@ chrome-trace-event@^0.1.1:
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz#d395af2d31c87b90a716c831fe326f69768ec084"
 
 ci-info@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
@@ -1001,6 +1024,12 @@ clean-css@^3.1.9:
     commander "2.8.x"
     source-map "0.4.x"
 
+clean-css@^4.1.11:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a"
+  dependencies:
+    source-map "0.5.x"
+
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -1020,8 +1049,8 @@ cliui@^2.1.0:
     wordwrap "0.0.2"
 
 cliui@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc"
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -1144,8 +1173,8 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
 compare-versions@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.1.0.tgz#43310256a5c555aaed4193c04d8f154cf9c6efd5"
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.2.1.tgz#a49eb7689d4caaf0b6db5220173fd279614000f7"
 
 component-emitter@^1.2.1:
   version "1.2.1"
@@ -1174,6 +1203,15 @@ 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"
 
+constantinople@^3.0.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz#d45ed724f57d3d10500017a7d3a889c1381ae647"
+  dependencies:
+    "@types/babel-types" "^7.0.0"
+    "@types/babylon" "^6.16.2"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+
 constantinople@~3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.0.2.tgz#4b945d9937907bcd98ee575122c3817516544141"
@@ -1188,15 +1226,11 @@ content-disposition@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.1.tgz#87476c6a67c8daa87e32e87616df883ba7fb071b"
 
-content-type-parser@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
-
 content-type@~1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
-convert-source-map@^1.4.0, convert-source-map@^1.5.0:
+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"
 
@@ -1228,8 +1262,8 @@ core-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
 core-js@^2.4.0, core-js@^2.5.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+  version "2.5.6"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d"
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -1435,11 +1469,19 @@ dashdash@^1.12.0:
   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"
+  dependencies:
+    abab "^1.0.4"
+    whatwg-mimetype "^2.0.0"
+    whatwg-url "^6.4.0"
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
+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"
   dependencies:
@@ -1465,9 +1507,9 @@ 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"
 
-deep-extend@~0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
+deep-extend@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f"
 
 deep-is@~0.1.3:
   version "0.1.3"
@@ -1559,8 +1601,8 @@ detect-newline@^2.1.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
 
 diff@^3.2.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
@@ -1576,6 +1618,10 @@ doctrine@^2.1.0:
   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"
+
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -1658,8 +1704,8 @@ error-ex@^1.2.0:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.5.1:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681"
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.1"
@@ -1699,15 +1745,15 @@ escodegen@1.8.x:
     source-map "~0.2.0"
 
 escodegen@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
-    source-map "~0.5.6"
+    source-map "~0.6.1"
 
 eslint-config-prettier@^2.9.0:
   version "2.9.0"
@@ -1893,16 +1939,16 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-expect@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-23.0.0-alpha.5.tgz#514d9f37b77c86f7d4386c2116de2abce795284c"
+expect@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-23.0.0-charlie.3.tgz#6f00326048ddcedd6645a861bf872aca90d09880"
   dependencies:
     ansi-styles "^3.2.0"
-    jest-diff "^23.0.0-alpha.5"
+    jest-diff "^23.0.0-charlie.3"
     jest-get-type "^22.1.0"
-    jest-matcher-utils "^23.0.0-alpha.5"
-    jest-message-util "^23.0.0-alpha.5"
-    jest-regex-util "^23.0.0-alpha.5"
+    jest-matcher-utils "^23.0.0-charlie.3"
+    jest-message-util "^23.0.0-charlie.3"
+    jest-regex-util "^23.0.0-charlie.3"
 
 express@~4.13.1:
   version "4.13.4"
@@ -2056,12 +2102,12 @@ fileset@^2.0.2:
     minimatch "^3.0.3"
 
 fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
-    randomatic "^1.1.3"
+    randomatic "^3.0.0"
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
@@ -2198,13 +2244,6 @@ fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-fsevents@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.39"
-
 fsevents@^1.1.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.2.tgz#4f598f0f69b273188ef4a62ca4e9e08ace314bbf"
@@ -2212,22 +2251,12 @@ fsevents@^1.1.2:
     nan "^2.9.2"
     node-pre-gyp "^0.9.0"
 
-fstream-ignore@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-  dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
-
-fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+fsevents@^1.2.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
   dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
 
 function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
@@ -2464,7 +2493,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
 
-hawk@3.1.3, hawk@~3.1.3:
+hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
   dependencies:
@@ -2506,8 +2535,8 @@ home-or-tmp@^2.0.0:
     os-tmpdir "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
 
 html-comment-regex@^1.1.0:
   version "1.1.1"
@@ -2554,12 +2583,18 @@ iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
-iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+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"
   dependencies:
     safer-buffer "^2.1.0"
 
+iconv-lite@^0.4.4:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 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"
@@ -2570,7 +2605,7 @@ icss-utils@^2.1.0:
   dependencies:
     postcss "^6.0.1"
 
-ieee754@^1.1.4:
+ieee754@^1.1.11, ieee754@^1.1.4:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455"
 
@@ -2618,7 +2653,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+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"
 
@@ -2650,8 +2685,8 @@ inquirer@^3.0.6:
     through "^2.3.6"
 
 invariant@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
     loose-envify "^1.0.0"
 
@@ -2751,6 +2786,13 @@ is-equal-shallow@^0.1.3:
   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"
+  dependencies:
+    acorn "~4.0.2"
+    object-assign "^4.0.1"
+
 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"
@@ -2889,7 +2931,7 @@ is-property@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
 
-is-regex@^1.0.4:
+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"
   dependencies:
@@ -2977,10 +3019,6 @@ istanbul-api@^1.3.1:
     mkdirp "^0.5.1"
     once "^1.4.0"
 
-istanbul-lib-coverage@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
-
 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"
@@ -3003,18 +3041,6 @@ istanbul-lib-instrument@^1.10.1:
     istanbul-lib-coverage "^1.2.0"
     semver "^5.3.0"
 
-istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.8.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e"
-  dependencies:
-    babel-generator "^6.18.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-    babylon "^6.18.0"
-    istanbul-lib-coverage "^1.1.1"
-    semver "^5.3.0"
-
 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"
@@ -3024,16 +3050,6 @@ istanbul-lib-report@^1.1.4:
     path-parse "^1.0.5"
     supports-color "^3.1.2"
 
-istanbul-lib-source-maps@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz#750578602435f28a0c04ee6d7d9e0f2960e62c1c"
-  dependencies:
-    debug "^3.1.0"
-    istanbul-lib-coverage "^1.1.1"
-    mkdirp "^0.5.1"
-    rimraf "^2.6.1"
-    source-map "^0.5.3"
-
 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"
@@ -3091,14 +3107,14 @@ jade@^1.11.0:
     with "~4.0.0"
 
 jest-changed-files@^22.2.0:
-  version "22.2.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.2.0.tgz#517610c4a8ca0925bdc88b0ca53bd678aa8d019e"
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.4.3.tgz#8882181e022c38bd46a2e4d18d44d19d90a90fb2"
   dependencies:
     throat "^4.0.0"
 
-jest-cli@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.0.0-alpha.5.tgz#713d38a20f046a595e4411ff9c3c26f7cc05b202"
+jest-cli@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.0.0-charlie.3.tgz#064d1b6581a9a4910754ec816e6ce4dae71203c0"
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
@@ -3108,23 +3124,23 @@ jest-cli@^23.0.0-alpha.5:
     import-local "^1.0.0"
     is-ci "^1.0.10"
     istanbul-api "^1.3.1"
-    istanbul-lib-coverage "^1.1.1"
-    istanbul-lib-instrument "^1.8.0"
-    istanbul-lib-source-maps "^1.2.1"
+    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-instrument "^1.10.1"
+    istanbul-lib-source-maps "^1.2.4"
     jest-changed-files "^22.2.0"
-    jest-config "^23.0.0-alpha.5"
-    jest-environment-jsdom "^23.0.0-alpha.5"
+    jest-config "^23.0.0-charlie.3"
+    jest-environment-jsdom "^23.0.0-charlie.3"
     jest-get-type "^22.1.0"
-    jest-haste-map "^23.0.0-alpha.5"
-    jest-message-util "^23.0.0-alpha.5"
-    jest-regex-util "^23.0.0-alpha.5"
-    jest-resolve-dependencies "^23.0.0-alpha.5"
-    jest-runner "^23.0.0-alpha.5"
-    jest-runtime "^23.0.0-alpha.5"
-    jest-snapshot "^23.0.0-alpha.5"
-    jest-util "^23.0.0-alpha.5"
-    jest-validate "^23.0.0-alpha.5"
-    jest-worker "^23.0.0-alpha.5"
+    jest-haste-map "^23.0.0-charlie.3"
+    jest-message-util "^23.0.0-charlie.3"
+    jest-regex-util "^23.0.0-charlie.3"
+    jest-resolve-dependencies "^23.0.0-charlie.3"
+    jest-runner "^23.0.0-charlie.3"
+    jest-runtime "^23.0.0-charlie.3"
+    jest-snapshot "^23.0.0-charlie.3"
+    jest-util "^23.0.0-charlie.3"
+    jest-validate "^23.0.0-charlie.3"
+    jest-worker "^23.0.0-charlie.3"
     micromatch "^2.3.11"
     node-notifier "^5.2.1"
     realpath-native "^1.0.0"
@@ -3135,103 +3151,104 @@ jest-cli@^23.0.0-alpha.5:
     which "^1.2.12"
     yargs "^11.0.0"
 
-jest-config@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.0.0-alpha.5.tgz#8e3aab4fdd36dedcc17b4462e74313b201740e8a"
+jest-config@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.0.0-charlie.3.tgz#e75d783a32d26b5d1aeb5736e5b2926d7709cd51"
   dependencies:
     babel-core "^6.0.0"
-    babel-jest "^23.0.0-alpha.5"
+    babel-jest "^23.0.0-charlie.3"
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^23.0.0-alpha.5"
-    jest-environment-node "^23.0.0-alpha.5"
+    jest-environment-jsdom "^23.0.0-charlie.3"
+    jest-environment-node "^23.0.0-charlie.3"
     jest-get-type "^22.1.0"
-    jest-jasmine2 "^23.0.0-alpha.5"
-    jest-regex-util "^23.0.0-alpha.5"
-    jest-resolve "^23.0.0-alpha.5"
-    jest-util "^23.0.0-alpha.5"
-    jest-validate "^23.0.0-alpha.5"
-    pretty-format "^23.0.0-alpha.5"
+    jest-jasmine2 "^23.0.0-charlie.3"
+    jest-regex-util "^23.0.0-charlie.3"
+    jest-resolve "^23.0.0-charlie.3"
+    jest-util "^23.0.0-charlie.3"
+    jest-validate "^23.0.0-charlie.3"
+    pretty-format "^23.0.0-charlie.3"
 
-jest-diff@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.0.0-alpha.5.tgz#65c40a2f83ae763167f3b22cbe546d11e879fd21"
+jest-diff@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.0.0-charlie.3.tgz#9ee0575d512875038c0dbb60b4ffb0d643c8b732"
   dependencies:
     chalk "^2.0.1"
     diff "^3.2.0"
     jest-get-type "^22.1.0"
-    pretty-format "^23.0.0-alpha.5"
+    pretty-format "^23.0.0-charlie.3"
 
 jest-docblock@^21.0.0:
   version "21.2.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
 
 jest-docblock@^22.4.0:
-  version "22.4.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.0.tgz#dbf1877e2550070cfc4d9b07a55775a0483159b8"
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.3.tgz#50886f132b42b280c903c592373bb6e93bb68b19"
   dependencies:
     detect-newline "^2.1.0"
 
-jest-environment-jsdom@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.0.0-alpha.5.tgz#5703be9552c971eb21a6d127ba61a0aef00376e4"
+jest-environment-jsdom@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.0.0-charlie.3.tgz#c88b81c77e00fb54c038a618768a2007bba4c92e"
   dependencies:
-    jest-mock "^23.0.0-alpha.5"
-    jest-util "^23.0.0-alpha.5"
+    jest-mock "^23.0.0-charlie.3"
+    jest-util "^23.0.0-charlie.3"
     jsdom "^11.5.1"
 
-jest-environment-node@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.0.0-alpha.5.tgz#a843ff68af484289493366923ed9c3fb13df38bd"
+jest-environment-node@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.0.0-charlie.3.tgz#4c853bb100e69f8ce0e693be45124a848c73fcc0"
   dependencies:
-    jest-mock "^23.0.0-alpha.5"
-    jest-util "^23.0.0-alpha.5"
+    jest-mock "^23.0.0-charlie.3"
+    jest-util "^23.0.0-charlie.3"
 
 jest-get-type@^22.1.0:
-  version "22.1.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.1.0.tgz#4e90af298ed6181edc85d2da500dbd2753e0d5a9"
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
 
-jest-haste-map@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.0.0-alpha.5.tgz#6602742b99a4a90f40775560b44294455acd55cd"
+jest-haste-map@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.0.0-charlie.3.tgz#d138a99fff7646c572e8aa0486dbfe89051942a2"
   dependencies:
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.11"
     jest-docblock "^22.4.0"
-    jest-serializer "^22.4.0"
-    jest-worker "^23.0.0-alpha.5"
+    jest-serializer "^23.0.0-charlie.3"
+    jest-worker "^23.0.0-charlie.3"
     micromatch "^2.3.11"
     sane "^2.0.0"
 
-jest-jasmine2@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.0.0-alpha.5.tgz#99757191bdadd54885217b239a9d2dc3045cd4c8"
+jest-jasmine2@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.0.0-charlie.3.tgz#2cf4269dc2d6b77d8f2bbd6bb4c5327fd28a4dee"
   dependencies:
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^23.0.0-alpha.5"
+    expect "^23.0.0-charlie.3"
     graceful-fs "^4.1.11"
     is-generator-fn "^1.0.0"
-    jest-diff "^23.0.0-alpha.5"
-    jest-matcher-utils "^23.0.0-alpha.5"
-    jest-message-util "^23.0.0-alpha.5"
-    jest-snapshot "^23.0.0-alpha.5"
-    jest-util "^23.0.0-alpha.5"
+    jest-diff "^23.0.0-charlie.3"
+    jest-matcher-utils "^23.0.0-charlie.3"
+    jest-message-util "^23.0.0-charlie.3"
+    jest-snapshot "^23.0.0-charlie.3"
+    jest-util "^23.0.0-charlie.3"
+    pretty-format "^23.0.0-charlie.3"
     source-map-support "^0.5.0"
 
-jest-leak-detector@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.0.0-alpha.5.tgz#0f35047e4734671c676e7e95661cd0e8a6c4fdfb"
+jest-leak-detector@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.0.0-charlie.3.tgz#f4e37d99466986208414584e0e397d416308f134"
   dependencies:
-    pretty-format "^23.0.0-alpha.5"
+    pretty-format "^23.0.0-charlie.3"
 
-jest-matcher-utils@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.0.0-alpha.5.tgz#300c31dde2fa3402f0b217add320cb7f101fa627"
+jest-matcher-utils@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.0.0-charlie.3.tgz#41e1b0f56a951ab61a6688014c9f1fdc5fd082d4"
   dependencies:
     chalk "^2.0.1"
     jest-get-type "^22.1.0"
-    pretty-format "^23.0.0-alpha.5"
+    pretty-format "^23.0.0-charlie.3"
 
 jest-message-util@^22.4.3:
   version "22.4.3"
@@ -3243,9 +3260,9 @@ jest-message-util@^22.4.3:
     slash "^1.0.0"
     stack-utils "^1.0.1"
 
-jest-message-util@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.0.0-alpha.5.tgz#72e56d5ffb196c1fc018a6c7ac49b94ddc5bf974"
+jest-message-util@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.0.0-charlie.3.tgz#975a41ca26234324d37a9a6ae8edffc92104c300"
   dependencies:
     "@babel/code-frame" "^7.0.0-beta.35"
     chalk "^2.0.1"
@@ -3253,62 +3270,63 @@ jest-message-util@^23.0.0-alpha.5:
     slash "^1.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.0.0-alpha.5.tgz#3c3ad13f69019ed3002ad84a8fded5676fc2ab4a"
+jest-mock@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.0.0-charlie.3.tgz#8bb1791579d92da32e733ee53b6e10c18739ea13"
 
-jest-regex-util@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.0.0-alpha.5.tgz#6dbe0dcb23c9389a2f979c7e293ead3e91052e14"
+jest-regex-util@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.0.0-charlie.3.tgz#f4cc6069940a2dbb1c5c4983cbb400932bef497c"
 
-jest-resolve-dependencies@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.0.0-alpha.5.tgz#5f371c22d35e3fb3d5e2ed0f580bff60b8f0f144"
+jest-resolve-dependencies@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.0.0-charlie.3.tgz#345e56f18b8d6d983387e0320a7e3f5207aa031b"
   dependencies:
-    jest-regex-util "^23.0.0-alpha.5"
-    jest-snapshot "^23.0.0-alpha.5"
+    jest-regex-util "^23.0.0-charlie.3"
+    jest-snapshot "^23.0.0-charlie.3"
 
-jest-resolve@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.0.0-alpha.5.tgz#31f484b3c6fa2c2be112092e0da4d898e482b95a"
+jest-resolve@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.0.0-charlie.3.tgz#ebca5181e00a5ee59a604d6c52347b7f37128bf7"
   dependencies:
     browser-resolve "^1.11.2"
     chalk "^2.0.1"
     realpath-native "^1.0.0"
 
-jest-runner@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.0.0-alpha.5.tgz#bc18404f0ad7016c2b641908240face3ca16c117"
+jest-runner@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.0.0-charlie.3.tgz#b391f6ac99ec4af14de57c0ca00e46493bc4cbe6"
   dependencies:
     exit "^0.1.2"
-    jest-config "^23.0.0-alpha.5"
+    jest-config "^23.0.0-charlie.3"
     jest-docblock "^22.4.0"
-    jest-haste-map "^23.0.0-alpha.5"
-    jest-jasmine2 "^23.0.0-alpha.5"
-    jest-leak-detector "^23.0.0-alpha.5"
-    jest-message-util "^23.0.0-alpha.5"
-    jest-runtime "^23.0.0-alpha.5"
-    jest-util "^23.0.0-alpha.5"
-    jest-worker "^23.0.0-alpha.5"
+    jest-haste-map "^23.0.0-charlie.3"
+    jest-jasmine2 "^23.0.0-charlie.3"
+    jest-leak-detector "^23.0.0-charlie.3"
+    jest-message-util "^23.0.0-charlie.3"
+    jest-runtime "^23.0.0-charlie.3"
+    jest-util "^23.0.0-charlie.3"
+    jest-worker "^23.0.0-charlie.3"
     throat "^4.0.0"
 
-jest-runtime@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.0.0-alpha.5.tgz#8a8def856cf9be87d154f13b47d6e2551e0a55ac"
+jest-runtime@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.0.0-charlie.3.tgz#ac33976445144ceffc7992e15249c9259c1e48d6"
   dependencies:
     babel-core "^6.0.0"
-    babel-plugin-istanbul "^4.1.5"
+    babel-plugin-istanbul "^4.1.6"
     chalk "^2.0.1"
     convert-source-map "^1.4.0"
     exit "^0.1.2"
     graceful-fs "^4.1.11"
-    jest-config "^23.0.0-alpha.5"
-    jest-haste-map "^23.0.0-alpha.5"
-    jest-regex-util "^23.0.0-alpha.5"
-    jest-resolve "^23.0.0-alpha.5"
-    jest-snapshot "^23.0.0-alpha.5"
-    jest-util "^23.0.0-alpha.5"
-    jest-validate "^23.0.0-alpha.5"
+    jest-config "^23.0.0-charlie.3"
+    jest-haste-map "^23.0.0-charlie.3"
+    jest-message-util "^23.0.0-charlie.3"
+    jest-regex-util "^23.0.0-charlie.3"
+    jest-resolve "^23.0.0-charlie.3"
+    jest-snapshot "^23.0.0-charlie.3"
+    jest-util "^23.0.0-charlie.3"
+    jest-validate "^23.0.0-charlie.3"
     json-stable-stringify "^1.0.1"
     micromatch "^2.3.11"
     realpath-native "^1.0.0"
@@ -3317,9 +3335,9 @@ jest-runtime@^23.0.0-alpha.5:
     write-file-atomic "^2.1.0"
     yargs "^11.0.0"
 
-jest-serializer@^22.4.0:
-  version "22.4.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-22.4.0.tgz#b5d145b98c4b0d2c20ab686609adbb81fe23b566"
+jest-serializer@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.0-charlie.3.tgz#ae334ee1d16d827699ce2b18c74aa49b23515027"
 
 jest-silent-reporter@0.0.4:
   version "0.0.4"
@@ -3328,16 +3346,16 @@ jest-silent-reporter@0.0.4:
     chalk "^2.3.1"
     jest-util "^22.3.0"
 
-jest-snapshot@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.0.0-alpha.5.tgz#98ba2e55c2dca0837782a83bcfd880d125f7d849"
+jest-snapshot@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.0.0-charlie.3.tgz#8e64540577806eb88794801c036cd9859e31ffc6"
   dependencies:
     chalk "^2.0.1"
-    jest-diff "^23.0.0-alpha.5"
-    jest-matcher-utils "^23.0.0-alpha.5"
+    jest-diff "^23.0.0-charlie.3"
+    jest-matcher-utils "^23.0.0-charlie.3"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^23.0.0-alpha.5"
+    pretty-format "^23.0.0-charlie.3"
 
 jest-util@^22.3.0:
   version "22.4.3"
@@ -3351,40 +3369,39 @@ jest-util@^22.3.0:
     mkdirp "^0.5.1"
     source-map "^0.6.0"
 
-jest-util@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.0.0-alpha.5.tgz#2ac78c3d6c9e459cae7c100e028f271f954b4b15"
+jest-util@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.0.0-charlie.3.tgz#116d0a4bb75620b8be3f0985bc46cd91f963c883"
   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-alpha.5"
+    jest-message-util "^23.0.0-charlie.3"
     mkdirp "^0.5.1"
     source-map "^0.6.0"
 
-jest-validate@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.0.0-alpha.5.tgz#c95ec2032b0971af8baa0978de67598ccffdaa8d"
+jest-validate@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.0.0-charlie.3.tgz#4d2c5e9b6e98b90d0b97c8a37c4b117326be9ed0"
   dependencies:
     chalk "^2.0.1"
-    jest-config "^23.0.0-alpha.5"
     jest-get-type "^22.1.0"
     leven "^2.1.0"
-    pretty-format "^23.0.0-alpha.5"
+    pretty-format "^23.0.0-charlie.3"
 
-jest-worker@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.0.0-alpha.5.tgz#003d3b106b126070c5c563b20d48cf2141df0f44"
+jest-worker@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.0.0-charlie.3.tgz#851a8e15e1891cf32f89653a222ce3ea1bc0ab83"
   dependencies:
     merge-stream "^1.0.1"
 
-jest@23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-23.0.0-alpha.5.tgz#f3c1a5add21f22a10e1159650ccf6312d2bdde58"
+jest@23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-23.0.0-charlie.3.tgz#956583da462782e3ab6bcf2e6c5cc6b57eb0e66e"
   dependencies:
     import-local "^1.0.0"
-    jest-cli "^23.0.0-alpha.5"
+    jest-cli "^23.0.0-charlie.3"
 
 joi@^12.x:
   version "12.0.0"
@@ -3398,6 +3415,10 @@ js-base64@^2.1.9:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
 
+js-stringify@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+
 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"
@@ -3409,20 +3430,13 @@ js-yaml@3.6.1:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
-js-yaml@3.x, js-yaml@^3.9.1:
+js-yaml@3.x, js-yaml@^3.7.0, js-yaml@^3.9.1:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.7.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 js-yaml@~3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
@@ -3435,23 +3449,22 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
 jsdom@^11.5.1:
-  version "11.6.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.6.0.tgz#7334781595ee8bdeea9742fc33fab5cdad6d195f"
+  version "11.10.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.10.0.tgz#a42cd54e88895dc765f03f15b807a474962ac3b5"
   dependencies:
     abab "^1.0.4"
     acorn "^5.3.0"
     acorn-globals "^4.1.0"
     array-equal "^1.0.0"
-    browser-process-hrtime "^0.1.2"
-    content-type-parser "^1.0.2"
     cssom ">= 0.3.2 < 0.4.0"
     cssstyle ">= 0.2.37 < 0.3.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"
-    parse5 "^4.0.0"
+    parse5 "4.0.0"
     pn "^1.1.0"
     request "^2.83.0"
     request-promise-native "^1.0.5"
@@ -3461,6 +3474,7 @@ jsdom@^11.5.1:
     w3c-hr-time "^1.0.1"
     webidl-conversions "^4.0.2"
     whatwg-encoding "^1.0.3"
+    whatwg-mimetype "^2.1.0"
     whatwg-url "^6.4.0"
     ws "^4.0.0"
     xml-name-validator "^3.0.0"
@@ -3477,6 +3491,10 @@ json-loader@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
 
+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-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
@@ -3527,6 +3545,13 @@ jstransformer@0.0.2:
     is-promise "^2.0.0"
     promise "^6.0.1"
 
+jstransformer@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  dependencies:
+    is-promise "^2.0.0"
+    promise "^7.0.1"
+
 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"
@@ -3570,8 +3595,8 @@ leb@^0.3.0:
   resolved "https://registry.yarnpkg.com/leb/-/leb-0.3.0.tgz#32bee9fad168328d6aea8522d833f4180eed1da3"
 
 left-pad@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
 
 less-loader@^4.0.3:
   version "4.1.0"
@@ -3659,14 +3684,10 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@^4.13.1, lodash@^4.17.4, lodash@^4.3.0:
+lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
-lodash@^4.14.0:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
 log-driver@1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"
@@ -3689,7 +3710,14 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
   dependencies:
     js-tokens "^3.0.0"
 
-lru-cache@^4.0.1, lru-cache@^4.1.1:
+lru-cache@^4.0.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  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"
   dependencies:
@@ -3712,6 +3740,10 @@ makeerror@1.0.x:
   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"
@@ -3726,6 +3758,10 @@ 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"
 
+math-random@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+
 md5.js@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
@@ -3768,7 +3804,7 @@ methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
-micromatch@^2.1.5, micromatch@^2.3.11:
+micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
@@ -3841,7 +3877,7 @@ 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"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+"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"
   dependencies:
@@ -3860,8 +3896,8 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
 minipass@^2.2.1, minipass@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40"
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.1.tgz#4e872b959131a672837ab3cb554962bc84b1537d"
   dependencies:
     safe-buffer "^5.1.1"
     yallist "^3.0.0"
@@ -3894,7 +3930,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+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"
   dependencies:
@@ -3923,7 +3959,7 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.3.0, nan@^2.9.2:
+nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
@@ -3949,8 +3985,8 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
 needle@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.0.tgz#f14efc69cee1024b72c8b21c7bdf94a731dc12fa"
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
   dependencies:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
@@ -4012,21 +4048,20 @@ node-notifier@^5.2.1:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@^0.6.39:
-  version "0.6.39"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
+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"
   dependencies:
     detect-libc "^1.0.2"
-    hawk "3.1.3"
     mkdirp "^0.5.1"
+    needle "^2.2.0"
     nopt "^4.0.1"
+    npm-packlist "^1.1.6"
     npmlog "^4.0.2"
     rc "^1.1.7"
-    request "2.81.0"
     rimraf "^2.6.1"
     semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
+    tar "^4"
 
 node-pre-gyp@^0.9.0:
   version "0.9.1"
@@ -4065,7 +4100,7 @@ normalize-package-data@^2.3.2:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
+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"
   dependencies:
@@ -4119,8 +4154,8 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
 nwmatcher@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
@@ -4174,7 +4209,7 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
+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"
   dependencies:
@@ -4294,7 +4329,7 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
-parse5@^4.0.0:
+parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
 
@@ -4672,14 +4707,14 @@ prettier@^1.11.1:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
 
-pretty-format@^23.0.0-alpha.5:
-  version "23.0.0-alpha.5"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.0.0-alpha.5.tgz#49441032994ce2b1cfa74531c1c9d9a36fe59e90"
+pretty-format@^23.0.0-charlie.3:
+  version "23.0.0-charlie.3"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.0.0-charlie.3.tgz#b251f1bdd5da81110c8d48842ac722405085f5fc"
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
-private@^0.1.7:
+private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
 
@@ -4705,7 +4740,7 @@ promise@^6.0.1:
   dependencies:
     asap "~1.0.0"
 
-promise@^7.1.1:
+promise@^7.0.1, promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
   dependencies:
@@ -4750,6 +4785,107 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
+pug-attrs@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.3.tgz#a3095f970e64151f7bdad957eef55fb5d7905d15"
+  dependencies:
+    constantinople "^3.0.1"
+    js-stringify "^1.0.1"
+    pug-runtime "^2.0.4"
+
+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"
+  dependencies:
+    constantinople "^3.0.1"
+    doctypes "^1.1.0"
+    js-stringify "^1.0.1"
+    pug-attrs "^2.0.3"
+    pug-error "^1.3.2"
+    pug-runtime "^2.0.4"
+    void-elements "^2.0.1"
+    with "^5.0.0"
+
+pug-error@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
+
+pug-filters@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-3.1.0.tgz#27165555bc04c236e4aa2b0366246dfa021b626e"
+  dependencies:
+    clean-css "^4.1.11"
+    constantinople "^3.0.1"
+    jstransformer "1.0.0"
+    pug-error "^1.3.2"
+    pug-walk "^1.1.7"
+    resolve "^1.1.6"
+    uglify-js "^2.6.1"
+
+pug-lexer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-4.0.0.tgz#210c18457ef2e1760242740c5e647bd794cec278"
+  dependencies:
+    character-parser "^2.1.1"
+    is-expression "^3.0.0"
+    pug-error "^1.3.2"
+
+pug-linker@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.5.tgz#9e9a7ae4005682d027deeb96b000f88eeb83a02f"
+  dependencies:
+    pug-error "^1.3.2"
+    pug-walk "^1.1.7"
+
+pug-load@^2.0.11:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.11.tgz#e648e57ed113fe2c1f45d57858ea2bad6bc01527"
+  dependencies:
+    object-assign "^4.1.0"
+    pug-walk "^1.1.7"
+
+pug-loader@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/pug-loader/-/pug-loader-2.4.0.tgz#18eebdda045d9c31c2856f1cc3ceb8d3df7ca49a"
+  dependencies:
+    loader-utils "^1.1.0"
+    pug-walk "^1.0.0"
+    resolve "^1.1.7"
+
+pug-parser@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-5.0.0.tgz#e394ad9b3fca93123940aff885c06e44ab7e68e4"
+  dependencies:
+    pug-error "^1.3.2"
+    token-stream "0.0.1"
+
+pug-runtime@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.4.tgz#e178e1bda68ab2e8c0acfc9bced2c54fd88ceb58"
+
+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"
+  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"
+
+pug@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.3.tgz#71cba82537c95a5eab7ed04696e4221f53aa878e"
+  dependencies:
+    pug-code-gen "^2.0.1"
+    pug-filters "^3.1.0"
+    pug-lexer "^4.0.0"
+    pug-linker "^3.0.5"
+    pug-load "^2.0.11"
+    pug-parser "^5.0.0"
+    pug-runtime "^2.0.4"
+    pug-strip-comments "^1.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"
@@ -4794,8 +4930,8 @@ qs@~6.4.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
 qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
 query-string@^4.1.0:
   version "4.3.4"
@@ -4812,12 +4948,13 @@ querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+randomatic@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
   dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    math-random "^1.0.1"
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
@@ -4845,10 +4982,10 @@ raw-loader@~0.5.0, raw-loader@~0.5.1:
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
 
 rc@^1.1.7:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092"
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.7.tgz#8a10ca30d588d00464360372b890d06dacd02297"
   dependencies:
-    deep-extend "~0.4.0"
+    deep-extend "^0.5.1"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
@@ -4887,7 +5024,7 @@ read-pkg@^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.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3:
+"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:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -5065,8 +5202,8 @@ request@2.81.0:
     uuid "^3.0.0"
 
 request@^2.83.0:
-  version "2.85.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  version "2.86.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.86.0.tgz#2b9497f449b0a32654c081a5cf426bbfb5bf5b69"
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -5086,7 +5223,6 @@ request@^2.83.0:
     performance-now "^2.1.0"
     qs "~6.5.1"
     safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
     tough-cookie "~2.3.3"
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
@@ -5128,7 +5264,7 @@ resolve@1.1.7, resolve@1.1.x:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.3.3:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.3:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
   dependencies:
@@ -5151,7 +5287,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+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"
   dependencies:
@@ -5164,6 +5300,10 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
+rsvp@^3.3.3:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -5186,7 +5326,7 @@ 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"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+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"
 
@@ -5196,23 +5336,24 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
 sane@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-2.3.0.tgz#3f3df584abf69e63d4bb74f0f8c42468e4d7d46b"
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
   dependencies:
-    anymatch "^1.3.0"
+    anymatch "^2.0.0"
+    capture-exit "^1.2.0"
     exec-sh "^0.2.0"
     fb-watchman "^2.0.0"
-    minimatch "^3.0.2"
+    micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
     watch "~0.18.0"
   optionalDependencies:
-    fsevents "^1.1.1"
+    fsevents "^1.2.3"
 
 sax@^1.2.4, sax@~1.2.1:
   version "1.2.4"
@@ -5408,10 +5549,10 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
 source-map-resolve@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
   dependencies:
-    atob "^2.0.0"
+    atob "^2.1.1"
     decode-uri-component "^0.2.0"
     resolve-url "^0.2.1"
     source-map-url "^0.4.0"
@@ -5424,9 +5565,10 @@ source-map-support@^0.4.15:
     source-map "^0.5.6"
 
 source-map-support@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.2.tgz#1a6297fd5b2e762b39688c7fc91233b60984f0a5"
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
   dependencies:
+    buffer-from "^1.0.0"
     source-map "^0.6.0"
 
 source-map-url@^0.4.0:
@@ -5439,7 +5581,7 @@ source-map@0.4.x, source-map@^0.4.4:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.6:
+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"
 
@@ -5459,19 +5601,27 @@ source-map@~0.2.0:
   dependencies:
     amdefine ">=0.0.4"
 
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+spdx-correct@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
   dependencies:
-    spdx-license-ids "^1.0.2"
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
 
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+spdx-exceptions@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
 
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+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"
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^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"
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -5586,7 +5736,7 @@ string_decoder@^1.0.0, string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringstream@~0.0.4, stringstream@~0.0.5:
+stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
@@ -5644,8 +5794,8 @@ supports-color@^4.0.0:
     has-flag "^2.0.0"
 
 supports-color@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
   dependencies:
     has-flag "^3.0.0"
 
@@ -5680,49 +5830,18 @@ tapable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
 
-tar-pack@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
-  dependencies:
-    debug "^2.2.0"
-    fstream "^1.0.10"
-    fstream-ignore "^1.0.5"
-    once "^1.3.3"
-    readable-stream "^2.1.4"
-    rimraf "^2.5.1"
-    tar "^2.2.1"
-    uid-number "^0.0.6"
-
-tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
 tar@^4:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.1.tgz#b25d5a8470c976fd7a9a8a350f42c59e9fa81749"
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.2.tgz#60685211ba46b38847b1ae7ee1a24d744a2cd462"
   dependencies:
     chownr "^1.0.1"
     fs-minipass "^1.2.5"
     minipass "^2.2.4"
     minizlib "^1.1.0"
     mkdirp "^0.5.0"
-    safe-buffer "^5.1.1"
+    safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-test-exclude@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26"
-  dependencies:
-    arrify "^1.0.1"
-    micromatch "^2.3.11"
-    object-assign "^4.1.0"
-    read-pkg-up "^1.0.1"
-    require-main-filename "^1.0.1"
-
 test-exclude@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
@@ -5802,25 +5921,23 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+token-stream@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
+
 topo@2.x.x:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/topo/-/topo-2.0.2.tgz#cd5615752539057c0dc0491a621c3bc6fbe1d182"
   dependencies:
     hoek "4.x.x"
 
-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.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"
   dependencies:
     punycode "^1.4.1"
 
-tough-cookie@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  dependencies:
-    punycode "^1.4.1"
-
-tr46@^1.0.0:
+tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
   dependencies:
@@ -5873,9 +5990,9 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@^2.9.0-dev.20180506:
-  version "2.9.0-dev.20180506"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.0-dev.20180506.tgz#e20070caa88fca90227cf040459402611a74e13f"
+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"
 
 ua-parser-js@^0.7.9:
   version "0.7.17"
@@ -5888,7 +6005,7 @@ uglify-es@^3.3.4:
     commander "~2.13.0"
     source-map "~0.6.1"
 
-uglify-js@^2.4.19, uglify-js@^2.6:
+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"
   dependencies:
@@ -5921,14 +6038,6 @@ uglifyjs-webpack-plugin@^1.2.4:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-uid-number@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-
-ultron@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
-
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -6042,11 +6151,11 @@ val-loader@^1.0.2:
     loader-utils "^1.0.0"
 
 validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
   dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
 
 vary@~1.0.1:
   version "1.0.1"
@@ -6070,7 +6179,7 @@ vm-browserify@0.0.4, vm-browserify@~0.0.0:
   dependencies:
     indexof "0.0.1"
 
-void-elements@~2.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"
 
@@ -6080,12 +6189,22 @@ w3c-hr-time@^1.0.1:
   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"
+
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
   dependencies:
     makeerror "1.0.x"
 
+wast-loader@^1.5.5:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/wast-loader/-/wast-loader-1.5.5.tgz#a1d6cdc468b6963a6e479de683dc74755f09b81a"
+  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"
@@ -6101,17 +6220,7 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-webassemblyjs@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.3.2.tgz#bba52db7b56fa0cc7882cb1176e8099ab4dd3e3c"
-  dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-    "@webassemblyjs/validation" "1.3.2"
-    "@webassemblyjs/wasm-parser" "1.3.2"
-    "@webassemblyjs/wast-parser" "1.3.2"
-    long "^3.2.0"
-
-webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
+webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
 
@@ -6142,13 +6251,17 @@ whatwg-fetch@>=0.10.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
 
+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"
+
 whatwg-url@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.0.tgz#08fdf2b9e872783a7a1f6216260a1d66cc722e08"
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.1.tgz#fdb94b440fd4ad836202c16e9737d511f012fd67"
   dependencies:
     lodash.sortby "^4.7.0"
-    tr46 "^1.0.0"
-    webidl-conversions "^4.0.1"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
 
 whet.extend@~0.9.9:
   version "0.9.9"
@@ -6174,6 +6287,13 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
+with@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
+  dependencies:
+    acorn "^3.1.0"
+    acorn-globals "^3.0.0"
+
 with@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/with/-/with-4.0.3.tgz#eefd154e9e79d2c8d3417b647a8f14d9fecce14e"
@@ -6232,12 +6352,11 @@ write@^0.2.1:
     mkdirp "^0.5.1"
 
 ws@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-4.0.0.tgz#bfe1da4c08eeb9780b986e0e4d10eccd7345999f"
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
-    ultron "~1.1.0"
 
 xml-name-validator@^3.0.0:
   version "3.0.0"