webpack 5.111.0 → 5.112.0

package/lib/dependencies/{ImportPlugin.js → import/ImportPlugin.js}

@@ -9,7 +9,7 @@ const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("../ModuleTypeConstants");
+} = require("../../module/ModuleTypeConstants");
 const ImportContextDependency = require("./ImportContextDependency");
 const ImportDependency = require("./ImportDependency");
 const ImportEagerDependency = require("./ImportEagerDependency");
@@ -19,10 +19,10 @@ const ImportWeakDependency = require("./ImportWeakDependency");
 /**
  * @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 = "ImportPlugin";
 

package/lib/dependencies/{ImportWeakDependency.js → import/ImportWeakDependency.js}

@@ -5,15 +5,16 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
+const makeSerializable = require("../../util/makeSerializable");
+const { ImportPhaseUtils } = require("../core/ImportPhase");
 const ImportDependency = require("./ImportDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency, { RawReferencedExports } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import Module, { BuildMeta } from "../Module" */
-/** @import { ImportAttributes, Range } from "../javascript/JavascriptParser" */
-/** @import { ImportPhaseType } from "./ImportPhase" */
+/** @import Dependency, { RawReferencedExports } from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import Module, { BuildMeta } from "../../module/Module" */
+/** @import { ImportAttributes, Range } from "../../javascript/JavascriptParser" */
+/** @import { ImportPhaseType } from "../core/ImportPhase" */
 
 class ImportWeakDependency extends ImportDependency {
 	/**
@@ -35,10 +36,11 @@ class ImportWeakDependency extends ImportDependency {
 	}
 }
 
-makeSerializable(
-	ImportWeakDependency,
+makeSerializable(ImportWeakDependency, [
+	"webpack/lib/dependencies/import/ImportWeakDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/ImportWeakDependency"
-);
+]);
 
 ImportWeakDependency.Template = class ImportDependencyTemplate extends (
 	ImportDependency.Template
@@ -56,7 +58,7 @@ ImportWeakDependency.Template = class ImportDependencyTemplate extends (
 		{ runtimeTemplate, module, moduleGraph, chunkGraph, runtimeRequirements }
 	) {
 		const dep = /** @type {ImportWeakDependency} */ (dependency);
-		const content = runtimeTemplate.moduleNamespacePromise({
+		let content = runtimeTemplate.moduleNamespacePromise({
 			chunkGraph,
 			module: /** @type {Module} */ (moduleGraph.getModule(dep)),
 			request: dep.request,
@@ -66,6 +68,12 @@ ImportWeakDependency.Template = class ImportDependencyTemplate extends (
 			dependency: dep,
 			runtimeRequirements
 		});
+		if (ImportPhaseUtils.isSource(dep.phase)) {
+			content = `${content}.then(${runtimeTemplate.returningFunction(
+				'm["default"]',
+				"m"
+			)})`;
+		}
 
 		source.replace(dep.range[0], dep.range[1] - 1, content);
 	}

package/lib/dependencies/{importOptionsCheck.js → import/importOptionsCheck.js}

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const Template = require("../Template");
+const Template = require("../../template/Template");
 
-/** @import RuntimeTemplate from "../RuntimeTemplate" */
+/** @import RuntimeTemplate from "../../template/RuntimeTemplate" */
 
 /**
  * Wraps an import so its arguments evaluate in source order and the options are

package/lib/dependencies/{BuildTimeConstDependency.js → import-meta/BuildTimeConstDependency.js}

@@ -5,21 +5,21 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const ConstDependency = require("./ConstDependency");
-const NullDependency = require("./NullDependency");
+const makeSerializable = require("../../util/makeSerializable");
+const ConstDependency = require("../core/ConstDependency");
+const NullDependency = require("../core/NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency, { UpdateHashContext } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import Dependency, { UpdateHashContext } from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
 /**
  * @import {
  * 	ObjectDeserializerContext,
  * 	ObjectSerializerContext
- * } from "../serialization/ObjectMiddleware"
+ * } from "../../serialization/ObjectMiddleware"
  */
-/** @import Hash from "../util/Hash" */
+/** @import Hash from "../../util/Hash" */
 
 /**
  * A constant replacement whose source is only valid in emitted output (e.g.
@@ -69,10 +69,11 @@ class BuildTimeConstDependency extends ConstDependency {
 	}
 }
 
-makeSerializable(
-	BuildTimeConstDependency,
+makeSerializable(BuildTimeConstDependency, [
+	"webpack/lib/dependencies/import-meta/BuildTimeConstDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/BuildTimeConstDependency"
-);
+]);
 
 BuildTimeConstDependency.Template = class BuildTimeConstDependencyTemplate extends (
 	NullDependency.Template

package/lib/dependencies/{ImportMetaMainDependency.js → import-meta/ImportMetaMainDependency.js}

@@ -5,21 +5,21 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const ConstDependency = require("./ConstDependency");
-const NullDependency = require("./NullDependency");
+const makeSerializable = require("../../util/makeSerializable");
+const ConstDependency = require("../core/ConstDependency");
+const NullDependency = require("../core/NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency, { UpdateHashContext } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import Dependency, { UpdateHashContext } from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
 /**
  * @import {
  * 	ObjectDeserializerContext,
  * 	ObjectSerializerContext
- * } from "../serialization/ObjectMiddleware"
+ * } from "../../serialization/ObjectMiddleware"
  */
-/** @import Hash from "../util/Hash" */
+/** @import Hash from "../../util/Hash" */
 
 /**
  * `import.meta.main` asks whether the module is the entry, which needs the
@@ -70,10 +70,11 @@ class ImportMetaMainDependency extends ConstDependency {
 	}
 }
 
-makeSerializable(
-	ImportMetaMainDependency,
+makeSerializable(ImportMetaMainDependency, [
+	"webpack/lib/dependencies/import-meta/ImportMetaMainDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/ImportMetaMainDependency"
-);
+]);
 
 ImportMetaMainDependency.Template = class ImportMetaMainDependencyTemplate extends (
 	NullDependency.Template

package/lib/dependencies/{ImportMetaPlugin.js → import-meta/ImportMetaPlugin.js}

@@ -7,34 +7,34 @@
 
 const { pathToFileURL } = require("url");
 const { SyncBailHook } = require("tapable");
-/** @import Compilation from "../Compilation" */
-const DefinePlugin = require("../DefinePlugin");
-const {
-	JAVASCRIPT_MODULE_TYPE_AUTO,
-	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
-const BasicEvaluatedExpression = require("../javascript/BasicEvaluatedExpression");
+/** @import Compilation from "../../Compilation" */
+const DefinePlugin = require("../../define/DefinePlugin");
+const BasicEvaluatedExpression = require("../../javascript/BasicEvaluatedExpression");
 const {
 	evaluateToIdentifier,
 	evaluateToNumber,
 	evaluateToString,
 	toConstantDependency
-} = require("../javascript/JavascriptParserHelpers");
-const { getInnerGraphUtils } = require("../optimize/InnerGraph");
-const createHooksRegistry = require("../util/createHooksRegistry");
-const { propertyAccess } = require("../util/property");
+} = require("../../javascript/JavascriptParserHelpers");
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_ESM
+} = require("../../module/ModuleTypeConstants");
+const { getInnerGraphUtils } = require("../../optimize/InnerGraph");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const Template = require("../../template/Template");
+const createHooksRegistry = require("../../util/createHooksRegistry");
+const { propertyAccess } = require("../../util/property");
+const ConstDependency = require("../core/ConstDependency");
+const ModuleInitFragmentDependency = require("../core/ModuleInitFragmentDependency");
+const ImportMetaResolveDependency = require("../url/ImportMetaResolveDependency");
 const BuildTimeConstDependency = require("./BuildTimeConstDependency");
-const ConstDependency = require("./ConstDependency");
 const ImportMetaMainDependency = require("./ImportMetaMainDependency");
-const ImportMetaResolveDependency = require("./ImportMetaResolveDependency");
-const ModuleInitFragmentDependency = require("./ModuleInitFragmentDependency");
 
 // Loaded at module scope, not inside the parser handler: the async resolver
 // cache tail can run that handler after a test tears down the module registry.
 const WEBPACK_VERSION = Number.parseInt(
-	require("../../package.json").version,
+	require("../../../package.json").version,
 	10
 );
 
@@ -50,25 +50,26 @@ const WEBPACK_VERSION = Number.parseInt(
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import Compiler from "../Compiler" */
-/** @import { MergedDefinitionNode } from "../DefinePlugin" */
-/** @import { ValueCacheVersion } from "../Module" */
-/** @import NormalModule, { NormalModuleBuildInfo } from "../NormalModule" */
+/** @import Compiler from "../../Compiler" */
+/** @import { MergedDefinitionNode } from "../../define/DefinePlugin" */
+/** @import { ValueCacheVersion } from "../../module/Module" */
+/** @import NormalModule, { NormalModuleBuildInfo } from "../../module/NormalModule" */
 /**
  * @import {
  * 	JavascriptModuleBuildInfo
- * } from "../javascript/JavascriptModule"
+ * } from "../../javascript/JavascriptModule"
  */
 /**
  * @import Parser, {
  * 	Range,
  * 	Members,
- * 	DestructuringAssignmentProperty
- * } from "../javascript/JavascriptParser"
+ * 	DestructuringAssignmentProperty,
+ * 	JavascriptParserState
+ * } from "../../javascript/JavascriptParser"
  */
-/** @import { RawRuntimeRequirements } from "./NullDependency" */
+/** @import { RawRuntimeRequirements } from "../core/NullDependency" */
 
 const PLUGIN_NAME = "ImportMetaPlugin";
 
@@ -93,11 +94,9 @@ const IMPORT_META_FIELDS = new Set([
 	"webpackHot"
 ]);
 
-// Single source of truth for `import.meta` accesses that only exist in ES modules
-// and therefore mark a module as ESM (consumed by HarmonyDetectionParserPlugin).
-// `dirname`/`filename` are resolved by NodeStuffPlugin, the rest here. The webpack
-// pragmas `import.meta.webpackHot`/`webpackContext` are intentionally excluded:
-// they are usable in CommonJS modules and must not force ESM.
+// The `import.meta` accesses that exist only in ES modules, and so mark one.
+// `dirname` and `filename` are resolved by NodeStuffPlugin. The webpack pragmas
+// are excluded: they work in CommonJS too and must not force ESM.
 const IMPORT_META_NAMES = [
 	IMPORT_META,
 	IMPORT_META_URL,
@@ -109,11 +108,11 @@ const IMPORT_META_NAMES = [
 	IMPORT_META_RESOLVE
 ];
 
-// Ordering contract for import.meta parser hooks across plugins: ESM detection
-// (HarmonyDetectionParserPlugin, non-bailing) must observe every access before
-// any bailing replacement; the merged replacements here must run before
-// DefinePlugin object defines (default stage 0) and its nested destructuring
-// handler (stage 100).
+// WHY: the ordering contract for the `import.meta` parser hooks across plugins.
+// ESM detection (ESMDetectionParserPlugin, non-bailing) must observe every
+// access before any bailing replacement, and the merged replacements here must
+// run before DefinePlugin's object defines (default stage 0) and its nested
+// destructuring handler (stage 100).
 const IMPORT_META_STAGE_ESM_DETECTION = -1000;
 const IMPORT_META_STAGE_REPLACEMENT = -100;
 
@@ -193,6 +192,12 @@ const importMetaVarName = (parser) => {
 	return `__webpack_import_meta_${index}__`;
 };
 
+/**
+ * The binding of each parse's synthesized `import.meta`, so it is set up once per module.
+ * @type {WeakMap<JavascriptParserState, string>}
+ */
+const importMetaObjects = new WeakMap();
+
 /**
  * Checks whether the callee is the `import.meta.resolve` member.
  * @param {Expression | Super} callee call callee
@@ -409,12 +414,86 @@ class ImportMetaPlugin {
 						JSON.stringify(getUrl(parser.state.module));
 					const importMetaWebpackVersion = () =>
 						JSON.stringify(WEBPACK_VERSION);
+					/**
+					 * Initializes the module's shared import.meta object on demand.
+					 * @param {Expression} expression expression using the object
+					 * @returns {string} the object's local binding
+					 */
+					const getImportMetaObject = (expression) => {
+						const existing = importMetaObjects.get(parser.state);
+						if (existing !== undefined) return existing;
+						const varName = importMetaVarName(parser);
+						const knownProps = [];
+						if (isImportMetaFieldEnabled(importMeta, "url")) {
+							knownProps.push(`url: ${importMetaUrl()}`);
+						}
+						if (isImportMetaFieldEnabled(importMeta, "webpack")) {
+							knownProps.push(`webpack: ${importMetaWebpackVersion()}`);
+						}
+						if (isImportMetaFieldEnabled(importMeta, "main")) {
+							knownProps.push(`main: ${renderImportMetaMain(parser, false)}`);
+						}
+						if (isImportMetaFieldEnabled(importMeta, "env")) {
+							addDefinitionValueDependencies();
+							knownProps.push(
+								`env: ${renderDefinition(envNode, IMPORT_META_ENV)}`
+							);
+						}
+						for (const [prop, node] of customProps) {
+							addDefinitionValueDependencies();
+							knownProps.push(
+								`${DefinePlugin.toPropertyKey(prop)}: ${renderDefinition(
+									node,
+									`${IMPORT_META}.${prop}`
+								)}`
+							);
+						}
+						const plainInitCode = `var ${varName} = {${knownProps.join(
+							", "
+						)}};\n`;
+						// Each module owns its `import.meta`: it copies the bundle's one
+						// and inherits from it, so later host writes stay visible.
+						const initCode = preserveUnknown(importMeta)
+							? `var ${varName} = Object.assign(Object.create(import.meta), import.meta, {${knownProps.join(
+									", "
+								)}});\n`
+							: plainInitCode;
+						/** @type {RawRuntimeRequirements} */
+						const initRuntimeRequirements = [
+							RuntimeGlobals.moduleCache,
+							RuntimeGlobals.entryModuleId,
+							RuntimeGlobals.module
+						];
+						const initCodeRequirements =
+							DefinePlugin.getRuntimeRequirements(initCode);
+						if (initCodeRequirements) {
+							initRuntimeRequirements.push(...initCodeRequirements);
+						}
+						const initDep = new ModuleInitFragmentDependency(
+							initCode,
+							initRuntimeRequirements,
+							varName,
+							// native `import.meta` does not parse in the build-time vm
+							initCode === plainInitCode ? undefined : plainInitCode
+						);
+						initDep.loc = parser.getLocation(expression);
+						parser.state.module.addPresentationalDependency(initDep);
+						importMetaObjects.set(parser.state, varName);
+						return varName;
+					};
 					/**
 					 * Import meta unknown property.
 					 * @param {Members} members members
-					 * @returns {string} error message
+					 * @param {Expression} expression expression using the property
+					 * @returns {string} property access
 					 */
-					const importMetaUnknownProperty = (members) => {
+					const importMetaUnknownProperty = (members, expression) => {
+						if (
+							preserveUnknown(importMeta) &&
+							!IMPORT_META_FIELDS.has(members[0])
+						) {
+							return `${getImportMetaObject(expression)}${propertyAccess(members, 0)}`;
+						}
 						if (
 							preserveUnknown(importMeta) ||
 							(IMPORT_META_FIELDS.has(members[0]) &&
@@ -428,12 +507,11 @@ class ImportMetaPlugin {
 					};
 					/**
 					 * @param {string} field field name
+					 * @param {Expression} expression expression using the property
 					 * @returns {string} generated property
 					 */
-					const importMetaRuntimeProperty = (field) =>
-						`[${JSON.stringify(field)}]: ${importMetaUnknownProperty([
-							field
-						])},`;
+					const importMetaRuntimeProperty = (field, expression) =>
+						`[${JSON.stringify(field)}]: ${importMetaUnknownProperty([field], expression)},`;
 					/**
 					 * Import meta runtime property for build-time execution.
 					 * @param {string} field field name
@@ -474,64 +552,7 @@ class ImportMetaPlugin {
 							const referencedPropertiesInDestructuring =
 								parser.destructuringAssignmentPropertiesFor(metaProperty);
 							if (!referencedPropertiesInDestructuring) {
-								const varName = importMetaVarName(parser);
-								const knownProps = [];
-								if (isImportMetaFieldEnabled(importMeta, "url")) {
-									knownProps.push(`url: ${importMetaUrl()}`);
-								}
-								if (isImportMetaFieldEnabled(importMeta, "webpack")) {
-									knownProps.push(`webpack: ${importMetaWebpackVersion()}`);
-								}
-								if (isImportMetaFieldEnabled(importMeta, "main")) {
-									knownProps.push(
-										`main: ${renderImportMetaMain(parser, false)}`
-									);
-								}
-								if (isImportMetaFieldEnabled(importMeta, "env")) {
-									addDefinitionValueDependencies();
-									knownProps.push(
-										`env: ${renderDefinition(envNode, IMPORT_META_ENV)}`
-									);
-								}
-								for (const [prop, node] of customProps) {
-									addDefinitionValueDependencies();
-									knownProps.push(
-										`${DefinePlugin.toPropertyKey(prop)}: ${renderDefinition(
-											node,
-											`${IMPORT_META}.${prop}`
-										)}`
-									);
-								}
-								const plainInitCode = `var ${varName} = {${knownProps.join(
-									", "
-								)}};\n`;
-								// Each module owns its `import.meta`: it copies the bundle's one
-								// and inherits from it, so later host writes stay visible.
-								const initCode = preserveUnknown(importMeta)
-									? `var ${varName} = Object.assign(Object.create(import.meta), import.meta, {${knownProps.join(
-											", "
-										)}});\n`
-									: plainInitCode;
-								/** @type {RawRuntimeRequirements} */
-								const initRuntimeRequirements = [
-									RuntimeGlobals.moduleCache,
-									RuntimeGlobals.entryModuleId,
-									RuntimeGlobals.module
-								];
-								const initCodeRequirements =
-									DefinePlugin.getRuntimeRequirements(initCode);
-								if (initCodeRequirements) {
-									initRuntimeRequirements.push(...initCodeRequirements);
-								}
-								const initDep = new ModuleInitFragmentDependency(
-									initCode,
-									initRuntimeRequirements,
-									varName,
-									// native `import.meta` does not parse in the build-time vm
-									initCode === plainInitCode ? undefined : plainInitCode
-								);
-								initDep.loc = parser.getLocation(metaProperty);
-								parser.state.module.addPresentationalDependency(initDep);
+								const varName = getImportMetaObject(metaProperty);
 								const dep = new ConstDependency(
 									varName,
 									/** @type {Range} */ (metaProperty.range),
@@ -553,12 +574,11 @@ class ImportMetaPlugin {
 								strBuildTime += code;
 							};
 							/**
-							 * Appends a property reading native `import.meta`, which
-							 * does not parse in the build-time vm.
+							 * Appends a runtime property with its build-time fallback.
 							 * @param {string} field field name
 							 */
 							const appendRuntimeProperty = (field) => {
-								str += importMetaRuntimeProperty(field);
+								str += importMetaRuntimeProperty(field, metaProperty);
 								strBuildTime += importMetaBuildTimeProperty(field);
 							};
 							for (const prop of referencedPropertiesInDestructuring) {
@@ -884,10 +904,9 @@ class ImportMetaPlugin {
 								(IMPORT_META_FIELDS.has(members[0]) &&
 									!isImportMetaFieldEnabled(importMeta, members[0]))
 							) {
-								// keep the native access verbatim for emitted output, but
-								// native `import.meta` does not parse in the build-time vm
+								// Runtime properties are unavailable in the build-time vm.
 								const dep = new BuildTimeConstDependency(
-									`${IMPORT_META}${propertyAccess(members, 0)}`,
+									importMetaUnknownProperty(members, expr),
 									`${Template.toNormalComment(
 										`unsupported import.meta.${members.join(".")}`
 									)} undefined${propertyAccess(members, 1)}`,
@@ -898,7 +917,7 @@ class ImportMetaPlugin {
 								return true;
 							}
 							const dep = new ConstDependency(
-								importMetaUnknownProperty(members),
+								importMetaUnknownProperty(members, expr),
 								/** @type {Range} */ (expr.range)
 							);
 							dep.loc = parser.getLocation(expr);

package/lib/dependencies/{SystemPlugin.js → system/SystemPlugin.js}

@@ -5,29 +5,27 @@
 
 "use strict";
 
-const {
-	JAVASCRIPT_MODULE_TYPE_AUTO,
-	JAVASCRIPT_MODULE_TYPE_DYNAMIC
-} = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const WebpackError = require("../errors/WebpackError");
+const SystemImportDeprecationWarning = require("../../errors/SystemImportDeprecationWarning");
 const {
 	evaluateToString,
 	expressionIsUnsupported,
 	toConstantDependency
-} = require("../javascript/JavascriptParserHelpers");
-const makeSerializable = require("../util/makeSerializable");
-const ConstDependency = require("./ConstDependency");
+} = require("../../javascript/JavascriptParserHelpers");
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const ConstDependency = require("../core/ConstDependency");
 const SystemRuntimeModule = require("./SystemRuntimeModule");
 
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import Compiler from "../Compiler" */
-/** @import { DependencyLocation } from "../Dependency" */
-/** @import Parser, { Range } from "../javascript/JavascriptParser" */
+/** @import Compiler from "../../Compiler" */
+/** @import Parser, { Range } from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "SystemPlugin";
 
@@ -145,31 +143,6 @@ class SystemPlugin {
 	}
 }
 
-class SystemImportDeprecationWarning extends WebpackError {
-	/**
-	 * Creates an instance of SystemImportDeprecationWarning.
-	 * @param {DependencyLocation} loc location
-	 */
-	constructor(loc) {
-		super(
-			"System.import() is deprecated and will be removed soon. Use import() instead.\n" +
-				"For more info visit https://webpack.js.org/guides/code-splitting/"
-		);
-
-		/** @type {string} */
-		this.name = "SystemImportDeprecationWarning";
-
-		/** @type {DependencyLocation} */
-		this.loc = loc;
-	}
-}
-
-makeSerializable(
-	SystemImportDeprecationWarning,
-	"webpack/lib/dependencies/SystemPlugin",
-	"SystemImportDeprecationWarning"
-);
-
 SystemPlugin.SystemImportDeprecationWarning = SystemImportDeprecationWarning;
 
 module.exports = SystemPlugin;

package/lib/dependencies/{SystemRuntimeModule.js → system/SystemRuntimeModule.js}

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const RuntimeModule = require("../../runtime/RuntimeModule");
+const Template = require("../../template/Template");
 
 class SystemRuntimeModule extends RuntimeModule {
 	constructor() {

package/lib/dependencies/{ImportMetaResolveDependency.js → url/ImportMetaResolveDependency.js}

@@ -5,14 +5,14 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const makeSerializable = require("../util/makeSerializable");
-const ModuleDependency = require("./ModuleDependency");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const makeSerializable = require("../../util/makeSerializable");
+const ModuleDependency = require("../core/ModuleDependency");
 const URLDependency = require("./URLDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Dependency from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
 
 // `import.meta.resolve(specifier)` is the string form of
 // `new URL(specifier, import.meta.url)`, so it reuses the URL asset pipeline
@@ -81,9 +81,10 @@ ImportMetaResolveDependency.Template = class ImportMetaResolveDependencyTemplate
 	}
 };
 
-makeSerializable(
-	ImportMetaResolveDependency,
+makeSerializable(ImportMetaResolveDependency, [
+	"webpack/lib/dependencies/url/ImportMetaResolveDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/ImportMetaResolveDependency"
-);
+]);
 
 module.exports = ImportMetaResolveDependency;