webpack 5.104.1 → 5.105.0

package/lib/css/CssModulesPlugin.js

@@ -35,7 +35,7 @@ const CssImportDependency = require("../dependencies/CssImportDependency");
 const CssUrlDependency = require("../dependencies/CssUrlDependency");
 const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
 const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
-const { compareModulesByIdOrIdentifier } = require("../util/comparators");
+const { compareModulesByFullName } = require("../util/comparators");
 const createSchemaValidation = require("../util/create-schema-validation");
 const createHash = require("../util/createHash");
 const { getUndoPath } = require("../util/identifier");
@@ -311,7 +311,7 @@ class CssModulesPlugin {
 										(compilation.moduleGraph.getParentModule(dependency));
 
 									if (parent instanceof CssModule) {
-										/** @type {import("../CssModule").Inheritance | undefined} */
+										/** @type {Inheritance | undefined} */
 										let inheritance;
 
 										if (
@@ -417,6 +417,7 @@ class CssModulesPlugin {
 
 					return source;
 				});
+				/** @type {WeakMap<Chunk, CssModule[]>} */
 				const orderedCssModulesPerChunk = new WeakMap();
 				compilation.hooks.afterCodeGeneration.tap(PLUGIN_NAME, () => {
 					const { chunkGraph } = compilation;
@@ -526,6 +527,7 @@ class CssModulesPlugin {
 							: globalChunkLoading;
 					return chunkLoading === "jsonp" || chunkLoading === "import";
 				};
+				/** @type {WeakSet<Chunk>} */
 				const onceForChunkSet = new WeakSet();
 				/**
 				 * @param {Chunk} chunk chunk to check
@@ -597,7 +599,7 @@ class CssModulesPlugin {
 
 	/**
 	 * @param {Chunk} chunk chunk
-	 * @param {Iterable<Module>} modules unordered modules
+	 * @param {Iterable<Module> | undefined} modules unordered modules
 	 * @param {Compilation} compilation compilation
 	 * @returns {Module[]} ordered modules
 	 */
@@ -632,8 +634,8 @@ class CssModulesPlugin {
 			return modulesByChunkGroup[0].list.reverse();
 		}
 
-		const boundCompareModulesByIdOrIdentifier = compareModulesByIdOrIdentifier(
-			compilation.chunkGraph
+		const boundCompareModulesByFullName = compareModulesByFullName(
+			compilation.compiler
 		);
 
 		/**
@@ -646,10 +648,7 @@ class CssModulesPlugin {
 				return b.length === 0 ? 0 : 1;
 			}
 			if (b.length === 0) return -1;
-			return boundCompareModulesByIdOrIdentifier(
-				a[a.length - 1],
-				b[b.length - 1]
-			);
+			return boundCompareModulesByFullName(a[a.length - 1], b[b.length - 1]);
 		};
 
 		modulesByChunkGroup.sort(compareModuleLists);
@@ -658,6 +657,7 @@ class CssModulesPlugin {
 		const finalModules = [];
 
 		for (;;) {
+			/** @type {Set<Module>} */
 			const failedModules = new Set();
 			const list = modulesByChunkGroup[0].list;
 			if (list.length === 0) {
@@ -666,6 +666,7 @@ class CssModulesPlugin {
 			}
 			/** @type {Module} */
 			let selectedModule = list[list.length - 1];
+			/** @type {undefined | false | Module} */
 			let hasFailed;
 			outer: for (;;) {
 				for (const { list, set } of modulesByChunkGroup) {
@@ -690,10 +691,9 @@ class CssModulesPlugin {
 				// TODO print better warning
 				compilation.warnings.push(
 					new WebpackError(
-						`chunk ${chunk.name || chunk.id}\nConflicting order between ${
-							/** @type {Module} */
-							(hasFailed).readableIdentifier(compilation.requestShortener)
-						} and ${selectedModule.readableIdentifier(
+						`chunk ${chunk.name || chunk.id}\nConflicting order between ${hasFailed.readableIdentifier(
+							compilation.requestShortener
+						)} and ${selectedModule.readableIdentifier(
 							compilation.requestShortener
 						)}`
 					)
@@ -721,35 +721,29 @@ class CssModulesPlugin {
 	 * @param {Chunk} chunk chunk
 	 * @param {ChunkGraph} chunkGraph chunk graph
 	 * @param {Compilation} compilation compilation
-	 * @returns {Module[]} ordered css modules
+	 * @returns {CssModule[]} ordered css modules
 	 */
 	getOrderedChunkCssModules(chunk, chunkGraph, compilation) {
-		return [
+		return /** @type {CssModule[]} */ ([
 			...this.getModulesInOrder(
 				chunk,
-				/** @type {Iterable<Module>} */
-				(
-					chunkGraph.getOrderedChunkModulesIterableBySourceType(
-						chunk,
-						CSS_IMPORT_TYPE,
-						compareModulesByIdOrIdentifier(chunkGraph)
-					)
+				chunkGraph.getOrderedChunkModulesIterableBySourceType(
+					chunk,
+					CSS_IMPORT_TYPE,
+					compareModulesByFullName(compilation.compiler)
 				),
 				compilation
 			),
 			...this.getModulesInOrder(
 				chunk,
-				/** @type {Iterable<Module>} */
-				(
-					chunkGraph.getOrderedChunkModulesIterableBySourceType(
-						chunk,
-						CSS_TYPE,
-						compareModulesByIdOrIdentifier(chunkGraph)
-					)
+				chunkGraph.getOrderedChunkModulesIterableBySourceType(
+					chunk,
+					CSS_TYPE,
+					compareModulesByFullName(compilation.compiler)
 				),
 				compilation
 			)
-		];
+		]);
 	}
 
 	/**
@@ -768,6 +762,7 @@ class CssModulesPlugin {
 			inheritance.push(...module.inheritance);
 		}
 
+		/** @type {CachedSource} */
 		let source;
 		if (
 			cacheEntry &&
@@ -792,6 +787,7 @@ class CssModulesPlugin {
 			);
 			/** @type {Source} */
 			let moduleSource = new ReplaceSource(moduleSourceContent);
+			/** @type {null | RegExpExecArray} */
 			let match;
 			while ((match = publicPathAutoRegex.exec(moduleSourceCode))) {
 				/** @type {ReplaceSource} */ (moduleSource).replace(

package/lib/css/CssParser.js

@@ -56,11 +56,11 @@ const CC_EQUAL = "=".charCodeAt(0);
 const STRING_MULTILINE = /\\[\n\r\f]/g;
 // https://www.w3.org/TR/css-syntax-3/#whitespace
 const TRIM_WHITE_SPACES = /(^[ \t\n\r\f]*|[ \t\n\r\f]*$)/g;
-const UNESCAPE = /\\([0-9a-fA-F]{1,6}[ \t\n\r\f]?|[\s\S])/g;
-const IMAGE_SET_FUNCTION = /^(-\w+-)?image-set$/i;
-const OPTIONALLY_VENDOR_PREFIXED_KEYFRAMES_AT_RULE = /^@(-\w+-)?keyframes$/;
-const COMPOSES_PROPERTY = /^(composes|compose-with)$/i;
-const IS_MODULES = /\.module(s)?\.[^.]+$/i;
+const UNESCAPE = /\\([0-9a-f]{1,6}[ \t\n\r\f]?|[\s\S])/gi;
+const IMAGE_SET_FUNCTION = /^(?:-\w+-)?image-set$/i;
+const OPTIONALLY_VENDOR_PREFIXED_KEYFRAMES_AT_RULE = /^@(?:-\w+-)?keyframes$/;
+const COMPOSES_PROPERTY = /^(?:composes|compose-with)$/i;
+const IS_MODULES = /\.modules?\.[^.]+$/i;
 const CSS_COMMENT = /\/\*((?!\*\/).*?)\*\//g;
 
 /**
@@ -72,6 +72,7 @@ const matchAll = (regexp, str) => {
 	/** @type {RegExpExecArray[]} */
 	const result = [];
 
+	/** @type {null | RegExpExecArray} */
 	let match;
 
 	// Use a while loop with exec() to find all matches
@@ -123,8 +124,7 @@ const normalizeUrl = (str, isString) => {
 	return str;
 };
 
-// eslint-disable-next-line no-useless-escape
-const regexSingleEscape = /[ -,.\/:-@[\]\^`{-~]/;
+const regexSingleEscape = /[ -,./:-@[\]^`{-~]/;
 const regexExcessiveSpaces =
 	/(^|\\+)?(\\[A-F0-9]{1,6})\u0020(?![a-fA-F0-9\u0020])/g;
 
@@ -139,10 +139,10 @@ const escapeIdentifier = (str) => {
 	while (counter < str.length) {
 		const character = str.charAt(counter++);
 
+		/** @type {string} */
 		let value;
 
-		// eslint-disable-next-line no-control-regex
-		if (/[\t\n\f\r\u000B]/.test(character)) {
+		if (/[\t\n\f\r\v]/.test(character)) {
 			const codePoint = character.charCodeAt(0);
 
 			value = `\\${codePoint.toString(16).toUpperCase()} `;
@@ -829,12 +829,14 @@ class CssParser extends Parser {
 				return newline;
 			}
 
+			/** @type {undefined | string} */
 			let layer;
 
 			if (tokens[1]) {
 				layer = input.slice(tokens[1][0] + 6, tokens[1][1] - 1).trim();
 			}
 
+			/** @type {undefined | string} */
 			let supports;
 
 			if (tokens[2]) {
@@ -847,6 +849,7 @@ class CssParser extends Parser {
 				last[1]
 			)[0];
 
+			/** @type {undefined | string} */
 			let media;
 
 			if (mediaStart !== semi - 1) {

package/lib/debug/ProfilingPlugin.js

@@ -561,6 +561,7 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 					id,
 					cat: defaultCategory
 				});
+				/** @type {PluginFunction} */
 				let r;
 				try {
 					r = fn(...args);

package/lib/dependencies/AMDDefineDependency.js

@@ -10,6 +10,7 @@ const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
+/** @typedef {import("./LocalModule")} LocalModule */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
@@ -120,6 +121,7 @@ class AMDDefineDependency extends NullDependency {
 		this.functionRange = functionRange;
 		this.objectRange = objectRange;
 		this.namedModule = namedModule;
+		/** @type {LocalModule | null} */
 		this.localModule = null;
 	}
 
@@ -182,7 +184,7 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends (
 
 	/**
 	 * @param {AMDDefineDependency} dependency dependency
-	 * @returns {string} variable name
+	 * @returns {string | false | null} variable name
 	 */
 	localModuleVar(dependency) {
 		return (

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -26,11 +26,13 @@ const { addLocalModule, getLocalModule } = require("./LocalModulesHelpers");
 /** @typedef {import("estree").ObjectExpression} ObjectExpression */
 /** @typedef {import("estree").SpreadElement} SpreadElement */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
+/** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").ExportedVariableInfo} ExportedVariableInfo */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("./LocalModule")} LocalModule */
 
 /**
  * @param {Expression | SpreadElement} expr expression
@@ -123,7 +125,9 @@ class AMDDefineDependencyParserPlugin {
 			const deps = [];
 			const array = /** @type {string[]} */ (param.array);
 			for (const [idx, request] of array.entries()) {
+				/** @type {string | LocalModuleDependency | AMDRequireItemDependency} */
 				let dep;
+				/** @type {undefined | null | LocalModule} */
 				let localModule;
 				if (request === "require") {
 					identifiers[idx] = request;
@@ -174,7 +178,9 @@ class AMDDefineDependencyParserPlugin {
 
 			return true;
 		} else if (param.isString()) {
+			/** @type {Dependency} */
 			let dep;
+			/** @type {undefined | null | LocalModule} */
 			let localModule;
 
 			if (param.string === "require") {

package/lib/dependencies/AMDPlugin.js

@@ -58,7 +58,7 @@ class AMDPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const amdOptions = this.amdOptions;
+		const { amdOptions } = this;
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { contextModuleFactory, normalModuleFactory }) => {

package/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

@@ -25,10 +25,12 @@ const getFunctionExpression = require("./getFunctionExpression");
 /** @typedef {import("estree").SourceLocation} SourceLocation */
 /** @typedef {import("estree").SpreadElement} SpreadElement */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
+/** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("./LocalModule")} LocalModule */
 
 const PLUGIN_NAME = "AMDRequireDependenciesBlockParserPlugin";
 
@@ -102,8 +104,10 @@ class AMDRequireDependenciesBlockParserPlugin {
 		} else if (param.isConstArray()) {
 			/** @type {(string | LocalModuleDependency | AMDRequireItemDependency)[]} */
 			const deps = [];
-			for (const request of /** @type {EXPECTED_ANY[]} */ (param.array)) {
+			for (const request of /** @type {string[]} */ (param.array)) {
+				/** @type {string | LocalModuleDependency | AMDRequireItemDependency} */
 				let dep;
+				/** @type {undefined | null | LocalModule} */
 				let localModule;
 				if (request === "require") {
 					dep = RuntimeGlobals.require;
@@ -152,7 +156,9 @@ class AMDRequireDependenciesBlockParserPlugin {
 			}
 			return true;
 		} else if (param.isString()) {
+			/** @type {Dependency} */
 			let dep;
+			/** @type {LocalModule | null | undefined} */
 			let localModule;
 			if (param.string === "require") {
 				dep = new ConstDependency(

package/lib/dependencies/CachedConstDependency.js

@@ -38,6 +38,7 @@ class CachedConstDependency extends NullDependency {
 		this.range = range;
 		this.identifier = identifier;
 		this.place = place;
+		/** @type {undefined | string} */
 		this._hashUpdate = undefined;
 	}
 

package/lib/dependencies/CommonJsDependencyHelpers.js

@@ -22,7 +22,9 @@ module.exports.handleDependencyBase = (
 	module,
 	runtimeRequirements
 ) => {
+	/** @type {string} */
 	let base;
+	/** @type {string} */
 	let type;
 	switch (depBase) {
 		case "exports":

package/lib/dependencies/CommonJsExportRequireDependency.js

@@ -57,6 +57,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		this.names = names;
 		this.ids = ids;
 		this.resultUsed = resultUsed;
+		/** @type {undefined | boolean} */
 		this.asiSafe = undefined;
 	}
 

package/lib/dependencies/CommonJsFullRequireDependency.js

@@ -41,7 +41,9 @@ class CommonJsFullRequireDependency extends ModuleDependency {
 		this.range = range;
 		this.names = names;
 		this.idRanges = idRanges;
+		/** @type {boolean} */
 		this.call = false;
+		/** @type {undefined | boolean} */
 		this.asiSafe = undefined;
 	}
 

package/lib/dependencies/CommonJsImportsParserPlugin.js

@@ -40,6 +40,7 @@ const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../javascript/JavascriptParser").Members} Members */
 /** @typedef {import("../javascript/JavascriptParser").CalleeMembers} CalleeMembers */
+/** @typedef {import("./LocalModule")} LocalModule */
 
 /**
  * @typedef {object} CommonJsImportSettings
@@ -299,6 +300,7 @@ class CommonJsImportsParserPlugin {
 			}
 
 			if (expr.arguments.length !== 1) return;
+			/** @type {null | LocalModule} */
 			let localModule;
 			const param = parser.evaluateExpression(expr.arguments[0]);
 			if (param.isConditional()) {
@@ -586,6 +588,7 @@ class CommonJsImportsParserPlugin {
 			moduleName = ["module", "node:module"];
 			specifierName = "createRequire";
 		} else {
+			/** @type {undefined | string} */
 			let moduleName;
 			const match = /^(.*) from (.*)$/.exec(options.createRequire);
 			if (match) {

package/lib/dependencies/CommonJsRequireContextDependency.js

@@ -18,8 +18,8 @@ class CommonJsRequireContextDependency extends ContextDependency {
 	/**
 	 * @param {ContextDependencyOptions} options options for the context module
 	 * @param {Range} range location in source code
-	 * @param {Range | undefined} valueRange location of the require call
-	 * @param {boolean | string} inShorthand true or name
+	 * @param {Range=} valueRange location of the require call
+	 * @param {boolean | string=} inShorthand true or name
 	 * @param {string=} context context
 	 */
 	constructor(options, range, valueRange, inShorthand, context) {

package/lib/dependencies/CommonJsSelfReferenceDependency.js

@@ -118,6 +118,7 @@ CommonJsSelfReferenceDependency.Template = class CommonJsSelfReferenceDependency
 			);
 		}
 
+		/** @type {string} */
 		let base;
 		switch (dep.base) {
 			case "exports":

package/lib/dependencies/ConstDependency.js

@@ -33,6 +33,7 @@ class ConstDependency extends NullDependency {
 		this.runtimeRequirements = runtimeRequirements
 			? new Set(runtimeRequirements)
 			: null;
+		/** @type {undefined | string} */
 		this._hashUpdate = undefined;
 	}
 

package/lib/dependencies/ContextDependencyHelpers.js

@@ -26,7 +26,7 @@ const quoteMeta = (str) => str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
 
 /**
  * @param {string} prefix prefix
- * @returns {{prefix: string, context: string}} result
+ * @returns {{ prefix: string, context: string }} result
  */
 const splitContextFromPrefix = (prefix) => {
 	const idx = prefix.lastIndexOf("/");
@@ -42,17 +42,23 @@ const splitContextFromPrefix = (prefix) => {
 };
 
 /** @typedef {Partial<Omit<ContextDependencyOptions, "resource">>} PartialContextDependencyOptions */
-/** @typedef {{ new(options: ContextDependencyOptions, range: Range, valueRange: Range, ...args: EXPECTED_ANY[]): ContextDependency }} ContextDependencyConstructor */
+/** @typedef {{ new (options: ContextDependencyOptions, range: Range, valueRange: Range, ...args: EXPECTED_ANY[]): ContextDependency }} ContextDependencyConstructor */
 
 /**
- * @param {ContextDependencyConstructor} Dep the Dependency class
+ * @template T
+ * @typedef {T extends new (options: ContextDependencyOptions, range: Range, valueRange: Range, ...remains: infer R) => EXPECTED_ANY ? R : []} GetAdditionalDepArgs
+ */
+
+/**
+ * @template {ContextDependencyConstructor} T
+ * @param {T} Dep the Dependency class
  * @param {Range} range source range
  * @param {BasicEvaluatedExpression} param context param
  * @param {Expression} expr expr
  * @param {Pick<JavascriptParserOptions, `${"expr" | "wrapped"}Context${"Critical" | "Recursive" | "RegExp"}` | "exprContextRequest">} options options for context creation
  * @param {PartialContextDependencyOptions} contextOptions options for the ContextModule
  * @param {JavascriptParser} parser the parser
- * @param {...EXPECTED_ANY} depArgs depArgs
+ * @param {GetAdditionalDepArgs<T>} depArgs depArgs
  * @returns {ContextDependency} the created Dependency
  */
 module.exports.create = (
@@ -216,6 +222,7 @@ module.exports.create = (
 			...depArgs
 		);
 		dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+		/** @type {Replaces} */
 		const replaces = [];
 		if (prefixRange) {
 			replaces.push({

package/lib/dependencies/ContextElementDependency.js

@@ -82,6 +82,7 @@ class ContextElementDependency extends ModuleDependency {
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		if (!this.referencedExports) return Dependency.EXPORTS_OBJECT_REFERENCED;
+		/** @type {ReferencedExports} */
 		const refs = [];
 		for (const referencedExport of this.referencedExports) {
 			if (

package/lib/dependencies/CriticalDependencyWarning.js

@@ -15,6 +15,7 @@ class CriticalDependencyWarning extends WebpackError {
 	constructor(message) {
 		super();
 
+		/** @type {string} */
 		this.name = "CriticalDependencyWarning";
 		this.message = `Critical dependency: ${message}`;
 	}

package/lib/dependencies/CssIcssExportDependency.js

@@ -60,7 +60,7 @@ const getLocalIdent = (local, module, chunkGraph, runtimeTemplate) => {
 
 	let localIdentHash = "";
 
-	if (/\[(fullhash|hash)\]/.test(localIdentName)) {
+	if (/\[(?:fullhash|hash)\]/.test(localIdentName)) {
 		const hashSalt = generator.options.localIdentHashSalt;
 		const hashDigest =
 			/** @type {string} */
@@ -113,8 +113,8 @@ const getLocalIdent = (local, module, chunkGraph, runtimeTemplate) => {
 			if (typeof id !== "string") return id;
 
 			return id
-				.replace(/^([.-]|[^a-zA-Z0-9_-])+/, "")
-				.replace(/[^a-zA-Z0-9_-]+/g, "_");
+				.replace(/^([.-]|[^a-z0-9_-])+/i, "")
+				.replace(/[^a-z0-9_-]+/gi, "_");
 		},
 		filename: relativeResourcePath,
 		hash: localIdentHash,
@@ -135,7 +135,7 @@ const getLocalIdent = (local, module, chunkGraph, runtimeTemplate) => {
 	}
 
 	// Protect the first character from unsupported values
-	return localIdent.replace(/^((-?[0-9])|--)/, "_$1");
+	return localIdent.replace(/^((-?\d)|--)/, "_$1");
 };
 
 // 0 - replace, 1 - replace, 2 - append,  2 - once
@@ -170,6 +170,7 @@ class CssIcssExportDependency extends NullDependency {
 		this.interpolate = interpolate;
 		this.exportMode = exportMode;
 		this.exportType = exportType;
+		/** @type {undefined | string} */
 		this._hashUpdate = undefined;
 	}
 

package/lib/dependencies/CssIcssSymbolDependency.js

@@ -36,6 +36,7 @@ class CssIcssSymbolDependency extends NullDependency {
 		this.symbol = symbol;
 		this.range = range;
 		this.isReference = isReference;
+		/** @type {undefined | string} */
 		this._hashUpdate = undefined;
 	}
 

package/lib/dependencies/CssUrlDependency.js

@@ -16,6 +16,7 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
+/** @typedef {import("../Module").CodeGenerationResultData} CodeGenerationResultData */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -173,9 +174,7 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 			return "data:,";
 		}
 		const codeGen = codeGenerationResults.get(module, runtime);
-		const data =
-			/** @type {NonNullable<CodeGenerationResult["data"]>} */
-			(codeGen.data);
+		const data = codeGen.data;
 		if (!data) return "data:,";
 		const url = data.get("url");
 		if (!url || !url["css-url"]) return "data:,";

package/lib/dependencies/ExternalModuleInitFragment.js

@@ -13,7 +13,8 @@ const makeSerializable = require("../util/makeSerializable");
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {{ name: string, value?: string }[]} ArrayImportSpecifiers */
-/** @typedef {Map<string, Set<string>>} ImportSpecifiers */
+/** @typedef {Set<string>} ImportSpecifier */
+/** @typedef {Map<string, ImportSpecifier>} ImportSpecifiers */
 
 /**
  * @extends {InitFragment<GenerateContext>}
@@ -38,6 +39,7 @@ class ExternalModuleInitFragment extends InitFragment {
 			for (const { name, value } of specifiers) {
 				let specifiers = this.specifiers.get(name);
 				if (!specifiers) {
+					/** @type {ImportSpecifier} */
 					specifiers = new Set();
 					this.specifiers.set(name, specifiers);
 				}
@@ -77,6 +79,7 @@ class ExternalModuleInitFragment extends InitFragment {
 	 * @returns {string | Source | undefined} the source code that will be included as initialization code
 	 */
 	getContent({ runtimeRequirements }) {
+		/** @type {string[]} */
 		const namedImports = [];
 
 		for (const [name, specifiers] of this.specifiers) {

package/lib/dependencies/ExternalModuleInitFragmentDependency.js

@@ -31,15 +31,6 @@ class ExternalModuleInitFragmentDependency extends NullDependency {
 		this.default = defaultImport;
 	}
 
-	/**
-	 * @returns {string} hash update
-	 */
-	_createHashUpdate() {
-		return `${this.importedModule}${JSON.stringify(this.specifiers)}${
-			this.default || "null"
-		}`;
-	}
-
 	/**
 	 * @param {ObjectSerializerContext} context context
 	 */

package/lib/dependencies/HarmonyAcceptDependency.js

@@ -114,8 +114,11 @@ HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends
 		 * @returns {HarmonyImportDependency[]} array of related harmony import dependencies
 		 */
 		const getHarmonyImportDependencies = (dependency) => {
+			/** @type {HarmonyImportDependency[]} */
 			const result = [];
+			/** @type {HarmonyImportDependency | null} */
 			let deferDependency = null;
+			/** @type {HarmonyImportDependency | null} */
 			let noDeferredDependency = null;
 
 			for (const d of module.dependencies) {

package/lib/dependencies/HarmonyEvaluatedImportSpecifierDependency.js

@@ -103,6 +103,7 @@ HarmonyEvaluatedImportSpecifierDependency.Template = class HarmonyEvaluatedImpor
 		);
 		const ids = dep.getIds(moduleGraph);
 
+		/** @type {boolean | undefined | null} */
 		let value;
 
 		const exportsType =

package/lib/dependencies/HarmonyExportExpressionDependency.js

@@ -21,6 +21,7 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./HarmonyExportInitFragment").ExportMap} ExportMap */
 
 class HarmonyExportExpressionDependency extends NullDependency {
 	/**
@@ -120,6 +121,7 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 		const { declarationId } = dep;
 		const exportsName = module.exportsArgument;
 		if (declarationId) {
+			/** @type {string} */
 			let name;
 			if (typeof declarationId === "string") {
 				name = declarationId;
@@ -139,6 +141,7 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 					.getExportsInfo(module)
 					.getUsedName("default", runtime);
 				if (used) {
+					/** @type {ExportMap} */
 					const map = new Map();
 					map.set(used, `/* export default binding */ ${name}`);
 					initFragments.push(new HarmonyExportInitFragment(exportsName, map));
@@ -164,6 +167,7 @@ HarmonyExportExpressionDependency.Template = class HarmonyExportDependencyTempla
 						.getUsedName("default", runtime);
 					if (used) {
 						runtimeRequirements.add(RuntimeGlobals.exports);
+						/** @type {ExportMap} */
 						const map = new Map();
 						map.set(used, name);
 						initFragments.push(new HarmonyExportInitFragment(exportsName, map));