webpack 5.92.1 → 5.94.0

package/lib/NormalModuleFactory.js

@@ -116,15 +116,15 @@ const loaderToIdent = data => {
 		return data.loader;
 	}
 	if (typeof data.options === "string") {
-		return data.loader + "?" + data.options;
+		return `${data.loader}?${data.options}`;
 	}
 	if (typeof data.options !== "object") {
 		throw new Error("loader options must be string or object");
 	}
 	if (data.ident) {
-		return data.loader + "??" + data.ident;
+		return `${data.loader}??${data.ident}`;
 	}
-	return data.loader + "?" + JSON.stringify(data.options);
+	return `${data.loader}?${JSON.stringify(data.options)}`;
 };
 
 /**
@@ -135,7 +135,7 @@ const loaderToIdent = data => {
 const stringifyLoadersAndResource = (loaders, resource) => {
 	let str = "";
 	for (const loader of loaders) {
-		str += loaderToIdent(loader) + "!";
+		str += `${loaderToIdent(loader)}!`;
 	}
 	return str + resource;
 };
@@ -145,16 +145,14 @@ const stringifyLoadersAndResource = (loaders, resource) => {
  * @param {(err?: null | Error) => void} callback callback
  * @returns {(err?: null | Error) => void} callback
  */
-const needCalls = (times, callback) => {
-	return err => {
-		if (--times === 0) {
-			return callback(err);
-		}
-		if (err && times > 0) {
-			times = NaN;
-			return callback(err);
-		}
-	};
+const needCalls = (times, callback) => err => {
+	if (--times === 0) {
+		return callback(err);
+	}
+	if (err && times > 0) {
+		times = Number.NaN;
+		return callback(err);
+	}
 };
 
 /**
@@ -173,18 +171,14 @@ const mergeGlobalOptions = (globalOptions, type, localOptions) => {
 		current = current ? `${current}/${part}` : part;
 		const options = globalOptions[current];
 		if (typeof options === "object") {
-			if (result === undefined) {
-				result = options;
-			} else {
-				result = cachedCleverMerge(result, options);
-			}
+			result =
+				result === undefined ? options : cachedCleverMerge(result, options);
 		}
 	}
 	if (result === undefined) {
 		return localOptions;
-	} else {
-		return cachedCleverMerge(result, localOptions);
 	}
+	return cachedCleverMerge(result, localOptions);
 };
 
 // TODO webpack 6 remove
@@ -200,9 +194,7 @@ const deprecationChangedHookMessage = (name, hook) => {
 			 * @param {TODO} tapped tapped
 			 * @returns {string} name
 			 */
-			tapped => {
-				return tapped.name;
-			}
+			tapped => tapped.name
 		)
 		.join(", ");
 
@@ -348,8 +340,10 @@ class NormalModuleFactory extends ModuleFactory {
 
 					if (typeof result === "object")
 						throw new Error(
-							deprecationChangedHookMessage("resolve", this.hooks.resolve) +
-								" Returning a Module object will result in this module used as result."
+							`${deprecationChangedHookMessage(
+								"resolve",
+								this.hooks.resolve
+							)} Returning a Module object will result in this module used as result.`
 						);
 
 					this.hooks.afterResolve.callAsync(resolveData, (err, result) => {
@@ -427,7 +421,7 @@ class NormalModuleFactory extends ModuleFactory {
 				const loaderResolver = this.getResolver("loader");
 
 				/** @type {ResourceData | undefined} */
-				let matchResourceData = undefined;
+				let matchResourceData;
 				/** @type {string} */
 				let unresolvedResource;
 				/** @type {ParsedLoaderRequest[]} */
@@ -538,8 +532,8 @@ class NormalModuleFactory extends ModuleFactory {
 								item.ident = ident;
 							}
 						}
-					} catch (e) {
-						return callback(/** @type {Error} */ (e));
+					} catch (identErr) {
+						return callback(/** @type {Error} */ (identErr));
 					}
 
 					if (!resourceData) {
@@ -617,10 +611,15 @@ class NormalModuleFactory extends ModuleFactory {
 							} else if (
 								typeof r.value === "object" &&
 								r.value !== null &&
-								typeof settings[r.type] === "object" &&
-								settings[r.type] !== null
+								typeof settings[
+									/** @type {keyof ModuleSettings} */ (r.type)
+								] === "object" &&
+								settings[/** @type {keyof ModuleSettings} */ (r.type)] !== null
 							) {
-								settings[r.type] = cachedCleverMerge(settings[r.type], r.value);
+								settings[r.type] = cachedCleverMerge(
+									settings[/** @type {keyof ModuleSettings} */ (r.type)],
+									r.value
+								);
 							} else {
 								settings[r.type] = r.value;
 							}
@@ -652,7 +651,7 @@ class NormalModuleFactory extends ModuleFactory {
 						}
 						for (const loader of /** @type {LoaderItem[]} */ (preLoaders))
 							allLoaders.push(loader);
-						let type = /** @type {string} */ (settings.type);
+						const type = /** @type {string} */ (settings.type);
 						const resolveOptions = settings.resolve;
 						const layer = settings.layer;
 						if (layer !== undefined && !layers) {
@@ -688,8 +687,8 @@ class NormalModuleFactory extends ModuleFactory {
 								generatorOptions: settings.generator,
 								resolveOptions
 							});
-						} catch (e) {
-							return callback(/** @type {Error} */ (e));
+						} catch (createDataErr) {
+							return callback(/** @type {Error} */ (createDataErr));
 						}
 						callback();
 					});
