webpack 5.77.0 → 5.78.0

package/lib/APIPlugin.js

@@ -5,6 +5,11 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM
+} = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const WebpackError = require("./WebpackError");
 const ConstDependency = require("./dependencies/ConstDependency");
@@ -113,6 +118,8 @@ const REPLACEMENTS = {
 };
 /* eslint-enable camelcase */
 
+const PLUGIN_NAME = "APIPlugin";
+
 class APIPlugin {
 	/**
 	 * Apply the plugin
@@ -121,7 +128,7 @@ class APIPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"APIPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyTemplates.set(
 					ConstDependency,
@@ -130,7 +137,7 @@ class APIPlugin {
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.chunkName)
-					.tap("APIPlugin", chunk => {
+					.tap(PLUGIN_NAME, chunk => {
 						compilation.addRuntimeModule(
 							chunk,
 							new ChunkNameRuntimeModule(chunk.name)
@@ -140,7 +147,7 @@ class APIPlugin {
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.getFullHash)
-					.tap("APIPlugin", (chunk, set) => {
+					.tap(PLUGIN_NAME, (chunk, set) => {
 						compilation.addRuntimeModule(chunk, new GetFullHashRuntimeModule());
 						return true;
 					});
@@ -154,11 +161,11 @@ class APIPlugin {
 						parser.hooks.expression
 							.for(key)
 							.tap(
-								"APIPlugin",
+								PLUGIN_NAME,
 								toConstantDependency(parser, info.expr, info.req)
 							);
 						if (info.assign === false) {
-							parser.hooks.assign.for(key).tap("APIPlugin", expr => {
+							parser.hooks.assign.for(key).tap(PLUGIN_NAME, expr => {
 								const err = new WebpackError(`${key} must not be assigned`);
 								err.loc = expr.loc;
 								throw err;
@@ -167,13 +174,13 @@ class APIPlugin {
 						if (info.type) {
 							parser.hooks.evaluateTypeof
 								.for(key)
-								.tap("APIPlugin", evaluateToString(info.type));
+								.tap(PLUGIN_NAME, evaluateToString(info.type));
 						}
 					});
 
 					parser.hooks.expression
 						.for("__webpack_layer__")
-						.tap("APIPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							const dep = new ConstDependency(
 								JSON.stringify(parser.state.module.layer),
 								expr.range
@@ -184,7 +191,7 @@ class APIPlugin {
 						});
 					parser.hooks.evaluateIdentifier
 						.for("__webpack_layer__")
-						.tap("APIPlugin", expr =>
+						.tap(PLUGIN_NAME, expr =>
 							(parser.state.module.layer === null
 								? new BasicEvaluatedExpression().setNull()
 								: new BasicEvaluatedExpression().setString(
@@ -194,7 +201,7 @@ class APIPlugin {
 						);
 					parser.hooks.evaluateTypeof
 						.for("__webpack_layer__")
-						.tap("APIPlugin", expr =>
+						.tap(PLUGIN_NAME, expr =>
 							new BasicEvaluatedExpression()
 								.setString(
 									parser.state.module.layer === null ? "object" : "string"
@@ -204,7 +211,7 @@ class APIPlugin {
 
 					parser.hooks.expression
 						.for("__webpack_module__.id")
-						.tap("APIPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							parser.state.module.buildInfo.moduleConcatenationBailout =
 								"__webpack_module__.id";
 							const dep = new ConstDependency(
@@ -219,7 +226,7 @@ class APIPlugin {
 
 					parser.hooks.expression
 						.for("__webpack_module__")
-						.tap("APIPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							parser.state.module.buildInfo.moduleConcatenationBailout =
 								"__webpack_module__";
 							const dep = new ConstDependency(
@@ -233,18 +240,18 @@ class APIPlugin {
 						});
 					parser.hooks.evaluateTypeof
 						.for("__webpack_module__")
-						.tap("APIPlugin", evaluateToString("object"));
+						.tap(PLUGIN_NAME, evaluateToString("object"));
 				};
 
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("APIPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("APIPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("APIPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_ESM)
+					.tap(PLUGIN_NAME, handler);
 			}
 		);
 	}

package/lib/CompatibilityPlugin.js

@@ -5,12 +5,18 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM
+} = require("./ModuleTypeConstants");
 const ConstDependency = require("./dependencies/ConstDependency");
 
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
 
 const nestedWebpackRequireTag = Symbol("nested __webpack_require__");
+const PLUGIN_NAME = "CompatibilityPlugin";
 
 class CompatibilityPlugin {
 	/**
@@ -20,7 +26,7 @@ class CompatibilityPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"CompatibilityPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyTemplates.set(
 					ConstDependency,
@@ -28,41 +34,39 @@ class CompatibilityPlugin {
 				);
 
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("CompatibilityPlugin", (parser, parserOptions) => {
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, (parser, parserOptions) => {
 						if (
 							parserOptions.browserify !== undefined &&
 							!parserOptions.browserify
 						)
 							return;
 
-						parser.hooks.call
-							.for("require")
-							.tap("CompatibilityPlugin", expr => {
-								// support for browserify style require delegator: "require(o, !0)"
-								if (expr.arguments.length !== 2) return;
-								const second = parser.evaluateExpression(expr.arguments[1]);
-								if (!second.isBoolean()) return;
-								if (second.asBool() !== true) return;
-								const dep = new ConstDependency("require", expr.callee.range);
-								dep.loc = expr.loc;
-								if (parser.state.current.dependencies.length > 0) {
-									const last =
-										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;
-							});
+						parser.hooks.call.for("require").tap(PLUGIN_NAME, expr => {
+							// support for browserify style require delegator: "require(o, !0)"
+							if (expr.arguments.length !== 2) return;
+							const second = parser.evaluateExpression(expr.arguments[1]);
+							if (!second.isBoolean()) return;
+							if (second.asBool() !== true) return;
+							const dep = new ConstDependency("require", expr.callee.range);
+							dep.loc = expr.loc;
+							if (parser.state.current.dependencies.length > 0) {
+								const last =
+									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;
+						});
 					});
 
 				/**
@@ -71,7 +75,7 @@ class CompatibilityPlugin {
 				 */
 				const handler = parser => {
 					// Handle nested requires
-					parser.hooks.preStatement.tap("CompatibilityPlugin", statement => {
+					parser.hooks.preStatement.tap(PLUGIN_NAME, statement => {
 						if (
 							statement.type === "FunctionDeclaration" &&
 							statement.id &&
@@ -91,7 +95,7 @@ class CompatibilityPlugin {
 					});
 					parser.hooks.pattern
 						.for("__webpack_require__")
-						.tap("CompatibilityPlugin", pattern => {
+						.tap(PLUGIN_NAME, pattern => {
 							const newName = `__nested_webpack_require_${pattern.range[0]}__`;
 							parser.tagVariable(pattern.name, nestedWebpackRequireTag, {
 								name: newName,
@@ -105,7 +109,7 @@ class CompatibilityPlugin {
 						});
 					parser.hooks.expression
 						.for(nestedWebpackRequireTag)
-						.tap("CompatibilityPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							const { name, declaration } = parser.currentTagData;
 							if (!declaration.updated) {
 								const dep = new ConstDependency(name, declaration.range);
@@ -120,31 +124,28 @@ class CompatibilityPlugin {
 						});
 
 					// Handle hashbang
-					parser.hooks.program.tap(
-						"CompatibilityPlugin",
-						(program, comments) => {
-							if (comments.length === 0) return;
-							const c = comments[0];
-							if (c.type === "Line" && c.range[0] === 0) {
-								if (parser.state.source.slice(0, 2).toString() !== "#!") return;
-								// this is a hashbang comment
-								const dep = new ConstDependency("//", 0);
-								dep.loc = c.loc;
-								parser.state.module.addPresentationalDependency(dep);
-							}
+					parser.hooks.program.tap(PLUGIN_NAME, (program, comments) => {
+						if (comments.length === 0) return;
+						const c = comments[0];
+						if (c.type === "Line" && c.range[0] === 0) {
+							if (parser.state.source.slice(0, 2).toString() !== "#!") return;
+							// this is a hashbang comment
+							const dep = new ConstDependency("//", 0);
+							dep.loc = c.loc;
+							parser.state.module.addPresentationalDependency(dep);
 						}
-					);
+					});
 				};
 
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("CompatibilityPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("CompatibilityPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("CompatibilityPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_ESM)
+					.tap(PLUGIN_NAME, handler);
 			}
 		);
 	}

package/lib/ConstPlugin.js

@@ -5,6 +5,11 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM
+} = require("./ModuleTypeConstants");
 const CachedConstDependency = require("./dependencies/CachedConstDependency");
 const ConstDependency = require("./dependencies/ConstDependency");
 const { evaluateToString } = require("./javascript/JavascriptParserHelpers");
@@ -108,6 +113,8 @@ const getHoistedDeclarations = (branch, includeFunctionDeclarations) => {
 	return Array.from(declarations);
 };
 
+const PLUGIN_NAME = "ConstPlugin";
+
 class ConstPlugin {
 	/**
 	 * Apply the plugin
@@ -117,7 +124,7 @@ class ConstPlugin {
 	apply(compiler) {
 		const cachedParseResource = parseResource.bindCache(compiler.root);
 		compiler.hooks.compilation.tap(
-			"ConstPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyTemplates.set(
 					ConstDependency,
@@ -130,7 +137,7 @@ class ConstPlugin {
 				);
 
 				const handler = parser => {
-					parser.hooks.statementIf.tap("ConstPlugin", statement => {
+					parser.hooks.statementIf.tap(PLUGIN_NAME, statement => {
 						if (parser.scope.isAsmJs) return;
 						const param = parser.evaluateExpression(statement.test);
 						const bool = param.asBool();
@@ -202,7 +209,7 @@ class ConstPlugin {
 						}
 					});
 					parser.hooks.expressionConditionalOperator.tap(
-						"ConstPlugin",
+						PLUGIN_NAME,
 						expression => {
 							if (parser.scope.isAsmJs) return;
 							const param = parser.evaluateExpression(expression.test);
@@ -237,7 +244,7 @@ class ConstPlugin {
 						}
 					);
 					parser.hooks.expressionLogicalOperator.tap(
-						"ConstPlugin",
+						PLUGIN_NAME,
 						expression => {
 							if (parser.scope.isAsmJs) return;
 							if (
@@ -374,7 +381,7 @@ class ConstPlugin {
 							}
 						}
 					);
-					parser.hooks.optionalChaining.tap("ConstPlugin", expr => {
+					parser.hooks.optionalChaining.tap(PLUGIN_NAME, expr => {
 						/** @type {ExpressionNode[]} */
 						const optionalExpressionsStack = [];
 						/** @type {ExpressionNode|SuperNode} */
@@ -429,7 +436,7 @@ class ConstPlugin {
 					});
 					parser.hooks.evaluateIdentifier
 						.for("__resourceQuery")
-						.tap("ConstPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							if (parser.scope.isAsmJs) return;
 							if (!parser.state.module) return;
 							return evaluateToString(
@@ -438,7 +445,7 @@ class ConstPlugin {
 						});
 					parser.hooks.expression
 						.for("__resourceQuery")
-						.tap("ConstPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							if (parser.scope.isAsmJs) return;
 							if (!parser.state.module) return;
 							const dep = new CachedConstDependency(
@@ -455,7 +462,7 @@ class ConstPlugin {
 
 					parser.hooks.evaluateIdentifier
 						.for("__resourceFragment")
-						.tap("ConstPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							if (parser.scope.isAsmJs) return;
 							if (!parser.state.module) return;
 							return evaluateToString(
@@ -464,7 +471,7 @@ class ConstPlugin {
 						});
 					parser.hooks.expression
 						.for("__resourceFragment")
-						.tap("ConstPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							if (parser.scope.isAsmJs) return;
 							if (!parser.state.module) return;
 							const dep = new CachedConstDependency(
@@ -481,14 +488,14 @@ class ConstPlugin {
 				};
 
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("ConstPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("ConstPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("ConstPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_ESM)
+					.tap(PLUGIN_NAME, handler);
 			}
 		);
 	}

package/lib/ContextModule.js

@@ -9,6 +9,7 @@ const { OriginalSource, RawSource } = require("webpack-sources");
 const AsyncDependenciesBlock = require("./AsyncDependenciesBlock");
 const { makeWebpackError } = require("./HookWebpackError");
 const Module = require("./Module");
+const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const Template = require("./Template");
 const WebpackError = require("./WebpackError");
@@ -105,7 +106,7 @@ class ContextModule extends Module {
 			const resourceFragment =
 				(options && options.resourceFragment) || parsed.fragment;
 
-			super("javascript/dynamic", resource);
+			super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, resource);
 			/** @type {ContextModuleOptions} */
 			this.options = {
 				...options,
@@ -114,7 +115,7 @@ class ContextModule extends Module {
 				resourceFragment
 			};
 		} else {
-			super("javascript/dynamic");
+			super(JAVASCRIPT_MODULE_TYPE_DYNAMIC);
 			/** @type {ContextModuleOptions} */
 			this.options = {
 				...options,

package/lib/DefinePlugin.js

@@ -5,10 +5,16 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_ESM,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const WebpackError = require("./WebpackError");
 const ConstDependency = require("./dependencies/ConstDependency");
 const BasicEvaluatedExpression = require("./javascript/BasicEvaluatedExpression");
+
 const {
 	evaluateToString,
 	toConstantDependency
@@ -249,8 +255,12 @@ const toCacheVersion = code => {
 	return code + "";
 };
 
-const VALUE_DEP_PREFIX = "webpack/DefinePlugin ";
-const VALUE_DEP_MAIN = "webpack/DefinePlugin_hash";
+const PLUGIN_NAME = "DefinePlugin";
+const VALUE_DEP_PREFIX = `webpack/${PLUGIN_NAME} `;
+const VALUE_DEP_MAIN = `webpack/${PLUGIN_NAME}_hash`;
+const TYPEOF_OPERATOR_REGEXP = /^typeof\s+/;
+const WEBPACK_REQUIRE_FUNCTION_REGEXP = /__webpack_require__\s*(!?\.)/;
+const WEBPACK_REQUIRE_IDENTIFIER_REGEXP = /__webpack_require__/;
 
 class DefinePlugin {
 	/**
@@ -278,7 +288,7 @@ class DefinePlugin {
 	apply(compiler) {
 		const definitions = this.definitions;
 		compiler.hooks.compilation.tap(
-			"DefinePlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyTemplates.set(
 					ConstDependency,
@@ -300,7 +310,7 @@ class DefinePlugin {
 				 */
 				const handler = parser => {
 					const mainValue = compilation.valueCacheVersions.get(VALUE_DEP_MAIN);
-					parser.hooks.program.tap("DefinePlugin", () => {
+					parser.hooks.program.tap(PLUGIN_NAME, () => {
 						const { buildInfo } = parser.state.module;
 						if (!buildInfo.valueDependencies)
 							buildInfo.valueDependencies = new Map();
@@ -356,7 +366,7 @@ class DefinePlugin {
 						const splittedKey = key.split(".");
 						splittedKey.slice(1).forEach((_, i) => {
 							const fullKey = prefix + splittedKey.slice(0, i + 1).join(".");
-							parser.hooks.canRename.for(fullKey).tap("DefinePlugin", () => {
+							parser.hooks.canRename.for(fullKey).tap(PLUGIN_NAME, () => {
 								addValueDependency(key);
 								return true;
 							});
@@ -371,18 +381,18 @@ class DefinePlugin {
 					 */
 					const applyDefine = (key, code) => {
 						const originalKey = key;
-						const isTypeof = /^typeof\s+/.test(key);
-						if (isTypeof) key = key.replace(/^typeof\s+/, "");
+						const isTypeof = TYPEOF_OPERATOR_REGEXP.test(key);
+						if (isTypeof) key = key.replace(TYPEOF_OPERATOR_REGEXP, "");
 						let recurse = false;
 						let recurseTypeof = false;
 						if (!isTypeof) {
-							parser.hooks.canRename.for(key).tap("DefinePlugin", () => {
+							parser.hooks.canRename.for(key).tap(PLUGIN_NAME, () => {
 								addValueDependency(originalKey);
 								return true;
 							});
 							parser.hooks.evaluateIdentifier
 								.for(key)
-								.tap("DefinePlugin", expr => {
+								.tap(PLUGIN_NAME, expr => {
 									/**
 									 * this is needed in case there is a recursion in the DefinePlugin
 									 * to prevent an endless recursion
@@ -408,7 +418,7 @@ class DefinePlugin {
 									res.setRange(expr.range);
 									return res;
 								});
-							parser.hooks.expression.for(key).tap("DefinePlugin", expr => {
+							parser.hooks.expression.for(key).tap(PLUGIN_NAME, expr => {
 								addValueDependency(originalKey);
 								const strCode = toCode(
 									code,
@@ -418,11 +428,11 @@ class DefinePlugin {
 									runtimeTemplate,
 									!parser.isAsiPosition(expr.range[0])
 								);
-								if (/__webpack_require__\s*(!?\.)/.test(strCode)) {
+								if (WEBPACK_REQUIRE_FUNCTION_REGEXP.test(strCode)) {
 									return toConstantDependency(parser, strCode, [
 										RuntimeGlobals.require
 									])(expr);
-								} else if (/__webpack_require__/.test(strCode)) {
+								} else if (WEBPACK_REQUIRE_IDENTIFIER_REGEXP.test(strCode)) {
 									return toConstantDependency(parser, strCode, [
 										RuntimeGlobals.requireScope
 									])(expr);
@@ -431,7 +441,7 @@ class DefinePlugin {
 								}
 							});
 						}
-						parser.hooks.evaluateTypeof.for(key).tap("DefinePlugin", expr => {
+						parser.hooks.evaluateTypeof.for(key).tap(PLUGIN_NAME, expr => {
 							/**
 							 * this is needed in case there is a recursion in the DefinePlugin
 							 * to prevent an endless recursion
@@ -459,7 +469,7 @@ class DefinePlugin {
 							res.setRange(expr.range);
 							return res;
 						});
-						parser.hooks.typeof.for(key).tap("DefinePlugin", expr => {
+						parser.hooks.typeof.for(key).tap(PLUGIN_NAME, expr => {
 							addValueDependency(originalKey);
 							const codeCode = toCode(
 								code,
@@ -488,26 +498,24 @@ class DefinePlugin {
 					 * @returns {void}
 					 */
 					const applyObjectDefine = (key, obj) => {
-						parser.hooks.canRename.for(key).tap("DefinePlugin", () => {
+						parser.hooks.canRename.for(key).tap(PLUGIN_NAME, () => {
 							addValueDependency(key);
 							return true;
 						});
-						parser.hooks.evaluateIdentifier
-							.for(key)
-							.tap("DefinePlugin", expr => {
-								addValueDependency(key);
-								return new BasicEvaluatedExpression()
-									.setTruthy()
-									.setSideEffects(false)
-									.setRange(expr.range);
-							});
+						parser.hooks.evaluateIdentifier.for(key).tap(PLUGIN_NAME, expr => {
+							addValueDependency(key);
+							return new BasicEvaluatedExpression()
+								.setTruthy()
+								.setSideEffects(false)
+								.setRange(expr.range);
+						});
 						parser.hooks.evaluateTypeof
 							.for(key)
 							.tap(
-								"DefinePlugin",
+								PLUGIN_NAME,
 								withValueDependency(key, evaluateToString("object"))
 							);
-						parser.hooks.expression.for(key).tap("DefinePlugin", expr => {
+						parser.hooks.expression.for(key).tap(PLUGIN_NAME, expr => {
 							addValueDependency(key);
 							const strCode = stringifyObj(
 								obj,
@@ -518,11 +526,11 @@ class DefinePlugin {
 								!parser.isAsiPosition(expr.range[0])
 							);
 
-							if (/__webpack_require__\s*(!?\.)/.test(strCode)) {
+							if (WEBPACK_REQUIRE_FUNCTION_REGEXP.test(strCode)) {
 								return toConstantDependency(parser, strCode, [
 									RuntimeGlobals.require
 								])(expr);
-							} else if (/__webpack_require__/.test(strCode)) {
+							} else if (WEBPACK_REQUIRE_IDENTIFIER_REGEXP.test(strCode)) {
 								return toConstantDependency(parser, strCode, [
 									RuntimeGlobals.requireScope
 								])(expr);
@@ -533,7 +541,7 @@ class DefinePlugin {
 						parser.hooks.typeof
 							.for(key)
 							.tap(
-								"DefinePlugin",
+								PLUGIN_NAME,
 								withValueDependency(
 									key,
 									toConstantDependency(parser, JSON.stringify("object"))
@@ -545,14 +553,14 @@ class DefinePlugin {
 				};
 
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("DefinePlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("DefinePlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("DefinePlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_ESM)
+					.tap(PLUGIN_NAME, handler);
 
 				/**
 				 * Walk definitions
@@ -571,7 +579,7 @@ class DefinePlugin {
 							compilation.valueCacheVersions.set(name, version);
 						} else if (oldVersion !== version) {
 							const warning = new WebpackError(
-								`DefinePlugin\nConflicting values for '${prefix + key}'`
+								`${PLUGIN_NAME}\nConflicting values for '${prefix + key}'`
 							);
 							warning.details = `'${oldVersion}' !== '${version}'`;
 							warning.hideStack = true;