webpack 4.10.1 → 4.12.0

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);
@@ -475,6 +487,7 @@ class Compilation extends Tapable {
 
 				const errorAndCallback = err => {
 					err.origin = module;
+					err.dependencies = dependencies;
 					this.errors.push(err);
 					if (bail) {
 						callback(err);
@@ -519,7 +532,7 @@ class Compilation extends Tapable {
 							if (err) {
 								semaphore.release();
 								return errorOrWarningAndCallback(
-									new ModuleNotFoundError(module, err, dependencies)
+									new ModuleNotFoundError(module, err)
 								);
 							}
 							if (!dependentModule) {
@@ -781,7 +794,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 +940,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 +961,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 +1398,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 +1555,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 +1613,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 +1726,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 +1768,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 +1863,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 +1905,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;
 		}
 	}

package/lib/ContextModule.js

@@ -35,14 +35,16 @@ class ContextModule extends Module {
 			resource: resource,
 			resourceQuery: resourceQuery
 		});
-		if (options.resolveOptions !== undefined)
+		if (options.resolveOptions !== undefined) {
 			this.resolveOptions = options.resolveOptions;
+		}
 
 		// Info from Build
 		this._contextDependencies = new Set([this.context]);
 
-		if (typeof options.mode !== "string")
+		if (typeof options.mode !== "string") {
 			throw new Error("options.mode is a required option");
+		}
 
 		this._identifier = this._createIdentifier();
 	}
@@ -73,22 +75,37 @@ class ContextModule extends Module {
 
 	_createIdentifier() {
 		let identifier = this.context;
-		if (this.options.resourceQuery)
+		if (this.options.resourceQuery) {
 			identifier += ` ${this.options.resourceQuery}`;
-		if (this.options.mode) identifier += ` ${this.options.mode}`;
-		if (!this.options.recursive) identifier += " nonrecursive";
-		if (this.options.addon) identifier += ` ${this.options.addon}`;
-		if (this.options.regExp) identifier += ` ${this.options.regExp}`;
-		if (this.options.include) identifier += ` include: ${this.options.include}`;
-		if (this.options.exclude) identifier += ` exclude: ${this.options.exclude}`;
+		}
+		if (this.options.mode) {
+			identifier += ` ${this.options.mode}`;
+		}
+		if (!this.options.recursive) {
+			identifier += " nonrecursive";
+		}
+		if (this.options.addon) {
+			identifier += ` ${this.options.addon}`;
+		}
+		if (this.options.regExp) {
+			identifier += ` ${this.options.regExp}`;
+		}
+		if (this.options.include) {
+			identifier += ` include: ${this.options.include}`;
+		}
+		if (this.options.exclude) {
+			identifier += ` exclude: ${this.options.exclude}`;
+		}
 		if (this.options.groupOptions) {
 			identifier += ` groupOptions: ${JSON.stringify(
 				this.options.groupOptions
 			)}`;
 		}
-		if (this.options.namespaceObject === "strict")
+		if (this.options.namespaceObject === "strict") {
 			identifier += " strict namespace object";
-		else if (this.options.namespaceObject) identifier += " namespace object";
+		} else if (this.options.namespaceObject) {
+			identifier += " namespace object";
+		}
 
 		return identifier;
 	}
@@ -99,42 +116,62 @@ class ContextModule extends Module {
 
 	readableIdentifier(requestShortener) {
 		let identifier = requestShortener.shorten(this.context);
-		if (this.options.resourceQuery)
+		if (this.options.resourceQuery) {
 			identifier += ` ${this.options.resourceQuery}`;
-		if (this.options.mode) identifier += ` ${this.options.mode}`;
-		if (!this.options.recursive) identifier += " nonrecursive";
-		if (this.options.addon)
+		}
+		if (this.options.mode) {
+			identifier += ` ${this.options.mode}`;
+		}
+		if (!this.options.recursive) {
+			identifier += " nonrecursive";
+		}
+		if (this.options.addon) {
 			identifier += ` ${requestShortener.shorten(this.options.addon)}`;
-		if (this.options.regExp)
+		}
+		if (this.options.regExp) {
 			identifier += ` ${this.prettyRegExp(this.options.regExp + "")}`;
-		if (this.options.include)
+		}
+		if (this.options.include) {
 			identifier += ` include: ${this.prettyRegExp(this.options.include + "")}`;
-		if (this.options.exclude)
+		}
+		if (this.options.exclude) {
 			identifier += ` exclude: ${this.prettyRegExp(this.options.exclude + "")}`;
+		}
 		if (this.options.groupOptions) {
 			const groupOptions = this.options.groupOptions;
-			for (const key of Object.keys(groupOptions))
+			for (const key of Object.keys(groupOptions)) {
 				identifier += ` ${key}: ${groupOptions[key]}`;
+			}
 		}
-		if (this.options.namespaceObject === "strict")
+		if (this.options.namespaceObject === "strict") {
 			identifier += " strict namespace object";
-		else if (this.options.namespaceObject) identifier += " namespace object";
+		} else if (this.options.namespaceObject) {
+			identifier += " namespace object";
+		}
 
 		return identifier;
 	}
 
 	libIdent(options) {
 		let identifier = this.contextify(options.context, this.context);
-		if (this.options.mode) identifier += ` ${this.options.mode}`;
-		if (this.options.recursive) identifier += " recursive";
-		if (this.options.addon)
+		if (this.options.mode) {
+			identifier += ` ${this.options.mode}`;
+		}
+		if (this.options.recursive) {
+			identifier += " recursive";
+		}
+		if (this.options.addon) {
 			identifier += ` ${this.contextify(options.context, this.options.addon)}`;
-		if (this.options.regExp)
+		}
+		if (this.options.regExp) {
 			identifier += ` ${this.prettyRegExp(this.options.regExp + "")}`;
-		if (this.options.include)
+		}
+		if (this.options.include) {
 			identifier += ` include: ${this.prettyRegExp(this.options.include + "")}`;
-		if (this.options.exclude)
+		}
+		if (this.options.exclude) {
 			identifier += ` exclude: ${this.prettyRegExp(this.options.exclude + "")}`;
+		}
 
 		return identifier;
 	}
@@ -206,7 +243,9 @@ class ContextModule extends Module {
 				for (const dep of dependencies) {
 					let chunkName = this.options.chunkName;
 					if (chunkName) {
-						if (!/\[(index|request)\]/.test(chunkName)) chunkName += "[index]";
+						if (!/\[(index|request)\]/.test(chunkName)) {
+							chunkName += "[index]";
+						}
 						chunkName = chunkName.replace(/\[index\]/g, index++);
 						chunkName = chunkName.replace(
 							/\[request\]/g,
@@ -253,7 +292,9 @@ class ContextModule extends Module {
 	}
 
 	getFakeMap(dependencies) {
-		if (!this.options.namespaceObject) return 9;
+		if (!this.options.namespaceObject) {
+			return 9;
+		}
 		// if we filter first we get a new array
 		// therefor we dont need to create a clone of dependencies explicitly
 		// therefore the order of this is !important!
@@ -281,11 +322,18 @@ class ContextModule extends Module {
 				}
 				return map;
 			}, Object.create(null));
-		if (!hasNamespace && hasNonHarmony && !hasNamed)
+		if (!hasNamespace && hasNonHarmony && !hasNamed) {
 			return this.options.namespaceObject === "strict" ? 1 : 7;
-		if (hasNamespace && !hasNonHarmony && !hasNamed) return 9;
-		if (!hasNamespace && !hasNonHarmony && hasNamed) return 3;
-		if (!hasNamespace && !hasNonHarmony && !hasNamed) return 9;
+		}
+		if (hasNamespace && !hasNonHarmony && !hasNamed) {
+			return 9;
+		}
+		if (!hasNamespace && !hasNonHarmony && hasNamed) {
+			return 3;
+		}
+		if (!hasNamespace && !hasNonHarmony && !hasNamed) {
+			return 9;
+		}
 		return fakeMap;
 	}
 
@@ -296,13 +344,16 @@ class ContextModule extends Module {
 	}
 
 	getReturn(type) {
-		if (type === 9) return "__webpack_require__(id)";
+		if (type === 9) {
+			return "__webpack_require__(id)";
+		}
 		return `__webpack_require__.t(id, ${type})`;
 	}
 
 	getReturnModuleObjectSource(fakeMap, fakeMapDataExpression = "fakeMap[id]") {
-		if (typeof fakeMap === "number")
+		if (typeof fakeMap === "number") {
 			return `return ${this.getReturn(fakeMap)};`;
+		}
 		return `return __webpack_require__.t(id, ${fakeMapDataExpression})`;
 	}
 
@@ -504,8 +555,9 @@ module.exports = webpackAsyncContext;`;
 					hasMultipleOrNoChunks = true;
 				}
 				const arrayStart = [item.dependency.module.id];
-				if (typeof fakeMap === "object")
+				if (typeof fakeMap === "object") {
 					arrayStart.push(fakeMap[item.dependency.module.id]);
+				}
 				map[item.userRequest] = arrayStart.concat(
 					chunks.map(chunk => chunk.id)
 				);

package/lib/ContextModuleFactory.js

@@ -67,17 +67,24 @@ module.exports = class ContextModuleFactory extends Tapable {
 					loadersPrefix = "";
 				const idx = request.lastIndexOf("!");
 				if (idx >= 0) {
-					loaders = request.substr(0, idx + 1);
+					let loadersRequest = request.substr(0, idx + 1);
 					let i;
-					for (i = 0; i < loaders.length && loaders[i] === "!"; i++) {
+					for (
+						i = 0;
+						i < loadersRequest.length && loadersRequest[i] === "!";
+						i++
+					) {
 						loadersPrefix += "!";
 					}
-					loaders = loaders
+					loadersRequest = loadersRequest
 						.substr(i)
 						.replace(/!+$/, "")
 						.replace(/!!+/g, "!");
-					if (loaders === "") loaders = [];
-					else loaders = loaders.split("!");
+					if (loadersRequest === "") {
+						loaders = [];
+					} else {
+						loaders = loadersRequest.split("!");
+					}
 					resource = request.substr(idx + 1);
 				} else {
 					loaders = [];
@@ -222,9 +229,13 @@ module.exports = class ContextModuleFactory extends Tapable {
 											callback(null, alternatives);
 										}
 									);
-								} else callback();
+								} else {
+									callback();
+								}
 							});
-						} else callback();
+						} else {
+							callback();
+						}
 					},
 					(err, result) => {
 						if (err) return callback(err);