webpack 4.10.1 → 4.10.2

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/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/Chunk.js

@@ -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())
 			);
@@ -592,8 +614,9 @@ class 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];
 			}
 		}
@@ -642,12 +665,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

@@ -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/Compilation.js

@@ -287,8 +287,9 @@ class Compilation extends Tapable {
 		if (this.cache && this.cache[cacheName]) {
 			const cacheModule = this.cache[cacheName];
 
-			if (typeof cacheModule.updateCacheModule === "function")
+			if (typeof cacheModule.updateCacheModule === "function") {
 				cacheModule.updateCacheModule(module);
+			}
 
 			let rebuild = true;
 			if (this.fileTimestamps && this.contextTimestamps) {
@@ -302,8 +303,12 @@ class Compilation extends Tapable {
 				cacheModule.disconnect();
 				this._modules.set(identifier, cacheModule);
 				this.modules.push(cacheModule);
-				for (const err of cacheModule.errors) this.errors.push(err);
-				for (const err of cacheModule.warnings) this.warnings.push(err);
+				for (const err of cacheModule.errors) {
+					this.errors.push(err);
+				}
+				for (const err of cacheModule.warnings) {
+					this.warnings.push(err);
+				}
 				return {
 					module: cacheModule,
 					issuer: true,
@@ -355,7 +360,9 @@ class Compilation extends Tapable {
 
 		const callback = err => {
 			this._buildingModules.delete(module);
-			for (const cb of callbackList) cb(err);
+			for (const cb of callbackList) {
+				cb(err);
+			}
 		};
 
 		this.hooks.buildModule.call(module);
@@ -370,8 +377,11 @@ class Compilation extends Tapable {
 					const err = errors[indexError];
 					err.origin = origin;
 					err.dependencies = dependencies;
-					if (optional) this.warnings.push(err);
-					else this.errors.push(err);
+					if (optional) {
+						this.warnings.push(err);
+					} else {
+						this.errors.push(err);
+					}
 				}
 
 				const warnings = module.warnings;
@@ -403,15 +413,17 @@ class Compilation extends Tapable {
 			const resourceIdent = dep.getResourceIdentifier();
 			if (resourceIdent) {
 				const factory = this.dependencyFactories.get(dep.constructor);
-				if (factory === undefined)
+				if (factory === undefined) {
 					throw new Error(
 						`No module factory available for dependency type: ${
 							dep.constructor.name
 						}`
 					);
+				}
 				let innerMap = dependencies.get(factory);
-				if (innerMap === undefined)
+				if (innerMap === undefined) {
 					dependencies.set(factory, (innerMap = new Map()));
+				}
 				let list = innerMap.get(resourceIdent);
 				if (list === undefined) innerMap.set(resourceIdent, (list = []));
 				list.push(dep);
@@ -781,7 +793,9 @@ class Compilation extends Tapable {
 
 		const callback = err => {
 			this._rebuildingModules.delete(module);
-			for (const cb of callbackList) cb(err);
+			for (const cb of callbackList) {
+				cb(err);
+			}
 		};
 
 		this.hooks.rebuildModule.call(module);
@@ -925,15 +939,18 @@ class Compilation extends Tapable {
 
 			this.sortItemsWithChunkIds();
 
-			if (shouldRecord)
+			if (shouldRecord) {
 				this.hooks.recordModules.call(this.modules, this.records);
-			if (shouldRecord) this.hooks.recordChunks.call(this.chunks, this.records);
+				this.hooks.recordChunks.call(this.chunks, this.records);
+			}
 
 			this.hooks.beforeHash.call();
 			this.createHash();
 			this.hooks.afterHash.call();
 
-			if (shouldRecord) this.hooks.recordHash.call(this.records);
+			if (shouldRecord) {
+				this.hooks.recordHash.call(this.records);
+			}
 
 			this.hooks.beforeModuleAssets.call();
 			this.createModuleAssets();
@@ -943,7 +960,9 @@ class Compilation extends Tapable {
 			}
 			this.hooks.additionalChunkAssets.call(this.chunks);
 			this.summarizeDependencies();
-			if (shouldRecord) this.hooks.record.call(this, this.records);
+			if (shouldRecord) {
+				this.hooks.record.call(this, this.records);
+			}
 
 			this.hooks.additionalAssets.callAsync(err => {
 				if (err) {
@@ -1378,8 +1397,11 @@ class Compilation extends Tapable {
 
 			// 3. Create a new Set of available modules at this points
 			newAvailableModules = new Set(availableModules);
-			for (const chunk of chunkGroup.chunks)
-				for (const m of chunk.modulesIterable) newAvailableModules.add(m);
+			for (const chunk of chunkGroup.chunks) {
+				for (const m of chunk.modulesIterable) {
+					newAvailableModules.add(m);
+				}
+			}
 
 			// 4. Filter edges with available modules
 			const filteredDeps = deps.filter(filterFn);
@@ -1532,8 +1554,11 @@ class Compilation extends Tapable {
 		for (let indexModule2 = 0; indexModule2 < modules2.length; indexModule2++) {
 			const module2 = modules2[indexModule2];
 			if (module2.id === null) {
-				if (unusedIds.length > 0) module2.id = unusedIds.pop();
-				else module2.id = nextFreeModuleId++;
+				if (unusedIds.length > 0) {
+					module2.id = unusedIds.pop();
+				} else {
+					module2.id = nextFreeModuleId++;
+				}
 			}
 		}
 	}
@@ -1587,8 +1612,11 @@ class Compilation extends Tapable {
 		for (let indexChunk = 0; indexChunk < chunks.length; indexChunk++) {
 			const chunk = chunks[indexChunk];
 			if (chunk.id === null) {
-				if (unusedIds.length > 0) chunk.id = unusedIds.pop();
-				else chunk.id = nextFreeChunkId++;
+				if (unusedIds.length > 0) {
+					chunk.id = unusedIds.pop();
+				} else {
+					chunk.id = nextFreeChunkId++;
+				}
 			}
 			if (!chunk.ids) {
 				chunk.ids = [chunk.id];
@@ -1697,14 +1725,23 @@ class Compilation extends Tapable {
 		const hashDigest = outputOptions.hashDigest;
 		const hashDigestLength = outputOptions.hashDigestLength;
 		const hash = createHash(hashFunction);
-		if (outputOptions.hashSalt) hash.update(outputOptions.hashSalt);
+		if (outputOptions.hashSalt) {
+			hash.update(outputOptions.hashSalt);
+		}
 		this.mainTemplate.updateHash(hash);
 		this.chunkTemplate.updateHash(hash);
-		for (const key of Object.keys(this.moduleTemplates).sort())
+		for (const key of Object.keys(this.moduleTemplates).sort()) {
 			this.moduleTemplates[key].updateHash(hash);
-		for (const child of this.children) hash.update(child.hash);
-		for (const warning of this.warnings) hash.update(`${warning.message}`);
-		for (const error of this.errors) hash.update(`${error.message}`);
+		}
+		for (const child of this.children) {
+			hash.update(child.hash);
+		}
+		for (const warning of this.warnings) {
+			hash.update(`${warning.message}`);
+		}
+		for (const error of this.errors) {
+			hash.update(`${error.message}`);
+		}
 		const modules = this.modules;
 		for (let i = 0; i < modules.length; i++) {
 			const module = modules[i];
@@ -1730,7 +1767,9 @@ class Compilation extends Tapable {
 		for (let i = 0; i < chunks.length; i++) {
 			const chunk = chunks[i];
 			const chunkHash = createHash(hashFunction);
-			if (outputOptions.hashSalt) chunkHash.update(outputOptions.hashSalt);
+			if (outputOptions.hashSalt) {
+				chunkHash.update(outputOptions.hashSalt);
+			}
 			chunk.updateHash(chunkHash);
 			const template = chunk.hasRuntime()
 				? this.mainTemplate
@@ -1823,10 +1862,11 @@ class Compilation extends Tapable {
 						}
 					}
 					file = this.getPath(filenameTemplate, fileManifest.pathOptions);
-					if (this.assets[file] && this.assets[file] !== source)
+					if (this.assets[file] && this.assets[file] !== source) {
 						throw new Error(
 							`Conflict: Multiple assets emit to the same filename ${file}`
 						);
+					}
 					this.assets[file] = source;
 					chunk.files.push(file);
 					this.hooks.chunkAsset.call(chunk, file);
@@ -1864,18 +1904,20 @@ class Compilation extends Tapable {
 		for (let indexModule = 0; indexModule < modules.length; indexModule++) {
 			const moduleId = modules[indexModule].id;
 			if (moduleId === null) continue;
-			if (usedIds.has(moduleId))
+			if (usedIds.has(moduleId)) {
 				throw new Error(`checkConstraints: duplicate module id ${moduleId}`);
+			}
 			usedIds.add(moduleId);
 		}
 
 		const chunks = this.chunks;
 		for (let indexChunk = 0; indexChunk < chunks.length; indexChunk++) {
 			const chunk = chunks[indexChunk];
-			if (chunks.indexOf(chunk) !== indexChunk)
+			if (chunks.indexOf(chunk) !== indexChunk) {
 				throw new Error(
 					`checkConstraints: duplicate chunk in compilation ${chunk.debugId}`
 				);
+			}
 		}
 
 		for (const chunkGroup of this.chunkGroups) {

package/lib/Compiler.js

@@ -245,8 +245,9 @@ class Compiler extends Tapable {
 	}
 
 	purgeInputFileSystem() {
-		if (this.inputFileSystem && this.inputFileSystem.purge)
+		if (this.inputFileSystem && this.inputFileSystem.purge) {
 			this.inputFileSystem.purge();
+		}
 	}
 
 	emitAssets(compilation, callback) {
@@ -291,7 +292,9 @@ class Compiler extends Tapable {
 							this.outputFileSystem.join(outputPath, dir),
 							writeOut
 						);
-					} else writeOut();
+					} else {
+						writeOut();
+					}
 				},
 				err => {
 					if (err) return callback(err);
@@ -317,10 +320,11 @@ class Compiler extends Tapable {
 		const idx1 = this.recordsOutputPath.lastIndexOf("/");
 		const idx2 = this.recordsOutputPath.lastIndexOf("\\");
 		let recordsOutputPathDirectory = null;
-		if (idx1 > idx2)
+		if (idx1 > idx2) {
 			recordsOutputPathDirectory = this.recordsOutputPath.substr(0, idx1);
-		if (idx1 < idx2)
+		} else if (idx1 < idx2) {
 			recordsOutputPathDirectory = this.recordsOutputPath.substr(0, idx2);
+		}
 
 		const writeFile = () => {
 			this.outputFileSystem.writeFile(
@@ -330,7 +334,9 @@ class Compiler extends Tapable {
 			);
 		};
 
-		if (!recordsOutputPathDirectory) return writeFile();
+		if (!recordsOutputPathDirectory) {
+			return writeFile();
+		}
 		this.outputFileSystem.mkdirp(recordsOutputPathDirectory, err => {
 			if (err) return callback(err);
 			writeFile();
@@ -371,7 +377,9 @@ class Compiler extends Tapable {
 	) {
 		const childCompiler = new Compiler(this.context);
 		if (Array.isArray(plugins)) {
-			for (const plugin of plugins) plugin.apply(childCompiler);
+			for (const plugin of plugins) {
+				plugin.apply(childCompiler);
+			}
 		}
 		for (const name in this.hooks) {
 			if (
@@ -385,8 +393,9 @@ class Compiler extends Tapable {
 					"thisCompilation"
 				].includes(name)
 			) {
-				if (childCompiler.hooks[name])
+				if (childCompiler.hooks[name]) {
 					childCompiler.hooks[name].taps = this.hooks[name].taps.slice();
+				}
 			}
 		}
 		childCompiler.name = compilerName;
@@ -398,11 +407,14 @@ class Compiler extends Tapable {
 		childCompiler.contextTimestamps = this.contextTimestamps;
 
 		const relativeCompilerName = makePathsRelative(this.context, compilerName);
-		if (!this.records[relativeCompilerName])
+		if (!this.records[relativeCompilerName]) {
 			this.records[relativeCompilerName] = [];
-		if (this.records[relativeCompilerName][compilerIndex])
+		}
+		if (this.records[relativeCompilerName][compilerIndex]) {
 			childCompiler.records = this.records[relativeCompilerName][compilerIndex];
-		else this.records[relativeCompilerName].push((childCompiler.records = {}));
+		} else {
+			this.records[relativeCompilerName].push((childCompiler.records = {}));
+		}
 
 		childCompiler.options = Object.create(this.options);
 		childCompiler.options.output = Object.create(childCompiler.options.output);

package/lib/ConstPlugin.js

@@ -21,13 +21,19 @@ const collectDeclaration = (declarations, pattern) => {
 				declarations.add(node.name);
 				break;
 			case "ArrayPattern":
-				for (const element of node.elements) if (element) stack.push(element);
+				for (const element of node.elements) {
+					if (element) {
+						stack.push(element);
+					}
+				}
 				break;
 			case "AssignmentPattern":
 				stack.push(node.left);
 				break;
 			case "ObjectPattern":
-				for (const property of node.properties) stack.push(property.value);
+				for (const property of node.properties) {
+					stack.push(property.value);
+				}
 				break;
 			case "RestElement":
 				stack.push(node.argument);
@@ -47,7 +53,9 @@ const getHoistedDeclarations = (branch, includeFunctionDeclarations) => {
 			// Walk through control statements to look for hoisted declarations.
 			// Some branches are skipped since they do not allow declarations.
 			case "BlockStatement":
-				for (const stmt of node.body) stack.push(stmt);
+				for (const stmt of node.body) {
+					stack.push(stmt);
+				}
 				break;
 			case "IfStatement":
 				stack.push(node.consequent);
@@ -68,22 +76,30 @@ const getHoistedDeclarations = (branch, includeFunctionDeclarations) => {
 				stack.push(node.body);
 				break;
 			case "SwitchStatement":
-				for (const cs of node.cases)
-					for (const consequent of cs.consequent) stack.push(consequent);
+				for (const cs of node.cases) {
+					for (const consequent of cs.consequent) {
+						stack.push(consequent);
+					}
+				}
 				break;
 			case "TryStatement":
 				stack.push(node.block);
-				if (node.handler) stack.push(node.handler.body);
+				if (node.handler) {
+					stack.push(node.handler.body);
+				}
 				stack.push(node.finalizer);
 				break;
 			case "FunctionDeclaration":
-				if (includeFunctionDeclarations)
+				if (includeFunctionDeclarations) {
 					collectDeclaration(declarations, node.id);
+				}
 				break;
 			case "VariableDeclaration":
-				if (node.kind === "var")
-					for (const decl of node.declarations)
+				if (node.kind === "var") {
+					for (const decl of node.declarations) {
 						collectDeclaration(declarations, decl.id);
+					}
+				}
 				break;
 		}
 	}