webpack 5.97.1 → 5.104.1

package/lib/CompatibilityPlugin.js

@@ -16,9 +16,23 @@ const ConstDependency = require("./dependencies/ConstDependency");
 /** @typedef {import("estree").CallExpression} CallExpression */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("./dependencies/ContextDependency")} ContextDependency */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("./javascript/JavascriptParser").Range} Range */
 
+/**
+ * @typedef {object} CompatibilitySettingsDeclaration
+ * @property {boolean} updated
+ * @property {DependencyLocation} loc
+ * @property {Range} range
+ */
+
+/**
+ * @typedef {object} CompatibilitySettings
+ * @property {string} name
+ * @property {CompatibilitySettingsDeclaration} declaration
+ */
+
 const nestedWebpackIdentifierTag = Symbol("nested webpack identifier");
 const PLUGIN_NAME = "CompatibilityPlugin";
 
@@ -43,8 +57,9 @@ class CompatibilityPlugin {
 						if (
 							parserOptions.browserify !== undefined &&
 							!parserOptions.browserify
-						)
+						) {
 							return;
+						}
 
 						parser.hooks.call.for("require").tap(
 							PLUGIN_NAME,
@@ -52,7 +67,7 @@ class CompatibilityPlugin {
 							 * @param {CallExpression} expr call expression
 							 * @returns {boolean | void} true when need to handle
 							 */
-							expr => {
+							(expr) => {
 								// support for browserify style require delegator: "require(o, !0)"
 								if (expr.arguments.length !== 2) return;
 								const second = parser.evaluateExpression(expr.arguments[1]);
@@ -65,17 +80,21 @@ class CompatibilityPlugin {
 								dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 								if (parser.state.current.dependencies.length > 0) {
 									const last =
-										parser.state.current.dependencies[
-											parser.state.current.dependencies.length - 1
-										];
+										/** @type {ContextDependency} */
+										(
+											parser.state.current.dependencies[
+												parser.state.current.dependencies.length - 1
+											]
+										);
 									if (
 										last.critical &&
 										last.options &&
 										last.options.request === "." &&
 										last.userRequest === "." &&
 										last.options.recursive
-									)
+									) {
 										parser.state.current.dependencies.pop();
+									}
 								}
 								parser.state.module.addPresentationalDependency(dep);
 								return true;
@@ -87,16 +106,17 @@ class CompatibilityPlugin {
 				 * @param {JavascriptParser} parser the parser
 				 * @returns {void}
 				 */
-				const handler = parser => {
+				const handler = (parser) => {
 					// Handle nested requires
-					parser.hooks.preStatement.tap(PLUGIN_NAME, statement => {
+					parser.hooks.preStatement.tap(PLUGIN_NAME, (statement) => {
 						if (
 							statement.type === "FunctionDeclaration" &&
 							statement.id &&
 							statement.id.name === RuntimeGlobals.require
 						) {
 							const newName = `__nested_webpack_require_${
-								/** @type {Range} */ (statement.range)[0]
+								/** @type {Range} */
+								(statement.range)[0]
 							}__`;
 							parser.tagVariable(
 								statement.id.name,
@@ -105,8 +125,8 @@ class CompatibilityPlugin {
 									name: newName,
 									declaration: {
 										updated: false,
-										loc: statement.id.loc,
-										range: statement.id.range
+										loc: /** @type {DependencyLocation} */ (statement.id.loc),
+										range: /** @type {Range} */ (statement.id.range)
 									}
 								}
 							);
@@ -115,7 +135,7 @@ class CompatibilityPlugin {
 					});
 					parser.hooks.pattern
 						.for(RuntimeGlobals.require)
-						.tap(PLUGIN_NAME, pattern => {
+						.tap(PLUGIN_NAME, (pattern) => {
 							const newName = `__nested_webpack_require_${
 								/** @type {Range} */ (pattern.range)[0]
 							}__`;
@@ -123,29 +143,56 @@ class CompatibilityPlugin {
 								name: newName,
 								declaration: {
 									updated: false,
-									loc: pattern.loc,
-									range: pattern.range
+									loc: /** @type {DependencyLocation} */ (pattern.loc),
+									range: /** @type {Range} */ (pattern.range)
 								}
 							});
-							return true;
+							if (!parser.scope.topLevelScope) {
+								return true;
+							}
 						});
 					parser.hooks.pattern
 						.for(RuntimeGlobals.exports)
-						.tap(PLUGIN_NAME, pattern => {
+						.tap(PLUGIN_NAME, (pattern) => {
+							const newName = "__nested_webpack_exports__";
 							parser.tagVariable(pattern.name, nestedWebpackIdentifierTag, {
-								name: "__nested_webpack_exports__",
+								name: newName,
 								declaration: {
 									updated: false,
-									loc: pattern.loc,
-									range: pattern.range
+									loc: /** @type {DependencyLocation} */ (pattern.loc),
+									range: /** @type {Range} */ (pattern.range)
 								}
 							});
 							return true;
 						});
+					// Update single `var __webpack_require__ = {};` and `var __webpack_exports__ = {};` without expression
+					parser.hooks.declarator.tap(PLUGIN_NAME, (declarator) => {
+						if (
+							declarator.id.type === "Identifier" &&
+							(declarator.id.name === RuntimeGlobals.exports ||
+								declarator.id.name === RuntimeGlobals.require)
+						) {
+							const { name, declaration } =
+								/** @type {CompatibilitySettings} */ (
+									parser.getTagData(
+										declarator.id.name,
+										nestedWebpackIdentifierTag
+									)
+								);
+							if (!declaration.updated) {
+								const dep = new ConstDependency(name, declaration.range);
+								dep.loc = declaration.loc;
+								parser.state.module.addPresentationalDependency(dep);
+								declaration.updated = true;
+							}
+						}
+					});
 					parser.hooks.expression
 						.for(nestedWebpackIdentifierTag)
-						.tap(PLUGIN_NAME, expr => {
-							const { name, declaration } = parser.currentTagData;
+						.tap(PLUGIN_NAME, (expr) => {
+							const { name, declaration } =
+								/** @type {CompatibilitySettings} */
+								(parser.currentTagData);
 							if (!declaration.updated) {
 								const dep = new ConstDependency(name, declaration.range);
 								dep.loc = declaration.loc;
@@ -188,4 +235,6 @@ class CompatibilityPlugin {
 		);
 	}
 }
+
 module.exports = CompatibilityPlugin;
+module.exports.nestedWebpackIdentifierTag = nestedWebpackIdentifierTag;