webpack 4.8.2 → 4.9.2

package/lib/dependencies/ContextDependencyHelpers.js

@@ -1,142 +1,142 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const ContextDependencyHelpers = exports;
-
-/**
- * Escapes regular expression metacharacters
- * @param {string} str String to quote
- * @returns {string} Escaped string
- */
-const quotemeta = str => {
-	return str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
-};
-
-ContextDependencyHelpers.create = (
-	Dep,
-	range,
-	param,
-	expr,
-	options,
-	contextOptions
-) => {
-	let dep;
-	let prefix;
-	let postfix;
-	let prefixRange;
-	let valueRange;
-	let idx;
-	let context;
-	let regExp;
-	if (param.isTemplateString()) {
-		prefix = param.quasis[0].string;
-		postfix =
-			param.quasis.length > 1
-				? param.quasis[param.quasis.length - 1].string
-				: "";
-		prefixRange = [param.quasis[0].range[0], param.quasis[0].range[1]];
-		valueRange = param.range;
-		idx = prefix.lastIndexOf("/");
-		context = ".";
-		if (idx >= 0) {
-			context = prefix.substr(0, idx);
-			prefix = `.${prefix.substr(idx)}`;
-		}
-		// If there are more than two quasis, maybe the generated RegExp can be more precise?
-		regExp = new RegExp(
-			`^${quotemeta(prefix)}${options.wrappedContextRegExp.source}${quotemeta(
-				postfix
-			)}$`
-		);
-		dep = new Dep(
-			Object.assign(
-				{
-					request: context,
-					recursive: options.wrappedContextRecursive,
-					regExp,
-					mode: "sync"
-				},
-				contextOptions
-			),
-			range,
-			valueRange
-		);
-		dep.loc = expr.loc;
-		dep.replaces = [
-			{
-				range: prefixRange,
-				value: prefix
-			}
-		];
-		dep.critical =
-			options.wrappedContextCritical &&
-			"a part of the request of a dependency is an expression";
-		return dep;
-	} else if (
-		param.isWrapped() &&
-		((param.prefix && param.prefix.isString()) ||
-			(param.postfix && param.postfix.isString()))
-	) {
-		prefix = param.prefix && param.prefix.isString() ? param.prefix.string : "";
-		postfix =
-			param.postfix && param.postfix.isString() ? param.postfix.string : "";
-		prefixRange =
-			param.prefix && param.prefix.isString() ? param.prefix.range : null;
-		valueRange = [
-			prefixRange ? prefixRange[1] : param.range[0],
-			param.range[1]
-		];
-		idx = prefix.lastIndexOf("/");
-		context = ".";
-		if (idx >= 0) {
-			context = prefix.substr(0, idx);
-			prefix = `.${prefix.substr(idx)}`;
-		}
-		regExp = new RegExp(
-			`^${quotemeta(prefix)}${options.wrappedContextRegExp.source}${quotemeta(
-				postfix
-			)}$`
-		);
-		dep = new Dep(
-			Object.assign(
-				{
-					request: context,
-					recursive: options.wrappedContextRecursive,
-					regExp,
-					mode: "sync"
-				},
-				contextOptions
-			),
-			range,
-			valueRange
-		);
-		dep.loc = expr.loc;
-		dep.prepend = param.prefix && param.prefix.isString() ? prefix : null;
-		dep.critical =
-			options.wrappedContextCritical &&
-			"a part of the request of a dependency is an expression";
-		return dep;
-	} else {
-		dep = new Dep(
-			Object.assign(
-				{
-					request: options.exprContextRequest,
-					recursive: options.exprContextRecursive,
-					regExp: options.exprContextRegExp,
-					mode: "sync"
-				},
-				contextOptions
-			),
-			range,
-			param.range
-		);
-		dep.loc = expr.loc;
-		dep.critical =
-			options.exprContextCritical &&
-			"the request of a dependency is an expression";
-		return dep;
-	}
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const ContextDependencyHelpers = exports;
+
+/**
+ * Escapes regular expression metacharacters
+ * @param {string} str String to quote
+ * @returns {string} Escaped string
+ */
+const quotemeta = str => {
+	return str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
+};
+
+ContextDependencyHelpers.create = (
+	Dep,
+	range,
+	param,
+	expr,
+	options,
+	contextOptions
+) => {
+	let dep;
+	let prefix;
+	let postfix;
+	let prefixRange;
+	let valueRange;
+	let idx;
+	let context;
+	let regExp;
+	if (param.isTemplateString()) {
+		prefix = param.quasis[0].string;
+		postfix =
+			param.quasis.length > 1
+				? param.quasis[param.quasis.length - 1].string
+				: "";
+		prefixRange = [param.quasis[0].range[0], param.quasis[0].range[1]];
+		valueRange = param.range;
+		idx = prefix.lastIndexOf("/");
+		context = ".";
+		if (idx >= 0) {
+			context = prefix.substr(0, idx);
+			prefix = `.${prefix.substr(idx)}`;
+		}
+		// If there are more than two quasis, maybe the generated RegExp can be more precise?
+		regExp = new RegExp(
+			`^${quotemeta(prefix)}${options.wrappedContextRegExp.source}${quotemeta(
+				postfix
+			)}$`
+		);
+		dep = new Dep(
+			Object.assign(
+				{
+					request: context,
+					recursive: options.wrappedContextRecursive,
+					regExp,
+					mode: "sync"
+				},
+				contextOptions
+			),
+			range,
+			valueRange
+		);
+		dep.loc = expr.loc;
+		dep.replaces = [
+			{
+				range: prefixRange,
+				value: prefix
+			}
+		];
+		dep.critical =
+			options.wrappedContextCritical &&
+			"a part of the request of a dependency is an expression";
+		return dep;
+	} else if (
+		param.isWrapped() &&
+		((param.prefix && param.prefix.isString()) ||
+			(param.postfix && param.postfix.isString()))
+	) {
+		prefix = param.prefix && param.prefix.isString() ? param.prefix.string : "";
+		postfix =
+			param.postfix && param.postfix.isString() ? param.postfix.string : "";
+		prefixRange =
+			param.prefix && param.prefix.isString() ? param.prefix.range : null;
+		valueRange = [
+			prefixRange ? prefixRange[1] : param.range[0],
+			param.range[1]
+		];
+		idx = prefix.lastIndexOf("/");
+		context = ".";
+		if (idx >= 0) {
+			context = prefix.substr(0, idx);
+			prefix = `.${prefix.substr(idx)}`;
+		}
+		regExp = new RegExp(
+			`^${quotemeta(prefix)}${options.wrappedContextRegExp.source}${quotemeta(
+				postfix
+			)}$`
+		);
+		dep = new Dep(
+			Object.assign(
+				{
+					request: context,
+					recursive: options.wrappedContextRecursive,
+					regExp,
+					mode: "sync"
+				},
+				contextOptions
+			),
+			range,
+			valueRange
+		);
+		dep.loc = expr.loc;
+		dep.prepend = param.prefix && param.prefix.isString() ? prefix : null;
+		dep.critical =
+			options.wrappedContextCritical &&
+			"a part of the request of a dependency is an expression";
+		return dep;
+	} else {
+		dep = new Dep(
+			Object.assign(
+				{
+					request: options.exprContextRequest,
+					recursive: options.exprContextRecursive,
+					regExp: options.exprContextRegExp,
+					mode: "sync"
+				},
+				contextOptions
+			),
+			range,
+			param.range
+		);
+		dep.loc = expr.loc;
+		dep.critical =
+			options.exprContextCritical &&
+			"the request of a dependency is an expression";
+		return dep;
+	}
+};

package/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;`;
 };

package/lib/optimize/RemoveEmptyChunksPlugin.js

@@ -1,40 +1,42 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-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);
-					});
-			};
-			compilation.hooks.optimizeChunksBasic.tap(
-				"RemoveEmptyChunksPlugin",
-				handler
-			);
-			compilation.hooks.optimizeChunksAdvanced.tap(
-				"RemoveEmptyChunksPlugin",
-				handler
-			);
-			compilation.hooks.optimizeExtractedChunksBasic.tap(
-				"RemoveEmptyChunksPlugin",
-				handler
-			);
-			compilation.hooks.optimizeExtractedChunksAdvanced.tap(
-				"RemoveEmptyChunksPlugin",
-				handler
-			);
-		});
-	}
-}
-module.exports = RemoveEmptyChunksPlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class RemoveEmptyChunksPlugin {
+	apply(compiler) {
+		compiler.hooks.compilation.tap("RemoveEmptyChunksPlugin", compilation => {
+			const handler = chunks => {
+				for (let i = chunks.length - 1; i >= 0; i--) {
+					const chunk = chunks[i];
+					if (
+						chunk.isEmpty() &&
+						!chunk.hasRuntime() &&
+						!chunk.hasEntryModule()
+					) {
+						chunk.remove("empty");
+						chunks.splice(i, 1);
+					}
+				}
+			};
+			compilation.hooks.optimizeChunksBasic.tap(
+				"RemoveEmptyChunksPlugin",
+				handler
+			);
+			compilation.hooks.optimizeChunksAdvanced.tap(
+				"RemoveEmptyChunksPlugin",
+				handler
+			);
+			compilation.hooks.optimizeExtractedChunksBasic.tap(
+				"RemoveEmptyChunksPlugin",
+				handler
+			);
+			compilation.hooks.optimizeExtractedChunksAdvanced.tap(
+				"RemoveEmptyChunksPlugin",
+				handler
+			);
+		});
+	}
+}
+module.exports = RemoveEmptyChunksPlugin;

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