webpack 4.31.0 → 4.33.0

package/README.md

@@ -90,7 +90,7 @@ or packaging just about any resource or asset.
 
 ### Get Started
 
-Check out webpack's quick [**Get Started**](https://webpack.js.org/get-started/) guide and the [other guides](https://webpack.js.org/guides/).
+Check out webpack's quick [**Get Started**](https://webpack.js.org/guides/getting-started) guide and the [other guides](https://webpack.js.org/guides/).
 
 ### Browser Compatibility
 

package/bin/webpack.js

@@ -109,7 +109,7 @@ if (installedClis.length === 0) {
 		)}".`
 	);
 
-	let question = `Do you want to install 'webpack-cli' (yes/no): `;
+	const question = `Do you want to install 'webpack-cli' (yes/no): `;
 
 	const questionInterface = readLine.createInterface({
 		input: process.stdin,

package/declarations/WebpackOptions.d.ts

@@ -22,6 +22,8 @@ export type EntryDynamic = () => EntryStatic | Promise<EntryStatic>;
  */
 export type EntryStatic = EntryObject | EntryItem;
 /**
+ * A non-empty array of non-empty strings
+ *
  * This interface was referenced by `WebpackOptions`'s JSON-Schema
  * via the `definition` "NonEmptyArrayOfUniqueStringValues".
  */
@@ -388,7 +390,8 @@ export interface WebpackOptions {
 				| "async-node"
 				| "node-webkit"
 				| "electron-main"
-				| "electron-renderer")
+				| "electron-renderer"
+				| "electron-preload")
 		| ((compiler: import("../lib/Compiler")) => void);
 	/**
 	 * Enter watch mode, which rebuilds on file change.
@@ -1061,7 +1064,7 @@ export interface OutputOptions {
 	 */
 	filename?: string | Function;
 	/**
-	 * Use the future version of asset emitting logic, which is allows freeing memory of assets after emitting. It could break plugins which assume that assets are still readable after emitting. Will be the new default in the next major version.
+	 * Use the future version of asset emitting logic, which allows freeing memory of assets after emitting. It could break plugins which assume that assets are still readable after emitting. Will be the new default in the next major version.
 	 */
 	futureEmitAssets?: boolean;
 	/**

package/lib/Chunk.js

@@ -688,7 +688,15 @@ class Chunk {
 		};
 
 		if (includeDirectChildren) {
-			addChildIdsByOrdersToMap(this);
+			const chunks = new Set();
+			for (const chunkGroup of this.groupsIterable) {
+				for (const chunk of chunkGroup.chunks) {
+					chunks.add(chunk);
+				}
+			}
+			for (const chunk of chunks) {
+				addChildIdsByOrdersToMap(chunk);
+			}
 		}
 
 		for (const chunk of this.getAllAsyncChunks()) {

package/lib/CommonJsStuffPlugin.js

@@ -0,0 +1,114 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const path = require("path");
+const ParserHelpers = require("./ParserHelpers");
+
+class CommonJsStuffPlugin {
+	apply(compiler) {
+		compiler.hooks.compilation.tap(
+			"CommonJsStuffPlugin",
+			(compilation, { normalModuleFactory }) => {
+				const handler = (parser, parserOptions) => {
+					parser.hooks.expression
+						.for("require.main.require")
+						.tap(
+							"CommonJsStuffPlugin",
+							ParserHelpers.expressionIsUnsupported(
+								parser,
+								"require.main.require is not supported by webpack."
+							)
+						);
+					parser.hooks.expression
+						.for("module.parent.require")
+						.tap(
+							"CommonJsStuffPlugin",
+							ParserHelpers.expressionIsUnsupported(
+								parser,
+								"module.parent.require is not supported by webpack."
+							)
+						);
+					parser.hooks.expression
+						.for("require.main")
+						.tap(
+							"CommonJsStuffPlugin",
+							ParserHelpers.toConstantDependencyWithWebpackRequire(
+								parser,
+								"__webpack_require__.c[__webpack_require__.s]"
+							)
+						);
+					parser.hooks.expression
+						.for("module.loaded")
+						.tap("CommonJsStuffPlugin", expr => {
+							parser.state.module.buildMeta.moduleConcatenationBailout =
+								"module.loaded";
+							return ParserHelpers.toConstantDependency(parser, "module.l")(
+								expr
+							);
+						});
+					parser.hooks.expression
+						.for("module.id")
+						.tap("CommonJsStuffPlugin", expr => {
+							parser.state.module.buildMeta.moduleConcatenationBailout =
+								"module.id";
+							return ParserHelpers.toConstantDependency(parser, "module.i")(
+								expr
+							);
+						});
+					parser.hooks.expression
+						.for("module.exports")
+						.tap("CommonJsStuffPlugin", () => {
+							const module = parser.state.module;
+							const isHarmony =
+								module.buildMeta && module.buildMeta.exportsType;
+							if (!isHarmony) return true;
+						});
+					parser.hooks.evaluateIdentifier
+						.for("module.hot")
+						.tap(
+							"CommonJsStuffPlugin",
+							ParserHelpers.evaluateToIdentifier("module.hot", false)
+						);
+					parser.hooks.expression
+						.for("module")
+						.tap("CommonJsStuffPlugin", () => {
+							const module = parser.state.module;
+							const isHarmony =
+								module.buildMeta && module.buildMeta.exportsType;
+							let moduleJsPath = path.join(
+								__dirname,
+								"..",
+								"buildin",
+								isHarmony ? "harmony-module.js" : "module.js"
+							);
+							if (module.context) {
+								moduleJsPath = path.relative(
+									parser.state.module.context,
+									moduleJsPath
+								);
+								if (!/^[A-Z]:/i.test(moduleJsPath)) {
+									moduleJsPath = `./${moduleJsPath.replace(/\\/g, "/")}`;
+								}
+							}
+							return ParserHelpers.addParsedVariableToModule(
+								parser,
+								"module",
+								`require(${JSON.stringify(moduleJsPath)})(module)`
+							);
+						});
+				};
+
+				normalModuleFactory.hooks.parser
+					.for("javascript/auto")
+					.tap("CommonJsStuffPlugin", handler);
+				normalModuleFactory.hooks.parser
+					.for("javascript/dynamic")
+					.tap("CommonJsStuffPlugin", handler);
+			}
+		);
+	}
+}
+module.exports = CommonJsStuffPlugin;

package/lib/HotModuleReplacement.runtime.js

@@ -290,7 +290,7 @@ module.exports = function() {
 			var outdatedModules = [updateModuleId];
 			var outdatedDependencies = {};
 
-			var queue = outdatedModules.slice().map(function(id) {
+			var queue = outdatedModules.map(function(id) {
 				return {
 					chain: [id],
 					id: id
@@ -467,12 +467,15 @@ module.exports = function() {
 			moduleId = outdatedModules[i];
 			if (
 				installedModules[moduleId] &&
-				installedModules[moduleId].hot._selfAccepted
-			)
+				installedModules[moduleId].hot._selfAccepted &&
+				// removed self-accepted modules should not be required
+				appliedUpdate[moduleId] !== warnUnexpectedRequire
+			) {
 				outdatedSelfAcceptedModules.push({
 					module: moduleId,
 					errorHandler: installedModules[moduleId].hot._selfAccepted
 				});
+			}
 		}
 
 		// Now in "dispose" phase
@@ -539,7 +542,7 @@ module.exports = function() {
 			}
 		}
 
-		// Not in "apply" phase
+		// Now in "apply" phase
 		hotSetStatus("apply");
 
 		hotCurrentHash = hotUpdateNewHash;

package/lib/MainTemplate.js

@@ -98,6 +98,8 @@ module.exports = class MainTemplate extends Tapable {
 			beforeStartup: new SyncWaterfallHook(["source", "chunk", "hash"]),
 			/** @type {SyncWaterfallHook<string, Chunk, string>} */
 			startup: new SyncWaterfallHook(["source", "chunk", "hash"]),
+			/** @type {SyncWaterfallHook<string, Chunk, string>} */
+			afterStartup: new SyncWaterfallHook(["source", "chunk", "hash"]),
 			render: new SyncWaterfallHook([
 				"source",
 				"chunk",
@@ -404,7 +406,20 @@ module.exports = class MainTemplate extends Tapable {
 		);
 		buf.push("");
 		buf.push(Template.asString(this.hooks.beforeStartup.call("", chunk, hash)));
+		const afterStartupCode = Template.asString(
+			this.hooks.afterStartup.call("", chunk, hash)
+		);
+		if (afterStartupCode) {
+			// TODO webpack 5: this is a bit hacky to avoid a breaking change
+			// change it to a better way
+			buf.push("var startupResult = (function() {");
+		}
 		buf.push(Template.asString(this.hooks.startup.call("", chunk, hash)));
+		if (afterStartupCode) {
+			buf.push("})();");
+			buf.push(afterStartupCode);
+			buf.push("return startupResult;");
+		}
 		return buf;
 	}
 

package/lib/NodeStuffPlugin.js

@@ -58,47 +58,42 @@ class NodeStuffPlugin {
 							});
 					};
 					const context = compiler.context;
