webpack 5.99.7 → 5.99.9

package/lib/ExportsInfo.js

@@ -34,9 +34,18 @@ const RETURNS_TRUE = () => true;
 
 const CIRCULAR = Symbol("circular target");
 
+/**
+ * @typedef {object} RestoreProvidedDataExports
+ * @property {ExportInfoName} name
+ * @property {ExportInfo["provided"]} provided
+ * @property {ExportInfo["canMangleProvide"]} canMangleProvide
+ * @property {ExportInfo["terminalBinding"]} terminalBinding
+ * @property {RestoreProvidedData | undefined} exportsInfo
+ */
+
 class RestoreProvidedData {
 	/**
-	 * @param {TODO[]} exports exports
+	 * @param {RestoreProvidedDataExports[]} exports exports
 	 * @param {ExportInfo["provided"]} otherProvided other provided
 	 * @param {ExportInfo["canMangleProvide"]} otherCanMangleProvide other can mangle provide
 	 * @param {ExportInfo["terminalBinding"]} otherTerminalBinding other terminal binding
@@ -78,7 +87,7 @@ makeSerializable(
 	"RestoreProvidedData"
 );
 
-/** @typedef {Map<string, ExportInfo>} Exports */
+/** @typedef {Map<ExportInfoName, ExportInfo>} Exports */
 /** @typedef {string | string[] | false} UsedName */
 
 class ExportsInfo {
@@ -131,6 +140,7 @@ class ExportsInfo {
 			this._sortExports();
 		}
 		if (this._redirectTo !== undefined) {
+			/** @type {Exports} */
 			const map = new Map(
 				Array.from(this._redirectTo.orderedExports, item => [item.name, item])
 			);
@@ -160,6 +170,7 @@ class ExportsInfo {
 	 */
 	_sortExportsMap(exports) {
 		if (exports.size > 1) {
+			/** @type {string[]} */
 			const namesInOrder = [];
 			for (const entry of exports.values()) {
 				namesInOrder.push(entry.name);
@@ -229,7 +240,7 @@ class ExportsInfo {
 	}
 
 	/**
-	 * @param {string} name export name
+	 * @param {ExportInfoName} name export name
 	 * @returns {ExportInfo} export info for this name
 	 */
 	getOwnExportInfo(name) {
@@ -242,7 +253,7 @@ class ExportsInfo {
 	}
 
 	/**
-	 * @param {string} name export name
+	 * @param {ExportInfoName} name export name
 	 * @returns {ExportInfo} export info for this name
 	 */
 	getExportInfo(name) {
@@ -257,7 +268,7 @@ class ExportsInfo {
 	}
 
 	/**
-	 * @param {string} name export name
+	 * @param {ExportInfoName} name export name
 	 * @returns {ExportInfo} export info for this name
 	 */
 	getReadOnlyExportInfo(name) {
@@ -269,7 +280,7 @@ class ExportsInfo {
 	}
 
 	/**
-	 * @param {string[]} name export name
+	 * @param {ExportInfoName[]} name export name
 	 * @returns {ExportInfo | undefined} export info for this name
 	 */
 	getReadOnlyExportInfoRecursive(name) {
@@ -280,7 +291,7 @@ class ExportsInfo {
 	}
 
 	/**
-	 * @param {string[]=} name the export name
+	 * @param {ExportInfoName[]=} name the export name
 	 * @returns {ExportsInfo | undefined} the nested exports info
 	 */
 	getNestedExportsInfo(name) {
@@ -327,7 +338,8 @@ class ExportsInfo {
 			if (targetKey) {
 				exportInfo.setTarget(
 					targetKey,
-					/** @type {ModuleGraphConnection} */ (targetModule),
+					/** @type {ModuleGraphConnection} */
+					(targetModule),
 					[exportInfo.name],
 					-1
 				);
@@ -552,6 +564,7 @@ class ExportsInfo {
 					return true;
 			}
 		}
+		/** @type {string[]} */
 		const array = [];
 		if (!this._exportsAreOrdered) this._sortExports();
 		for (const exportInfo of this._exports.values()) {
@@ -604,7 +617,7 @@ class ExportsInfo {
 	}
 
 	/**
-	 * @param {string | string[]} name the name of the export
+	 * @param {ExportInfoName | ExportInfoName[]} name the name of the export
 	 * @returns {boolean | undefined | null} if the export is provided
 	 */
 	isExportProvided(name) {
@@ -665,7 +678,7 @@ class ExportsInfo {
 	}
 
 	/**
-	 * @param {string | string[]} name export name
+	 * @param {ExportInfoName | ExportInfoName[]} name export name
 	 * @param {RuntimeSpec} runtime check usage for this runtime only
 	 * @returns {UsageStateType} usage status
 	 */
@@ -683,7 +696,7 @@ class ExportsInfo {
 	}
 
 	/**
-	 * @param {string | string[]} name the export name
+	 * @param {ExportInfoName | ExportInfoName[]} name the export name
 	 * @param {RuntimeSpec} runtime check usage for this runtime only
 	 * @returns {UsedName} the used name
 	 */
@@ -698,7 +711,7 @@ class ExportsInfo {
 			const x = info.getUsedName(name[0], runtime);
 			if (x === false) return false;
 			const arr =
-				/** @type {string[]} */
+				/** @type {ExportInfoName[]} */
 				(x === name[0] && name.length === 1 ? name : [x]);
 			if (name.length === 1) {
 				return arr;
@@ -755,6 +768,7 @@ class ExportsInfo {
 		const otherProvided = this._otherExportsInfo.provided;
 		const otherCanMangleProvide = this._otherExportsInfo.canMangleProvide;
 		const otherTerminalBinding = this._otherExportsInfo.terminalBinding;
+		/** @type {RestoreProvidedDataExports[]} */
 		const exports = [];
 		for (const exportInfo of this.orderedExports) {
 			if (
@@ -827,19 +841,24 @@ class ExportsInfo {
 /** @typedef {(module: Module) => boolean} ValidTargetModuleFilter */
 
 /** @typedef {{ connection: ModuleGraphConnection, export: string[], priority: number }} TargetItem */
+
 /** @typedef {Map<Dependency | undefined, TargetItem>} Target */
 
+/** @typedef {string} ExportInfoName */
+/** @typedef {string | null} ExportInfoUsedName */
+/** @typedef {boolean | null} ExportInfoProvided */
+
 class ExportInfo {
 	/**
-	 * @param {string} name the original name of the export
+	 * @param {ExportInfoName} name the original name of the export
 	 * @param {ExportInfo=} initFrom init values from this ExportInfo
 	 */
 	constructor(name, initFrom) {
-		/** @type {string} */
+		/** @type {ExportInfoName} */
 		this.name = name;
 		/**
 		 * @private
-		 * @type {string | null}
+		 * @type {ExportInfoUsedName}
 		 */
 		this._usedName = initFrom ? initFrom._usedName : null;
 		/**
@@ -867,7 +886,7 @@ class ExportInfo {
 		 * false: it is not provided
 		 * null: only the runtime knows if it is provided
 		 * undefined: it was not determined if it is provided
-		 * @type {boolean | null | undefined}
+		 * @type {ExportInfoProvided | undefined}
 		 */
 		this.provided = initFrom ? initFrom.provided : undefined;
 		/**

package/lib/ExternalModule.js

@@ -28,6 +28,7 @@ const propertyAccess = require("./util/propertyAccess");
 const { register } = require("./util/serialization");
 
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
@@ -58,7 +59,6 @@ const { register } = require("./util/serialization");
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("./util/Hash")} Hash */
-/** @typedef {typeof import("./util/Hash")} HashConstructor */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
@@ -215,9 +215,10 @@ const getSourceForImportExternal = (
 };
 
 /**
- * @param {string} key key
- * @param {TODO | undefined} value value
- * @returns {undefined | string} replaced value
+ * @template {{ [key: string]: string }} T
+ * @param {keyof T} key key
+ * @param {T[keyof T]} value value
+ * @returns {undefined | T[keyof T]} replaced value
  */
 const importAssertionReplacer = (key, value) => {
 	if (key === "_isLegacyAssert") {
@@ -235,7 +236,7 @@ class ModuleExternalInitFragment extends InitFragment {
 	 * @param {string} request import source
 	 * @param {string=} ident recomputed ident
 	 * @param {ImportDependencyMeta=} dependencyMeta the dependency meta
-	 * @param {string | HashConstructor=} hashFunction the hash function to use
+	 * @param {HashFunction=} hashFunction the hash function to use
 	 */
 	constructor(
 		request,

package/lib/FileSystemInfo.js

@@ -24,7 +24,7 @@ const processAsyncTree = require("./util/processAsyncTree");
 /** @typedef {import("./logging/Logger").Logger} Logger */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {typeof import("./util/Hash")} Hash */
+/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
 /** @typedef {import("./util/fs").IStats} IStats */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./util/fs").PathLike} PathLike */
@@ -708,7 +708,6 @@ class SnapshotOptimization {
 					};
 				}
 				this._map.set(path, newOptimizationEntry);
-				continue;
 			} else {
 				optimizationEntries.add(optimizationEntry);
 			}
@@ -742,7 +741,6 @@ class SnapshotOptimization {
 							continue optimizationEntriesLabel;
 						}
 						nonSharedFiles.add(path);
-						continue;
 					}
 				}
 				if (nonSharedFiles.size === 0) {
@@ -1058,7 +1056,7 @@ class FileSystemInfo {
 	 * @param {Iterable<string | RegExp>=} options.managedPaths paths that are only managed by a package manager
 	 * @param {Iterable<string | RegExp>=} options.immutablePaths paths that are immutable
 	 * @param {Logger=} options.logger logger used to log invalid snapshots
-	 * @param {string | Hash=} options.hashFunction the hash function to use
+	 * @param {HashFunction=} options.hashFunction the hash function to use
 	 */
 	constructor(
 		fs,

package/lib/LibManifestPlugin.js

@@ -19,8 +19,8 @@ const { dirname, mkdirp } = require("./util/fs");
 /**
  * @typedef {object} ManifestModuleData
  * @property {string | number} id
- * @property {BuildMeta} buildMeta
- * @property {boolean | string[] | undefined} exports
+ * @property {BuildMeta=} buildMeta
+ * @property {boolean | string[]=} exports
  */
 
 /**

package/lib/ModuleFilenameHelpers.js

@@ -10,10 +10,11 @@ const { DEFAULTS } = require("./config/defaults");
 const createHash = require("./util/createHash");
 const memoize = require("./util/memoize");
 
+/** @typedef {import("../declarations/WebpackOptions").DevtoolModuleFilenameTemplate} DevtoolModuleFilenameTemplate */
+/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./RequestShortener")} RequestShortener */
-/** @typedef {typeof import("./util/Hash")} Hash */
 
 /** @typedef {string | RegExp | (string | RegExp)[]} Matcher */
 /** @typedef {{ test?: Matcher, include?: Matcher, exclude?: Matcher }} MatchObject */
@@ -76,7 +77,7 @@ const getBefore = (strFn, token) => () => {
 /**
  * Returns a function that returns a hash of the string
  * @param {ReturnStringCallback} strFn the function to get the string
- * @param {string | Hash=} hashFunction the hash function to use
+ * @param {HashFunction=} hashFunction the hash function to use
  * @returns {ReturnStringCallback} a function that returns the hash of the string
  */
 const getHash =
@@ -117,10 +118,13 @@ const lazyObject = obj => {
 
 const SQUARE_BRACKET_TAG_REGEXP = /\[\\*([\w-]+)\\*\]/gi;
 
+/** @typedef {((context: TODO) => string)} ModuleFilenameTemplateFunction */
+/** @typedef {string | ModuleFilenameTemplateFunction} ModuleFilenameTemplate */
+
 /**
  * @param {Module | string} module the module
- * @param {{ namespace?: string, moduleFilenameTemplate?: string | TODO }} options options
- * @param {{ requestShortener: RequestShortener, chunkGraph: ChunkGraph, hashFunction?: string | Hash }} contextInfo context info
+ * @param {{ namespace?: string, moduleFilenameTemplate?: ModuleFilenameTemplate }} options options
+ * @param {{ requestShortener: RequestShortener, chunkGraph: ChunkGraph, hashFunction?: HashFunction }} contextInfo context info
  * @returns {string} the filename
  */
 ModuleFilenameHelpers.createFilename = (

package/lib/NormalModule.js

@@ -57,6 +57,7 @@ const memoize = require("./util/memoize");
 /** @typedef {import("../declarations/WebpackOptions").Mode} Mode */
 /** @typedef {import("../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
+/** @typedef {import("../declarations/WebpackOptions").NoParse} NoParse */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
@@ -80,11 +81,13 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./ModuleTypeConstants").JavaScriptModuleTypes} JavaScriptModuleTypes */
 /** @typedef {import("./NormalModuleFactory")} NormalModuleFactory */
 /** @typedef {import("./NormalModuleFactory").ResourceDataWithData} ResourceDataWithData */
+/** @typedef {import("./NormalModuleFactory").ResourceSchemeData} ResourceSchemeData */
 /** @typedef {import("./Parser")} Parser */
 /** @typedef {import("./Parser").PreparsedAst} PreparsedAst */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolveContext} ResolveContext */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
+/** @typedef {import("./ResolverFactory").ResolveRequest} ResolveRequest */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("./logging/Logger").Logger} WebpackLogger */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
@@ -92,7 +95,7 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./util/Hash")} Hash */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("./util/createHash").Algorithm} Algorithm */
+/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
 /** @typedef {import("./util/identifier").AssociatedObjectForCache} AssociatedObjectForCache */
 /**
  * @template T
@@ -249,7 +252,7 @@ makeSerializable(
  * @property {string} rawRequest request without resolving
  * @property {LoaderItem[]} loaders list of loaders
  * @property {string} resource path + query of the real resource
- * @property {TODO=} resourceResolveData resource resolve data
+ * @property {(ResourceSchemeData & Partial<ResolveRequest>)=} resourceResolveData resource resolve data
  * @property {string} context context directory for resolving
  * @property {string=} matchResource path + query of the matched resource (virtual)
  * @property {Parser} parser the parser used
@@ -586,12 +589,14 @@ class NormalModule extends Module {
 	 * @param {Compilation} compilation the compilation
 	 * @param {InputFileSystem} fs file system from reading
 	 * @param {NormalModuleCompilationHooks} hooks the hooks
-	 * @returns {import("../declarations/LoaderContext").NormalModuleLoaderContext<T>} loader context
+	 * @returns {import("../declarations/LoaderContext").LoaderContext<T>} loader context
 	 */
 	_createLoaderContext(resolver, options, compilation, fs, hooks) {
 		const { requestShortener } = compilation.runtimeTemplate;
 		const getCurrentLoaderName = () => {
-			const currentLoader = this.getCurrentLoader(loaderContext);
+			const currentLoader = this.getCurrentLoader(
+				/** @type {LoaderContext<EXPECTED_ANY>} */ (loaderContext)
+			);
 			if (!currentLoader) return "(not in loader scope)";
 			return requestShortener.shorten(currentLoader.loader);
 		};
@@ -600,13 +605,22 @@ class NormalModule extends Module {
 		 */
 		const getResolveContext = () => ({
 			fileDependencies: {
-				add: d => /** @type {TODO} */ (loaderContext).addDependency(d)
+				add: d =>
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (
+						loaderContext
+					).addDependency(d)
 			},
 			contextDependencies: {
-				add: d => /** @type {TODO} */ (loaderContext).addContextDependency(d)
+				add: d =>
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (
+						loaderContext
+					).addContextDependency(d)
 			},
 			missingDependencies: {
-				add: d => /** @type {TODO} */ (loaderContext).addMissingDependency(d)
+				add: d =>
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (
+						loaderContext
+					).addMissingDependency(d)
 			}
 		});
 		const getAbsolutify = memoize(() =>
@@ -649,13 +663,13 @@ class NormalModule extends Module {
 					? getContextifyInContext()(request)
 					: getContextify()(context, request),
 			/**
-			 * @param {(string | typeof import("./util/Hash"))=} type type
+			 * @param {HashFunction=} type type
 			 * @returns {Hash} hash
 			 */
 			createHash: type =>
 				createHash(
 					type ||
-						/** @type {Algorithm} */
+						/** @type {HashFunction} */
 						(compilation.outputOptions.hashFunction)
 				)
 		};
@@ -667,7 +681,9 @@ class NormalModule extends Module {
 			 * @returns {T} options
 			 */
 			getOptions: schema => {
-				const loader = this.getCurrentLoader(loaderContext);
+				const loader = this.getCurrentLoader(
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (loaderContext)
+				);
 
 				let { options } = /** @type {LoaderItem} */ (loader);
 
@@ -727,7 +743,9 @@ class NormalModule extends Module {
 				);
 			},
 			getLogger: name => {
-				const currentLoader = this.getCurrentLoader(loaderContext);
+				const currentLoader = this.getCurrentLoader(
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (loaderContext)
+				);
 				return compilation.getLogger(() =>
 					[currentLoader && currentLoader.loader, name, this.identifier()]
 						.filter(Boolean)
@@ -803,7 +821,7 @@ class NormalModule extends Module {
 			webpack: true,
 			sourceMap: Boolean(this.useSourceMap),
 			mode: options.mode || "production",
-			hashFunction: /** @type {TODO} */ (options.output.hashFunction),
+			hashFunction: /** @type {string} */ (options.output.hashFunction),
 			hashDigest: /** @type {string} */ (options.output.hashDigest),
 			hashDigestLength: /** @type {number} */ (options.output.hashDigestLength),
 			hashSalt: /** @type {string} */ (options.output.hashSalt),
@@ -815,18 +833,19 @@ class NormalModule extends Module {
 
 		Object.assign(loaderContext, options.loader);
 
+		// After `hooks.loader.call` is called, the loaderContext is typed as LoaderContext<EXPECTED_ANY>
 		hooks.loader.call(
 			/** @type {LoaderContext<EXPECTED_ANY>} */
 			(loaderContext),
 			this
 		);
 
-		return loaderContext;
+		return /** @type {LoaderContext<EXPECTED_ANY>} */ (loaderContext);
 	}
 
 	// TODO remove `loaderContext` in webpack@6
 	/**
-	 * @param {TODO} loaderContext loader context
+	 * @param {LoaderContext<EXPECTED_ANY>} loaderContext loader context
 	 * @param {number} index index
 	 * @returns {LoaderItem | null} loader
 	 */
@@ -997,7 +1016,7 @@ class NormalModule extends Module {
 				loaders: this.loaders,
 				context: loaderContext,
 				/**
-				 * @param {LoaderContext<TODO>} loaderContext the loader context
+				 * @param {LoaderContext<EXPECTED_ANY>} loaderContext the loader context
 				 * @param {string} resourcePath the resource Path
 				 * @param {(err: Error | null, result?: string | Buffer) => void} callback callback
 				 */
@@ -1079,7 +1098,7 @@ class NormalModule extends Module {
 	}
 
 	/**
-	 * @param {TODO} rule rule
+	 * @param {Exclude<NoParse, EXPECTED_ANY[]>} rule rule
 	 * @param {string} content content
 	 * @returns {boolean} result
 	 */
@@ -1097,7 +1116,7 @@ class NormalModule extends Module {
 	}
 
 	/**
-	 * @param {TODO} noParseRule no parse rule
+	 * @param {undefined | NoParse} noParseRule no parse rule
 	 * @param {string} request request
 	 * @returns {boolean} check if module should not be parsed, returns "true" if the module should !not! be parsed, returns "false" if the module !must! be parsed
 	 */
@@ -1132,7 +1151,7 @@ class NormalModule extends Module {
 	 */
 	_initBuildHash(compilation) {
 		const hash = createHash(
-			/** @type {Algorithm} */
+			/** @type {HashFunction} */
 			(compilation.outputOptions.hashFunction)
 		);
 		if (this._source) {
@@ -1661,7 +1680,7 @@ class NormalModule extends Module {
 
 	/**
 	 * @param {ObjectDeserializerContext} context context
-	 * @returns {TODO} Module
+	 * @returns {NormalModule} module
 	 */
 	static deserialize(context) {
 		const obj = new NormalModule({

package/lib/NormalModuleFactory.js

@@ -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
@@ -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
 		);
@@ -447,21 +456,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 +556,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 =
@@ -759,9 +765,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 +797,11 @@ class NormalModuleFactory extends ModuleFactory {
 										/** @type {string} */
 										(_resolvedResource);
 									resourceData = {
+										...cacheParseResource(resolvedResource),
 										resource: resolvedResource,
 										data:
 											/** @type {ResolveRequest} */
-											(resolvedResourceResolveData),
-										.../** @type {TODO} */
-										(cacheParseResource(resolvedResource))
+											(resolvedResourceResolveData)
 									};
 								}
 								continueCallback();
@@ -1228,7 +1233,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/RuntimePlugin.js

@@ -292,7 +292,7 @@ class RuntimePlugin {
 											? compilation.outputOptions.filename
 											: compilation.outputOptions.chunkFilename)
 								),
-							false
+							set.has(RuntimeGlobals.hmrDownloadUpdateHandlers)
 						)
 					);
 					return true;

package/lib/SourceMapDevToolPlugin.js

@@ -19,6 +19,7 @@ const { makePathsAbsolute } = require("./util/identifier");
 
 /** @typedef {import("webpack-sources").MapOptions} MapOptions */
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
 /** @typedef {import("./Cache").Etag} Etag */
 /** @typedef {import("./CacheFacade").ItemCacheFacade} ItemCacheFacade */
@@ -29,8 +30,6 @@ const { makePathsAbsolute } = require("./util/identifier");
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./NormalModule").SourceMap} SourceMap */
 /** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
-/** @typedef {import("./util/Hash")} Hash */
-/** @typedef {import("./util/createHash").Algorithm} Algorithm */
 /** @typedef {import("./util/fs").OutputFileSystem} OutputFileSystem */
 
 const validate = createSchemaValidation(
@@ -489,7 +488,7 @@ class SourceMapDevToolPlugin {
 											(
 												usesContentHash &&
 													createHash(
-														/** @type {Algorithm} */
+														/** @type {HashFunction} */
 														(compilation.outputOptions.hashFunction)
 													)
 														.update(sourceMapString)

package/lib/WebpackOptionsApply.js

@@ -504,10 +504,7 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 		if (options.optimization.runtimeChunk) {
 			const RuntimeChunkPlugin = require("./optimize/RuntimeChunkPlugin");
-			new RuntimeChunkPlugin(
-				/** @type {{ name?: (entrypoint: { name: string }) => string }} */
-				(options.optimization.runtimeChunk)
-			).apply(compiler);
+			new RuntimeChunkPlugin(options.optimization.runtimeChunk).apply(compiler);
 		}
 		if (!options.optimization.emitOnErrors) {
 			const NoEmitOnErrorsPlugin = require("./NoEmitOnErrorsPlugin");