webpack 5.111.1 → 5.112.1

package/lib/dependencies/{CommonJsImportsParserPlugin.js → commonjs/CommonJsImportsParserPlugin.js}

@@ -5,53 +5,53 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-
 const {
 	evaluateToIdentifier,
 	evaluateToString,
 	expressionIsUnsupported,
 	toConstantDependency
-} = require("../javascript/JavascriptParserHelpers");
-const memoize = require("../util/memoize");
-const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
+} = require("../../javascript/JavascriptParserHelpers");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+
+const memoize = require("../../util/memoize");
+const LocalModuleDependency = require("../amd/LocalModuleDependency");
+const { getLocalModule } = require("../amd/LocalModulesHelpers");
+const ContextDependencyHelpers = require("../context/ContextDependencyHelpers");
+const ConstDependency = require("../core/ConstDependency");
+const ESMImportGuard = require("../esm/ESMImportGuard");
+const traverseDestructuringAssignmentProperties = require("../helpers/traverseDestructuringAssignmentProperties");
 const CommonJsFullRequireDependency = require("./CommonJsFullRequireDependency");
 const CommonJsRequireContextDependency = require("./CommonJsRequireContextDependency");
 const CommonJsRequireDependency = require("./CommonJsRequireDependency");
-const ConstDependency = require("./ConstDependency");
-const ContextDependencyHelpers = require("./ContextDependencyHelpers");
-const HarmonyImportGuard = require("./HarmonyImportGuard");
-const LocalModuleDependency = require("./LocalModuleDependency");
-const { getLocalModule } = require("./LocalModulesHelpers");
 const RequireHeaderDependency = require("./RequireHeaderDependency");
 const RequireResolveContextDependency = require("./RequireResolveContextDependency");
 const RequireResolveDependency = require("./RequireResolveDependency");
 const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency");
 
 const getUnsupportedFeatureWarning = memoize(() =>
-	require("../errors/UnsupportedFeatureWarning")
+	require("../../errors/UnsupportedFeatureWarning")
 );
 
 const getCommentCompilationWarning = memoize(() =>
-	require("../errors/CommentCompilationWarning")
+	require("../../errors/CommentCompilationWarning")
 );
 
 /** @import { CallExpression, Expression, NewExpression } from "estree" */
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import { RawReferencedExports } from "../Dependency" */
+/** @import { RawReferencedExports } from "../../graph/Dependency" */
 /**
  * @import JavascriptParser, {
  * 	Range,
  * 	Members,
  * 	CalleeMembers
- * } from "../javascript/JavascriptParser"
+ * } from "../../javascript/JavascriptParser"
  */
-/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
-/** @import LocalModule from "./LocalModule" */
+/** @import BasicEvaluatedExpression from "../../javascript/BasicEvaluatedExpression" */
+/** @import LocalModule from "../amd/LocalModule" */
 
 /**
  * Defines the common js import settings type used by this module.
@@ -65,6 +65,7 @@ const getCommentCompilationWarning = memoize(() =>
  * member-access references on `NAME` to the `CommonJsRequireDependency`
  * created for the `require()` call.
  * @typedef {object} RequireBindingData
+ * @property {string} request request passed to `require()`
  * @property {RawReferencedExports | null} referencedExports mutable list, pushed to as `NAME.x.y` accesses are walked; null means the whole namespace is used. Separate from `dep` so a deferred require (walked after accesses on `NAME`) still collects them; becomes the dep's shared list on creation.
  * @property {InstanceType<typeof import("./CommonJsRequireDependency")> | null} dep dependency for the `require()` call, null until the `require()` is walked; kept so a later whole-namespace use can null its list directly
  */
@@ -188,9 +189,7 @@ const createRequireCallHandler = (
 				parser,
 				expr
 			);
-			const binding =
-				requireBindingData &&
-				requireBindingData.get(/** @type {CallExpression} */ (expr));
+			const binding = requireBindingData && requireBindingData.get(expr);
 			if (binding && !referencedExports) {
 				// `const NAME = require(LITERAL)` — let later member-access walks
 				// on `NAME` populate the dependency's referenced exports.
@@ -216,7 +215,7 @@ const createRequireCallHandler = (
 			dep.loc = parser.getLocation(expr);
 			dep.optional = Boolean(parser.scope.inTry);
 			parser.state.current.addDependency(dep);
-			HarmonyImportGuard.attachDependencyGuards(parser, dep);
+			ESMImportGuard.attachDependencyGuards(parser, dep);
 			return dep;
 		}
 	};
