webpack 5.101.3 → 5.102.1

package/lib/css/CssModulesPlugin.js

@@ -48,8 +48,7 @@ const CssGenerator = require("./CssGenerator");
 const CssParser = require("./CssParser");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../../declarations/WebpackOptions").HashFunction} HashFunction */
-/** @typedef {import("../../declarations/WebpackOptions").OutputNormalized} OutputOptions */
+/** @typedef {import("../config/defaults").OutputNormalizedWithDefaults} OutputOptions */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
@@ -59,10 +58,10 @@ const CssParser = require("./CssParser");
 /** @typedef {import("../CssModule").CSSModuleCreateData} CSSModuleCreateData */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
+/** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
 /** @typedef {import("../Template").RuntimeTemplate} RuntimeTemplate */
 /** @typedef {import("../TemplatedPathPlugin").TemplatePath} TemplatePath */
 /** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../util/memoize")} Memoize */
 
 /**
  * @typedef {object} RenderContext
@@ -445,7 +444,6 @@ class CssModulesPlugin {
 				compilation.hooks.contentHash.tap(PLUGIN_NAME, (chunk) => {
 					const {
 						chunkGraph,
-						codeGenerationResults,
 						moduleGraph,
 						runtimeTemplate,
 						outputOptions: {
@@ -455,8 +453,11 @@ class CssModulesPlugin {
 							hashFunction
 						}
 					} = compilation;
-					const hash = createHash(/** @type {HashFunction} */ (hashFunction));
+					const hash = createHash(hashFunction);
 					if (hashSalt) hash.update(hashSalt);
