webpack 4.10.1 → 4.10.2

package/lib/RuleSet.js

@@ -117,7 +117,7 @@ module.exports = class RuleSet {
 	}
 
 	static normalizeRule(rule, refs, ident) {
-		if (typeof rule === "string")
+		if (typeof rule === "string") {
 			return {
 				use: [
 					{
@@ -125,9 +125,11 @@ module.exports = class RuleSet {
 					}
 				]
 			};
-		if (!rule)
+		}
+		if (!rule) {
 			throw new Error("Unexcepted null when object was expected as rule");
-		if (typeof rule !== "object")
+		}
+		if (typeof rule !== "object") {
 			throw new Error(
 				"Unexcepted " +
 					typeof rule +
@@ -135,6 +137,7 @@ module.exports = class RuleSet {
 					rule +
 					")"
 			);
+		}
 
 		const newRule = {};
 		let useSource;
@@ -142,7 +145,7 @@ module.exports = class RuleSet {
 		let condition;
 
 		const checkUseSource = newSource => {
-			if (useSource && useSource !== newSource)
+			if (useSource && useSource !== newSource) {
 				throw new Error(
 					RuleSet.buildErrorMessage(
 						rule,
@@ -155,11 +158,12 @@ module.exports = class RuleSet {
 						)
 					)
 				);
+			}
 			useSource = newSource;
 		};
 
 		const checkResourceSource = newSource => {
-			if (resourceSource && resourceSource !== newSource)
+			if (resourceSource && resourceSource !== newSource) {
 				throw new Error(
 					RuleSet.buildErrorMessage(
 						rule,
@@ -172,6 +176,7 @@ module.exports = class RuleSet {
 						)
 					)
 				);
+			}
 			resourceSource = newSource;
 		};
 
@@ -222,7 +227,7 @@ module.exports = class RuleSet {
 			}
 		}
 
-		if (rule.loader && rule.loaders)
+		if (rule.loader && rule.loaders) {
 			throw new Error(
 				RuleSet.buildErrorMessage(
 					rule,
@@ -231,6 +236,7 @@ module.exports = class RuleSet {
 					)
 				)
 			);
+		}
 
 		const loader = rule.loaders || rule.loader;
 		if (typeof loader === "string" && !rule.options && !rule.query) {
@@ -274,19 +280,21 @@ module.exports = class RuleSet {
 			newRule.use = RuleSet.normalizeUse(rule.use, ident);
 		}
 
-		if (rule.rules)
+		if (rule.rules) {
 			newRule.rules = RuleSet.normalizeRules(
 				rule.rules,
 				refs,
 				`${ident}-rules`
 			);
+		}
 
-		if (rule.oneOf)
+		if (rule.oneOf) {
 			newRule.oneOf = RuleSet.normalizeRules(
 				rule.oneOf,
 				refs,
 				`${ident}-oneOf`
 			);
+		}
 
 		const keys = Object.keys(rule).filter(key => {
 			return ![
@@ -365,16 +373,22 @@ module.exports = class RuleSet {
 
 		const newItem = {};
 
-		if (item.options && item.query)
+		if (item.options && item.query) {
 			throw new Error("Provided options and query in use");
+		}
 
-		if (!item.loader) throw new Error("No loader specified");
+		if (!item.loader) {
+			throw new Error("No loader specified");
+		}
 
 		newItem.options = item.options || item.query;
 
 		if (typeof newItem.options === "object" && newItem.options) {
-			if (newItem.options.ident) newItem.ident = newItem.options.ident;
-			else newItem.ident = ident;
+			if (newItem.options.ident) {
+				newItem.ident = newItem.options.ident;
+			} else {
+				newItem.ident = ident;
+			}
 		}
 
 		const keys = Object.keys(item).filter(function(key) {
@@ -403,7 +417,7 @@ module.exports = class RuleSet {
 			const items = condition.map(c => RuleSet.normalizeCondition(c));
 			return orMatcher(items);
 		}
-		if (typeof condition !== "object")
+		if (typeof condition !== "object") {
 			throw Error(
 				"Unexcepted " +
 					typeof condition +
@@ -411,6 +425,7 @@ module.exports = class RuleSet {
 					condition +
 					")"
 			);
+		}
 
 		const matchers = [];
 		Object.keys(condition).forEach(key => {
@@ -438,9 +453,12 @@ module.exports = class RuleSet {
 					throw new Error("Unexcepted property " + key + " in condition");
 			}
 		});
-		if (matchers.length === 0)
+		if (matchers.length === 0) {
 			throw new Error("Excepted condition but got " + condition);
-		if (matchers.length === 1) return matchers[0];
+		}
+		if (matchers.length === 1) {
+			return matchers[0];
+		}
 		return andMatcher(matchers);
 	}
 
@@ -468,10 +486,12 @@ module.exports = class RuleSet {
 			data.resourceQuery &&
 			rule.resourceQuery &&
 			!rule.resourceQuery(data.resourceQuery)
-		)
+		) {
 			return false;
-		if (data.compiler && rule.compiler && !rule.compiler(data.compiler))
+		}
+		if (data.compiler && rule.compiler && !rule.compiler(data.compiler)) {
 			return false;
+		}
 
 		// apply
 		const keys = Object.keys(rule).filter(key => {
@@ -527,8 +547,9 @@ module.exports = class RuleSet {
 
 	findOptionsByIdent(ident) {
 		const options = this.references[ident];
-		if (!options)
+		if (!options) {
 			throw new Error("Can't find options with ident '" + ident + "'");
+		}
 		return options;
 	}
 };

package/lib/RuntimeTemplate.js

@@ -79,10 +79,11 @@ module.exports = class RuntimeTemplate {
 	}
 
 	moduleRaw({ module, request }) {
-		if (!module)
+		if (!module) {
 			return this.missingModule({
 				request
 			});
+		}
 		return `__webpack_require__(${this.moduleId({ module, request })})`;
 	}
 
@@ -94,10 +95,11 @@ module.exports = class RuntimeTemplate {
 	}
 
 	moduleNamespace({ module, request, strict }) {
-		if (!module)
+		if (!module) {
 			return this.missingModule({
 				request
 			});
+		}
 		const moduleId = this.moduleId({
 			module,
 			request
@@ -205,10 +207,11 @@ module.exports = class RuntimeTemplate {
 			content += `/* harmony import */ ${optDeclaration}${importVar}_default = /*#__PURE__*/__webpack_require__.n(${importVar});\n`;
 		}
 		if (exportsType === "named") {
-			if (Array.isArray(module.buildMeta.providedExports))
+			if (Array.isArray(module.buildMeta.providedExports)) {
 				content += `${optDeclaration}${importVar}_namespace = /*#__PURE__*/__webpack_require__.t(${moduleId}, 1);\n`;
-			else
+			} else {
 				content += `${optDeclaration}${importVar}_namespace = /*#__PURE__*/__webpack_require__.t(${moduleId});\n`;
+			}
 		}
 		return content;
 	}
@@ -223,18 +226,23 @@ module.exports = class RuntimeTemplate {
 		callContext,
 		importVar
 	}) {
-		if (!module)
+		if (!module) {
 			return this.missingModule({
 				request
 			});
+		}
 		const exportsType = module.buildMeta && module.buildMeta.exportsType;
 
 		if (!exportsType) {
 			if (exportName === "default") {
 				if (!originModule.buildMeta.strictHarmonyModule) {
-					if (isCall) return `${importVar}_default()`;
-					else if (asiSafe) return `(${importVar}_default())`;
-					else return `${importVar}_default.a`;
+					if (isCall) {
+						return `${importVar}_default()`;
+					} else if (asiSafe) {
+						return `(${importVar}_default())`;
+					} else {
+						return `${importVar}_default.a`;
+					}
 				} else {
 					return importVar;
 				}
@@ -261,8 +269,11 @@ module.exports = class RuntimeTemplate {
 				used !== exportName ? Template.toNormalComment(exportName) + " " : "";
 			const access = `${importVar}[${comment}${JSON.stringify(used)}]`;
 			if (isCall) {
-				if (callContext === false && asiSafe) return `(0,${access})`;
-				else if (callContext === false) return `Object(${access})`;
+				if (callContext === false && asiSafe) {
+					return `(0,${access})`;
+				} else if (callContext === false) {
+					return `Object(${access})`;
+				}
 			}
 			return access;
 		} else {

package/lib/SourceMapDevToolPlugin.js

@@ -53,10 +53,11 @@ const getTaskForFile = (file, chunk, options, compilation) => {
 
 class SourceMapDevToolPlugin {
 	constructor(options) {
-		if (arguments.length > 1)
+		if (arguments.length > 1) {
 			throw new Error(
 				"SourceMapDevToolPlugin only takes one argument (pass an options object)"
 			);
+		}
 
 		validateOptions(schema, options || {}, "SourceMap DevTool Plugin");
 
@@ -121,7 +122,7 @@ class SourceMapDevToolPlugin {
 					const tasks = [];
 					files.forEach(({ file, chunk }, idx) => {
 						reportProgress(
-							0.5 * idx / files.length,
+							(0.5 * idx) / files.length,
 							file,
 							"generate SourceMap"
 						);
@@ -205,7 +206,7 @@ class SourceMapDevToolPlugin {
 					}
 					tasks.forEach((task, index) => {
 						reportProgress(
-							0.5 + 0.5 * index / tasks.length,
+							0.5 + (0.5 * index) / tasks.length,
 							task.file,
 							"attach SourceMap"
 						);

package/lib/Stats.js

@@ -114,10 +114,15 @@ class Stats {
 				); // eslint-disable-line no-useless-escape
 				return ident => regExp.test(ident);
 			}
-			if (item && typeof item === "object" && typeof item.test === "function")
+			if (item && typeof item === "object" && typeof item.test === "function") {
 				return ident => item.test(ident);
-			if (typeof item === "function") return item;
-			if (typeof item === "boolean") return () => item;
+			}
+			if (typeof item === "function") {
+				return item;
+			}
+			if (typeof item === "boolean") {
+				return () => item;
+			}
 		};
 
 		const compilation = this.compilation;
@@ -260,10 +265,9 @@ class Stats {
 
 		const formatError = e => {
 			let text = "";
-			if (typeof e === "string")
-				e = {
-					message: e
-				};
+			if (typeof e === "string") {
+				e = { message: e };
+			}
 			if (e.chunk) {
 				text += `chunk ${e.chunk.name || e.chunk.id}${
 					e.chunk.hasRuntime()
@@ -286,9 +290,12 @@ class Stats {
 				);
 			}
 			text += e.message;
-			if (showErrorDetails && e.details) text += `\n${e.details}`;
-			if (showErrorDetails && e.missing)
+			if (showErrorDetails && e.details) {
+				text += `\n${e.details}`;
+			}
+			if (showErrorDetails && e.missing) {
 				text += e.missing.map(item => `\n[${item}]`).join("");
+			}
 			if (showModuleTrace && e.origin) {
 				text += `\n @ ${e.origin.readableIdentifier(requestShortener)}`;
 				if (typeof e.originLoc === "object") {
@@ -392,11 +399,13 @@ class Stats {
 						}
 						if (chunk.name) {
 							assetsByFile[asset].chunkNames.push(chunk.name);
-							if (obj.assetsByChunkName[chunk.name])
+							if (obj.assetsByChunkName[chunk.name]) {
 								obj.assetsByChunkName[chunk.name] = []
 									.concat(obj.assetsByChunkName[chunk.name])
 									.concat([asset]);
-							else obj.assetsByChunkName[chunk.name] = asset;
+							} else {
+								obj.assetsByChunkName[chunk.name] = asset;
+							}
 						}
 					}
 				}
@@ -520,15 +529,20 @@ class Stats {
 						};
 						if (reason.dependency) {
 							const locInfo = formatLocation(reason.dependency.loc);
-							if (locInfo) obj.loc = locInfo;
+							if (locInfo) {
+								obj.loc = locInfo;
+							}
 						}
 						return obj;
 					})
 					.sort((a, b) => a.moduleId - b.moduleId);
 			}
 			if (showUsedExports) {
-				if (module.used === true) obj.usedExports = module.usedExports;
-				else if (module.used === false) obj.usedExports = false;
+				if (module.used === true) {
+					obj.usedExports = module.usedExports;
+				} else if (module.used === false) {
+					obj.usedExports = false;
+				}
 			}
 			if (showProvidedExports) {
 				obj.providedExports = Array.isArray(module.buildMeta.providedExports)
@@ -662,12 +676,13 @@ class Stats {
 				const obj = new Stats(child).toJson(childOptions, forToString);
 				delete obj.hash;
 				delete obj.version;
-				if (child.name)
+				if (child.name) {
 					obj.name = identifierUtils.makePathsRelative(
 						context,
 						child.name,
 						compilation.cache
 					);
+				}
 				return obj;
 			});
 		}
@@ -745,7 +760,9 @@ class Stats {
 			const rows = array.length;
 			const cols = array[0].length;
 			const colSizes = new Array(cols);
-			for (let col = 0; col < cols; col++) colSizes[col] = 0;
+			for (let col = 0; col < cols; col++) {
+				colSizes[col] = 0;
+			}
 			for (let row = 0; row < rows; row++) {
 				for (let col = 0; col < cols; col++) {
 					const value = `${getText(array, row, col)}`;
@@ -759,11 +776,18 @@ class Stats {
 					const format = array[row][col].color;
 					const value = `${getText(array, row, col)}`;
 					let l = value.length;
-					if (align[col] === "l") format(value);
-					for (; l < colSizes[col] && col !== cols - 1; l++) colors.normal(" ");
-					if (align[col] === "r") format(value);
-					if (col + 1 < cols && colSizes[col] !== 0)
+					if (align[col] === "l") {
+						format(value);
+					}
+					for (; l < colSizes[col] && col !== cols - 1; l++) {
+						colors.normal(" ");
+					}
+					if (align[col] === "r") {
+						format(value);
+					}
+					if (col + 1 < cols && colSizes[col] !== 0) {
 						colors.normal(splitter || "  ");
+					}
 				}
 				newline();
 			}
@@ -981,21 +1005,26 @@ class Stats {
 				colors.magenta(" [prefetched]");
 			}
 			if (module.failed) colors.red(" [failed]");
-			if (module.warnings)
+			if (module.warnings) {
 				colors.yellow(
 					` [${module.warnings} warning${module.warnings === 1 ? "" : "s"}]`
 				);
-			if (module.errors)
+			}
+			if (module.errors) {
 				colors.red(
 					` [${module.errors} error${module.errors === 1 ? "" : "s"}]`
 				);
+			}
 		};
 
 		const processModuleContent = (module, prefix) => {
 			if (Array.isArray(module.providedExports)) {
 				colors.normal(prefix);
-				if (module.providedExports.length === 0) colors.cyan("[no exports]");
-				else colors.cyan(`[exports: ${module.providedExports.join(", ")}]`);
+				if (module.providedExports.length === 0) {
+					colors.cyan("[no exports]");
+				} else {
+					colors.cyan(`[exports: ${module.providedExports.join(", ")}]`);
+				}
 				newline();
 			}
 			if (module.usedExports !== undefined) {
@@ -1285,7 +1314,9 @@ class Stats {
 			);
 		}
 
-		while (buf[buf.length - 1] === "\n") buf.pop();
+		while (buf[buf.length - 1] === "\n") {
+			buf.pop();
+		}
 		return buf.join("");
 	}
 
@@ -1356,13 +1387,18 @@ class Stats {
 	static getChildOptions(options, idx) {
 		let innerOptions;
 		if (Array.isArray(options.children)) {
-			if (idx < options.children.length) innerOptions = options.children[idx];
+			if (idx < options.children.length) {
+				innerOptions = options.children[idx];
+			}
 		} else if (typeof options.children === "object" && options.children) {
 			innerOptions = options.children;
 		}
-		if (typeof innerOptions === "boolean" || typeof innerOptions === "string")
+		if (typeof innerOptions === "boolean" || typeof innerOptions === "string") {
 			innerOptions = Stats.presetToOptions(innerOptions);
-		if (!innerOptions) return options;
+		}
+		if (!innerOptions) {
+			return options;
+		}
 		const childOptions = Object.assign({}, options);
 		delete childOptions.children; // do not inherit children
 		return Object.assign(childOptions, innerOptions);

package/lib/Template.js

@@ -114,13 +114,15 @@ class Template {
 	 */
 	static numberToIdentifer(n) {
 		// lower case
-		if (n < DELTA_A_TO_Z)
+		if (n < DELTA_A_TO_Z) {
 			return String.fromCharCode(START_LOWERCASE_ALPHABET_CODE + n);
+		}
 
 		// upper case
 		n -= DELTA_A_TO_Z;
-		if (n < DELTA_A_TO_Z)
+		if (n < DELTA_A_TO_Z) {
 			return String.fromCharCode(START_UPPERCASE_ALPHABET_CODE + n);
+		}
 
 		// use multiple letters
 		return (

package/lib/TemplatedPathPlugin.js

@@ -39,10 +39,11 @@ const getReplacer = (value, allowEmpty) => {
 		// last argument in replacer is the entire input string
 		const input = args[args.length - 1];
 		if (value === null || value === undefined) {
-			if (!allowEmpty)
+			if (!allowEmpty) {
 				throw new Error(
 					`Path variable ${match} not implemented in this context: ${input}`
 				);
+			}
 			return "";
 		} else {
 			return `${value}`;
@@ -150,8 +151,9 @@ class TemplatedPathPlugin {
 					const outputOptions = mainTemplate.outputOptions;
 					const chunkFilename =
 						outputOptions.chunkFilename || outputOptions.filename;
-					if (REGEXP_CHUNKHASH_FOR_TEST.test(chunkFilename))
+					if (REGEXP_CHUNKHASH_FOR_TEST.test(chunkFilename)) {
 						hash.update(JSON.stringify(chunk.getChunkMaps(true).hash));
+					}
 					if (REGEXP_CONTENTHASH_FOR_TEST.test(chunkFilename)) {
 						hash.update(
 							JSON.stringify(
@@ -159,8 +161,9 @@ class TemplatedPathPlugin {
 							)
 						);
 					}
-					if (REGEXP_NAME_FOR_TEST.test(chunkFilename))
+					if (REGEXP_NAME_FOR_TEST.test(chunkFilename)) {
 						hash.update(JSON.stringify(chunk.getChunkMaps(true).name));
+					}
 				}
 			);
 		});

package/lib/UmdMainTemplatePlugin.js

@@ -144,16 +144,21 @@ class UmdMainTemplatePlugin {
 						.map(m => {
 							let expr;
 							let request = m.request;
-							if (typeof request === "object") request = request[type];
-							if (typeof request === "undefined")
+							if (typeof request === "object") {
+								request = request[type];
+							}
+							if (typeof request === "undefined") {
 								throw new Error(
 									"Missing external configuration for type:" + type
 								);
+							}
 							if (Array.isArray(request)) {
 								expr = `require(${JSON.stringify(
 									request[0]
 								)})${accessorToObjectAccess(request.slice(1))}`;
-							} else expr = `require(${JSON.stringify(request)})`;
+							} else {
+								expr = `require(${JSON.stringify(request)})`;
+							}
 							if (m.optional) {
 								expr = `(function webpackLoadOptionalExternalModule() { try { return ${expr}; } catch(e) {} }())`;
 							}

package/lib/WarnCaseSensitiveModulesPlugin.js

@@ -24,8 +24,9 @@ class WarnCaseSensitiveModulesPlugin {
 					}
 					for (const pair of moduleWithoutCase) {
 						const array = pair[1];
-						if (array.length > 1)
+						if (array.length > 1) {
 							compilation.warnings.push(new CaseSensitiveModulesWarning(array));
+						}
 					}
 				});
 			}

package/lib/Watching.js

@@ -128,8 +128,9 @@ class Watching {
 			) => {
 				this.pausedWatcher = this.watcher;
 				this.watcher = null;
-				if (err) return this.handler(err);
-
+				if (err) {
+					return this.handler(err);
+				}
 				this.compiler.fileTimestamps = fileTimestamps;
 				this.compiler.contextTimestamps = contextTimestamps;
 				this._invalidate();

package/lib/WebpackOptionsApply.js

@@ -298,38 +298,53 @@ class WebpackOptionsApply extends OptionsApply {
 		new ImportPlugin(options.module).apply(compiler);
 		new SystemPlugin(options.module).apply(compiler);
 
-		if (typeof options.mode !== "string")
+		if (typeof options.mode !== "string") {
 			new WarnNoModeSetPlugin().apply(compiler);
+		}
 
 		new EnsureChunkConditionsPlugin().apply(compiler);
-		if (options.optimization.removeAvailableModules)
+		if (options.optimization.removeAvailableModules) {
 			new RemoveParentModulesPlugin().apply(compiler);
-		if (options.optimization.removeEmptyChunks)
+		}
+		if (options.optimization.removeEmptyChunks) {
 			new RemoveEmptyChunksPlugin().apply(compiler);
-		if (options.optimization.mergeDuplicateChunks)
+		}
+		if (options.optimization.mergeDuplicateChunks) {
 			new MergeDuplicateChunksPlugin().apply(compiler);
-		if (options.optimization.flagIncludedChunks)
+		}
+		if (options.optimization.flagIncludedChunks) {
 			new FlagIncludedChunksPlugin().apply(compiler);
-		if (options.optimization.occurrenceOrder)
+		}
+		if (options.optimization.occurrenceOrder) {
 			new OccurrenceOrderPlugin(true).apply(compiler);
-		if (options.optimization.sideEffects)
+		}
+		if (options.optimization.sideEffects) {
 			new SideEffectsFlagPlugin().apply(compiler);
-		if (options.optimization.providedExports)
+		}
+		if (options.optimization.providedExports) {
 			new FlagDependencyExportsPlugin().apply(compiler);
-		if (options.optimization.usedExports)
+		}
+		if (options.optimization.usedExports) {
 			new FlagDependencyUsagePlugin().apply(compiler);
-		if (options.optimization.concatenateModules)
+		}
+		if (options.optimization.concatenateModules) {
 			new ModuleConcatenationPlugin().apply(compiler);
-		if (options.optimization.splitChunks)
+		}
+		if (options.optimization.splitChunks) {
 			new SplitChunksPlugin(options.optimization.splitChunks).apply(compiler);
-		if (options.optimization.runtimeChunk)
+		}
+		if (options.optimization.runtimeChunk) {
 			new RuntimeChunkPlugin(options.optimization.runtimeChunk).apply(compiler);
-		if (options.optimization.noEmitOnErrors)
+		}
+		if (options.optimization.noEmitOnErrors) {
 			new NoEmitOnErrorsPlugin().apply(compiler);
-		if (options.optimization.namedModules)
+		}
+		if (options.optimization.namedModules) {
 			new NamedModulesPlugin().apply(compiler);
-		if (options.optimization.namedChunks)
+		}
+		if (options.optimization.namedChunks) {
 			new NamedChunksPlugin().apply(compiler);
+		}
 		if (options.optimization.nodeEnv) {
 			new DefinePlugin({
 				"process.env.NODE_ENV": JSON.stringify(options.optimization.nodeEnv)
@@ -361,8 +376,9 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 
 		compiler.hooks.afterPlugins.call(compiler);
-		if (!compiler.inputFileSystem)
+		if (!compiler.inputFileSystem) {
 			throw new Error("No input filesystem provided");
+		}
 		compiler.resolverFactory.hooks.resolveOptions
 			.for("normal")
 			.tap("WebpackOptionsApply", resolveOptions => {