webpack 5.105.4 → 5.106.0

package/lib/css/walkCssTokens.js

@@ -7,8 +7,8 @@
 
 /**
  * @typedef {object} CssTokenCallbacks
- * @property {((input: string, start: number, end: number, innerStart: number, innerEnd: number) => number)=} url
  * @property {((input: string, start: number, end: number) => number)=} comment
+ * @property {((input: string, start: number, end: number) => number)=} whitespace
  * @property {((input: string, start: number, end: number) => number)=} string
  * @property {((input: string, start: number, end: number) => number)=} leftCurlyBracket
  * @property {((input: string, start: number, end: number) => number)=} rightCurlyBracket
@@ -17,13 +17,21 @@
  * @property {((input: string, start: number, end: number) => number)=} leftSquareBracket
  * @property {((input: string, start: number, end: number) => number)=} rightSquareBracket
  * @property {((input: string, start: number, end: number) => number)=} function
+ * @property {((input: string, start: number, end: number, innerStart: number, innerEnd: number) => number)=} url
  * @property {((input: string, start: number, end: number) => number)=} colon
  * @property {((input: string, start: number, end: number) => number)=} atKeyword
  * @property {((input: string, start: number, end: number) => number)=} delim
  * @property {((input: string, start: number, end: number) => number)=} identifier
+ * @property {((input: string, start: number, end: number) => number)=} percentage
+ * @property {((input: string, start: number, end: number) => number)=} number
+ * @property {((input: string, start: number, end: number) => number)=} dimension
  * @property {((input: string, start: number, end: number, isId: boolean) => number)=} hash
  * @property {((input: string, start: number, end: number) => number)=} semicolon
  * @property {((input: string, start: number, end: number) => number)=} comma
+ * @property {((input: string, start: number, end: number) => number)=} cdo
+ * @property {((input: string, start: number, end: number) => number)=} cdc
+ * @property {((input: string, start: number, end: number) => number)=} badStringToken
+ * @property {((input: string, start: number, end: number) => number)=} badUrlToken
  * @property {(() => boolean)=} needTerminate
  */
 
@@ -81,13 +89,19 @@ const CC_LESS_THAN_SIGN = "<".charCodeAt(0);
 const CC_GREATER_THAN_SIGN = ">".charCodeAt(0);
 
 /** @type {CharHandler} */