+					const codeGenerationResults =
+						/** @type {CodeGenerationResults} */
+						(compilation.codeGenerationResults);
 					hooks.chunkHash.call(chunk, hash, {
 						chunkGraph,
 						codeGenerationResults,
@@ -469,12 +470,8 @@ class CssModulesPlugin {
 							hash.update(chunkGraph.getModuleHash(module, chunk.runtime));
 						}
 					}
-					const digest = /** @type {string} */ (hash.digest(hashDigest));
-					chunk.contentHash.css = nonNumericOnlyHash(
-						digest,
-						/** @type {number} */
-						(hashDigestLength)
-					);
+					const digest = hash.digest(hashDigest);
+					chunk.contentHash.css = nonNumericOnlyHash(digest, hashDigestLength);
 				});
 				compilation.hooks.renderManifest.tap(PLUGIN_NAME, (result, options) => {
 					const { chunkGraph } = compilation;
@@ -500,8 +497,7 @@ class CssModulesPlugin {
 						);
 						const undoPath = getUndoPath(
 							filename,
-							/** @type {string} */
-							(compilation.outputOptions.path),
+							compilation.outputOptions.path,
 							false
 						);
 						result.push({
@@ -511,9 +507,7 @@ class CssModulesPlugin {
 										chunk,
 										chunkGraph,
 										codeGenerationResults,
-										uniqueName:
-											/** @type {string} */
-											(compilation.outputOptions.uniqueName),
+										uniqueName: compilation.outputOptions.uniqueName,
 										undoPath,
 										modules,
 										runtimeTemplate
@@ -544,7 +538,7 @@ class CssModulesPlugin {
 				const onceForChunkSet = new WeakSet();
 				/**
 				 * @param {Chunk} chunk chunk to check
-				 * @param {Set<string>} set runtime requirements
+				 * @param {RuntimeRequirements} set runtime requirements
 				 */
 				const handler = (chunk, set) => {
 					if (onceForChunkSet.has(chunk)) return;
@@ -914,9 +908,9 @@ class CssModulesPlugin {
 		if (chunk.cssFilenameTemplate) {
 			return chunk.cssFilenameTemplate;
 		} else if (chunk.canBeInitial()) {
-			return /** @type {TemplatePath} */ (outputOptions.cssFilename);
+			return outputOptions.cssFilename;
 		}
-		return /** @type {TemplatePath} */ (outputOptions.cssChunkFilename);
+		return outputOptions.cssChunkFilename;
 	}
 
 	/**

package/lib/css/CssParser.js

@@ -355,7 +355,7 @@ class CssParser extends Parser {
 			mode === "auto" &&
 			module.type === CSS_MODULE_TYPE_AUTO &&
 			IS_MODULES.test(
-				parseResource(module.matchResource || module.resource).path
+				parseResource(/** @type {string} */ (module.getResource())).path
 			)
 		) {
 			mode = "local";
@@ -372,7 +372,7 @@ class CssParser extends Parser {
 		let scope = CSS_MODE_TOP_LEVEL;
 		/** @type {boolean} */
 		let allowImportAtRule = true;
-		/** @type [string, number, number][] */
+		/** @type {[string, number, number][]} */
 		const balanced = [];
 		let lastTokenEndForComments = 0;
 
@@ -1611,7 +1611,7 @@ class CssParser extends Parser {
 					const newErr = new Error(String(/** @type {Error} */ (err).message));
 					newErr.stack = String(/** @type {Error} */ (err).stack);
 					Object.assign(newErr, { comment });
-					errors.push(/** @type (Error & { comment: Comment }) */ (newErr));
+					errors.push(/** @type {(Error & { comment: Comment })} */ (newErr));
 				}
 			}
 		}

package/lib/css/walkCssTokens.js

@@ -66,7 +66,7 @@ const CC_LOWER_Z = "z".charCodeAt(0);
 const CC_UPPER_A = "A".charCodeAt(0);
 const CC_UPPER_F = "F".charCodeAt(0);
 const CC_UPPER_E = "E".charCodeAt(0);
-const CC_UPPER_U = "E".charCodeAt(0);
+const CC_UPPER_U = "U".charCodeAt(0);
 const CC_UPPER_Z = "Z".charCodeAt(0);
 const CC_0 = "0".charCodeAt(0);
 const CC_9 = "9".charCodeAt(0);
@@ -1589,7 +1589,7 @@ const eatUntil = (chars) => {
 		chars.charCodeAt(i)
 	);
 	const arr = Array.from(
-		{ length: charCodes.reduce((a, b) => Math.max(a, b), 0) + 1 },
+		{ length: Math.max(...charCodes, 0) + 1 },
 		() => false
 	);
 	for (const cc of charCodes) {

package/lib/debug/ProfilingPlugin.js

@@ -19,13 +19,30 @@ 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("../Parser")} Parser */
 /** @typedef {import("../ResolverFactory")} ResolverFactory */
 /** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
 
+/**
+ * @template T, R
+ * @typedef {import("tapable").Hook<T, R>} Hook
+ */
+
+/**
+ * @template T
+ * @typedef {import("../util/deprecation").FakeHook<T>} FakeHook
+ */
+
+/**
+ * @template T
+ * @typedef {import("tapable").HookMap<T>} HookMap
+ */
+
+/**
+ * @template T, R
+ * @typedef {import("tapable").HookInterceptor<T, R>} HookInterceptor
+ */
+
 const validate = createSchemaValidation(
 	require("../../schemas/plugins/debug/ProfilingPlugin.check"),
 	() => require("../../schemas/plugins/debug/ProfilingPlugin.json"),
@@ -119,6 +136,9 @@ class Profiler {
 		return Promise.resolve();
 	}
 
+	/**
+	 * @returns {Promise<{ profile: { startTime: number, endTime: number } }>} profile result
+	 */
 	stopProfiling() {
 		return this.sendCommand("Profiler.stop").then(({ profile }) => {
 			const hrtime = process.hrtime();
@@ -255,7 +275,10 @@ class ProfilingPlugin {
 					(hookName)
 				];
 			if (hook) {
-				hook.intercept(makeInterceptorFor("Resolver", tracer)(hookName));
+				hook.intercept(
+					/** @type {EXPECTED_ANY} */
+					(makeInterceptorFor("Resolver", tracer)(hookName))
+				);
 			}
 		}
 
@@ -347,15 +370,18 @@ class ProfilingPlugin {
 	}
 }
 
+/** @typedef {Record<string, Hook<EXPECTED_ANY, EXPECTED_ANY> | FakeHook<EXPECTED_ANY> | HookMap<EXPECTED_ANY>>} Hooks */
+
 /**
- * @param {EXPECTED_ANY & { hooks: TODO }} instance instance
+ * @param {EXPECTED_OBJECT & { hooks?: Hooks }} instance instance
  * @param {Trace} tracer tracer
  * @param {string} logLabel log label
  */
 const interceptAllHooksFor = (instance, tracer, logLabel) => {
 	if (Reflect.has(instance, "hooks")) {
-		for (const hookName of Object.keys(instance.hooks)) {
-			const hook = instance.hooks[hookName];
+		const hooks = /** @type {Hooks} */ (instance.hooks);
+		for (const hookName of Object.keys(hooks)) {
+			const hook = hooks[hookName];
 			if (hook && !hook._fakeHook) {
 				hook.intercept(makeInterceptorFor(logLabel, tracer)(hookName));
 			}
@@ -439,9 +465,10 @@ const interceptAllCssModulesPluginHooks = (compilation, tracer) => {
 /** @typedef {(...args: EXPECTED_ANY[]) => EXPECTED_ANY | Promise<(...args: EXPECTED_ANY[]) => EXPECTED_ANY>} PluginFunction */
 
 /**
+ * @template T
  * @param {string} instance instance
  * @param {Trace} tracer tracer
- * @returns {(hookName: string) => TODO} interceptor
+ * @returns {(hookName: string) => HookInterceptor<EXPECTED_ANY, EXPECTED_ANY>} interceptor
  */
 const makeInterceptorFor = (instance, tracer) => (hookName) => ({
 	/**

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -24,12 +24,12 @@ const { addLocalModule, getLocalModule } = require("./LocalModulesHelpers");
 /** @typedef {import("estree").Literal} Literal */
 /** @typedef {import("estree").MemberExpression} MemberExpression */
 /** @typedef {import("estree").ObjectExpression} ObjectExpression */
-/** @typedef {import("estree").SimpleCallExpression} SimpleCallExpression */
 /** @typedef {import("estree").SpreadElement} SpreadElement */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @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 */
 
 /**
@@ -68,6 +68,8 @@ const isCallable = (expr) => {
 	return false;
 };
 
+/** @typedef {Record<number, string>} Identifiers */
+
 const PLUGIN_NAME = "AMDDefineDependencyParserPlugin";
 
 class AMDDefineDependencyParserPlugin {
@@ -92,7 +94,7 @@ class AMDDefineDependencyParserPlugin {
 	 * @param {JavascriptParser} parser the parser
 	 * @param {CallExpression} expr call expression
 	 * @param {BasicEvaluatedExpression} param param
-	 * @param {Record<number, string>} identifiers identifiers
+	 * @param {Identifiers} identifiers identifiers
 	 * @param {string=} namedModule named module
 	 * @returns {boolean | undefined} result
 	 */
@@ -106,7 +108,7 @@ class AMDDefineDependencyParserPlugin {
 						/** @type {string} */ (item.string)
 					)
 				) {
-					identifiers[/** @type {number} */ (idx)] =
+					identifiers[idx] =
 						/** @type {string} */
 						(item.string);
 				}
@@ -347,9 +349,10 @@ class AMDDefineDependencyParserPlugin {
 				}
 			}
 		}
+		/** @type {Map<string, ExportedVariableInfo>} */
 		const fnRenames = new Map();
 		if (array) {
-			/** @type {Record<number, string>} */
+			/** @type {Identifiers} */
 			const identifiers = {};
 			const param = parser.evaluateExpression(array);
 			const result = this.processArray(
@@ -417,19 +420,11 @@ class AMDDefineDependencyParserPlugin {
 						parser.setVariable(name, varInfo);
 					}
 					parser.scope.inTry = /** @type {boolean} */ (inTry);
-
-					if (object.body.type === "BlockStatement") {
-						parser.detectMode(object.body.body);
-						const prev = parser.prevStatement;
-						parser.preWalkStatement(object.body);
-						parser.prevStatement = prev;
-						parser.walkStatement(object.body);
-					} else {
-						parser.walkExpression(
-							/** @type {TODO} */
-							(object.body)
-						);
-					}
+					parser.detectMode(object.body.body);
+					const prev = parser.prevStatement;
+					parser.preWalkStatement(object.body);
+					parser.prevStatement = prev;
+					parser.walkStatement(object.body);
 				}
 			);
 			if (fn.arguments) {

package/lib/dependencies/AMDPlugin.js

@@ -34,11 +34,11 @@ const UnsupportedDependency = require("./UnsupportedDependency");
 
 /** @typedef {import("../../declarations/WebpackOptions").Amd} Amd */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../../declarations/WebpackOptions").ModuleOptionsNormalized} ModuleOptions */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../javascript/JavascriptParser")} Parser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../javascript/BasicEvaluatedExpression").GetMembers} GetMembers */
 
 const PLUGIN_NAME = "AMDPlugin";
 
@@ -143,7 +143,7 @@ class AMDPlugin {
 					/**
 					 * @param {string} optionExpr option expression
 					 * @param {string} rootName root name
-					 * @param {() => string[]} getMembers callback
+					 * @param {GetMembers} getMembers callback
 					 */
 					const tapOptionsHooks = (optionExpr, rootName, getMembers) => {
 						parser.hooks.expression

package/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

@@ -26,7 +26,6 @@ const getFunctionExpression = require("./getFunctionExpression");
 /** @typedef {import("estree").SpreadElement} SpreadElement */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
@@ -296,7 +295,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			depBlock.addDependency(dep);
 
-			parser.state.current = /** @type {TODO} */ (depBlock);
+			parser.state.current = /** @type {EXPECTED_ANY} */ (depBlock);
 		}
 
 		if (expr.arguments.length === 1) {

package/lib/dependencies/CachedConstDependency.js

@@ -11,13 +11,9 @@ const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../DependencyTemplates")} DependencyTemplates */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */

package/lib/dependencies/CommonJsExportRequireDependency.js

@@ -17,11 +17,13 @@ const processExportInfo = require("./processExportInfo");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
-/** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
+/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
+/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ExportsInfo")} ExportsInfo */
 /** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
+/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
@@ -34,14 +36,17 @@ const idsSymbol = Symbol("CommonJsExportRequireDependency.ids");
 
 const EMPTY_OBJECT = {};
 
+/** @typedef {Set<string>} Exports */
+/** @typedef {Set<string>} Checked */
+
 class CommonJsExportRequireDependency extends ModuleDependency {
 	/**
 	 * @param {Range} range range
 	 * @param {Range | null} valueRange value range
 	 * @param {CommonJSDependencyBaseKeywords} base base
-	 * @param {string[]} names names
+	 * @param {ExportInfoName[]} names names
 	 * @param {string} request request
-	 * @param {string[]} ids ids
+	 * @param {ExportInfoName[]} ids ids
 	 * @param {boolean} resultUsed true, when the result is used
 	 */
 	constructor(range, valueRange, base, names, request, ids, resultUsed) {
@@ -68,7 +73,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
-	 * @returns {string[]} the imported id
+	 * @returns {ExportInfoName[]} the imported id
 	 */
 	getIds(moduleGraph) {
 		return moduleGraph.getMeta(this)[idsSymbol] || this.ids;
@@ -76,7 +81,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
-	 * @param {string[]} ids the imported ids
+	 * @param {ExportInfoName[]} ids the imported ids
 	 * @returns {void}
 	 */
 	setIds(moduleGraph, ids) {
@@ -87,7 +92,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 	 * Returns list of exports referenced by this dependency
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @param {RuntimeSpec} runtime the runtime for which the module is analysed
-	 * @returns {(string[] | ReferencedExport)[]} referenced exports
+	 * @returns {ReferencedExports} referenced exports
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		const ids = this.getIds(moduleGraph);
@@ -108,9 +113,9 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 			/** @type {Module} */ (moduleGraph.getParentModule(this))
 		);
 		for (const name of this.names) {
-			const exportInfo = /** @type {ExportInfo} */ (
-				exportsInfo.getReadOnlyExportInfo(name)
-			);
+			const exportInfo =
+				/** @type {ExportInfo} */
+				(exportsInfo.getReadOnlyExportInfo(name));
 			const used = exportInfo.getUsed(runtime);
 			if (used === UsageState.Unused) return Dependency.NO_EXPORTS_REFERENCED;
 			if (used !== UsageState.OnlyPropertiesUsed) return getFullResult();
@@ -120,7 +125,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		if (exportsInfo.otherExportsInfo.getUsed(runtime) !== UsageState.Unused) {
 			return getFullResult();
 		}
-		/** @type {string[][]} */
+		/** @type {RawReferencedExports} */
 		const referencedExports = [];
 		for (const exportInfo of exportsInfo.orderedExports) {
 			processExportInfo(
@@ -188,7 +193,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		if (reexportInfo) {
 			return {
 				exports: Array.from(
-					/** @type {Set<string>} */
+					/** @type {Exports} */
 					(reexportInfo.exports),
 					(name) => ({
 						name,
@@ -213,7 +218,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @param {RuntimeSpec} runtime the runtime
 	 * @param {Module} importedModule the imported module (optional)
-	 * @returns {{exports?: Set<string>, checked?: Set<string>} | undefined} information
+	 * @returns {{ exports?: Exports, checked?: Checked } | undefined} information
 	 */
 	getStarReexports(
 		moduleGraph,
@@ -248,9 +253,9 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		const isNamespaceImport =
 			importedModule.getExportsType(moduleGraph, false) === "namespace";
 
-		/** @type {Set<string>} */
+		/** @type {Exports} */
 		const exports = new Set();
-		/** @type {Set<string>} */
+		/** @type {Checked} */
 		const checked = new Set();
 
 		if (noExtraImports) {
@@ -403,3 +408,4 @@ CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependency
 };
 
 module.exports = CommonJsExportRequireDependency;
+module.exports.idsSymbol = idsSymbol;

package/lib/dependencies/CommonJsExportsDependency.js

@@ -16,6 +16,7 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -28,7 +29,7 @@ class CommonJsExportsDependency extends NullDependency {
 	 * @param {Range} range range
 	 * @param {Range | null} valueRange value range
 	 * @param {CommonJSDependencyBaseKeywords} base base
-	 * @param {string[]} names names
+	 * @param {ExportInfoName[]} names names
 	 */
 	constructor(range, valueRange, base, names) {
 		super();

package/lib/dependencies/CommonJsExportsParserPlugin.js

@@ -22,12 +22,14 @@ const ModuleDecoratorDependency = require("./ModuleDecoratorDependency");
 /** @typedef {import("estree").Super} Super */
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../javascript/JavascriptParser").Members} Members */
 /** @typedef {import("../javascript/JavascriptParser").StatementPath} StatementPath */
 /** @typedef {import("./CommonJsDependencyHelpers").CommonJSDependencyBaseKeywords} CommonJSDependencyBaseKeywords */
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
 
 /**
  * This function takes a generic expression and detects whether it is an ObjectExpression.
@@ -94,9 +96,10 @@ const isFalsyLiteral = (expr) => {
 /**
  * @param {JavascriptParser} parser the parser
  * @param {Expression} expr expression
- * @returns {{ argument: BasicEvaluatedExpression, ids: string[] } | undefined} parsed call
+ * @returns {{ argument: BasicEvaluatedExpression, ids: ExportInfoName[] } | undefined} parsed call
  */
 const parseRequireCall = (parser, expr) => {
+	/** @type {ExportInfoName[]} */
 	const ids = [];
 	while (expr.type === "MemberExpression") {
 		if (expr.object.type === "Super") return;
@@ -146,7 +149,7 @@ class CommonJsExportsParserPlugin {
 
 		/**
 		 * @param {boolean} topLevel true, when the export is on top level
-		 * @param {string[]} members members of the export
+		 * @param {Members} members members of the export
 		 * @param {Expression | undefined} valueExpr expression for the value
 		 * @returns {void}
 		 */
@@ -189,7 +192,7 @@ class CommonJsExportsParserPlugin {
 		/**
 		 * @param {AssignmentExpression} expr expression
 		 * @param {CommonJSDependencyBaseKeywords} base commonjs base keywords
-		 * @param {string[]} members members of the export
+		 * @param {Members} members members of the export
 		 * @returns {boolean | undefined} true, when the expression was handled
 		 */
 		const handleAssignExport = (expr, base, members) => {
@@ -216,6 +219,10 @@ class CommonJsExportsParserPlugin {
 				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 				dep.optional = Boolean(parser.scope.inTry);
 				parser.state.module.addDependency(dep);
+				/** @type {BuildMeta} */ (
+					parser.state.module.buildMeta
+				).treatAsCommonJs = true;
+
 				return true;
 			}
 			if (members.length === 0) return;
@@ -236,6 +243,8 @@ class CommonJsExportsParserPlugin {
 			);
 			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			parser.state.module.addDependency(dep);
+			/** @type {BuildMeta} */ (parser.state.module.buildMeta).treatAsCommonJs =
+				true;
 			parser.walkExpression(expr.right);
 			return true;
 		};
@@ -293,6 +302,9 @@ class CommonJsExportsParserPlugin {
 				);
 				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 				parser.state.module.addDependency(dep);
+				/** @type {BuildMeta} */ (
+					parser.state.module.buildMeta
+				).treatAsCommonJs = true;
 
 				parser.walkExpression(expr.arguments[2]);
 				return true;
@@ -303,7 +315,7 @@ class CommonJsExportsParserPlugin {
 		/**
 		 * @param {Expression | Super} expr expression
 		 * @param {CommonJSDependencyBaseKeywords} base commonjs base keywords
-		 * @param {string[]} members members of the export
+		 * @param {Members} members members of the export
 		 * @param {CallExpression=} call call expression
 		 * @returns {boolean | void} true, when the expression was handled
 		 */
@@ -333,6 +345,9 @@ class CommonJsExportsParserPlugin {
 			);
 			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			parser.state.module.addDependency(dep);
+			/** @type {BuildMeta} */ (parser.state.module.buildMeta).treatAsCommonJs =
+				true;
+
 			if (call) {
 				parser.walkExpressions(call.arguments);
 			}

package/lib/dependencies/CommonJsFullRequireDependency.js

@@ -14,20 +14,22 @@ const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
+/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @typedef {import("../util/chainedImports").IdRanges} IdRanges */
 
 class CommonJsFullRequireDependency extends ModuleDependency {
 	/**
 	 * @param {string} request the request string
 	 * @param {Range} range location in source code
-	 * @param {string[]} names accessed properties on module
-	 * @param {Range[]=} idRanges ranges for members of ids; the two arrays are right-aligned
+	 * @param {ExportInfoName[]} names accessed properties on module
+	 * @param {IdRanges=} idRanges ranges for members of ids; the two arrays are right-aligned
 	 */
 	constructor(
 		request,
@@ -47,7 +49,7 @@ class CommonJsFullRequireDependency extends ModuleDependency {
 	 * Returns list of exports referenced by this dependency
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @param {RuntimeSpec} runtime the runtime for which the module is analysed
-	 * @returns {(string[] | ReferencedExport)[]} referenced exports
+	 * @returns {ReferencedExports} referenced exports
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		if (this.call) {