webpack 5.90.3 → 5.91.0

package/lib/css/CssLoadingRuntimeModule.js

@@ -16,19 +16,22 @@ const { chunkHasCss } = require("./CssModulesPlugin");
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation").RuntimeRequirementsContext} RuntimeRequirementsContext */
+/** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
 
 /**
- * @typedef {Object} JsonpCompilationPluginHooks
+ * @typedef {Object} CssLoadingRuntimeModulePluginHooks
  * @property {SyncWaterfallHook<[string, Chunk]>} createStylesheet
+ * @property {SyncWaterfallHook<[string, Chunk]>} linkPreload
+ * @property {SyncWaterfallHook<[string, Chunk]>} linkPrefetch
  */
 
-/** @type {WeakMap<Compilation, JsonpCompilationPluginHooks>} */
+/** @type {WeakMap<Compilation, CssLoadingRuntimeModulePluginHooks>} */
 const compilationHooksMap = new WeakMap();
 
 class CssLoadingRuntimeModule extends RuntimeModule {
 	/**
 	 * @param {Compilation} compilation the compilation
-	 * @returns {JsonpCompilationPluginHooks} hooks
+	 * @returns {CssLoadingRuntimeModulePluginHooks} hooks
 	 */
 	static getCompilationHooks(compilation) {
 		if (!(compilation instanceof Compilation)) {
@@ -39,7 +42,9 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 		let hooks = compilationHooksMap.get(compilation);
 		if (hooks === undefined) {
 			hooks = {
-				createStylesheet: new SyncWaterfallHook(["source", "chunk"])
+				createStylesheet: new SyncWaterfallHook(["source", "chunk"]),
+				linkPreload: new SyncWaterfallHook(["source", "chunk"]),
+				linkPrefetch: new SyncWaterfallHook(["source", "chunk"])
 			};
 			compilationHooksMap.set(compilation, hooks);
 		}
@@ -47,7 +52,7 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @param {Set<string>} runtimeRequirements runtime requirements
+	 * @param {ReadOnlyRuntimeRequirements} runtimeRequirements runtime requirements
 	 */
 	constructor(runtimeRequirements) {
 		super("css loading", 10);
@@ -59,16 +64,19 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		const { compilation, chunk, _runtimeRequirements } = this;
+		const { _runtimeRequirements } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const chunk = /** @type {Chunk} */ (this.chunk);
 		const {
 			chunkGraph,
 			runtimeTemplate,
 			outputOptions: {
 				crossOriginLoading,
 				uniqueName,
-				chunkLoadTimeout: loadTimeout
+				chunkLoadTimeout: loadTimeout,
+				cssHeadDataCompression: withCompression
 			}
-		} = /** @type {Compilation} */ (compilation);
+		} = compilation;
 		const fn = RuntimeGlobals.ensureChunkHandlers;
 		const conditionMap = chunkGraph.getChunkConditionMap(
 			/** @type {Chunk} */ (chunk),
@@ -85,6 +93,12 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 		const withLoading =
 			_runtimeRequirements.has(RuntimeGlobals.ensureChunkHandlers) &&
 			hasCssMatcher !== false;
+		const withPrefetch = this._runtimeRequirements.has(
+			RuntimeGlobals.prefetchChunkHandlers
+		);
+		const withPreload = this._runtimeRequirements.has(
+			RuntimeGlobals.preloadChunkHandlers
+		);
 		/** @type {boolean} */
 		const withHmr = _runtimeRequirements.has(
 			RuntimeGlobals.hmrDownloadUpdateHandlers
@@ -104,19 +118,39 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 			return null;
 		}
 
-		const { createStylesheet } = CssLoadingRuntimeModule.getCompilationHooks(
-			/** @type {Compilation} */ (compilation)
+		const { linkPreload, linkPrefetch } =
+			CssLoadingRuntimeModule.getCompilationHooks(compilation);
+
+		const withFetchPriority = _runtimeRequirements.has(
+			RuntimeGlobals.hasFetchPriority
 		);
 
+		const { createStylesheet } =
+			CssLoadingRuntimeModule.getCompilationHooks(compilation);
+
 		const stateExpression = withHmr
 			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_css`
 			: undefined;
 
 		const code = Template.asString([
 			"link = document.createElement('link');",
+			`if (${RuntimeGlobals.scriptNonce}) {`,
+			Template.indent(
+				`link.setAttribute("nonce", ${RuntimeGlobals.scriptNonce});`
+			),
+			"}",
 			uniqueName
 				? 'link.setAttribute("data-webpack", uniqueName + ":" + key);'
 				: "",
+			withFetchPriority
+				? Template.asString([
+						"if(fetchPriority) {",
+						Template.indent(
+							'link.setAttribute("fetchpriority", fetchPriority);'
+						),
+						"}"
+					])
+				: "",
 			"link.setAttribute(loadingAttribute, 1);",
 			'link.rel = "stylesheet";',
 			"link.href = url;",
@@ -163,9 +197,9 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 			`var loadCssChunkData = ${runtimeTemplate.basicFunction(
 				"target, link, chunkId",
 				[
-					`var data, token = "", token2, exports = {}, exportsWithId = [], exportsWithDashes = [], ${
+					`var data, token = "", token2 = "", exports = {}, ${
 						withHmr ? "moduleIds = [], " : ""
-					}name = ${name}, i = 0, cc = 1;`,
+					}name = ${name}, i, cc = 1;`,
 					"try {",
 					Template.indent([
 						"if(!link) link = loadStylesheet(chunkId);",
@@ -187,46 +221,41 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 					]),
 					"}",
 					"if(!data) return [];",
-					"for(; cc; i++) {",
+					withCompression
+						? Template.asString([
+								// LZW decode
+								`var map = {}, char = data[0], oldPhrase = char, decoded = char, code = 256, maxCode = "\uffff".charCodeAt(0), phrase;`,
+								"for (i = 1; i < data.length; i++) {",
+								Template.indent([
+									"cc = data[i].charCodeAt(0);",
+									"if (cc < 256) phrase = data[i]; else phrase = map[cc] ? map[cc] : (oldPhrase + char);",
+									"decoded += phrase;",
+									"char = phrase.charAt(0);",
+									"map[code] = oldPhrase + char;",
+									"if (++code > maxCode) { code = 256; map = {}; }",
+									"oldPhrase = phrase;"
+								]),
+								"}",
+								"data = decoded;"
+							])
+						: "// css head data compression is disabled",
+					"for(i = 0; cc; i++) {",
 					Template.indent([
 						"cc = data.charCodeAt(i);",
-						`if(cc == ${cc("(")}) { token2 = token; token = ""; }`,
+						`if(cc == ${cc(":")}) { token2 = token; token = ""; }`,
 						`else if(cc == ${cc(
-							")"
-						)}) { exports[token2.replace(/^_/, "")] = token.replace(/^_/, ""); token = ""; }`,
-						`else if(cc == ${cc("/")} || cc == ${cc(
-							"%"
-						)}) { token = token.replace(/^_/, ""); exports[token] = token; exportsWithId.push(token); if(cc == ${cc(
-							"%"
-						)}) exportsWithDashes.push(token); token = ""; }`,
+							"/"
+						)}) { token = token.replace(/^_/, ""); token2 = token2.replace(/^_/, ""); exports[token2] = token; token = ""; token2 = ""; }`,
 						`else if(!cc || cc == ${cc(
 							","
-						)}) { token = token.replace(/^_/, ""); exportsWithId.forEach(${runtimeTemplate.expressionFunction(
-							`exports[x] = ${
-								uniqueName
-									? runtimeTemplate.concatenation(
-											{ expr: "uniqueName" },
-											"-",
-											{ expr: "token" },
-											"-",
-											{ expr: "exports[x]" }
-										)
-									: runtimeTemplate.concatenation({ expr: "token" }, "-", {
-											expr: "exports[x]"
-										})
-							}`,
-							"x"
-						)}); exportsWithDashes.forEach(${runtimeTemplate.expressionFunction(
-							`exports[x] = "--" + exports[x]`,
-							"x"
-						)}); ${
+						)}) { token = token.replace(/^_/, ""); ${
 							RuntimeGlobals.makeNamespaceObject
 						}(exports); target[token] = (${runtimeTemplate.basicFunction(
 							"exports, module",
 							`module.exports = exports;`
 						)}).bind(null, exports); ${
 							withHmr ? "moduleIds.push(token); " : ""
-						}token = ""; exports = {}; exportsWithId.length = 0; exportsWithDashes.length = 0; }`,
+						}token = ""; token2 = ""; exports = {};  }`,
 						`else if(cc == ${cc("\\")}) { token += data[++i] }`,
 						`else { token += data[i]; }`
 					]),
@@ -239,7 +268,9 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 			)}`,
 			'var loadingAttribute = "data-webpack-loading";',
 			`var loadStylesheet = ${runtimeTemplate.basicFunction(
-				"chunkId, url, done" + (withHmr ? ", hmr" : ""),
+				"chunkId, url, done" +
+					(withHmr ? ", hmr" : "") +
+					(withFetchPriority ? ", fetchPriority" : ""),
 				[
 					'var link, needAttach, key = "chunk-" + chunkId;',
 					withHmr ? "if(!hmr) {" : "",
@@ -307,74 +338,159 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 			"",
 			withLoading
 				? Template.asString([
-						`${fn}.css = ${runtimeTemplate.basicFunction("chunkId, promises", [
-							"// css chunk loading",
-							`var installedChunkData = ${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;`,
-							'if(installedChunkData !== 0) { // 0 means "already installed".',
-							Template.indent([
-								"",
-								'// a Promise means "currently loading".',
-								"if(installedChunkData) {",
-								Template.indent(["promises.push(installedChunkData[2]);"]),
-								"} else {",
+						`${fn}.css = ${runtimeTemplate.basicFunction(
+							`chunkId, promises${withFetchPriority ? " , fetchPriority" : ""}`,
+							[
+								"// css chunk loading",
+								`var installedChunkData = ${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;`,
+								'if(installedChunkData !== 0) { // 0 means "already installed".',
 								Template.indent([
-									hasCssMatcher === true
-										? "if(true) { // all chunks have CSS"
-										: `if(${hasCssMatcher("chunkId")}) {`,
+									"",
+									'// a Promise means "currently loading".',
+									"if(installedChunkData) {",
+									Template.indent(["promises.push(installedChunkData[2]);"]),
+									"} else {",
 									Template.indent([
-										"// setup Promise in chunk cache",
-										`var promise = new Promise(${runtimeTemplate.expressionFunction(
-											`installedChunkData = installedChunks[chunkId] = [resolve, reject]`,
-											"resolve, reject"
-										)});`,
-										"promises.push(installedChunkData[2] = promise);",
-										"",
-										"// start chunk loading",
-										`var url = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkCssFilename}(chunkId);`,
-										"// create error before stack unwound to get useful stacktrace later",
-										"var error = new Error();",
-										`var loadingEnded = ${runtimeTemplate.basicFunction(
-											"event",
-											[
-												`if(${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId)) {`,
-												Template.indent([
-													"installedChunkData = installedChunks[chunkId];",
-													"if(installedChunkData !== 0) installedChunks[chunkId] = undefined;",
-													"if(installedChunkData) {",
+										hasCssMatcher === true
+											? "if(true) { // all chunks have CSS"
+											: `if(${hasCssMatcher("chunkId")}) {`,
+										Template.indent([
+											"// setup Promise in chunk cache",
+											`var promise = new Promise(${runtimeTemplate.expressionFunction(
+												`installedChunkData = installedChunks[chunkId] = [resolve, reject]`,
+												"resolve, reject"
+											)});`,
+											"promises.push(installedChunkData[2] = promise);",
+											"",
+											"// start chunk loading",
+											`var url = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkCssFilename}(chunkId);`,
+											"// create error before stack unwound to get useful stacktrace later",
+											"var error = new Error();",
+											`var loadingEnded = ${runtimeTemplate.basicFunction(
+												"event",
+												[
+													`if(${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId)) {`,
 													Template.indent([
-														'if(event.type !== "load") {',
-														Template.indent([
-															"var errorType = event && event.type;",
-															"var realHref = event && event.target && event.target.href;",
-															"error.message = 'Loading css chunk ' + chunkId + ' failed.\\n(' + errorType + ': ' + realHref + ')';",
-															"error.name = 'ChunkLoadError';",
-															"error.type = errorType;",
-															"error.request = realHref;",
-															"installedChunkData[1](error);"
-														]),
-														"} else {",
+														"installedChunkData = installedChunks[chunkId];",
+														"if(installedChunkData !== 0) installedChunks[chunkId] = undefined;",
+														"if(installedChunkData) {",
 														Template.indent([
-															`loadCssChunkData(${RuntimeGlobals.moduleFactories}, link, chunkId);`,
-															"installedChunkData[0]();"
+															'if(event.type !== "load") {',
+															Template.indent([
+																"var errorType = event && event.type;",
+																"var realHref = event && event.target && event.target.href;",
+																"error.message = 'Loading css chunk ' + chunkId + ' failed.\\n(' + errorType + ': ' + realHref + ')';",
+																"error.name = 'ChunkLoadError';",
+																"error.type = errorType;",
+																"error.request = realHref;",
+																"installedChunkData[1](error);"
+															]),
+															"} else {",
+															Template.indent([
+																`loadCssChunkData(${RuntimeGlobals.moduleFactories}, link, chunkId);`,
+																"installedChunkData[0]();"
+															]),
+															"}"
 														]),
 														"}"
 													]),
 													"}"
-												]),
-												"}"
-											]
-										)};`,
-										"var link = loadStylesheet(chunkId, url, loadingEnded);"
+												]
+											)};`,
+											`var link = loadStylesheet(chunkId, url, loadingEnded${
+												withFetchPriority ? ", fetchPriority" : ""
+											});`
+										]),
+										"} else installedChunks[chunkId] = 0;"
 									]),
-									"} else installedChunks[chunkId] = 0;"
+									"}"
 								]),
 								"}"
-							]),
-							"}"
-						])};`
+							]
+						)};`
 					])
 				: "// no chunk loading",
 			"",
+			withPrefetch && hasCssMatcher !== false
+				? `${
+						RuntimeGlobals.prefetchChunkHandlers
+					}.s = ${runtimeTemplate.basicFunction("chunkId", [
+						`if((!${
+							RuntimeGlobals.hasOwnProperty
+						}(installedChunks, chunkId) || installedChunks[chunkId] === undefined) && ${
+							hasCssMatcher === true ? "true" : hasCssMatcher("chunkId")
+						}) {`,
+						Template.indent([
+							"installedChunks[chunkId] = null;",
+							linkPrefetch.call(
+								Template.asString([
+									"var link = document.createElement('link');",
+									crossOriginLoading
+										? `link.crossOrigin = ${JSON.stringify(
+												crossOriginLoading
+											)};`
+										: "",
+									`if (${RuntimeGlobals.scriptNonce}) {`,
+									Template.indent(
+										`link.setAttribute("nonce", ${RuntimeGlobals.scriptNonce});`
+									),
+									"}",
+									'link.rel = "prefetch";',
+									'link.as = "style";',
+									`link.href = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkCssFilename}(chunkId);`
+								]),
+								chunk
+							),
+							"document.head.appendChild(link);"
+						]),
+						"}"
+					])};`
+				: "// no prefetching",
+			"",
+			withPreload && hasCssMatcher !== false
+				? `${
+						RuntimeGlobals.preloadChunkHandlers
+					}.s = ${runtimeTemplate.basicFunction("chunkId", [
+						`if((!${
+							RuntimeGlobals.hasOwnProperty
+						}(installedChunks, chunkId) || installedChunks[chunkId] === undefined) && ${
+							hasCssMatcher === true ? "true" : hasCssMatcher("chunkId")
+						}) {`,
+						Template.indent([
+							"installedChunks[chunkId] = null;",
+							linkPreload.call(
+								Template.asString([
+									"var link = document.createElement('link');",
+									"link.charset = 'utf-8';",
+									`if (${RuntimeGlobals.scriptNonce}) {`,
+									Template.indent(
+										`link.setAttribute("nonce", ${RuntimeGlobals.scriptNonce});`
+									),
+									"}",
+									'link.rel = "preload";',
+									'link.as = "style";',
+									`link.href = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkCssFilename}(chunkId);`,
+									crossOriginLoading
+										? crossOriginLoading === "use-credentials"
+											? 'link.crossOrigin = "use-credentials";'
+											: Template.asString([
+													"if (link.href.indexOf(window.location.origin + '/') !== 0) {",
+													Template.indent(
+														`link.crossOrigin = ${JSON.stringify(
+															crossOriginLoading
+														)};`
+													),
+													"}"
+												])
+										: ""
+								]),
+								chunk
+							),
+							"document.head.appendChild(link);"
+						]),
+						"}"
+					])};`
+				: "// no preloaded",
 			withHmr
 				? Template.asString([
 						"var oldTags = [];",

package/lib/css/CssModulesPlugin.js

@@ -128,6 +128,35 @@ const escapeCss = (str, omitOptionalUnderscore) => {
 		: escaped;
 };
 
+/**
+ * @param {string} str string
+ * @returns {string} encoded string
+ */
+const LZWEncode = str => {
+	/** @type {Map<string, string>} */
+	const map = new Map();
+	let encoded = "";
+	let phrase = str[0];
+	let code = 256;
+	let maxCode = "\uffff".charCodeAt(0);
+	for (let i = 1; i < str.length; i++) {
+		const c = str[i];
+		if (map.has(phrase + c)) {
+			phrase += c;
+		} else {
+			encoded += phrase.length > 1 ? map.get(phrase) : phrase;
+			map.set(phrase + c, String.fromCharCode(code));
+			phrase = c;
+			if (++code > maxCode) {
+				code = 256;
+				map.clear();
+			}
+		}
+	}
+	encoded += phrase.length > 1 ? map.get(phrase) : phrase;
+	return encoded;
+};
+
 const plugin = "CssModulesPlugin";
 
 class CssModulesPlugin {
@@ -213,8 +242,14 @@ class CssModulesPlugin {
 							validateGeneratorOptions[type](generatorOptions);
 
 							return generatorOptions.exportsOnly
-								? new CssExportsGenerator()
-								: new CssGenerator();
+								? new CssExportsGenerator(
+										generatorOptions.exportsConvention,
+										generatorOptions.localIdentName
+									)
+								: new CssGenerator(
+										generatorOptions.exportsConvention,
+										generatorOptions.localIdentName
+									);
 						});
 					normalModuleFactory.hooks.createModuleClass
 						.for(type)
@@ -326,6 +361,8 @@ class CssModulesPlugin {
 									chunkGraph,
 									codeGenerationResults,
 									uniqueName: compilation.outputOptions.uniqueName,
+									cssHeadDataCompression:
+										compilation.outputOptions.cssHeadDataCompression,
 									modules
 								}),
 							filenameTemplate: CssModulesPlugin.getChunkFilenameTemplate(
@@ -537,6 +574,7 @@ class CssModulesPlugin {
 	/**
 	 * @param {Object} options options
 	 * @param {string | undefined} options.uniqueName unique name
+	 * @param {boolean | undefined} options.cssHeadDataCompression compress css head data
 	 * @param {Chunk} options.chunk chunk
 	 * @param {ChunkGraph} options.chunkGraph chunk graph
 	 * @param {CodeGenerationResults} options.codeGenerationResults code generation results
@@ -545,6 +583,7 @@ class CssModulesPlugin {
 	 */
 	renderChunk({
 		uniqueName,
+		cssHeadDataCompression,
 		chunk,
 		chunkGraph,
 		codeGenerationResults,
@@ -618,16 +657,10 @@ class CssModulesPlugin {
 				metaData.push(
 					`${
 						exports
-							? Array.from(exports, ([n, v]) => {
-									const shortcutValue = `${
-										uniqueName ? uniqueName + "-" : ""
-									}${moduleId}-${n}`;
-									return v === shortcutValue
-										? `${escapeCss(n)}/`
-										: v === "--" + shortcutValue
-											? `${escapeCss(n)}%`
-											: `${escapeCss(n)}(${escapeCss(v)})`;
-								}).join("")
+							? Array.from(
+									exports,
+									([n, v]) => `${escapeCss(n)}:${escapeCss(v)}/`
+								).join("")
 							: ""
 					}${escapeCss(moduleId)}`
 				);
@@ -637,11 +670,12 @@ class CssModulesPlugin {
 				throw e;
 			}
 		}
+		const metaDataStr = metaData.join(",");
 		source.add(
 			`head{--webpack-${escapeCss(
 				(uniqueName ? uniqueName + "-" : "") + chunk.id,
 				true
-			)}:${metaData.join(",")};}`
+			)}:${cssHeadDataCompression ? LZWEncode(metaDataStr) : metaDataStr};}`
 		);
 		return source;
 	}

package/lib/debug/ProfilingPlugin.js

@@ -17,9 +17,15 @@ const createSchemaValidation = require("../util/create-schema-validation");
 const { dirname, mkdirpSync } = require("../util/fs");
 
 /** @typedef {import("../../declarations/plugins/debug/ProfilingPlugin").ProfilingPluginOptions} ProfilingPluginOptions */
+/** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../ContextModuleFactory")} ContextModuleFactory */
+/** @typedef {import("../ModuleFactory")} ModuleFactory */
+/** @typedef {import("../NormalModuleFactory")} NormalModuleFactory */
 /** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
 
+/** @typedef {TODO} Inspector */
+
 const validate = createSchemaValidation(
 	require("../../schemas/plugins/debug/ProfilingPlugin.check.js"),
 	() => require("../../schemas/plugins/debug/ProfilingPlugin.json"),
@@ -28,6 +34,8 @@ const validate = createSchemaValidation(
 		baseDataPath: "options"
 	}
 );
+
+/** @type {Inspector | undefined} */
 let inspector = undefined;
 
 try {
@@ -38,6 +46,9 @@ try {
 }
 
 class Profiler {
+	/**
+	 * @param {Inspector} inspector inspector
+	 */
 	constructor(inspector) {
 		this.session = undefined;
 		this.inspector = inspector;
@@ -140,7 +151,7 @@ class Profiler {
  */
 const createTrace = (fs, outputPath) => {
 	const trace = new Tracer();
-	const profiler = new Profiler(inspector);
+	const profiler = new Profiler(/** @type {Inspector} */ (inspector));
 	if (/\/|\\/.test(outputPath)) {
 		const dirPath = dirname(fs, outputPath);
 		mkdirpSync(fs, dirPath);
@@ -216,7 +227,8 @@ class ProfilingPlugin {
 	 */
 	apply(compiler) {
 		const tracer = createTrace(
-			compiler.intermediateFileSystem,
+			/** @type {IntermediateFileSystem} */
+			(compiler.intermediateFileSystem),
 			this.outputPath
 		);
 		tracer.profiler.startProfiling();
@@ -320,6 +332,11 @@ class ProfilingPlugin {
 	}
 }
 
+/**
+ * @param {any} instance instance
+ * @param {Trace} tracer tracer
+ * @param {string} logLabel log label
+ */
 const interceptAllHooksFor = (instance, tracer, logLabel) => {
 	if (Reflect.has(instance, "hooks")) {
 		Object.keys(instance.hooks).forEach(hookName => {
@@ -331,6 +348,10 @@ const interceptAllHooksFor = (instance, tracer, logLabel) => {
 	}
 };
 
+/**
+ * @param {NormalModuleFactory} moduleFactory normal module factory
+ * @param {Trace} tracer tracer
+ */
 const interceptAllParserHooks = (moduleFactory, tracer) => {
 	const moduleTypes = [
 		JAVASCRIPT_MODULE_TYPE_AUTO,
@@ -350,6 +371,10 @@ const interceptAllParserHooks = (moduleFactory, tracer) => {
 	});
 };
 
+/**
+ * @param {Compilation} compilation compilation
+ * @param {Trace} tracer tracer
+ */
 const interceptAllJavascriptModulesPluginHooks = (compilation, tracer) => {
 	interceptAllHooksFor(
 		{

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -103,7 +103,7 @@ class AMDDefineDependencyParserPlugin {
 						/** @type {string} */ (param.string)
 					)
 				)
-					identifiers[idx] = param.string;
+					identifiers[/** @type {number} */ (idx)] = param.string;
 				const result = this.processItem(parser, expr, param, namedModule);
 				if (result === undefined) {
 					this.processContext(parser, expr, param);
@@ -113,7 +113,8 @@ class AMDDefineDependencyParserPlugin {
 		} else if (param.isConstArray()) {
 			/** @type {(string | LocalModuleDependency | AMDRequireItemDependency)[]} */
 			const deps = [];
-			param.array.forEach((request, idx) => {
+			/** @type {string[]} */
+			(param.array).forEach((request, idx) => {
 				let dep;
 				let localModule;
 				if (request === "require") {
@@ -151,7 +152,7 @@ class AMDDefineDependencyParserPlugin {
 	 * @param {CallExpression} expr call expression
 	 * @param {BasicEvaluatedExpression} param param
 	 * @param {string=} namedModule named module
-	 * @returns {boolean} result
+	 * @returns {boolean | undefined} result
 	 */
 	processItem(parser, expr, param, namedModule) {
 		if (param.isConditional()) {
@@ -193,7 +194,10 @@ class AMDDefineDependencyParserPlugin {
 				localModule.flagUsed();
 				dep = new LocalModuleDependency(localModule, param.range, false);
 			} else {
-				dep = this.newRequireItemDependency(param.string, param.range);
+				dep = this.newRequireItemDependency(
+					/** @type {string} */ (param.string),
+					param.range
+				);
 				dep.optional = !!parser.scope.inTry;
 				parser.state.current.addDependency(dep);
 				return true;
@@ -377,7 +381,7 @@ class AMDDefineDependencyParserPlugin {
 					for (const [name, varInfo] of fnRenames) {
 						parser.setVariable(name, varInfo);
 					}
-					parser.scope.inTry = inTry;
+					parser.scope.inTry = /** @type {boolean} */ (inTry);
 					if (fn.callee.object.body.type === "BlockStatement") {
 						parser.detectMode(fn.callee.object.body.body);
 						const prev = parser.prevStatement;