From 64db3064c76b52dec070e113998415b9b5e65430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= <i@jhuang.me>
Date: Wed, 2 May 2018 18:12:24 +0800
Subject: [PATCH 001/111] docs(examples): add yarn add webpack-cli step

Running node_modules/bin/webpack without webpack-cli installed will get hang.

The culprit is that webpack expects a stdin of whether to install webpack-cli or not. However, as examples/build-common use `child_process.exec` to execute `webpack`, the user will not be prompted for any questions since the stdin is not piped and the stdout will be pass to parent process only after the child process exits. We can keep build-common simple by instructing devs to install webpack-cli before they build examples.

Also rewrite the install step using yarn since we use yarn in webpack.
---
 examples/README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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`

From d50f00db879d2e8ec5dd636386197561d4356f8d Mon Sep 17 00:00:00 2001
From: byzyk <bohdan.kh@gmail.com>
Date: Thu, 3 May 2018 15:48:17 +0400
Subject: [PATCH 002/111] fix: allow array of strings for library.root

---
 schemas/WebpackOptions.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
index 15b17c0461b..6576e1494e6 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",

From 470663ae1cebe6ba40c763ededf3a540abe3e4bf Mon Sep 17 00:00:00 2001
From: byzyk <bohdan.kh@gmail.com>
Date: Thu, 3 May 2018 17:40:58 +0400
Subject: [PATCH 003/111] add prettierignore file

---
 .prettierignore | 14 ++++++++++++++
 package.json    |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 .prettierignore

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/package.json b/package.json
index f38f0c4a3e9..7101f65858e 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "code-lint": "eslint 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 \"**/*.{js,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",

From 6a919ba8ddfcd7b12aa1080d523fe5f7dfcd30af Mon Sep 17 00:00:00 2001
From: Sean Larkin <sean.larkin@cuw.edu>
Date: Fri, 20 Apr 2018 17:51:40 -0600
Subject: [PATCH 004/111] chore(types): add type support for Template base
 class

---
 lib/Chunk.js    |  1 +
 lib/Module.js   |  6 +++---
 lib/Template.js | 15 +++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

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/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/Template.js b/lib/Template.js
index 59089c2e96a..7c6e6e33b00 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
  * @return {boolean} return true if module.id is equal to type "number"
  */
 const moduleIdIsNumber = module => {
@@ -133,7 +131,7 @@ class Template {
 
 	/**
 	 *
-	 * @param {string | string[]} str string to convert to identity
+	 * @param {string[] | string} str string to convert to identity
 	 * @return {string} converted identity
 	 */
 	static indent(str) {
@@ -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
 	 * @return {[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

From a3d3af88a53d1917780ec977b1edd899b3e79d93 Mon Sep 17 00:00:00 2001
From: byzyk <bohdan.kh@gmail.com>
Date: Fri, 4 May 2018 15:32:49 +0400
Subject: [PATCH 005/111] add test

---
 .../configCases/library/umd/webpack.config.js | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/test/configCases/library/umd/webpack.config.js b/test/configCases/library/umd/webpack.config.js
index 4ce89d69c0a..16b6c9cb6bc 100644
--- a/test/configCases/library/umd/webpack.config.js
+++ b/test/configCases/library/umd/webpack.config.js
@@ -1,10 +1,22 @@
-module.exports = {
-	output: {
-		libraryTarget: "umd",
-		library: {
-			root: "testLibrary",
-			amd: "test-library",
-			commonjs: "test-library"
+module.exports = [
+	{
+		output: {
+			libraryTarget: "umd",
+			library: {
+				root: "testLibrary",
+				amd: "test-library",
+				commonjs: "test-library"
+			}
+		}
+	},
+	{
+		output: {
+			libraryTarget: "umd",
+			library: {
+				root: ["test", "library"],
+				amd: "test-library",
+				commonjs: "test-library"
+			}
 		}
 	}
-};
+];

From 71b05f9f832654d10a9972d5c3b8c048cf926d3e Mon Sep 17 00:00:00 2001
From: byzyk <bohdan.kh@gmail.com>
Date: Fri, 4 May 2018 16:00:18 +0400
Subject: [PATCH 006/111] move test to separate folder

---
 test/configCases/library/umd-array/index.js   |  3 ++
 .../library/umd-array/webpack.config.js       | 10 +++++++
 .../configCases/library/umd/webpack.config.js | 28 ++++++-------------
 3 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 test/configCases/library/umd-array/index.js
 create mode 100644 test/configCases/library/umd-array/webpack.config.js

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/library/umd/webpack.config.js b/test/configCases/library/umd/webpack.config.js
index 16b6c9cb6bc..4ce89d69c0a 100644
--- a/test/configCases/library/umd/webpack.config.js
+++ b/test/configCases/library/umd/webpack.config.js
@@ -1,22 +1,10 @@
-module.exports = [
-	{
-		output: {
-			libraryTarget: "umd",
-			library: {
-				root: "testLibrary",
-				amd: "test-library",
-				commonjs: "test-library"
-			}
-		}
-	},
-	{
-		output: {
-			libraryTarget: "umd",
-			library: {
-				root: ["test", "library"],
-				amd: "test-library",
-				commonjs: "test-library"
-			}
+module.exports = {
+	output: {
+		libraryTarget: "umd",
+		library: {
+			root: "testLibrary",
+			amd: "test-library",
+			commonjs: "test-library"
 		}
 	}
-];
+};

From ed9d0246d5186333435a225f473474352b9b406c Mon Sep 17 00:00:00 2001
From: Florent Cailhol <florent.cailhol@gmail.com>
Date: Wed, 9 May 2018 11:32:06 +0200
Subject: [PATCH 007/111] Add typings for various library template plugins

---
 lib/AmdMainTemplatePlugin.js            | 10 +++
 lib/ExportPropertyMainTemplatePlugin.js | 13 ++++
 lib/LibraryTemplatePlugin.js            | 99 ++++++++++++++++---------
 lib/SetVarMainTemplatePlugin.js         | 12 +++
 lib/UmdMainTemplatePlugin.js            | 49 +++++++++---
 5 files changed, 140 insertions(+), 43 deletions(-)

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/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/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/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/UmdMainTemplatePlugin.js b/lib/UmdMainTemplatePlugin.js
index 8f1ea5799c4..2cc6626a9df 100644
--- a/lib/UmdMainTemplatePlugin.js
+++ b/lib/UmdMainTemplatePlugin.js
@@ -7,22 +7,47 @@
 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[] | {[k: string]: string | string[]}} UmdMainTemplatePluginName
+ * @typedef {{optionalAmdExternalAsGlobal: boolean, namedDefine: boolean, auxiliaryComment: TODO}} UmdMainTemplatePluginOption
+ */
 
 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 +65,10 @@ class UmdMainTemplatePlugin {
 		this.auxiliaryComment = options.auxiliaryComment;
 	}
 
+	/**
+	 * @param {Compilation} compilation the compilation instance
+	 * @returns {void}
+	 */
 	apply(compilation) {
 		const { mainTemplate, chunkTemplate, runtimeTemplate } = compilation;
 

From 85b5ee33e2686282428dd1a3afef3f74614349c2 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Wed, 9 May 2018 17:40:02 +0200
Subject: [PATCH 008/111] chore: bump webassemblyjs 1.4.0

---
 package.json |   6 +-
 yarn.lock    | 178 +++++++++++++++++++++++++--------------------------
 2 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/package.json b/package.json
index 6b54e031949..7abecaced4c 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
   "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.4.0",
+    "@webassemblyjs/wasm-edit": "1.4.0",
+    "@webassemblyjs/wasm-parser": "1.4.0",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 011342076f5..a735bc74eab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18,115 +18,115 @@
   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.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.0.tgz#7c633ad9ddbb9001ce2088e729b7000587f04ad5"
   dependencies:
-    "@webassemblyjs/helper-wasm-bytecode" "1.3.2"
-    "@webassemblyjs/wast-parser" "1.3.2"
-    webassemblyjs "1.3.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.0"
+    "@webassemblyjs/wast-parser" "1.4.0"
+    webassemblyjs "1.4.0"
 
-"@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.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.0.tgz#1d573e193fc459b42b60626fb6d3d5a1ad988a66"
 
-"@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-buffer@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.0.tgz#c3571685a2d71ecb0afba85556bd9a3cec3eb689"
 
-"@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-code-frame@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.0.tgz#c88b5932e312dcac1b01bd5130417820199ad161"
   dependencies:
-    "@webassemblyjs/wast-printer" "1.3.2"
+    "@webassemblyjs/wast-printer" "1.4.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-fsm@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.0.tgz#a9a31678fd04c8bfc6124e4e68cefd07971d2421"
 
-"@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-wasm-bytecode@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.0.tgz#bcc4ed104d87f7d62a2ff193f5192222fa5b42ba"
 
-"@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"
+"@webassemblyjs/helper-wasm-section@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.0.tgz#9a46e637924312efd193a3012899e0aa4ef486aa"
   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/ast" "1.4.0"
+    "@webassemblyjs/helper-buffer" "1.4.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.0"
+    "@webassemblyjs/wasm-gen" "1.4.0"
 
-"@webassemblyjs/leb128@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.3.2.tgz#f0b0d7e3b711e17a8140e3475ac26292ac6f4245"
+"@webassemblyjs/leb128@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.4.0.tgz#de3ab2a73df41a0b6f07ee1faffe51680f2a0cfa"
   dependencies:
     leb "^0.3.0"
 
-"@webassemblyjs/validation@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.3.2.tgz#1a05dd9d7d7414d7a36d39649abf0981cead68f2"
+"@webassemblyjs/validation@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.4.0.tgz#d09b6acb0397089a1eaaf26b7f66d522f89d224e"
   dependencies:
-    "@webassemblyjs/ast" "1.3.2"
+    "@webassemblyjs/ast" "1.4.0"
 
-"@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/wasm-edit@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.0.tgz#96703293b470bd79fb33304fd940f4c905ece2d2"
+  dependencies:
+    "@webassemblyjs/ast" "1.4.0"
+    "@webassemblyjs/helper-buffer" "1.4.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.0"
+    "@webassemblyjs/helper-wasm-section" "1.4.0"
+    "@webassemblyjs/wasm-gen" "1.4.0"
+    "@webassemblyjs/wasm-opt" "1.4.0"
+    "@webassemblyjs/wasm-parser" "1.4.0"
+    "@webassemblyjs/wast-printer" "1.4.0"
     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/wasm-gen@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.0.tgz#85824fb95c84ac3ed85313b8c81d5af3053c3bba"
   dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.3.2"
-    "@webassemblyjs/leb128" "1.3.2"
+    "@webassemblyjs/ast" "1.4.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.0"
+    "@webassemblyjs/leb128" "1.4.0"
 
-"@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/wasm-opt@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.0.tgz#b7304cae781616a4987bab2e1804c98d7e29cc1b"
   dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-    "@webassemblyjs/helper-buffer" "1.3.2"
-    "@webassemblyjs/wasm-gen" "1.3.2"
-    "@webassemblyjs/wasm-parser" "1.3.2"
+    "@webassemblyjs/ast" "1.4.0"
+    "@webassemblyjs/helper-buffer" "1.4.0"
+    "@webassemblyjs/wasm-gen" "1.4.0"
+    "@webassemblyjs/wasm-parser" "1.4.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-parser@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.0.tgz#cf98ef396ad5553196a614c11a4b2ecfd13f1e82"
   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.4.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.0"
+    "@webassemblyjs/leb128" "1.4.0"
+    "@webassemblyjs/wasm-parser" "1.4.0"
+    webassemblyjs "1.4.0"
 
-"@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/wast-parser@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.0.tgz#9402dfcd67edd455785f29575ad4c9266e5c14ae"
   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.4.0"
+    "@webassemblyjs/floating-point-hex-parser" "1.4.0"
+    "@webassemblyjs/helper-code-frame" "1.4.0"
+    "@webassemblyjs/helper-fsm" "1.4.0"
     long "^3.2.0"
-    webassemblyjs "1.3.2"
+    webassemblyjs "1.4.0"
 
-"@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.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.4.0.tgz#7223a32cde1fee681e9160ae50b1c3d8d4b50f09"
   dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-    "@webassemblyjs/wast-parser" "1.3.2"
+    "@webassemblyjs/ast" "1.4.0"
+    "@webassemblyjs/wast-parser" "1.4.0"
     long "^3.2.0"
 
 abab@^1.0.4:
@@ -6101,14 +6101,14 @@ 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"
+webassemblyjs@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.4.0.tgz#19473db20153c558fe0b95f143bd344df39fa83a"
   dependencies:
-    "@webassemblyjs/ast" "1.3.2"
-    "@webassemblyjs/validation" "1.3.2"
-    "@webassemblyjs/wasm-parser" "1.3.2"
-    "@webassemblyjs/wast-parser" "1.3.2"
+    "@webassemblyjs/ast" "1.4.0"
+    "@webassemblyjs/validation" "1.4.0"
+    "@webassemblyjs/wasm-parser" "1.4.0"
+    "@webassemblyjs/wast-parser" "1.4.0"
     long "^3.2.0"
 
 webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:

From d491fdc786238f8814ffec7919ca81326271088e Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Wed, 9 May 2018 17:40:38 +0200
Subject: [PATCH 009/111] feat: uses new APIs

---
 declarations.d.ts                | 15 ++++++++++---
 lib/wasm/WebAssemblyGenerator.js | 37 ++++++++++++++++++++------------
 lib/wasm/WebAssemblyParser.js    |  8 +++----
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/declarations.d.ts b/declarations.d.ts
index 398a8973e49..d73b4d8305a 100644
--- a/declarations.d.ts
+++ b/declarations.d.ts
@@ -33,19 +33,28 @@ 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;
+			id: string;
 		};
 		name: string;
 	}
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index 852174799fb..928d90aca1b 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -7,7 +7,7 @@
 const Generator = require("../Generator");
 const { RawSource } = require("webpack-sources");
 
-const { edit, add } = require("@webassemblyjs/wasm-edit");
+const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
 const { decode } = require("@webassemblyjs/wasm-parser");
 const t = require("@webassemblyjs/ast");
 
@@ -18,9 +18,19 @@ function compose(...fns) {
 }
 
 // Utility functions
-const isGlobalImport = moduleImport => moduleImport.descr.type === "GlobalType";
-const isFuncImport = moduleImport =>
-	moduleImport.descr.type === "FuncImportDescr";
+
+/**
+ * @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";
+
 const initFuncId = t.identifier("__webpack_init__");
 
 // TODO replace with @callback
@@ -35,7 +45,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,7 +159,7 @@ 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;
@@ -168,7 +178,7 @@ const rewriteImportedGlobals = state => bin => {
 	});
 
 	// Add global declaration instructions
-	return add(bin, newGlobals);
+	return addWithAST(state.ast, bin, newGlobals);
 };
 
 /**
@@ -177,17 +187,17 @@ 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.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,
 	startAtFuncIndex,
 	importedGlobals,
-	funcSectionMetadata,
 	nextFuncIndex,
 	nextTypeIndex
 }) => bin => {
@@ -229,7 +239,7 @@ const addInitFunction = ({
 	// Export section
 	const moduleExport = t.moduleExport(initFuncId.value, "Func", nextFuncIndex);
 
-	return add(bin, [func, moduleExport, funcindex, functype]);
+	return addWithAST(ast, bin, [func, moduleExport, funcindex, functype]);
 };
 
 class WebAssemblyGenerator extends Generator {
@@ -244,20 +254,19 @@ class WebAssemblyGenerator extends Generator {
 		});
 
 		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 transform = compose(
-			removeStartFunc({}),
+			removeStartFunc({ ast }),
 
-			rewriteImportedGlobals({}),
+			rewriteImportedGlobals({ ast }),
 
 			addInitFunction({
+				ast,
 				importedGlobals,
-				funcSectionMetadata,
 				startAtFuncIndex,
 				nextFuncIndex,
 				nextTypeIndex
diff --git a/lib/wasm/WebAssemblyParser.js b/lib/wasm/WebAssemblyParser.js
index cbb6167e05a..e0c01ad475b 100644
--- a/lib/wasm/WebAssemblyParser.js
+++ b/lib/wasm/WebAssemblyParser.js
@@ -11,16 +11,16 @@ const { Tapable } = require("tapable");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 
 /**
- * @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 decoderOpts = {
 	ignoreCodeSection: true,

From d72f7c6b1caa7f43949229e101c90d5baa4ee452 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Wed, 9 May 2018 17:47:05 +0200
Subject: [PATCH 010/111] feat: store wasm ast on the module

---
 lib/wasm/WebAssemblyGenerator.js | 9 +--------
 lib/wasm/WebAssemblyParser.js    | 2 ++
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index 928d90aca1b..21e5c4d222f 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -8,7 +8,6 @@ const Generator = require("../Generator");
 const { RawSource } = require("webpack-sources");
 
 const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
-const { decode } = require("@webassemblyjs/wasm-parser");
 const t = require("@webassemblyjs/ast");
 
 function compose(...fns) {
@@ -244,15 +243,9 @@ const addInitFunction = ({
 
 class WebAssemblyGenerator extends Generator {
 	generate(module) {
+		const ast = module._ast;
 		const bin = module.originalSource().source();
 
-		// FIXME(sven): this module is parsed twice, we could preserve the AST
-		// from wasm/WebAssemblyParser.js
-		const ast = decode(bin, {
-			ignoreDataSection: true,
-			ignoreCodeSection: true
-		});
-
 		const importedGlobals = getImportedGlobals(ast);
 		const countImportedFunc = getCountImportedFunc(ast);
 		const startAtFuncIndex = getStartFuncIndex(ast);
diff --git a/lib/wasm/WebAssemblyParser.js b/lib/wasm/WebAssemblyParser.js
index e0c01ad475b..6b5580d1cdc 100644
--- a/lib/wasm/WebAssemblyParser.js
+++ b/lib/wasm/WebAssemblyParser.js
@@ -73,6 +73,8 @@ class WebAssemblyParser extends Tapable {
 			}
 		});
 
+		state.module._ast = ast;
+
 		return state;
 	}
 }

From 8bdc8ad6468c7911f8cbed5aa2c15fd3c1c4bf60 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Wed, 9 May 2018 17:53:25 +0200
Subject: [PATCH 011/111] refactor: remove type cast

---
 lib/wasm/WebAssemblyParser.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/wasm/WebAssemblyParser.js b/lib/wasm/WebAssemblyParser.js
index 6b5580d1cdc..a79ffc40008 100644
--- a/lib/wasm/WebAssemblyParser.js
+++ b/lib/wasm/WebAssemblyParser.js
@@ -45,27 +45,24 @@ 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);
-
 				let onlyDirectImport = false;
 
-				if (isMemoryImport(moduleImport) === true) {
+				if (isMemoryImport(node) === true) {
 					onlyDirectImport = true;
 				}
 
-				if (isTableImport(moduleImport) === true) {
+				if (isTableImport(node) === true) {
 					onlyDirectImport = true;
 				}
 
 				const dep = new WebAssemblyImportDependency(
-					moduleImport.module,
-					moduleImport.name,
-					moduleImport.descr,
+					node.module,
+					node.name,
+					node.descr,
 					onlyDirectImport
 				);
 

From a31721a1daa19f647a5ba621c8f89e2e22480eb1 Mon Sep 17 00:00:00 2001
From: Joe Lencioni <joe.lencioni@airbnb.com>
Date: Tue, 8 May 2018 09:22:00 -0700
Subject: [PATCH 012/111] Update test readme for Jest

This documentation still referenced Mocha, but tests were converted to
Jest.
---
 test/README.md | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

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).

From 78423b038897933a7290b593e9e31fc19acad776 Mon Sep 17 00:00:00 2001
From: Florent Cailhol <florent.cailhol@gmail.com>
Date: Wed, 9 May 2018 21:13:21 +0200
Subject: [PATCH 013/111] Update rc and deep-extend

There is a security issue with 'deep-extend' package which is a dependency
of 'rc'. Further details on https://nodesecurity.io/advisories/612

Fixes #7255
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 011342076f5..52ac6d6fcb9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1465,9 +1465,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"
@@ -4845,10 +4845,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"

From 9b37c6bf2c40ede496de8c2720eb3f93bfc29e62 Mon Sep 17 00:00:00 2001
From: Florent Cailhol <florent.cailhol@gmail.com>
Date: Thu, 10 May 2018 09:13:17 +0200
Subject: [PATCH 014/111] Replace Jade by Pug

---
 package.json                                  |   2 +
 test/TestCases.template.js                    |   4 +-
 .../{included.jade => included.pug}           |   0
 .../_resources/{parent.jade => parent.pug}    |   0
 .../{template.jade => template.pug}           |   0
 test/cases/loaders/jade-loader/index.js       |   4 -
 test/cases/loaders/pug-loader/index.js        |   4 +
 test/cases/resolving/context/index.js         |   2 +-
 .../subcontent/{test.jade => test.pug}        |   0
 yarn.lock                                     | 189 +++++++++++++++++-
 10 files changed, 191 insertions(+), 14 deletions(-)
 rename test/cases/loaders/_resources/{included.jade => included.pug} (100%)
 rename test/cases/loaders/_resources/{parent.jade => parent.pug} (100%)
 rename test/cases/loaders/_resources/{template.jade => template.pug} (100%)
 delete mode 100644 test/cases/loaders/jade-loader/index.js
 create mode 100644 test/cases/loaders/pug-loader/index.js
 rename test/cases/resolving/context/node_modules/subcontent/{test.jade => test.pug} (100%)

diff --git a/package.json b/package.json
index 6b54e031949..6913207d4ba 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,8 @@
     "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",
diff --git a/test/TestCases.template.js b/test/TestCases.template.js
index 8242c61dd6f..c860c7211b4 100644
--- a/test/TestCases.template.js
+++ b/test/TestCases.template.js
@@ -139,8 +139,8 @@ const describeCases = config => {
 											loader: "coffee-loader"
 										},
 										{
-											test: /\.jade$/,
-											loader: "jade-loader"
+											test: /\.pug/,
+											loader: "pug-loader"
 										}
 									]
 								},
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/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/yarn.lock b/yarn.lock
index 011342076f5..3969bfecca9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10,6 +10,16 @@
     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"
@@ -160,6 +170,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,10 +196,14 @@ 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@^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.5.0:
   version "5.5.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
@@ -934,6 +954,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"
@@ -1001,6 +1027,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"
@@ -1174,6 +1206,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"
@@ -1576,6 +1617,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"
@@ -2751,6 +2796,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 +2941,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:
@@ -3398,6 +3450,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"
@@ -3527,6 +3583,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"
@@ -4705,7 +4768,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 +4813,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"
@@ -5128,7 +5292,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:
@@ -5439,7 +5603,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.1, source-map@~0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -5802,6 +5966,10 @@ 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"
@@ -5888,7 +6056,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:
@@ -6070,7 +6238,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"
 
@@ -6174,6 +6342,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"

From 8488b882a44da3d23fca6c6fd03d7f0576e36d80 Mon Sep 17 00:00:00 2001
From: Florent Cailhol <florent.cailhol@gmail.com>
Date: Thu, 10 May 2018 16:36:08 +0200
Subject: [PATCH 015/111] Allow banner to be specified as a function

---
 lib/BannerPlugin.js                           | 28 ++++++++++++++-----
 schemas/plugins/BannerPlugin.json             | 15 ++++++++--
 .../plugins/banner-plugin/index.js            | 17 ++++++-----
 .../plugins/banner-plugin/webpack.config.js   |  5 ++++
 4 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/lib/BannerPlugin.js b/lib/BannerPlugin.js
index dc1c46021f4..544d4b4227b 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") {
+			let getBanner = this.options.banner;
+			this.banner = this.options.raw
+				? getBanner
+				: data => wrapComment(getBanner(data));
+		} else {
+			let 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/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/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}`
 		})
 	]
 };

From 85ef6343894ed968d557229228f009f2fcc93484 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 10 May 2018 20:19:30 +0200
Subject: [PATCH 016/111] remove _ast variable, add WeakMap

---
 lib/wasm/WebAssemblyGenerator.js |  3 ++-
 lib/wasm/WebAssemblyParser.js    | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index 21e5c4d222f..d4fb1255a6d 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -6,6 +6,7 @@
 
 const Generator = require("../Generator");
 const { RawSource } = require("webpack-sources");
+const WebAssemblyParser = require("./WebAssemblyParser");
 
 const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
 const t = require("@webassemblyjs/ast");