@@ -772,12 +771,17 @@ class NormalModuleFactory extends ModuleFactory {
 							unresolvedResource,
 							normalResolver,
 							resolveContext,
-							(err, resolvedResource, resolvedResourceResolveData) => {
+							(err, _resolvedResource, resolvedResourceResolveData) => {
 								if (err) return continueCallback(err);
-								if (resolvedResource !== false) {
+								if (_resolvedResource !== false) {
+									const resolvedResource =
+										/** @type {string} */
+										(_resolvedResource);
 									resourceData = {
 										resource: resolvedResource,
-										data: resolvedResourceResolveData,
+										data:
+											/** @type {ResolveRequest} */
+											(resolvedResourceResolveData),
 										...cacheParseResource(resolvedResource)
 									};
 								}
@@ -1066,13 +1070,12 @@ Add the extension to the request.`
 											/(\.[^.]+)(\?|$)/,
 											"$2"
 										);
-										if (resolver.options.extensions.has(match[1])) {
-											hint = `Did you mean '${fixedRequest}'?`;
-										} else {
-											hint = `Did you mean '${fixedRequest}'? Also note that '${match[1]}' is not in 'resolve.extensions' yet and need to be added for this to work?`;
-										}
+										hint = resolver.options.extensions.has(match[1])
+											? `Did you mean '${fixedRequest}'?`
+											: `Did you mean '${fixedRequest}'? Also note that '${match[1]}' is not in 'resolve.extensions' yet and need to be added for this to work?`;
 									} else {
-										hint = `Did you mean to omit the extension or to remove 'resolve.enforceExtension'?`;
+										hint =
+											"Did you mean to omit the extension or to remove 'resolve.enforceExtension'?";
 									}
 									return callback(
 										null,
@@ -1151,18 +1154,17 @@ If changing the source code is not an option there is also a resolve options cal
 						if (
 							err &&
 							/^[^/]*$/.test(item.loader) &&
-							!/-loader$/.test(item.loader)
+							!item.loader.endsWith("-loader")
 						) {
 							return resolver.resolve(
 								contextInfo,
 								context,
-								item.loader + "-loader",
+								`${item.loader}-loader`,
 								resolveContext,
 								err2 => {
 									if (!err2) {
 										err.message =
-											err.message +
-											"\n" +
+											`${err.message}\n` +
 											"BREAKING CHANGE: It's no longer allowed to omit the '-loader' suffix when using loaders.\n" +
 											`                 You need to specify '${item.loader}-loader' instead of '${item.loader}',\n` +
 											"                 see https://webpack.js.org/migrate/3/#automatic-loader-module-name-extension-removed";
@@ -1173,7 +1175,9 @@ If changing the source code is not an option there is also a resolve options cal
 						}
 						if (err) return callback(err);
 
-						const parsedResult = this._parseResourceWithoutFragment(result);
+						const parsedResult = this._parseResourceWithoutFragment(
+							/** @type {string} */ (result)
+						);
 
 						const type = /\.mjs$/i.test(parsedResult.path)
 							? "module"

package/lib/OptimizationStages.js

@@ -5,6 +5,6 @@
 
 "use strict";
 
-exports.STAGE_BASIC = -10;
-exports.STAGE_DEFAULT = 0;
-exports.STAGE_ADVANCED = 10;
+module.exports.STAGE_BASIC = -10;
+module.exports.STAGE_DEFAULT = 0;
+module.exports.STAGE_ADVANCED = 10;

package/lib/ProgressPlugin.js

@@ -41,9 +41,7 @@ const validate = createSchemaValidation(
  * @param {number} c c
  * @returns {number} median
  */
-const median3 = (a, b, c) => {
-	return a + b + c - Math.max(a, b, c) - Math.min(a, b, c);
-};
+const median3 = (a, b, c) => a + b + c - Math.max(a, b, c) - Math.min(a, b, c);
 
 /**
  * @param {boolean | null | undefined} profile need profile
@@ -78,11 +76,12 @@ const createDefaultHandler = (profile, logger) => {
 						if (lastStateItem.value) {
 							let reportState = lastStateItem.value;
 							if (i > 0) {
-								reportState = lastStateInfo[i - 1].value + " > " + reportState;
+								reportState = `${lastStateInfo[i - 1].value} > ${reportState}`;
 							}
 							const stateMsg = `${" | ".repeat(i)}${diff} ms ${reportState}`;
 							const d = diff;
 							// This depends on timing so we ignore it for coverage
+							/* eslint-disable no-lone-blocks */
 							/* istanbul ignore next */
 							{
 								if (d > 10000) {
@@ -97,6 +96,7 @@ const createDefaultHandler = (profile, logger) => {
 									logger.debug(stateMsg);
 								}
 							}
+							/* eslint-enable no-lone-blocks */
 						}
 						if (stateItem === undefined) {
 							lastStateInfo.length = i;
@@ -191,14 +191,14 @@ class ProgressPlugin {
 		const states = compiler.compilers.map(
 			() => /** @type {[number, ...string[]]} */ ([0])
 		);
-		compiler.compilers.forEach((compiler, idx) => {
+		for (const [idx, item] of compiler.compilers.entries()) {
 			new ProgressPlugin((p, msg, ...args) => {
 				states[idx] = [p, msg, ...args];
 				let sum = 0;
 				for (const [p] of states) sum += p;
 				handler(sum / states.length, `[${idx}] ${msg}`, ...args);
-			}).apply(compiler);
-		});
+			}).apply(item);
+		}
 	}
 
 	/**
@@ -507,7 +507,7 @@ class ProgressPlugin {
 				afterSeal: "after seal"
 			};
 			const numberOfHooks = Object.keys(hooks).length;
-			Object.keys(hooks).forEach((name, idx) => {
+			for (const [idx, name] of Object.keys(hooks).entries()) {
 				const title = hooks[/** @type {keyof typeof hooks} */ (name)];
 				const percentage = (idx / numberOfHooks) * 0.25 + 0.7;
 				compilation.hooks[/** @type {keyof typeof hooks} */ (name)].intercept({
@@ -534,7 +534,7 @@ class ProgressPlugin {
 						handler(percentage, "sealing", title, tap.name);
 					}
 				});
-			});
+			}
 		});
 		compiler.hooks.make.intercept({
 			name: "ProgressPlugin",

package/lib/ProvidePlugin.js

@@ -58,16 +58,16 @@ class ProvidePlugin {
 				 * @returns {void}
 				 */
 				const handler = (parser, parserOptions) => {
-					Object.keys(definitions).forEach(name => {
+					for (const name of Object.keys(definitions)) {
 						const request =
 							/** @type {string[]} */
 							([]).concat(definitions[name]);
 						const splittedName = name.split(".");
 						if (splittedName.length > 0) {
-							splittedName.slice(1).forEach((_, i) => {
+							for (const [i, _] of splittedName.slice(1).entries()) {
 								const name = splittedName.slice(0, i + 1).join(".");
 								parser.hooks.canRename.for(name).tap(PLUGIN_NAME, approve);
-							});
+							}
 						}
 
 						parser.hooks.expression.for(name).tap(PLUGIN_NAME, expr => {
@@ -100,7 +100,7 @@ class ProvidePlugin {
 							parser.walkExpressions(expr.arguments);
 							return true;
 						});
-					});
+					}
 				};
 				normalModuleFactory.hooks.parser
 					.for(JAVASCRIPT_MODULE_TYPE_AUTO)