-const consumeSpace = (input, pos, _callbacks) => {
+const consumeSpace = (input, pos, callbacks) => {
+	const start = pos - 1;
+
 	// Consume as much whitespace as possible.
 	while (_isWhiteSpace(input.charCodeAt(pos))) {
 		pos++;
 	}
 
 	// Return a <whitespace-token>.
+	if (callbacks.whitespace !== undefined) {
+		return callbacks.whitespace(input, start, pos);
+	}
+
 	return pos;
 };
 
@@ -143,9 +157,14 @@ const isIdentStartCodePoint = (cc) =>
 	cc >= 0x80;
 
 /** @type {CharHandler} */
-const consumeDelimToken = (input, pos, _callbacks) =>
+const consumeDelimToken = (input, pos, callbacks) => {
 	// Return a <delim-token> with its value set to the current input code point.
-	pos;
+	if (callbacks.delim) {
+		pos = callbacks.delim(input, pos - 1, pos);
+	}
+
+	return pos;
+};
 
 /** @type {CharHandler} */
 const consumeComments = (input, pos, callbacks) => {
@@ -286,6 +305,11 @@ const consumeAStringToken = (input, pos, callbacks) => {
 		// Reconsume the current input code point, create a <bad-string-token>, and return it.
 		else if (_isNewline(cc)) {
 			pos--;
+
+			if (callbacks.badStringToken !== undefined) {
+				return callbacks.badStringToken(input, start, pos);
+			}
+
 			// bad string
 			return pos;
 		}
@@ -445,7 +469,7 @@ const _ifThreeCodePointsWouldStartANumber = (input, pos, f, s, t) => {
 
 	const first = f || input.charCodeAt(pos - 1);
 	const second = s || input.charCodeAt(pos);
-	const third = t || input.charCodeAt(pos);
+	const third = t || input.charCodeAt(pos + 1);
 
 	// Look at the first code point:
 
@@ -523,6 +547,10 @@ const consumeNumberSign = (input, pos, callbacks) => {
 		return pos;
 	}
 
+	if (callbacks.delim !== undefined) {
+		return callbacks.delim(input, start, pos);
+	}
+
 	// Otherwise, return a <delim-token> with its value set to the current input code point.
 	return pos;
 };
@@ -539,6 +567,10 @@ const consumeHyphenMinus = (input, pos, callbacks) => {
 		input.charCodeAt(pos) === CC_HYPHEN_MINUS &&
 		input.charCodeAt(pos + 1) === CC_GREATER_THAN_SIGN
 	) {
+		if (callbacks.cdc !== undefined) {
+			return callbacks.cdc(input, pos - 1, pos + 2);
+		}
+
 		return pos + 2;
 	}
 	// Otherwise, if the input stream starts with an ident sequence, reconsume the current input code point, consume an ident-like token, and return it.
@@ -547,6 +579,10 @@ const consumeHyphenMinus = (input, pos, callbacks) => {
 		return consumeAnIdentLikeToken(input, pos, callbacks);
 	}
 
+	if (callbacks.delim !== undefined) {
+		return callbacks.delim(input, pos - 1, pos);
+	}
+
 	// Otherwise, return a <delim-token> with its value set to the current input code point.
 	return pos;
 };
@@ -571,6 +607,8 @@ const consumeFullStop = (input, pos, callbacks) => {
 
 /** @type {CharHandler} */
 const consumePlusSign = (input, pos, callbacks) => {
+	const start = pos - 1;
+
 	// If the input stream starts with a number, reconsume the current input code point, consume a numeric token, and return it.
 	if (_ifThreeCodePointsWouldStartANumber(input, pos)) {
 		pos--;
@@ -578,6 +616,10 @@ const consumePlusSign = (input, pos, callbacks) => {
 	}
 
 	// Otherwise, return a <delim-token> with its value set to the current input code point.
+	if (callbacks.delim !== undefined) {
+		return callbacks.delim(input, start, pos);
+	}
+
 	return pos;
 };
 
@@ -657,6 +699,8 @@ const consumeANumericToken = (input, pos, callbacks) => {
 	// This section describes how to consume a numeric token from a stream of code points.
 	// It returns either a <number-token>, <percentage-token>, or <dimension-token>.
 
+	const start = pos;
+
 	// Consume a number and let number be the result.
 	pos = _consumeANumber(input, pos, callbacks);
 
@@ -679,15 +723,29 @@ const consumeANumericToken = (input, pos, callbacks) => {
 			third
 		)
 	) {
-		return _consumeAnIdentSequence(input, pos, callbacks);
+		pos = _consumeAnIdentSequence(input, pos, callbacks);
+
+		if (callbacks.dimension !== undefined) {
+			return callbacks.dimension(input, start, pos);
+		}
+
+		return pos;
 	}
 	// Otherwise, if the next input code point is U+0025 PERCENTAGE SIGN (%), consume it.
 	// Create a <percentage-token> with the same value as number, and return it.
 	else if (first === CC_PERCENTAGE) {
+		if (callbacks.percentage !== undefined) {
+			return callbacks.percentage(input, start, pos + 1);
+		}
+
 		return pos + 1;
 	}
 
 	// Otherwise, create a <number-token> with the same value and type flag as number, and return it.
+	if (callbacks.number !== undefined) {
+		return callbacks.number(input, start, pos);
+	}
+
 	return pos;
 };
 
@@ -697,6 +755,7 @@ const consumeColon = (input, pos, callbacks) => {
 	if (callbacks.colon !== undefined) {
 		return callbacks.colon(input, pos - 1, pos);
 	}
+
 	return pos;
 };
 
@@ -706,6 +765,7 @@ const consumeLeftParenthesis = (input, pos, callbacks) => {
 	if (callbacks.leftParenthesis !== undefined) {
 		return callbacks.leftParenthesis(input, pos - 1, pos);
 	}
+
 	return pos;
 };
 
@@ -715,6 +775,7 @@ const consumeRightParenthesis = (input, pos, callbacks) => {
 	if (callbacks.rightParenthesis !== undefined) {
 		return callbacks.rightParenthesis(input, pos - 1, pos);
 	}
+
 	return pos;
 };
 
@@ -724,6 +785,7 @@ const consumeLeftSquareBracket = (input, pos, callbacks) => {
 	if (callbacks.leftSquareBracket !== undefined) {
 		return callbacks.leftSquareBracket(input, pos - 1, pos);
 	}
+
 	return pos;
 };
 
@@ -733,6 +795,7 @@ const consumeRightSquareBracket = (input, pos, callbacks) => {
 	if (callbacks.rightSquareBracket !== undefined) {
 		return callbacks.rightSquareBracket(input, pos - 1, pos);
 	}
+
 	return pos;
 };
 
@@ -742,6 +805,7 @@ const consumeLeftCurlyBracket = (input, pos, callbacks) => {
 	if (callbacks.leftCurlyBracket !== undefined) {
 		return callbacks.leftCurlyBracket(input, pos - 1, pos);
 	}
+
 	return pos;
 };
 
@@ -751,6 +815,7 @@ const consumeRightCurlyBracket = (input, pos, callbacks) => {
 	if (callbacks.rightCurlyBracket !== undefined) {
 		return callbacks.rightCurlyBracket(input, pos - 1, pos);
 	}
+
 	return pos;
 };
 
@@ -760,6 +825,7 @@ const consumeSemicolon = (input, pos, callbacks) => {
 	if (callbacks.semicolon !== undefined) {
 		return callbacks.semicolon(input, pos - 1, pos);
 	}
+
 	return pos;
 };
 
@@ -769,6 +835,7 @@ const consumeComma = (input, pos, callbacks) => {
 	if (callbacks.comma !== undefined) {
 		return callbacks.comma(input, pos - 1, pos);
 	}
+
 	return pos;
 };
 
@@ -935,7 +1002,13 @@ const consumeAUrlToken = (input, pos, fnStart, callbacks) => {
 			}
 
 			// Don't handle bad urls
-			return consumeTheRemnantsOfABadUrl(input, pos);
+			pos = consumeTheRemnantsOfABadUrl(input, pos);
+
+			if (callbacks.badUrlToken !== undefined) {
+				return callbacks.badUrlToken(input, fnStart, pos);
+			}
+
+			return pos;
 		}
 		// U+0022 QUOTATION MARK (")
 		// U+0027 APOSTROPHE (')
@@ -949,7 +1022,13 @@ const consumeAUrlToken = (input, pos, fnStart, callbacks) => {
 			_isNonPrintableCodePoint(cc)
 		) {
 			// Don't handle bad urls
-			return consumeTheRemnantsOfABadUrl(input, pos);
+			pos = consumeTheRemnantsOfABadUrl(input, pos);
+
+			if (callbacks.badUrlToken !== undefined) {
+				return callbacks.badUrlToken(input, fnStart, pos);
+			}
+
+			return pos;
 		}
 		// // U+005C REVERSE SOLIDUS (\)
 		// // If the stream starts with a valid escape, consume an escaped code point and append the returned code point to the <url-token>’s value.
@@ -959,7 +1038,13 @@ const consumeAUrlToken = (input, pos, fnStart, callbacks) => {
 				pos = _consumeAnEscapedCodePoint(input, pos);
 			} else {
 				// Don't handle bad urls
-				return consumeTheRemnantsOfABadUrl(input, pos);
+				pos = consumeTheRemnantsOfABadUrl(input, pos);
+
+				if (callbacks.badUrlToken !== undefined) {
+					return callbacks.badUrlToken(input, fnStart, pos);
+				}
+
+				return pos;
 			}
 		}
 		// anything else
@@ -1033,12 +1118,20 @@ const consumeAnIdentLikeToken = (input, pos, callbacks) => {
 };
 
 /** @type {CharHandler} */
-const consumeLessThan = (input, pos, _callbacks) => {
+const consumeLessThan = (input, pos, callbacks) => {
 	// If the next 3 input code points are U+0021 EXCLAMATION MARK U+002D HYPHEN-MINUS U+002D HYPHEN-MINUS (!--), consume them and return a <CDO-token>.
 	if (input.slice(pos, pos + 3) === "!--") {
+		if (callbacks.cdo !== undefined) {
+			return callbacks.cdo(input, pos - 1, pos + 3);
+		}
+
 		return pos + 3;
 	}
 
+	if (callbacks.delim !== undefined) {
+		return callbacks.delim(input, pos - 1, pos);
+	}
+
 	// Otherwise, return a <delim-token> with its value set to the current input code point.
 	return pos;
 };
@@ -1067,6 +1160,10 @@ const consumeCommercialAt = (input, pos, callbacks) => {
 	}
 
 	// Otherwise, return a <delim-token> with its value set to the current input code point.
+	if (callbacks.delim !== undefined) {
+		return callbacks.delim(input, start, pos);
+	}
+
 	return pos;
 };
 
@@ -1079,6 +1176,10 @@ const consumeReverseSolidus = (input, pos, callbacks) => {
 	}
 
 	// Otherwise, this is a parse error. Return a <delim-token> with its value set to the current input code point.
+	if (callbacks.delim !== undefined) {
+		return callbacks.delim(input, pos - 1, pos);
+	}
+
 	return pos;
 };
 
