webpack 5.99.9 → 5.100.0

package/lib/dependencies/CommonJsImportsParserPlugin.js

@@ -42,6 +42,8 @@ const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency
 const createRequireSpecifierTag = Symbol("createRequire");
 const createdRequireIdentifierTag = Symbol("createRequire()");
 
+const PLUGIN_NAME = "CommonJsImportsParserPlugin";
+
 class CommonJsImportsParserPlugin {
 	/**
 	 * @param {JavascriptParserOptions} options parser options
@@ -73,16 +75,16 @@ class CommonJsImportsParserPlugin {
 			parser.hooks.typeof
 				.for(expression)
 				.tap(
-					"CommonJsImportsParserPlugin",
+					PLUGIN_NAME,
 					toConstantDependency(parser, JSON.stringify("function"))
 				);
 			parser.hooks.evaluateTypeof
 				.for(expression)
-				.tap("CommonJsImportsParserPlugin", evaluateToString("function"));
+				.tap(PLUGIN_NAME, evaluateToString("function"));
 			parser.hooks.evaluateIdentifier
 				.for(expression)
 				.tap(
-					"CommonJsImportsParserPlugin",
+					PLUGIN_NAME,
 					evaluateToIdentifier(expression, "require", getMembers, true)
 				);
 		};
@@ -93,12 +95,12 @@ class CommonJsImportsParserPlugin {
 			parser.hooks.typeof
 				.for(tag)
 				.tap(
-					"CommonJsImportsParserPlugin",
+					PLUGIN_NAME,
 					toConstantDependency(parser, JSON.stringify("function"))
 				);
 			parser.hooks.evaluateTypeof
 				.for(tag)
-				.tap("CommonJsImportsParserPlugin", evaluateToString("function"));
+				.tap(PLUGIN_NAME, evaluateToString("function"));
 		};
 		tapRequireExpression("require", () => []);
 		tapRequireExpression("require.resolve", () => ["resolve"]);
@@ -106,21 +108,19 @@ class CommonJsImportsParserPlugin {
 		// #endregion
 
 		// Weird stuff //
-		parser.hooks.assign
-			.for("require")
-			.tap("CommonJsImportsParserPlugin", expr => {
-				// to not leak to global "require", we need to define a local require here.
-				const dep = new ConstDependency("var require;", 0);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
-				parser.state.module.addPresentationalDependency(dep);
-				return true;
-			});
+		parser.hooks.assign.for("require").tap(PLUGIN_NAME, expr => {
+			// to not leak to global "require", we need to define a local require here.
+			const dep = new ConstDependency("var require;", 0);
+			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			parser.state.module.addPresentationalDependency(dep);
+			return true;
+		});
 
 		// #region Unsupported
 		parser.hooks.expression
 			.for("require.main")
 			.tap(
-				"CommonJsImportsParserPlugin",
+				PLUGIN_NAME,
 				expressionIsUnsupported(
 					parser,
 					"require.main is not supported by webpack."
@@ -129,7 +129,7 @@ class CommonJsImportsParserPlugin {
 		parser.hooks.call
 			.for("require.main.require")
 			.tap(
-				"CommonJsImportsParserPlugin",
+				PLUGIN_NAME,
 				expressionIsUnsupported(
 					parser,
 					"require.main.require is not supported by webpack."
@@ -138,7 +138,7 @@ class CommonJsImportsParserPlugin {
 		parser.hooks.expression
 			.for("module.parent.require")
 			.tap(
-				"CommonJsImportsParserPlugin",
+				PLUGIN_NAME,
 				expressionIsUnsupported(
 					parser,
 					"module.parent.require is not supported by webpack."
@@ -147,7 +147,7 @@ class CommonJsImportsParserPlugin {
 		parser.hooks.call
 			.for("module.parent.require")
 			.tap(
-				"CommonJsImportsParserPlugin",
+				PLUGIN_NAME,
 				expressionIsUnsupported(
 					parser,
 					"module.parent.require is not supported by webpack."
@@ -170,12 +170,8 @@ class CommonJsImportsParserPlugin {
 			parser.state.module.addPresentationalDependency(dep);
 			return false;
 		};
-		parser.hooks.canRename
-			.for("require")
-			.tap("CommonJsImportsParserPlugin", () => true);
-		parser.hooks.rename
-			.for("require")
-			.tap("CommonJsImportsParserPlugin", defineUndefined);
+		parser.hooks.canRename.for("require").tap(PLUGIN_NAME, () => true);
+		parser.hooks.rename.for("require").tap(PLUGIN_NAME, defineUndefined);
 		// #endregion
 
 		// #region Inspection
@@ -189,9 +185,7 @@ class CommonJsImportsParserPlugin {
 			]
 		);
 
-		parser.hooks.expression
-			.for("require.cache")
-			.tap("CommonJsImportsParserPlugin", requireCache);
+		parser.hooks.expression.for("require.cache").tap(PLUGIN_NAME, requireCache);
 		// #endregion
 
 		// #region Require as expression
@@ -222,7 +216,7 @@ class CommonJsImportsParserPlugin {
 		};
 		parser.hooks.expression
 			.for("require")
-			.tap("CommonJsImportsParserPlugin", requireAsExpressionHandler);
+			.tap(PLUGIN_NAME, requireAsExpressionHandler);
 		// #endregion
 
 		// #region Require
@@ -357,16 +351,16 @@ class CommonJsImportsParserPlugin {
 		};
 		parser.hooks.call
 			.for("require")
-			.tap("CommonJsImportsParserPlugin", createRequireHandler(false));
+			.tap(PLUGIN_NAME, createRequireHandler(false));
 		parser.hooks.new
 			.for("require")
-			.tap("CommonJsImportsParserPlugin", createRequireHandler(true));
+			.tap(PLUGIN_NAME, createRequireHandler(true));
 		parser.hooks.call
 			.for("module.require")
-			.tap("CommonJsImportsParserPlugin", createRequireHandler(false));
+			.tap(PLUGIN_NAME, createRequireHandler(false));
 		parser.hooks.new
 			.for("module.require")
-			.tap("CommonJsImportsParserPlugin", createRequireHandler(true));
+			.tap(PLUGIN_NAME, createRequireHandler(true));
 		// #endregion
 
 		// #region Require with property access
@@ -446,16 +440,16 @@ class CommonJsImportsParserPlugin {
 		};
 		parser.hooks.memberChainOfCallMemberChain
 			.for("require")
-			.tap("CommonJsImportsParserPlugin", chainHandler);
+			.tap(PLUGIN_NAME, chainHandler);
 		parser.hooks.memberChainOfCallMemberChain
 			.for("module.require")
-			.tap("CommonJsImportsParserPlugin", chainHandler);
+			.tap(PLUGIN_NAME, chainHandler);
 		parser.hooks.callMemberChainOfCallMemberChain
 			.for("require")
-			.tap("CommonJsImportsParserPlugin", callChainHandler);
+			.tap(PLUGIN_NAME, callChainHandler);
 		parser.hooks.callMemberChainOfCallMemberChain
 			.for("module.require")
-			.tap("CommonJsImportsParserPlugin", callChainHandler);
+			.tap(PLUGIN_NAME, callChainHandler);
 		// #endregion
 
 		// #region Require.resolve
@@ -573,10 +567,10 @@ class CommonJsImportsParserPlugin {
 
 		parser.hooks.call
 			.for("require.resolve")
-			.tap("CommonJsImportsParserPlugin", expr => processResolve(expr, false));
+			.tap(PLUGIN_NAME, expr => processResolve(expr, false));
 		parser.hooks.call
 			.for("require.resolveWeak")
-			.tap("CommonJsImportsParserPlugin", expr => processResolve(expr, true));
+			.tap(PLUGIN_NAME, expr => processResolve(expr, true));
 		// #endregion
 
 		// #region Create require
@@ -613,7 +607,7 @@ class CommonJsImportsParserPlugin {
 		tapRequireExpressionTag(createRequireSpecifierTag);
 		parser.hooks.evaluateCallExpression
 			.for(createRequireSpecifierTag)
-			.tap("CommonJsImportsParserPlugin", expr => {
+			.tap(PLUGIN_NAME, expr => {
 				const context = parseCreateRequireArguments(expr);
 				if (context === undefined) return;
 				const ident = parser.evaluatedVariable({
@@ -629,7 +623,7 @@ class CommonJsImportsParserPlugin {
 			});
 		parser.hooks.unhandledExpressionMemberChain
 			.for(createdRequireIdentifierTag)
-			.tap("CommonJsImportsParserPlugin", (expr, members) =>
+			.tap(PLUGIN_NAME, (expr, members) =>
 				expressionIsUnsupported(
 					parser,
 					`createRequire().${members.join(".")} is not supported by webpack.`
@@ -637,19 +631,19 @@ class CommonJsImportsParserPlugin {
 			);
 		parser.hooks.canRename
 			.for(createdRequireIdentifierTag)
-			.tap("CommonJsImportsParserPlugin", () => true);
+			.tap(PLUGIN_NAME, () => true);
 		parser.hooks.canRename
 			.for(createRequireSpecifierTag)
-			.tap("CommonJsImportsParserPlugin", () => true);
+			.tap(PLUGIN_NAME, () => true);
 		parser.hooks.rename
 			.for(createRequireSpecifierTag)
-			.tap("CommonJsImportsParserPlugin", defineUndefined);
+			.tap(PLUGIN_NAME, defineUndefined);
 		parser.hooks.expression
 			.for(createdRequireIdentifierTag)
-			.tap("CommonJsImportsParserPlugin", requireAsExpressionHandler);
+			.tap(PLUGIN_NAME, requireAsExpressionHandler);
 		parser.hooks.call
 			.for(createdRequireIdentifierTag)
-			.tap("CommonJsImportsParserPlugin", createRequireHandler(false));
+			.tap(PLUGIN_NAME, createRequireHandler(false));
 		/**
 		 * @param {CallExpression} expr call expression
 		 * @returns {string | void} context
@@ -683,7 +677,7 @@ class CommonJsImportsParserPlugin {
 
 		parser.hooks.import.tap(
 			{
-				name: "CommonJsImportsParserPlugin",
+				name: PLUGIN_NAME,
 				stage: -10
 			},
 			(statement, source) => {
@@ -693,8 +687,9 @@ class CommonJsImportsParserPlugin {
 					statement.specifiers[0].type !== "ImportSpecifier" ||
 					statement.specifiers[0].imported.type !== "Identifier" ||
 					statement.specifiers[0].imported.name !== specifierName
-				)
+				) {
 					return;
+				}
 				// clear for 'import { createRequire as x } from "module"'
 				// if any other specifier was used import module
 				const clearDep = new ConstDependency(
@@ -711,7 +706,7 @@ class CommonJsImportsParserPlugin {
 		);
 		parser.hooks.importSpecifier.tap(
 			{
-				name: "CommonJsImportsParserPlugin",
+				name: PLUGIN_NAME,
 				stage: -10
 			},
 			(statement, source, id, name) => {
@@ -720,70 +715,62 @@ class CommonJsImportsParserPlugin {
 				return true;
 			}
 		);
-		parser.hooks.preDeclarator.tap(
-			"CommonJsImportsParserPlugin",
-			declarator => {
-				if (
-					declarator.id.type !== "Identifier" ||
-					!declarator.init ||
-					declarator.init.type !== "CallExpression" ||
-					declarator.init.callee.type !== "Identifier"
-				)
-					return;
-				const variableInfo = parser.getVariableInfo(
-					declarator.init.callee.name
-				);
-				if (
-					variableInfo instanceof VariableInfo &&
-					variableInfo.tagInfo &&
-					variableInfo.tagInfo.tag === createRequireSpecifierTag
-				) {
-					const context = parseCreateRequireArguments(declarator.init);
-					if (context === undefined) return;
-					parser.tagVariable(declarator.id.name, createdRequireIdentifierTag, {
-						name: declarator.id.name,
-						context
-					});
-					return true;
-				}
+		parser.hooks.preDeclarator.tap(PLUGIN_NAME, declarator => {
+			if (
+				declarator.id.type !== "Identifier" ||
+				!declarator.init ||
+				declarator.init.type !== "CallExpression" ||
+				declarator.init.callee.type !== "Identifier"
+			) {
+				return;
 			}
-		);
+			const variableInfo = parser.getVariableInfo(declarator.init.callee.name);
+			if (
+				variableInfo instanceof VariableInfo &&
+				variableInfo.tagInfo &&
+				variableInfo.tagInfo.tag === createRequireSpecifierTag
+			) {
+				const context = parseCreateRequireArguments(declarator.init);
+				if (context === undefined) return;
+				parser.tagVariable(declarator.id.name, createdRequireIdentifierTag, {
+					name: declarator.id.name,
+					context
+				});
+				return true;
+			}
+		});
 
 		parser.hooks.memberChainOfCallMemberChain
 			.for(createRequireSpecifierTag)
-			.tap(
-				"CommonJsImportsParserPlugin",
-				(expr, calleeMembers, callExpr, members) => {
-					if (
-						calleeMembers.length !== 0 ||
-						members.length !== 1 ||
-						members[0] !== "cache"
-					)
-						return;
-					// createRequire().cache
-					const context = parseCreateRequireArguments(callExpr);
-					if (context === undefined) return;
-					return requireCache(expr);
+			.tap(PLUGIN_NAME, (expr, calleeMembers, callExpr, members) => {
+				if (
+					calleeMembers.length !== 0 ||
+					members.length !== 1 ||
+					members[0] !== "cache"
+				) {
+					return;
 				}
-			);
+				// createRequire().cache
+				const context = parseCreateRequireArguments(callExpr);
+				if (context === undefined) return;
+				return requireCache(expr);
+			});
 		parser.hooks.callMemberChainOfCallMemberChain
 			.for(createRequireSpecifierTag)
-			.tap(
-				"CommonJsImportsParserPlugin",
-				(expr, calleeMembers, innerCallExpression, members) => {
-					if (
-						calleeMembers.length !== 0 ||
-						members.length !== 1 ||
-						members[0] !== "resolve"
-					)
-						return;
-					// createRequire().resolve()
-					return processResolve(expr, false);
+			.tap(PLUGIN_NAME, (expr, calleeMembers, innerCallExpression, members) => {
+				if (
+					calleeMembers.length !== 0 ||
+					members.length !== 1 ||
+					members[0] !== "resolve"
+				) {
+					return;
 				}
-			);
+				// createRequire().resolve()
+				return processResolve(expr, false);
+			});
 		parser.hooks.expressionMemberChain
 			.for(createdRequireIdentifierTag)
-			.tap("CommonJsImportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				// require.cache
 				if (members.length === 1 && members[0] === "cache") {
 					return requireCache(expr);
@@ -791,24 +778,23 @@ class CommonJsImportsParserPlugin {
 			});
 		parser.hooks.callMemberChain
 			.for(createdRequireIdentifierTag)
-			.tap("CommonJsImportsParserPlugin", (expr, members) => {
+			.tap(PLUGIN_NAME, (expr, members) => {
 				// require.resolve()
 				if (members.length === 1 && members[0] === "resolve") {
 					return processResolve(expr, false);
 				}
 			});
-		parser.hooks.call
-			.for(createRequireSpecifierTag)
-			.tap("CommonJsImportsParserPlugin", expr => {
-				const clearDep = new ConstDependency(
-					"/* createRequire() */ undefined",
-					/** @type {Range} */ (expr.range)
-				);
-				clearDep.loc = /** @type {DependencyLocation} */ (expr.loc);
-				parser.state.module.addPresentationalDependency(clearDep);
-				return true;
-			});
+		parser.hooks.call.for(createRequireSpecifierTag).tap(PLUGIN_NAME, expr => {
+			const clearDep = new ConstDependency(
+				"/* createRequire() */ undefined",
+				/** @type {Range} */ (expr.range)
+			);
+			clearDep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			parser.state.module.addPresentationalDependency(clearDep);
+			return true;
+		});
 		// #endregion
 	}
 }