-					if (localOptions.__filename === "mock") {
-						setConstant("__filename", "/index.js");
-					} else if (localOptions.__filename) {
-						setModuleConstant("__filename", module =>
-							path.relative(context, module.resource)
-						);
+					if (localOptions.__filename) {
+						if (localOptions.__filename === "mock") {
+							setConstant("__filename", "/index.js");
+						} else {
+							setModuleConstant("__filename", module =>
+								path.relative(context, module.resource)
+							);
+						}
+						parser.hooks.evaluateIdentifier
+							.for("__filename")
+							.tap("NodeStuffPlugin", expr => {
+								if (!parser.state.module) return;
+								const resource = parser.state.module.resource;
+								const i = resource.indexOf("?");
+								return ParserHelpers.evaluateToString(
+									i < 0 ? resource : resource.substr(0, i)
+								)(expr);
+							});
 					}
-					parser.hooks.evaluateIdentifier
-						.for("__filename")
-						.tap("NodeStuffPlugin", expr => {
-							if (!parser.state.module) return;
-							const resource = parser.state.module.resource;
-							const i = resource.indexOf("?");
-							return ParserHelpers.evaluateToString(
-								i < 0 ? resource : resource.substr(0, i)
-							)(expr);
-						});
-					if (localOptions.__dirname === "mock") {
-						setConstant("__dirname", "/");
-					} else if (localOptions.__dirname) {
-						setModuleConstant("__dirname", module =>
-							path.relative(context, module.context)
-						);
+					if (localOptions.__dirname) {
+						if (localOptions.__dirname === "mock") {
+							setConstant("__dirname", "/");
+						} else {
+							setModuleConstant("__dirname", module =>
+								path.relative(context, module.context)
+							);
+						}
+						parser.hooks.evaluateIdentifier
+							.for("__dirname")
+							.tap("NodeStuffPlugin", expr => {
+								if (!parser.state.module) return;
+								return ParserHelpers.evaluateToString(
+									parser.state.module.context
+								)(expr);
+							});
 					}
-					parser.hooks.evaluateIdentifier
-						.for("__dirname")
-						.tap("NodeStuffPlugin", expr => {
-							if (!parser.state.module) return;
-							return ParserHelpers.evaluateToString(
-								parser.state.module.context
-							)(expr);
-						});
-					parser.hooks.expression
-						.for("require.main")
-						.tap(
-							"NodeStuffPlugin",
-							ParserHelpers.toConstantDependencyWithWebpackRequire(
-								parser,
-								"__webpack_require__.c[__webpack_require__.s]"
-							)
-						);
 					parser.hooks.expression
 						.for("require.extensions")
 						.tap(
@@ -108,80 +103,6 @@ class NodeStuffPlugin {
 								"require.extensions is not supported by webpack. Use a loader instead."
 							)
 						);
-					parser.hooks.expression
-						.for("require.main.require")
-						.tap(
-							"NodeStuffPlugin",
-							ParserHelpers.expressionIsUnsupported(
-								parser,
-								"require.main.require is not supported by webpack."
-							)
-						);
-					parser.hooks.expression
-						.for("module.parent.require")
-						.tap(
-							"NodeStuffPlugin",
-							ParserHelpers.expressionIsUnsupported(
-								parser,
-								"module.parent.require is not supported by webpack."
-							)
-						);
-					parser.hooks.expression
-						.for("module.loaded")
-						.tap("NodeStuffPlugin", expr => {
-							parser.state.module.buildMeta.moduleConcatenationBailout =
-								"module.loaded";
-							return ParserHelpers.toConstantDependency(parser, "module.l")(
-								expr
-							);
-						});
-					parser.hooks.expression
-						.for("module.id")
-						.tap("NodeStuffPlugin", expr => {
-							parser.state.module.buildMeta.moduleConcatenationBailout =
-								"module.id";
-							return ParserHelpers.toConstantDependency(parser, "module.i")(
-								expr
-							);
-						});
-					parser.hooks.expression
-						.for("module.exports")
-						.tap("NodeStuffPlugin", () => {
-							const module = parser.state.module;
-							const isHarmony =
-								module.buildMeta && module.buildMeta.exportsType;
-							if (!isHarmony) return true;
-						});
-					parser.hooks.evaluateIdentifier
-						.for("module.hot")
-						.tap(
-							"NodeStuffPlugin",
-							ParserHelpers.evaluateToIdentifier("module.hot", false)
-						);
-					parser.hooks.expression.for("module").tap("NodeStuffPlugin", () => {
-						const module = parser.state.module;
-						const isHarmony = module.buildMeta && module.buildMeta.exportsType;
-						let moduleJsPath = path.join(
-							__dirname,
-							"..",
-							"buildin",
-							isHarmony ? "harmony-module.js" : "module.js"
-						);
-						if (module.context) {
-							moduleJsPath = path.relative(
-								parser.state.module.context,
-								moduleJsPath
-							);
-							if (!/^[A-Z]:/i.test(moduleJsPath)) {
-								moduleJsPath = `./${moduleJsPath.replace(/\\/g, "/")}`;
-							}
-						}
-						return ParserHelpers.addParsedVariableToModule(
-							parser,
-							"module",
-							`require(${JSON.stringify(moduleJsPath)})(module)`
-						);
-					});
 				};
 
 				normalModuleFactory.hooks.parser

package/lib/NormalModule.js

@@ -212,6 +212,7 @@ class NormalModule extends Module {
 			rootContext: options.context,
 			webpack: true,
 			sourceMap: !!this.useSourceMap,
+			mode: options.mode || "production",
 			_module: this,
 			_compilation: compilation,
 			_compiler: compilation.compiler,

package/lib/Parser.js

@@ -1954,6 +1954,9 @@ class Parser extends Tapable {
 			case "RestElement":
 				this.enterRestElement(pattern, onIdent);
 				break;
+			case "Property":
+				this.enterPattern(pattern.value, onIdent);
+				break;
 		}
 	}
 
@@ -1968,7 +1971,7 @@ class Parser extends Tapable {
 			propIndex++
 		) {
 			const prop = pattern.properties[propIndex];
-			this.enterPattern(prop.value, onIdent);
+			this.enterPattern(prop, onIdent);
 		}
 	}
 