@@ -243,7 +244,7 @@ const addInitFunction = ({
 
 class WebAssemblyGenerator extends Generator {
 	generate(module) {
-		const ast = module._ast;
+		const ast = WebAssemblyParser.getAst(module);
 		const bin = module.originalSource().source();
 
 		const importedGlobals = getImportedGlobals(ast);
diff --git a/lib/wasm/WebAssemblyParser.js b/lib/wasm/WebAssemblyParser.js
index a79ffc40008..0cfd037257f 100644
--- a/lib/wasm/WebAssemblyParser.js
+++ b/lib/wasm/WebAssemblyParser.js
@@ -10,6 +10,8 @@ const { decode } = require("@webassemblyjs/wasm-parser");
 const { Tapable } = require("tapable");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 
+/** @typedef {import("../Module")} Module */
+
 /**
  * @param {t.ModuleImport} n the import
  * @returns {boolean} true, if a memory was imported
@@ -27,6 +29,9 @@ const decoderOpts = {
 	ignoreDataSection: true
 };
 
+/** @type {WeakMap<Module, TODO>} */
+const astStore = new WeakMap();
+
 class WebAssemblyParser extends Tapable {
 	constructor(options) {
 		super();
@@ -34,6 +39,10 @@ class WebAssemblyParser extends Tapable {
 		this.options = options;
 	}
 
+	static getAst(module) {
+		return astStore.get(module);
+	}
+
 	parse(binary, state) {
 		// flag it as ESM
 		state.module.buildMeta.exportsType = "namespace";
@@ -41,6 +50,9 @@ class WebAssemblyParser extends Tapable {
 		// parse it
 		const ast = decode(binary, decoderOpts);
 
+		// cache it to be available for generators
+		astStore.set(state.module, ast);
+
 		// extract imports and exports
 		const exports = (state.module.buildMeta.providedExports = []);
 		t.traverse(ast, {
@@ -70,8 +82,6 @@ class WebAssemblyParser extends Tapable {
 			}
 		});
 
-		state.module._ast = ast;
-
 		return state;
 	}
 }

From 91b648074090a30d079612d8c062f52ead92c774 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Thu, 10 May 2018 22:04:18 +0200
Subject: [PATCH 017/111] chore: bump webassemblyjs

---
 package.json |   6 +-
 yarn.lock    | 280 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 191 insertions(+), 95 deletions(-)

diff --git a/package.json b/package.json
index 7abecaced4c..07a33b0f465 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
   "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.4.0",
-    "@webassemblyjs/wasm-edit": "1.4.0",
-    "@webassemblyjs/wasm-parser": "1.4.0",
+    "@webassemblyjs/ast": "1.4.1",
+    "@webassemblyjs/wasm-edit": "1.4.1",
+    "@webassemblyjs/wasm-parser": "1.4.1",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index a735bc74eab..d5e28b23112 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,12 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@7.0.0-beta.46", "@babel/code-frame@^7.0.0-beta.36":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.46.tgz#e0d002100805daab1461c0fcb32a07e304f3a4f4"
+  dependencies:
+    "@babel/highlight" "7.0.0-beta.46"
+
 "@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"
@@ -10,6 +16,41 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
+"@babel/generator@^7.0.0-beta.40":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.46.tgz#6f57159bcc28bf8c3ed6b549789355cebfa3faa7"
+  dependencies:
+    "@babel/types" "7.0.0-beta.46"
+    jsesc "^2.5.1"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/highlight@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.46.tgz#c553c51e65f572bdedd6eff66fc0bb563016645e"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/template@^7.0.0-beta.40":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.46.tgz#8b23982411d5b5dbfa479437bfe414adb1411bb9"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+    babylon "7.0.0-beta.46"
+    lodash "^4.2.0"
+
+"@babel/types@7.0.0-beta.46", "@babel/types@^7.0.0-beta.40":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.46.tgz#eb84399a699af9fcb244440cce78e1acbeb40e0c"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^2.0.0"
+
 "@types/node@^9.6.4":
   version "9.6.6"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.6.tgz#439b91f9caf3983cad2eef1e11f6bedcbf9431d2"
@@ -18,115 +59,144 @@
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
 
-"@webassemblyjs/ast@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.0.tgz#7c633ad9ddbb9001ce2088e729b7000587f04ad5"
+"@webassemblyjs/ast@1.0.0-y.7":
+  version "1.0.0-y.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.0.0-y.7.tgz#081dd61dd50030d4008aac9baf0ef5ff0cc2cab9"
   dependencies:
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.0"
-    "@webassemblyjs/wast-parser" "1.4.0"
-    webassemblyjs "1.4.0"
+    "@webassemblyjs/wast-parser" "1.0.0-y.7"
+    webassembly-floating-point-hex-parser "0.1.2"
+    webassemblyjs "1.0.0-y.7"
 
-"@webassemblyjs/floating-point-hex-parser@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.0.tgz#1d573e193fc459b42b60626fb6d3d5a1ad988a66"
+"@webassemblyjs/ast@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.1.tgz#8d44bd45cb3e39c33ea0000ca7c54df4b622f0c8"
+  dependencies:
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.1"
+    "@webassemblyjs/wast-parser" "1.4.1"
+    debug "^3.1.0"
+    webassemblyjs "1.4.1"
 
-"@webassemblyjs/helper-buffer@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.0.tgz#c3571685a2d71ecb0afba85556bd9a3cec3eb689"
+"@webassemblyjs/floating-point-hex-parser@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.1.tgz#f6aca087e185097472007961e8b8bd58e042f084"
 
-"@webassemblyjs/helper-code-frame@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.0.tgz#c88b5932e312dcac1b01bd5130417820199ad161"
+"@webassemblyjs/helper-buffer@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.1.tgz#f0c89990845f97a2e919516c1e66ceef930ae113"
+
+"@webassemblyjs/helper-code-frame@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.1.tgz#744fedcb8dcc61ef79a599699cb46fdaa8045d68"
   dependencies:
-    "@webassemblyjs/wast-printer" "1.4.0"
+    "@webassemblyjs/wast-printer" "1.4.1"
 
-"@webassemblyjs/helper-fsm@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.0.tgz#a9a31678fd04c8bfc6124e4e68cefd07971d2421"
+"@webassemblyjs/helper-fsm@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.1.tgz#b365a3afda50f472163b59c1f61bb83f60ff60b8"
 
-"@webassemblyjs/helper-wasm-bytecode@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.0.tgz#bcc4ed104d87f7d62a2ff193f5192222fa5b42ba"
+"@webassemblyjs/helper-wasm-bytecode@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.1.tgz#ef060e989f9ac8c913270f9c80298ef39a0819c1"
 
-"@webassemblyjs/helper-wasm-section@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.0.tgz#9a46e637924312efd193a3012899e0aa4ef486aa"
+"@webassemblyjs/helper-wasm-section@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.1.tgz#a76753d812c56c692ee8e8b412772e388fe22f63"
   dependencies:
-    "@webassemblyjs/ast" "1.4.0"
-    "@webassemblyjs/helper-buffer" "1.4.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.0"
-    "@webassemblyjs/wasm-gen" "1.4.0"
+    "@webassemblyjs/ast" "1.4.1"
+    "@webassemblyjs/helper-buffer" "1.4.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.1"
+    "@webassemblyjs/wasm-gen" "1.4.1"
 
-"@webassemblyjs/leb128@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.4.0.tgz#de3ab2a73df41a0b6f07ee1faffe51680f2a0cfa"
+"@webassemblyjs/leb128@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.4.1.tgz#c96f0f65a7b833fb19972b80bceda0d5c0a7ab9c"
   dependencies:
     leb "^0.3.0"
 
-"@webassemblyjs/validation@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.4.0.tgz#d09b6acb0397089a1eaaf26b7f66d522f89d224e"
+"@webassemblyjs/validation@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.4.1.tgz#aaabe07eee5183e5e7e6263f92108c5e68b32019"
   dependencies:
-    "@webassemblyjs/ast" "1.4.0"
+    "@webassemblyjs/ast" "1.4.1"
 
-"@webassemblyjs/wasm-edit@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.0.tgz#96703293b470bd79fb33304fd940f4c905ece2d2"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.0"
-    "@webassemblyjs/helper-buffer" "1.4.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.0"
-    "@webassemblyjs/helper-wasm-section" "1.4.0"
-    "@webassemblyjs/wasm-gen" "1.4.0"
-    "@webassemblyjs/wasm-opt" "1.4.0"
-    "@webassemblyjs/wasm-parser" "1.4.0"
-    "@webassemblyjs/wast-printer" "1.4.0"
+"@webassemblyjs/wasm-edit@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.1.tgz#76bc68470a64c5c36309146548b566c5cb3ce2ec"
+  dependencies:
+    "@webassemblyjs/ast" "1.4.1"
+    "@webassemblyjs/helper-buffer" "1.4.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.1"
+    "@webassemblyjs/helper-wasm-section" "1.4.1"
+    "@webassemblyjs/wasm-gen" "1.4.1"
+    "@webassemblyjs/wasm-opt" "1.4.1"
+    "@webassemblyjs/wasm-parser" "1.4.1"
+    "@webassemblyjs/wast-printer" "1.4.1"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-gen@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.0.tgz#85824fb95c84ac3ed85313b8c81d5af3053c3bba"
+"@webassemblyjs/wasm-gen@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.1.tgz#774e5ed7d21a52cb1241a862d3fc73ceaa857ff0"
   dependencies:
-    "@webassemblyjs/ast" "1.4.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.0"
-    "@webassemblyjs/leb128" "1.4.0"
+    "@babel/generator" "^7.0.0-beta.40"
+    "@babel/template" "^7.0.0-beta.40"
+    "@babel/types" "^7.0.0-beta.40"
+    "@webassemblyjs/wasm-parser" "1.0.0-y.7"
+    commander "^2.14.1"
 
-"@webassemblyjs/wasm-opt@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.0.tgz#b7304cae781616a4987bab2e1804c98d7e29cc1b"
+"@webassemblyjs/wasm-opt@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.1.tgz#e5a30ec5bbfb4fe94e83bf616d3a99182ba76655"
   dependencies:
-    "@webassemblyjs/ast" "1.4.0"
-    "@webassemblyjs/helper-buffer" "1.4.0"
-    "@webassemblyjs/wasm-gen" "1.4.0"
-    "@webassemblyjs/wasm-parser" "1.4.0"
+    "@webassemblyjs/ast" "1.4.1"
+    "@webassemblyjs/helper-buffer" "1.4.1"
+    "@webassemblyjs/wasm-gen" "1.4.1"
+    "@webassemblyjs/wasm-parser" "1.4.1"
 
-"@webassemblyjs/wasm-parser@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.0.tgz#cf98ef396ad5553196a614c11a4b2ecfd13f1e82"
+"@webassemblyjs/wasm-parser@1.0.0-y.7":
+  version "1.0.0-y.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.0.0-y.7.tgz#aafd74a65330d1b39f195717d987e1cfd9e648ba"
   dependencies:
-    "@webassemblyjs/ast" "1.4.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.0"
-    "@webassemblyjs/leb128" "1.4.0"
-    "@webassemblyjs/wasm-parser" "1.4.0"
-    webassemblyjs "1.4.0"
+    "@webassemblyjs/ast" "1.0.0-y.7"
+    "@webassemblyjs/wasm-parser" "1.0.0-y.7"
+    webassemblyjs "1.0.0-y.7"
 
-"@webassemblyjs/wast-parser@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.0.tgz#9402dfcd67edd455785f29575ad4c9266e5c14ae"
+"@webassemblyjs/wasm-parser@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.1.tgz#363d326187d495024eacd63f8720576dded5b4c4"
   dependencies:
-    "@webassemblyjs/ast" "1.4.0"
-    "@webassemblyjs/floating-point-hex-parser" "1.4.0"
-    "@webassemblyjs/helper-code-frame" "1.4.0"
-    "@webassemblyjs/helper-fsm" "1.4.0"
+    "@webassemblyjs/ast" "1.4.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.1"
+    "@webassemblyjs/leb128" "1.4.1"
+    "@webassemblyjs/wasm-parser" "1.4.1"
+    webassemblyjs "1.4.1"
+
+"@webassemblyjs/wast-parser@1.0.0-y.7":
+  version "1.0.0-y.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.0.0-y.7.tgz#7a2965048b8478a3595a6c9e2054776277f8c3be"
+  dependencies:
+    "@babel/code-frame" "^7.0.0-beta.36"
+    "@webassemblyjs/ast" "1.0.0-y.7"
     long "^3.2.0"
-    webassemblyjs "1.4.0"
+    webassembly-floating-point-hex-parser "0.1.2"
+    webassemblyjs "1.0.0-y.7"
 
-"@webassemblyjs/wast-printer@1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.4.0.tgz#7223a32cde1fee681e9160ae50b1c3d8d4b50f09"
+"@webassemblyjs/wast-parser@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.1.tgz#e2a56084b6062daa78eb3784ad6d3532f3c5ebd9"
   dependencies:
-    "@webassemblyjs/ast" "1.4.0"
-    "@webassemblyjs/wast-parser" "1.4.0"
+    "@webassemblyjs/ast" "1.4.1"
+    "@webassemblyjs/floating-point-hex-parser" "1.4.1"
+    "@webassemblyjs/helper-code-frame" "1.4.1"
+    "@webassemblyjs/helper-fsm" "1.4.1"
+    long "^3.2.0"
+    webassemblyjs "1.4.1"
+
+"@webassemblyjs/wast-printer@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.4.1.tgz#d9288e777aa40dadaca9896c9e92aa535ae4212b"
+  dependencies:
+    "@webassemblyjs/ast" "1.4.1"
+    "@webassemblyjs/wast-parser" "1.4.1"
     long "^3.2.0"
 
 abab@^1.0.4:
@@ -594,6 +664,10 @@ babel-types@^6.18.0, babel-types@^6.26.0:
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
+babylon@7.0.0-beta.46:
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.46.tgz#b6ddaba81bbb130313932757ff9c195d527088b6"
+
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
@@ -1127,7 +1201,7 @@ commander@2.8.x:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.9.0, commander@^2.x:
+commander@^2.14.1, commander@^2.9.0, commander@^2.x:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
 
@@ -3469,6 +3543,10 @@ jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
+jsesc@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -3659,7 +3737,7 @@ 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.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
@@ -5439,7 +5517,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.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -5780,6 +5858,10 @@ to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -6101,14 +6183,28 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-webassemblyjs@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.4.0.tgz#19473db20153c558fe0b95f143bd344df39fa83a"
+webassembly-floating-point-hex-parser@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/webassembly-floating-point-hex-parser/-/webassembly-floating-point-hex-parser-0.1.2.tgz#85bb01f54e68690c2645ea0cfad26c1110fdf988"
+
+webassemblyjs@1.0.0-y.7:
+  version "1.0.0-y.7"
+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.0.0-y.7.tgz#142ca4d6b37f81531fdf39c49ec6c79c927b7836"
+  dependencies:
+    "@webassemblyjs/ast" "1.0.0-y.7"
+    "@webassemblyjs/wasm-parser" "1.0.0-y.7"
+    "@webassemblyjs/wast-parser" "1.0.0-y.7"
+    long "^3.2.0"
+    webassembly-floating-point-hex-parser "0.1.2"
+
+webassemblyjs@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.4.1.tgz#fdf1eaab969b5ed274a85ebed21418521382a71c"
   dependencies:
-    "@webassemblyjs/ast" "1.4.0"
-    "@webassemblyjs/validation" "1.4.0"
-    "@webassemblyjs/wasm-parser" "1.4.0"
-    "@webassemblyjs/wast-parser" "1.4.0"
+    "@webassemblyjs/ast" "1.4.1"
+    "@webassemblyjs/validation" "1.4.1"
+    "@webassemblyjs/wasm-parser" "1.4.1"
+    "@webassemblyjs/wast-parser" "1.4.1"
     long "^3.2.0"
 
 webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:

From a9c771a8aceef9339217b35d9f569355b2f8b142 Mon Sep 17 00:00:00 2001
From: Sean Larkin <sean.larkin@cuw.edu>
Date: Thu, 10 May 2018 13:13:33 -0700
Subject: [PATCH 018/111] fix eslint error

---
 lib/Template.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Template.js b/lib/Template.js
index afa75f2854b..92327ac49f0 100644
--- a/lib/Template.js
+++ b/lib/Template.js
@@ -46,7 +46,7 @@ const stringifyIdSortPredicate = (a, b) => {
 
 /**
  * @param {Module} module the module to compare against
- * @return {boolean} return true if module.id is equal to type "number"
+ * @returns {boolean} return true if module.id is equal to type "number"
  */
 const moduleIdIsNumber = module => {
 	return typeof module.id === "number";
@@ -176,7 +176,7 @@ class Template {
 	/**
 	 *
 	 * @param {Module[]} modules a collection of modules to get array bounds for
-	 * @return {[number, number] | false} returns the upper and lower array bounds
+	 * @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) {

From 912a1a66cc0775366074b9a7de61869d1c38b382 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Thu, 10 May 2018 22:15:24 +0200
Subject: [PATCH 019/111] chore: update lock

---
 yarn.lock | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 93b77cf746c..af187894761 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,6 +16,41 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
+"@babel/generator@^7.0.0-beta.40":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.46.tgz#6f57159bcc28bf8c3ed6b549789355cebfa3faa7"
+  dependencies:
+    "@babel/types" "7.0.0-beta.46"
+    jsesc "^2.5.1"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/highlight@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.46.tgz#c553c51e65f572bdedd6eff66fc0bb563016645e"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/template@^7.0.0-beta.40":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.46.tgz#8b23982411d5b5dbfa479437bfe414adb1411bb9"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+    babylon "7.0.0-beta.46"
+    lodash "^4.2.0"
+
+"@babel/types@7.0.0-beta.46", "@babel/types@^7.0.0-beta.40":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.46.tgz#eb84399a699af9fcb244440cce78e1acbeb40e0c"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^2.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"
@@ -5646,7 +5681,7 @@ source-map@0.4.x, source-map@^0.4.4:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.5.x, 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.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 

From f613e9ac2e6de4e8f767e2268ca7dd636ac3aa9d Mon Sep 17 00:00:00 2001
From: Sean Larkin <sean.larkin@cuw.edu>
Date: Sun, 6 May 2018 23:19:41 -0700
Subject: [PATCH 020/111] chore(types): add basic type info for a few warning
 and errors

---
 lib/AsyncDependencyToInitialChunkError.js | 14 ++++++++++++--
 lib/CaseSensitiveModulesWarning.js        | 22 ++++++++++++++++++++--
 lib/ModuleDependencyError.js              | 14 ++++++++++++--
 lib/WebpackError.js                       | 10 ++++++++--
 4 files changed, 52 insertions(+), 8 deletions(-)

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/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/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/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;

From 561e95eb3154c33613383cf9f027e6f3f50765e9 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 11 May 2018 09:46:16 +0200
Subject: [PATCH 021/111] use const

---
 lib/BannerPlugin.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/BannerPlugin.js b/lib/BannerPlugin.js
index 544d4b4227b..930990ad8d3 100644
--- a/lib/BannerPlugin.js
+++ b/lib/BannerPlugin.js
@@ -39,12 +39,12 @@ class BannerPlugin {
 		this.options = options || {};
 
 		if (typeof options.banner === "function") {
-			let getBanner = this.options.banner;
+			const getBanner = this.options.banner;
 			this.banner = this.options.raw
 				? getBanner
 				: data => wrapComment(getBanner(data));
 		} else {
-			let banner = this.options.raw
+			const banner = this.options.raw
 				? this.options.banner
 				: wrapComment(this.options.banner);
 			this.banner = () => banner;

From 17bcc3c9db736e427a0c2566d011dd56a5aec57d Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 11 May 2018 16:06:20 +0200
Subject: [PATCH 022/111] enable eslint caching

---
 .gitignore   | 1 +
 package.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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/package.json b/package.json
index 6913207d4ba..4f6c66673ec 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
     "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",

From 38456ead4da744a96b5bdf348dea4cc98b53c227 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Fri, 11 May 2018 16:16:01 +0200
Subject: [PATCH 023/111] chore: bump webassemblyjs

---
 package.json |   6 +-
 yarn.lock    | 293 +++++++++++++++++----------------------------------
 2 files changed, 102 insertions(+), 197 deletions(-)

diff --git a/package.json b/package.json
index bd2e21abb3d..7ef53b57944 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
   "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.4.1",
-    "@webassemblyjs/wasm-edit": "1.4.1",
-    "@webassemblyjs/wasm-parser": "1.4.1",
+    "@webassemblyjs/ast": "1.4.2",
+    "@webassemblyjs/wasm-edit": "1.4.2",
+    "@webassemblyjs/wasm-parser": "1.4.2",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index af187894761..16d0b6b7603 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,12 +2,6 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.0.0-beta.46", "@babel/code-frame@^7.0.0-beta.36":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.46.tgz#e0d002100805daab1461c0fcb32a07e304f3a4f4"
-  dependencies:
-    "@babel/highlight" "7.0.0-beta.46"
-
 "@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"
@@ -16,41 +10,6 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-"@babel/generator@^7.0.0-beta.40":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.46.tgz#6f57159bcc28bf8c3ed6b549789355cebfa3faa7"
-  dependencies:
-    "@babel/types" "7.0.0-beta.46"
-    jsesc "^2.5.1"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-"@babel/highlight@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.46.tgz#c553c51e65f572bdedd6eff66fc0bb563016645e"
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
-"@babel/template@^7.0.0-beta.40":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.46.tgz#8b23982411d5b5dbfa479437bfe414adb1411bb9"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.46"
-    "@babel/types" "7.0.0-beta.46"
-    babylon "7.0.0-beta.46"
-    lodash "^4.2.0"
-
-"@babel/types@7.0.0-beta.46", "@babel/types@^7.0.0-beta.40":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.46.tgz#eb84399a699af9fcb244440cce78e1acbeb40e0c"
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^2.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"
@@ -69,144 +28,116 @@
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
 
-"@webassemblyjs/ast@1.0.0-y.7":
-  version "1.0.0-y.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.0.0-y.7.tgz#081dd61dd50030d4008aac9baf0ef5ff0cc2cab9"
-  dependencies:
-    "@webassemblyjs/wast-parser" "1.0.0-y.7"
-    webassembly-floating-point-hex-parser "0.1.2"
-    webassemblyjs "1.0.0-y.7"
-
-"@webassemblyjs/ast@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.1.tgz#8d44bd45cb3e39c33ea0000ca7c54df4b622f0c8"
+"@webassemblyjs/ast@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.2.tgz#ab715aa1fec9dd23c025204dba39690c119418ea"
   dependencies:
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.1"
-    "@webassemblyjs/wast-parser" "1.4.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
+    "@webassemblyjs/wast-parser" "1.4.2"
     debug "^3.1.0"
-    webassemblyjs "1.4.1"
+    webassemblyjs "1.4.2"
 
-"@webassemblyjs/floating-point-hex-parser@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.1.tgz#f6aca087e185097472007961e8b8bd58e042f084"
+"@webassemblyjs/floating-point-hex-parser@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.2.tgz#9296fb64caa37bf98c8064aa329680e3e2bfacc7"
 
-"@webassemblyjs/helper-buffer@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.1.tgz#f0c89990845f97a2e919516c1e66ceef930ae113"
+"@webassemblyjs/helper-buffer@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.2.tgz#3cacecd5a6bfcb67932ed8219f81f92d8b2dafbb"
 
-"@webassemblyjs/helper-code-frame@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.1.tgz#744fedcb8dcc61ef79a599699cb46fdaa8045d68"
+"@webassemblyjs/helper-code-frame@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.2.tgz#20526637c3849f12b08f8661248477eef9642329"
   dependencies:
-    "@webassemblyjs/wast-printer" "1.4.1"
+    "@webassemblyjs/wast-printer" "1.4.2"
 
-"@webassemblyjs/helper-fsm@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.1.tgz#b365a3afda50f472163b59c1f61bb83f60ff60b8"
+"@webassemblyjs/helper-fsm@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.2.tgz#e41050282994b5be077b95b65b66ecd5a92c5e88"
 
-"@webassemblyjs/helper-wasm-bytecode@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.1.tgz#ef060e989f9ac8c913270f9c80298ef39a0819c1"
+"@webassemblyjs/helper-wasm-bytecode@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.2.tgz#b48c289c7921056aa12d71e78a17070ffe90c49c"
 
-"@webassemblyjs/helper-wasm-section@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.1.tgz#a76753d812c56c692ee8e8b412772e388fe22f63"
+"@webassemblyjs/helper-wasm-section@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.2.tgz#520e02c0cc3e5e9b5f44f58abc04ba5eda6e5476"
   dependencies:
-    "@webassemblyjs/ast" "1.4.1"
-    "@webassemblyjs/helper-buffer" "1.4.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.1"
-    "@webassemblyjs/wasm-gen" "1.4.1"
+    "@webassemblyjs/ast" "1.4.2"
+    "@webassemblyjs/helper-buffer" "1.4.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
+    "@webassemblyjs/wasm-gen" "1.4.2"
 
-"@webassemblyjs/leb128@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.4.1.tgz#c96f0f65a7b833fb19972b80bceda0d5c0a7ab9c"
+"@webassemblyjs/leb128@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.4.2.tgz#d13f368abdcefc54428f55a265a993de610f8893"
   dependencies:
     leb "^0.3.0"
 
-"@webassemblyjs/validation@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.4.1.tgz#aaabe07eee5183e5e7e6263f92108c5e68b32019"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.1"
-
-"@webassemblyjs/wasm-edit@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.1.tgz#76bc68470a64c5c36309146548b566c5cb3ce2ec"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.1"
-    "@webassemblyjs/helper-buffer" "1.4.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.1"
-    "@webassemblyjs/helper-wasm-section" "1.4.1"
-    "@webassemblyjs/wasm-gen" "1.4.1"
-    "@webassemblyjs/wasm-opt" "1.4.1"
-    "@webassemblyjs/wasm-parser" "1.4.1"
-    "@webassemblyjs/wast-printer" "1.4.1"
-    debug "^3.1.0"
-
-"@webassemblyjs/wasm-gen@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.1.tgz#774e5ed7d21a52cb1241a862d3fc73ceaa857ff0"
-  dependencies:
-    "@babel/generator" "^7.0.0-beta.40"
-    "@babel/template" "^7.0.0-beta.40"
-    "@babel/types" "^7.0.0-beta.40"
-    "@webassemblyjs/wasm-parser" "1.0.0-y.7"
-    commander "^2.14.1"
-
-"@webassemblyjs/wasm-opt@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.1.tgz#e5a30ec5bbfb4fe94e83bf616d3a99182ba76655"
+"@webassemblyjs/validation@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.4.2.tgz#55cf5b219e25900c85773fc35beb9d12ae0ede53"
   dependencies:
-    "@webassemblyjs/ast" "1.4.1"
-    "@webassemblyjs/helper-buffer" "1.4.1"
-    "@webassemblyjs/wasm-gen" "1.4.1"
-    "@webassemblyjs/wasm-parser" "1.4.1"
+    "@webassemblyjs/ast" "1.4.2"
 
-"@webassemblyjs/wasm-parser@1.0.0-y.7":
-  version "1.0.0-y.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.0.0-y.7.tgz#aafd74a65330d1b39f195717d987e1cfd9e648ba"
+"@webassemblyjs/wasm-edit@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.2.tgz#bde9a581065f63f257ed511d7d9cf04f8cd04524"
   dependencies:
-    "@webassemblyjs/ast" "1.0.0-y.7"
-    "@webassemblyjs/wasm-parser" "1.0.0-y.7"
-    webassemblyjs "1.0.0-y.7"
-
-"@webassemblyjs/wasm-parser@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.1.tgz#363d326187d495024eacd63f8720576dded5b4c4"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.1"
-    "@webassemblyjs/leb128" "1.4.1"
-    "@webassemblyjs/wasm-parser" "1.4.1"
-    webassemblyjs "1.4.1"
-
-"@webassemblyjs/wast-parser@1.0.0-y.7":
-  version "1.0.0-y.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.0.0-y.7.tgz#7a2965048b8478a3595a6c9e2054776277f8c3be"
-  dependencies:
-    "@babel/code-frame" "^7.0.0-beta.36"
-    "@webassemblyjs/ast" "1.0.0-y.7"
-    long "^3.2.0"
-    webassembly-floating-point-hex-parser "0.1.2"
-    webassemblyjs "1.0.0-y.7"
+    "@webassemblyjs/ast" "1.4.2"
+    "@webassemblyjs/helper-buffer" "1.4.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
+    "@webassemblyjs/helper-wasm-section" "1.4.2"
+    "@webassemblyjs/wasm-gen" "1.4.2"
+    "@webassemblyjs/wasm-opt" "1.4.2"
+    "@webassemblyjs/wasm-parser" "1.4.2"
+    "@webassemblyjs/wast-printer" "1.4.2"
+    debug "^3.1.0"
 
-"@webassemblyjs/wast-parser@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.1.tgz#e2a56084b6062daa78eb3784ad6d3532f3c5ebd9"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.1"
-    "@webassemblyjs/floating-point-hex-parser" "1.4.1"
-    "@webassemblyjs/helper-code-frame" "1.4.1"
-    "@webassemblyjs/helper-fsm" "1.4.1"
+"@webassemblyjs/wasm-gen@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.2.tgz#0899297f9426073736df799287845a73c597cf90"
+  dependencies:
+    "@webassemblyjs/ast" "1.4.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
+    "@webassemblyjs/leb128" "1.4.2"
+
+"@webassemblyjs/wasm-opt@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.2.tgz#c44ad48e109aec197e3bf69875c54537d76ba2e9"
+  dependencies:
+    "@webassemblyjs/ast" "1.4.2"
+    "@webassemblyjs/helper-buffer" "1.4.2"
+    "@webassemblyjs/wasm-gen" "1.4.2"
+    "@webassemblyjs/wasm-parser" "1.4.2"
+
+"@webassemblyjs/wasm-parser@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.2.tgz#3bf7e10cfe336db0ecdea0a5d7ed8a63b7a7754a"
+  dependencies:
+    "@webassemblyjs/ast" "1.4.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
+    "@webassemblyjs/leb128" "1.4.2"
+    "@webassemblyjs/wasm-parser" "1.4.2"
+    webassemblyjs "1.4.2"
+
+"@webassemblyjs/wast-parser@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.2.tgz#6499c38cf8895a81394f7e40d4681a85aaa84498"
+  dependencies:
+    "@webassemblyjs/ast" "1.4.2"
+    "@webassemblyjs/floating-point-hex-parser" "1.4.2"
+    "@webassemblyjs/helper-code-frame" "1.4.2"
+    "@webassemblyjs/helper-fsm" "1.4.2"
     long "^3.2.0"
-    webassemblyjs "1.4.1"
+    webassemblyjs "1.4.2"
 
-"@webassemblyjs/wast-printer@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.4.1.tgz#d9288e777aa40dadaca9896c9e92aa535ae4212b"
+"@webassemblyjs/wast-printer@1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.4.2.tgz#ee70a828f0d9730b55b9a5c3ed694094ba68ba57"
   dependencies:
-    "@webassemblyjs/ast" "1.4.1"
-    "@webassemblyjs/wast-parser" "1.4.1"
+    "@webassemblyjs/ast" "1.4.2"
+    "@webassemblyjs/wast-parser" "1.4.2"
     long "^3.2.0"
 
 abab@^1.0.4:
@@ -684,10 +615,6 @@ babel-types@^6.18.0, babel-types@^6.26.0:
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babylon@7.0.0-beta.46:
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.46.tgz#b6ddaba81bbb130313932757ff9c195d527088b6"
-
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
@@ -1233,7 +1160,7 @@ commander@2.8.x:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.14.1, commander@^2.9.0, commander@^2.x:
+commander@^2.9.0, commander@^2.x:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
 
@@ -3599,10 +3526,6 @@ jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
-jsesc@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -3800,7 +3723,7 @@ 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.2.0, lodash@^4.3.0:
+lodash@^4.13.1, lodash@^4.17.4, lodash@^4.3.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
@@ -5681,7 +5604,7 @@ source-map@0.4.x, source-map@^0.4.4:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.5.x, source-map@^0.5.0, 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.1, source-map@~0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -6022,10 +5945,6 @@ to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -6351,28 +6270,14 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-webassembly-floating-point-hex-parser@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/webassembly-floating-point-hex-parser/-/webassembly-floating-point-hex-parser-0.1.2.tgz#85bb01f54e68690c2645ea0cfad26c1110fdf988"
-
-webassemblyjs@1.0.0-y.7:
-  version "1.0.0-y.7"
-  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.0.0-y.7.tgz#142ca4d6b37f81531fdf39c49ec6c79c927b7836"
-  dependencies:
-    "@webassemblyjs/ast" "1.0.0-y.7"
-    "@webassemblyjs/wasm-parser" "1.0.0-y.7"
-    "@webassemblyjs/wast-parser" "1.0.0-y.7"
-    long "^3.2.0"
-    webassembly-floating-point-hex-parser "0.1.2"
-
-webassemblyjs@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.4.1.tgz#fdf1eaab969b5ed274a85ebed21418521382a71c"
+webassemblyjs@1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.4.2.tgz#3b07b506917c97153d83441d8a88ffa2d25cc07d"
   dependencies:
-    "@webassemblyjs/ast" "1.4.1"
-    "@webassemblyjs/validation" "1.4.1"
-    "@webassemblyjs/wasm-parser" "1.4.1"
-    "@webassemblyjs/wast-parser" "1.4.1"
+    "@webassemblyjs/ast" "1.4.2"
+    "@webassemblyjs/validation" "1.4.2"
+    "@webassemblyjs/wasm-parser" "1.4.2"
+    "@webassemblyjs/wast-parser" "1.4.2"
     long "^3.2.0"
 
 webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:

From e2c8f3d501dcd891ce943c1be393f34aba7d31ca Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 11 May 2018 16:46:33 +0200
Subject: [PATCH 024/111] remove passing AST, redecode AST in Generator

---
 lib/wasm/WebAssemblyGenerator.js |  8 ++++++--
 lib/wasm/WebAssemblyParser.js    | 10 ----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index d4fb1255a6d..7174be66a91 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -6,9 +6,9 @@
 
 const Generator = require("../Generator");
 const { RawSource } = require("webpack-sources");
-const WebAssemblyParser = require("./WebAssemblyParser");
 
 const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
+const { decode } = require("@webassemblyjs/wasm-parser");
 const t = require("@webassemblyjs/ast");
 
 function compose(...fns) {
@@ -244,9 +244,13 @@ const addInitFunction = ({
 
 class WebAssemblyGenerator extends Generator {
 	generate(module) {
-		const ast = WebAssemblyParser.getAst(module);
 		const bin = module.originalSource().source();
 
+		const ast = decode(bin, {
+			ignoreDataSection: true,
+			ignoreCodeSection: true
+		});
+
 		const importedGlobals = getImportedGlobals(ast);
 		const countImportedFunc = getCountImportedFunc(ast);
 		const startAtFuncIndex = getStartFuncIndex(ast);
diff --git a/lib/wasm/WebAssemblyParser.js b/lib/wasm/WebAssemblyParser.js
index 0cfd037257f..559208f4505 100644
--- a/lib/wasm/WebAssemblyParser.js
+++ b/lib/wasm/WebAssemblyParser.js
@@ -29,9 +29,6 @@ const decoderOpts = {
 	ignoreDataSection: true
 };
 
-/** @type {WeakMap<Module, TODO>} */
-const astStore = new WeakMap();
-
 class WebAssemblyParser extends Tapable {
 	constructor(options) {
 		super();
@@ -39,10 +36,6 @@ class WebAssemblyParser extends Tapable {
 		this.options = options;
 	}
 
-	static getAst(module) {
-		return astStore.get(module);
-	}
-
 	parse(binary, state) {
 		// flag it as ESM
 		state.module.buildMeta.exportsType = "namespace";
@@ -50,9 +43,6 @@ class WebAssemblyParser extends Tapable {
 		// parse it
 		const ast = decode(binary, decoderOpts);
 
-		// cache it to be available for generators
-		astStore.set(state.module, ast);
-
 		// extract imports and exports
 		const exports = (state.module.buildMeta.providedExports = []);
 		t.traverse(ast, {

From bbb9f38b719fd09e85189e69e8e90747808bbf41 Mon Sep 17 00:00:00 2001
From: Krzysztof Czopp <chris.czopp@glue.codes>
Date: Sun, 6 May 2018 09:36:28 +0100
Subject: [PATCH 025/111] fix: ReferenceError: onScriptComplete is not defined
 when using HMR on Firefox 45

---
 lib/web/JsonpMainTemplatePlugin.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js
index 412e4d68ef5..906dca4c0ff 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;"
 				]);
 			}
 		);

From c92eabd3be44d4162be0affc9ef368624b0a6e51 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 11 May 2018 18:13:07 +0200
Subject: [PATCH 026/111] 4.8.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7ef53b57944..7c1ea3969f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.8.1",
+  "version": "4.8.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",

From 737eaa51b6ffe3886c85e5660a9446f101f7c71a Mon Sep 17 00:00:00 2001
From: Jaehwan Moon <mkch115@gmail.com>
Date: Fri, 11 May 2018 13:06:10 -0400
Subject: [PATCH 027/111] Fix a bug where ProgressPlugin is not working
 properly with MultiCompiler

---
 lib/ProgressPlugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)

From 81de2d43142da436eceef86f02d3425af17c00e4 Mon Sep 17 00:00:00 2001
From: Sean Larkin <sean.larkin@cuw.edu>
Date: Fri, 11 May 2018 11:35:44 -0700
Subject: [PATCH 028/111] chore(deps): upgrade typescript nightly

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 7c1ea3969f1..61bb7b1025f 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "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.20180511",
     "url-loader": "^0.6.2",
     "val-loader": "^1.0.2",
     "vm-browserify": "~0.0.0",
diff --git a/yarn.lock b/yarn.lock
index 16d0b6b7603..14827f7ef3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6042,9 +6042,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.20180511:
+  version "2.9.0-dev.20180511"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.0-dev.20180511.tgz#e864f6b9bf9e7f654d26f5401e74b76871f5a8e2"
 
 ua-parser-js@^0.7.9:
   version "0.7.17"

From f903cd3ef9535000eb110e097b5e24d9c3d8130c Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Wed, 9 May 2018 16:19:31 +0200
Subject: [PATCH 029/111] mangle exports of wasm modules mangle webpack init
 function store WebAssembly.Instance.exports directly connect wasm modules
 directly when already cached

---
 lib/MainTemplate.js                        |  2 +-
 lib/wasm/WasmMainTemplatePlugin.js         | 21 ++++++-----
 lib/wasm/WebAssemblyGenerator.js           | 41 ++++++++++++++++++++--
 lib/wasm/WebAssemblyJavascriptGenerator.js | 37 ++++++-------------
 4 files changed, 61 insertions(+), 40 deletions(-)

diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
index a9c1be0fd9f..378fbb59c42 100644
--- a/lib/MainTemplate.js
+++ b/lib/MainTemplate.js
@@ -46,7 +46,7 @@ const Template = require("./Template");
 // __webpack_require__.r = define compatibility on export
 // __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/wasm/WasmMainTemplatePlugin.js b/lib/wasm/WasmMainTemplatePlugin.js
index 6f4a23d41f7..48ec88566b7 100644
--- a/lib/wasm/WasmMainTemplatePlugin.js
+++ b/lib/wasm/WasmMainTemplatePlugin.js
@@ -67,22 +67,25 @@ function generateImportObject(module) {
 					`installedWasmModules[${JSON.stringify(data.module.id)}]`
 				);
 				properties.push(
-					`${JSON.stringify(data.exportName)}: ${instanceVar}.exports` +
-						`[${JSON.stringify(data.exportName)}]`
+					`${JSON.stringify(data.exportName)}: ${instanceVar}` +
+						`[${JSON.stringify(data.usedName)}]`
 				);
 			} else {
 				const params = data.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(data.module.id)}]`;
+				const func = `${mod}.exports[${JSON.stringify(data.usedName)}]`;
 
 				properties.push(
 					Template.asString([
-						`${JSON.stringify(data.exportName)}: function(${params}) {`,
-						Template.indent([`return ${result};`]),
+						`${JSON.stringify(data.exportName)}: ` +
+							(data.module.type.startsWith("webassembly")
+								? `${mod} ? ${func} : `
+								: "") +
+							`function(${params}) {`,
+						Template.indent([`return ${func}(${params});`]),
 						"}"
 					])
 				);
@@ -257,7 +260,7 @@ class WasmMainTemplatePlugin {
 							Template.indent([
 								`return ${
 									mainTemplate.requireFn
-								}.w[wasmModuleId] = res.instance || res;`
+								}.w[wasmModuleId] = (res.instance || res).exports;`
 							]),
 							"}));"
 						]),
@@ -275,7 +278,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 7174be66a91..5afc60b5a65 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -5,6 +5,7 @@
 "use strict";
 
 const Generator = require("../Generator");
+const Template = require("../Template");
 const { RawSource } = require("webpack-sources");
 
 const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
@@ -12,7 +13,7 @@ const { decode } = require("@webassemblyjs/wasm-parser");
 const t = require("@webassemblyjs/ast");
 
 function compose(...fns) {
-	return fns.reverse().reduce((prevFn, nextFn) => {
+	return fns.reduce((prevFn, nextFn) => {
 		return value => nextFn(prevFn(value));
 	}, value => value);
 }
@@ -31,8 +32,6 @@ const isGlobalImport = n => n.descr.type === "GlobalType";
  */
 const isFuncImport = n => n.descr.type === "FuncImportDescr";
 
-const initFuncId = t.identifier("__webpack_init__");
-
 // TODO replace with @callback
 /**
  * @typedef {(ArrayBuffer) => ArrayBuffer} ArrayBufferTransform
@@ -181,6 +180,28 @@ const rewriteImportedGlobals = state => bin => {
 	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;
+				// TODO remove this when fixed in @webassemblyjs
+				path.node.descr.id = t.numberLiteral(+path.node.descr.id.raw);
+			} else {
+				path.remove();
+			}
+		}
+	});
+};
+
 /**
  * Add an init function.
  *
@@ -188,6 +209,7 @@ const rewriteImportedGlobals = state => bin => {
  *
  * @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 {t.IndexLiteral} state.nextFuncIndex index of the next function
@@ -196,6 +218,7 @@ const rewriteImportedGlobals = state => bin => {
  */
 const addInitFunction = ({
 	ast,
+	initFuncId,
 	startAtFuncIndex,
 	importedGlobals,
 	nextFuncIndex,
@@ -246,6 +269,12 @@ class WebAssemblyGenerator extends Generator {
 	generate(module) {
 		const bin = module.originalSource().source();
 
+		const initFuncId = t.identifier(
+			Array.isArray(module.usedExports)
+				? Template.numberToIdentifer(module.usedExports.length)
+				: "__webpack_init__"
+		);
+
 		const ast = decode(bin, {
 			ignoreDataSection: true,
 			ignoreCodeSection: true
@@ -258,12 +287,18 @@ class WebAssemblyGenerator extends Generator {
 		const nextTypeIndex = getNextTypeIndex(ast);
 
 		const transform = compose(
+			rewriteExportNames({
+				ast,
+				module
+			}),
+
 			removeStartFunc({ ast }),
 
 			rewriteImportedGlobals({ ast }),
 
 			addInitFunction({
 				ast,
+				initFuncId,
 				importedGlobals,
 				startAtFuncIndex,
 				nextFuncIndex,
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;

From fb29d633dbfeba009db4f890133c0b0a33e23d3c Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 10 May 2018 11:34:09 +0200
Subject: [PATCH 030/111] Mangle import names and module requests

---
 lib/wasm/WasmMainTemplatePlugin.js            | 112 ++++++++----------
 lib/wasm/WebAssemblyGenerator.js              |  53 +++++++++
 test/cases/wasm/imports-multiple/index.js     |   5 +
 test/cases/wasm/imports-multiple/module.js    |   7 ++
 test/cases/wasm/imports-multiple/module2.js   |   5 +
 .../wasm/imports-multiple/test.filter.js      |   5 +
 test/cases/wasm/imports-multiple/wasm.wasm    | Bin 0 -> 202 bytes
 7 files changed, 122 insertions(+), 65 deletions(-)
 create mode 100644 test/cases/wasm/imports-multiple/index.js
 create mode 100644 test/cases/wasm/imports-multiple/module.js
 create mode 100644 test/cases/wasm/imports-multiple/module2.js
 create mode 100644 test/cases/wasm/imports-multiple/test.filter.js
 create mode 100644 test/cases/wasm/imports-multiple/wasm.wasm

diff --git a/lib/wasm/WasmMainTemplatePlugin.js b/lib/wasm/WasmMainTemplatePlugin.js
index 48ec88566b7..0b0f1cb06ed 100644
--- a/lib/wasm/WasmMainTemplatePlugin.js
+++ b/lib/wasm/WasmMainTemplatePlugin.js
@@ -23,7 +23,9 @@ function getAllWasmModules(chunk) {
 }
 
 function generateImportObject(module) {
-	const depsByRequest = new Map();
+	const waitForPromises = new Map();
+	const properties = [];
+	let importIndex = 0;
 	for (const dep of module.dependencies) {
 		if (dep instanceof WebAssemblyImportDependency) {
 			// Ignore global they will be handled later
@@ -31,74 +33,54 @@ function generateImportObject(module) {
 				continue;
 			}
 
-			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);
-
 			if (dep.module === null) {
 				// Dependency was not found, an error will be thrown later
 				continue;
 			}
 
+			const importedModule = dep.module;
+			const exportName = dep.name;
+			const usedName = importedModule && importedModule.isUsed(exportName);
 			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}` +
-						`[${JSON.stringify(data.usedName)}]`
-				);
-			} else {
-				const params = data.description.signature.params.map(
-					(param, k) => "p" + k + param.valtype
-				);
+				const description = dep.description;
+				const direct = dep.onlyDirectImport;
 
-				const mod = `installedModules[${JSON.stringify(data.module.id)}]`;
-				const func = `${mod}.exports[${JSON.stringify(data.usedName)}]`;
+				const index = importIndex++;
 
-				properties.push(
-					Template.asString([
-						`${JSON.stringify(data.exportName)}: ` +
-							(data.module.type.startsWith("webassembly")
-								? `${mod} ? ${func} : `
-								: "") +
-							`function(${params}) {`,
-						Template.indent([`return ${func}(${params});`]),
-						"}"
-					])
-				);
+				const propertyName = Template.numberToIdentifer(index);
+
+				if (direct) {
+					const instanceVar = `m${waitForPromises.size}`;
+					waitForPromises.set(
+						instanceVar,
+						`installedWasmModules[${JSON.stringify(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 mod = `installedModules[${JSON.stringify(importedModule.id)}]`;
+					const func = `${mod}.exports[${JSON.stringify(usedName)}]`;
+
+					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) {
@@ -114,7 +96,7 @@ function generateImportObject(module) {
 				Template.indent([
 					variables,
 					"return {",
-					Template.indent([importsCode.join(",")]),
+					Template.indent([properties.join(",\n")]),
 					"};"
 				]),
 				"});"
@@ -126,7 +108,7 @@ function generateImportObject(module) {
 			`${JSON.stringify(module.id)}: function() {`,
 			Template.indent([
 				"return {",
-				Template.indent([importsCode.join(",")]),
+				Template.indent([properties.join(",\n")]),
 				"};"
 			]),
 			"},"
@@ -221,13 +203,13 @@ 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], {a:items[1]});"
 											]),
 											"});"
 										]),
 										"} else if(typeof WebAssembly.instantiateStreaming === 'function') {",
 										Template.indent([
-											"promise = WebAssembly.instantiateStreaming(req, importObject);"
+											"promise = WebAssembly.instantiateStreaming(req, {a:importObject});"
 										])
 								  ])
 								: Template.asString([
@@ -241,7 +223,7 @@ class WasmMainTemplatePlugin {
 											]),
 											"]).then(function(items) {",
 											Template.indent([
-												"return WebAssembly.instantiate(items[0], items[1]);"
+												"return WebAssembly.instantiate(items[0], {a:items[1]});"
 											]),
 											"});"
 										])
@@ -251,7 +233,7 @@ 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, {a:importObject});"
 								]),
 								"});"
 							]),
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index 5afc60b5a65..889651dcc84 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -6,6 +6,7 @@
 
 const Generator = require("../Generator");
 const Template = require("../Template");
+const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 const { RawSource } = require("webpack-sources");
 
 const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
@@ -202,6 +203,27 @@ const rewriteExportNames = ({ ast, module }) => bin => {
 	});
 };
 
+const rewriteImports = state => bin => {
+	const importMangleMap = state.importMangleMap;
+	return edit(bin, {
+		ModuleImport(path) {
+			const result = importMangleMap.get(
+				path.node.module + ":" + path.node.name
+			);
+			if (result === undefined) {
+				path.remove();
+			} else {
+				path.node.module = "a";
+				path.node.name = result;
+				if (path.node.descr.id)
+					path.node.descr.id = t.numberLiteral(+path.node.descr.id.raw);
+				if (path.node.descr.name)
+					path.node.descr.name = t.numberLiteral(+path.node.descr.name.raw);
+			}
+		}
+	});
+};
+
 /**
  * Add an init function.
  *
@@ -265,6 +287,31 @@ const addInitFunction = ({
 	return addWithAST(ast, bin, [func, moduleExport, funcindex, functype]);
 };
 
+const getImportMangleMap = module => {
+	/** @type {Map<string,string>} */
+	const map = new Map();
+	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 request = dep.request;
+			const exportName = dep.name;
+			const usedName = importedModule && importedModule.isUsed(exportName);
+			if (usedName !== false) {
+				map.set(
+					request + ":" + exportName,
+					Template.numberToIdentifer(importIndex++)
+				);
+			}
+		}
+	}
+	return map;
+};
+
 class WebAssemblyGenerator extends Generator {
 	generate(module) {
 		const bin = module.originalSource().source();
@@ -286,6 +333,8 @@ class WebAssemblyGenerator extends Generator {
 		const nextFuncIndex = getNextFuncIndex(ast, countImportedFunc);
 		const nextTypeIndex = getNextTypeIndex(ast);
 
+		const importMangleMap = getImportMangleMap(module);
+
 		const transform = compose(
 			rewriteExportNames({
 				ast,
@@ -296,6 +345,10 @@ class WebAssemblyGenerator extends Generator {
 
 			rewriteImportedGlobals({ ast }),
 
+			rewriteImports({
+				importMangleMap
+			}),
+
 			addInitFunction({
 				ast,
 				initFuncId,
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..239d73c6cad
--- /dev/null
+++ b/test/cases/wasm/imports-multiple/module.js
@@ -0,0 +1,7 @@
+import { getResult } from "./wasm.wasm";
+
+export var result = getResult();
+
+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 0000000000000000000000000000000000000000..19fef4041f6ce8b0552051ac2b910ce44bbed265
GIT binary patch
literal 202
zcmZQbEY4+QU|?Y6VoG3OtWRL9XRK$^VdBu!&&^LM%}M1<Pc88)%}q)zVqoBe2^t}b
zGBYzVFtSTBA&G(6L8-;1IVB9tTzpI{431*l><j`70*qPQ3}GyJiMgqa4lE2pFa!1A
hwlE4~iWwo9&CHpYk^*rM6E6$U-3&|&%s`^R004}ZG7bO$

literal 0
HcmV?d00001


From cb3a0ed08c688dd14d316e5947d706d8ff2e78cf Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 10 May 2018 18:07:24 +0200
Subject: [PATCH 031/111] enforce direct import when types are incompatible
 with JS types

---
 declarations.d.ts                             |  15 ++++----
 .../WebAssemblyImportDependency.js            |   8 +++--
 lib/wasm/WebAssemblyGenerator.js              |   2 +-
 lib/wasm/WebAssemblyParser.js                 |  33 +++++++++++++++---
 .../cases/wasm/imports-complex-types/index.js |   6 ++++
 .../wasm/imports-complex-types/other.wasm     | Bin 0 -> 68 bytes
 .../wasm/imports-complex-types/test.filter.js |   5 +++
 .../wasm/imports-complex-types/wasm.wasm      | Bin 0 -> 119 bytes
 8 files changed, 55 insertions(+), 14 deletions(-)
 create mode 100644 test/cases/wasm/imports-complex-types/index.js
 create mode 100644 test/cases/wasm/imports-complex-types/other.wasm
 create mode 100644 test/cases/wasm/imports-complex-types/test.filter.js
 create mode 100644 test/cases/wasm/imports-complex-types/wasm.wasm

diff --git a/declarations.d.ts b/declarations.d.ts
index d73b4d8305a..85bb4fc5f6f 100644
--- a/declarations.d.ts
+++ b/declarations.d.ts
@@ -53,8 +53,9 @@ declare module "@webassemblyjs/ast" {
 		module: string;
 		descr: {
 			type: string;
-			valtype: string;
-			id: string;
+			valtype?: string;
+			id?: Identifier;
+			signature?: Signature;
 		};
 		name: string;
 	}
@@ -64,7 +65,9 @@ declare module "@webassemblyjs/ast" {
 	export class IndexLiteral extends Node {}
 	export class NumberLiteral 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 {}
@@ -72,8 +75,8 @@ declare module "@webassemblyjs/ast" {
 		signature: Signature;
 	}
 	export class Signature {
-		params: any;
-		result: any;
+		params: FuncParam[];
+		results: string[];
 	}
 	export class TypeInstructionFunc extends Node {}
 	export class IndexInFuncSection extends Node {}
@@ -90,7 +93,7 @@ declare module "@webassemblyjs/ast" {
 		init: Node[]
 	): ObjectInstruction;
 	export function func(initFuncId, funcParams, funcResults, funcBody): Func;
-	export function typeInstructionFunc(params, result): TypeInstructionFunc;
+	export function typeInstructionFunc(params: FuncParam[], results: string[]): TypeInstructionFunc;
 	export function indexInFuncSection(index: IndexLiteral): IndexInFuncSection;
 	export function moduleExport(
 		identifier: string,
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/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index 889651dcc84..59d8d14642d 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -275,7 +275,7 @@ const addInitFunction = ({
 	// Type section
 	const functype = t.typeInstructionFunc(
 		func.signature.params,
-		func.signature.result
+		func.signature.results
 	);
 
 	// Func section
diff --git a/lib/wasm/WebAssemblyParser.js b/lib/wasm/WebAssemblyParser.js
index 559208f4505..b964b2d9878 100644
--- a/lib/wasm/WebAssemblyParser.js
+++ b/lib/wasm/WebAssemblyParser.js
@@ -24,6 +24,25 @@ const isMemoryImport = n => n.descr.type === "Memory";
  */
 const isTableImport = n => n.descr.type === "Table";
 
+const JS_COMPAT_TYPES = new Set(["i32", "u32", "f32"]);
+
+/**
+ * @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,
 	ignoreDataSection: true
@@ -51,14 +70,18 @@ class WebAssemblyParser extends Tapable {
 			},
 
 			ModuleImport({ node }) {
+				/** @type {false | string} */
 				let onlyDirectImport = false;
 
 				if (isMemoryImport(node) === true) {
-					onlyDirectImport = true;
-				}
-
-				if (isTableImport(node) === true) {
-					onlyDirectImport = 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(
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 0000000000000000000000000000000000000000..70c5aee0fa3d0b396998cdca051e8969857e5941
GIT binary patch
literal 68
zcmZQbEY4+QU|?WmV@zPIW2|FlVq{?FVq{BCE%7unVPN3mWMpShU~tl^;bstL$xF;l
RW#nXJfJ!s5GBN-)0{~OQ39$eG

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..8374df1439fc93409a083afdeaf1be7ee0fbef0b
GIT binary patch
literal 119
zcmZQbEY4+QU|?Y6VoG4FW2{SHV60~nXXMe-&o9YHEz&Co%Cn`XmUx<(FfcGPF*34q
xGqRVY7J~&Cxnvln7@QiQKtKSAUAvr{L6RjeF*lWwlaT>x1QR<G1JE``1^_ug8kztA

literal 0
HcmV?d00001


From ee0b5afc449e987d28a4c67b3a86e816ca464c0c Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 10 May 2018 18:08:29 +0200
Subject: [PATCH 032/111] generate shorter runtime code for the imports map

---
 lib/wasm/WasmMainTemplatePlugin.js | 45 +++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/lib/wasm/WasmMainTemplatePlugin.js b/lib/wasm/WasmMainTemplatePlugin.js
index 0b0f1cb06ed..157cc5d95c9 100644
--- a/lib/wasm/WasmMainTemplatePlugin.js
+++ b/lib/wasm/WasmMainTemplatePlugin.js
@@ -23,7 +23,7 @@ function getAllWasmModules(chunk) {
 }
 
 function generateImportObject(module) {
-	const waitForPromises = new Map();
+	const waitForInstances = new Map();
 	const properties = [];
 	let importIndex = 0;
 	for (const dep of module.dependencies) {
@@ -50,11 +50,8 @@ function generateImportObject(module) {
 				const propertyName = Template.numberToIdentifer(index);
 
 				if (direct) {
-					const instanceVar = `m${waitForPromises.size}`;
-					waitForPromises.set(
-						instanceVar,
-						`installedWasmModules[${JSON.stringify(importedModule.id)}]`
-					);
+					const instanceVar = `m${waitForInstances.size}`;
+					waitForInstances.set(instanceVar, importedModule.id);
 					properties.push(
 						`${JSON.stringify(propertyName)}: ${instanceVar}` +
 							`[${JSON.stringify(usedName)}]`
@@ -83,18 +80,38 @@ function generateImportObject(module) {
 		}
 	}
 
-	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([properties.join(",\n")]),
 					"};"
@@ -134,6 +151,8 @@ class WasmMainTemplatePlugin {
 					"// object to store loaded and loading wasm modules",
 					"var installedWasmModules = {};",
 					"",
+					"function promiseResolve() { return Promise.resolve(); }",
+					"",
 					"var wasmImportObjects = {",
 					Template.indent(importObjects),
 					"};"

From 08e72f546815fb3dccd947eb18662dcde7e5c65e Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 11 May 2018 14:24:08 +0200
Subject: [PATCH 033/111] fix compat types list

---
 lib/wasm/WebAssemblyParser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/wasm/WebAssemblyParser.js b/lib/wasm/WebAssemblyParser.js
index b964b2d9878..16103074491 100644
--- a/lib/wasm/WebAssemblyParser.js
+++ b/lib/wasm/WebAssemblyParser.js
@@ -24,7 +24,7 @@ const isMemoryImport = n => n.descr.type === "Memory";
  */
 const isTableImport = n => n.descr.type === "Table";
 
-const JS_COMPAT_TYPES = new Set(["i32", "u32", "f32"]);
+const JS_COMPAT_TYPES = new Set(["i32", "f32", "f64"]);
 
 /**
  * @param {t.ModuleImport} moduleImport the import

From 42c0214254df5ade315daf4a51580f0424a1792f Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 11 May 2018 14:24:40 +0200
Subject: [PATCH 034/111] move common code into separate module

---
 lib/wasm/WasmMainTemplatePlugin.js | 101 ++++++++++++++---------------
 lib/wasm/WebAssemblyGenerator.js   |  60 ++++++++---------
 lib/wasm/WebAssemblyUtils.js       |  48 ++++++++++++++
 3 files changed, 128 insertions(+), 81 deletions(-)
 create mode 100644 lib/wasm/WebAssemblyUtils.js

diff --git a/lib/wasm/WasmMainTemplatePlugin.js b/lib/wasm/WasmMainTemplatePlugin.js
index 157cc5d95c9..1daf0b8c145 100644
--- a/lib/wasm/WasmMainTemplatePlugin.js
+++ b/lib/wasm/WasmMainTemplatePlugin.js
@@ -6,6 +6,9 @@
 
 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,61 +25,51 @@ 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 waitForInstances = new Map();
 	const properties = [];
-	let importIndex = 0;
-	for (const dep of module.dependencies) {
-		if (dep instanceof WebAssemblyImportDependency) {
-			// Ignore global they will be handled later
-			if (dep.description.type === "GlobalType") {
-				continue;
-			}
-
-			if (dep.module === null) {
-				// Dependency was not found, an error will be thrown later
-				continue;
-			}
+	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 importedModule = dep.module;
-			const exportName = dep.name;
-			const usedName = importedModule && importedModule.isUsed(exportName);
-			if (usedName !== false) {
-				const description = dep.description;
-				const direct = dep.onlyDirectImport;
+		const propertyName = usedDep.name;
 
-				const index = importIndex++;
+		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 propertyName = Template.numberToIdentifer(index);
+			const mod = `installedModules[${JSON.stringify(importedModule.id)}]`;
+			const func = `${mod}.exports[${JSON.stringify(usedName)}]`;
 
-				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 mod = `installedModules[${JSON.stringify(importedModule.id)}]`;
-					const func = `${mod}.exports[${JSON.stringify(usedName)}]`;
-
-					properties.push(
-						Template.asString([
-							`${JSON.stringify(propertyName)}: ` +
-								(importedModule.type.startsWith("webassembly")
-									? `${mod} ? ${func} : `
-									: "") +
-								`function(${params}) {`,
-							Template.indent([`return ${func}(${params});`]),
-							"}"
-						])
-					);
-				}
-			}
+			properties.push(
+				Template.asString([
+					`${JSON.stringify(propertyName)}: ` +
+						(importedModule.type.startsWith("webassembly")
+							? `${mod} ? ${func} : `
+							: "") +
+						`function(${params}) {`,
+					Template.indent([`return ${func}(${params});`]),
+					"}"
+				])
+			);
 		}
 	}
 
@@ -222,13 +215,15 @@ class WasmMainTemplatePlugin {
 										Template.indent([
 											"promise = Promise.all([WebAssembly.compileStreaming(req), importObject]).then(function(items) {",
 											Template.indent([
-												"return WebAssembly.instantiate(items[0], {a:items[1]});"
+												"return WebAssembly.instantiate(items[0], " +
+													`{ ${WebAssemblyUtils.MANGLED_MODULE}: items[1] });`
 											]),
 											"});"
 										]),
 										"} else if(typeof WebAssembly.instantiateStreaming === 'function') {",
 										Template.indent([
-											"promise = WebAssembly.instantiateStreaming(req, {a:importObject});"
+											"promise = WebAssembly.instantiateStreaming(req, " +
+												`{ ${WebAssemblyUtils.MANGLED_MODULE}: importObject });`
 										])
 								  ])
 								: Template.asString([
@@ -242,7 +237,8 @@ class WasmMainTemplatePlugin {
 											]),
 											"]).then(function(items) {",
 											Template.indent([
-												"return WebAssembly.instantiate(items[0], {a:items[1]});"
+												"return WebAssembly.instantiate(items[0], " +
+													`{ ${WebAssemblyUtils.MANGLED_MODULE}: items[1] });`
 											]),
 											"});"
 										])
@@ -252,7 +248,8 @@ class WasmMainTemplatePlugin {
 								"var bytesPromise = req.then(function(x) { return x.arrayBuffer(); });",
 								"promise = bytesPromise.then(function(bytes) {",
 								Template.indent([
-									"return WebAssembly.instantiate(bytes, {a:importObject});"
+									"return WebAssembly.instantiate(bytes, " +
+										`{ ${WebAssemblyUtils.MANGLED_MODULE}: importObject });`
 								]),
 								"});"
 							]),
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index 59d8d14642d..7df42298316 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -6,13 +6,16 @@
 
 const Generator = require("../Generator");
 const Template = require("../Template");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+const WebAssemblyUtils = require("./WebAssemblyUtils");
 const { RawSource } = require("webpack-sources");
 
 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 */
+
 function compose(...fns) {
 	return fns.reduce((prevFn, nextFn) => {
 		return value => nextFn(prevFn(value));
@@ -203,18 +206,24 @@ const rewriteExportNames = ({ ast, module }) => bin => {
 	});
 };
 
-const rewriteImports = state => bin => {
-	const importMangleMap = state.importMangleMap;
-	return edit(bin, {
+/**
+ * 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 = importMangleMap.get(
+			const result = usedDependencyMap.get(
 				path.node.module + ":" + path.node.name
 			);
 			if (result === undefined) {
 				path.remove();
 			} else {
-				path.node.module = "a";
-				path.node.name = result;
+				path.node.module = WebAssemblyUtils.MANGLED_MODULE;
+				path.node.name = result.name;
 				if (path.node.descr.id)
 					path.node.descr.id = t.numberLiteral(+path.node.descr.id.raw);
 				if (path.node.descr.name)
@@ -287,27 +296,19 @@ const addInitFunction = ({
 	return addWithAST(ast, bin, [func, moduleExport, funcindex, functype]);
 };
 
-const getImportMangleMap = module => {
-	/** @type {Map<string,string>} */
+/**
+ * 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();
-	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 request = dep.request;
-			const exportName = dep.name;
-			const usedName = importedModule && importedModule.isUsed(exportName);
-			if (usedName !== false) {
-				map.set(
-					request + ":" + exportName,
-					Template.numberToIdentifer(importIndex++)
-				);
-			}
-		}
+	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;
 };
@@ -333,7 +334,7 @@ class WebAssemblyGenerator extends Generator {
 		const nextFuncIndex = getNextFuncIndex(ast, countImportedFunc);
 		const nextTypeIndex = getNextTypeIndex(ast);
 
-		const importMangleMap = getImportMangleMap(module);
+		const usedDependencyMap = getUsedDependencyMap(module);
 
 		const transform = compose(
 			rewriteExportNames({
@@ -346,7 +347,8 @@ class WebAssemblyGenerator extends Generator {
 			rewriteImportedGlobals({ ast }),
 
 			rewriteImports({
-				importMangleMap
+				ast,
+				usedDependencyMap
 			}),
 
 			addInitFunction({
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;

From 22ec60434d9e79fb695f70136168a3513c7b65be Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 11 May 2018 16:30:06 +0200
Subject: [PATCH 035/111] lint and type

---
 lib/wasm/WasmMainTemplatePlugin.js | 1 -
 lib/wasm/WebAssemblyGenerator.js   | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/wasm/WasmMainTemplatePlugin.js b/lib/wasm/WasmMainTemplatePlugin.js
index 1daf0b8c145..d87039ef86c 100644
--- a/lib/wasm/WasmMainTemplatePlugin.js
+++ b/lib/wasm/WasmMainTemplatePlugin.js
@@ -5,7 +5,6 @@
 "use strict";
 
 const Template = require("../Template");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 
 /** @typedef {import("../Module")} Module */
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index 7df42298316..2b2e8bf31db 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -16,6 +16,11 @@ const t = require("@webassemblyjs/ast");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("./WebAssemblyUtils").UsedWasmDependency} UsedWasmDependency */
 
+/**
+ * @template T
+ * @param {Function[]} fns transforms
+ * @returns {Function} composed transform
+ */
 function compose(...fns) {
 	return fns.reduce((prevFn, nextFn) => {
 		return value => nextFn(prevFn(value));

From cd7980e2a8f8ce6e6364d2bc7b5eb196927d52d5 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Sat, 12 May 2018 10:25:17 +0200
Subject: [PATCH 036/111] add comment about the microtask delay

---
 lib/wasm/WasmMainTemplatePlugin.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/wasm/WasmMainTemplatePlugin.js b/lib/wasm/WasmMainTemplatePlugin.js
index d87039ef86c..1cec8f89600 100644
--- a/lib/wasm/WasmMainTemplatePlugin.js
+++ b/lib/wasm/WasmMainTemplatePlugin.js
@@ -143,6 +143,10 @@ 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 = {",

From 51073cd3a1dc2d39f88ea3a1f36e40f454baf97d Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Sat, 12 May 2018 11:38:09 +0200
Subject: [PATCH 037/111] chore: bump webassemblyjs

---
 package.json |   6 +-
 yarn.lock    | 194 ++++++++++++++++++++++++++-------------------------
 2 files changed, 102 insertions(+), 98 deletions(-)

diff --git a/package.json b/package.json
index 5ae3ceb0da6..0d3f11b3a2d 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
   "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.4.2",
-    "@webassemblyjs/wasm-edit": "1.4.2",
-    "@webassemblyjs/wasm-parser": "1.4.2",
+    "@webassemblyjs/ast": "1.4.3",
+    "@webassemblyjs/wasm-edit": "1.4.3",
+    "@webassemblyjs/wasm-parser": "1.4.3",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 14827f7ef3d..56a5a9bb526 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,116 +28,120 @@
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
 
-"@webassemblyjs/ast@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.2.tgz#ab715aa1fec9dd23c025204dba39690c119418ea"
+"@webassemblyjs/ast@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.3.tgz#3b3f6fced944d8660273347533e6d4d315b5934a"
   dependencies:
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
-    "@webassemblyjs/wast-parser" "1.4.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
+    "@webassemblyjs/wast-parser" "1.4.3"
     debug "^3.1.0"
-    webassemblyjs "1.4.2"
+    webassemblyjs "1.4.3"
 
-"@webassemblyjs/floating-point-hex-parser@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.2.tgz#9296fb64caa37bf98c8064aa329680e3e2bfacc7"
+"@webassemblyjs/floating-point-hex-parser@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.3.tgz#f5aee4c376a717c74264d7bacada981e7e44faad"
 
-"@webassemblyjs/helper-buffer@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.2.tgz#3cacecd5a6bfcb67932ed8219f81f92d8b2dafbb"
+"@webassemblyjs/helper-buffer@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.3.tgz#0434b55958519bf503697d3824857b1dea80b729"
+  dependencies:
+    debug "^3.1.0"
 
-"@webassemblyjs/helper-code-frame@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.2.tgz#20526637c3849f12b08f8661248477eef9642329"
+"@webassemblyjs/helper-code-frame@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.3.tgz#f1349ca3e01a8e29ee2098c770773ef97af43641"
   dependencies:
-    "@webassemblyjs/wast-printer" "1.4.2"
+    "@webassemblyjs/wast-printer" "1.4.3"
 
-"@webassemblyjs/helper-fsm@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.2.tgz#e41050282994b5be077b95b65b66ecd5a92c5e88"
+"@webassemblyjs/helper-fsm@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.3.tgz#65a921db48fb43e868f17b27497870bdcae22b79"
 
-"@webassemblyjs/helper-wasm-bytecode@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.2.tgz#b48c289c7921056aa12d71e78a17070ffe90c49c"
+"@webassemblyjs/helper-wasm-bytecode@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.3.tgz#0e5b4b5418e33f8a26e940b7809862828c3721a5"
 
-"@webassemblyjs/helper-wasm-section@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.2.tgz#520e02c0cc3e5e9b5f44f58abc04ba5eda6e5476"
+"@webassemblyjs/helper-wasm-section@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.3.tgz#9ceedd53a3f152c3412e072887ade668d0b1acbf"
   dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/helper-buffer" "1.4.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
-    "@webassemblyjs/wasm-gen" "1.4.2"
+    "@webassemblyjs/ast" "1.4.3"
+    "@webassemblyjs/helper-buffer" "1.4.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
+    "@webassemblyjs/wasm-gen" "1.4.3"
+    debug "^3.1.0"
 
-"@webassemblyjs/leb128@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.4.2.tgz#d13f368abdcefc54428f55a265a993de610f8893"
+"@webassemblyjs/leb128@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.4.3.tgz#5a5e5949dbb5adfe3ae95664d0439927ac557fb8"
   dependencies:
     leb "^0.3.0"
 
-"@webassemblyjs/validation@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.4.2.tgz#55cf5b219e25900c85773fc35beb9d12ae0ede53"
+"@webassemblyjs/validation@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.4.3.tgz#9e66c9b3079d7bbcf2070c1bf52a54af2a09aac9"
+  dependencies:
+    "@webassemblyjs/ast" "1.4.3"
+
+"@webassemblyjs/wasm-edit@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.3.tgz#87febd565e0ffb5ae25f6495bb3958d17aa0a779"
+  dependencies:
+    "@webassemblyjs/ast" "1.4.3"
+    "@webassemblyjs/helper-buffer" "1.4.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
+    "@webassemblyjs/helper-wasm-section" "1.4.3"
+    "@webassemblyjs/wasm-gen" "1.4.3"
+    "@webassemblyjs/wasm-opt" "1.4.3"
+    "@webassemblyjs/wasm-parser" "1.4.3"
+    "@webassemblyjs/wast-printer" "1.4.3"
+    debug "^3.1.0"
+
+"@webassemblyjs/wasm-gen@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.3.tgz#8553164d0154a6be8f74d653d7ab355f73240aa4"
   dependencies:
-    "@webassemblyjs/ast" "1.4.2"
+    "@webassemblyjs/ast" "1.4.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
+    "@webassemblyjs/leb128" "1.4.3"
 
-"@webassemblyjs/wasm-edit@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.2.tgz#bde9a581065f63f257ed511d7d9cf04f8cd04524"
+"@webassemblyjs/wasm-opt@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.3.tgz#26c7a23bfb136aa405b1d3410e63408ec60894b8"
   dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/helper-buffer" "1.4.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
-    "@webassemblyjs/helper-wasm-section" "1.4.2"
-    "@webassemblyjs/wasm-gen" "1.4.2"
-    "@webassemblyjs/wasm-opt" "1.4.2"
-    "@webassemblyjs/wasm-parser" "1.4.2"
-    "@webassemblyjs/wast-printer" "1.4.2"
+    "@webassemblyjs/ast" "1.4.3"
+    "@webassemblyjs/helper-buffer" "1.4.3"
+    "@webassemblyjs/wasm-gen" "1.4.3"
+    "@webassemblyjs/wasm-parser" "1.4.3"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-gen@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.2.tgz#0899297f9426073736df799287845a73c597cf90"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
-    "@webassemblyjs/leb128" "1.4.2"
-
-"@webassemblyjs/wasm-opt@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.2.tgz#c44ad48e109aec197e3bf69875c54537d76ba2e9"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/helper-buffer" "1.4.2"
-    "@webassemblyjs/wasm-gen" "1.4.2"
-    "@webassemblyjs/wasm-parser" "1.4.2"
-
-"@webassemblyjs/wasm-parser@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.2.tgz#3bf7e10cfe336db0ecdea0a5d7ed8a63b7a7754a"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
-    "@webassemblyjs/leb128" "1.4.2"
-    "@webassemblyjs/wasm-parser" "1.4.2"
-    webassemblyjs "1.4.2"
-
-"@webassemblyjs/wast-parser@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.2.tgz#6499c38cf8895a81394f7e40d4681a85aaa84498"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/floating-point-hex-parser" "1.4.2"
-    "@webassemblyjs/helper-code-frame" "1.4.2"
-    "@webassemblyjs/helper-fsm" "1.4.2"
+"@webassemblyjs/wasm-parser@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.3.tgz#7ddd3e408f8542647ed612019cfb780830993698"
+  dependencies:
+    "@webassemblyjs/ast" "1.4.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.4.3"
+    "@webassemblyjs/leb128" "1.4.3"
+    "@webassemblyjs/wasm-parser" "1.4.3"
+    webassemblyjs "1.4.3"
+
+"@webassemblyjs/wast-parser@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz#3250402e2c5ed53dbe2233c9de1fe1f9f0d51745"
+  dependencies:
+    "@webassemblyjs/ast" "1.4.3"
+    "@webassemblyjs/floating-point-hex-parser" "1.4.3"
+    "@webassemblyjs/helper-code-frame" "1.4.3"
+    "@webassemblyjs/helper-fsm" "1.4.3"
     long "^3.2.0"
-    webassemblyjs "1.4.2"
+    webassemblyjs "1.4.3"
 
-"@webassemblyjs/wast-printer@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.4.2.tgz#ee70a828f0d9730b55b9a5c3ed694094ba68ba57"
+"@webassemblyjs/wast-printer@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.4.3.tgz#3d59aa8d0252d6814a3ef4e6d2a34c9ded3904e0"
   dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/wast-parser" "1.4.2"
+    "@webassemblyjs/ast" "1.4.3"
+    "@webassemblyjs/wast-parser" "1.4.3"
     long "^3.2.0"
 
 abab@^1.0.4:
@@ -6270,14 +6274,14 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-webassemblyjs@1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.4.2.tgz#3b07b506917c97153d83441d8a88ffa2d25cc07d"
+webassemblyjs@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.4.3.tgz#0591893efb8fbde74498251cbe4b2d83df9239cb"
   dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/validation" "1.4.2"
-    "@webassemblyjs/wasm-parser" "1.4.2"
-    "@webassemblyjs/wast-parser" "1.4.2"
+    "@webassemblyjs/ast" "1.4.3"
+    "@webassemblyjs/validation" "1.4.3"
+    "@webassemblyjs/wasm-parser" "1.4.3"
+    "@webassemblyjs/wast-parser" "1.4.3"
     long "^3.2.0"
 
 webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:

From 9a72294918064d6b976538adf808808de948585f Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Sat, 12 May 2018 22:56:19 +0200
Subject: [PATCH 038/111] 4.8.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0d3f11b3a2d..f67472e72d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.8.2",
+  "version": "4.8.3",
   "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",

From 9a1eca5e202d816ba031f37c9bfb4d34a29308a8 Mon Sep 17 00:00:00 2001
From: Mihail Bodrov <connormiha1@gmail.com>
Date: Sun, 13 May 2018 01:15:39 +0300
Subject: [PATCH 039/111] Optimize RemoveEmptyChunksPlugin

---
 lib/optimize/RemoveEmptyChunksPlugin.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/optimize/RemoveEmptyChunksPlugin.js b/lib/optimize/RemoveEmptyChunksPlugin.js
index 458e5c318fb..25895b65019 100644
--- a/lib/optimize/RemoveEmptyChunksPlugin.js
+++ b/lib/optimize/RemoveEmptyChunksPlugin.js
@@ -8,15 +8,16 @@ class RemoveEmptyChunksPlugin {
 	apply(compiler) {
 		compiler.hooks.compilation.tap("RemoveEmptyChunksPlugin", compilation => {
 			const handler = chunks => {
-				chunks
-					.filter(
-						chunk =>
-							chunk.isEmpty() && !chunk.hasRuntime() && !chunk.hasEntryModule()
-					)
-					.forEach(chunk => {
-						chunk.remove("empty");
-						chunks.splice(chunks.indexOf(chunk), 1);
-					});
+				for (let i = chunks.length - 1; i >= 0; i--) {
+					const chunk = chunks[i];
+					if (
+						chunk.isEmpty() &&
+						!chunk.hasRuntime() &&
+						!chunk.hasEntryModule()
+					) {
+						chunks.splice(i, 1);
+					}
+				}
 			};
 			compilation.hooks.optimizeChunksBasic.tap(
 				"RemoveEmptyChunksPlugin",

From 8d1d569541bc680a2f1857d9a927ba588163c0a7 Mon Sep 17 00:00:00 2001
From: Mihail Bodrov <connormiha1@gmail.com>
Date: Sun, 13 May 2018 02:04:06 +0300
Subject: [PATCH 040/111] Fix remove empty

---
 lib/optimize/RemoveEmptyChunksPlugin.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/optimize/RemoveEmptyChunksPlugin.js b/lib/optimize/RemoveEmptyChunksPlugin.js
index 25895b65019..42ba24a1574 100644
--- a/lib/optimize/RemoveEmptyChunksPlugin.js
+++ b/lib/optimize/RemoveEmptyChunksPlugin.js
@@ -15,6 +15,7 @@ class RemoveEmptyChunksPlugin {
 						!chunk.hasRuntime() &&
 						!chunk.hasEntryModule()
 					) {
+						chunk.remove("empty");
 						chunks.splice(i, 1);
 					}
 				}

From 736ac2645d83a31c5400c3640089af5a142cdcb2 Mon Sep 17 00:00:00 2001
From: BeniCheni <benjaminlchen@gmail.com>
Date: Sat, 12 May 2018 21:09:04 -0700
Subject: [PATCH 041/111] Update support readme for webpack1 wiki

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 9a8c423f813..baf8be38536 100644
--- a/README.md
+++ b/README.md
@@ -287,6 +287,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 webpack1 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

From b77283e8851869424189bda4371509b7149252e6 Mon Sep 17 00:00:00 2001
From: BeniCheni <benjaminlchen@gmail.com>
Date: Sat, 12 May 2018 21:11:11 -0700
Subject: [PATCH 042/111] Update keyword "webpack1" to "webpack 1" support
 readme for webpack1 wiki

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index baf8be38536..ef71f20eb7a 100644
--- a/README.md
+++ b/README.md
@@ -287,7 +287,7 @@ 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 webpack1 docs? Please check out the old [wiki](https://github.com/webpack/docs/wiki/contents), but note that this deprecated version is no longer supported.
+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!
 

From 307591fa49006b6582dbebadca362331a68d1cec Mon Sep 17 00:00:00 2001
From: byzyk <bohdan.kh@gmail.com>
Date: Sun, 13 May 2018 17:09:53 +0400
Subject: [PATCH 043/111] remove `pretty` script from package.json

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 7101f65858e..0feb3471cbc 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,6 @@
     "code-lint": "eslint 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 --write \"**/*.{js,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",

From 5230740f6ffe9ed03dd59e0826cecb170bb9089b Mon Sep 17 00:00:00 2001
From: evilebottnawi <alexander.krasnoyarov@itgalaxy.company>
Date: Wed, 9 May 2018 15:00:15 +0300
Subject: [PATCH 044/111] feat(cli): support `webpack-command`

---
 bin/webpack.js    | 115 ++++++++++++++++++++++++++++++++--------------
 declarations.d.ts |   1 +
 2 files changed, 81 insertions(+), 35 deletions(-)

diff --git a/bin/webpack.js b/bin/webpack.js
index 9d83f9bef43..4c6f3a5bdb6 100755
--- a/bin/webpack.js
+++ b/bin/webpack.js
@@ -21,61 +21,106 @@ function runCommand(command, options) {
 	});
 }
 
-let webpackCliInstalled = false;
-try {
-	require.resolve("webpack-cli");
-	webpackCliInstalled = true;
-} catch (err) {
-	webpackCliInstalled = false;
+function isInstalled(packageName) {
+	try {
+		require.resolve(packageName);
+
+		return true;
+	} catch (err) {
+		return false;
+	}
 }
 
-if (!webpackCliInstalled) {
+const CLI = [
+	{
+		name: "webpack-cli",
+		installed: isInstalled("webpack-cli"),
+		URL: "https://github.com/webpack/webpack-cli",
+		description: "The original webpack full-featured CLI from webpack@3."
+	},
+	{
+		name: "webpack-command",
+		installed: isInstalled("webpack-command"),
+		URL: "https://github.com/webpack-contrib/webpack-command",
+		description: "A lightweight, opinionated webpack CLI."
+	}
+];
+
+if (CLI.every(item => !item.installed)) {
 	const path = require("path");
 	const fs = require("fs");
 	const readLine = require("readline");
+
+	let notify =
+		"The CLI for webpack must be installed as a separate package, for which there are choices:\n";
+
+	CLI.forEach(item => {
+		notify += `    ${item.name} (${item.URL}): ${item.description}\n`;
+	});
+
+	console.error(notify);
+
 	const isYarn = fs.existsSync(path.resolve(process.cwd(), "yarn.lock"));
 
 	const packageManager = isYarn ? "yarn" : "npm";
-	const options = ["install", "-D", "webpack-cli"];
+	const installOptions = ["install", "-D"];
 
 	if (isYarn) {
-		options[0] = "add";
+		installOptions[0] = "add";
 	}
 
-	const commandToBeRun = `${packageManager} ${options.join(" ")}`;
+	let question = `Would you like to install (${CLI.map(item => item.name).join(
+		"/"
+	)}):\n`;
 
-	const question = `Would you like to install webpack-cli? (That will run ${commandToBeRun}) (yes/NO)`;
-
-	console.error("The CLI moved into a separate package: webpack-cli");
 	const questionInterface = readLine.createInterface({
 		input: process.stdin,
 		output: process.stdout
 	});
 	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 = CLI.find(item => item.name === normalizedAnswer);
+
+		if (!selectedPackage) {
+			console.error(
+				"It needs to be installed alongside webpack to use the CLI"
+			);
+			process.exitCode = 1;
+
+			return;
 		}
+
+		installOptions.push(normalizedAnswer);
+
+		console.log(
+			`Installing '${normalizedAnswer}' (running '${packageManager} ${installOptions.join(
+				" "
+			)}')...`
+		);
+
+		runCommand(packageManager, installOptions)
+			.then(result => {
+				return require(normalizedAnswer); //eslint-disable-line
+			})
+			.catch(error => {
+				console.error(error);
+				process.exitCode = 1;
+			});
 	});
 } else {
-	require("webpack-cli"); // eslint-disable-line
+	const installedPackage = CLI.map(
+		item => (item.installed ? item.name : "")
+	).filter(v => v);
+
+	if (installedPackage.length > 1) {
+		console.warn(
+			`You have installed ${installedPackage.join(
+				" and "
+			)} together. To work with the webpack you need only one CLI package, please remove one of them`
+		);
+	}
+
+	require(installedPackage[0]); // eslint-disable-line
 }
diff --git a/declarations.d.ts b/declarations.d.ts
index fe84d642bd8..5d161e7c5d2 100644
--- a/declarations.d.ts
+++ b/declarations.d.ts
@@ -1,5 +1,6 @@
 declare module "*.json";
 declare module "webpack-cli";
+declare module "webpack-command";
 
 // Deprecated NodeJS API usages in Webpack
 declare namespace NodeJS {

From 17fd4d8b48902eb1b2bf0015f1e235abd38fef09 Mon Sep 17 00:00:00 2001
From: Oded Niv <oded.niv@gmail.com>
Date: Tue, 15 May 2018 09:16:39 +0300
Subject: [PATCH 045/111] Align 'Cannot find module' message with native NodeJS

---
 .../code-splitted-require.context-amd/README.md  |  2 +-
 examples/code-splitted-require.context/README.md |  2 +-
 examples/code-splitting-harmony/README.md        |  2 +-
 .../README.md                                    |  2 +-
 .../README.md                                    |  2 +-
 .../code-splitting-specify-chunk-name/README.md  |  2 +-
 examples/hybrid-routing/README.md                |  2 +-
 examples/mixed/README.md                         |  2 +-
 examples/require.context/README.md               |  2 +-
 examples/web-worker/README.md                    |  2 +-
 lib/ContextModule.js                             | 16 ++++++++--------
 lib/RuntimeTemplate.js                           |  2 +-
 lib/dependencies/WebpackMissingModule.js         |  4 ++--
 test/ExternalModule.unittest.js                  |  6 +++---
 test/WebpackMissingModule.unittest.js            |  6 +++---
 test/cases/parsing/issue-2641/index.js           |  4 ++--
 test/cases/parsing/issue-758/index.js            |  4 ++--
 .../context-exclusion/simple/index.js            |  6 +++---
 .../errors/multi-entry-missing-module/index.js   |  4 ++--
 19 files changed, 36 insertions(+), 36 deletions(-)

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/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/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/ContextModule.js b/lib/ContextModule.js
index fd186bc90f6..85ff4794354 100644
--- a/lib/ContextModule.js
+++ b/lib/ContextModule.js
@@ -330,7 +330,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;
 	}
@@ -365,7 +365,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;
 	}
@@ -404,7 +404,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;
 		}
@@ -441,7 +441,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;
 		}
@@ -481,7 +481,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;
 		}
@@ -540,7 +540,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;
 		});
@@ -559,7 +559,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;
 }
@@ -574,7 +574,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/RuntimeTemplate.js b/lib/RuntimeTemplate.js
index e3146ad5941..3cb912a20ee 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; }`;
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/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/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/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-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/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/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'");
 });

From 9791c0b5c85b0b08160e6163cf87daa4470efc4a Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Tue, 15 May 2018 08:32:08 +0200
Subject: [PATCH 046/111] fix spacing

---
 lib/web/JsonpMainTemplatePlugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js
index 906dca4c0ff..ad069d5313b 100644
--- a/lib/web/JsonpMainTemplatePlugin.js
+++ b/lib/web/JsonpMainTemplatePlugin.js
@@ -196,7 +196,7 @@ class JsonpMainTemplatePlugin {
 						"}"
 					]),
 					"};",
-          "script.onerror = script.onload = onScriptComplete;"
+					"script.onerror = script.onload = onScriptComplete;"
 				]);
 			}
 		);

From 7cc9605ea3ffb4310ae58524550b0f387ab0fc98 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Tue, 15 May 2018 10:11:57 +0200
Subject: [PATCH 047/111] Improve pull request template and add automatic issue
 to docs

---
 .github/PULL_REQUEST_TEMPLATE.md | 19 ++++++-------
 open-bot.yaml                    | 47 ++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7af602ab91a..998368de95e 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 need to be documented once your changes are merged?**
+
+<!-- List all the information that need 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/open-bot.yaml b/open-bot.yaml
index 46f693cba16..5721f82dbd6 100644
--- a/open-bot.yaml
+++ b/open-bot.yaml
@@ -517,6 +517,53 @@ 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.
+
 
 
 

From a8a42b442d22cc0876a287e212c8f30b2172f07a Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Tue, 15 May 2018 11:01:13 +0200
Subject: [PATCH 048/111] typos

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 998368de95e..8967c8f0169 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -17,7 +17,7 @@
 
 <!-- If this PR introduces a breaking change, please describe the impact and a migration path for existing applications. -->
 
-**What need to be documented once your changes are merged?**
+**What needs to be documented once your changes are merged?**
 
-<!-- List all the information that need to be added to the documentation after merge -->
+<!-- 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 -->

From 9c0036ba50c7fdf35136aef45440ff48cf575513 Mon Sep 17 00:00:00 2001
From: Jaehwan Moon <mkch115@gmail.com>
Date: Tue, 15 May 2018 07:19:53 -0400
Subject: [PATCH 049/111] Add a test

---
 test/ProgressPlugin.test.js | 40 +++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 test/ProgressPlugin.test.js

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();
+			}
+		});
+	});
+});

From d6efad856b325d6574e84833c03268c320f94b6d Mon Sep 17 00:00:00 2001
From: Philipp Klein <philipptheklein@gmail.com>
Date: Tue, 15 May 2018 16:12:54 +0200
Subject: [PATCH 050/111] Allow serve property in webpack configuration

The server property is used to configure webpack-serve
(https://github.com/webpack-contrib/webpack-serve).
Also adapt tests.

Fixes #7306
---
 schemas/WebpackOptions.json | 4 ++++
 test/Validation.test.js     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
index 6576e1494e6..f8d94d68320 100644
--- a/schemas/WebpackOptions.json
+++ b/schemas/WebpackOptions.json
@@ -1679,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/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.",

From 92bcb81ede6adc184699302e17c5f6d10bcf623f Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Tue, 15 May 2018 16:56:15 +0200
Subject: [PATCH 051/111] wording, optimizations, types, cleanup

---
 bin/webpack.js | 130 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 85 insertions(+), 45 deletions(-)

diff --git a/bin/webpack.js b/bin/webpack.js
index 4c6f3a5bdb6..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,15 +21,19 @@ function runCommand(command, options) {
 
 		executedCommand.on("exit", code => {
 			if (code === 0) {
-				resolve(true);
+				resolve();
 			} else {
 				reject();
 			}
 		});
 	});
-}
+};
 
-function isInstalled(packageName) {
+/**
+ * @param {string} packageName name of the package
+ * @returns {boolean} is the package installed?
+ */
+const isInstalled = packageName => {
 	try {
 		require.resolve(packageName);
 
@@ -29,98 +41,126 @@ function isInstalled(packageName) {
 	} catch (err) {
 		return false;
 	}
-}
-
-const CLI = [
+};
+
+/**
+ * @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 from webpack@3."
+		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",
+		url: "https://github.com/webpack-contrib/webpack-command",
 		description: "A lightweight, opinionated webpack CLI."
 	}
 ];
 
-if (CLI.every(item => !item.installed)) {
+const installedClis = CLIs.filter(cli => cli.installed);
+
+if (installedClis.length === 0) {
 	const path = require("path");
 	const fs = require("fs");
 	const readLine = require("readline");
 
 	let notify =
-		"The CLI for webpack must be installed as a separate package, for which there are choices:\n";
+		"One CLI for webpack must be installed. These are recommended choices, delivered as separate packages:";
 
-	CLI.forEach(item => {
-		notify += `    ${item.name} (${item.URL}): ${item.description}\n`;
-	});
+	for (const item of CLIs) {
+		notify += `\n - ${item.name} (${item.url})\n   ${item.description}`;
+	}
 
 	console.error(notify);
 
 	const isYarn = fs.existsSync(path.resolve(process.cwd(), "yarn.lock"));
 
 	const packageManager = isYarn ? "yarn" : "npm";
-	const installOptions = ["install", "-D"];
+	const installOptions = [isYarn ? "add" : "install", "-D"];
 
-	if (isYarn) {
-		installOptions[0] = "add";
-	}
+	console.error(
+		`We will use "${packageManager}" to install the CLI via "${packageManager} ${installOptions.join(
+			" "
+		)}".`
+	);
 
-	let question = `Would you like to install (${CLI.map(item => item.name).join(
-		"/"
-	)}):\n`;
+	let question = `Which one do you like to install (${CLIs.map(
+		item => item.name
+	).join("/")}):\n`;
 
 	const questionInterface = readLine.createInterface({
 		input: process.stdin,
-		output: process.stdout
+		output: process.stderr
 	});
 	questionInterface.question(question, answer => {
 		questionInterface.close();
 
 		const normalizedAnswer = answer.toLowerCase();
-		const selectedPackage = CLI.find(item => item.name === normalizedAnswer);
+		const selectedPackage = CLIs.find(item => {
+			return item.name === normalizedAnswer || item.alias === normalizedAnswer;
+		});
 
-		if (!selectedPackage) {
+		if (!normalizedAnswer) {
 			console.error(
-				"It needs to be installed alongside webpack to use the CLI"
+				"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;
 		}
 
-		installOptions.push(normalizedAnswer);
+		const packageName = selectedPackage.package;
 
 		console.log(
-			`Installing '${normalizedAnswer}' (running '${packageManager} ${installOptions.join(
+			`Installing '${
+				selectedPackage.name
+			}' (running '${packageManager} ${installOptions.join(
 				" "
-			)}')...`
+			)} ${packageName}')...`
 		);
 
-		runCommand(packageManager, installOptions)
-			.then(result => {
-				return require(normalizedAnswer); //eslint-disable-line
+		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 {
-	const installedPackage = CLI.map(
-		item => (item.installed ? item.name : "")
-	).filter(v => v);
-
-	if (installedPackage.length > 1) {
-		console.warn(
-			`You have installed ${installedPackage.join(
+	console.warn(
+		`You have installed ${installedClis
+			.map(item => item.name)
+			.join(
 				" and "
-			)} together. To work with the webpack you need only one CLI package, please remove one of them`
-		);
-	}
-
-	require(installedPackage[0]); // eslint-disable-line
+			)} 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.`
+	);
 }

From 4c12b796d7fdcdf21d8b611ebad1a1d4c8f28557 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Tue, 15 May 2018 17:07:14 +0200
Subject: [PATCH 052/111] remove unused declarations

---
 declarations.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/declarations.d.ts b/declarations.d.ts
index 5d161e7c5d2..06d06158cec 100644
--- a/declarations.d.ts
+++ b/declarations.d.ts
@@ -1,6 +1,4 @@
 declare module "*.json";
-declare module "webpack-cli";
-declare module "webpack-command";
 
 // Deprecated NodeJS API usages in Webpack
 declare namespace NodeJS {

From 0d89a4540378808391cbb9f530e5b5656c3ed302 Mon Sep 17 00:00:00 2001
From: Florent Cailhol <florent.cailhol@gmail.com>
Date: Wed, 16 May 2018 13:03:38 +0200
Subject: [PATCH 053/111] Add a test to check typeof transformation

---
 test/cases/parsing/issue-7318/index.js  | 5 +++++
 test/cases/parsing/issue-7318/typeof.js | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 test/cases/parsing/issue-7318/index.js
 create mode 100644 test/cases/parsing/issue-7318/typeof.js

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"

From 426e6259e1788db27a614a4a6a59a52ee9505619 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Wed, 16 May 2018 13:22:29 +0200
Subject: [PATCH 054/111] chore: bump to v1.5.0

---
 package.json |   6 +-
 yarn.lock    | 201 +++++++++++++++++++++++++++------------------------
 2 files changed, 109 insertions(+), 98 deletions(-)

diff --git a/package.json b/package.json
index 7c1ea3969f1..2df8bf2770b 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
   "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.4.2",
-    "@webassemblyjs/wasm-edit": "1.4.2",
-    "@webassemblyjs/wasm-parser": "1.4.2",
+    "@webassemblyjs/ast": "1.5.0",
+    "@webassemblyjs/wasm-edit": "1.5.0",
+    "@webassemblyjs/wasm-parser": "1.5.0",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 16d0b6b7603..18ae8cce81a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,116 +28,121 @@
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
 
-"@webassemblyjs/ast@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.2.tgz#ab715aa1fec9dd23c025204dba39690c119418ea"
+"@webassemblyjs/ast@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.0.tgz#ee70576d035377392c1d74dba3810a0e82f035bc"
   dependencies:
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
-    "@webassemblyjs/wast-parser" "1.4.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.0"
+    "@webassemblyjs/wast-parser" "1.5.0"
     debug "^3.1.0"
-    webassemblyjs "1.4.2"
+    webassemblyjs "1.5.0"
 
-"@webassemblyjs/floating-point-hex-parser@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.2.tgz#9296fb64caa37bf98c8064aa329680e3e2bfacc7"
+"@webassemblyjs/floating-point-hex-parser@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.0.tgz#37fd9785ef9f7b655522235308a23e3770a695a9"
 
-"@webassemblyjs/helper-buffer@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.2.tgz#3cacecd5a6bfcb67932ed8219f81f92d8b2dafbb"
+"@webassemblyjs/helper-buffer@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.0.tgz#87e2192f7b80330cf422684680bc959f0b802fe2"
+  dependencies:
+    debug "^3.1.0"
 
-"@webassemblyjs/helper-code-frame@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.2.tgz#20526637c3849f12b08f8661248477eef9642329"
+"@webassemblyjs/helper-code-frame@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.0.tgz#335bfe462ec6c34a3c6f5b18fb79e729529c131f"
   dependencies:
-    "@webassemblyjs/wast-printer" "1.4.2"
+    "@webassemblyjs/wast-printer" "1.5.0"
 
-"@webassemblyjs/helper-fsm@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.2.tgz#e41050282994b5be077b95b65b66ecd5a92c5e88"
+"@webassemblyjs/helper-fsm@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.0.tgz#eb7fd42a8aa3a52bbe4775edd4fbb3acfe5f6b8c"
 
-"@webassemblyjs/helper-wasm-bytecode@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.2.tgz#b48c289c7921056aa12d71e78a17070ffe90c49c"
+"@webassemblyjs/helper-wasm-bytecode@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.0.tgz#2c91bff8628152945604e54d06eaa80ffde0afbd"
 
-"@webassemblyjs/helper-wasm-section@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.2.tgz#520e02c0cc3e5e9b5f44f58abc04ba5eda6e5476"
+"@webassemblyjs/helper-wasm-section@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.0.tgz#d777f1b29394de1d8d1b01f354724c8e6bcc5cce"
   dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/helper-buffer" "1.4.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
-    "@webassemblyjs/wasm-gen" "1.4.2"
+    "@webassemblyjs/ast" "1.5.0"
+    "@webassemblyjs/helper-buffer" "1.5.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.0"
+    "@webassemblyjs/wasm-gen" "1.5.0"
+    debug "^3.1.0"
 
-"@webassemblyjs/leb128@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.4.2.tgz#d13f368abdcefc54428f55a265a993de610f8893"
+"@webassemblyjs/leb128@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.0.tgz#1c5f0ae55e8961b1d366f1182969a7b005bc25cb"
   dependencies:
     leb "^0.3.0"
 
-"@webassemblyjs/validation@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.4.2.tgz#55cf5b219e25900c85773fc35beb9d12ae0ede53"
+"@webassemblyjs/validation@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.5.0.tgz#40decf501635e6e838eb8caa7dde864db8651ee8"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.0"
+    debug "3.0.1"
+
+"@webassemblyjs/wasm-edit@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.0.tgz#3876d692afa4810dc05566e860a2f6c081865a9a"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.0"
+    "@webassemblyjs/helper-buffer" "1.5.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.0"
+    "@webassemblyjs/helper-wasm-section" "1.5.0"
+    "@webassemblyjs/wasm-gen" "1.5.0"
+    "@webassemblyjs/wasm-opt" "1.5.0"
+    "@webassemblyjs/wasm-parser" "1.5.0"
+    "@webassemblyjs/wast-printer" "1.5.0"
+    debug "^3.1.0"
+
+"@webassemblyjs/wasm-gen@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.0.tgz#8d8ce57c8dcf395e1538d9343c1f64b37ceb4e37"
   dependencies:
-    "@webassemblyjs/ast" "1.4.2"
+    "@webassemblyjs/ast" "1.5.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.0"
+    "@webassemblyjs/leb128" "1.5.0"
 
-"@webassemblyjs/wasm-edit@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.2.tgz#bde9a581065f63f257ed511d7d9cf04f8cd04524"
+"@webassemblyjs/wasm-opt@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.0.tgz#3aee98a45e5db4e10e712a48fcdf02d07f36f518"
   dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/helper-buffer" "1.4.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
-    "@webassemblyjs/helper-wasm-section" "1.4.2"
-    "@webassemblyjs/wasm-gen" "1.4.2"
-    "@webassemblyjs/wasm-opt" "1.4.2"
-    "@webassemblyjs/wasm-parser" "1.4.2"
-    "@webassemblyjs/wast-printer" "1.4.2"
+    "@webassemblyjs/ast" "1.5.0"
+    "@webassemblyjs/helper-buffer" "1.5.0"
+    "@webassemblyjs/wasm-gen" "1.5.0"
+    "@webassemblyjs/wasm-parser" "1.5.0"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-gen@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.2.tgz#0899297f9426073736df799287845a73c597cf90"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
-    "@webassemblyjs/leb128" "1.4.2"
-
-"@webassemblyjs/wasm-opt@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.2.tgz#c44ad48e109aec197e3bf69875c54537d76ba2e9"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/helper-buffer" "1.4.2"
-    "@webassemblyjs/wasm-gen" "1.4.2"
-    "@webassemblyjs/wasm-parser" "1.4.2"
-
-"@webassemblyjs/wasm-parser@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.2.tgz#3bf7e10cfe336db0ecdea0a5d7ed8a63b7a7754a"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.4.2"
-    "@webassemblyjs/leb128" "1.4.2"
-    "@webassemblyjs/wasm-parser" "1.4.2"
-    webassemblyjs "1.4.2"
-
-"@webassemblyjs/wast-parser@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.2.tgz#6499c38cf8895a81394f7e40d4681a85aaa84498"
-  dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/floating-point-hex-parser" "1.4.2"
-    "@webassemblyjs/helper-code-frame" "1.4.2"
-    "@webassemblyjs/helper-fsm" "1.4.2"
+"@webassemblyjs/wasm-parser@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.0.tgz#d32b277ab8687de84d2a65f6866266796b9cdd27"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.0"
+    "@webassemblyjs/leb128" "1.5.0"
+    "@webassemblyjs/wasm-parser" "1.5.0"
+    webassemblyjs "1.5.0"
+
+"@webassemblyjs/wast-parser@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.0.tgz#7ef24ba1a872d72306f5ad2063236674c7dd7863"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.0"
+    "@webassemblyjs/floating-point-hex-parser" "1.5.0"
+    "@webassemblyjs/helper-code-frame" "1.5.0"
+    "@webassemblyjs/helper-fsm" "1.5.0"
     long "^3.2.0"
-    webassemblyjs "1.4.2"
+    webassemblyjs "1.5.0"
 
-"@webassemblyjs/wast-printer@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.4.2.tgz#ee70a828f0d9730b55b9a5c3ed694094ba68ba57"
+"@webassemblyjs/wast-printer@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.0.tgz#a2204d71a187936df86ce8f6fbd7157fb229eccf"
   dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/wast-parser" "1.4.2"
+    "@webassemblyjs/ast" "1.5.0"
+    "@webassemblyjs/wast-parser" "1.5.0"
     long "^3.2.0"
 
 abab@^1.0.4:
@@ -1481,6 +1486,12 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
+debug@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64"
+  dependencies:
+    ms "2.0.0"
+
 debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -6270,14 +6281,14 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-webassemblyjs@1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.4.2.tgz#3b07b506917c97153d83441d8a88ffa2d25cc07d"
+webassemblyjs@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.5.0.tgz#aad753e53e222e51d33a21782c6697cd353ed280"
   dependencies:
-    "@webassemblyjs/ast" "1.4.2"
-    "@webassemblyjs/validation" "1.4.2"
-    "@webassemblyjs/wasm-parser" "1.4.2"
-    "@webassemblyjs/wast-parser" "1.4.2"
+    "@webassemblyjs/ast" "1.5.0"
+    "@webassemblyjs/validation" "1.5.0"
+    "@webassemblyjs/wasm-parser" "1.5.0"
+    "@webassemblyjs/wast-parser" "1.5.0"
     long "^3.2.0"
 
 webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:

From d7d82b25d554d4881ce664d3f453b83ff091e160 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Wed, 16 May 2018 13:22:46 +0200
Subject: [PATCH 055/111] refactor : use AST utils

---
 declarations.d.ts                | 13 +++++++++----
 lib/wasm/WebAssemblyGenerator.js | 22 +++++++++-------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/declarations.d.ts b/declarations.d.ts
index 85bb4fc5f6f..15ae0098193 100644
--- a/declarations.d.ts
+++ b/declarations.d.ts
@@ -62,6 +62,7 @@ declare module "@webassemblyjs/ast" {
 	export class ModuleExport extends Node {
 		name: string;
 	}
+	export class ModuleExportDescr extends Node {}
 	export class IndexLiteral extends Node {}
 	export class NumberLiteral extends Node {}
 	export class Global extends Node {}
@@ -78,7 +79,7 @@ declare module "@webassemblyjs/ast" {
 		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;
@@ -92,13 +93,17 @@ declare module "@webassemblyjs/ast" {
 		type: string,
 		init: Node[]
 	): ObjectInstruction;
-	export function func(initFuncId, funcParams, funcResults, funcBody): Func;
-	export function typeInstructionFunc(params: FuncParam[], results: string[]): 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/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index 2b2e8bf31db..ba9a232bcf1 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -202,8 +202,6 @@ const rewriteExportNames = ({ ast, module }) => bin => {
 			const usedName = module.isUsed(path.node.name);
 			if (usedName) {
 				path.node.name = usedName;
-				// TODO remove this when fixed in @webassemblyjs
-				path.node.descr.id = t.numberLiteral(+path.node.descr.id.raw);
 			} else {
 				path.remove();
 			}
@@ -229,10 +227,6 @@ const rewriteImports = ({ ast, usedDependencyMap }) => bin => {
 			} else {
 				path.node.module = WebAssemblyUtils.MANGLED_MODULE;
 				path.node.name = result.name;
-				if (path.node.descr.id)
-					path.node.descr.id = t.numberLiteral(+path.node.descr.id.raw);
-				if (path.node.descr.name)
-					path.node.descr.name = t.numberLiteral(+path.node.descr.name.raw);
 			}
 		}
 	});
@@ -284,19 +278,20 @@ 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.results
-	);
+	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 addWithAST(ast, bin, [func, moduleExport, funcindex, functype]);
 };
@@ -330,7 +325,8 @@ class WebAssemblyGenerator extends Generator {
 
 		const ast = decode(bin, {
 			ignoreDataSection: true,
-			ignoreCodeSection: true
+			ignoreCodeSection: true,
+			ignoreCustomNameSection: true
 		});
 
 		const importedGlobals = getImportedGlobals(ast);

From 78cecc709e672dc40a9cf65fe3a834e3f3ac3c08 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Wed, 16 May 2018 13:27:57 +0200
Subject: [PATCH 056/111] chore: bump webassemblyjs to v1.5.1

---
 package.json |   6 +-
 yarn.lock    | 178 +++++++++++++++++++++++++--------------------------
 2 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/package.json b/package.json
index 2df8bf2770b..225b31d4572 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
   "dependencies": {
-    "@webassemblyjs/ast": "1.5.0",
-    "@webassemblyjs/wasm-edit": "1.5.0",
-    "@webassemblyjs/wasm-parser": "1.5.0",
+    "@webassemblyjs/ast": "1.5.1",
+    "@webassemblyjs/wasm-edit": "1.5.1",
+    "@webassemblyjs/wasm-parser": "1.5.1",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 18ae8cce81a..d182b663a38 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,121 +28,121 @@
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
 
-"@webassemblyjs/ast@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.0.tgz#ee70576d035377392c1d74dba3810a0e82f035bc"
+"@webassemblyjs/ast@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.1.tgz#b77382eed0c334418508fb08b73f1eae198c6960"
   dependencies:
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.0"
-    "@webassemblyjs/wast-parser" "1.5.0"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.1"
+    "@webassemblyjs/wast-parser" "1.5.1"
     debug "^3.1.0"
-    webassemblyjs "1.5.0"
+    webassemblyjs "1.5.1"
 
-"@webassemblyjs/floating-point-hex-parser@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.0.tgz#37fd9785ef9f7b655522235308a23e3770a695a9"
+"@webassemblyjs/floating-point-hex-parser@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.1.tgz#0af82482faea3d86e37a020643475571197e8b3f"
 
-"@webassemblyjs/helper-buffer@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.0.tgz#87e2192f7b80330cf422684680bc959f0b802fe2"
+"@webassemblyjs/helper-buffer@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.1.tgz#659046a5af671cd7b1d67a021d8dccef043508e3"
   dependencies:
     debug "^3.1.0"
 
-"@webassemblyjs/helper-code-frame@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.0.tgz#335bfe462ec6c34a3c6f5b18fb79e729529c131f"
+"@webassemblyjs/helper-code-frame@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.1.tgz#9170e9e5c0af7ac8154a7a2d0cb85d6f7e318207"
   dependencies:
-    "@webassemblyjs/wast-printer" "1.5.0"
+    "@webassemblyjs/wast-printer" "1.5.1"
 
-"@webassemblyjs/helper-fsm@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.0.tgz#eb7fd42a8aa3a52bbe4775edd4fbb3acfe5f6b8c"
+"@webassemblyjs/helper-fsm@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.1.tgz#68f9e4a432b9e825f334db790dc037209c393a07"
 
-"@webassemblyjs/helper-wasm-bytecode@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.0.tgz#2c91bff8628152945604e54d06eaa80ffde0afbd"
+"@webassemblyjs/helper-wasm-bytecode@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.1.tgz#363459069ef44173dcd9d5392fa6074eab7b711d"
 
-"@webassemblyjs/helper-wasm-section@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.0.tgz#d777f1b29394de1d8d1b01f354724c8e6bcc5cce"
+"@webassemblyjs/helper-wasm-section@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.1.tgz#c45b3cc233c5067ef44cd35599b07aff279c531a"
   dependencies:
-    "@webassemblyjs/ast" "1.5.0"
-    "@webassemblyjs/helper-buffer" "1.5.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.0"
-    "@webassemblyjs/wasm-gen" "1.5.0"
+    "@webassemblyjs/ast" "1.5.1"
+    "@webassemblyjs/helper-buffer" "1.5.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.1"
+    "@webassemblyjs/wasm-gen" "1.5.1"
     debug "^3.1.0"
 
-"@webassemblyjs/leb128@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.0.tgz#1c5f0ae55e8961b1d366f1182969a7b005bc25cb"
+"@webassemblyjs/leb128@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.1.tgz#a0069a66560547cf1e4228845e760ac035449e0d"
   dependencies:
     leb "^0.3.0"
 
-"@webassemblyjs/validation@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.5.0.tgz#40decf501635e6e838eb8caa7dde864db8651ee8"
+"@webassemblyjs/validation@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.5.1.tgz#ce8e06f7be7392e0ddb7dab55b6c0f37f63dcaa6"
   dependencies:
-    "@webassemblyjs/ast" "1.5.0"
+    "@webassemblyjs/ast" "1.5.1"
     debug "3.0.1"
 
-"@webassemblyjs/wasm-edit@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.0.tgz#3876d692afa4810dc05566e860a2f6c081865a9a"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.0"
-    "@webassemblyjs/helper-buffer" "1.5.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.0"
-    "@webassemblyjs/helper-wasm-section" "1.5.0"
-    "@webassemblyjs/wasm-gen" "1.5.0"
-    "@webassemblyjs/wasm-opt" "1.5.0"
-    "@webassemblyjs/wasm-parser" "1.5.0"
-    "@webassemblyjs/wast-printer" "1.5.0"
+"@webassemblyjs/wasm-edit@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.1.tgz#4b3eb413031e63de2c4fddd69eda3f0a2a43c772"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.1"
+    "@webassemblyjs/helper-buffer" "1.5.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.1"
+    "@webassemblyjs/helper-wasm-section" "1.5.1"
+    "@webassemblyjs/wasm-gen" "1.5.1"
+    "@webassemblyjs/wasm-opt" "1.5.1"
+    "@webassemblyjs/wasm-parser" "1.5.1"
+    "@webassemblyjs/wast-printer" "1.5.1"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-gen@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.0.tgz#8d8ce57c8dcf395e1538d9343c1f64b37ceb4e37"
+"@webassemblyjs/wasm-gen@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.1.tgz#805c1b15ef43e3f311e96d4f8a648f03bfc3b5a2"
   dependencies:
-    "@webassemblyjs/ast" "1.5.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.0"
-    "@webassemblyjs/leb128" "1.5.0"
+    "@webassemblyjs/ast" "1.5.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.1"
+    "@webassemblyjs/leb128" "1.5.1"
 
-"@webassemblyjs/wasm-opt@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.0.tgz#3aee98a45e5db4e10e712a48fcdf02d07f36f518"
+"@webassemblyjs/wasm-opt@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.1.tgz#01f3e0f5ea89762e02a374a8d34a1b418b6066ee"
   dependencies:
-    "@webassemblyjs/ast" "1.5.0"
-    "@webassemblyjs/helper-buffer" "1.5.0"
-    "@webassemblyjs/wasm-gen" "1.5.0"
-    "@webassemblyjs/wasm-parser" "1.5.0"
+    "@webassemblyjs/ast" "1.5.1"
+    "@webassemblyjs/helper-buffer" "1.5.1"
+    "@webassemblyjs/wasm-gen" "1.5.1"
+    "@webassemblyjs/wasm-parser" "1.5.1"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-parser@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.0.tgz#d32b277ab8687de84d2a65f6866266796b9cdd27"
+"@webassemblyjs/wasm-parser@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.1.tgz#ee8c5562fa6a1213dd535c4b59dd2d7760bbf0f3"
   dependencies:
-    "@webassemblyjs/ast" "1.5.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.0"
-    "@webassemblyjs/leb128" "1.5.0"
-    "@webassemblyjs/wasm-parser" "1.5.0"
-    webassemblyjs "1.5.0"
+    "@webassemblyjs/ast" "1.5.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.1"
+    "@webassemblyjs/leb128" "1.5.1"
+    "@webassemblyjs/wasm-parser" "1.5.1"
+    webassemblyjs "1.5.1"
 
-"@webassemblyjs/wast-parser@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.0.tgz#7ef24ba1a872d72306f5ad2063236674c7dd7863"
+"@webassemblyjs/wast-parser@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.1.tgz#4da00bf7f4e2532c6ed674089a072ae604aeaaab"
   dependencies:
-    "@webassemblyjs/ast" "1.5.0"
-    "@webassemblyjs/floating-point-hex-parser" "1.5.0"
-    "@webassemblyjs/helper-code-frame" "1.5.0"
-    "@webassemblyjs/helper-fsm" "1.5.0"
+    "@webassemblyjs/ast" "1.5.1"
+    "@webassemblyjs/floating-point-hex-parser" "1.5.1"
+    "@webassemblyjs/helper-code-frame" "1.5.1"
+    "@webassemblyjs/helper-fsm" "1.5.1"
     long "^3.2.0"
-    webassemblyjs "1.5.0"
+    webassemblyjs "1.5.1"
 
-"@webassemblyjs/wast-printer@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.0.tgz#a2204d71a187936df86ce8f6fbd7157fb229eccf"
+"@webassemblyjs/wast-printer@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.1.tgz#91f52975decdd98051d28bf7fe89c1faa978d9a8"
   dependencies:
-    "@webassemblyjs/ast" "1.5.0"
-    "@webassemblyjs/wast-parser" "1.5.0"
+    "@webassemblyjs/ast" "1.5.1"
+    "@webassemblyjs/wast-parser" "1.5.1"
     long "^3.2.0"
 
 abab@^1.0.4:
@@ -6281,14 +6281,14 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-webassemblyjs@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.5.0.tgz#aad753e53e222e51d33a21782c6697cd353ed280"
+webassemblyjs@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.5.1.tgz#645caab374dd1803cfbfbaa7489bb4b72f2061ff"
   dependencies:
-    "@webassemblyjs/ast" "1.5.0"
-    "@webassemblyjs/validation" "1.5.0"
-    "@webassemblyjs/wasm-parser" "1.5.0"
-    "@webassemblyjs/wast-parser" "1.5.0"
+    "@webassemblyjs/ast" "1.5.1"
+    "@webassemblyjs/validation" "1.5.1"
+    "@webassemblyjs/wasm-parser" "1.5.1"
+    "@webassemblyjs/wast-parser" "1.5.1"
     long "^3.2.0"
 
 webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:

From cbbe6f8cd0feadd0f21f869cd923ad6c2ff7e18c Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 17 May 2018 10:08:24 +0200
Subject: [PATCH 057/111] add all examples from the WebAssembly explorer as
 tests

---
 .../wasm-explorer-examples-async/Q_rsqrt.wasm | Bin 0 -> 156 bytes
 .../wasm-explorer-examples-async/duff.wasm    | Bin 0 -> 531 bytes
 .../wasm-explorer-examples-async/fact.wasm    | Bin 0 -> 154 bytes
 .../fast-math.wasm                            | Bin 0 -> 290 bytes
 .../wasm-explorer-examples-async/index.js     |  55 ++++++++++++++++++
 .../node_modules/env.js                       |   1 +
 .../wasm-explorer-examples-async/popcnt.wasm  | Bin 0 -> 120 bytes
 .../test.filter.js                            |   5 ++
 .../testFunction.wasm                         | Bin 0 -> 154 bytes
 .../wasm-explorer-examples-sync/Q_rsqrt.wasm  | Bin 0 -> 156 bytes
 .../wasm-explorer-examples-sync/duff.wasm     | Bin 0 -> 531 bytes
 .../wasm-explorer-examples-sync/fact.wasm     | Bin 0 -> 154 bytes
 .../fast-math.wasm                            | Bin 0 -> 290 bytes
 .../wasm/wasm-explorer-examples-sync/index.js |  23 ++++++++
 .../node_modules/env.js                       |   1 +
 .../wasm-explorer-examples-sync/popcnt.wasm   | Bin 0 -> 120 bytes
 .../test.filter.js                            |   5 ++
 .../testFunction.wasm                         | Bin 0 -> 154 bytes
 .../wasm/wasm-explorer-examples-sync/tests.js |  50 ++++++++++++++++
 19 files changed, 140 insertions(+)
 create mode 100644 test/cases/wasm/wasm-explorer-examples-async/Q_rsqrt.wasm
 create mode 100644 test/cases/wasm/wasm-explorer-examples-async/duff.wasm
 create mode 100644 test/cases/wasm/wasm-explorer-examples-async/fact.wasm
 create mode 100644 test/cases/wasm/wasm-explorer-examples-async/fast-math.wasm
 create mode 100644 test/cases/wasm/wasm-explorer-examples-async/index.js
 create mode 100644 test/cases/wasm/wasm-explorer-examples-async/node_modules/env.js
 create mode 100644 test/cases/wasm/wasm-explorer-examples-async/popcnt.wasm
 create mode 100644 test/cases/wasm/wasm-explorer-examples-async/test.filter.js
 create mode 100644 test/cases/wasm/wasm-explorer-examples-async/testFunction.wasm
 create mode 100644 test/cases/wasm/wasm-explorer-examples-sync/Q_rsqrt.wasm
 create mode 100644 test/cases/wasm/wasm-explorer-examples-sync/duff.wasm
 create mode 100644 test/cases/wasm/wasm-explorer-examples-sync/fact.wasm
 create mode 100644 test/cases/wasm/wasm-explorer-examples-sync/fast-math.wasm
 create mode 100644 test/cases/wasm/wasm-explorer-examples-sync/index.js
 create mode 100644 test/cases/wasm/wasm-explorer-examples-sync/node_modules/env.js
 create mode 100644 test/cases/wasm/wasm-explorer-examples-sync/popcnt.wasm
 create mode 100644 test/cases/wasm/wasm-explorer-examples-sync/test.filter.js
 create mode 100644 test/cases/wasm/wasm-explorer-examples-sync/testFunction.wasm
 create mode 100644 test/cases/wasm/wasm-explorer-examples-sync/tests.js

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 0000000000000000000000000000000000000000..e5c17c16d9316f427e5fecc3c5ff9be22f980233
GIT binary patch
literal 156
zcmZQbEY4+QU|?WuYiMX-U`$}FWvpdx0<#%dTEKJx0|RR_M1+y85yW6%p8=wn*m6^I
z^NT8(7`Wr3%md?#iVKTM(ij-H4uMtg0h5fi&I}9(>=hV*6odT~B}T{loA3T)RbbfT
f$XJ@aPl;iQ0>hNaK&%8(0aB>I2;@zfJcSzo+ifc&

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..0b75ea455a873ad27a1abde856c02784cb186231
GIT binary patch
literal 531
zcmaKoyH3O~5Jm6Uj-6z(%P%<ebW~JKK}CZ^N3$T<CQ^8<ghZ9_koX2ZgNol{W*4Lt
zD9DnJ?K_^w#l@;80Q5GFBk0@@!vO!hz977=c?%RTn-_{tc0hVJxY#fIoBKzHW^uN^
zT3%nBT%Im^p#Ic&(8qdrLw1rn@ei$chrgF;cQSOlPU7(l+07F<ABvcWh1$?0mQoQ}
zlA>UViojARJWEhG7O&6`t_|$})cC2H!@Mr>oxZ9#Bhwym0AvVttzHdeX&RoEtyn!R
wTTA~Wx5mrq-!@*Fmd%7XEt^%vw(QMYe>C#~m4Zs!ld5Ms8=KX<N&~?B1-~vvegFUf

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..50ce8c098a4ce68742a7198ac3f24acc5044d88e
GIT binary patch
literal 154
zcmZQbEY4+QU|?WuYiMX-U`$}FXRKjv0<#%dTEKJx0|RR_M1+y85yW6%p9-Rw*m6^I
z^NT8(7&zjiOwtmQOEMW4xDJDr?gf)fbxaNl433N*ybKBqYn&Ks6d9cu6`7bF6qpnk
fo$70p80!>4EXGh?25tqWo&4M`K(_$F2YYS+izOn~

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..1733deb9ba7cbe6174e75dd6b0b7cb9a83dce216
GIT binary patch
literal 290
zcmZQbEY4+QU|?XJ+|ba#z?{HTQ^Q!3zz8CkYd~zK2_OkZ=G440j`%3!g8cH76b1(7
zHjpSQBLgEN6H5zNMF9f?YcrU|z{u7JVlc2@08wmgxv9DNMU_kp>_7w3^7B&|82RF(
zEOQeplTzbzGxLB3GV#PmStKXs<ivw4U|{Bok1|Wihj3Vca%O3X$tC$kDL|#HTrWYU
zvi5<kP+)KYx*iBP92Rr;K!p?-6&Ms4lcl-)QPn6o2rzKZgehWJq=13AdttIni-4vu
IEn2`002+)+LjV8(

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..f605a5a95f78d673d3586e2007b781a3511552db
GIT binary patch
literal 120
zcmZQbEY4+QU|?WuYiMX-U`$}FXRK##2C<nK7+6}sf&~l=tY9HV21d3<kPrj=ToA>~
ymYbTJUsTD&z>=Gona9Au86RbuoL`z(lEuKtH3Mu)2UxuVL#88R33n@u!wmpEmLEs}

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..3be47ce57b4698410ae6f5eed03da4d114cdb8c4
GIT binary patch
literal 154
zcmZQbEY4+QU|?WuZ)j*>U`$}DuV<`hZUS={SX#hz0RsbTGem@utr5gvU|#^DnAmbt
zbMuQTnHYrQqYRBoQj1I6O7oISGV}8SGBX(%xVD3JZ3L5y^^OdROiT_6jE;;RybR0^
i3Je-d3<^wHicAU&jx1S<3_zLsEG0%>25xQzCT;*J5hNJ^

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..e5c17c16d9316f427e5fecc3c5ff9be22f980233
GIT binary patch
literal 156
zcmZQbEY4+QU|?WuYiMX-U`$}FWvpdx0<#%dTEKJx0|RR_M1+y85yW6%p8=wn*m6^I
z^NT8(7`Wr3%md?#iVKTM(ij-H4uMtg0h5fi&I}9(>=hV*6odT~B}T{loA3T)RbbfT
f$XJ@aPl;iQ0>hNaK&%8(0aB>I2;@zfJcSzo+ifc&

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..0b75ea455a873ad27a1abde856c02784cb186231
GIT binary patch
literal 531
zcmaKoyH3O~5Jm6Uj-6z(%P%<ebW~JKK}CZ^N3$T<CQ^8<ghZ9_koX2ZgNol{W*4Lt
zD9DnJ?K_^w#l@;80Q5GFBk0@@!vO!hz977=c?%RTn-_{tc0hVJxY#fIoBKzHW^uN^
zT3%nBT%Im^p#Ic&(8qdrLw1rn@ei$chrgF;cQSOlPU7(l+07F<ABvcWh1$?0mQoQ}
zlA>UViojARJWEhG7O&6`t_|$})cC2H!@Mr>oxZ9#Bhwym0AvVttzHdeX&RoEtyn!R
wTTA~Wx5mrq-!@*Fmd%7XEt^%vw(QMYe>C#~m4Zs!ld5Ms8=KX<N&~?B1-~vvegFUf

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..50ce8c098a4ce68742a7198ac3f24acc5044d88e
GIT binary patch
literal 154
zcmZQbEY4+QU|?WuYiMX-U`$}FXRKjv0<#%dTEKJx0|RR_M1+y85yW6%p9-Rw*m6^I
z^NT8(7&zjiOwtmQOEMW4xDJDr?gf)fbxaNl433N*ybKBqYn&Ks6d9cu6`7bF6qpnk
fo$70p80!>4EXGh?25tqWo&4M`K(_$F2YYS+izOn~

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..1733deb9ba7cbe6174e75dd6b0b7cb9a83dce216
GIT binary patch
literal 290
zcmZQbEY4+QU|?XJ+|ba#z?{HTQ^Q!3zz8CkYd~zK2_OkZ=G440j`%3!g8cH76b1(7
zHjpSQBLgEN6H5zNMF9f?YcrU|z{u7JVlc2@08wmgxv9DNMU_kp>_7w3^7B&|82RF(
zEOQeplTzbzGxLB3GV#PmStKXs<ivw4U|{Bok1|Wihj3Vca%O3X$tC$kDL|#HTrWYU
zvi5<kP+)KYx*iBP92Rr;K!p?-6&Ms4lcl-)QPn6o2rzKZgehWJq=13AdttIni-4vu
IEn2`002+)+LjV8(

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..f605a5a95f78d673d3586e2007b781a3511552db
GIT binary patch
literal 120
zcmZQbEY4+QU|?WuYiMX-U`$}FXRK##2C<nK7+6}sf&~l=tY9HV21d3<kPrj=ToA>~
ymYbTJUsTD&z>=Gona9Au86RbuoL`z(lEuKtH3Mu)2UxuVL#88R33n@u!wmpEmLEs}

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..3be47ce57b4698410ae6f5eed03da4d114cdb8c4
GIT binary patch
literal 154
zcmZQbEY4+QU|?WuZ)j*>U`$}DuV<`hZUS={SX#hz0RsbTGem@utr5gvU|#^DnAmbt
zbMuQTnHYrQqYRBoQj1I6O7oISGV}8SGBX(%xVD3JZ3L5y^^OdROiT_6jE;;RybR0^
i3Je-d3<^wHicAU&jx1S<3_zLsEG0%>25xQzCT;*J5hNJ^

literal 0
HcmV?d00001

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);
+}

From 71af5e214e5932809f33bd91a39fa27a930858ed Mon Sep 17 00:00:00 2001
From: byzyk <bohdan.kh@gmail.com>
Date: Thu, 17 May 2018 13:08:11 +0400
Subject: [PATCH 058/111] revert: remove pretty script from package.json

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 0feb3471cbc..240c5bf9e19 100644
--- a/package.json
+++ b/package.json
@@ -112,6 +112,7 @@
     "code-lint": "eslint 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 --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",

From 63a4145e3fa846e4b9b720436a6fddc692c51833 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 17 May 2018 17:29:07 +0200
Subject: [PATCH 059/111] clear output directory on test start

---
 test/ConfigTestCases.test.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/ConfigTestCases.test.js b/test/ConfigTestCases.test.js
index b0f58ddc86b..0fa46e346b2 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");
@@ -47,7 +48,6 @@ describe("ConfigTestCases", () => {
 						category.name,
 						testName
 					);
-					mkdirp.sync(outputDirectory);
 					const exportedTests = [];
 					const exportedBeforeEach = [];
 					const exportedAfterEach = [];
@@ -59,6 +59,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 }

From 75db965170335acc7b4d1be52dca033fc0f10d9b Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 17 May 2018 12:35:13 +0200
Subject: [PATCH 060/111] update combination when split fails because of max
 requests

fixes #7323
---
 lib/optimize/SplitChunksPlugin.js             | 319 +++++++++++-------
 .../__snapshots__/StatsTestCases.test.js.snap | 198 ++++++-----
 .../statsCases/split-chunks/webpack.config.js |   1 +
 3 files changed, 294 insertions(+), 224 deletions(-)

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/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
index a2efbf558d7..74b351dd2ff 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`] = `
@@ -2161,61 +2161,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 +2274,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 +2350,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/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"
 			}
 		},

From 7453db9dddabf0784f0cdf18a524037f6e4b86f2 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 17 May 2018 18:14:34 +0200
Subject: [PATCH 061/111] Reduce the travis load with build stages

---
 .travis.yml  | 29 +++++++++++++++++++++--------
 codecov.yml  | 15 +++++++++++++++
 package.json |  2 ++
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b1cc16a5835..88f661c3d31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,28 +10,41 @@ branches:
 cache:
   yarn: true
 
+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 JOB_PART=basic
+      stage: basic
     - os: linux
       node_js: "10"
-      env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
+      env: NO_WATCH_TESTS=1 JOB_PART=lint
+      stage: advanced
     - os: linux
-      node_js: "8"
+      node_js: "10"
       env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
+      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
+      stage: advanced
     - os: osx
       node_js: "10"
       env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
-  allow_failures:
-    - os: osx
+      stage: versions
+    - os: linux
+      node_js: "8"
+      env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
+      stage: versions
+    - os: linux
+      node_js: "6"
+      env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
+      stage: versions
   fast_finish: true
 
 install:
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/package.json b/package.json
index f67472e72d0..973e968cdc0 100644
--- a/package.json
+++ b/package.json
@@ -99,8 +99,10 @@
     "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,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:basic": "yarn test:basic --ci $JEST",
     "travis:unit": "yarn cover:init && yarn cover:unit --ci",
     "travis:lint": "yarn lint",
     "travis:benchmark": "yarn benchmark --ci",

From 105dd779a497b46d78af80e6610ef059d5b73c43 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 17 May 2018 19:27:51 +0200
Subject: [PATCH 062/111] Include StatsTestCases

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 973e968cdc0..0550de2fb1f 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "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,ConfigTestCases}.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:basic": "yarn test:basic --ci $JEST",

From 217a657b7821f09eda8e732d764b8e373356ada1 Mon Sep 17 00:00:00 2001
From: REDDY PRASAD <dev.drprasad@aim.com>
Date: Thu, 17 May 2018 23:23:28 +0530
Subject: [PATCH 063/111] :construction: WIP

---
 lib/util/cachedMerge.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/util/cachedMerge.js b/lib/util/cachedMerge.js
index 863141e6b18..11e5ea9081b 100644
--- a/lib/util/cachedMerge.js
+++ b/lib/util/cachedMerge.js
@@ -5,7 +5,12 @@
 "use strict";
 
 const mergeCache = new WeakMap();
-
+/**
+ * returns something
+ * @param {object} first first key
+ * @param {object} second second key
+ * @returns {WeakMap} new merge
+ */
 const cachedMerge = (first, second) => {
 	let innerCache = mergeCache.get(first);
 	if (innerCache === undefined) {

From 5930cf54b92e6a839bf75f42b1eb32ace793b916 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 17 May 2018 20:33:18 +0200
Subject: [PATCH 064/111] add split chunks example

---
 examples/many-pages/README.md          | 141 +++++++++++++++++++++++++
 examples/many-pages/build.js           |   3 +
 examples/many-pages/node_modules/m1.js |   1 +
 examples/many-pages/node_modules/m2.js |   1 +
 examples/many-pages/node_modules/m3.js |   1 +
 examples/many-pages/node_modules/m4.js |   1 +
 examples/many-pages/node_modules/m5.js |   1 +
 examples/many-pages/node_modules/m6.js |   1 +
 examples/many-pages/node_modules/m7.js |   1 +
 examples/many-pages/node_modules/m8.js |   1 +
 examples/many-pages/pages/a.js         |   7 ++
 examples/many-pages/pages/b.js         |   7 ++
 examples/many-pages/pages/c.js         |   7 ++
 examples/many-pages/pages/d.js         |   7 ++
 examples/many-pages/pages/e.js         |   5 +
 examples/many-pages/pages/f.js         |   7 ++
 examples/many-pages/pages/g.js         |   3 +
 examples/many-pages/stuff/s1.js        |   1 +
 examples/many-pages/stuff/s2.js        |   1 +
 examples/many-pages/stuff/s3.js        |   1 +
 examples/many-pages/stuff/s4.js        |   1 +
 examples/many-pages/stuff/s5.js        |   1 +
 examples/many-pages/stuff/s6.js        |   1 +
 examples/many-pages/stuff/s7.js        |   1 +
 examples/many-pages/stuff/s8.js        |   1 +
 examples/many-pages/template.md        |  35 ++++++
 examples/many-pages/webpack.config.js  |  21 ++++
 27 files changed, 259 insertions(+)
 create mode 100644 examples/many-pages/README.md
 create mode 100644 examples/many-pages/build.js
 create mode 100644 examples/many-pages/node_modules/m1.js
 create mode 100644 examples/many-pages/node_modules/m2.js
 create mode 100644 examples/many-pages/node_modules/m3.js
 create mode 100644 examples/many-pages/node_modules/m4.js
 create mode 100644 examples/many-pages/node_modules/m5.js
 create mode 100644 examples/many-pages/node_modules/m6.js
 create mode 100644 examples/many-pages/node_modules/m7.js
 create mode 100644 examples/many-pages/node_modules/m8.js
 create mode 100644 examples/many-pages/pages/a.js
 create mode 100644 examples/many-pages/pages/b.js
 create mode 100644 examples/many-pages/pages/c.js
 create mode 100644 examples/many-pages/pages/d.js
 create mode 100644 examples/many-pages/pages/e.js
 create mode 100644 examples/many-pages/pages/f.js
 create mode 100644 examples/many-pages/pages/g.js
 create mode 100644 examples/many-pages/stuff/s1.js
 create mode 100644 examples/many-pages/stuff/s2.js
 create mode 100644 examples/many-pages/stuff/s3.js
 create mode 100644 examples/many-pages/stuff/s4.js
 create mode 100644 examples/many-pages/stuff/s5.js
 create mode 100644 examples/many-pages/stuff/s6.js
 create mode 100644 examples/many-pages/stuff/s7.js
 create mode 100644 examples/many-pages/stuff/s8.js
 create mode 100644 examples/many-pages/template.md
 create mode 100644 examples/many-pages/webpack.config.js

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
+		}
+	}
+};

From d30aef920d5a56ddbaf61d747cba515c0fc07b38 Mon Sep 17 00:00:00 2001
From: Steven <steven@ceriously.com>
Date: Thu, 17 May 2018 20:52:50 -0400
Subject: [PATCH 065/111] Add badges to display install size

---
 README.md | 145 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 93 insertions(+), 52 deletions(-)

diff --git a/README.md b/README.md
index ef71f20eb7a..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
 

From 3406367f6caba7c31c42a658bbd82b213dfe8783 Mon Sep 17 00:00:00 2001
From: Sean Larkin <sean.larkin@cuw.edu>
Date: Fri, 18 May 2018 00:01:31 -0700
Subject: [PATCH 066/111] chore(deps): update to latest typescript nightly

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index f67472e72d0..ecb2b06dee8 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "script-loader": "~0.7.0",
     "simple-git": "^1.65.0",
     "style-loader": "^0.19.1",
-    "typescript": "^2.9.0-dev.20180511",
+    "typescript": "^2.9.0-dev.20180518",
     "url-loader": "^0.6.2",
     "val-loader": "^1.0.2",
     "vm-browserify": "~0.0.0",
diff --git a/yarn.lock b/yarn.lock
index 56a5a9bb526..11f8503c336 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6046,9 +6046,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.20180511:
-  version "2.9.0-dev.20180511"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.0-dev.20180511.tgz#e864f6b9bf9e7f654d26f5401e74b76871f5a8e2"
+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"

From b42646908d03cc3a71c8148b5cb83585cde7feb9 Mon Sep 17 00:00:00 2001
From: William Lohan <william.g.lohan@gmail.com>
Date: Thu, 17 May 2018 13:41:59 -0700
Subject: [PATCH 067/111] fix: json with byte order mark

fixes issue #7330
---
 lib/JsonParser.js                   | 2 +-
 test/cases/parsing/bom/bomfile.json | 1 +
 test/cases/parsing/bom/index.js     | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 test/cases/parsing/bom/bomfile.json

diff --git a/lib/JsonParser.js b/lib/JsonParser.js
index 0c67ff48dc2..29c233a3328 100644
--- a/lib/JsonParser.js
+++ b/lib/JsonParser.js
@@ -12,7 +12,7 @@ class JsonParser {
 	}
 
 	parse(source, state) {
-		const data = JSON.parse(source);
+		const data = JSON.parse(source.replace(/^\ufeff/, ""));
 		state.module.buildInfo.jsonData = data;
 		state.module.buildMeta.exportsType = "named";
 		if (typeof data === "object" && data)
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");
+});

From 6c0c52558c42ec3ec3d9117027fc3ee12bf2d145 Mon Sep 17 00:00:00 2001
From: Aliaksei Sapach <dreamsonic@tut.by>
Date: Fri, 18 May 2018 22:13:10 +0300
Subject: [PATCH 068/111] feat: support tree shaking in DllPlugin

This change introduces a new `entryOnly` flag to the DllPlugin options which limits the exposed modules to only those configured as entry points. This allows module concatenation and dead code removal optimizations to take place.
---
 lib/DllPlugin.js                              |  4 +++-
 schemas/plugins/DllPlugin.json                |  4 ++++
 .../dll-plugin-entry/0-create-dll/dep.js      |  5 +++++
 .../dll-plugin-entry/0-create-dll/index.js    |  2 ++
 .../0-create-dll/test.config.js               |  1 +
 .../0-create-dll/webpack.config.js            | 20 ++++++++++++++++++
 .../dll-plugin-entry/1-use-dll/index.js       | 21 +++++++++++++++++++
 .../1-use-dll/webpack.config.js               | 13 ++++++++++++
 .../2-error-non-entry/errors.js               |  1 +
 .../2-error-non-entry/index.js                |  1 +
 .../2-error-non-entry/webpack.config.js       | 13 ++++++++++++
 11 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 test/configCases/dll-plugin-entry/0-create-dll/dep.js
 create mode 100644 test/configCases/dll-plugin-entry/0-create-dll/index.js
 create mode 100644 test/configCases/dll-plugin-entry/0-create-dll/test.config.js
 create mode 100644 test/configCases/dll-plugin-entry/0-create-dll/webpack.config.js
 create mode 100644 test/configCases/dll-plugin-entry/1-use-dll/index.js
 create mode 100644 test/configCases/dll-plugin-entry/1-use-dll/webpack.config.js
 create mode 100644 test/configCases/dll-plugin-entry/2-error-non-entry/errors.js
 create mode 100644 test/configCases/dll-plugin-entry/2-error-non-entry/index.js
 create mode 100644 test/configCases/dll-plugin-entry/2-error-non-entry/webpack.config.js

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/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/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/index.js b/test/configCases/dll-plugin-entry/0-create-dll/index.js
new file mode 100644
index 00000000000..f413eff4283
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/0-create-dll/index.js
@@ -0,0 +1,2 @@
+export { bar } from "./dep";
+export default 42;
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..dbce04b198d
--- /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 });
+});
+
+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..8e85f71b5f0
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/2-error-non-entry/errors.js
@@ -0,0 +1 @@
+module.exports = [[/Can't resolve 'dll\/dep'/]];
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..e4103206ccb
--- /dev/null
+++ b/test/configCases/dll-plugin-entry/2-error-non-entry/index.js
@@ -0,0 +1 @@
+require("dll/dep");
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()
+	]
+};

From 252ac31a57a5e362cbec7655aa953b13c7781b8c Mon Sep 17 00:00:00 2001
From: Florent Cailhol <florent.cailhol@gmail.com>
Date: Sat, 19 May 2018 11:09:30 +0200
Subject: [PATCH 069/111] Improve JSON parse error

---
 lib/Compiler.js           | 3 ++-
 lib/DllReferencePlugin.js | 3 ++-
 lib/JsonParser.js         | 3 ++-
 package.json              | 1 +
 yarn.lock                 | 4 ++++
 5 files changed, 11 insertions(+), 3 deletions(-)

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/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/JsonParser.js b/lib/JsonParser.js
index 0c67ff48dc2..be8461f37b7 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);
 		state.module.buildInfo.jsonData = data;
 		state.module.buildMeta.exportsType = "named";
 		if (typeof data === "object" && data)
diff --git a/package.json b/package.json
index cde333d61ef..37c932e86c4 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,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",
diff --git a/yarn.lock b/yarn.lock
index 11f8503c336..4a1db94e397 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3538,6 +3538,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"

From 1b6bb850e4b76aca337cef557ffc5ddb13f688de Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Sat, 19 May 2018 12:20:05 +0200
Subject: [PATCH 070/111] use slice instead of replace for better performance

---
 lib/JsonParser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/JsonParser.js b/lib/JsonParser.js
index cd2d4d2b865..6642fbbf109 100644
--- a/lib/JsonParser.js
+++ b/lib/JsonParser.js
@@ -13,7 +13,7 @@ class JsonParser {
 	}
 
 	parse(source, state) {
-		const data = parseJson(source.replace(/^\ufeff/, ""));
+		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)

From 10c850de6595aa2393d24f429ec6ff57fa2ee791 Mon Sep 17 00:00:00 2001
From: REDDY PRASAD <dev.drprasad@aim.com>
Date: Sat, 19 May 2018 23:12:56 +0530
Subject: [PATCH 071/111] :memo: Add annotations and description to cachedMerge
 util function

---
 lib/util/cachedMerge.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/util/cachedMerge.js b/lib/util/cachedMerge.js
index 11e5ea9081b..ff7b4426a62 100644
--- a/lib/util/cachedMerge.js
+++ b/lib/util/cachedMerge.js
@@ -5,11 +5,19 @@
 "use strict";
 
 const mergeCache = new WeakMap();
+
 /**
- * returns something
- * @param {object} first first key
- * @param {object} second second key
- * @returns {WeakMap} new merge
+ * 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);

From 413e1c9a709c8220b0b58541b2cbc75835d65ab7 Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <me@azimi.me>
Date: Sun, 20 May 2018 00:16:33 -0700
Subject: [PATCH 072/111] add typing for compare locations helper

---
 lib/compareLocations.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lib/compareLocations.js b/lib/compareLocations.js
index 51227f25463..c29827fe620 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
+ * @param {string|NodeLocation} b
+ * @returns {-1|0|1}
+ */
 module.exports = (a, b) => {
 	if (typeof a === "string") {
 		if (typeof b === "string") {

From 1a2bbc5303194054653a45d2d88df7b030a97a5c Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <me@azimi.me>
Date: Sun, 20 May 2018 00:18:20 -0700
Subject: [PATCH 073/111] Add more JSDoc to make ESLint happuy

---
 lib/compareLocations.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/compareLocations.js b/lib/compareLocations.js
index c29827fe620..7dce42bdb12 100644
--- a/lib/compareLocations.js
+++ b/lib/compareLocations.js
@@ -19,9 +19,9 @@
 
 /**
  * Compare two locations
- * @param {string|NodeLocation} a
- * @param {string|NodeLocation} b
- * @returns {-1|0|1}
+ * @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") {

From f2817233b5cee7a721c6ba087c835b3315095bdb Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <me@azimi.me>
Date: Sun, 20 May 2018 00:22:26 -0700
Subject: [PATCH 074/111] Add typing for ChunkRenderError

---
 lib/ChunkRenderError.js | 8 ++++++++
 1 file changed, 8 insertions(+)

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();
 

From bfc74252fd42a6134ddf2fe588fe614a29d736ab Mon Sep 17 00:00:00 2001
From: Florent Cailhol <florent.cailhol@gmail.com>
Date: Sat, 19 May 2018 14:02:31 +0200
Subject: [PATCH 075/111] Use WeakMaps instead of mutating assets

---
 lib/SourceMapDevToolPlugin.js | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

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)

From 8a6db447a8fe6ebe15bae25854082bcaeee4919a Mon Sep 17 00:00:00 2001
From: Jonathan del Strother <jdelStrother@gmail.com>
Date: Mon, 21 May 2018 09:40:09 +0100
Subject: [PATCH 076/111] Use snapshots for records tests

---
 .../ConfigTestCases.test.js.snap              | 29 +++++++++++++++++++
 test/configCases/records/issue-2991/test.js   | 28 ++----------------
 2 files changed, 31 insertions(+), 26 deletions(-)
 create mode 100644 test/__snapshots__/ConfigTestCases.test.js.snap

diff --git a/test/__snapshots__/ConfigTestCases.test.js.snap b/test/__snapshots__/ConfigTestCases.test.js.snap
new file mode 100644
index 00000000000..fa2cb74f029
--- /dev/null
+++ b/test/__snapshots__/ConfigTestCases.test.js.snap
@@ -0,0 +1,29 @@
+// 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
+    ]
+  }
+}"
+`;
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();
 });

From 6bf9479af27aaa20b16b8865f82494396fc76785 Mon Sep 17 00:00:00 2001
From: Jonathan del Strother <jdelStrother@gmail.com>
Date: Mon, 21 May 2018 09:46:09 +0100
Subject: [PATCH 077/111] Don't record absolute paths	for regexps used in
 dynamic requires

This avoids records like:

"src/dependencies sync ../../../../^/.//.*$": "./src/dependencies sync recursive ^\\.\\/.*$"

with the number of "../"s varying according to the depth of the folder you're building from.

Fixes #7339
---
 lib/util/identifier.js                        |  5 +++
 .../ConfigTestCases.test.js.snap              | 32 +++++++++++++++++++
 .../records/issue-7339/dependencies/bar.js    |  1 +
 .../records/issue-7339/dependencies/foo.js    |  1 +
 test/configCases/records/issue-7339/test.js   | 10 ++++++
 .../records/issue-7339/webpack.config.js      | 13 ++++++++
 6 files changed, 62 insertions(+)
 create mode 100644 test/configCases/records/issue-7339/dependencies/bar.js
 create mode 100644 test/configCases/records/issue-7339/dependencies/foo.js
 create mode 100644 test/configCases/records/issue-7339/test.js
 create mode 100644 test/configCases/records/issue-7339/webpack.config.js

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/test/__snapshots__/ConfigTestCases.test.js.snap b/test/__snapshots__/ConfigTestCases.test.js.snap
index fa2cb74f029..0dab29d9c95 100644
--- a/test/__snapshots__/ConfigTestCases.test.js.snap
+++ b/test/__snapshots__/ConfigTestCases.test.js.snap
@@ -27,3 +27,35 @@ exports[`ConfigTestCases records issue-2991 exported tests should write relative
   }
 }"
 `;
+
+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/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
+	}
+};

From 98541fdb29cade9da76721a3570de2cb50f8de0e Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Mon, 21 May 2018 13:27:44 +0200
Subject: [PATCH 078/111] chore: update webassemblyjs

---
 package.json |   6 +-
 yarn.lock    | 178 +++++++++++++++++++++++++--------------------------
 2 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/package.json b/package.json
index 0d798b09a6d..09df2924088 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
   "dependencies": {
-    "@webassemblyjs/ast": "1.5.1",
-    "@webassemblyjs/wasm-edit": "1.5.1",
-    "@webassemblyjs/wasm-parser": "1.5.1",
+    "@webassemblyjs/ast": "1.5.3",
+    "@webassemblyjs/wasm-edit": "1.5.3",
+    "@webassemblyjs/wasm-parser": "1.5.3",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 2122015d8bc..8dc2dc0724a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,121 +28,121 @@
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
 
-"@webassemblyjs/ast@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.1.tgz#b77382eed0c334418508fb08b73f1eae198c6960"
+"@webassemblyjs/ast@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.3.tgz#90e48421e9adb0927d986124fea306418c18561d"
   dependencies:
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.1"
-    "@webassemblyjs/wast-parser" "1.5.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.3"
+    "@webassemblyjs/wast-parser" "1.5.3"
     debug "^3.1.0"
-    webassemblyjs "1.5.1"
+    webassemblyjs "1.5.3"
 
-"@webassemblyjs/floating-point-hex-parser@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.1.tgz#0af82482faea3d86e37a020643475571197e8b3f"
+"@webassemblyjs/floating-point-hex-parser@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.3.tgz#dc2971e0951e2eb925e2b7a8800ae375868a0b41"
 
-"@webassemblyjs/helper-buffer@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.1.tgz#659046a5af671cd7b1d67a021d8dccef043508e3"
+"@webassemblyjs/helper-buffer@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.3.tgz#28ffb90035623994dd6675dbb61454eb2e08d5f5"
   dependencies:
     debug "^3.1.0"
 
-"@webassemblyjs/helper-code-frame@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.1.tgz#9170e9e5c0af7ac8154a7a2d0cb85d6f7e318207"
+"@webassemblyjs/helper-code-frame@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.3.tgz#b67e16cd0f09561bb76d882ba230f627d339edcd"
   dependencies:
-    "@webassemblyjs/wast-printer" "1.5.1"
+    "@webassemblyjs/wast-printer" "1.5.3"
 
-"@webassemblyjs/helper-fsm@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.1.tgz#68f9e4a432b9e825f334db790dc037209c393a07"
+"@webassemblyjs/helper-fsm@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.3.tgz#ec47da8fdad47fa3275989c76edbb7e3d8442edc"
 
-"@webassemblyjs/helper-wasm-bytecode@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.1.tgz#363459069ef44173dcd9d5392fa6074eab7b711d"
+"@webassemblyjs/helper-wasm-bytecode@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.3.tgz#1e9150fbd53ef573d568dc704fdcedc0c4f72c61"
 
-"@webassemblyjs/helper-wasm-section@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.1.tgz#c45b3cc233c5067ef44cd35599b07aff279c531a"
+"@webassemblyjs/helper-wasm-section@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.3.tgz#dcb5004d138c416cf60dd819554592de75cc6184"
   dependencies:
-    "@webassemblyjs/ast" "1.5.1"
-    "@webassemblyjs/helper-buffer" "1.5.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.1"
-    "@webassemblyjs/wasm-gen" "1.5.1"
+    "@webassemblyjs/ast" "1.5.3"
+    "@webassemblyjs/helper-buffer" "1.5.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.3"
+    "@webassemblyjs/wasm-gen" "1.5.3"
     debug "^3.1.0"
 
-"@webassemblyjs/leb128@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.1.tgz#a0069a66560547cf1e4228845e760ac035449e0d"
+"@webassemblyjs/leb128@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.3.tgz#99ae66968d88a0d6e8772fe72a33089f1f8fbe6b"
   dependencies:
     leb "^0.3.0"
 
-"@webassemblyjs/validation@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.5.1.tgz#ce8e06f7be7392e0ddb7dab55b6c0f37f63dcaa6"
+"@webassemblyjs/validation@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.5.3.tgz#55495848e97bc87d9f9cc4e1c40d535a5df16144"
   dependencies:
-    "@webassemblyjs/ast" "1.5.1"
+    "@webassemblyjs/ast" "1.5.3"
     debug "3.0.1"
 
-"@webassemblyjs/wasm-edit@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.1.tgz#4b3eb413031e63de2c4fddd69eda3f0a2a43c772"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.1"
-    "@webassemblyjs/helper-buffer" "1.5.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.1"
-    "@webassemblyjs/helper-wasm-section" "1.5.1"
-    "@webassemblyjs/wasm-gen" "1.5.1"
-    "@webassemblyjs/wasm-opt" "1.5.1"
-    "@webassemblyjs/wasm-parser" "1.5.1"
-    "@webassemblyjs/wast-printer" "1.5.1"
+"@webassemblyjs/wasm-edit@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.3.tgz#05ade86d765755c7401d509dbe61b401e320589f"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.3"
+    "@webassemblyjs/helper-buffer" "1.5.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.3"
+    "@webassemblyjs/helper-wasm-section" "1.5.3"
+    "@webassemblyjs/wasm-gen" "1.5.3"
+    "@webassemblyjs/wasm-opt" "1.5.3"
+    "@webassemblyjs/wasm-parser" "1.5.3"
+    "@webassemblyjs/wast-printer" "1.5.3"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-gen@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.1.tgz#805c1b15ef43e3f311e96d4f8a648f03bfc3b5a2"
+"@webassemblyjs/wasm-gen@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.3.tgz#c358dc1b1281f140c25aeaa3e1c9e75275bebd90"
   dependencies:
-    "@webassemblyjs/ast" "1.5.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.1"
-    "@webassemblyjs/leb128" "1.5.1"
+    "@webassemblyjs/ast" "1.5.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.3"
+    "@webassemblyjs/leb128" "1.5.3"
 
-"@webassemblyjs/wasm-opt@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.1.tgz#01f3e0f5ea89762e02a374a8d34a1b418b6066ee"
+"@webassemblyjs/wasm-opt@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.3.tgz#9df6a434d53e328cd294a8698f734dea501088bf"
   dependencies:
-    "@webassemblyjs/ast" "1.5.1"
-    "@webassemblyjs/helper-buffer" "1.5.1"
-    "@webassemblyjs/wasm-gen" "1.5.1"
-    "@webassemblyjs/wasm-parser" "1.5.1"
+    "@webassemblyjs/ast" "1.5.3"
+    "@webassemblyjs/helper-buffer" "1.5.3"
+    "@webassemblyjs/wasm-gen" "1.5.3"
+    "@webassemblyjs/wasm-parser" "1.5.3"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-parser@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.1.tgz#ee8c5562fa6a1213dd535c4b59dd2d7760bbf0f3"
+"@webassemblyjs/wasm-parser@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.3.tgz#f7b4f6c3346f9ca9e325b578a780ee513558917b"
   dependencies:
-    "@webassemblyjs/ast" "1.5.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.1"
-    "@webassemblyjs/leb128" "1.5.1"
-    "@webassemblyjs/wasm-parser" "1.5.1"
-    webassemblyjs "1.5.1"
+    "@webassemblyjs/ast" "1.5.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.3"
+    "@webassemblyjs/leb128" "1.5.3"
+    "@webassemblyjs/wasm-parser" "1.5.3"
+    webassemblyjs "1.5.3"
 
-"@webassemblyjs/wast-parser@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.1.tgz#4da00bf7f4e2532c6ed674089a072ae604aeaaab"
+"@webassemblyjs/wast-parser@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.3.tgz#2d6fd7463cbd363f557442ab8e6b7799507ba45e"
   dependencies:
-    "@webassemblyjs/ast" "1.5.1"
-    "@webassemblyjs/floating-point-hex-parser" "1.5.1"
-    "@webassemblyjs/helper-code-frame" "1.5.1"
-    "@webassemblyjs/helper-fsm" "1.5.1"
+    "@webassemblyjs/ast" "1.5.3"
+    "@webassemblyjs/floating-point-hex-parser" "1.5.3"
+    "@webassemblyjs/helper-code-frame" "1.5.3"
+    "@webassemblyjs/helper-fsm" "1.5.3"
     long "^3.2.0"
-    webassemblyjs "1.5.1"
+    webassemblyjs "1.5.3"
 
-"@webassemblyjs/wast-printer@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.1.tgz#91f52975decdd98051d28bf7fe89c1faa978d9a8"
+"@webassemblyjs/wast-printer@1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.3.tgz#593ed61a4a42db17cfa8e778472dd067b12b1a89"
   dependencies:
-    "@webassemblyjs/ast" "1.5.1"
-    "@webassemblyjs/wast-parser" "1.5.1"
+    "@webassemblyjs/ast" "1.5.3"
+    "@webassemblyjs/wast-parser" "1.5.3"
     long "^3.2.0"
 
 abab@^1.0.4:
@@ -6281,14 +6281,14 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-webassemblyjs@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.5.1.tgz#645caab374dd1803cfbfbaa7489bb4b72f2061ff"
+webassemblyjs@1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.5.3.tgz#89229d3eeb37ca2760ffa0002d270123c2d18bac"
   dependencies:
-    "@webassemblyjs/ast" "1.5.1"
-    "@webassemblyjs/validation" "1.5.1"
-    "@webassemblyjs/wasm-parser" "1.5.1"
-    "@webassemblyjs/wast-parser" "1.5.1"
+    "@webassemblyjs/ast" "1.5.3"
+    "@webassemblyjs/validation" "1.5.3"
+    "@webassemblyjs/wasm-parser" "1.5.3"
+    "@webassemblyjs/wast-parser" "1.5.3"
     long "^3.2.0"
 
 webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:

From 6d8bc91a9b32b492d40fd358c964ed66516dd518 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Mon, 14 May 2018 13:00:19 +0200
Subject: [PATCH 079/111] feat: add missing preprocessing

---
 declarations.d.ts                |  2 +-
 lib/wasm/WebAssemblyGenerator.js | 24 +++++++++++++++++++-----
 package.json                     |  1 +
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/declarations.d.ts b/declarations.d.ts
index bab2f6008b3..0aa48818c8b 100644
--- a/declarations.d.ts
+++ b/declarations.d.ts
@@ -81,7 +81,7 @@ declare module "@webassemblyjs/ast" {
 	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 global(globalType: string, nodes: Node[]): Global;
 	export function identifier(indentifier: string): Identifier;
 	export function funcParam(valType: string, id: Identifier): FuncParam;
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index ba9a232bcf1..7afb2648efd 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -9,6 +9,7 @@ const Template = require("../Template");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 const { RawSource } = require("webpack-sources");
 
+const { shrinkPaddedLEB128 } = require("@webassemblyjs/wasm-opt");
 const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
 const { decode } = require("@webassemblyjs/wasm-parser");
 const t = require("@webassemblyjs/ast");
@@ -16,6 +17,21 @@ 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
@@ -42,9 +58,6 @@ const isGlobalImport = n => n.descr.type === "GlobalType";
 const isFuncImport = n => n.descr.type === "FuncImportDescr";
 
 // TODO replace with @callback
-/**
- * @typedef {(ArrayBuffer) => ArrayBuffer} ArrayBufferTransform
- */
 
 /**
  * Removes the start instruction
@@ -176,7 +189,7 @@ const rewriteImportedGlobals = state => bin => {
 
 				newGlobals.push(
 					t.global(globalType, [
-						t.objectInstruction("const", "i32", [t.numberLiteral(0)])
+						t.objectInstruction("const", "i32", [t.numberLiteralFromRaw(0)])
 					])
 				);
 
@@ -315,7 +328,8 @@ const getUsedDependencyMap = module => {
 
 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)
diff --git a/package.json b/package.json
index 09df2924088..2cb009c11a3 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
   "dependencies": {
     "@webassemblyjs/ast": "1.5.3",
     "@webassemblyjs/wasm-edit": "1.5.3",
+    "@webassemblyjs/wasm-opt": "1.5.3",
     "@webassemblyjs/wasm-parser": "1.5.3",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",

From ffeca24412b5586d9b0d4d4e25ef4d05918d5484 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Mon, 21 May 2018 14:42:18 +0200
Subject: [PATCH 080/111] feat(wasm): pass arg in test

---
 test/cases/wasm/imports-multiple/module.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cases/wasm/imports-multiple/module.js b/test/cases/wasm/imports-multiple/module.js
index 239d73c6cad..deccad21fe4 100644
--- a/test/cases/wasm/imports-multiple/module.js
+++ b/test/cases/wasm/imports-multiple/module.js
@@ -1,6 +1,6 @@
 import { getResult } from "./wasm.wasm";
 
-export var result = getResult();
+export var result = getResult(1);
 
 export function getNumber() {
 	return 20;

From 7b535b3e1d9ddd1e6d1b6aba34147e2de2944c49 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Mon, 21 May 2018 15:01:09 +0200
Subject: [PATCH 081/111] chore: bump webassemblyjs

---
 package.json |   6 +--
 yarn.lock    | 139 ++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 124 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 2cb009c11a3..b07d0d4d6e0 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,10 @@
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
   "dependencies": {
-    "@webassemblyjs/ast": "1.5.3",
-    "@webassemblyjs/wasm-edit": "1.5.3",
+    "@webassemblyjs/ast": "1.5.4",
+    "@webassemblyjs/wasm-edit": "1.5.4",
     "@webassemblyjs/wasm-opt": "1.5.3",
-    "@webassemblyjs/wasm-parser": "1.5.3",
+    "@webassemblyjs/wasm-parser": "1.5.4",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index 8dc2dc0724a..a32856af81b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -37,38 +37,71 @@
     debug "^3.1.0"
     webassemblyjs "1.5.3"
 
+"@webassemblyjs/ast@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.4.tgz#b459d032edd00c98dd3de46d6850845d5d588ad4"
+  dependencies:
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.4"
+    "@webassemblyjs/wast-parser" "1.5.4"
+    debug "^3.1.0"
+    webassemblyjs "1.5.4"
+
 "@webassemblyjs/floating-point-hex-parser@1.5.3":
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.3.tgz#dc2971e0951e2eb925e2b7a8800ae375868a0b41"
 
+"@webassemblyjs/floating-point-hex-parser@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.4.tgz#b51b380a86914ae87ec075965eee24ac393c967e"
+
 "@webassemblyjs/helper-buffer@1.5.3":
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.3.tgz#28ffb90035623994dd6675dbb61454eb2e08d5f5"
   dependencies:
     debug "^3.1.0"
 
+"@webassemblyjs/helper-buffer@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.4.tgz#2280e11dfd3109cdff5de6651f6d019a2d4346f9"
+  dependencies:
+    debug "^3.1.0"
+
 "@webassemblyjs/helper-code-frame@1.5.3":
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.3.tgz#b67e16cd0f09561bb76d882ba230f627d339edcd"
   dependencies:
     "@webassemblyjs/wast-printer" "1.5.3"
 
+"@webassemblyjs/helper-code-frame@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.4.tgz#78daa37c08f6c4853d67608e389606c980e9d59e"
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.5.4"
+
 "@webassemblyjs/helper-fsm@1.5.3":
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.3.tgz#ec47da8fdad47fa3275989c76edbb7e3d8442edc"
 
+"@webassemblyjs/helper-fsm@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.4.tgz#94c2ebf7f08d19e5083e9f33278c516c4bde98fe"
+
 "@webassemblyjs/helper-wasm-bytecode@1.5.3":
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.3.tgz#1e9150fbd53ef573d568dc704fdcedc0c4f72c61"
 
-"@webassemblyjs/helper-wasm-section@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.3.tgz#dcb5004d138c416cf60dd819554592de75cc6184"
+"@webassemblyjs/helper-wasm-bytecode@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.4.tgz#70eca87631f61458562ed462e72db4abe789dc5d"
+
+"@webassemblyjs/helper-wasm-section@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.4.tgz#73652f04fbc7cf3efc60eb9474eb2bddea915d1f"
   dependencies:
-    "@webassemblyjs/ast" "1.5.3"
-    "@webassemblyjs/helper-buffer" "1.5.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.3"
-    "@webassemblyjs/wasm-gen" "1.5.3"
+    "@webassemblyjs/ast" "1.5.4"
+    "@webassemblyjs/helper-buffer" "1.5.4"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.4"
+    "@webassemblyjs/wasm-gen" "1.5.4"
     debug "^3.1.0"
 
 "@webassemblyjs/leb128@1.5.3":
@@ -77,6 +110,12 @@
   dependencies:
     leb "^0.3.0"
 
+"@webassemblyjs/leb128@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.4.tgz#3adbd9a4c12324397533aedb9ad4b0a6e1837ad1"
+  dependencies:
+    leb "^0.3.0"
+
 "@webassemblyjs/validation@1.5.3":
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.5.3.tgz#55495848e97bc87d9f9cc4e1c40d535a5df16144"
@@ -84,18 +123,25 @@
     "@webassemblyjs/ast" "1.5.3"
     debug "3.0.1"
 
-"@webassemblyjs/wasm-edit@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.3.tgz#05ade86d765755c7401d509dbe61b401e320589f"
+"@webassemblyjs/validation@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.5.4.tgz#4efebc3d6634c56b09f7f1f11de7794ff87acb7e"
   dependencies:
-    "@webassemblyjs/ast" "1.5.3"
-    "@webassemblyjs/helper-buffer" "1.5.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.3"
-    "@webassemblyjs/helper-wasm-section" "1.5.3"
-    "@webassemblyjs/wasm-gen" "1.5.3"
-    "@webassemblyjs/wasm-opt" "1.5.3"
-    "@webassemblyjs/wasm-parser" "1.5.3"
-    "@webassemblyjs/wast-printer" "1.5.3"
+    "@webassemblyjs/ast" "1.5.4"
+    debug "3.0.1"
+
+"@webassemblyjs/wasm-edit@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.4.tgz#40d3d76a31755e5497559dfe8733fa753e23698d"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.4"
+    "@webassemblyjs/helper-buffer" "1.5.4"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.4"
+    "@webassemblyjs/helper-wasm-section" "1.5.4"
+    "@webassemblyjs/wasm-gen" "1.5.4"
+    "@webassemblyjs/wasm-opt" "1.5.4"
+    "@webassemblyjs/wasm-parser" "1.5.4"
+    "@webassemblyjs/wast-printer" "1.5.4"
     debug "^3.1.0"
 
 "@webassemblyjs/wasm-gen@1.5.3":
@@ -106,6 +152,14 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.5.3"
     "@webassemblyjs/leb128" "1.5.3"
 
+"@webassemblyjs/wasm-gen@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.4.tgz#e34ce3b4599aa56e28b21afd7731da7d374f0b28"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.4"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.4"
+    "@webassemblyjs/leb128" "1.5.4"
+
 "@webassemblyjs/wasm-opt@1.5.3":
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.3.tgz#9df6a434d53e328cd294a8698f734dea501088bf"
@@ -116,6 +170,16 @@
     "@webassemblyjs/wasm-parser" "1.5.3"
     debug "^3.1.0"
 
+"@webassemblyjs/wasm-opt@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.4.tgz#8abc137664f3bca68cf1d20597fd755787d6a380"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.4"
+    "@webassemblyjs/helper-buffer" "1.5.4"
+    "@webassemblyjs/wasm-gen" "1.5.4"
+    "@webassemblyjs/wasm-parser" "1.5.4"
+    debug "^3.1.0"
+
 "@webassemblyjs/wasm-parser@1.5.3":
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.3.tgz#f7b4f6c3346f9ca9e325b578a780ee513558917b"
@@ -126,6 +190,16 @@
     "@webassemblyjs/wasm-parser" "1.5.3"
     webassemblyjs "1.5.3"
 
+"@webassemblyjs/wasm-parser@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.4.tgz#9abaf1b2c521c0d01051cd0a65a1d74b3d78deaa"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.4"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.4"
+    "@webassemblyjs/leb128" "1.5.4"
+    "@webassemblyjs/wasm-parser" "1.5.4"
+    webassemblyjs "1.5.4"
+
 "@webassemblyjs/wast-parser@1.5.3":
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.3.tgz#2d6fd7463cbd363f557442ab8e6b7799507ba45e"
@@ -137,6 +211,17 @@
     long "^3.2.0"
     webassemblyjs "1.5.3"
 
+"@webassemblyjs/wast-parser@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.4.tgz#799a78355f153607c541fdbfe0466119afc8e808"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.4"
+    "@webassemblyjs/floating-point-hex-parser" "1.5.4"
+    "@webassemblyjs/helper-code-frame" "1.5.4"
+    "@webassemblyjs/helper-fsm" "1.5.4"
+    long "^3.2.0"
+    webassemblyjs "1.5.4"
+
 "@webassemblyjs/wast-printer@1.5.3":
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.3.tgz#593ed61a4a42db17cfa8e778472dd067b12b1a89"
@@ -145,6 +230,14 @@
     "@webassemblyjs/wast-parser" "1.5.3"
     long "^3.2.0"
 
+"@webassemblyjs/wast-printer@1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.4.tgz#c02284c96735537f15944dfab5150df3935bcb8d"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.4"
+    "@webassemblyjs/wast-parser" "1.5.4"
+    long "^3.2.0"
+
 abab@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
@@ -6291,6 +6384,16 @@ webassemblyjs@1.5.3:
     "@webassemblyjs/wast-parser" "1.5.3"
     long "^3.2.0"
 
+webassemblyjs@1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.5.4.tgz#d8b2a4c2d70a4c911ca446f20e49bc22cde09d15"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.4"
+    "@webassemblyjs/validation" "1.5.4"
+    "@webassemblyjs/wasm-parser" "1.5.4"
+    "@webassemblyjs/wast-parser" "1.5.4"
+    long "^3.2.0"
+
 webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"

From f8455657c553c9f47056b4ddec62d59ada1c73f3 Mon Sep 17 00:00:00 2001
From: Jonathan del Strother <jdelStrother@gmail.com>
Date: Mon, 21 May 2018 15:45:28 +0100
Subject: [PATCH 082/111] Sort the usedIds array in records

This prevents unnecessary churn when version-controlling your records
---
 lib/RecordIdsPlugin.js                             |  2 +-
 test/configCases/records/stable-sort/split-2.js    |  0
 test/configCases/records/stable-sort/split.js      |  0
 test/configCases/records/stable-sort/test.js       | 14 ++++++++++++++
 .../records/stable-sort/webpack.config.js          | 14 ++++++++++++++
 5 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 test/configCases/records/stable-sort/split-2.js
 create mode 100644 test/configCases/records/stable-sort/split.js
 create mode 100644 test/configCases/records/stable-sort/test.js
 create mode 100644 test/configCases/records/stable-sort/webpack.config.js

diff --git a/lib/RecordIdsPlugin.js b/lib/RecordIdsPlugin.js
index a2a3d6406d3..78dc372fc52 100644
--- a/lib/RecordIdsPlugin.js
+++ b/lib/RecordIdsPlugin.js
@@ -118,7 +118,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/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..9e426ed34ad
--- /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, "main", "split"]);
+});
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..2a39b41e118
--- /dev/null
+++ b/test/configCases/records/stable-sort/webpack.config.js
@@ -0,0 +1,14 @@
+var path = require("path");
+
+module.exports = {
+	mode: "development",
+	entry: "./test",
+	recordsOutputPath: path.resolve(
+		__dirname,
+		"../../../js/config/records/stable-sort/records.json"
+	),
+	target: "node",
+	node: {
+		__dirname: false
+	}
+};

From 586469af4e1b1408020fad0521ebe1ce6556b324 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Mon, 21 May 2018 21:15:59 +0200
Subject: [PATCH 083/111] chore: correct version

---
 package.json |   2 +-
 yarn.lock    | 103 ---------------------------------------------------
 2 files changed, 1 insertion(+), 104 deletions(-)

diff --git a/package.json b/package.json
index b07d0d4d6e0..5560f153648 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@webassemblyjs/ast": "1.5.4",
     "@webassemblyjs/wasm-edit": "1.5.4",
-    "@webassemblyjs/wasm-opt": "1.5.3",
+    "@webassemblyjs/wasm-opt": "1.5.4",
     "@webassemblyjs/wasm-parser": "1.5.4",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index a32856af81b..9b9000f4f5a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,15 +28,6 @@
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
 
-"@webassemblyjs/ast@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.3.tgz#90e48421e9adb0927d986124fea306418c18561d"
-  dependencies:
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.3"
-    "@webassemblyjs/wast-parser" "1.5.3"
-    debug "^3.1.0"
-    webassemblyjs "1.5.3"
-
 "@webassemblyjs/ast@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.4.tgz#b459d032edd00c98dd3de46d6850845d5d588ad4"
@@ -46,50 +37,26 @@
     debug "^3.1.0"
     webassemblyjs "1.5.4"
 
-"@webassemblyjs/floating-point-hex-parser@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.3.tgz#dc2971e0951e2eb925e2b7a8800ae375868a0b41"
-
 "@webassemblyjs/floating-point-hex-parser@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.4.tgz#b51b380a86914ae87ec075965eee24ac393c967e"
 
-"@webassemblyjs/helper-buffer@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.3.tgz#28ffb90035623994dd6675dbb61454eb2e08d5f5"
-  dependencies:
-    debug "^3.1.0"
-
 "@webassemblyjs/helper-buffer@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.4.tgz#2280e11dfd3109cdff5de6651f6d019a2d4346f9"
   dependencies:
     debug "^3.1.0"
 
-"@webassemblyjs/helper-code-frame@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.3.tgz#b67e16cd0f09561bb76d882ba230f627d339edcd"
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.5.3"
-
 "@webassemblyjs/helper-code-frame@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.4.tgz#78daa37c08f6c4853d67608e389606c980e9d59e"
   dependencies:
     "@webassemblyjs/wast-printer" "1.5.4"
 
-"@webassemblyjs/helper-fsm@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.3.tgz#ec47da8fdad47fa3275989c76edbb7e3d8442edc"
-
 "@webassemblyjs/helper-fsm@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.4.tgz#94c2ebf7f08d19e5083e9f33278c516c4bde98fe"
 
-"@webassemblyjs/helper-wasm-bytecode@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.3.tgz#1e9150fbd53ef573d568dc704fdcedc0c4f72c61"
-
 "@webassemblyjs/helper-wasm-bytecode@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.4.tgz#70eca87631f61458562ed462e72db4abe789dc5d"
@@ -104,25 +71,12 @@
     "@webassemblyjs/wasm-gen" "1.5.4"
     debug "^3.1.0"
 
-"@webassemblyjs/leb128@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.3.tgz#99ae66968d88a0d6e8772fe72a33089f1f8fbe6b"
-  dependencies:
-    leb "^0.3.0"
-
 "@webassemblyjs/leb128@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.4.tgz#3adbd9a4c12324397533aedb9ad4b0a6e1837ad1"
   dependencies:
     leb "^0.3.0"
 
-"@webassemblyjs/validation@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.5.3.tgz#55495848e97bc87d9f9cc4e1c40d535a5df16144"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.3"
-    debug "3.0.1"
-
 "@webassemblyjs/validation@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.5.4.tgz#4efebc3d6634c56b09f7f1f11de7794ff87acb7e"
@@ -144,14 +98,6 @@
     "@webassemblyjs/wast-printer" "1.5.4"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-gen@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.3.tgz#c358dc1b1281f140c25aeaa3e1c9e75275bebd90"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.3"
-    "@webassemblyjs/leb128" "1.5.3"
-
 "@webassemblyjs/wasm-gen@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.4.tgz#e34ce3b4599aa56e28b21afd7731da7d374f0b28"
@@ -160,16 +106,6 @@
     "@webassemblyjs/helper-wasm-bytecode" "1.5.4"
     "@webassemblyjs/leb128" "1.5.4"
 
-"@webassemblyjs/wasm-opt@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.3.tgz#9df6a434d53e328cd294a8698f734dea501088bf"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.3"
-    "@webassemblyjs/helper-buffer" "1.5.3"
-    "@webassemblyjs/wasm-gen" "1.5.3"
-    "@webassemblyjs/wasm-parser" "1.5.3"
-    debug "^3.1.0"
-
 "@webassemblyjs/wasm-opt@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.4.tgz#8abc137664f3bca68cf1d20597fd755787d6a380"
@@ -180,16 +116,6 @@
     "@webassemblyjs/wasm-parser" "1.5.4"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-parser@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.3.tgz#f7b4f6c3346f9ca9e325b578a780ee513558917b"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.3"
-    "@webassemblyjs/leb128" "1.5.3"
-    "@webassemblyjs/wasm-parser" "1.5.3"
-    webassemblyjs "1.5.3"
-
 "@webassemblyjs/wasm-parser@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.4.tgz#9abaf1b2c521c0d01051cd0a65a1d74b3d78deaa"
@@ -200,17 +126,6 @@
     "@webassemblyjs/wasm-parser" "1.5.4"
     webassemblyjs "1.5.4"
 
-"@webassemblyjs/wast-parser@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.3.tgz#2d6fd7463cbd363f557442ab8e6b7799507ba45e"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.3"
-    "@webassemblyjs/floating-point-hex-parser" "1.5.3"
-    "@webassemblyjs/helper-code-frame" "1.5.3"
-    "@webassemblyjs/helper-fsm" "1.5.3"
-    long "^3.2.0"
-    webassemblyjs "1.5.3"
-
 "@webassemblyjs/wast-parser@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.4.tgz#799a78355f153607c541fdbfe0466119afc8e808"
@@ -222,14 +137,6 @@
     long "^3.2.0"
     webassemblyjs "1.5.4"
 
-"@webassemblyjs/wast-printer@1.5.3":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.3.tgz#593ed61a4a42db17cfa8e778472dd067b12b1a89"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.3"
-    "@webassemblyjs/wast-parser" "1.5.3"
-    long "^3.2.0"
-
 "@webassemblyjs/wast-printer@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.4.tgz#c02284c96735537f15944dfab5150df3935bcb8d"
@@ -6374,16 +6281,6 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-webassemblyjs@1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.5.3.tgz#89229d3eeb37ca2760ffa0002d270123c2d18bac"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.3"
-    "@webassemblyjs/validation" "1.5.3"
-    "@webassemblyjs/wasm-parser" "1.5.3"
-    "@webassemblyjs/wast-parser" "1.5.3"
-    long "^3.2.0"
-
 webassemblyjs@1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.5.4.tgz#d8b2a4c2d70a4c911ca446f20e49bc22cde09d15"

From 66922757048c6b0967dfe4b80f807db921e3f499 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Tue, 22 May 2018 13:24:40 +0200
Subject: [PATCH 084/111] Only put entries into the manifest

---
 lib/LibManifestPlugin.js                                 | 9 +++++++++
 test/configCases/dll-plugin-entry/0-create-dll/dep2.js   | 1 +
 test/configCases/dll-plugin-entry/0-create-dll/index.js  | 2 ++
 .../dll-plugin-entry/2-error-non-entry/errors.js         | 2 +-
 .../dll-plugin-entry/2-error-non-entry/index.js          | 2 +-
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 test/configCases/dll-plugin-entry/0-create-dll/dep2.js

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/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
index f413eff4283..80cdc870f74 100644
--- a/test/configCases/dll-plugin-entry/0-create-dll/index.js
+++ b/test/configCases/dll-plugin-entry/0-create-dll/index.js
@@ -1,2 +1,4 @@
 export { bar } from "./dep";
 export default 42;
+
+require("./dep2");
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
index 8e85f71b5f0..857282ec937 100644
--- a/test/configCases/dll-plugin-entry/2-error-non-entry/errors.js
+++ b/test/configCases/dll-plugin-entry/2-error-non-entry/errors.js
@@ -1 +1 @@
-module.exports = [[/Can't resolve 'dll\/dep'/]];
+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
index e4103206ccb..901f17038f8 100644
--- a/test/configCases/dll-plugin-entry/2-error-non-entry/index.js
+++ b/test/configCases/dll-plugin-entry/2-error-non-entry/index.js
@@ -1 +1 @@
-require("dll/dep");
+require("dll/dep2");

From 19015b698c96dd44df940503bfe1ec901d3dc874 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Tue, 22 May 2018 15:20:56 +0200
Subject: [PATCH 085/111] fix problems with circular unneeded chunks

fixes #7363
fixes #7239
fixes #6587
---
 lib/Compilation.js                                |  2 +-
 test/__snapshots__/StatsTestCases.test.js.snap    |  4 ++--
 test/cases/chunks/import-circle/index.js          | 15 +++++++++++++++
 test/cases/chunks/import-circle/leftHelix.js      |  6 ++++++
 test/cases/chunks/import-circle/leftHelixPrime.js |  9 +++++++++
 test/cases/chunks/import-circle/rightHelix.js     |  6 ++++++
 .../cases/chunks/import-circle/rightHelixPrime.js |  9 +++++++++
 7 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 test/cases/chunks/import-circle/index.js
 create mode 100644 test/cases/chunks/import-circle/leftHelix.js
 create mode 100644 test/cases/chunks/import-circle/leftHelixPrime.js
 create mode 100644 test/cases/chunks/import-circle/rightHelix.js
 create mode 100644 test/cases/chunks/import-circle/rightHelixPrime.js

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/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
index 74b351dd2ff..b1226b7d44c 100644
--- a/test/__snapshots__/StatsTestCases.test.js.snap
+++ b/test/__snapshots__/StatsTestCases.test.js.snap
@@ -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]
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
+};

From 8df9f5f1f5cfaf2903c559b35635f8875ea9695c Mon Sep 17 00:00:00 2001
From: Florent Cailhol <florent.cailhol@gmail.com>
Date: Sat, 19 May 2018 13:42:18 +0200
Subject: [PATCH 086/111] Use a WeakMap instead of mutating objects

---
 lib/NormalModuleFactory.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
index 9bee66d076d..f38ea23a8e3 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);
 						}
 					}
 

From afca267ae615be63732b82618527622cdd2988c2 Mon Sep 17 00:00:00 2001
From: Aliaksei Sapach <dreamsonic@tut.by>
Date: Tue, 22 May 2018 23:27:41 +0300
Subject: [PATCH 087/111] added entry-only example

---
 examples/dll-entry-only/README.md         | 282 ++++++++++++++++++++++
 examples/dll-entry-only/a.js              |   3 +
 examples/dll-entry-only/b.js              |   4 +
 examples/dll-entry-only/build.js          |   2 +
 examples/dll-entry-only/cjs.js            |   2 +
 examples/dll-entry-only/example.js        |   2 +
 examples/dll-entry-only/template.md       |  64 +++++
 examples/dll-entry-only/webpack.config.js |  24 ++
 8 files changed, 383 insertions(+)
 create mode 100644 examples/dll-entry-only/README.md
 create mode 100644 examples/dll-entry-only/a.js
 create mode 100644 examples/dll-entry-only/b.js
 create mode 100644 examples/dll-entry-only/build.js
 create mode 100644 examples/dll-entry-only/cjs.js
 create mode 100644 examples/dll-entry-only/example.js
 create mode 100644 examples/dll-entry-only/template.md
 create mode 100644 examples/dll-entry-only/webpack.config.js

diff --git a/examples/dll-entry-only/README.md b/examples/dll-entry-only/README.md
new file mode 100644
index 00000000000..d0d606492e0
--- /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
+	},
+	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..65767239806
--- /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
+	},
+	plugins: [
+		new webpack.DllPlugin({
+			path: path.join(__dirname, "dist", "[name]-manifest.json"),
+			name: "[name]_[hash]",
+			entryOnly: true
+		})
+	]
+};

From a9d9feeba7d50a8960b453109c9fa2dd16d5d906 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Wed, 23 May 2018 18:13:25 +0200
Subject: [PATCH 088/111] refactor: switch to tests to wast

---
 lib/WebpackOptionsDefaulter.js        |   5 +++++
 package.json                          |   1 +
 test/cases/wasm/decoding/index.js     |   4 ++--
 test/cases/wasm/decoding/memory2.wasm | Bin 35 -> 0 bytes
 test/cases/wasm/decoding/memory2.wast |   3 +++
 test/cases/wasm/decoding/memory3.wasm | Bin 143 -> 0 bytes
 test/cases/wasm/decoding/memory3.wast |  14 ++++++++++++++
 yarn.lock                             |  10 ++++++++++
 8 files changed, 35 insertions(+), 2 deletions(-)
 delete mode 100644 test/cases/wasm/decoding/memory2.wasm
 create mode 100644 test/cases/wasm/decoding/memory2.wast
 delete mode 100644 test/cases/wasm/decoding/memory3.wasm
 create mode 100644 test/cases/wasm/decoding/memory3.wast

diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
index d947e6a97db..0ff86d5a84b 100644
--- a/lib/WebpackOptionsDefaulter.js
+++ b/lib/WebpackOptionsDefaulter.js
@@ -73,6 +73,11 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			{
 				test: /\.wasm$/i,
 				type: "webassembly/experimental"
+			},
+			{
+				test: /\.wast$/i,
+				loader: "@webassemblyjs/wast-loader",
+				type: "webassembly/experimental"
 			}
 		]);
 
diff --git a/package.json b/package.json
index 37c932e86c4..ce8548bec2c 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "@webassemblyjs/ast": "1.4.3",
     "@webassemblyjs/wasm-edit": "1.4.3",
     "@webassemblyjs/wasm-parser": "1.4.3",
+    "@webassemblyjs/wast-loader": "^1.5.4",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
diff --git a/test/cases/wasm/decoding/index.js b/test/cases/wasm/decoding/index.js
index 5951edc435d..a5e4265f1c6 100644
--- a/test/cases/wasm/decoding/index.js
+++ b/test/cases/wasm/decoding/index.js
@@ -1,5 +1,5 @@
 it("should support wasm compiled from c++", function() {
-	return import("./memory3.wasm").then(function(wasm) {
+	return import("./memory3.wast").then(function(wasm) {
 		expect(wasm._Z3getv()).toBe(0);
 		wasm._Z3seti(42);
 		expect(wasm._Z3getv()).toBe(42);
@@ -7,7 +7,7 @@ it("should support wasm compiled from c++", function() {
 });
 
 it("should raw memory export without data", function() {
-	return import("./memory2.wasm").then(function(wasm) {
+	return import("./memory2.wast").then(function(wasm) {
 		expect(wasm.memory).toBeInstanceOf(WebAssembly.Memory);
 		expect(wasm.memory.buffer).toBeInstanceOf(ArrayBuffer);
 		expect(wasm.memory.buffer.byteLength).toBe(1 << 16);
diff --git a/test/cases/wasm/decoding/memory2.wasm b/test/cases/wasm/decoding/memory2.wasm
deleted file mode 100644
index 654daf1d9b0329f1f9b64f40f1c5b2063ab5cd1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 35
qcmZQbEY4+QU|?WnW@KPw=VD~bP0h_Os$^nd;9$v1%uQutWB>qOBn7Yl

diff --git a/test/cases/wasm/decoding/memory2.wast b/test/cases/wasm/decoding/memory2.wast
new file mode 100644
index 00000000000..0a1657bb7b0
--- /dev/null
+++ b/test/cases/wasm/decoding/memory2.wast
@@ -0,0 +1,3 @@
+(module
+  (memory $memory (export "memory") 1))
+
diff --git a/test/cases/wasm/decoding/memory3.wasm b/test/cases/wasm/decoding/memory3.wasm
deleted file mode 100644
index 0c2ca20c8852e794312a805553088dace4a744b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 143
zcmZQbEY4+QU|?YEY-ng;U`k-DXGmaRtY>Zpa~T*}T0jiO0tN<Fun;2yBU>X#h=F|`
zh+<~TP0h_Os$^ndkB>4gPA$m<$^cpEsU>9$j9jz9#(>RcaAZ(mFk|B3ZU<|3WY7Sz
Rxw}9dMg~V7ZWf>`7y$H*A(#LF

diff --git a/test/cases/wasm/decoding/memory3.wast b/test/cases/wasm/decoding/memory3.wast
new file mode 100644
index 00000000000..2382a8661c9
--- /dev/null
+++ b/test/cases/wasm/decoding/memory3.wast
@@ -0,0 +1,14 @@
+(module
+  (type $t0 (func (param i32)))
+  (type $t1 (func (result i32)))
+  (func $_Z3seti (export "_Z3seti") (type $t0) (param $p0 i32)
+    (i32.store offset=12
+      (i32.const 0)
+      (get_local $p0)))
+  (func $_Z3getv (export "_Z3getv") (type $t1) (result i32)
+    (i32.load offset=12
+      (i32.const 0)))
+  (table $T0 0 anyfunc)
+  (memory $memory (export "memory") 1)
+  (data (i32.const 12) "\00\00\00\00"))
+
diff --git a/yarn.lock b/yarn.lock
index 4a1db94e397..0d760491176 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -125,6 +125,12 @@
     "@webassemblyjs/wasm-parser" "1.4.3"
     webassemblyjs "1.4.3"
 
+"@webassemblyjs/wast-loader@^1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-loader/-/wast-loader-1.5.4.tgz#6db66671edc5955cb77cbf90a6c4f627f6335a6a"
+  dependencies:
+    wabt "^1.0.0"
+
 "@webassemblyjs/wast-parser@1.4.3":
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz#3250402e2c5ed53dbe2233c9de1fe1f9f0d51745"
@@ -6257,6 +6263,10 @@ 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"

From 4a541303c9d0d6bb8a4a659ae914dde3904c14d1 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 18 May 2018 16:34:01 +0200
Subject: [PATCH 089/111] Upgrade jest increase timeout fix hanging avoid
 inspector in CI setup jest caching

---
 .travis.yml                                   |  31 +-
 appveyor.yml                                  |  10 +-
 package.json                                  |   8 +-
 test/ConfigTestCases.test.js                  |   6 +-
 test/Errors.test.js                           |   2 +
 test/HotTestCases.test.js                     |  16 +-
 test/MultiCompiler.test.js                    |   2 +
 test/TestCases.template.js                    |   8 +-
 test/WatchTestCases.test.js                   |   4 +-
 .../plugins/profiling-plugin/test.filter.js   |   3 +
 .../plugins/uglifyjs-plugin/webpack.config.js |   6 +
 .../test.filter.js                            |   3 +
 yarn.lock                                     | 774 ++++++++----------
 13 files changed, 424 insertions(+), 449 deletions(-)
 create mode 100644 test/configCases/plugins/profiling-plugin/test.filter.js
 create mode 100644 test/configCases/source-map/source-map-with-profiling-plugin/test.filter.js

diff --git a/.travis.yml b/.travis.yml
index 88f661c3d31..fb7677098a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,9 @@ branches:
 
 cache:
   yarn: true
+  directories:
+    - ".jest-cache"
+    - ".eslintcache"
 
 stages:
  - basic
@@ -19,7 +22,7 @@ matrix:
   include:
     - os: linux
       node_js: "10"
-      env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=basic
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=basic
       stage: basic
     - os: linux
       node_js: "10"
@@ -27,7 +30,11 @@ matrix:
       stage: advanced
     - os: linux
       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=integration1
+      stage: advanced
+    - os: linux
+      node_js: "10"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration2
       stage: advanced
     - os: linux
       node_js: "10"
@@ -35,15 +42,27 @@ matrix:
       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=integration1
+      stage: versions
+    - os: osx
+      node_js: "10"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration2
       stage: versions
     - 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=integration1
+      stage: versions
+    - os: linux
+      node_js: "8"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration2
+      stage: versions
+    - os: linux
+      node_js: "6"
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration1
       stage: versions
     - 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=integration2
       stage: versions
   fast_finish: true
 
@@ -52,7 +71,7 @@ install:
   - 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
diff --git a/appveyor.yml b/appveyor.yml
index 0e9fc6f4fe2..dd1cc0f9e91 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,10 +15,16 @@ environment:
     - nodejs_version: 8
       job_part: unit
     - nodejs_version: 8
-      job_part: integration
+      job_part: integration1
+      jest: --maxWorkers=2
+    - nodejs_version: 8
+      job_part: integration2
+      jest: --maxWorkers=2
+    - nodejs_version: 6
+      job_part: integration1
       jest: --maxWorkers=2
     - nodejs_version: 6
-      job_part: integration
+      job_part: integration2
       jest: --maxWorkers=2
 
 install:
diff --git a/package.json b/package.json
index 37c932e86c4..c2fc8509038 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "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",
@@ -102,12 +102,14 @@
     "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:integration1": "yarn cover:init && yarn cover:integration \"test/((?!TestCases)|TestCasesD)\" --ci $JEST && yarn cover:report-min",
+    "travis:integration2": "yarn cover:init && yarn cover:integration \"test/TestCases(?!D)\" --ci $JEST && yarn cover:report-min",
     "travis:basic": "yarn test:basic --ci $JEST",
     "travis:unit": "yarn cover:init && yarn cover:unit --ci",
     "travis:lint": "yarn lint",
     "travis:benchmark": "yarn benchmark --ci",
-    "appveyor:integration": "yarn cover:init && yarn cover:integration --ci %JEST% && yarn cover:report-min",
+    "appveyor:integration1": "yarn cover:init && yarn cover:integration \"test/((?!TestCases)|TestCasesD)\" --ci %JEST% && yarn cover:report-min",
+    "appveyor:integration2": "yarn cover:init && yarn cover:integration \"test/TestCases(?!D)\" --ci %JEST% && yarn cover:report-min",
     "appveyor:unit": "yarn cover:init && yarn cover:unit --ci && yarn cover:report-min",
     "appveyor:benchmark": "yarn benchmark --ci",
     "circleci:test": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --ci",
diff --git a/test/ConfigTestCases.test.js b/test/ConfigTestCases.test.js
index 0fa46e346b2..9273f2b9362 100644
--- a/test/ConfigTestCases.test.js
+++ b/test/ConfigTestCases.test.js
@@ -16,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,
@@ -262,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/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/TestCases.template.js b/test/TestCases.template.js
index c860c7211b4..8168b8ee5c4 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);
@@ -160,10 +162,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 +235,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/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/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/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/yarn.lock b/yarn.lock
index 4a1db94e397..8cd2fe675fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,8 +3,14 @@
 
 
 "@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"
@@ -209,14 +215,10 @@ 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.5.0:
+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"
@@ -282,25 +284,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"
@@ -443,9 +432,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"
@@ -479,8 +468,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"
@@ -492,19 +481,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"
@@ -512,7 +501,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:
@@ -522,12 +511,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"
@@ -535,14 +524,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"
@@ -552,19 +533,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:
@@ -668,12 +649,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"
@@ -906,6 +881,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"
@@ -931,7 +912,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:
@@ -939,7 +920,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:
@@ -996,8 +977,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"
@@ -1057,8 +1038,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"
@@ -1181,8 +1162,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"
@@ -1234,15 +1215,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"
 
@@ -1274,8 +1251,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"
@@ -1481,11 +1458,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:
@@ -1605,8 +1590,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"
@@ -1708,8 +1693,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"
@@ -1749,15 +1734,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"
@@ -1943,16 +1928,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"
@@ -2106,12 +2091,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"
 
@@ -2248,13 +2233,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"
@@ -2262,22 +2240,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"
@@ -2514,7 +2482,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:
@@ -2556,8 +2524,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"
@@ -2604,12 +2572,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"
@@ -2668,7 +2642,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"
 
@@ -2700,8 +2674,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"
 
@@ -3034,10 +3008,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"
@@ -3060,18 +3030,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"
@@ -3081,16 +3039,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"
@@ -3148,14 +3096,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"
@@ -3165,23 +3113,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"
@@ -3192,103 +3140,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"
@@ -3300,9 +3249,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"
@@ -3310,62 +3259,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"
@@ -3374,9 +3324,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"
@@ -3385,16 +3335,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"
@@ -3408,40 +3358,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"
@@ -3470,20 +3419,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"
@@ -3496,23 +3438,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"
@@ -3522,6 +3463,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"
@@ -3642,8 +3584,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"
@@ -3731,14 +3673,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"
@@ -3761,7 +3699,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:
@@ -3798,6 +3743,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"
@@ -3840,7 +3789,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:
@@ -3913,7 +3862,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:
@@ -3932,8 +3881,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"
@@ -3966,7 +3915,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:
@@ -3995,7 +3944,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"
 
@@ -4021,8 +3970,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"
@@ -4084,21 +4033,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"
@@ -4137,7 +4085,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:
@@ -4191,8 +4139,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"
@@ -4246,7 +4194,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:
@@ -4366,7 +4314,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"
 
@@ -4744,14 +4692,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"
 
@@ -4967,8 +4915,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"
@@ -4985,12 +4933,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"
@@ -5060,7 +5009,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:
@@ -5238,8 +5187,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"
@@ -5259,7 +5208,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"
@@ -5324,7 +5272,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:
@@ -5337,6 +5285,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"
@@ -5359,7 +5311,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"
 
@@ -5369,23 +5321,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"
@@ -5581,10 +5534,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"
@@ -5597,9 +5550,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:
@@ -5612,7 +5566,7 @@ source-map@0.4.x, source-map@^0.4.4:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.5.x, 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"
 
@@ -5632,19 +5586,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"
@@ -5759,7 +5721,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"
 
@@ -5817,8 +5779,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"
 
@@ -5853,49 +5815,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"
@@ -5985,19 +5916,13 @@ topo@2.x.x:
   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:
@@ -6098,14 +6023,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"
@@ -6219,11 +6136,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"
@@ -6288,7 +6205,7 @@ webassemblyjs@1.4.3:
     "@webassemblyjs/wast-parser" "1.4.3"
     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"
 
@@ -6319,13 +6236,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"
@@ -6416,12 +6337,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"

From 7184bb4ac13cae646d3c05aff14000774dba919f Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Thu, 24 May 2018 13:50:12 +0200
Subject: [PATCH 090/111] fix: keep decoding in wasm

---
 test/cases/wasm/decoding/index.js     |   4 ++--
 test/cases/wasm/decoding/memory2.wasm | Bin 0 -> 35 bytes
 test/cases/wasm/decoding/memory2.wast |   3 ---
 test/cases/wasm/decoding/memory3.wasm | Bin 0 -> 143 bytes
 test/cases/wasm/decoding/memory3.wast |  14 --------------
 5 files changed, 2 insertions(+), 19 deletions(-)
 create mode 100644 test/cases/wasm/decoding/memory2.wasm
 delete mode 100644 test/cases/wasm/decoding/memory2.wast
 create mode 100644 test/cases/wasm/decoding/memory3.wasm
 delete mode 100644 test/cases/wasm/decoding/memory3.wast

diff --git a/test/cases/wasm/decoding/index.js b/test/cases/wasm/decoding/index.js
index a5e4265f1c6..5951edc435d 100644
--- a/test/cases/wasm/decoding/index.js
+++ b/test/cases/wasm/decoding/index.js
@@ -1,5 +1,5 @@
 it("should support wasm compiled from c++", function() {
-	return import("./memory3.wast").then(function(wasm) {
+	return import("./memory3.wasm").then(function(wasm) {
 		expect(wasm._Z3getv()).toBe(0);
 		wasm._Z3seti(42);
 		expect(wasm._Z3getv()).toBe(42);
@@ -7,7 +7,7 @@ it("should support wasm compiled from c++", function() {
 });
 
 it("should raw memory export without data", function() {
-	return import("./memory2.wast").then(function(wasm) {
+	return import("./memory2.wasm").then(function(wasm) {
 		expect(wasm.memory).toBeInstanceOf(WebAssembly.Memory);
 		expect(wasm.memory.buffer).toBeInstanceOf(ArrayBuffer);
 		expect(wasm.memory.buffer.byteLength).toBe(1 << 16);
diff --git a/test/cases/wasm/decoding/memory2.wasm b/test/cases/wasm/decoding/memory2.wasm
new file mode 100644
index 0000000000000000000000000000000000000000..654daf1d9b0329f1f9b64f40f1c5b2063ab5cd1b
GIT binary patch
literal 35
qcmZQbEY4+QU|?WnW@KPw=VD~bP0h_Os$^nd;9$v1%uQutWB>qOBn7Yl

literal 0
HcmV?d00001

diff --git a/test/cases/wasm/decoding/memory2.wast b/test/cases/wasm/decoding/memory2.wast
deleted file mode 100644
index 0a1657bb7b0..00000000000
--- a/test/cases/wasm/decoding/memory2.wast
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
-  (memory $memory (export "memory") 1))
-
diff --git a/test/cases/wasm/decoding/memory3.wasm b/test/cases/wasm/decoding/memory3.wasm
new file mode 100644
index 0000000000000000000000000000000000000000..0c2ca20c8852e794312a805553088dace4a744b2
GIT binary patch
literal 143
zcmZQbEY4+QU|?YEY-ng;U`k-DXGmaRtY>Zpa~T*}T0jiO0tN<Fun;2yBU>X#h=F|`
zh+<~TP0h_Os$^ndkB>4gPA$m<$^cpEsU>9$j9jz9#(>RcaAZ(mFk|B3ZU<|3WY7Sz
Rxw}9dMg~V7ZWf>`7y$H*A(#LF

literal 0
HcmV?d00001

diff --git a/test/cases/wasm/decoding/memory3.wast b/test/cases/wasm/decoding/memory3.wast
deleted file mode 100644
index 2382a8661c9..00000000000
--- a/test/cases/wasm/decoding/memory3.wast
+++ /dev/null
@@ -1,14 +0,0 @@
-(module
-  (type $t0 (func (param i32)))
-  (type $t1 (func (result i32)))
-  (func $_Z3seti (export "_Z3seti") (type $t0) (param $p0 i32)
-    (i32.store offset=12
-      (i32.const 0)
-      (get_local $p0)))
-  (func $_Z3getv (export "_Z3getv") (type $t1) (result i32)
-    (i32.load offset=12
-      (i32.const 0)))
-  (table $T0 0 anyfunc)
-  (memory $memory (export "memory") 1)
-  (data (i32.const 12) "\00\00\00\00"))
-

From acc45fd806145e1d1f42aa8042a76c79121eaf1f Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Thu, 24 May 2018 14:12:11 +0200
Subject: [PATCH 091/111] refactor: switch to wast

---
 lib/WebpackOptionsDefaulter.js                 |   5 -----
 package.json                                   |   2 +-
 test/TestCases.template.js                     |   5 +++++
 test/cases/wasm/import-wasm-wasm/index.js      |   2 +-
 test/cases/wasm/import-wasm-wasm/wasm.wasm     | Bin 78 -> 0 bytes
 test/cases/wasm/import-wasm-wasm/wasm.wat      |   9 +++++++++
 test/cases/wasm/import-wasm-wasm/wasm2.wasm    | Bin 42 -> 0 bytes
 test/cases/wasm/import-wasm-wasm/wasm2.wat     |   5 +++++
 test/cases/wasm/imports-circular/module.js     |   2 +-
 test/cases/wasm/imports-circular/wasm.wasm     | Bin 74 -> 0 bytes
 test/cases/wasm/imports-circular/wasm.wat      |   9 +++++++++
 test/cases/wasm/imports/index.js               |   2 +-
 test/cases/wasm/imports/wasm.wasm              | Bin 74 -> 0 bytes
 test/cases/wasm/imports/wasm.wat               |   9 +++++++++
 test/cases/wasm/memory/mem-access.wasm         | Bin 117 -> 0 bytes
 test/cases/wasm/memory/mem-access.wat          |   1 +
 test/cases/wasm/memory/memory.wasm             | Bin 47 -> 0 bytes
 test/cases/wasm/memory/memory.wat              |   4 ++++
 test/cases/wasm/memory/run.js                  |   4 ++--
 test/cases/wasm/order/a.js                     |   2 +-
 test/cases/wasm/order/wasm.wasm                | Bin 82 -> 0 bytes
 test/cases/wasm/simple/index.js                |   2 +-
 test/cases/wasm/simple/module.js               |   2 +-
 test/cases/wasm/simple/wasm.wasm               | Bin 63 -> 0 bytes
 test/cases/wasm/simple/wasm.wat                |  10 ++++++++++
 test/cases/wasm/table/index.js                 |   6 +++---
 test/cases/wasm/table/wasm-table-export.wasm   | Bin 85 -> 0 bytes
 test/cases/wasm/table/wasm-table-export.wat    |   9 +++++++++
 test/cases/wasm/table/wasm-table-imported.wasm | Bin 105 -> 0 bytes
 test/cases/wasm/table/wasm-table-imported.wat  |   8 ++++++++
 test/cases/wasm/table/wasm-table.wasm          | Bin 84 -> 0 bytes
 test/cases/wasm/table/wasm-table.wat           |  14 ++++++++++++++
 yarn.lock                                      |  12 ++++++------
 33 files changed, 101 insertions(+), 23 deletions(-)
 delete mode 100644 test/cases/wasm/import-wasm-wasm/wasm.wasm
 create mode 100644 test/cases/wasm/import-wasm-wasm/wasm.wat
 delete mode 100644 test/cases/wasm/import-wasm-wasm/wasm2.wasm
 create mode 100644 test/cases/wasm/import-wasm-wasm/wasm2.wat
 delete mode 100644 test/cases/wasm/imports-circular/wasm.wasm
 create mode 100644 test/cases/wasm/imports-circular/wasm.wat
 delete mode 100644 test/cases/wasm/imports/wasm.wasm
 create mode 100644 test/cases/wasm/imports/wasm.wat
 delete mode 100644 test/cases/wasm/memory/mem-access.wasm
 create mode 100644 test/cases/wasm/memory/mem-access.wat
 delete mode 100644 test/cases/wasm/memory/memory.wasm
 create mode 100644 test/cases/wasm/memory/memory.wat
 delete mode 100644 test/cases/wasm/order/wasm.wasm
 delete mode 100644 test/cases/wasm/simple/wasm.wasm
 create mode 100644 test/cases/wasm/simple/wasm.wat
 delete mode 100644 test/cases/wasm/table/wasm-table-export.wasm
 create mode 100644 test/cases/wasm/table/wasm-table-export.wat
 delete mode 100644 test/cases/wasm/table/wasm-table-imported.wasm
 create mode 100644 test/cases/wasm/table/wasm-table-imported.wat
 delete mode 100644 test/cases/wasm/table/wasm-table.wasm
 create mode 100644 test/cases/wasm/table/wasm-table.wat

diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
index 0ff86d5a84b..d947e6a97db 100644
--- a/lib/WebpackOptionsDefaulter.js
+++ b/lib/WebpackOptionsDefaulter.js
@@ -73,11 +73,6 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			{
 				test: /\.wasm$/i,
 				type: "webassembly/experimental"
-			},
-			{
-				test: /\.wast$/i,
-				loader: "@webassemblyjs/wast-loader",
-				type: "webassembly/experimental"
 			}
 		]);
 
diff --git a/package.json b/package.json
index ce8548bec2c..8a4bae952fa 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,6 @@
     "@webassemblyjs/ast": "1.4.3",
     "@webassemblyjs/wasm-edit": "1.4.3",
     "@webassemblyjs/wasm-parser": "1.4.3",
-    "@webassemblyjs/wast-loader": "^1.5.4",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
@@ -73,6 +72,7 @@
     "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"
diff --git a/test/TestCases.template.js b/test/TestCases.template.js
index c860c7211b4..ce8d15985c3 100644
--- a/test/TestCases.template.js
+++ b/test/TestCases.template.js
@@ -141,6 +141,11 @@ const describeCases = config => {
 										{
 											test: /\.pug/,
 											loader: "pug-loader"
+										},
+										{
+											test: /\.wat$/i,
+											loader: "wast-loader",
+											type: "webassembly/experimental"
 										}
 									]
 								},
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 a05b904f6fe209b4325bcb5e1a8edc682342136b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 78
zcmZQbEY4+QU|?Y6VoG3OtWRL9XRK$EV&u`&F9*sP>48Yj^wbi+(%hufA_fL#CPqef
YUPjKuloY5CBNrzlJA(p)07Dix0FfII5C8xG

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 067de62c2d0812c006514e4705cf8144bc71db07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 42
xcmZQbEY4+QU|?WmWlUgTtY>CoWMJoI<V;U3@hi<uN-bhw;9_HBVQ>`V1^|d?25tZV

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/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 f5a703f15e1395d495b4020051d72c7c24e42632..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 74
zcmZQbEY4+QU|?Y6VoG3OtWRL9XRK!uW8~1&&&^LM%}M1<Pc88)%}q)zVqjoqVq|3J
YW#mjuNr4J6a&a=UGbk_!Fl2E906g9fz5oCK

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/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 f5a703f15e1395d495b4020051d72c7c24e42632..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 74
zcmZQbEY4+QU|?Y6VoG3OtWRL9XRK!uW8~1&&&^LM%}M1<Pc88)%}q)zVqjoqVq|3J
YW#mjuNr4J6a&a=UGbk_!Fl2E906g9fz5oCK

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 9150b70d0afe70857a955007eecd7cb4c35328bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 117
zcmXAiu?oU47=-UG(ilr8r-Fl{Q@XkPCdm+-Vv7~TDX;Edy4-zm9~|;p34lQfY>5pT
zImD@!I=_GMYkRk|K<6y{AonaEz^#@%o#pYsP3VL56?Y?C4zFAbdtr0AsXEGj2rhs0
CbrX^R

diff --git a/test/cases/wasm/memory/mem-access.wat b/test/cases/wasm/memory/mem-access.wat
new file mode 100644
index 00000000000..7ad2ad2c8a9
--- /dev/null
+++ b/test/cases/wasm/memory/mem-access.wat
@@ -0,0 +1 @@
+(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))))

\ No newline at end of file
diff --git a/test/cases/wasm/memory/memory.wasm b/test/cases/wasm/memory/memory.wasm
deleted file mode 100644
index 4c09473966aa79d75a94c37ed1d9632bfd9869f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 47
zcmZQbEY4+QU|?WnW@KPw=VD~bP0h_Os$^o|=3-=U<l$xk$}uo-u;eA?rZO=y005Ro
B1|k3e

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 105c6a1a97f5e92875659258dc9718dc2383faad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 82
zcmW;CF$#bn00q$h6-0CC4$bLJT3a=dsBqDmy?W8~mWS910Z@y;jsS>R80YUA)0M0F
fUB3h<=aV~|Epb26@{}!C*&zj~$w5<L!U+2U?fek;

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 5364a02e7843ddafd1d3273e61e29a4ab08c1939..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 63
zcmZQbEY4+QU|?Y6W=deHuV<`JU|_6gW@chwWEW;)PE1K*VBkzoE%7VOO-e0dVC3Rs
SVrNibP+-jBW?^vD;06F&`3htJ

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 29dba516860302289a92274605db0854e300e0ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85
zcmWN|u?>JA6a>(_;}b<<?GARj0h@>kRANlDcXe%E_mJ;K0QB6z*Es=Zyr3@7KY2e2
e5qcsa3LK&gX^uZ*#AIh~g+WkVsJhDko%jHne+eM~

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 446719fd6f2b357366eda6dbccd48e1449097869..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 105
zcmZQbEY4+QU|?Y6VoG3OtWRL9XRK#ZVU*C*F9*u#mLw+Sr0S+t6yz6`=z&C7!6J+W
z3{1>SjEwC3jNHkIIXO<1o_Q&$6$}hqoQ&)Y3Jih_4BQO7EP08!sZ4B)3_zF(00{~f
ALjV8(

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 157fe739c8f811023de43c8e6ffca93ceaa56926..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 84
zcmW;6F%CdL5CzcxXEs?(5OD#uThO_M4Z0-~4b@(qDBeT3b^>6fGnjr%OzIR6=XgSV
fO<O{Y<1-!Wc0=-v7+?YxtvU?7eU;|Xp&{%AA3h5U

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/yarn.lock b/yarn.lock
index 0d760491176..c112730b4ce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -125,12 +125,6 @@
     "@webassemblyjs/wasm-parser" "1.4.3"
     webassemblyjs "1.4.3"
 
-"@webassemblyjs/wast-loader@^1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-loader/-/wast-loader-1.5.4.tgz#6db66671edc5955cb77cbf90a6c4f627f6335a6a"
-  dependencies:
-    wabt "^1.0.0"
-
 "@webassemblyjs/wast-parser@1.4.3":
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz#3250402e2c5ed53dbe2233c9de1fe1f9f0d51745"
@@ -6273,6 +6267,12 @@ walker@~1.0.5:
   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"

From aa99385b9acade1230843269ed925c9b5a89a6be Mon Sep 17 00:00:00 2001
From: Aliaksei Sapach <dreamsonic@tut.by>
Date: Thu, 24 May 2018 15:15:41 +0300
Subject: [PATCH 092/111] added a note about production mode

---
 examples/dll-entry-only/README.md         | 4 ++--
 examples/dll-entry-only/webpack.config.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/dll-entry-only/README.md b/examples/dll-entry-only/README.md
index d0d606492e0..6a9f0b50d0a 100644
--- a/examples/dll-entry-only/README.md
+++ b/examples/dll-entry-only/README.md
@@ -39,7 +39,7 @@ var path = require("path");
 var webpack = require("../../");
 
 module.exports = {
-	// mode: "development || "production",
+	// mode: "development" || "production",
 	entry: {
 		dll: ["./example"]
 	},
@@ -49,7 +49,7 @@ module.exports = {
 		library: "[name]_[hash]"
 	},
 	optimization: {
-		concatenateModules: true
+		concatenateModules: true // this is enabled by default in production mode
 	},
 	plugins: [
 		new webpack.DllPlugin({
diff --git a/examples/dll-entry-only/webpack.config.js b/examples/dll-entry-only/webpack.config.js
index 65767239806..768b81d76a7 100644
--- a/examples/dll-entry-only/webpack.config.js
+++ b/examples/dll-entry-only/webpack.config.js
@@ -2,7 +2,7 @@ var path = require("path");
 var webpack = require("../../");
 
 module.exports = {
-	// mode: "development || "production",
+	// mode: "development" || "production",
 	entry: {
 		dll: ["./example"]
 	},
@@ -12,7 +12,7 @@ module.exports = {
 		library: "[name]_[hash]"
 	},
 	optimization: {
-		concatenateModules: true
+		concatenateModules: true // this is enabled by default in production mode
 	},
 	plugins: [
 		new webpack.DllPlugin({

From 00eafa6d3bad7dc669cb260b1c8d5ebad399462f Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <contact@xtuc.fr>
Date: Thu, 24 May 2018 14:16:20 +0200
Subject: [PATCH 093/111] Update mem-access.wat

---
 test/cases/wasm/memory/mem-access.wat | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/cases/wasm/memory/mem-access.wat b/test/cases/wasm/memory/mem-access.wat
index 7ad2ad2c8a9..50870824331 100644
--- a/test/cases/wasm/memory/mem-access.wat
+++ b/test/cases/wasm/memory/mem-access.wat
@@ -1 +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))))

\ No newline at end of file
+(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))))

From 374376d6dc0f0ecb565aad4f154bb0cc1f427359 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 24 May 2018 15:37:52 +0200
Subject: [PATCH 094/111] fixes #7382

---
 lib/optimize/RuntimeChunkPlugin.js            | 14 ++++++---
 .../__snapshots__/StatsTestCases.test.js.snap |  5 +++
 .../statsCases/runtime-chunk-issue-7382/e1.js |  1 +
 .../statsCases/runtime-chunk-issue-7382/e2.js |  1 +
 .../webpack.config.js                         | 31 +++++++++++++++++++
 5 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 test/statsCases/runtime-chunk-issue-7382/e1.js
 create mode 100644 test/statsCases/runtime-chunk-issue-7382/e2.js
 create mode 100644 test/statsCases/runtime-chunk-issue-7382/webpack.config.js

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/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
index b1226b7d44c..6d359b7f07c 100644
--- a/test/__snapshots__/StatsTestCases.test.js.snap
+++ b/test/__snapshots__/StatsTestCases.test.js.snap
@@ -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"
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"
+				}
+			}
+		}
+	}
+};

From 25c7b07ef35e702b4a34ead502e88e078030d35f Mon Sep 17 00:00:00 2001
From: moondef <stpnsamko@gmail.com>
Date: Thu, 24 May 2018 17:05:56 +0300
Subject: [PATCH 095/111] Fix link

---
 lib/NormalModuleFactory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
index f38ea23a8e3..91ef80baf29 100644
--- a/lib/NormalModuleFactory.js
+++ b/lib/NormalModuleFactory.js
@@ -401,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);
 								}

From f026310ad6aa848b98a0ce2dd4dc2cc4561048e1 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 24 May 2018 16:07:19 +0200
Subject: [PATCH 096/111] only record number ids

fixes #7381
---
 lib/RecordIdsPlugin.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/RecordIdsPlugin.js b/lib/RecordIdsPlugin.js
index 78dc372fc52..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);

From 72a45ab9a9704d42bb8f82ee357a9c54486d6cc1 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Thu, 24 May 2018 13:24:43 +0200
Subject: [PATCH 097/111] speed up CI

---
 .travis.yml  | 34 ++++++++--------------------------
 appveyor.yml | 32 ++++++++++++++++----------------
 package.json | 20 +++++++++-----------
 3 files changed, 33 insertions(+), 53 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fb7677098a5..184cf5ee220 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,45 +26,27 @@ matrix:
       stage: basic
     - 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=lint-unit
       stage: advanced
     - os: linux
       node_js: "10"
-      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration1
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
       stage: advanced
-    - os: linux
-      node_js: "10"
-      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration2
-      stage: advanced
-    - os: linux
-      node_js: "10"
-      env: NO_WATCH_TESTS=1 JOB_PART=unit
-      stage: advanced
-    - os: osx
-      node_js: "10"
-      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration1
-      stage: versions
     - os: osx
       node_js: "10"
-      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration2
-      stage: versions
-    - os: linux
-      node_js: "8"
-      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration1
+      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=integration2
+      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=integration1
-      stage: versions
-    - os: linux
-      node_js: "6"
-      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration2
+      env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
       stage: versions
   fast_finish: true
+  allow_failures:
+    - os: osx
 
 install:
   - yarn --frozen-lockfile
@@ -76,7 +58,7 @@ 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/appveyor.yml b/appveyor.yml
index dd1cc0f9e91..bd61e1135c5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,30 +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
-      job_part: integration1
-      jest: --maxWorkers=2
-    - nodejs_version: 8
-      job_part: integration2
-      jest: --maxWorkers=2
-    - nodejs_version: 6
-      job_part: integration1
-      jest: --maxWorkers=2
+      jest: --maxWorkers=2 --cacheDirectory .jest-cache
+    - nodejs_version: 10
+      job_part: integration
+      jest: --maxWorkers=2 --cacheDirectory .jest-cache
     - nodejs_version: 6
-      job_part: integration2
-      jest: --maxWorkers=2
+      job_part: integration
+      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
 
@@ -44,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/package.json b/package.json
index c2fc8509038..ab8cc8eec0e 100644
--- a/package.json
+++ b/package.json
@@ -102,15 +102,12 @@
     "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:integration1": "yarn cover:init && yarn cover:integration \"test/((?!TestCases)|TestCasesD)\" --ci $JEST && yarn cover:report-min",
-    "travis:integration2": "yarn cover:init && yarn cover:integration \"test/TestCases(?!D)\" --ci $JEST && yarn cover:report-min",
+    "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:unit": "yarn cover:init && yarn cover:unit --ci",
-    "travis:lint": "yarn lint",
+    "travis:lint-unit": "yarn lint && yarn cover:init && yarn cover:unit --ci $JEST",
     "travis:benchmark": "yarn benchmark --ci",
-    "appveyor:integration1": "yarn cover:init && yarn cover:integration \"test/((?!TestCases)|TestCasesD)\" --ci %JEST% && yarn cover:report-min",
-    "appveyor:integration2": "yarn cover:init && yarn cover:integration \"test/TestCases(?!D)\" --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",
@@ -129,8 +126,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,
@@ -147,7 +143,8 @@
       "<rootDir>/test/fixtures/temp-",
       "<rootDir>/benchmark/",
       "<rootDir>/examples/*/dist",
-      "<rootDir>/coverage/"
+      "<rootDir>/coverage/",
+      "<rootDir>/.eslintcache/"
     ],
     "modulePathIgnorePatterns": [
       "<rootDir>/node_modules/webpack/node_modules/",
@@ -157,7 +154,8 @@
       "<rootDir>/test/fixtures/temp-",
       "<rootDir>/benchmark/",
       "<rootDir>/examples/*/dist",
-      "<rootDir>/coverage/"
+      "<rootDir>/coverage/",
+      "<rootDir>/.eslintcache/"
     ],
     "transformIgnorePatterns": [
       "<rootDir>/"

From 713292f47ad161e3f16f53525fc108e34a121f46 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 25 May 2018 10:43:30 +0200
Subject: [PATCH 098/111] update bot for jest tests

---
 open-bot.yaml | 127 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 93 insertions(+), 34 deletions(-)

diff --git a/open-bot.yaml b/open-bot.yaml
index 5721f82dbd6..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
@@ -567,7 +626,7 @@ rules:
 
 
 
-# Check issues every week
+# Check open issues and pull requests every day
 - filters:
     open: true
   actions:

From 69567a1db299d89827771ad114ba23afd359d772 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 25 May 2018 10:56:04 +0200
Subject: [PATCH 099/111] update test case to reflect change

---
 test/configCases/records/stable-sort/test.js           | 2 +-
 test/configCases/records/stable-sort/webpack.config.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/configCases/records/stable-sort/test.js b/test/configCases/records/stable-sort/test.js
index 9e426ed34ad..9a7c63ce254 100644
--- a/test/configCases/records/stable-sort/test.js
+++ b/test/configCases/records/stable-sort/test.js
@@ -10,5 +10,5 @@ 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, "main", "split"]);
+	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
index 2a39b41e118..56c58a64209 100644
--- a/test/configCases/records/stable-sort/webpack.config.js
+++ b/test/configCases/records/stable-sort/webpack.config.js
@@ -7,6 +7,9 @@ module.exports = {
 		__dirname,
 		"../../../js/config/records/stable-sort/records.json"
 	),
+	optimization: {
+		namedChunks: false
+	},
 	target: "node",
 	node: {
 		__dirname: false

From d0ce47ddc6c1d7d3f6054cb9c0e59e386a71ef68 Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Fri, 25 May 2018 15:01:02 +0200
Subject: [PATCH 100/111] chore: bump webassemblyjs 1.5.7

---
 package.json |   8 +--
 yarn.lock    | 199 ++++++++++++++++++++++++---------------------------
 2 files changed, 99 insertions(+), 108 deletions(-)

diff --git a/package.json b/package.json
index d8f6c9ccd4d..6763a7642d4 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,10 @@
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
   "dependencies": {
-    "@webassemblyjs/ast": "1.5.4",
-    "@webassemblyjs/wasm-edit": "1.5.4",
-    "@webassemblyjs/wasm-opt": "1.5.4",
-    "@webassemblyjs/wasm-parser": "1.5.4",
+    "@webassemblyjs/ast": "1.5.7",
+    "@webassemblyjs/wasm-edit": "1.5.7",
+    "@webassemblyjs/wasm-opt": "1.5.7",
+    "@webassemblyjs/wasm-parser": "1.5.7",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
diff --git a/yarn.lock b/yarn.lock
index d506225e5dc..7d8c4f8fc9e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -34,121 +34,124 @@
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
 
-"@webassemblyjs/ast@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.4.tgz#b459d032edd00c98dd3de46d6850845d5d588ad4"
+"@webassemblyjs/ast@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.7.tgz#af544e995a4e9132791987c92d333378afcfb046"
   dependencies:
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.4"
-    "@webassemblyjs/wast-parser" "1.5.4"
+    "@webassemblyjs/helper-module-context" "1.5.7"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.7"
+    "@webassemblyjs/wast-parser" "1.5.7"
     debug "^3.1.0"
-    webassemblyjs "1.5.4"
+    mamacro "^0.0.3"
 
-"@webassemblyjs/floating-point-hex-parser@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.4.tgz#b51b380a86914ae87ec075965eee24ac393c967e"
+"@webassemblyjs/floating-point-hex-parser@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.7.tgz#45d88100cdc5c068c961fd606d1deaa2bc55b061"
 
-"@webassemblyjs/helper-buffer@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.4.tgz#2280e11dfd3109cdff5de6651f6d019a2d4346f9"
+"@webassemblyjs/helper-api-error@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.7.tgz#b5030962e196767ee30645ecfc03866857855ed3"
+
+"@webassemblyjs/helper-buffer@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.7.tgz#24e5a31e7786e1062d9b45e746f9aebe9d041323"
   dependencies:
     debug "^3.1.0"
 
-"@webassemblyjs/helper-code-frame@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.4.tgz#78daa37c08f6c4853d67608e389606c980e9d59e"
+"@webassemblyjs/helper-code-frame@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.7.tgz#f98b941e32a254b7d85340f8425f31d250ae1aab"
   dependencies:
-    "@webassemblyjs/wast-printer" "1.5.4"
+    "@webassemblyjs/wast-printer" "1.5.7"
+
+"@webassemblyjs/helper-fsm@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.7.tgz#92efc1e1cd307087087f843e5919fb71e0b49a9d"
 
-"@webassemblyjs/helper-fsm@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.4.tgz#94c2ebf7f08d19e5083e9f33278c516c4bde98fe"
+"@webassemblyjs/helper-module-context@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.7.tgz#5525cdea9ffeea4e131872dfcc55f856e5cc8a64"
 
-"@webassemblyjs/helper-wasm-bytecode@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.4.tgz#70eca87631f61458562ed462e72db4abe789dc5d"
+"@webassemblyjs/helper-wasm-bytecode@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.7.tgz#319a3e8ec7248ff32df3f7b48335a31b7ac3f503"
 
-"@webassemblyjs/helper-wasm-section@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.4.tgz#73652f04fbc7cf3efc60eb9474eb2bddea915d1f"
+"@webassemblyjs/helper-wasm-section@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.7.tgz#8ae8c004b99dc80afcf46a46135c53bc23ec6d71"
   dependencies:
-    "@webassemblyjs/ast" "1.5.4"
-    "@webassemblyjs/helper-buffer" "1.5.4"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.4"
-    "@webassemblyjs/wasm-gen" "1.5.4"
+    "@webassemblyjs/ast" "1.5.7"
+    "@webassemblyjs/helper-buffer" "1.5.7"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.7"
+    "@webassemblyjs/wasm-gen" "1.5.7"
     debug "^3.1.0"
 
-"@webassemblyjs/leb128@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.4.tgz#3adbd9a4c12324397533aedb9ad4b0a6e1837ad1"
+"@webassemblyjs/leb128@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.7.tgz#9dd206782e80a85f969377ce283f4a941b3e37ff"
   dependencies:
     leb "^0.3.0"
 
-"@webassemblyjs/validation@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.5.4.tgz#4efebc3d6634c56b09f7f1f11de7794ff87acb7e"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.4"
-    debug "3.0.1"
-
-"@webassemblyjs/wasm-edit@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.4.tgz#40d3d76a31755e5497559dfe8733fa753e23698d"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.4"
-    "@webassemblyjs/helper-buffer" "1.5.4"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.4"
-    "@webassemblyjs/helper-wasm-section" "1.5.4"
-    "@webassemblyjs/wasm-gen" "1.5.4"
-    "@webassemblyjs/wasm-opt" "1.5.4"
-    "@webassemblyjs/wasm-parser" "1.5.4"
-    "@webassemblyjs/wast-printer" "1.5.4"
+"@webassemblyjs/wasm-edit@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.7.tgz#7d368a3a059028b8b6e756ef333730ddb140f0bc"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.7"
+    "@webassemblyjs/helper-buffer" "1.5.7"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.7"
+    "@webassemblyjs/helper-wasm-section" "1.5.7"
+    "@webassemblyjs/wasm-gen" "1.5.7"
+    "@webassemblyjs/wasm-opt" "1.5.7"
+    "@webassemblyjs/wasm-parser" "1.5.7"
+    "@webassemblyjs/wast-printer" "1.5.7"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-gen@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.4.tgz#e34ce3b4599aa56e28b21afd7731da7d374f0b28"
+"@webassemblyjs/wasm-gen@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.7.tgz#00e36330ef9103bd343e37a90c23a6e2fd4e617d"
   dependencies:
-    "@webassemblyjs/ast" "1.5.4"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.4"
-    "@webassemblyjs/leb128" "1.5.4"
+    "@webassemblyjs/ast" "1.5.7"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.7"
+    "@webassemblyjs/leb128" "1.5.7"
 
-"@webassemblyjs/wasm-opt@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.4.tgz#8abc137664f3bca68cf1d20597fd755787d6a380"
+"@webassemblyjs/wasm-opt@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.7.tgz#c0b8ff4241549aca63f72284cc945c8556d5702e"
   dependencies:
-    "@webassemblyjs/ast" "1.5.4"
-    "@webassemblyjs/helper-buffer" "1.5.4"
-    "@webassemblyjs/wasm-gen" "1.5.4"
-    "@webassemblyjs/wasm-parser" "1.5.4"
+    "@webassemblyjs/ast" "1.5.7"
+    "@webassemblyjs/helper-buffer" "1.5.7"
+    "@webassemblyjs/wasm-gen" "1.5.7"
+    "@webassemblyjs/wasm-parser" "1.5.7"
     debug "^3.1.0"
 
-"@webassemblyjs/wasm-parser@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.4.tgz#9abaf1b2c521c0d01051cd0a65a1d74b3d78deaa"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.4"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.4"
-    "@webassemblyjs/leb128" "1.5.4"
-    "@webassemblyjs/wasm-parser" "1.5.4"
-    webassemblyjs "1.5.4"
-
-"@webassemblyjs/wast-parser@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.4.tgz#799a78355f153607c541fdbfe0466119afc8e808"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.4"
-    "@webassemblyjs/floating-point-hex-parser" "1.5.4"
-    "@webassemblyjs/helper-code-frame" "1.5.4"
-    "@webassemblyjs/helper-fsm" "1.5.4"
+"@webassemblyjs/wasm-parser@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.7.tgz#2d3513e3437596ac19584f09abab5a5d482a0fb6"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.7"
+    "@webassemblyjs/helper-api-error" "1.5.7"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.7"
+    "@webassemblyjs/leb128" "1.5.7"
+    "@webassemblyjs/wasm-parser" "1.5.7"
+
+"@webassemblyjs/wast-parser@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.7.tgz#56692821e2190a4dcddd3fa460cdfda0ab120f74"
+  dependencies:
+    "@webassemblyjs/ast" "1.5.7"
+    "@webassemblyjs/floating-point-hex-parser" "1.5.7"
+    "@webassemblyjs/helper-api-error" "1.5.7"
+    "@webassemblyjs/helper-code-frame" "1.5.7"
+    "@webassemblyjs/helper-fsm" "1.5.7"
     long "^3.2.0"
-    webassemblyjs "1.5.4"
+    mamacro "^0.0.3"
 
-"@webassemblyjs/wast-printer@1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.4.tgz#c02284c96735537f15944dfab5150df3935bcb8d"
+"@webassemblyjs/wast-printer@1.5.7":
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.7.tgz#89d74f7fbe0ff5560e87a50afd28183074b6327b"
   dependencies:
-    "@webassemblyjs/ast" "1.5.4"
-    "@webassemblyjs/wast-parser" "1.5.4"
+    "@webassemblyjs/ast" "1.5.7"
+    "@webassemblyjs/wast-parser" "1.5.7"
     long "^3.2.0"
 
 abab@^1.0.4:
@@ -1471,12 +1474,6 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-debug@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64"
-  dependencies:
-    ms "2.0.0"
-
 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"
@@ -3736,6 +3733,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"
@@ -6202,16 +6203,6 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-webassemblyjs@1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.5.4.tgz#d8b2a4c2d70a4c911ca446f20e49bc22cde09d15"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.4"
-    "@webassemblyjs/validation" "1.5.4"
-    "@webassemblyjs/wasm-parser" "1.5.4"
-    "@webassemblyjs/wast-parser" "1.5.4"
-    long "^3.2.0"
-
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"

From 55ce14387efef4c958bfd3587b4deaf87970068a Mon Sep 17 00:00:00 2001
From: Florent Cailhol <florent.cailhol@gmail.com>
Date: Fri, 25 May 2018 15:37:15 +0200
Subject: [PATCH 101/111] Add test case

---
 test/cases/parsing/issue-7335/a.js     |  1 +
 test/cases/parsing/issue-7335/index.js | 27 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 test/cases/parsing/issue-7335/a.js
 create mode 100644 test/cases/parsing/issue-7335/index.js

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);
+});