@@ -1281,12 +1382,14 @@ const consumeUntil = (input, pos, callbacks, additional, options = {}) => {
 		};
 	}
 
+	const mergedCallbacks = { ...servicedCallbacks, ...callbacks };
+
 	while (pos < input.length) {
 		// Consume comments.
 		pos = consumeComments(
 			input,
 			pos,
-			needHandle ? { ...servicedCallbacks, ...callbacks } : servicedCallbacks
+			needHandle ? mergedCallbacks : servicedCallbacks
 		);
 
 		const start = pos;
@@ -1296,7 +1399,7 @@ const consumeUntil = (input, pos, callbacks, additional, options = {}) => {
 		pos = consumeAToken(
 			input,
 			pos,
-			needHandle ? { ...servicedCallbacks, ...callbacks } : servicedCallbacks
+			needHandle ? mergedCallbacks : servicedCallbacks
 		);
 
 		if (needTerminate) {

package/lib/debug/ProfilingPlugin.js

@@ -11,7 +11,6 @@ const {
 	JSON_MODULE_TYPE,
 	WEBASSEMBLY_MODULES
 } = require("../ModuleTypeConstants");
-const createSchemaValidation = require("../util/create-schema-validation");
 const { dirname, mkdirpSync } = require("../util/fs");
 
 /** @typedef {import("inspector").Session} Session */
@@ -43,15 +42,6 @@ const { dirname, mkdirpSync } = require("../util/fs");
  * @typedef {import("tapable").HookInterceptor<T, R>} HookInterceptor
  */
 
-const validate = createSchemaValidation(
-	require("../../schemas/plugins/debug/ProfilingPlugin.check"),
-	() => require("../../schemas/plugins/debug/ProfilingPlugin.json"),
-	{
-		name: "Profiling Plugin",
-		baseDataPath: "options"
-	}
-);
-
 /** @typedef {{ Session: typeof import("inspector").Session }} Inspector */
 
 /** @type {Inspector | undefined} */
@@ -242,8 +232,8 @@ class ProfilingPlugin {
 	 * @param {ProfilingPluginOptions=} options options object
 	 */
 	constructor(options = {}) {
-		validate(options);
-		this.outputPath = options.outputPath || "events.json";
+		/** @type {ProfilingPluginOptions} */
+		this.options = options;
 	}
 
 	/**
@@ -252,10 +242,23 @@ class ProfilingPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() => require("../../schemas/plugins/debug/ProfilingPlugin.json"),
+				this.options,
+				{
+					name: "Profiling Plugin",
+					baseDataPath: "options"
+				},
+				(options) =>
+					require("../../schemas/plugins/debug/ProfilingPlugin.check")(options)
+			);
+		});
+
 		const tracer = createTrace(
 			/** @type {IntermediateFileSystem} */
 			(compiler.intermediateFileSystem),
-			this.outputPath
+			this.options.outputPath || "events.json"
 		);
 		tracer.profiler.startProfiling();
 

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -394,21 +394,25 @@ class AMDDefineDependencyParserPlugin {
 		let inTry;
 		if (fn && isUnboundFunctionExpression(fn)) {
 			inTry = parser.scope.inTry;
-			parser.inScope(/** @type {Identifier[]} */ (fnParams), () => {
-				for (const [name, varInfo] of fnRenames) {
-					parser.setVariable(name, varInfo);
-				}
-				parser.scope.inTry = /** @type {boolean} */ (inTry);
-				if (fn.body.type === "BlockStatement") {
-					parser.detectMode(fn.body.body);
-					const prev = parser.prevStatement;
-					parser.preWalkStatement(fn.body);
-					parser.prevStatement = prev;
-					parser.walkStatement(fn.body);
-				} else {
-					parser.walkExpression(fn.body);
+			parser.inFunctionScope(
+				true,
+				/** @type {Identifier[]} */ (fnParams),
+				() => {
+					for (const [name, varInfo] of fnRenames) {
+						parser.setVariable(name, varInfo);
+					}
+					parser.scope.inTry = /** @type {boolean} */ (inTry);
+					if (fn.body.type === "BlockStatement") {
+						parser.detectMode(fn.body.body);
+						const prev = parser.prevStatement;
+						parser.preWalkStatement(fn.body);
+						parser.prevStatement = prev;
+						parser.walkStatement(fn.body);
+					} else {
+						parser.walkExpression(fn.body);
+					}
 				}
-			});
+			);
 		} else if (fn && isBoundFunctionExpression(fn)) {
 			inTry = parser.scope.inTry;
 
@@ -416,7 +420,8 @@ class AMDDefineDependencyParserPlugin {
 				/** @type {FunctionExpression} */
 				(/** @type {MemberExpression} */ (fn.callee).object);
 
-			parser.inScope(
+			parser.inFunctionScope(
+				true,
 				/** @type {Identifier[]} */
 				(object.params).filter(
 					(i) => !["require", "module", "exports"].includes(i.name)

package/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

@@ -51,7 +51,8 @@ class AMDRequireDependenciesBlockParserPlugin {
 		let bindThis = true;
 		const fnData = getFunctionExpression(expression);
 		if (fnData) {
-			parser.inScope(
+			parser.inFunctionScope(
+				true,
 				fnData.fn.params.filter(
 					(i) =>
 						!["require", "module", "exports"].includes(
@@ -305,7 +306,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 		}
 
 		if (expr.arguments.length === 1) {
-			parser.inScope([], () => {
+			parser.inFunctionScope(true, [], () => {
 				result = this.processArray(
 					parser,
 					expr,
@@ -324,7 +325,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 
 		if (expr.arguments.length === 2 || expr.arguments.length === 3) {
 			try {
-				parser.inScope([], () => {
+				parser.inFunctionScope(true, [], () => {
 					result = this.processArray(
 						parser,
 						expr,

package/lib/dependencies/CommonJsExportRequireDependency.js

@@ -10,7 +10,7 @@ const { UsageState } = require("../ExportsInfo");
 const Template = require("../Template");
 const { equals } = require("../util/ArrayHelpers");
 const makeSerializable = require("../util/makeSerializable");
-const propertyAccess = require("../util/propertyAccess");
+const { propertyAccess } = require("../util/property");
 const { handleDependencyBase } = require("./CommonJsDependencyHelpers");
 const ModuleDependency = require("./ModuleDependency");
 const processExportInfo = require("./processExportInfo");
@@ -32,7 +32,9 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 /** @typedef {import("./CommonJsDependencyHelpers").CommonJSDependencyBaseKeywords} CommonJSDependencyBaseKeywords */
 
-const idsSymbol = Symbol("CommonJsExportRequireDependency.ids");
+const idsSymbol = /** @type {symbol} */ (
+	Symbol("CommonJsExportRequireDependency.ids")
+);
 
 const EMPTY_OBJECT = {};
 

package/lib/dependencies/CommonJsExportsDependency.js

@@ -7,7 +7,7 @@
 
 const InitFragment = require("../InitFragment");
 const makeSerializable = require("../util/makeSerializable");
-const propertyAccess = require("../util/propertyAccess");
+const { propertyAccess } = require("../util/property");
 const { handleDependencyBase } = require("./CommonJsDependencyHelpers");
 const NullDependency = require("./NullDependency");
 

package/lib/dependencies/CommonJsExportsParserPlugin.js

@@ -8,7 +8,7 @@
 const RuntimeGlobals = require("../RuntimeGlobals");
 const formatLocation = require("../formatLocation");
 const { evaluateToString } = require("../javascript/JavascriptParserHelpers");
-const propertyAccess = require("../util/propertyAccess");
+const { propertyAccess } = require("../util/property");
 const CommonJsExportRequireDependency = require("./CommonJsExportRequireDependency");
 const CommonJsExportsDependency = require("./CommonJsExportsDependency");
 const CommonJsSelfReferenceDependency = require("./CommonJsSelfReferenceDependency");

package/lib/dependencies/CommonJsFullRequireDependency.js

@@ -9,7 +9,7 @@ const Template = require("../Template");
 const { equals } = require("../util/ArrayHelpers");
 const { getTrimmedIdsAndRange } = require("../util/chainedImports");
 const makeSerializable = require("../util/makeSerializable");
-const propertyAccess = require("../util/propertyAccess");
+const { propertyAccess } = require("../util/property");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */

package/lib/dependencies/CommonJsImportsParserPlugin.js

@@ -14,6 +14,7 @@ const {
 	expressionIsUnsupported,
 	toConstantDependency
 } = require("../javascript/JavascriptParserHelpers");
+const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
 const CommonJsFullRequireDependency = require("./CommonJsFullRequireDependency");
 const CommonJsRequireContextDependency = require("./CommonJsRequireContextDependency");
 const CommonJsRequireDependency = require("./CommonJsRequireDependency");
@@ -31,6 +32,7 @@ const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency
 /** @typedef {import("estree").NewExpression} NewExpression */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser").ImportSource} ImportSource */
@@ -47,6 +49,48 @@ const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency
 
 const PLUGIN_NAME = "CommonJsImportsParserPlugin";
 
+/**
+ * @param {Expression} expression expression
+ * @returns {boolean} true, when expression is `require(...)` or `module.require(...)`
+ */
+const isRequireCallExpression = (expression) => {
+	if (expression.type !== "CallExpression") return false;
+	const { callee } = expression;
+	if (callee.type === "Identifier") {
+		return callee.name === "require";
+	}
+	if (callee.type === "MemberExpression" && !callee.computed) {
+		const object = callee.object;
+		const property = callee.property;
+		return (
+			object.type === "Identifier" &&
+			object.name === "module" &&
+			property.type === "Identifier" &&
+			property.name === "require"
+		);
+	}
+	return false;
+};
+
+/**
+ * @param {JavascriptParser} parser parser
+ * @param {CallExpression | NewExpression} expr expression
+ * @returns {RawReferencedExports | null} referenced exports from destructuring
+ */
+const getRequireReferencedExportsFromDestructuring = (parser, expr) => {
+	const referencedPropertiesInDestructuring =
+		parser.destructuringAssignmentPropertiesFor(expr);
+	if (!referencedPropertiesInDestructuring) return null;
+
+	/** @type {RawReferencedExports} */
+	const referencedExports = [];
+	traverseDestructuringAssignmentProperties(
+		referencedPropertiesInDestructuring,
+		(stack) => referencedExports.push(stack.map((p) => p.id))
+	);
+	return referencedExports;
+};
+
 /**
  * @param {JavascriptParser} parser parser
  * @returns {(expr: Expression) => boolean} handler
@@ -101,10 +145,15 @@ const createRequireCallHandler = (parser, options, getContext) => {
 	 */
 	const processRequireItem = (expr, param) => {
 		if (param.isString()) {
+			const referencedExports = getRequireReferencedExportsFromDestructuring(
+				parser,
+				expr
+			);
 			const dep = new CommonJsRequireDependency(
 				/** @type {string} */ (param.string),
 				/** @type {Range} */ (param.range),
-				getContext()
+				getContext(),
+				referencedExports
 			);
 			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			dep.optional = Boolean(parser.scope.inTry);
@@ -118,6 +167,10 @@ const createRequireCallHandler = (parser, options, getContext) => {
 	 * @returns {boolean | void} true when handled
 	 */
 	const processRequireContext = (expr, param) => {
+		const referencedExports = getRequireReferencedExportsFromDestructuring(
+			parser,
+			expr
+		);
 		const dep = ContextDependencyHelpers.create(
 			CommonJsRequireContextDependency,
 			/** @type {Range} */ (expr.range),
@@ -125,7 +178,8 @@ const createRequireCallHandler = (parser, options, getContext) => {
 			expr,
 			options,
 			{
-				category: "commonjs"
+				category: "commonjs",
+				referencedExports
 			},
 			parser,
 			undefined,
@@ -353,6 +407,13 @@ class CommonJsImportsParserPlugin {
 	 */
 	apply(parser) {
 		const options = this.options;
+		parser.hooks.collectDestructuringAssignmentProperties.tap(
+			PLUGIN_NAME,
+			(expr) => {
+				if (isRequireCallExpression(expr)) return true;
+			}
+		);
+
 		const getContext = () => {
 			if (parser.currentTagData) {
 				const { context } =