webpack 4.10.1 → 4.12.0

package/lib/ContextReplacementPlugin.js

@@ -60,12 +60,15 @@ class ContextReplacementPlugin {
 			cmf.hooks.beforeResolve.tap("ContextReplacementPlugin", result => {
 				if (!result) return;
 				if (resourceRegExp.test(result.request)) {
-					if (typeof newContentResource !== "undefined")
+					if (typeof newContentResource !== "undefined") {
 						result.request = newContentResource;
-					if (typeof newContentRecursive !== "undefined")
+					}
+					if (typeof newContentRecursive !== "undefined") {
 						result.recursive = newContentRecursive;
-					if (typeof newContentRegExp !== "undefined")
+					}
+					if (typeof newContentRegExp !== "undefined") {
 						result.regExp = newContentRegExp;
+					}
 					if (typeof newContentCallback === "function") {
 						newContentCallback(result);
 					} else {
@@ -79,16 +82,20 @@ class ContextReplacementPlugin {
 			cmf.hooks.afterResolve.tap("ContextReplacementPlugin", result => {
 				if (!result) return;
 				if (resourceRegExp.test(result.resource)) {
-					if (typeof newContentResource !== "undefined")
+					if (typeof newContentResource !== "undefined") {
 						result.resource = path.resolve(result.resource, newContentResource);
-					if (typeof newContentRecursive !== "undefined")
+					}
+					if (typeof newContentRecursive !== "undefined") {
 						result.recursive = newContentRecursive;
-					if (typeof newContentRegExp !== "undefined")
+					}
+					if (typeof newContentRegExp !== "undefined") {
 						result.regExp = newContentRegExp;
-					if (typeof newContentCreateContextMap === "function")
+					}
+					if (typeof newContentCreateContextMap === "function") {
 						result.resolveDependencies = createResolveDependenciesFromContextMap(
 							newContentCreateContextMap
 						);
+					}
 					if (typeof newContentCallback === "function") {
 						const origResource = result.resource;
 						newContentCallback(result);

package/lib/DefinePlugin.js

@@ -23,13 +23,22 @@ const stringifyObj = obj => {
 };
 
 const toCode = code => {
-	if (code === null) return "null";
-	else if (code === undefined) return "undefined";
-	else if (code instanceof RegExp && code.toString) return code.toString();
-	else if (typeof code === "function" && code.toString)
+	if (code === null) {
+		return "null";
+	}
+	if (code === undefined) {
+		return "undefined";
+	}
+	if (code instanceof RegExp && code.toString) {
+		return code.toString();
+	}
+	if (typeof code === "function" && code.toString) {
 		return "(" + code.toString() + ")";
-	else if (typeof code === "object") return stringifyObj(code);
-	else return code + "";
+	}
+	if (typeof code === "object") {
+		return stringifyObj(code);
+	}
+	return code + "";
 };
 
 class DefinePlugin {

package/lib/DependenciesBlock.js

@@ -40,7 +40,9 @@ class DependenciesBlock {
 
 	removeDependency(dependency) {
 		const idx = this.dependencies.indexOf(dependency);
-		if (idx >= 0) this.dependencies.splice(idx, 1);
+		if (idx >= 0) {
+			this.dependencies.splice(idx, 1);
+		}
 	}
 
 	updateHash(hash) {

package/lib/DependenciesBlockVariable.js

@@ -25,8 +25,9 @@ class DependenciesBlockVariable {
 		const source = new ReplaceSource(new RawSource(this.expression));
 		for (const dep of this.dependencies) {
 			const template = dependencyTemplates.get(dep.constructor);
-			if (!template)
+			if (!template) {
 				throw new Error(`No template for dependency: ${dep.constructor.name}`);
+			}
 			template.apply(dep, source, runtimeTemplate, dependencyTemplates);
 		}
 		return source;

package/lib/DllPlugin.js

@@ -20,8 +20,10 @@ class DllPlugin {
 	apply(compiler) {
 		compiler.hooks.entryOption.tap("DllPlugin", (context, entry) => {
 			const itemToPlugin = (item, name) => {
-				if (Array.isArray(item)) return new DllEntryPlugin(context, item, name);
-				else throw new Error("DllPlugin: supply an Array as entry");
+				if (Array.isArray(item)) {
+					return new DllEntryPlugin(context, item, name);
+				}
+				throw new Error("DllPlugin: supply an Array as entry");
 			};
 			if (typeof entry === "object" && !Array.isArray(entry)) {
 				Object.keys(entry).forEach(name => {

package/lib/DynamicEntryPlugin.js

@@ -65,7 +65,9 @@ class DynamicEntryPlugin {
 module.exports = DynamicEntryPlugin;
 
 DynamicEntryPlugin.createDependency = (entry, name) => {
-	if (Array.isArray(entry))
+	if (Array.isArray(entry)) {
 		return MultiEntryPlugin.createDependency(entry, name);
-	else return SingleEntryPlugin.createDependency(entry, name);
+	} else {
+		return SingleEntryPlugin.createDependency(entry, name);
+	}
 };

package/lib/EntryModuleNotFoundError.js

@@ -1,22 +1,21 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const WebpackError = require("./WebpackError");
-
-class EntryModuleNotFoundError extends WebpackError {
-	constructor(err) {
-		super();
-
-		this.name = "EntryModuleNotFoundError";
-		this.message = "Entry module not found: " + err;
-		this.details = err.details;
-		this.error = err;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-}
-
-module.exports = EntryModuleNotFoundError;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+class EntryModuleNotFoundError extends WebpackError {
+	constructor(err) {
+		super("Entry module not found: " + err);
+
+		this.name = "EntryModuleNotFoundError";
+		this.details = err.details;
+		this.error = err;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
+module.exports = EntryModuleNotFoundError;

package/lib/ErrorHelpers.js

@@ -10,8 +10,11 @@ const webpackOptionsFlag = "WEBPACK_OPTIONS";
 
 exports.cutOffByFlag = (stack, flag) => {
 	stack = stack.split("\n");
-	for (let i = 0; i < stack.length; i++)
-		if (stack[i].includes(flag)) stack.length = i;
+	for (let i = 0; i < stack.length; i++) {
+		if (stack[i].includes(flag)) {
+			stack.length = i;
+		}
+	}
 	return stack.join("\n");
 };
 

package/lib/EvalSourceMapDevToolPlugin.js

@@ -9,10 +9,11 @@ const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOpt
 
 class EvalSourceMapDevToolPlugin {
 	constructor(options) {
-		if (arguments.length > 1)
+		if (arguments.length > 1) {
 			throw new Error(
 				"EvalSourceMapDevToolPlugin only takes one argument (pass an options object)"
 			);
+		}
 		if (typeof options === "string") {
 			options = {
 				append: options

package/lib/FlagDependencyUsagePlugin.js

@@ -26,16 +26,22 @@ class FlagDependencyUsagePlugin {
 					const processModule = (module, usedExports) => {
 						module.used = true;
 						if (module.usedExports === true) return;
-						else if (usedExports === true) module.usedExports = true;
-						else if (Array.isArray(usedExports)) {
+						if (usedExports === true) {
+							module.usedExports = true;
+						} else if (Array.isArray(usedExports)) {
 							const old = module.usedExports ? module.usedExports.length : -1;
 							module.usedExports = addToSet(
 								module.usedExports || [],
 								usedExports
 							);
-							if (module.usedExports.length === old) return;
-						} else if (Array.isArray(module.usedExports)) return;
-						else module.usedExports = false;
+							if (module.usedExports.length === old) {
+								return;
+							}
+						} else if (Array.isArray(module.usedExports)) {
+							return;
+						} else {
+							module.usedExports = false;
+						}
 
 						// for a module without side effects we stop tracking usage here when no export is used
 						// This module won't be evaluated in this case

package/lib/FunctionModuleTemplatePlugin.js

@@ -47,30 +47,32 @@ class FunctionModuleTemplatePlugin {
 					if (
 						Array.isArray(module.buildMeta.providedExports) &&
 						module.buildMeta.providedExports.length === 0
-					)
+					) {
 						source.add(Template.toComment("no exports provided") + "\n");
-					else if (Array.isArray(module.buildMeta.providedExports))
+					} else if (Array.isArray(module.buildMeta.providedExports)) {
 						source.add(
 							Template.toComment(
 								"exports provided: " +
 									module.buildMeta.providedExports.join(", ")
 							) + "\n"
 						);
-					else if (module.buildMeta.providedExports)
+					} else if (module.buildMeta.providedExports) {
 						source.add(Template.toComment("no static exports found") + "\n");
+					}
 					if (
 						Array.isArray(module.usedExports) &&
 						module.usedExports.length === 0
-					)
+					) {
 						source.add(Template.toComment("no exports used") + "\n");
-					else if (Array.isArray(module.usedExports))
+					} else if (Array.isArray(module.usedExports)) {
 						source.add(
 							Template.toComment(
 								"exports used: " + module.usedExports.join(", ")
 							) + "\n"
 						);
-					else if (module.usedExports)
+					} else if (module.usedExports) {
 						source.add(Template.toComment("all exports used") + "\n");
+					}
 					if (module.optimizationBailout) {
 						for (const text of module.optimizationBailout) {
 							let code;

package/lib/HarmonyLinkingError.js

@@ -8,9 +8,8 @@ const WebpackError = require("./WebpackError");
 module.exports = class HarmonyLinkingError extends WebpackError {
 	/** @param {string} message Error message */
 	constructor(message) {
-		super();
+		super(message);
 		this.name = "HarmonyLinkingError";
-		this.message = message;
 		this.hideStack = true;
 
 		Error.captureStackTrace(this, this.constructor);

package/lib/HotModuleReplacement.runtime.js

@@ -19,13 +19,16 @@ module.exports = function() {
 		var fn = function(request) {
 			if (me.hot.active) {
 				if (installedModules[request]) {
-					if (installedModules[request].parents.indexOf(moduleId) === -1)
+					if (installedModules[request].parents.indexOf(moduleId) === -1) {
 						installedModules[request].parents.push(moduleId);
+					}
 				} else {
 					hotCurrentParents = [moduleId];
 					hotCurrentChildModule = request;
 				}
-				if (me.children.indexOf(request) === -1) me.children.push(request);
+				if (me.children.indexOf(request) === -1) {
+					me.children.push(request);
+				}
 			} else {
 				console.warn(
 					"[HMR] unexpected require(" +
@@ -52,7 +55,8 @@ module.exports = function() {
 		for (var name in $require$) {
 			if (
 				Object.prototype.hasOwnProperty.call($require$, name) &&
-				name !== "e"
+				name !== "e" &&
+				name !== "t"
 			) {
 				Object.defineProperty(fn, name, ObjectFactory(name));
 			}
@@ -77,6 +81,10 @@ module.exports = function() {
 				}
 			}
 		};
+		fn.t = function(value, mode) {
+			if (mode & 1) value = fn(value);
+			return $require$.t(value, mode & ~1);
+		};
 		return fn;
 	}
 
@@ -167,8 +175,9 @@ module.exports = function() {
 	}
 
 	function hotCheck(apply) {
-		if (hotStatus !== "idle")
+		if (hotStatus !== "idle") {
 			throw new Error("check() is only allowed in idle status");
+		}
 		hotApplyOnUpdate = apply;
 		hotSetStatus("check");
 		return hotDownloadManifest(hotRequestTimeout).then(function(update) {

package/lib/HotModuleReplacementPlugin.js

@@ -255,8 +255,11 @@ module.exports = class HotModuleReplacementPlugin {
 				mainTemplate.hooks.currentHash.tap(
 					"HotModuleReplacementPlugin",
 					(_, length) => {
-						if (isFinite(length)) return `hotCurrentHash.substr(0, ${length})`;
-						else return "hotCurrentHash";
+						if (isFinite(length)) {
+							return `hotCurrentHash.substr(0, ${length})`;
+						} else {
+							return "hotCurrentHash";
+						}
 					}
 				);
 
@@ -301,21 +304,24 @@ module.exports = class HotModuleReplacementPlugin {
 						}
 					);
 					// TODO webpack 5: refactor this, no custom hooks
-					if (!parser.hooks.hotAcceptCallback)
+					if (!parser.hooks.hotAcceptCallback) {
 						parser.hooks.hotAcceptCallback = new SyncBailHook([
 							"expression",
 							"requests"
 						]);
-					if (!parser.hooks.hotAcceptWithoutCallback)
+					}
+					if (!parser.hooks.hotAcceptWithoutCallback) {
 						parser.hooks.hotAcceptWithoutCallback = new SyncBailHook([
 							"expression",
 							"requests"
 						]);
+					}
 					parser.hooks.call
 						.for("module.hot.accept")
 						.tap("HotModuleReplacementPlugin", expr => {
-							if (!parser.state.compilation.hotUpdateChunkTemplate)
+							if (!parser.state.compilation.hotUpdateChunkTemplate) {
 								return false;
+							}
 							if (expr.arguments.length >= 1) {
 								const arg = parser.evaluateExpression(expr.arguments[0]);
 								let params = [];
@@ -355,8 +361,9 @@ module.exports = class HotModuleReplacementPlugin {
 					parser.hooks.call
 						.for("module.hot.decline")
 						.tap("HotModuleReplacementPlugin", expr => {
-							if (!parser.state.compilation.hotUpdateChunkTemplate)
+							if (!parser.state.compilation.hotUpdateChunkTemplate) {
 								return false;
+							}
 							if (expr.arguments.length === 1) {
 								const arg = parser.evaluateExpression(expr.arguments[0]);
 								let params = [];

package/lib/JavascriptGenerator.js

@@ -143,10 +143,11 @@ class JavascriptGenerator {
 
 	sourceDependency(dependency, dependencyTemplates, source, runtimeTemplate) {
 		const template = dependencyTemplates.get(dependency.constructor);
-		if (!template)
+		if (!template) {
 			throw new Error(
 				"No template for dependency: " + dependency.constructor.name
 			);
+		}
 		template.apply(dependency, source, runtimeTemplate, dependencyTemplates);
 	}
 

package/lib/JavascriptModulesPlugin.js

@@ -55,10 +55,8 @@ class JavascriptModulesPlugin {
 						const moduleTemplates = options.moduleTemplates;
 						const dependencyTemplates = options.dependencyTemplates;
 
-						let filenameTemplate;
-						if (chunk.filenameTemplate)
-							filenameTemplate = chunk.filenameTemplate;
-						else filenameTemplate = outputOptions.filename;
+						const filenameTemplate =
+							chunk.filenameTemplate || outputOptions.filename;
 
 						const useChunkHash = compilation.mainTemplate.useChunkHash(chunk);
 
@@ -101,11 +99,8 @@ class JavascriptModulesPlugin {
 						const outputOptions = options.outputOptions;
 						const moduleTemplates = options.moduleTemplates;
 						const dependencyTemplates = options.dependencyTemplates;
-
-						let filenameTemplate;
-						if (chunk.filenameTemplate)
-							filenameTemplate = chunk.filenameTemplate;
-						else filenameTemplate = outputOptions.chunkFilename;
+						const filenameTemplate =
+							chunk.filenameTemplate || outputOptions.chunkFilename;
 
 						result.push({
 							render: () =>

package/lib/JsonParser.js

@@ -16,8 +16,9 @@ class JsonParser {
 		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)
+		if (typeof data === "object" && data) {
 			state.module.addDependency(new JsonExportsDependency(Object.keys(data)));
+		}
 		state.module.addDependency(new JsonExportsDependency(["default"]));
 		return state;
 	}

package/lib/LibraryTemplatePlugin.js

@@ -30,8 +30,9 @@ const accessorAccess = (base, accessor, joinWith = "; ") => {
 				? base + accessorToObjectAccess(accessors.slice(0, idx + 1))
 				: accessors[0] + accessorToObjectAccess(accessors.slice(1, idx + 1));
 			if (idx === accessors.length - 1) return a;
-			if (idx === 0 && typeof base === "undefined")
+			if (idx === 0 && typeof base === "undefined") {
 				return `${a} = typeof ${a} === "object" ? ${a} : {}`;
+			}
 			return `${a} = ${a} || {}`;
 		})
 		.join(joinWith);

package/lib/LoaderOptionsPlugin.js

@@ -14,10 +14,11 @@ class LoaderOptionsPlugin {
 		validateOptions(schema, options || {}, "Loader Options Plugin");
 
 		if (typeof options !== "object") options = {};
-		if (!options.test)
+		if (!options.test) {
 			options.test = {
 				test: () => true
 			};
+		}
 		this.options = options;
 	}
 

package/lib/MainTemplate.js

@@ -401,10 +401,11 @@ module.exports = class MainTemplate extends Tapable {
 		if (chunk.hasEntryModule()) {
 			source = this.hooks.renderWithEntry.call(source, chunk, hash);
 		}
-		if (!source)
+		if (!source) {
 			throw new Error(
 				"Compiler error: MainTemplate plugin 'render' should return something"
 			);
+		}
 		chunk.rendered = true;
 		return new ConcatSource(source, ";");
 	}

package/lib/Module.js

@@ -225,8 +225,9 @@ class Module extends DependenciesBlock {
 
 	hasReasonForChunk(chunk) {
 		if (this._rewriteChunkInReasons) {
-			for (const operation of this._rewriteChunkInReasons)
+			for (const operation of this._rewriteChunkInReasons) {
 				this._doRewriteChunkInReasons(operation.oldChunk, operation.newChunks);
+			}
 			this._rewriteChunkInReasons = undefined;
 		}
 		for (let i = 0; i < this.reasons.length; i++) {
@@ -241,8 +242,9 @@ class Module extends DependenciesBlock {
 
 	rewriteChunkInReasons(oldChunk, newChunks) {
 		// This is expensive. Delay operation until we really need the data
-		if (this._rewriteChunkInReasons === undefined)
+		if (this._rewriteChunkInReasons === undefined) {
 			this._rewriteChunkInReasons = [];
+		}
 		this._rewriteChunkInReasons.push({
 			oldChunk,
 			newChunks
@@ -266,13 +268,15 @@ class Module extends DependenciesBlock {
 
 		// Mangle export name if possible
 		if (this.isProvided(exportName)) {
-			if (this.buildMeta.exportsType === "namespace")
+			if (this.buildMeta.exportsType === "namespace") {
 				return Template.numberToIdentifer(idx);
-			else if (
+			}
+			if (
 				this.buildMeta.exportsType === "named" &&
 				!this.usedExports.includes("default")
-			)
+			) {
 				return Template.numberToIdentifer(idx);
+			}
 		}
 		return exportName;
 	}
@@ -366,8 +370,12 @@ Object.defineProperty(Module.prototype, "meta", {
 	}, "Module.meta was renamed to Module.buildMeta")
 });
 
+/** @type {function(): string} */
 Module.prototype.identifier = null;
+
+/** @type {function(RequestShortener): string} */
 Module.prototype.readableIdentifier = null;
+
 Module.prototype.build = null;
 Module.prototype.source = null;
 Module.prototype.size = null;

package/lib/ModuleBuildError.js

@@ -8,30 +8,40 @@ const WebpackError = require("./WebpackError");
 const { cutOffLoaderExecution } = require("./ErrorHelpers");
 
 class ModuleBuildError extends WebpackError {
-	constructor(module, err) {
-		super();
-
-		this.name = "ModuleBuildError";
-		this.message = "Module build failed: ";
+	constructor(module, err, { from = null } = {}) {
+		let message = "Module build failed";
+		let details = undefined;
+		if (from) {
+			message += ` (from ${from}):\n`;
+		} else {
+			message += ": ";
+		}
 		if (err !== null && typeof err === "object") {
 			if (typeof err.stack === "string" && err.stack) {
-				var stack = cutOffLoaderExecution(err.stack);
+				const stack = cutOffLoaderExecution(err.stack);
 				if (!err.hideStack) {
-					this.message += stack;
+					message += stack;
 				} else {
-					this.details = stack;
+					details = stack;
 					if (typeof err.message === "string" && err.message) {
-						this.message += err.message;
+						message += err.message;
 					} else {
-						this.message += err;
+						message += err;
 					}
 				}
 			} else if (typeof err.message === "string" && err.message) {
-				this.message += err.message;
+				message += err.message;
 			} else {
-				this.message += err;
+				message += err;
 			}
+		} else {
+			message = err;
 		}
+
+		super(message);
+
+		this.name = "ModuleBuildError";
+		this.details = details;
 		this.module = module;
 		this.error = err;
 

package/lib/ModuleDependencyError.js

@@ -5,7 +5,6 @@
 "use strict";
 
 const WebpackError = require("./WebpackError");
-const formatLocation = require("./formatLocation");
 
 /** @typedef {import("./Module")} Module */
 
@@ -17,16 +16,17 @@ class ModuleDependencyError extends WebpackError {
 	 * @param {TODO} loc location of dependency
 	 */
 	constructor(module, err, loc) {
-		super();
+		super(err.message);
 
 		this.name = "ModuleDependencyError";
-		this.message = `${formatLocation(loc)} ${err.message}`;
 		this.details = err.stack
 			.split("\n")
 			.slice(1)
 			.join("\n");
-		this.origin = this.module = module;
+		this.module = module;
+		this.loc = loc;
 		this.error = err;
+		this.origin = module.issuer;
 
 		Error.captureStackTrace(this, this.constructor);
 	}

package/lib/ModuleDependencyWarning.js

@@ -5,20 +5,20 @@
 "use strict";
 
 const WebpackError = require("./WebpackError");
-const formatLocation = require("./formatLocation");
 
 module.exports = class ModuleDependencyWarning extends WebpackError {
 	constructor(module, err, loc) {
-		super();
+		super(err.message);
 
 		this.name = "ModuleDependencyWarning";
-		this.message = `${formatLocation(loc)} ${err.message}`;
 		this.details = err.stack
 			.split("\n")
 			.slice(1)
 			.join("\n");
-		this.origin = this.module = module;
+		this.module = module;
+		this.loc = loc;
 		this.error = err;
+		this.origin = module.issuer;
 
 		Error.captureStackTrace(this, this.constructor);
 	}

package/lib/ModuleError.js

@@ -8,13 +8,21 @@ const WebpackError = require("./WebpackError");
 const { cleanUp } = require("./ErrorHelpers");
 
 class ModuleError extends WebpackError {
-	constructor(module, err) {
-		super();
-
+	constructor(module, err, { from = null } = {}) {
+		let message = "Module Error";
+		if (from) {
+			message += ` (from ${from}):\n`;
+		} else {
+			message += ": ";
+		}
+		if (err && typeof err === "object" && err.message) {
+			message += err.message;
+		} else if (err) {
+			message += err;
+		}
+		super(message);
 		this.name = "ModuleError";
 		this.module = module;
-		this.message =
-			err && typeof err === "object" && err.message ? err.message : err;
 		this.error = err;
 		this.details =
 			err && typeof err === "object" && err.stack