From f22fffdd4709c069ca00401854dad898cdf2b22e Mon Sep 17 00:00:00 2001
From: Florent Cailhol <florent.cailhol@gmail.com>
Date: Fri, 25 May 2018 17:34:19 +0200
Subject: [PATCH 102/111] Evaluate arguments in function's scope

---
 lib/Parser.js | 50 +++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

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);

From bb0731d7897fb8a7369efd9d2f9bf0a8c08d546d Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 25 May 2018 22:17:32 +0200
Subject: [PATCH 103/111] 4.9.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 261a0c1d0c8..102712ab381 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.8.3",
+  "version": "4.9.0",
   "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",

From 94cd709b06ffc7071b3505a746f0bb17fb7e3c33 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Fri, 25 May 2018 23:30:24 +0200
Subject: [PATCH 104/111] 4.9.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dd50dcaa340..b173897b166 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.9.0",
+  "version": "4.9.1",
   "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",

From 115a72ce506bcd19766ea07e972a0c7f269287b7 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Sat, 26 May 2018 23:07:02 +0200
Subject: [PATCH 105/111] SideEffectsPlugin don't modify cache entries

fixes #7400
---
 lib/FlagDependencyUsagePlugin.js              |  8 ++--
 ...armonyExportImportedSpecifierDependency.js | 25 ++++++++---
 lib/dependencies/HarmonyImportDependency.js   | 26 ++++++++----
 .../HarmonyImportSideEffectDependency.js      |  4 +-
 .../HarmonyImportSpecifierDependency.js       | 42 ++++++++++++-------
 lib/optimize/ConcatenatedModule.js            | 30 ++++++-------
 lib/optimize/SideEffectsFlagPlugin.js         | 38 ++++++-----------
 .../__snapshots__/StatsTestCases.test.js.snap | 10 ++---
 .../side-effects/issue-7400/0/index.js        |  6 +++
 .../issue-7400/0/my-module/index.js           |  1 +
 .../issue-7400/0/my-module/myFunction.js      |  3 ++
 .../issue-7400/0/my-module/package.json       |  4 ++
 .../side-effects/issue-7400/0/require-me.js   |  5 +++
 .../side-effects/issue-7400/1/index.js        |  6 +++
 .../side-effects/issue-7400/webpack.config.js |  5 +++
 15 files changed, 132 insertions(+), 81 deletions(-)
 create mode 100644 test/watchCases/side-effects/issue-7400/0/index.js
 create mode 100644 test/watchCases/side-effects/issue-7400/0/my-module/index.js
 create mode 100644 test/watchCases/side-effects/issue-7400/0/my-module/myFunction.js
 create mode 100644 test/watchCases/side-effects/issue-7400/0/my-module/package.json
 create mode 100644 test/watchCases/side-effects/issue-7400/0/require-me.js
 create mode 100644 test/watchCases/side-effects/issue-7400/1/index.js
 create mode 100644 test/watchCases/side-effects/issue-7400/webpack.config.js

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/dependencies/HarmonyExportImportedSpecifierDependency.js b/lib/dependencies/HarmonyExportImportedSpecifierDependency.js
index b4b2f23442b..d35a2b3e683 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/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
index 5b744261aaa..32774a94982 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, {
@@ -1145,7 +1145,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);
@@ -1154,7 +1154,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(
@@ -1168,7 +1168,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);
@@ -1179,14 +1179,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}__`;
@@ -1205,7 +1205,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);
@@ -1214,7 +1214,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(
@@ -1228,7 +1228,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);
@@ -1302,7 +1302,7 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 	}
 
 	getExports(dep) {
-		const importModule = dep.module;
+		const importModule = dep._module;
 		if (dep.id) {
 			// export { named } from "module"
 			return [
@@ -1336,7 +1336,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);
@@ -1345,7 +1345,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(
@@ -1360,7 +1360,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/SideEffectsFlagPlugin.js b/lib/optimize/SideEffectsFlagPlugin.js
index e503262a6ea..a38eb2f8a08 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,7 +102,6 @@ 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];
@@ -106,28 +110,12 @@ class SideEffectsFlagPlugin {
 							if (dep instanceof HarmonyImportSpecifierDependency) {
 								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/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
index 6d359b7f07c..e898e401754 100644
--- a/test/__snapshots__/StatsTestCases.test.js.snap
+++ b/test/__snapshots__/StatsTestCases.test.js.snap
@@ -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"
 `;
 
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
+	}
+};

