webpack 5.111.1 → 5.112.1

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

@@ -5,20 +5,20 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const InitFragment = require("../InitFragment");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const makeSerializable = require("../util/makeSerializable");
-const NullDependency = require("./NullDependency");
+const Dependency = require("../../graph/Dependency");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const InitFragment = require("../../template/InitFragment");
+const makeSerializable = require("../../util/makeSerializable");
+const NullDependency = require("../core/NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import { ReferencedExports, UpdateHashContext } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, boolean]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, boolean]>} ObjectSerializerContext */
-/** @import Hash from "../util/Hash" */
-/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import { ReferencedExports, UpdateHashContext } from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[string, boolean]>} ObjectSerializerContext */
+/** @import Hash from "../../util/Hash" */
+/** @import { RuntimeSpec } from "../../util/runtime" */
 
 class ModuleDecoratorDependency extends NullDependency {
 	/**
@@ -102,10 +102,11 @@ class ModuleDecoratorDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	ModuleDecoratorDependency,
+makeSerializable(ModuleDecoratorDependency, [
+	"webpack/lib/dependencies/commonjs/ModuleDecoratorDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/ModuleDecoratorDependency"
-);
+]);
 
 ModuleDecoratorDependency.Template = class ModuleDecoratorDependencyTemplate extends (
 	NullDependency.Template

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

@@ -5,11 +5,11 @@
 
 "use strict";
 
-const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
-const makeSerializable = require("../util/makeSerializable");
+const AsyncDependenciesBlock = require("../../graph/AsyncDependenciesBlock");
+const makeSerializable = require("../../util/makeSerializable");
 
-/** @import { GroupOptions } from "../AsyncDependenciesBlock" */
-/** @import { DependencyLocation } from "../Dependency" */
+/** @import { GroupOptions } from "../../graph/AsyncDependenciesBlock" */
+/** @import { DependencyLocation } from "../../graph/Dependency" */
 
 class RequireEnsureDependenciesBlock extends AsyncDependenciesBlock {
 	/**
@@ -22,9 +22,10 @@ class RequireEnsureDependenciesBlock extends AsyncDependenciesBlock {
 	}
 }
 
-makeSerializable(
-	RequireEnsureDependenciesBlock,
+makeSerializable(RequireEnsureDependenciesBlock, [
+	"webpack/lib/dependencies/commonjs/RequireEnsureDependenciesBlock",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/RequireEnsureDependenciesBlock"
-);
+]);
 
 module.exports = RequireEnsureDependenciesBlock;

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

@@ -5,16 +5,17 @@
 
 "use strict";
 
+const getFunctionExpression = require("../helpers/getFunctionExpression");
 const RequireEnsureDependenciesBlock = require("./RequireEnsureDependenciesBlock");
 const RequireEnsureDependency = require("./RequireEnsureDependency");
 const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
-const getFunctionExpression = require("./getFunctionExpression");
 
 /** @import { Expression, SpreadElement } from "estree" */
-/** @import { GroupOptions } from "../AsyncDependenciesBlock" */
-/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
-/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
-/** @import { FunctionExpressionResult } from "./getFunctionExpression" */
+/** @import { GroupOptions } from "../../graph/AsyncDependenciesBlock" */
+/** @import DependenciesBlock from "../../graph/DependenciesBlock" */
+/** @import BasicEvaluatedExpression from "../../javascript/BasicEvaluatedExpression" */
+/** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
+/** @import { FunctionExpressionResult } from "../helpers/getFunctionExpression" */
 
 const PLUGIN_NAME = "RequireEnsureDependenciesBlockParserPlugin";
 
@@ -87,7 +88,9 @@ module.exports = class RequireEnsureDependenciesBlockParserPlugin {
 					dep.loc = parser.getLocation(expr);
 					depBlock.addDependency(dep);
 					const old = parser.state.current;
-					parser.state.current = /** @type {EXPECTED_ANY} */ (depBlock);
+					parser.state.current = /** @type {typeof parser.state.current} */ (
+						/** @type {DependenciesBlock} */ (depBlock)
+					);
 					try {
 						let failed = false;
 						parser.inFunctionScope(true, [], () => {

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

@@ -5,17 +5,17 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const makeSerializable = require("../util/makeSerializable");
-const NullDependency = require("./NullDependency");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const makeSerializable = require("../../util/makeSerializable");
+const NullDependency = require("../core/NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import AsyncDependenciesBlock from "../AsyncDependenciesBlock" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range, Range | false]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, Range | false]>} ObjectSerializerContext */
+/** @import AsyncDependenciesBlock from "../../graph/AsyncDependenciesBlock" */
+/** @import Dependency from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range, Range | false]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, Range | false]>} ObjectSerializerContext */
 
 class RequireEnsureDependency extends NullDependency {
 	/**
@@ -64,10 +64,11 @@ class RequireEnsureDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	RequireEnsureDependency,
+makeSerializable(RequireEnsureDependency, [
+	"webpack/lib/dependencies/commonjs/RequireEnsureDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/RequireEnsureDependency"
-);
+]);
 
 RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate extends (
 	NullDependency.Template

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

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const ModuleDependency = require("./ModuleDependency");
-const NullDependency = require("./NullDependency");
+const makeSerializable = require("../../util/makeSerializable");
+const ModuleDependency = require("../core/ModuleDependency");
+const NullDependency = require("../core/NullDependency");
 
 class RequireEnsureItemDependency extends ModuleDependency {
 	/**
@@ -27,10 +27,11 @@ class RequireEnsureItemDependency extends ModuleDependency {
 	}
 }
 
-makeSerializable(
-	RequireEnsureItemDependency,
+makeSerializable(RequireEnsureItemDependency, [
+	"webpack/lib/dependencies/commonjs/RequireEnsureItemDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/RequireEnsureItemDependency"
-);
+]);
 
 RequireEnsureItemDependency.Template = NullDependency.Template;
 

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

@@ -5,14 +5,14 @@
 
 "use strict";
 
-const {
-	JAVASCRIPT_MODULE_TYPE_AUTO,
-	JAVASCRIPT_MODULE_TYPE_DYNAMIC
-} = require("../ModuleTypeConstants");
 const {
 	evaluateToString,
 	toConstantDependency
-} = require("../javascript/JavascriptParserHelpers");
+} = require("../../javascript/JavascriptParserHelpers");
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../../module/ModuleTypeConstants");
 const RequireEnsureDependenciesBlockParserPlugin = require("./RequireEnsureDependenciesBlockParserPlugin");
 const RequireEnsureDependency = require("./RequireEnsureDependency");
 const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
@@ -20,10 +20,10 @@ const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import Compiler from "../Compiler" */
-/** @import Parser from "../javascript/JavascriptParser" */
+/** @import Compiler from "../../Compiler" */
+/** @import Parser from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "RequireEnsurePlugin";
 

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

@@ -5,18 +5,18 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const makeSerializable = require("../util/makeSerializable");
-const HarmonyImportGuard = require("./HarmonyImportGuard");
-const NullDependency = require("./NullDependency");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const makeSerializable = require("../../util/makeSerializable");
+const NullDependency = require("../core/NullDependency");
+const ESMImportGuard = require("../esm/ESMImportGuard");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import Dependency from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
 /** @import CommonJsRequireDependency from "./CommonJsRequireDependency" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, CommonJsRequireDependency | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, CommonJsRequireDependency | undefined]>} ObjectSerializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, CommonJsRequireDependency | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, CommonJsRequireDependency | undefined]>} ObjectSerializerContext */
 
 class RequireHeaderDependency extends NullDependency {
 	/**
@@ -55,10 +55,11 @@ class RequireHeaderDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	RequireHeaderDependency,
+makeSerializable(RequireHeaderDependency, [
+	"webpack/lib/dependencies/commonjs/RequireHeaderDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/RequireHeaderDependency"
-);
+]);
 
 RequireHeaderDependency.Template = class RequireHeaderDependencyTemplate extends (
 	NullDependency.Template
@@ -95,7 +96,7 @@ RequireHeaderDependency.Template = class RequireHeaderDependencyTemplate extends
 					const guards = requireDep.branchGuards;
 					if (
 						guards === undefined ||
-						!HarmonyImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
+						!ESMImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
 					) {
 						return;
 					}

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

@@ -5,17 +5,17 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const Template = require("../Template");
-const makeSerializable = require("../util/makeSerializable");
-const ModuleDependency = require("./ModuleDependency");
+const Dependency = require("../../graph/Dependency");
+const Template = require("../../template/Template");
+const makeSerializable = require("../../util/makeSerializable");
+const ModuleDependency = require("../core/ModuleDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import { ReferencedExports } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import { ReferencedExports } from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @import { RuntimeSpec } from "../../util/runtime" */
 
 class RequireIncludeDependency extends ModuleDependency {
 	/**
@@ -49,10 +49,11 @@ class RequireIncludeDependency extends ModuleDependency {
 	}
 }
 
-makeSerializable(
-	RequireIncludeDependency,
+makeSerializable(RequireIncludeDependency, [
+	"webpack/lib/dependencies/commonjs/RequireIncludeDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/RequireIncludeDependency"
-);
+]);
 
 RequireIncludeDependency.Template = class RequireIncludeDependencyTemplate extends (
 	ModuleDependency.Template

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

@@ -5,16 +5,14 @@
 
 "use strict";
 
-const WebpackError = require("../errors/WebpackError");
+const RequireIncludeDeprecationWarning = require("../../errors/RequireIncludeDeprecationWarning");
 const {
 	evaluateToString,
 	toConstantDependency
-} = require("../javascript/JavascriptParserHelpers");
-const makeSerializable = require("../util/makeSerializable");
+} = require("../../javascript/JavascriptParserHelpers");
 const RequireIncludeDependency = require("./RequireIncludeDependency");
 
-/** @import { DependencyLocation } from "../Dependency" */
-/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
+/** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "RequireIncludeDependencyParserPlugin";
 
@@ -74,25 +72,3 @@ module.exports = class RequireIncludeDependencyParserPlugin {
 		});
 	}
 };
-
-class RequireIncludeDeprecationWarning extends WebpackError {
-	/**
-	 * Creates an instance of RequireIncludeDeprecationWarning.
-	 * @param {DependencyLocation} loc location
-	 */
-	constructor(loc) {
-		super("require.include() is deprecated and will be removed soon.");
-
-		/** @type {string} */
-		this.name = "RequireIncludeDeprecationWarning";
-
-		/** @type {DependencyLocation} */
-		this.loc = loc;
-	}
-}
-
-makeSerializable(
-	RequireIncludeDeprecationWarning,
-	"webpack/lib/dependencies/RequireIncludeDependencyParserPlugin",
-	"RequireIncludeDeprecationWarning"
-);

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

@@ -8,17 +8,17 @@
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC
-} = require("../ModuleTypeConstants");
+} = require("../../module/ModuleTypeConstants");
 const RequireIncludeDependency = require("./RequireIncludeDependency");
 const RequireIncludeDependencyParserPlugin = require("./RequireIncludeDependencyParserPlugin");
 
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import Compiler from "../Compiler" */
-/** @import Parser from "../javascript/JavascriptParser" */
+/** @import Compiler from "../../Compiler" */
+/** @import Parser from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "RequireIncludePlugin";
 

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

@@ -5,14 +5,14 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const ContextDependency = require("./ContextDependency");
-const ContextDependencyTemplateAsId = require("./ContextDependencyTemplateAsId");
+const makeSerializable = require("../../util/makeSerializable");
+const ContextDependency = require("../context/ContextDependency");
+const ContextDependencyTemplateAsId = require("../context/ContextDependencyTemplateAsId");
 
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range]>} ObjectSerializerContext */
-/** @import { ContextDependencyOptions } from "./ContextDependency" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range]>} ObjectSerializerContext */
+/** @import { ContextDependencyOptions } from "../context/ContextDependency" */
 
 class RequireResolveContextDependency extends ContextDependency {
 	/**
@@ -56,10 +56,11 @@ class RequireResolveContextDependency extends ContextDependency {
 	}
 }
 
-makeSerializable(
-	RequireResolveContextDependency,
+makeSerializable(RequireResolveContextDependency, [
+	"webpack/lib/dependencies/commonjs/RequireResolveContextDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/RequireResolveContextDependency"
-);
+]);
 
 RequireResolveContextDependency.Template = ContextDependencyTemplateAsId;
 

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

@@ -5,15 +5,15 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const makeSerializable = require("../util/makeSerializable");
-const ModuleDependency = require("./ModuleDependency");
-const ModuleDependencyAsId = require("./ModuleDependencyTemplateAsId");
+const Dependency = require("../../graph/Dependency");
+const makeSerializable = require("../../util/makeSerializable");
+const ModuleDependency = require("../core/ModuleDependency");
+const ModuleDependencyAsId = require("../core/ModuleDependencyTemplateAsId");
 
-/** @import { ReferencedExports } from "../Dependency" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import { ReferencedExports } from "../../graph/Dependency" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @import { RuntimeSpec } from "../../util/runtime" */
 
 class RequireResolveDependency extends ModuleDependency {
 	/**
@@ -50,10 +50,11 @@ class RequireResolveDependency extends ModuleDependency {
 	}
 }
 
-makeSerializable(
-	RequireResolveDependency,
+makeSerializable(RequireResolveDependency, [
+	"webpack/lib/dependencies/commonjs/RequireResolveDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/RequireResolveDependency"
-);
+]);
 
 RequireResolveDependency.Template = ModuleDependencyAsId;
 

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

@@ -5,15 +5,15 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const NullDependency = require("./NullDependency");
+const makeSerializable = require("../../util/makeSerializable");
+const NullDependency = require("../core/NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
+/** @import Dependency from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
 
 class RequireResolveHeaderDependency extends NullDependency {
 	/**
@@ -50,10 +50,11 @@ class RequireResolveHeaderDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	RequireResolveHeaderDependency,
+makeSerializable(RequireResolveHeaderDependency, [
+	"webpack/lib/dependencies/commonjs/RequireResolveHeaderDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/RequireResolveHeaderDependency"
-);
+]);
 
 RequireResolveHeaderDependency.Template = class RequireResolveHeaderDependencyTemplate extends (
 	NullDependency.Template
@@ -67,7 +68,7 @@ RequireResolveHeaderDependency.Template = class RequireResolveHeaderDependencyTe
 	 */
 	apply(dependency, source, templateContext) {
 		const dep = /** @type {RequireResolveHeaderDependency} */ (dependency);
-		source.replace(dep.range[0], dep.range[1] - 1, "/*require.resolve*/");
+		source.replace(dep.range[0], dep.range[1] - 1, "/*require.resolve*/(");
 	}
 
 	/**
@@ -77,7 +78,7 @@ RequireResolveHeaderDependency.Template = class RequireResolveHeaderDependencyTe
 	 * @param {ReplaceSource} source source
 	 */
 	applyAsTemplateArgument(name, dep, source) {
-		source.replace(dep.range[0], dep.range[1] - 1, "/*require.resolve*/");
+		source.replace(dep.range[0], dep.range[1] - 1, "/*require.resolve*/(");
 	}
 };
 

package/lib/dependencies/commonjs/TopLevelThisParserPlugin.js

@@ -0,0 +1,59 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Alexander Akait @alexander-akait
+*/
+
+"use strict";
+
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const ConstDependency = require("../core/ConstDependency");
+const ESMExports = require("../esm/ESMExports");
+
+/** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
+
+const GLOBAL_THIS = "globalThis";
+
+const PLUGIN_NAME = "TopLevelThisParserPlugin";
+
+class TopLevelThisParserPlugin {
+	/**
+	 * Creates an instance of TopLevelThisParserPlugin.
+	 * @param {boolean | undefined} hasGlobalThis whether the target has a `globalThis` binding
+	 */
+	constructor(hasGlobalThis) {
+		/** @type {boolean} */
+		this.hasGlobalThis = Boolean(hasGlobalThis);
+	}
+
+	/**
+	 * Applies the plugin by registering its hooks on the compiler.
+	 * @param {JavascriptParser} parser the parser
+	 * @returns {void}
+	 */
+	apply(parser) {
+		const { hasGlobalThis } = this;
+
+		parser.hooks.expression.for("this").tap(PLUGIN_NAME, (node) => {
+			if (!parser.scope.topLevelScope) return;
+			// an ES module's top-level `this` is `undefined` whatever the option
+			// says, and `ESMTopLevelThisParserPlugin` answers for it
+			if (ESMExports.isEnabled(parser.state)) return;
+			// a module may declare `globalThis` itself, and the replacement lands
+			// in that scope: a bare identifier would read the declaration, or its
+			// temporal dead zone, rather than the global object
+			const dep =
+				hasGlobalThis && parser.getVariableInfo(GLOBAL_THIS) === GLOBAL_THIS
+					? new ConstDependency(GLOBAL_THIS, /** @type {Range} */ (node.range))
+					: new ConstDependency(
+							RuntimeGlobals.global,
+							/** @type {Range} */ (node.range),
+							[RuntimeGlobals.global]
+						);
+			dep.loc = parser.getLocation(node);
+			parser.state.module.addPresentationalDependency(dep);
+			return true;
+		});
+	}
+}
+
+module.exports = TopLevelThisParserPlugin;

package/lib/dependencies/{ContextDependency.js → context/ContextDependency.js}

@@ -5,25 +5,25 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const DependencyTemplate = require("../DependencyTemplate");
-const makeSerializable = require("../util/makeSerializable");
-const memoize = require("../util/memoize");
+const Dependency = require("../../graph/Dependency");
+const DependencyTemplate = require("../../template/DependencyTemplate");
+const makeSerializable = require("../../util/makeSerializable");
+const memoize = require("../../util/memoize");
 
 const getCriticalDependencyWarning = memoize(() =>
-	require("./CriticalDependencyWarning")
+	require("../../errors/CriticalDependencyWarning")
 );
 
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @import { ContextOptions } from "../context/ContextModule" */
-/** @import { TRANSITIVE } from "../Dependency" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import WebpackError from "../errors/WebpackError" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @import { ContextOptions } from "../../context/ContextModule" */
+/** @import { TRANSITIVE } from "../../graph/Dependency" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import WebpackError from "../../errors/WebpackError" */
 /**
  * @import {
  * 	ObjectDeserializerContext,
  * 	ObjectSerializerContext
- * } from "../serialization/ObjectMiddleware"
+ * } from "../../serialization/ObjectMiddleware"
  */
 
 /** @typedef {ContextOptions & { request: string }} ContextDependencyOptions */
@@ -188,10 +188,11 @@ class ContextDependency extends Dependency {
 	}
 }
 
-makeSerializable(
-	ContextDependency,
+makeSerializable(ContextDependency, [
+	"webpack/lib/dependencies/context/ContextDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/ContextDependency"
-);
+]);
 
 ContextDependency.Template = DependencyTemplate;