webpack 4.10.1 → 4.12.0

package/lib/AmdMainTemplatePlugin.js

@@ -71,7 +71,9 @@ class AmdMainTemplatePlugin {
 		}
 
 		mainTemplate.hooks.globalHashPaths.tap("AmdMainTemplatePlugin", paths => {
-			if (this.name) paths.push(this.name);
+			if (this.name) {
+				paths.push(this.name);
+			}
 			return paths;
 		});
 

package/lib/AsyncDependencyToInitialChunkError.js

@@ -16,13 +16,13 @@ class AsyncDependencyToInitialChunkError extends WebpackError {
 	 * @param {TODO} loc location of dependency
 	 */
 	constructor(chunkName, module, loc) {
-		super();
+		super(
+			`It's not allowed to load an initial chunk on demand. The chunk name "${chunkName}" is already used by an entrypoint.`
+		);
 
 		this.name = "AsyncDependencyToInitialChunkError";
-		this.message = `It's not allowed to load an initial chunk on demand. The chunk name "${chunkName}" is already used by an entrypoint.`;
 		this.module = module;
-		this.origin = module;
-		this.originLoc = loc;
+		this.loc = loc;
 
 		Error.captureStackTrace(this, this.constructor);
 	}

package/lib/BannerPlugin.js

@@ -13,7 +13,9 @@ const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/BannerPlugin.json");
 
 const wrapComment = str => {
-	if (!str.includes("\n")) return Template.toComment(str);
+	if (!str.includes("\n")) {
+		return Template.toComment(str);
+	}
 	return `/*!\n * ${str
 		.replace(/\*\//g, "* /")
 		.split("\n")

package/lib/BasicEvaluatedExpression.js

@@ -90,20 +90,21 @@ class BasicEvaluatedExpression {
 
 	asBool() {
 		if (this.truthy) return true;
-		else if (this.falsy) return false;
-		else if (this.isBoolean()) return this.bool;
-		else if (this.isNull()) return false;
-		else if (this.isString()) return this.string !== "";
-		else if (this.isNumber()) return this.number !== 0;
-		else if (this.isRegExp()) return true;
-		else if (this.isArray()) return true;
-		else if (this.isConstArray()) return true;
-		else if (this.isWrapped())
+		if (this.falsy) return false;
+		if (this.isBoolean()) return this.bool;
+		if (this.isNull()) return false;
+		if (this.isString()) return this.string !== "";
+		if (this.isNumber()) return this.number !== 0;
+		if (this.isRegExp()) return true;
+		if (this.isArray()) return true;
+		if (this.isConstArray()) return true;
+		if (this.isWrapped()) {
 			return (this.prefix && this.prefix.asBool()) ||
 				(this.postfix && this.postfix.asBool())
 				? true
 				: undefined;
-		else if (this.isTemplateString()) {
+		}
+		if (this.isTemplateString()) {
 			for (const quasi of this.quasis) {
 				if (quasi.asBool()) return true;
 			}
@@ -165,7 +166,9 @@ class BasicEvaluatedExpression {
 			this.type = TypeConditional;
 			this.options = [];
 		}
-		for (const item of options) this.options.push(item);
+		for (const item of options) {
+			this.options.push(item);
+		}
 		return this;
 	}
 

package/lib/CachePlugin.js

@@ -26,12 +26,17 @@ class CachePlugin {
 						(childCompiler, compilerName, compilerIndex) => {
 							if (cache) {
 								let childCache;
-								if (!cache.children) cache.children = {};
-								if (!cache.children[compilerName])
+								if (!cache.children) {
+									cache.children = {};
+								}
+								if (!cache.children[compilerName]) {
 									cache.children[compilerName] = [];
-								if (cache.children[compilerName][compilerIndex])
+								}
+								if (cache.children[compilerName][compilerIndex]) {
 									childCache = cache.children[compilerName][compilerIndex];
-								else cache.children[compilerName].push((childCache = {}));
+								} else {
+									cache.children[compilerName].push((childCache = {}));
+								}
 								registerCacheToCompiler(childCompiler, childCache);
 							}
 						}
@@ -43,7 +48,9 @@ class CachePlugin {
 				this.watching = true;
 			});
 			compiler.hooks.run.tapAsync("CachePlugin", (compiler, callback) => {
-				if (!compiler._lastCompilationFileDependencies) return callback();
+				if (!compiler._lastCompilationFileDependencies) {
+					return callback();
+				}
 				const fs = compiler.inputFileSystem;
 				const fileTs = (compiler.fileTimestamps = new Map());
 				asyncLib.forEach(

package/lib/CaseSensitiveModulesWarning.js

@@ -8,64 +8,60 @@ const WebpackError = require("./WebpackError");
 
 /** @typedef {import("./Module")} Module */
 
+/**
+ * @param {Module[]} modules the modules to be sorted
+ * @returns {Module[]} sorted version of original modules
+ */
+const sortModules = modules => {
+	return modules.slice().sort((a, b) => {
+		const aIdent = a.identifier();
+		const bIdent = b.identifier();
+		/* istanbul ignore next */
+		if (aIdent < bIdent) return -1;
+		/* istanbul ignore next */
+		if (aIdent > bIdent) return 1;
+		/* istanbul ignore next */
+		return 0;
+	});
+};
+
+/**
+ * @param {Module[]} modules each module from throw
+ * @returns {string} each message from provided moduels
+ */
+const createModulesListMessage = modules => {
+	return modules
+		.map(m => {
+			let message = `* ${m.identifier()}`;
+			const validReasons = m.reasons.filter(reason => reason.module);
+
+			if (validReasons.length > 0) {
+				message += `\n    Used by ${validReasons.length} module(s), i. e.`;
+				message += `\n    ${validReasons[0].module.identifier()}`;
+			}
+			return message;
+		})
+		.join("\n");
+};
+
 class CaseSensitiveModulesWarning extends WebpackError {
 	/**
 	 * Creates an instance of CaseSensitiveModulesWarning.
 	 * @param {Module[]} modules modules that were detected
 	 */
 	constructor(modules) {
-		super();
-
-		this.name = "CaseSensitiveModulesWarning";
-		const sortedModules = this._sort(modules);
-		const modulesList = this._moduleMessages(sortedModules);
-		this.message = `There are multiple modules with names that only differ in casing.
+		const sortedModules = sortModules(modules);
+		const modulesList = createModulesListMessage(sortedModules);
+		super(`There are multiple modules with names that only differ in casing.
 This can lead to unexpected behavior when compiling on a filesystem with other case-semantic.
 Use equal casing. Compare these module identifiers:
-${modulesList}`;
+${modulesList}`);
 
+		this.name = "CaseSensitiveModulesWarning";
 		this.origin = this.module = sortedModules[0];
 
 		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();
-			b = b.identifier();
-			/* istanbul ignore next */
-			if (a < b) return -1;
-			/* istanbul ignore next */
-			if (a > b) return 1;
-			/* istanbul ignore next */
-			return 0;
-		});
-	}
-
-	/**
-	 * @private
-	 * @param {Module[]} modules each module from throw
-	 * @returns {string} each message from provided moduels
-	 */
-	_moduleMessages(modules) {
-		return modules
-			.map(m => {
-				let message = `* ${m.identifier()}`;
-				const validReasons = m.reasons.filter(reason => reason.module);
-
-				if (validReasons.length > 0) {
-					message += `\n    Used by ${validReasons.length} module(s), i. e.`;
-					message += `\n    ${validReasons[0].module.identifier()}`;
-				}
-				return message;
-			})
-			.join("\n");
-	}
 }
 
 module.exports = CaseSensitiveModulesWarning;

package/lib/Chunk.js

@@ -69,7 +69,7 @@ const getModulesIdent = set => {
 };
 
 /**
- * @template {T}
+ * @template T
  * @param {Set<T>} set the set to convert to array
  * @returns {Array<T>} the array returned from Array.from(set)
  */
@@ -378,13 +378,14 @@ class Chunk {
 		otherChunk._groups.clear();
 
 		if (this.name && otherChunk.name) {
-			if (this.name.length !== otherChunk.name.length)
+			if (this.name.length !== otherChunk.name.length) {
 				this.name =
 					this.name.length < otherChunk.name.length
 						? this.name
 						: otherChunk.name;
-			else
+			} else {
 				this.name = this.name < otherChunk.name ? this.name : otherChunk.name;
+			}
 		}
 
 		return true;
@@ -420,12 +421,16 @@ class Chunk {
 			for (const chunkGroup of queue) {
 				if (a.isInGroup(chunkGroup)) continue;
 				if (chunkGroup.isInitial()) return false;
-				for (const parent of chunkGroup.parentsIterable) queue.add(parent);
+				for (const parent of chunkGroup.parentsIterable) {
+					queue.add(parent);
+				}
 			}
 			return true;
 		};
 
-		if (this.preventIntegration || otherChunk.preventIntegration) return false;
+		if (this.preventIntegration || otherChunk.preventIntegration) {
+			return false;
+		}
 
 		if (this.hasRuntime() !== otherChunk.hasRuntime()) {
 			if (this.hasRuntime()) {
@@ -436,7 +441,11 @@ class Chunk {
 				return false;
 			}
 		}
-		if (this.hasEntryModule() || otherChunk.hasEntryModule()) return false;
+
+		if (this.hasEntryModule() || otherChunk.hasEntryModule()) {
+			return false;
+		}
+
 		return true;
 	}
 
@@ -509,14 +518,20 @@ class Chunk {
 		);
 
 		for (const chunkGroup of this.groupsIterable) {
-			for (const child of chunkGroup.childrenIterable) queue.add(child);
+			for (const child of chunkGroup.childrenIterable) {
+				queue.add(child);
+			}
 		}
 
 		for (const chunkGroup of queue) {
 			for (const chunk of chunkGroup.chunks) {
-				if (!initialChunks.has(chunk)) chunks.add(chunk);
+				if (!initialChunks.has(chunk)) {
+					chunks.add(chunk);
+				}
+			}
+			for (const child of chunkGroup.childrenIterable) {
+				queue.add(child);
 			}
-			for (const child of chunkGroup.childrenIterable) queue.add(child);
 		}
 
 		return chunks;
@@ -530,11 +545,14 @@ class Chunk {
 		for (const chunk of this.getAllAsyncChunks()) {
 			chunkHashMap[chunk.id] = realHash ? chunk.hash : chunk.renderedHash;
 			for (const key of Object.keys(chunk.contentHash)) {
-				if (!chunkContentHashMap[key])
+				if (!chunkContentHashMap[key]) {
 					chunkContentHashMap[key] = Object.create(null);
+				}
 				chunkContentHashMap[key][chunk.id] = chunk.contentHash[key];
 			}
-			if (chunk.name) chunkNameMap[chunk.id] = chunk.name;
+			if (chunk.name) {
+				chunkNameMap[chunk.id] = chunk.name;
+			}
 		}
 
 		return {
@@ -572,12 +590,16 @@ class Chunk {
 				const cmp = b.order - a.order;
 				if (cmp !== 0) return cmp;
 				// TOOD webpack 5 remove this check of compareTo
-				if (a.group.compareTo) return a.group.compareTo(b.group);
+				if (a.group.compareTo) {
+					return a.group.compareTo(b.group);
+				}
 				return 0;
 			});
 			result[name] = Array.from(
 				list.reduce((set, item) => {
-					for (const chunk of item.group.chunks) set.add(chunk.id);
+					for (const chunk of item.group.chunks) {
+						set.add(chunk.id);
+					}
 					return set;
 				}, new Set())
 			);
@@ -585,18 +607,28 @@ class Chunk {
 		return result;
 	}
 
-	getChildIdsByOrdersMap() {
+	getChildIdsByOrdersMap(includeDirectChildren) {
 		const chunkMaps = Object.create(null);
 
-		for (const chunk of this.getAllAsyncChunks()) {
+		const addChildIdsByOrdersToMap = chunk => {
 			const data = chunk.getChildIdsByOrders();
 			for (const key of Object.keys(data)) {
 				let chunkMap = chunkMaps[key];
-				if (chunkMap === undefined)
+				if (chunkMap === undefined) {
 					chunkMaps[key] = chunkMap = Object.create(null);
+				}
 				chunkMap[chunk.id] = data[key];
 			}
+		};
+
+		if (includeDirectChildren) {
+			addChildIdsByOrdersToMap(this);
 		}
+
+		for (const chunk of this.getAllAsyncChunks()) {
+			addChildIdsByOrdersToMap(chunk);
+		}
+
 		return chunkMaps;
 	}
 
@@ -642,12 +674,17 @@ class Chunk {
 				if (!chunksProcessed.has(chunk)) {
 					chunksProcessed.add(chunk);
 					if (!filterChunkFn || filterChunkFn(chunk)) {
-						for (const module of chunk.modulesIterable)
-							if (filterFn(module)) return true;
+						for (const module of chunk.modulesIterable) {
+							if (filterFn(module)) {
+								return true;
+							}
+						}
 					}
 				}
 			}
-			for (const child of chunkGroup.childrenIterable) queue.add(child);
+			for (const child of chunkGroup.childrenIterable) {
+				queue.add(child);
+			}
 		}
 		return false;
 	}

package/lib/ChunkGroup.js

@@ -18,7 +18,7 @@ const compareLocations = require("./compareLocations");
 let debugId = 5000;
 
 /**
- * @template {T}
+ * @template T
  * @param {Set<T>} set set to convert to array.
  * @returns {T[]} the array format of existing set
  */
@@ -259,7 +259,9 @@ class ChunkGroup {
 
 	setParents(newParents) {
 		this._parents.clear();
-		for (const p of newParents) this._parents.add(p);
+		for (const p of newParents) {
+			this._parents.add(p);
+		}
 	}
 
 	getNumberOfParents() {
@@ -418,7 +420,9 @@ class ChunkGroup {
 					if (key.endsWith("Order")) {
 						const name = key.substr(0, key.length - "Order".length);
 						let list = lists.get(name);
-						if (list === undefined) lists.set(name, (list = []));
+						if (list === undefined) {
+							lists.set(name, (list = []));
+						}
 						list.push({
 							order: childGroup.options[key],
 							group: childGroup
@@ -433,7 +437,9 @@ class ChunkGroup {
 				const cmp = b.order - a.order;
 				if (cmp !== 0) return cmp;
 				// TOOD webpack 5 remove this check of compareTo
-				if (a.group.compareTo) return a.group.compareTo(b.group);
+				if (a.group.compareTo) {
+					return a.group.compareTo(b.group);
+				}
 				return 0;
 			});
 			result[name] = list.map(i => i.group);
@@ -444,20 +450,22 @@ class ChunkGroup {
 	checkConstraints() {
 		const chunk = this;
 		for (const child of chunk._children) {
-			if (!child._parents.has(chunk))
+			if (!child._parents.has(chunk)) {
 				throw new Error(
 					`checkConstraints: child missing parent ${chunk.debugId} -> ${
 						child.debugId
 					}`
 				);
+			}
 		}
 		for (const parentChunk of chunk._parents) {
-			if (!parentChunk._children.has(chunk))
+			if (!parentChunk._children.has(chunk)) {
 				throw new Error(
 					`checkConstraints: parent missing child ${parentChunk.debugId} <- ${
 						chunk.debugId
 					}`
 				);
+			}
 		}
 	}
 }

package/lib/CommentCompilationWarning.js

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