From 7ebe12dde12a62301fb8979917592fdd5a51012a Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Sun, 27 May 2018 21:47:23 +0200
Subject: [PATCH 106/111] throw error when unexpected state has been found

---
 lib/RuntimeTemplate.js | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/lib/RuntimeTemplate.js b/lib/RuntimeTemplate.js
index 3cb912a20ee..862734cdd62 100644
--- a/lib/RuntimeTemplate.js
+++ b/lib/RuntimeTemplate.js
@@ -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)}`;
 	}
 
@@ -105,10 +111,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
@@ -151,10 +163,16 @@ module.exports = class RuntimeTemplate {
 	}
 
 	importStatement({ update, module, request, importVar, originModule }) {
-		if (!module)
+		if (!module) {
 			return this.missingModuleStatement({
 				request
 			});
+		}
+		if (module.id === null) {
+			throw new Error(
+				`RuntimeTemplate.importStatement(): Module ${module.identifier()} has no id. This should not happen.`
+			);
+		}
 		const comment = this.comment({
 			request
 		});

From ae8d6741d7b363266c437b924349358e64bc13f1 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Sun, 27 May 2018 21:47:58 +0200
Subject: [PATCH 107/111] fix bug with incorrectly emitted modules

---
 lib/optimize/SideEffectsFlagPlugin.js         |  5 ++++-
 .../__snapshots__/StatsTestCases.test.js.snap | 19 +++++++++++++++++++
 .../side-effects-simple-unused/index.js       |  3 +++
 .../node_modules/pmodule/a.js                 |  5 +++++
 .../node_modules/pmodule/b.js                 |  5 +++++
 .../node_modules/pmodule/c.js                 |  3 +++
 .../node_modules/pmodule/index.js             |  4 ++++
 .../node_modules/pmodule/package.json         |  3 +++
 .../webpack.config.js                         |  8 ++++++++
 9 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 test/statsCases/side-effects-simple-unused/index.js
 create mode 100644 test/statsCases/side-effects-simple-unused/node_modules/pmodule/a.js
 create mode 100644 test/statsCases/side-effects-simple-unused/node_modules/pmodule/b.js
 create mode 100644 test/statsCases/side-effects-simple-unused/node_modules/pmodule/c.js
 create mode 100644 test/statsCases/side-effects-simple-unused/node_modules/pmodule/index.js
 create mode 100644 test/statsCases/side-effects-simple-unused/node_modules/pmodule/package.json
 create mode 100644 test/statsCases/side-effects-simple-unused/webpack.config.js

diff --git a/lib/optimize/SideEffectsFlagPlugin.js b/lib/optimize/SideEffectsFlagPlugin.js
index a38eb2f8a08..81a00e52402 100644
--- a/lib/optimize/SideEffectsFlagPlugin.js
+++ b/lib/optimize/SideEffectsFlagPlugin.js
@@ -107,7 +107,10 @@ class SideEffectsFlagPlugin {
 						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) {
 									dep.redirectedModule = mapping.module;
diff --git a/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap
index e898e401754..d1e4e4d454b 100644
--- a/test/__snapshots__/StatsTestCases.test.js.snap
+++ b/test/__snapshots__/StatsTestCases.test.js.snap
@@ -2062,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  2.94 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
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
+	}
+};

From 9c7100ba6023347cd2ded17ec16900753b01c18d Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Mon, 28 May 2018 09:13:51 +0200
Subject: [PATCH 108/111] fix inline object types, add auxiliary comment types

---
 lib/UmdMainTemplatePlugin.js | 54 ++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/lib/UmdMainTemplatePlugin.js b/lib/UmdMainTemplatePlugin.js
index 2cc6626a9df..d01d0da4721 100644
--- a/lib/UmdMainTemplatePlugin.js
+++ b/lib/UmdMainTemplatePlugin.js
@@ -38,9 +38,21 @@ const accessorAccess = (base, accessor, joinWith = "; ") => {
 		.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 {string | string[] | {[k: string]: string | string[]}} UmdMainTemplatePluginName
- * @typedef {{optionalAmdExternalAsGlobal: boolean, namedDefine: boolean, auxiliaryComment: TODO}} UmdMainTemplatePluginOption
+ * @typedef {Object} UmdMainTemplatePluginOption
+ * @property {boolean=} optionalAmdExternalAsGlobal
+ * @property {boolean} namedDefine
+ * @property {string | AuxiliaryCommentObject} auxiliaryComment
  */
 
 class UmdMainTemplatePlugin {
@@ -181,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
@@ -221,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(

From 91546a11ab06406a0249172f8b83e33f6ff64e93 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Mon, 28 May 2018 10:44:30 +0200
Subject: [PATCH 109/111] fix incorrect default

---
 lib/UmdMainTemplatePlugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/UmdMainTemplatePlugin.js b/lib/UmdMainTemplatePlugin.js
index d01d0da4721..5c794767f0a 100644
--- a/lib/UmdMainTemplatePlugin.js
+++ b/lib/UmdMainTemplatePlugin.js
@@ -23,7 +23,7 @@ const accessorToObjectAccess = accessor => {
  * @param {string=} joinWith the element separator
  * @returns {string} the path
  */
-const accessorAccess = (base, accessor, joinWith = "; ") => {
+const accessorAccess = (base, accessor, joinWith = ", ") => {
 	const accessors = Array.isArray(accessor) ? accessor : [accessor];
 	return accessors
 		.map((_, idx) => {

From fd4e84b36fa0066ebc13c1e440b7c7aac98d431f Mon Sep 17 00:00:00 2001
From: Sven SAULEAU <sven.sauleau@xtuc.fr>
Date: Mon, 28 May 2018 14:55:40 +0200
Subject: [PATCH 110/111] fix(wasm): correct initializer type for rewritten
 globals

---
 declarations.d.ts                             |   2 +
 lib/wasm/WebAssemblyGenerator.js              |  22 ++-
 package.json                                  |   8 +-
 .../wasm/imported-global-preserve-type/env.js |   1 +
 .../imported-global-preserve-type/index.js    |   5 +
 .../imported-global-preserve-type/module.wat  |   7 +
 .../test.filter.js                            |   5 +
 yarn.lock                                     | 183 +++++++++---------
 8 files changed, 136 insertions(+), 97 deletions(-)
 create mode 100644 test/cases/wasm/imported-global-preserve-type/env.js
 create mode 100644 test/cases/wasm/imported-global-preserve-type/index.js
 create mode 100644 test/cases/wasm/imported-global-preserve-type/module.wat
 create mode 100644 test/cases/wasm/imported-global-preserve-type/test.filter.js

diff --git a/declarations.d.ts b/declarations.d.ts
index 0aa48818c8b..bd64715943c 100644
--- a/declarations.d.ts
+++ b/declarations.d.ts
@@ -64,6 +64,7 @@ declare module "@webassemblyjs/ast" {
 	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 {
 		valtype: string;
@@ -82,6 +83,7 @@ declare module "@webassemblyjs/ast" {
 	export class IndexInFuncSection extends Node {}
 	export function indexLiteral(index: number): IndexLiteral;
 	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;
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
index 7afb2648efd..9b19c51a2cd 100644
--- a/lib/wasm/WebAssemblyGenerator.js
+++ b/lib/wasm/WebAssemblyGenerator.js
@@ -187,11 +187,23 @@ const rewriteImportedGlobals = state => bin => {
 
 				globalType.mutability = "var";
 
-				newGlobals.push(
-					t.global(globalType, [
-						t.objectInstruction("const", "i32", [t.numberLiteralFromRaw(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();
 			}
diff --git a/package.json b/package.json
index 6763a7642d4..4d14afcce4c 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,10 @@
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
   "dependencies": {
-    "@webassemblyjs/ast": "1.5.7",
-    "@webassemblyjs/wasm-edit": "1.5.7",
-    "@webassemblyjs/wasm-opt": "1.5.7",
-    "@webassemblyjs/wasm-parser": "1.5.7",
+    "@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",
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/yarn.lock b/yarn.lock
index 7d8c4f8fc9e..adab980277f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -34,124 +34,131 @@
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
 
-"@webassemblyjs/ast@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.7.tgz#af544e995a4e9132791987c92d333378afcfb046"
+"@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-module-context" "1.5.7"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.7"
-    "@webassemblyjs/wast-parser" "1.5.7"
+    "@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.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.7.tgz#45d88100cdc5c068c961fd606d1deaa2bc55b061"
+"@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-api-error@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.7.tgz#b5030962e196767ee30645ecfc03866857855ed3"
+"@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-buffer@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.7.tgz#24e5a31e7786e1062d9b45e746f9aebe9d041323"
+"@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:
     debug "^3.1.0"
 
-"@webassemblyjs/helper-code-frame@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.7.tgz#f98b941e32a254b7d85340f8425f31d250ae1aab"
+"@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.7"
+    "@webassemblyjs/wast-printer" "1.5.8"
 
-"@webassemblyjs/helper-fsm@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.7.tgz#92efc1e1cd307087087f843e5919fb71e0b49a9d"
+"@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-module-context@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.7.tgz#5525cdea9ffeea4e131872dfcc55f856e5cc8a64"
+"@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/helper-wasm-bytecode@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.7.tgz#319a3e8ec7248ff32df3f7b48335a31b7ac3f503"
+"@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/helper-wasm-section@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.7.tgz#8ae8c004b99dc80afcf46a46135c53bc23ec6d71"
+"@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.5.7"
-    "@webassemblyjs/helper-buffer" "1.5.7"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.7"
-    "@webassemblyjs/wasm-gen" "1.5.7"
+    "@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/leb128@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.7.tgz#9dd206782e80a85f969377ce283f4a941b3e37ff"
+"@webassemblyjs/ieee754@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.8.tgz#29383c7172e90121613d5614d532f22c19255c3b"
+  dependencies:
+    ieee754 "^1.1.11"
+
+"@webassemblyjs/leb128@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.8.tgz#657c48ef2537ea2921e897a50157be700bf24eac"
   dependencies:
     leb "^0.3.0"
 
-"@webassemblyjs/wasm-edit@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.7.tgz#7d368a3a059028b8b6e756ef333730ddb140f0bc"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.7"
-    "@webassemblyjs/helper-buffer" "1.5.7"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.7"
-    "@webassemblyjs/helper-wasm-section" "1.5.7"
-    "@webassemblyjs/wasm-gen" "1.5.7"
-    "@webassemblyjs/wasm-opt" "1.5.7"
-    "@webassemblyjs/wasm-parser" "1.5.7"
-    "@webassemblyjs/wast-printer" "1.5.7"
+"@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.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.7.tgz#00e36330ef9103bd343e37a90c23a6e2fd4e617d"
+"@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.5.7"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.7"
-    "@webassemblyjs/leb128" "1.5.7"
+    "@webassemblyjs/ast" "1.5.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.5.8"
+    "@webassemblyjs/ieee754" "1.5.8"
+    "@webassemblyjs/leb128" "1.5.8"
 
-"@webassemblyjs/wasm-opt@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.7.tgz#c0b8ff4241549aca63f72284cc945c8556d5702e"
+"@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.5.7"
-    "@webassemblyjs/helper-buffer" "1.5.7"
-    "@webassemblyjs/wasm-gen" "1.5.7"
-    "@webassemblyjs/wasm-parser" "1.5.7"
+    "@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.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.7.tgz#2d3513e3437596ac19584f09abab5a5d482a0fb6"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.7"
-    "@webassemblyjs/helper-api-error" "1.5.7"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.7"
-    "@webassemblyjs/leb128" "1.5.7"
-    "@webassemblyjs/wasm-parser" "1.5.7"
-
-"@webassemblyjs/wast-parser@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.7.tgz#56692821e2190a4dcddd3fa460cdfda0ab120f74"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.7"
-    "@webassemblyjs/floating-point-hex-parser" "1.5.7"
-    "@webassemblyjs/helper-api-error" "1.5.7"
-    "@webassemblyjs/helper-code-frame" "1.5.7"
-    "@webassemblyjs/helper-fsm" "1.5.7"
+"@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"
     mamacro "^0.0.3"
 
-"@webassemblyjs/wast-printer@1.5.7":
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.7.tgz#89d74f7fbe0ff5560e87a50afd28183074b6327b"
+"@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.5.7"
-    "@webassemblyjs/wast-parser" "1.5.7"
+    "@webassemblyjs/ast" "1.5.8"
+    "@webassemblyjs/wast-parser" "1.5.8"
     long "^3.2.0"
 
 abab@^1.0.4:
@@ -2598,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"
 

From 317fb353518179c50342b1ac826d393a85b5903e Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Mon, 28 May 2018 22:28:54 +0200
Subject: [PATCH 111/111] 4.9.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b173897b166..7892d8aa9f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.9.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",