@@ -433,6 +432,18 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 
 		if (expr.arguments.length !== 1) return;
 		const param = parser.evaluateExpression(expr.arguments[0]);
+		const range = /** @type {Range} */ (expr.range);
+		const argumentRange = /** @type {Range} */ (expr.arguments[0].range);
+		const header = new RequireResolveHeaderDependency([
+			range[0],
+			argumentRange[0]
+		]);
+		header.loc = parser.getLocation(expr);
+		parser.state.module.addPresentationalDependency(header);
+		// A parenthesized expression cannot retain the call's trailing comma.
+		const closing = new ConstDependency(")", [argumentRange[1], range[1]]);
+		closing.loc = parser.getLocation(expr);
+		parser.state.module.addPresentationalDependency(closing);
 		if (param.isConditional()) {
 			for (const option of /** @type {BasicEvaluatedExpression[]} */ (
 				param.options
@@ -442,22 +453,12 @@ const createProcessResolveHandler = (parser, options, getContext) => {
 					processResolveContext(expr, option, weak);
 				}
 			}
-			const dep = new RequireResolveHeaderDependency(
-				/** @type {Range} */ (expr.callee.range)
-			);
-			dep.loc = parser.getLocation(expr);
-			parser.state.module.addPresentationalDependency(dep);
 			return true;
 		}
 		const result = processResolveItem(expr, param, weak);
 		if (result === undefined) {
 			processResolveContext(expr, param, weak);
 		}
-		const dep = new RequireResolveHeaderDependency(
-			/** @type {Range} */ (expr.callee.range)
-		);
-		dep.loc = parser.getLocation(expr);
-		parser.state.module.addPresentationalDependency(dep);
 		return true;
 	};
 };
@@ -675,7 +676,7 @@ class CommonJsImportsParserPlugin {
 				dep._canConcatenate = true;
 				dep.loc = parser.getLocation(expr);
 				parser.state.current.addDependency(dep);
-				HarmonyImportGuard.attachDependencyGuards(parser, dep);
+				ESMImportGuard.attachDependencyGuards(parser, dep);
 				return true;
 			}
 		};
@@ -718,7 +719,7 @@ class CommonJsImportsParserPlugin {
 				dep._canConcatenate = true;
 				dep.loc = parser.getLocation(expr.callee);
 				parser.state.current.addDependency(dep);
-				HarmonyImportGuard.attachDependencyGuards(parser, dep);
+				ESMImportGuard.attachDependencyGuards(parser, dep);
 				parser.walkExpressions(expr.arguments);
 				return true;
 			}
@@ -764,6 +765,7 @@ class CommonJsImportsParserPlugin {
 			if (!requireInfo || requireInfo.name !== "require") return;
 			/** @type {RequireBindingData} */
 			const binding = {
+				request: arg.value,
 				referencedExports: [],
 				dep: null
 			};
@@ -883,5 +885,6 @@ CommonJsImportsParserPlugin.createRequireAsExpressionHandler =
 CommonJsImportsParserPlugin.createRequireCacheDependency =
 	createRequireCacheDependency;
 CommonJsImportsParserPlugin.createRequireHandler = createRequireCallHandler;
+CommonJsImportsParserPlugin.REQUIRE_BINDING_TAG = REQUIRE_BINDING_TAG;
 
 module.exports = CommonJsImportsParserPlugin;

package/lib/dependencies/{CommonJsObjectExportDependency.js → commonjs/CommonJsObjectExportDependency.js}

@@ -5,18 +5,18 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const { propertyName } = require("../util/property");
-const NullDependency = require("./NullDependency");
+const makeSerializable = require("../../util/makeSerializable");
+const { propertyName } = require("../../util/property");
+const NullDependency = require("../core/NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency, { ExportsSpec, ExportInfoName } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import Dependency, { ExportsSpec, ExportInfoName } from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
 /** @typedef {"keyValue" | "shorthand" | "get" | "set" | "method" | "asyncMethod" | "generatorMethod" | "asyncGeneratorMethod"} CommonJsObjectExportKind */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range, Range, ExportInfoName, CommonJsObjectExportKind, boolean]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, Range, ExportInfoName, CommonJsObjectExportKind, boolean]>} ObjectSerializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range, Range, ExportInfoName, CommonJsObjectExportKind, boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, Range, ExportInfoName, CommonJsObjectExportKind, boolean]>} ObjectSerializerContext */
 
 const EMPTY_OBJECT = {};
 