package/lib/WebpackOptionsApply.js

@@ -21,7 +21,7 @@ const RecordIdsPlugin = require("./RecordIdsPlugin");
 
 const APIPlugin = require("./APIPlugin");
 const ConstPlugin = require("./ConstPlugin");
-const NodeStuffPlugin = require("./NodeStuffPlugin");
+const CommonJsStuffPlugin = require("./CommonJsStuffPlugin");
 const CompatibilityPlugin = require("./CompatibilityPlugin");
 
 const TemplatedPathPlugin = require("./TemplatedPathPlugin");
@@ -156,11 +156,19 @@ class WebpackOptionsApply extends OptionsApply {
 					new LoaderTargetPlugin(options.target).apply(compiler);
 					break;
 				case "electron-renderer":
-					JsonpTemplatePlugin = require("./web/JsonpTemplatePlugin");
+				case "electron-preload":
 					FetchCompileWasmTemplatePlugin = require("./web/FetchCompileWasmTemplatePlugin");
 					NodeTargetPlugin = require("./node/NodeTargetPlugin");
 					ExternalsPlugin = require("./ExternalsPlugin");
-					new JsonpTemplatePlugin().apply(compiler);
+					if (options.target === "electron-renderer") {
+						JsonpTemplatePlugin = require("./web/JsonpTemplatePlugin");
+						new JsonpTemplatePlugin().apply(compiler);
+					} else if (options.target === "electron-preload") {
+						NodeTemplatePlugin = require("./node/NodeTemplatePlugin");
+						new NodeTemplatePlugin({
+							asyncChunkLoading: true
+						}).apply(compiler);
+					}
 					new FetchCompileWasmTemplatePlugin({
 						mangleImports: options.optimization.mangleWasmImports
 					}).apply(compiler);
@@ -290,7 +298,11 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 		new CommonJsPlugin(options.module).apply(compiler);
 		new LoaderPlugin().apply(compiler);
-		new NodeStuffPlugin(options.node).apply(compiler);
+		if (options.node !== false) {
+			const NodeStuffPlugin = require("./NodeStuffPlugin");
+			new NodeStuffPlugin(options.node).apply(compiler);
+		}
+		new CommonJsStuffPlugin().apply(compiler);
 		new APIPlugin().apply(compiler);
 		new ConstPlugin().apply(compiler);
 		new UseStrictPlugin().apply(compiler);

package/lib/WebpackOptionsValidationError.js

@@ -50,13 +50,34 @@ const getSchemaPartDescription = schemaPart => {
 	return "";
 };
 
+const SPECIFICITY = {
+	type: 1,
+	oneOf: 1,
+	anyOf: 1,
+	allOf: 1,
+	additionalProperties: 2,
+	enum: 1,
+	instanceof: 1,
+	required: 2,
+	minimum: 2,
+	uniqueItems: 2,
+	minLength: 2,
+	minItems: 2,
+	minProperties: 2,
+	absolutePath: 2
+};
+
+const filterMax = (array, fn) => {
+	const max = array.reduce((max, item) => Math.max(max, fn(item)), 0);
+	return array.filter(item => fn(item) === max);
+};
+
 const filterChildren = children => {
-	return children.filter(
-		err =>
-			err.keyword !== "anyOf" &&
-			err.keyword !== "allOf" &&
-			err.keyword !== "oneOf"
+	children = filterMax(children, err =>
+		err.dataPath ? err.dataPath.length : 0
 	);
+	children = filterMax(children, err => SPECIFICITY[err.keyword] || 2);
+	return children;
 };
 
 const indent = (str, prefix, firstLine) => {
@@ -154,6 +175,10 @@ class WebpackOptionsValidationError extends WebpackError {
 				return "RegExp";
 		}
 
+		if (schema.enum) {
+			return schema.enum.map(item => JSON.stringify(item)).join(" | ");
+		}
+
 		if (schema.$ref) {
 			return formatInnerSchema(getSchemaPart(schema.$ref), true);
 		}
@@ -166,9 +191,6 @@ class WebpackOptionsValidationError extends WebpackError {
 		if (schema.anyOf) {
 			return schema.anyOf.map(formatInnerSchema).join(" | ");
 		}
-		if (schema.enum) {
-			return schema.enum.map(item => JSON.stringify(item)).join(" | ");
-		}
 		return JSON.stringify(schema, null, 2);
 	}
 
@@ -229,11 +251,17 @@ class WebpackOptionsValidationError extends WebpackError {
 						})
 					);
 				}
