webpack 5.99.8 → 5.100.0

package/lib/NormalModuleFactory.js

@@ -9,10 +9,10 @@ const { getContext } = require("loader-runner");
 const asyncLib = require("neo-async");
 const {
 	AsyncSeriesBailHook,
-	SyncWaterfallHook,
+	HookMap,
 	SyncBailHook,
 	SyncHook,
-	HookMap
+	SyncWaterfallHook
 } = require("tapable");
 const ChunkGraph = require("./ChunkGraph");
 const Module = require("./Module");
@@ -85,7 +85,15 @@ const {
  * @property {string=} context
  */
 
-/** @typedef {ResourceData & { data: Record<string, EXPECTED_ANY> }} ResourceDataWithData */
+/**
+ * @typedef {object} ResourceSchemeData
+ * @property {string=} mimetype mime type of the resource
+ * @property {string=} parameters additional parameters for the resource
+ * @property {"base64" | false=} encoding encoding of the resource
+ * @property {string=} encodedContent encoded content of the resource
+ */
+
+/** @typedef {ResourceData & { data: ResourceSchemeData & Partial<ResolveRequest> }} ResourceDataWithData */
 
 /**
  * @typedef {object} ParsedLoaderRequest
@@ -296,7 +304,7 @@ class NormalModuleFactory extends ModuleFactory {
 			generator: new HookMap(
 				() => new SyncHook(["generator", "generatorOptions"])
 			),
-			/** @type {HookMap<SyncBailHook<[TODO, ResolveData], Module | void>>} */
+			/** @type {HookMap<SyncBailHook<[CreateData, ResolveData], Module | void>>} */
 			createModuleClass: new HookMap(
 				() => new SyncBailHook(["createData", "resolveData"])
 			)
@@ -321,6 +329,7 @@ class NormalModuleFactory extends ModuleFactory {
 		/** @type {Set<Module>} */
 		this._restoredUnsafeCacheEntries = new Set();
 
+		/** @type {(resource: string) => import("./util/identifier").ParsedResource} */
 		const cacheParseResource = parseResource.bindCache(
 			associatedObjectForCache
 		);
@@ -343,24 +352,26 @@ class NormalModuleFactory extends ModuleFactory {
 					// direct module
 					if (result instanceof Module) return callback(null, result);
 
-					if (typeof result === "object")
+					if (typeof result === "object") {
 						throw new Error(
 							`${deprecationChangedHookMessage(
 								"resolve",
 								this.hooks.resolve
 							)} Returning a Module object will result in this module used as result.`
 						);
+					}
 
 					this.hooks.afterResolve.callAsync(resolveData, (err, result) => {
 						if (err) return callback(err);
 
-						if (typeof result === "object")
+						if (typeof result === "object") {
 							throw new Error(
 								deprecationChangedHookMessage(
 									"afterResolve",
 									this.hooks.afterResolve
 								)
 							);
+						}
 
 						// Ignored
 						if (result === false) return callback();
@@ -447,21 +458,22 @@ class NormalModuleFactory extends ModuleFactory {
 					const matchResourceMatch = MATCH_RESOURCE_REGEX.exec(request);
 					if (matchResourceMatch) {
 						let matchResource = matchResourceMatch[1];
+						// Check if matchResource starts with ./ or ../
 						if (matchResource.charCodeAt(0) === 46) {
-							// 46 === ".", 47 === "/"
+							// 46 is "."
 							const secondChar = matchResource.charCodeAt(1);
 							if (
-								secondChar === 47 ||
-								(secondChar === 46 && matchResource.charCodeAt(2) === 47)
+								secondChar === 47 || // 47 is "/"
+								(secondChar === 46 && matchResource.charCodeAt(2) === 47) // "../"
 							) {
-								// if matchResources startsWith ../ or ./
+								// Resolve relative path against context
 								matchResource = join(this.fs, context, matchResource);
 							}
 						}
 
 						matchResourceData = {
-							resource: matchResource,
-							.../** @type {TODO} */ (cacheParseResource(matchResource))
+							...cacheParseResource(matchResource),
+							resource: matchResource
 						};
 						requestWithoutMatchResource = request.slice(
 							matchResourceMatch[0].length
@@ -546,11 +558,7 @@ class NormalModuleFactory extends ModuleFactory {
 
 					if (!resourceData) {
 						// ignored
-						return callback(
-							null,
-							/** @type {TODO} */
-							(dependencies[0].createIgnoredModule(context))
-						);
+						return callback(null, dependencies[0].createIgnoredModule(context));
 					}
 
 					const userRequest =
@@ -629,12 +637,10 @@ class NormalModuleFactory extends ModuleFactory {
 								settings[/** @type {keyof ModuleSettings} */ (r.type)] !== null
 							) {
 								const type = /** @type {keyof ModuleSettings} */ (r.type);
-								/** @type {TODO} */
-								(settings)[type] = cachedCleverMerge(settings[type], r.value);
+								settings[type] = cachedCleverMerge(settings[type], r.value);
 							} else {
 								const type = /** @type {keyof ModuleSettings} */ (r.type);
-								/** @type {TODO} */
-								(settings)[type] = r.value;
+								settings[type] = r.value;
 							}
 						}
 					}
@@ -652,18 +658,27 @@ class NormalModuleFactory extends ModuleFactory {
 						}
 						const allLoaders = /** @type {LoaderItem[]} */ (postLoaders);
 						if (matchResourceData === undefined) {
-							for (const loader of /** @type {LoaderItem[]} */ (loaders))
+							for (const loader of /** @type {LoaderItem[]} */ (loaders)) {
 								allLoaders.push(loader);
-							for (const loader of /** @type {LoaderItem[]} */ (normalLoaders))
+							}
+							for (const loader of /** @type {LoaderItem[]} */ (
+								normalLoaders
+							)) {
 								allLoaders.push(loader);
+							}
 						} else {
-							for (const loader of /** @type {LoaderItem[]} */ (normalLoaders))
+							for (const loader of /** @type {LoaderItem[]} */ (
+								normalLoaders
+							)) {
 								allLoaders.push(loader);
-							for (const loader of /** @type {LoaderItem[]} */ (loaders))
+							}
+							for (const loader of /** @type {LoaderItem[]} */ (loaders)) {
 								allLoaders.push(loader);
+							}
 						}
-						for (const loader of /** @type {LoaderItem[]} */ (preLoaders))
+						for (const loader of /** @type {LoaderItem[]} */ (preLoaders)) {
 							allLoaders.push(loader);
+						}
 						const type = /** @type {string} */ (settings.type);
 						const resolveOptions = settings.resolve;
 						const layer = settings.layer;
@@ -759,9 +774,9 @@ class NormalModuleFactory extends ModuleFactory {
 				const defaultResolve = context => {
 					if (/^($|\?)/.test(unresolvedResource)) {
 						resourceData = {
+							...cacheParseResource(unresolvedResource),
 							resource: unresolvedResource,
-							data: {},
-							.../** @type {TODO} */ (cacheParseResource(unresolvedResource))
+							data: {}
 						};
 						continueCallback();
 					}
@@ -791,12 +806,11 @@ class NormalModuleFactory extends ModuleFactory {
 										/** @type {string} */
 										(_resolvedResource);
 									resourceData = {
+										...cacheParseResource(resolvedResource),
 										resource: resolvedResource,
 										data:
 											/** @type {ResolveRequest} */
-											(resolvedResourceResolveData),
-										.../** @type {TODO} */
-										(cacheParseResource(resolvedResource))
+											(resolvedResourceResolveData)
 									};
 								}
 								continueCallback();
@@ -843,7 +857,9 @@ class NormalModuleFactory extends ModuleFactory {
 				}
 
 				// resource without scheme and without path
-				else defaultResolve(context);
+				else {
+					defaultResolve(context);
+				}
 			}
 		);
 	}
@@ -915,13 +931,14 @@ class NormalModuleFactory extends ModuleFactory {
 				return callback(null, factoryResult);
 			}
 
-			if (typeof result === "object")
+			if (typeof result === "object") {
 				throw new Error(
 					deprecationChangedHookMessage(
 						"beforeResolve",
 						this.hooks.beforeResolve
 					)
 				);
+			}
 
 			this.hooks.factorize.callAsync(resolveData, (err, module) => {
 				if (err) {
@@ -994,9 +1011,7 @@ ${hints.join("\n\n")}`;
 
 							// Check if the extension is missing a leading dot (e.g. "js" instead of ".js")
 							let appendResolveExtensionsHint = false;
-							const specifiedExtensions = Array.from(
-								resolver.options.extensions
-							);
+							const specifiedExtensions = [...resolver.options.extensions];
 							const expectedExtensions = specifiedExtensions.map(extension => {
 								if (LEADING_DOT_EXTENSION_REGEX.test(extension)) {
 									appendResolveExtensionsHint = true;
@@ -1228,7 +1243,7 @@ If changing the source code is not an option there is also a resolve options cal
 					}
 				);
 			},
-			/** @type {Callback<TODO>} */ (callback)
+			/** @type {Callback<(LoaderItem | undefined)[]>} */ (callback)
 		);
 	}
 

package/lib/NormalModuleReplacementPlugin.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const { join, dirname } = require("./util/fs");
+const { dirname, join } = require("./util/fs");
 
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./NormalModuleFactory").ResolveData} ResolveData */

package/lib/NullFactory.js

@@ -20,4 +20,5 @@ class NullFactory extends ModuleFactory {
 		return callback();
 	}
 }
+
 module.exports = NullFactory;

package/lib/OptimizationStages.js

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

package/lib/Parser.js

@@ -32,6 +32,7 @@ class Parser {
 	 */
 	parse(source, state) {
 		const AbstractMethodError = require("./AbstractMethodError");
+
 		throw new AbstractMethodError();
 	}
 }

package/lib/ProgressPlugin.js

@@ -12,6 +12,10 @@ const createSchemaValidation = require("./util/create-schema-validation");
 const { contextify } = require("./util/identifier");
 
 /** @typedef {import("tapable").Tap} Tap */
+/**
+ * @template T, R, AdditionalOptions
+ * @typedef {import("tapable").Hook<T, R, AdditionalOptions>} Hook
+ */
 /** @typedef {import("../declarations/plugins/ProgressPlugin").HandlerFunction} HandlerFunction */
 /** @typedef {import("../declarations/plugins/ProgressPlugin").ProgressPluginArgument} ProgressPluginArgument */
 /** @typedef {import("../declarations/plugins/ProgressPlugin").ProgressPluginOptions} ProgressPluginOptions */
@@ -34,7 +38,7 @@ const { contextify } = require("./util/identifier");
  */
 
 const validate = createSchemaValidation(
-	require("../schemas/plugins/ProgressPlugin.check.js"),
+	require("../schemas/plugins/ProgressPlugin.check"),
 	() => require("../schemas/plugins/ProgressPlugin.json"),
 	{
 		name: "Progress Plugin",
@@ -321,14 +325,16 @@ class ProgressPlugin {
 				skippedDependenciesCount++;
 			}
 			dependenciesCount++;
-			if (dependenciesCount < 50 || dependenciesCount % 100 === 0)
+			if (dependenciesCount < 50 || dependenciesCount % 100 === 0) {
 				updateThrottled();
+			}
 		};
 
 		const factorizeDone = () => {
 			doneDependencies++;
-			if (doneDependencies < 50 || doneDependencies % 100 === 0)
+			if (doneDependencies < 50 || doneDependencies % 100 === 0) {
 				updateThrottled();
+			}
 		};
 
 		/**
@@ -413,7 +419,7 @@ class ProgressPlugin {
 						}
 						return data;
 					},
-					err => {
+					_err => {
 						// Ignore error
 					}
 				);
@@ -582,7 +588,8 @@ class ProgressPlugin {
 			}
 		});
 		/**
-		 * @param {TODO} hook hook
+		 * @template {Hook<EXPECTED_ANY, EXPECTED_ANY, EXPECTED_ANY>} T
+		 * @param {T} hook hook
 		 * @param {number} progress progress from 0 to 1
 		 * @param {string} category category
 		 * @param {string} name name

package/lib/ProvidePlugin.js

@@ -61,7 +61,11 @@ class ProvidePlugin {
 					for (const name of Object.keys(definitions)) {
 						const request =
 							/** @type {string[]} */
-							([]).concat(definitions[name]);
+							([
+								...(Array.isArray(definitions[name])
+									? definitions[name]
+									: [definitions[name]])
+							]);
 						const splittedName = name.split(".");
 						if (splittedName.length > 0) {
 							for (const [i, _] of splittedName.slice(1).entries()) {

package/lib/RecordIdsPlugin.js

@@ -22,7 +22,6 @@ const identifierUtils = require("./util/identifier");
 /**
  * @typedef {object} RecordsModules
  * @property {Record<string, number>=} byIdentifier
- * @property {Record<string, number>=} bySource
  * @property {number[]=} usedIds
  */
 
@@ -85,7 +84,7 @@ class RecordIdsPlugin {
 					records.modules.byIdentifier[identifier] = moduleId;
 					usedIds.add(moduleId);
 				}
-				records.modules.usedIds = Array.from(usedIds).sort(compareNumbers);
+				records.modules.usedIds = [...usedIds].sort(compareNumbers);
 			});
 			compilation.hooks.reviveModules.tap(PLUGIN_NAME, (modules, records) => {
 				if (!records.modules) return;
@@ -169,7 +168,7 @@ class RecordIdsPlugin {
 					}
 					usedIds.add(chunk.id);
 				}
-				records.chunks.usedIds = Array.from(usedIds).sort(compareNumbers);
+				records.chunks.usedIds = [...usedIds].sort(compareNumbers);
 			});
 			compilation.hooks.reviveChunks.tap(PLUGIN_NAME, (chunks, records) => {
 				if (!records.chunks) return;
@@ -209,4 +208,5 @@ class RecordIdsPlugin {
 		});
 	}
 }
+
 module.exports = RecordIdsPlugin;