@@ -110,10 +110,11 @@ class CommonJsObjectExportDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	CommonJsObjectExportDependency,
+makeSerializable(CommonJsObjectExportDependency, [
+	"webpack/lib/dependencies/commonjs/CommonJsObjectExportDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CommonJsObjectExportDependency"
-);
+]);
 
 CommonJsObjectExportDependency.Template = class CommonJsObjectExportDependencyTemplate extends (
 	NullDependency.Template
@@ -135,10 +136,10 @@ CommonJsObjectExportDependency.Template = class CommonJsObjectExportDependencyTe
 		if (!used) {
 			// Object spread rewrite needs environment.spread.
 			if (!runtimeTemplate.supportsSpread()) return;
-			const range = /** @type {Range} */ (dep.range);
+			const range = dep.range;
 			if (FUNCTION_PROPERTY_DROP_HEAD.has(dep.kind)) {
 				// Keep the function body so nested dependency replaces stay valid.
-				const valueRange = /** @type {Range} */ (dep.valueRange);
+				const valueRange = dep.valueRange;
 				source.replace(
 					range[0],
 					valueRange[0] - 1,
@@ -152,7 +153,7 @@ CommonJsObjectExportDependency.Template = class CommonJsObjectExportDependencyTe
 				return;
 			}
 			// keyValue: keep the value's side effects in place.
-			const valueRange = /** @type {Range} */ (dep.valueRange);
+			const valueRange = dep.valueRange;
 			if (dep.pure) {
 				// spreading null adds nothing; the text stays so nested replaces hold
 				source.replace(
@@ -169,7 +170,7 @@ CommonJsObjectExportDependency.Template = class CommonJsObjectExportDependencyTe
 		}
 		if (used === dep.name) return;
 		// Rename the key to the mangled export name.
-		const keyRange = /** @type {Range} */ (dep.keyRange);
+		const keyRange = dep.keyRange;
 		if (dep.kind === "shorthand") {
 			source.replace(
 				keyRange[0],

package/lib/dependencies/{CommonJsPlugin.js → commonjs/CommonJsPlugin.js}

@@ -5,19 +5,20 @@
 
 "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,
 	expressionIsUnsupported,
 	toConstantDependency
-} = require("../javascript/JavascriptParserHelpers");
+} = require("../../javascript/JavascriptParserHelpers");
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../../module/ModuleTypeConstants");
+const SelfModuleFactory = require("../../module/SelfModuleFactory");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const RuntimeModule = require("../../runtime/RuntimeModule");
+const Template = require("../../template/Template");
+const RuntimeRequirementsDependency = require("../core/RuntimeRequirementsDependency");
 const CommonJsExportRequireDependency = require("./CommonJsExportRequireDependency");
 const CommonJsExportsDependency = require("./CommonJsExportsDependency");
 const CommonJsExportsParserPlugin = require("./CommonJsExportsParserPlugin");
@@ -32,17 +33,16 @@ const RequireHeaderDependency = require("./RequireHeaderDependency");
 const RequireResolveContextDependency = require("./RequireResolveContextDependency");
 const RequireResolveDependency = require("./RequireResolveDependency");
 const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency");
-const RuntimeRequirementsDependency = require("./RuntimeRequirementsDependency");
+const TopLevelThisParserPlugin = require("./TopLevelThisParserPlugin");
 
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import Compilation from "../Compilation" */
-/** @import Compiler from "../Compiler" */
-/** @import { BuildInfo } from "../Module" */
-/** @import Parser from "../javascript/JavascriptParser" */
+/** @import Compilation from "../../Compilation" */
+/** @import Compiler from "../../Compiler" */
+/** @import Parser from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "CommonJsPlugin";
 
@@ -151,7 +151,7 @@ class CommonJsPlugin {
 				);
 
 				compilation.hooks.runtimeRequirementInModule
-					.for(RuntimeGlobals.harmonyModuleDecorator)
+					.for(RuntimeGlobals.esmModuleDecorator)
 					.tap(PLUGIN_NAME, (module, set) => {
 						set.add(RuntimeGlobals.module);
 						set.add(RuntimeGlobals.requireScope);
@@ -165,11 +165,11 @@ class CommonJsPlugin {
 					});
 
 				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.harmonyModuleDecorator)
+					.for(RuntimeGlobals.esmModuleDecorator)
 					.tap(PLUGIN_NAME, (chunk, _set) => {
 						compilation.addRuntimeModule(
 							chunk,
-							new HarmonyModuleDecoratorRuntimeModule()
+							new ESMModuleDecoratorRuntimeModule()
 						);
 					});
 
@@ -189,6 +189,14 @@ class CommonJsPlugin {
 				 * @returns {void}
 				 */
 				const handler = (parser, parserOptions) => {
+					// what `this` means does not depend on CommonJS syntax being parsed,
+					// so this one is applied before the `commonjs` option is read
+					if (parserOptions.topLevelThis === "global") {
+						new TopLevelThisParserPlugin(
+							compilation.outputOptions.environment.globalThis
+						).apply(parser);
+					}
+
 					if (parserOptions.commonjs !== undefined && !parserOptions.commonjs) {
 						return;
 					}
@@ -223,8 +231,7 @@ class CommonJsPlugin {
 					parser.hooks.expression
 						.for(RuntimeGlobals.moduleLoaded)
 						.tap(PLUGIN_NAME, (expr) => {
-							/** @type {BuildInfo} */
-							(parser.state.module.buildInfo).moduleConcatenationBailout =
+							parser.state.module.buildInfo.moduleConcatenationBailout =
 								RuntimeGlobals.moduleLoaded;
 							const dep = new RuntimeRequirementsDependency([
 								RuntimeGlobals.moduleLoaded
@@ -237,8 +244,7 @@ class CommonJsPlugin {
 					parser.hooks.expression
 						.for(RuntimeGlobals.moduleId)
 						.tap(PLUGIN_NAME, (expr) => {
-							/** @type {BuildInfo} */
-							(parser.state.module.buildInfo).moduleConcatenationBailout =
+							parser.state.module.buildInfo.moduleConcatenationBailout =
 								RuntimeGlobals.moduleId;
 							const dep = new RuntimeRequirementsDependency([
 								RuntimeGlobals.moduleId
@@ -254,7 +260,9 @@ class CommonJsPlugin {
 					);
 
 					new CommonJsImportsParserPlugin(parserOptions).apply(parser);
-					new CommonJsExportsParserPlugin().apply(parser);
+					new CommonJsExportsParserPlugin(parserOptions.topLevelThis).apply(
+						parser
+					);
 				};
 
 				normalModuleFactory.hooks.parser
@@ -268,7 +276,7 @@ class CommonJsPlugin {
 	}
 }
 
-class HarmonyModuleDecoratorRuntimeModule extends RuntimeModule {
+class ESMModuleDecoratorRuntimeModule extends RuntimeModule {
 	constructor() {
 		super("harmony module decorator");
 	}
@@ -299,21 +307,22 @@ class HarmonyModuleDecoratorRuntimeModule extends RuntimeModule {
 	generate() {
 		const { runtimeTemplate } = /** @type {Compilation} */ (this.compilation);
 		return Template.asString([
-			`${
-				RuntimeGlobals.harmonyModuleDecorator
-			} = ${runtimeTemplate.basicFunction("module", [
-				"module = Object.create(module);",
-				"if (!module.children) module.children = [];",
-				"Object.defineProperty(module, 'exports', {",
-				Template.indent([
-					"enumerable: true,",
-					`${runtimeTemplate.method("set", "", [
-						"throw new Error('ES Modules may not assign module.exports or exports.*, Use ESM export syntax, instead: ' + module.id);"
-					])}`
-				]),
-				"});",
-				"return module;"
-			])};`
+			`${RuntimeGlobals.esmModuleDecorator} = ${runtimeTemplate.basicFunction(
+				"module",
+				[
+					"module = Object.create(module);",
+					"if (!module.children) module.children = [];",
+					"Object.defineProperty(module, 'exports', {",
+					Template.indent([
+						"enumerable: true,",
+						`${runtimeTemplate.method("set", "", [
+							"throw new Error('ES Modules may not assign module.exports or exports.*, Use ESM export syntax, instead: ' + module.id);"
+						])}`
+					]),
+					"});",
+					"return module;"
+				]
+			)};`
 		]);
 	}
 }

package/lib/dependencies/{CommonJsRequireContextDependency.js → commonjs/CommonJsRequireContextDependency.js}

@@ -5,18 +5,18 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const makeSerializable = require("../util/makeSerializable");
-const ContextDependency = require("./ContextDependency");
-const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
+const Dependency = require("../../graph/Dependency");
+const makeSerializable = require("../../util/makeSerializable");
+const ContextDependency = require("../context/ContextDependency");
+const ContextDependencyTemplateAsRequireCall = require("../context/ContextDependencyTemplateAsRequireCall");
 
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range | undefined, boolean | string | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range | undefined, boolean | string | undefined]>} ObjectSerializerContext */
-/** @import { ContextDependencyOptions } from "./ContextDependency" */
-/** @import { ReferencedExports } from "../Dependency" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range | undefined, boolean | string | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range | undefined, boolean | string | undefined]>} ObjectSerializerContext */
+/** @import { ContextDependencyOptions } from "../context/ContextDependency" */
+/** @import { ReferencedExports } from "../../graph/Dependency" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { RuntimeSpec } from "../../util/runtime" */
 
 class CommonJsRequireContextDependency extends ContextDependency {
 	/**
@@ -82,10 +82,11 @@ class CommonJsRequireContextDependency extends ContextDependency {
 	}
 }
 
-makeSerializable(
-	CommonJsRequireContextDependency,
+makeSerializable(CommonJsRequireContextDependency, [
+	"webpack/lib/dependencies/commonjs/CommonJsRequireContextDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CommonJsRequireContextDependency"
-);
+]);
 
 CommonJsRequireContextDependency.Template =
 	ContextDependencyTemplateAsRequireCall;

package/lib/dependencies/{CommonJsRequireDependency.js → commonjs/CommonJsRequireDependency.js}

@@ -5,39 +5,40 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const RuntimeGlobals = require("../RuntimeGlobals");
+const Dependency = require("../../graph/Dependency");
 const {
 	getDependencyUsedByExportsCondition
-} = require("../optimize/InnerGraph");
-const makeSerializable = require("../util/makeSerializable");
+} = require("../../optimize/InnerGraph");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const makeSerializable = require("../../util/makeSerializable");
+const ModuleDependency = require("../core/ModuleDependency");
+const ESMImportGuard = require("../esm/ESMImportGuard");
 const {
 	ESM_MODULE_EXPORTS_NAME,
 	getRequireEsmModuleExportsAccess,
 	isRequireEsmModuleExportsModule
 } = require("./CommonJsDependencyHelpers");
-const HarmonyImportGuard = require("./HarmonyImportGuard");
-const ModuleDependency = require("./ModuleDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import ConcatenationScope from "../ConcatenationScope" */
+/** @import ConcatenationScope from "../../optimize/ConcatenationScope" */
 /**
  * @import {
  * 	GetConditionFn,
  * 	RawReferencedExports,
- * 	ReferencedExports
- * } from "../Dependency"
+ * 	ReferencedExports,
+ * 	DependencyKinds
+ * } from "../../graph/Dependency"
  */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import ModuleGraphConnection from "../ModuleGraphConnection" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @import { UsedByExports } from "../optimize/InnerGraph" */
-/** @import { RuntimeSpec } from "../util/runtime" */
-/** @import { DependencyGuard } from "./HarmonyImportGuard" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[RawReferencedExports | null, Range | undefined, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined, boolean | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[RawReferencedExports | null, Range | undefined, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined, boolean | undefined]>} ObjectSerializerContext */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import Module from "../../module/Module" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import ModuleGraphConnection from "../../graph/ModuleGraphConnection" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @import { UsedByExports } from "../../optimize/InnerGraph" */
+/** @import { RuntimeSpec } from "../../util/runtime" */
+/** @import { DependencyGuard } from "../esm/ESMImportGuard" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[RawReferencedExports | null, Range | undefined, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined, boolean | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[RawReferencedExports | null, Range | undefined, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined, boolean | undefined]>} ObjectSerializerContext */
 
 /**
  * Trims a member-access path at the first segment that is definitively not a
@@ -45,7 +46,7 @@ const ModuleDependency = require("./ModuleDependency");
  * array/object prototype method like `arr.includes`), so only the value up to
  * that point is observed; referencing the whole value keeps its data intact
  * instead of tree-shaking it away. Real named exports (`utils.foo`) are kept.
- * @param {import("../ExportsInfo")} exportsInfo module exports info
+ * @param {import("../../graph/ExportsInfo")} exportsInfo module exports info
  * @param {string[]} name member-access path
  * @returns {string[]} the provided prefix of the path
  */
@@ -147,7 +148,7 @@ class CommonJsRequireDependency extends ModuleDependency {
 			}
 			if (
 				guards !== undefined &&
-				HarmonyImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
+				ESMImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
 			) {
 				return false;
 			}
@@ -282,7 +283,7 @@ CommonJsRequireDependency.Template = class CommonJsRequireDependencyTemplate ext
 			const guards = dep.branchGuards;
 			if (
 				guards !== undefined &&
-				HarmonyImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
+				ESMImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
 			) {
 				// Dead branch: module is excluded and has no id; code is never executed.
 				source.replace(
@@ -349,9 +350,16 @@ CommonJsRequireDependency.Template = class CommonJsRequireDependencyTemplate ext
 	}
 };
 
-makeSerializable(
-	CommonJsRequireDependency,
+makeSerializable(CommonJsRequireDependency, [
+	"webpack/lib/dependencies/commonjs/CommonJsRequireDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CommonJsRequireDependency"
-);
+]);
+
+/** @type {Set<keyof DependencyKinds>} */
+CommonJsRequireDependency.KINDS = new Set([
+	...ModuleDependency.KINDS,
+	"commonjs-require"
+]);
 
 module.exports = CommonJsRequireDependency;

package/lib/dependencies/{CommonJsSelfReferenceDependency.js → commonjs/CommonJsSelfReferenceDependency.js}

@@ -5,12 +5,12 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const { equals } = require("../util/ArrayHelpers");
-const makeSerializable = require("../util/makeSerializable");
-const { propertyAccess } = require("../util/property");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const { equals } = require("../../util/ArrayHelpers");
+const makeSerializable = require("../../util/makeSerializable");
+const { propertyAccess } = require("../../util/property");
+const NullDependency = require("../core/NullDependency");
 const { isWorkerEntryThis } = require("./CommonJsDependencyHelpers");
-const NullDependency = require("./NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
 /**
@@ -18,20 +18,20 @@ const NullDependency = require("./NullDependency");
  * 	ReferencedExports,
  * 	UpdateHashContext,
  * 	ExportInfoName
- * } from "../Dependency"
+ * } from "../../graph/Dependency"
  */
-/** @import Hash from "../util/Hash" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import Hash from "../../util/Hash" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @import { RuntimeSpec } from "../../util/runtime" */
 /**
  * @import {
  * 	CommonJSDependencyBaseKeywords
  * } from "./CommonJsDependencyHelpers"
  */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, CommonJSDependencyBaseKeywords, ExportInfoName[], boolean]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, CommonJSDependencyBaseKeywords, ExportInfoName[], boolean]>} ObjectSerializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, CommonJSDependencyBaseKeywords, ExportInfoName[], boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, CommonJSDependencyBaseKeywords, ExportInfoName[], boolean]>} ObjectSerializerContext */
 
 class CommonJsSelfReferenceDependency extends NullDependency {
 	/**
@@ -136,10 +136,11 @@ class CommonJsSelfReferenceDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	CommonJsSelfReferenceDependency,
+makeSerializable(CommonJsSelfReferenceDependency, [
+	"webpack/lib/dependencies/commonjs/CommonJsSelfReferenceDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CommonJsSelfReferenceDependency"
-);
+]);
 
 CommonJsSelfReferenceDependency.Template = class CommonJsSelfReferenceDependencyTemplate extends (
 	NullDependency.Template