+				const children = filterChildren(err.children);
+				if (children.length === 1) {
+					return WebpackOptionsValidationError.formatValidationError(
+						children[0]
+					);
+				}
 				return (
 					`${dataPath} should be one of these:\n${getSchemaPartText(
 						err.parentSchema
 					)}\n` +
-					`Details:\n${filterChildren(err.children)
+					`Details:\n${children
 						.map(
 							err =>
 								" * " +
@@ -312,7 +340,21 @@ class WebpackOptionsValidationError extends WebpackError {
 			err.keyword === "minProperties"
 		) {
 			if (err.params.limit === 1) {
-				return `${dataPath} should not be empty.${getSchemaPartDescription(
+				switch (err.keyword) {
+					case "minLength":
+						return `${dataPath} should be an non-empty string.${getSchemaPartDescription(
+							err.parentSchema
+						)}`;
+					case "minItems":
+						return `${dataPath} should be an non-empty array.${getSchemaPartDescription(
+							err.parentSchema
+						)}`;
+					case "minProperties":
+						return `${dataPath} should be an non-empty object.${getSchemaPartDescription(
+							err.parentSchema
+						)}`;
+				}
+				return `${dataPath} should be not empty.${getSchemaPartDescription(
 					err.parentSchema
 				)}`;
 			} else {

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -50,6 +50,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	) {
 		super(request, originModule, sourceOrder, parserScope);
 		this.id = id;
+		this.redirectedId = undefined;
 		this.name = name;
 		this.activeExports = activeExports;
 		this.otherStarExports = otherStarExports;
@@ -60,9 +61,13 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		return "harmony export imported specifier";
 	}
 
+	get _id() {
+		return this.redirectedId || this.id;
+	}
+
 	getMode(ignoreUnused) {
 		const name = this.name;
-		const id = this.id;
+		const id = this._id;
 		const used = this.originModule.isUsed(name);
 		const importedModule = this._module;
 
@@ -288,7 +293,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 			};
 		}
 
-		const importedModule = this.module;
+		const importedModule = this._module;
 
 		if (!importedModule) {
 			// no imported module available
@@ -350,11 +355,11 @@ class HarmonyExportImportedSpecifierDependency 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(
@@ -365,20 +370,20 @@ class HarmonyExportImportedSpecifierDependency 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 ? ` (reexported as '${this.name}')` : "";
+			this._id !== this.name ? ` (reexported as '${this.name}')` : "";
 		const errorMessage = `"export '${
-			this.id
+			this._id
 		}'${idIsNotNameMessage} was not found in '${this.userRequest}'`;
 		return [new HarmonyLinkingError(errorMessage)];
 	}
@@ -402,6 +407,11 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 			importedModule.used + stringifiedUsedExport + stringifiedProvidedExport
 		);
 	}
+
+	disconnect() {
+		super.disconnect();
+		this.redirectedId = undefined;
+	}
 }
 
 module.exports = HarmonyExportImportedSpecifierDependency;