+
 module.exports = CommonJsImportsParserPlugin;

package/lib/dependencies/CommonJsPlugin.js

@@ -5,12 +5,23 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const SelfModuleFactory = require("../SelfModuleFactory");
 const Template = require("../Template");
+const {
+	evaluateToIdentifier,
+	toConstantDependency
+} = require("../javascript/JavascriptParserHelpers");
+const CommonJsExportRequireDependency = require("./CommonJsExportRequireDependency");
 const CommonJsExportsDependency = require("./CommonJsExportsDependency");
+const CommonJsExportsParserPlugin = require("./CommonJsExportsParserPlugin");
 const CommonJsFullRequireDependency = require("./CommonJsFullRequireDependency");
+const CommonJsImportsParserPlugin = require("./CommonJsImportsParserPlugin");
 const CommonJsRequireContextDependency = require("./CommonJsRequireContextDependency");
 const CommonJsRequireDependency = require("./CommonJsRequireDependency");
 const CommonJsSelfReferenceDependency = require("./CommonJsSelfReferenceDependency");
@@ -21,19 +32,6 @@ const RequireResolveDependency = require("./RequireResolveDependency");
 const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency");
 const RuntimeRequirementsDependency = require("./RuntimeRequirementsDependency");
 
-const CommonJsExportsParserPlugin = require("./CommonJsExportsParserPlugin");
-const CommonJsImportsParserPlugin = require("./CommonJsImportsParserPlugin");
-
-const {
-	JAVASCRIPT_MODULE_TYPE_AUTO,
-	JAVASCRIPT_MODULE_TYPE_DYNAMIC
-} = require("../ModuleTypeConstants");
-const {
-	evaluateToIdentifier,
-	toConstantDependency
-} = require("../javascript/JavascriptParserHelpers");
-const CommonJsExportRequireDependency = require("./CommonJsExportRequireDependency");
-
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compiler")} Compiler */
@@ -158,7 +156,7 @@ class CommonJsPlugin {
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.harmonyModuleDecorator)
-					.tap(PLUGIN_NAME, (chunk, set) => {
+					.tap(PLUGIN_NAME, (chunk, _set) => {
 						compilation.addRuntimeModule(
 							chunk,
 							new HarmonyModuleDecoratorRuntimeModule()
@@ -167,7 +165,7 @@ class CommonJsPlugin {
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.nodeModuleDecorator)
-					.tap(PLUGIN_NAME, (chunk, set) => {
+					.tap(PLUGIN_NAME, (chunk, _set) => {
 						compilation.addRuntimeModule(
 							chunk,
 							new NodeModuleDecoratorRuntimeModule()
@@ -180,8 +178,9 @@ class CommonJsPlugin {
 				 * @returns {void}
 				 */
 				const handler = (parser, parserOptions) => {
-					if (parserOptions.commonjs !== undefined && !parserOptions.commonjs)
+					if (parserOptions.commonjs !== undefined && !parserOptions.commonjs) {
 						return;
+					}
 					parser.hooks.typeof
 						.for("module")
 						.tap(

package/lib/dependencies/ContextDependencyHelpers.js

@@ -236,11 +236,12 @@ module.exports.create = (
 
 		if (parser && param.wrappedInnerExpressions) {
 			for (const part of param.wrappedInnerExpressions) {
-				if (part.expression)
+				if (part.expression) {
 					parser.walkExpression(
 						/** @type {Expression} */
 						(part.expression)
 					);
+				}
 			}
 		}
 

package/lib/dependencies/ContextDependencyTemplateAsId.js

@@ -59,4 +59,5 @@ class ContextDependencyTemplateAsId extends ContextDependency.Template {
 		}
 	}
 }
+
 module.exports = ContextDependencyTemplateAsId;

package/lib/dependencies/ContextDependencyTemplateAsRequireCall.js

@@ -56,4 +56,5 @@ class ContextDependencyTemplateAsRequireCall extends ContextDependency.Template
 		}
 	}
 }
+
 module.exports = ContextDependencyTemplateAsRequireCall;

package/lib/dependencies/CssIcssExportDependency.js

@@ -145,7 +145,7 @@ CssIcssExportDependency.Template = class CssIcssExportDependencyTemplate extends
 					.filter(Boolean)
 			);
 
-		for (const used of usedNames.concat(names)) {
+		for (const used of [...usedNames, ...names]) {
 			cssData.exports.set(used, dep.value);
 		}
 	}

package/lib/dependencies/CssLocalIdentifierDependency.js

@@ -222,7 +222,7 @@ CssLocalIdentifierDependency.Template = class CssLocalIdentifierDependencyTempla
 			(generator.convention)
 		);
 		const usedNames =
-			/** @type {(string)[]} */
+			/** @type {string[]} */
 			(
 				names
 					.map(name =>
@@ -239,7 +239,7 @@ CssLocalIdentifierDependency.Template = class CssLocalIdentifierDependencyTempla
 
 		source.replace(dep.range[0], dep.range[1] - 1, identifier);
 
-		for (const used of usedNames.concat(names)) {
+		for (const used of [...usedNames, ...names]) {
 			cssData.exports.set(used, getCssParser().unescapeIdentifier(identifier));
 		}
 	}

package/lib/dependencies/CssSelfLocalIdentifierDependency.js

@@ -63,8 +63,9 @@ class CssSelfLocalIdentifierDependency extends CssLocalIdentifierDependency {
 	 * @returns {(string[] | ReferencedExport)[]} referenced exports
 	 */
 	getReferencedExports(moduleGraph, runtime) {
-		if (this.declaredSet && !this.declaredSet.has(this.name))
+		if (this.declaredSet && !this.declaredSet.has(this.name)) {
 			return Dependency.NO_EXPORTS_REFERENCED;
+		}
 		return [[this.name]];
 	}
 

package/lib/dependencies/DynamicExports.js

@@ -42,14 +42,11 @@ module.exports.enable = parserState => {
 
 /**
  * @param {ParserState} parserState parser state
- * @returns {void}
+ * @returns {boolean} true, when enabled
  */
-module.exports.setFlagged = parserState => {
+module.exports.isEnabled = parserState => {
 	const value = parserStateExportsState.get(parserState);
-	if (value !== true) return;
-	const buildMeta = /** @type {BuildMeta} */ (parserState.module.buildMeta);
-	if (buildMeta.exportsType === "dynamic") return;
-	buildMeta.exportsType = "flagged";
+	return value === true;
 };
 
 /**
@@ -65,9 +62,12 @@ module.exports.setDynamic = parserState => {
 
 /**
  * @param {ParserState} parserState parser state
- * @returns {boolean} true, when enabled
+ * @returns {void}
  */
-module.exports.isEnabled = parserState => {
+module.exports.setFlagged = parserState => {
 	const value = parserStateExportsState.get(parserState);
-	return value === true;
+	if (value !== true) return;
+	const buildMeta = /** @type {BuildMeta} */ (parserState.module.buildMeta);
+	if (buildMeta.exportsType === "dynamic") return;
+	buildMeta.exportsType = "flagged";
 };

package/lib/dependencies/ExportsInfoDependency.js

@@ -49,7 +49,7 @@ const getProperty = (moduleGraph, module, _exportName, property, runtime) => {
 				) {
 					return usedExports;
 				}
-				return Array.from(usedExports).sort();
+				return [...usedExports].sort();
 			}
 		}
 	}