package/lib/optimize/ConcatenatedModule.js

@@ -521,7 +521,7 @@ class ConcatenatedModule extends Module {
 							dep instanceof HarmonyExportImportedSpecifierDependency
 						) {
 							const exportName = dep.name;
-							const importName = dep.id;
+							const importName = dep._id;
 							const importedModule = dep._module;
 							if (exportName && importName) {
 								if (!reexportMap.has(exportName)) {
@@ -1390,12 +1390,12 @@ class HarmonyExportImportedSpecifierDependencyConcatenatedTemplate {
 
 	getExports(dep) {
 		const importModule = dep._module;
-		if (dep.id) {
+		if (dep._id) {
 			// export { named } from "module"
 			return [
 				{
 					name: dep.name,
-					id: dep.id,
+					id: dep._id,
 					module: importModule
 				}
 			];

package/lib/optimize/SideEffectsFlagPlugin.js

@@ -111,8 +111,9 @@ class SideEffectsFlagPlugin {
 							const reason = module.reasons[i];
 							const dep = reason.dependency;
 							if (
-								dep instanceof HarmonyImportSpecifierDependency &&
-								!dep.namespaceObjectAsContext
+								dep instanceof HarmonyExportImportedSpecifierDependency ||
+								(dep instanceof HarmonyImportSpecifierDependency &&
+									!dep.namespaceObjectAsContext)
 							) {
 								const mapping = map.get(dep.id);
 								if (mapping) {

package/lib/web/JsonpMainTemplatePlugin.js

@@ -115,7 +115,11 @@ class JsonpMainTemplatePlugin {
 						),
 						"};",
 						"",
-						needEntryDeferringCode(chunk) ? "var deferredModules = [];" : ""
+						needEntryDeferringCode(chunk)
+							? needPrefetchingCode(chunk)
+								? "var deferredModules = [], deferredPrefetch = [];"
+								: "var deferredModules = [];"
+							: ""
 					);
 				}
 				if (needChunkOnDemandLoadingCode(chunk)) {
@@ -169,6 +173,8 @@ class JsonpMainTemplatePlugin {
 								"}"
 						  ])
 						: "",
+					"// create error before stack unwound to get useful stacktrace later",
+					"var error = new Error();",
 					"onScriptComplete = function (event) {",
 					Template.indent([
 						"// avoid mem leaks in IE.",
@@ -181,7 +187,7 @@ class JsonpMainTemplatePlugin {
 							Template.indent([
 								"var errorType = event && (event.type === 'load' ? 'missing' : event.type);",
 								"var realSrc = event && event.target && event.target.src;",
-								"var error = new Error('Loading chunk ' + chunkId + ' failed.\\n(' + errorType + ': ' + realSrc + ')');",
+								"error.message = 'Loading chunk ' + chunkId + ' failed.\\n(' + errorType + ': ' + realSrc + ')';",
 								"error.type = errorType;",
 								"error.request = realSrc;",
 								"chunk[1](error);"
@@ -384,20 +390,22 @@ class JsonpMainTemplatePlugin {
 							"}",
 							"if(parentJsonpFunction) parentJsonpFunction(data);",
 							withPrefetch
-								? Template.asString([
-										"// chunk prefetching for javascript",
-										"prefetchChunks.forEach(function(chunkId) {",
-										Template.indent([
-											"if(installedChunks[chunkId] === undefined) {",
+								? withDefer
+									? "deferredPrefetch.push.apply(deferredPrefetch, prefetchChunks);"
+									: Template.asString([
+											"// chunk prefetching for javascript",
+											"prefetchChunks.forEach(function(chunkId) {",
 											Template.indent([
-												"installedChunks[chunkId] = null;",
-												mainTemplate.hooks.linkPrefetch.call("", chunk, hash),
-												"document.head.appendChild(link);"
+												"if(installedChunks[chunkId] === undefined) {",
+												Template.indent([
+													"installedChunks[chunkId] = null;",
+													mainTemplate.hooks.linkPrefetch.call("", chunk, hash),
+													"document.head.appendChild(link);"
+												]),
+												"}"
 											]),
-											"}"
-										]),
-										"});"
-								  ])
+											"});"
+									  ])
 								: "",
 							"while(resolves.length) {",
 							Template.indent("resolves.shift()();"),
@@ -441,6 +449,31 @@ class JsonpMainTemplatePlugin {
 											"}"
 										]),
 										"}",
+										withPrefetch
+											? Template.asString([
+													"if(deferredModules.length === 0) {",
+													Template.indent([
+														"// chunk prefetching for javascript",
+														"deferredPrefetch.forEach(function(chunkId) {",
+														Template.indent([
+															"if(installedChunks[chunkId] === undefined) {",
+															Template.indent([
+																"installedChunks[chunkId] = null;",
+																mainTemplate.hooks.linkPrefetch.call(
+																	"",
+																	chunk,
+																	hash
+																),
+																"document.head.appendChild(link);"
+															]),
+															"}"
+														]),
+														"});",
+														"deferredPrefetch.length = 0;"
+													]),
+													"}"
+											  ])
+											: "",
 										"return result;"
 									]),
 									"}"
@@ -473,7 +506,7 @@ class JsonpMainTemplatePlugin {
 				return source;
 			}
 		);
-		mainTemplate.hooks.beforeStartup.tap(
+		mainTemplate.hooks.afterStartup.tap(
 			"JsonpMainTemplatePlugin",
 			(source, chunk, hash) => {
 				const prefetchChunks = chunk.getChildIdsByOrders().prefetch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.31.0",
+  "version": "4.33.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",
@@ -110,12 +110,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>/te{st/TestCasesNormal,st/StatsTestCases,st/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",
-    "travis:basic": "yarn test:basic --ci $JEST",
-    "travis:lint-unit": "yarn lint && yarn cover:init && yarn cover:unit --ci $JEST",
+    "travis:integration": "yarn cover:integration --ci $JEST",
+    "travis:basic": "yarn cover:basic --ci $JEST",
+    "travis:lintunit": "yarn lint && yarn cover:unit --ci $JEST",
     "travis:benchmark": "yarn benchmark --ci",
-    "appveyor:integration": "yarn cover:init && yarn cover:integration --ci %JEST%",
-    "appveyor:unit": "yarn cover:init && yarn cover:unit --ci %JEST%",
+    "appveyor:integration": "yarn cover:integration --ci %JEST%",
+    "appveyor:unit": "yarn cover:unit --ci %JEST%",
     "appveyor:benchmark": "yarn benchmark --ci",
     "build:examples": "cd examples && node buildAll.js",
     "pretest": "yarn lint",
@@ -129,9 +129,9 @@
     "pretty": "prettier --loglevel warn --write \"*.{ts,js,json,yml,yaml}\" \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.{js,json}\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
     "jest-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",
-    "cover:init": "rimraf coverage",
+    "cover": "yarn cover:all && yarn cover:report",
     "cover:all": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --coverage",
+    "cover:basic": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/te{st/TestCasesNormal,st/StatsTestCases,st/ConfigTestCases}.test.js\" --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"

package/schemas/WebpackOptions.json

@@ -385,6 +385,7 @@
       }
     },
     "NonEmptyArrayOfUniqueStringValues": {
+      "description": "A non-empty array of non-empty strings",
       "type": "array",
       "items": {
         "description": "A non-empty string",
@@ -868,7 +869,7 @@
           ]
         },
         "futureEmitAssets": {
-          "description": "Use the future version of asset emitting logic, which is allows freeing memory of assets after emitting. It could break plugins which assume that assets are still readable after emitting. Will be the new default in the next major version.",
+          "description": "Use the future version of asset emitting logic, which allows freeing memory of assets after emitting. It could break plugins which assume that assets are still readable after emitting. Will be the new default in the next major version.",
           "type": "boolean"
         },
         "globalObject": {
@@ -2127,7 +2128,8 @@
             "async-node",
             "node-webkit",
             "electron-main",
-            "electron-renderer"
+            "electron-renderer",
+            "electron-preload"
           ]
         },
         {