webpack 5.111.0 → 5.112.0

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

@@ -5,16 +5,16 @@
 
 "use strict";
 
-const { parseResource } = require("../util/identifier");
+const { parseResource } = require("../../util/identifier");
 
 /** @import { Expression } from "estree" */
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
-/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
+/** @import BasicEvaluatedExpression from "../../javascript/BasicEvaluatedExpression" */
+/** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
 /**
  * @import ContextDependency, {
  * 	ContextDependencyOptions,
@@ -23,11 +23,27 @@ const { parseResource } = require("../util/identifier");
  */
 
 /**
- * Escapes regular expression metacharacters
+ * Escapes regular expression metacharacters.
+ *
+ * `-` is intentionally left unescaped: outside a character class it is a
+ * literal, and the quoted string is only ever concatenated between anchors
+ * (never inside `[...]`). Escaping it as `\-` would also be an invalid escape
+ * under the `u`/`v` flags, which `getWrappedContextFlags` now preserves — so
+ * e.g. `` import(`./dir/module-${x}.js`) `` with a Unicode `wrappedContextRegExp`
+ * would throw when the matcher is rebuilt.
  * @param {string} str String to quote
  * @returns {string} Escaped string
  */
-const quoteMeta = (str) => str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
+const quoteMeta = (str) => str.replace(/[[\]\\/{}()*+?.^$|]/g, "\\$&");
+
+/**
+ * Returns the flags of a wrapped context RegExp, minus the stateful `g`/`y`
+ * flags, so the rebuilt matcher keeps `i`/`m`/`s`/`u` but stays safe to reuse
+ * across ContextModuleFactory's per-candidate `regExp.test()` calls.
+ * @param {RegExp} regExp the user's wrappedContextRegExp
+ * @returns {string} flags to apply to the rebuilt RegExp
+ */
+const getWrappedContextFlags = (regExp) => regExp.flags.replace(/[gy]/g, "");
 
 /**
  * Split context from prefix.
@@ -48,7 +64,7 @@ const splitContextFromPrefix = (prefix) => {
 };
 
 /** @typedef {Partial<Omit<ContextDependencyOptions, "resource">>} PartialContextDependencyOptions */
-/** @typedef {{ new (options: ContextDependencyOptions, range: Range, valueRange: Range, ...args: EXPECTED_ANY[]): ContextDependency }} ContextDependencyConstructor */
+/** @typedef {{ new (options: ContextDependencyOptions, range: Range, valueRange: Range, ...args: never[]): ContextDependency }} ContextDependencyConstructor */
 
 /**
  * Defines the get additional dep args type used by this module.
@@ -107,17 +123,14 @@ module.exports.create = (
 				)
 				.join("");
 
-		// Example: `./context/pre${e}inner${e}inner2${e}post?query#frag`
-		// context: "./context"
-		// prefix: "./pre"
-		// innerQuasis: [BEE("inner"), BEE("inner2")]
-		// (BEE = BasicEvaluatedExpression)
-		// postfix: "post"
-		// query: "?query"
-		// fragment: "#frag"
-		// regExp: /^\.\/pre.*inner.*inner2.*post$/
+		// The template's quasis become the literal anchors of the regexp and its
+		// expressions the gaps between them, so `./context/pre${e}inner${e}post`
+		// matches `/^\.\/pre.*inner.*post$/` under the context `./context`.
 		const regExp = new RegExp(
-			`^${quoteMeta(prefix)}${innerRegExp}${quoteMeta(postfix)}$`
+			`^${quoteMeta(prefix)}${innerRegExp}${quoteMeta(postfix)}$`,
+			getWrappedContextFlags(
+				/** @type {RegExp} */ (options.wrappedContextRegExp)
+			)
 		);
 		const dep = new Dep(
 			{
@@ -215,7 +228,10 @@ module.exports.create = (
 		const regExp = new RegExp(
 			`^${quoteMeta(prefix)}${
 				/** @type {RegExp} */ (options.wrappedContextRegExp).source
-			}${quoteMeta(postfix)}$`
+			}${quoteMeta(postfix)}$`,
+			getWrappedContextFlags(
+				/** @type {RegExp} */ (options.wrappedContextRegExp)
+			)
 		);
 		const dep = new Dep(
 			{

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

@@ -8,9 +8,9 @@
 const ContextDependency = require("./ContextDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @import Dependency from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
 
 class ContextDependencyTemplateAsId extends ContextDependency.Template {
 	/**

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

@@ -8,9 +8,9 @@
 const ContextDependency = require("./ContextDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @import Dependency from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
 
 class ContextDependencyTemplateAsRequireCall
 	extends ContextDependency.Template

package/lib/dependencies/context/ContextElementDependency.js

@@ -0,0 +1,198 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const Dependency = require("../../graph/Dependency");
+const makeSerializable = require("../../util/makeSerializable");
+const { ImportPhase, ImportPhaseUtils } = require("../core/ImportPhase");
+const ModuleDependency = require("../core/ModuleDependency");
+
+/** @import ContextModule from "../../context/ContextModule" */
+/** @import { RawReferencedExports, ReferencedExports, DependencyKinds } from "../../graph/Dependency" */
+/** @import Module from "../../module/Module" */
+/** @import ModuleGraph from "../../graph/ModuleGraph" */
+/** @import { ImportAttributes } from "../../javascript/JavascriptParser" */
+/** @import { RuntimeSpec } from "../../util/runtime" */
+/** @import { ImportPhaseType } from "../core/ImportPhase" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[string | undefined, string, RawReferencedExports | null | undefined, ImportAttributes | undefined, string | undefined, ImportPhaseType]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[string | undefined, string, RawReferencedExports | null | undefined, ImportAttributes | undefined, string | undefined, ImportPhaseType]>} ObjectSerializerContext */
+
+class ContextElementDependency extends ModuleDependency {
+	/**
+	 * Creates an instance of ContextElementDependency.
+	 * @param {string} request request
+	 * @param {string | undefined} userRequest user request
+	 * @param {string | undefined} typePrefix type prefix
+	 * @param {string} category category
+	 * @param {RawReferencedExports | null=} referencedExports referenced exports
+	 * @param {string=} context context
+	 * @param {ImportAttributes=} attributes import assertions
+	 * @param {string=} contextRequest the request of the context as written by the user, without query and fragment
+	 * @param {ImportPhaseType=} phase import phase
+	 */
+	constructor(
+		request,
+		userRequest,
+		typePrefix,
+		category,
+		referencedExports,
+		context,
+		attributes,
+		contextRequest,
+		phase = ImportPhase.Evaluation
+	) {
+		super(request);
+
+		if (userRequest) {
+			/** @type {string} */
+			this.userRequest = userRequest;
+		}
+
+		/** @type {string | undefined} */
+		this._typePrefix = typePrefix;
+		/** @type {string} */
+		this._category = category;
+		/** @type {RawReferencedExports | null | undefined} */
+		this.referencedExports = referencedExports;
+		/** @type {string | undefined} */
+		this._context = context || undefined;
+		/** @type {ImportAttributes | undefined} */
+		this.attributes = attributes;
+		/** @type {string | undefined} */
+		this._contextRequest = contextRequest || undefined;
+		/** @type {ImportPhaseType} */
+		this.phase = phase;
+	}
+
+	/**
+	 * The request as the user wrote it, e.g. `#configs/file.mjs` where `request`
+	 * is the `./file.mjs` relative to the resolved `#configs` directory.
+	 * @returns {string} the original request
+	 */
+	get originalRequest() {
+		const request = this.request;
+		if (this._contextRequest === undefined || !request.startsWith("./")) {
+			return request;
+		}
+		return this._contextRequest + request.slice(1);
+	}
+
+	get type() {
+		if (this._typePrefix) {
+			return `${this._typePrefix} context element`;
+		}
+
+		return "context element";
+	}
+
+	get category() {
+		return this._category;
+	}
+
+	/**
+	 * Returns an identifier to merge equal requests.
+	 * @returns {string | null} an identifier to merge equal requests
+	 */
+	getResourceIdentifier() {
+		let str = super.getResourceIdentifier();
+		if (this.phase) {
+			str += `|phase${ImportPhaseUtils.stringify(this.phase)}`;
+		}
+		if (this.attributes) {
+			str += `|attributes${JSON.stringify(this.attributes)}`;
+		}
+		return str;
+	}
+
+	/**
+	 * Returns list of exports referenced by this dependency
+	 * @param {ModuleGraph} moduleGraph module graph
+	 * @param {RuntimeSpec} runtime the runtime for which the module is analysed
+	 * @returns {ReferencedExports} referenced exports
+	 */
+	getReferencedExports(moduleGraph, runtime) {
+		if (!this.referencedExports) return Dependency.EXPORTS_OBJECT_REFERENCED;
+		/** @type {ReferencedExports} */
+		const refs = [];
+		for (const referencedExport of this.referencedExports) {
+			if (
+				this._typePrefix === "import()" &&
+				referencedExport[0] === "default"
+			) {
+				const selfModule =
+					/** @type {ContextModule} */
+					(moduleGraph.getParentModule(this));
+				const importedModule =
+					/** @type {Module} */
+					(moduleGraph.getModule(this));
+				const exportsType = importedModule.getExportsType(
+					moduleGraph,
+					selfModule.options.namespaceObject === "strict"
+				);
+				if (
+					exportsType === "default-only" ||
+					exportsType === "default-with-named"
+				) {
+					return Dependency.EXPORTS_OBJECT_REFERENCED;
+				}
+			}
+			refs.push({
+				name: referencedExport,
+				canMangle: false,
+				canInline: false
+			});
+		}
+		return refs;
+	}
+
+	/**
+	 * Serializes this instance into the provided serializer context.
+	 * @param {ObjectSerializerContext} context context
+	 */
+	serialize(context) {
+		context
+			.write(this._typePrefix)
+			.write(this._category)
+			.write(this.referencedExports)
+			.write(this.attributes)
+			.write(this._contextRequest)
+			.write(this.phase);
+		super.serialize(context);
+	}
+
+	/**
+	 * Restores this instance from the provided deserializer context.
+	 * @param {ObjectDeserializerContext} context context
+	 */
+	deserialize(context) {
+		this._typePrefix = context.read();
+		const c1 = context.rest;
+		this._category = c1.read();
+		const c2 = c1.rest;
+		this.referencedExports = c2.read();
+		const c3 = c2.rest;
+		this.attributes = c3.read();
+		const c4 = c3.rest;
+		this._contextRequest = c4.read();
+		const c5 = c4.rest;
+		this.phase = c5.read();
+		super.deserialize(c5.rest);
+	}
+}
+
+makeSerializable(ContextElementDependency, [
+	"webpack/lib/dependencies/context/ContextElementDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
+	"webpack/lib/dependencies/ContextElementDependency"
+]);
+
+/** @type {Set<keyof DependencyKinds>} */
+ContextElementDependency.KINDS = new Set([
+	...ModuleDependency.KINDS,
+	"context-element"
+]);
+
+module.exports = ContextElementDependency;

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

@@ -5,11 +5,11 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
+const makeSerializable = require("../../util/makeSerializable");
+const ModuleDependencyTemplateAsRequireId = require("../core/ModuleDependencyTemplateAsRequireId");
 const ContextDependency = require("./ContextDependency");
-const ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
 
-/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
 /** @import { ContextDependencyOptions } from "./ContextDependency" */
 
 class ImportMetaContextDependency extends ContextDependency {
@@ -33,10 +33,11 @@ class ImportMetaContextDependency extends ContextDependency {
 	}
 }
 
-makeSerializable(
-	ImportMetaContextDependency,
+makeSerializable(ImportMetaContextDependency, [
+	"webpack/lib/dependencies/context/ImportMetaContextDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/ImportMetaContextDependency"
-);
+]);
 
 ImportMetaContextDependency.Template = ModuleDependencyTemplateAsRequireId;
 

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

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const WebpackError = require("../errors/WebpackError");
+const WebpackError = require("../../errors/WebpackError");
 const {
 	evaluateToIdentifier
-} = require("../javascript/JavascriptParserHelpers");
+} = require("../../javascript/JavascriptParserHelpers");
 const ImportMetaContextDependency = require("./ImportMetaContextDependency");
 
 /**
@@ -19,12 +19,12 @@ const ImportMetaContextDependency = require("./ImportMetaContextDependency");
  * 	Identifier
  * } from "estree"
  */
-/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
-/** @import { ContextModuleOptions, ContextMode } from "../ContextModule" */
-/** @import { ChunkName } from "../Chunk" */
-/** @import { RawChunkGroupOptions } from "../ChunkGroup" */
-/** @import { RawReferencedExports, DependencyLocation } from "../Dependency" */
-/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
+/** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
+/** @import { ContextModuleOptions, ContextMode } from "../../context/ContextModule" */
+/** @import { ChunkName } from "../../graph/Chunk" */
+/** @import { RawChunkGroupOptions } from "../../graph/ChunkGroup" */
+/** @import { RawReferencedExports, DependencyLocation } from "../../graph/Dependency" */
+/** @import BasicEvaluatedExpression from "../../javascript/BasicEvaluatedExpression" */
 
 /** @typedef {Pick<ContextModuleOptions, "mode" | "recursive" | "regExp" | "include" | "exclude" | "chunkName"> & { groupOptions: RawChunkGroupOptions, exports?: RawReferencedExports }} ImportMetaContextOptions */
 
@@ -301,7 +301,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 					}
 				}
 				if (errors.length) {
-					for (const error of errors) parser.state.current.addError(error);
+					for (const error of errors) parser.state.module.addError(error);
 					return;
 				}
 

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

@@ -8,21 +8,21 @@
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("../ModuleTypeConstants");
+} = require("../../module/ModuleTypeConstants");
+const { isImportMetaFieldEnabled } = require("../import-meta/ImportMetaPlugin");
 const ContextElementDependency = require("./ContextElementDependency");
 const ImportMetaContextDependency = require("./ImportMetaContextDependency");
 const ImportMetaContextDependencyParserPlugin = require("./ImportMetaContextDependencyParserPlugin");
 const ImportMetaGlobDependency = require("./ImportMetaGlobDependency");
 const ImportMetaGlobDependencyParserPlugin = require("./ImportMetaGlobDependencyParserPlugin");
-const { isImportMetaFieldEnabled } = require("./ImportMetaPlugin");
 
 /**
  * @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 = "ImportMetaContextPlugin";
 

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

@@ -5,11 +5,11 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
+const makeSerializable = require("../../util/makeSerializable");
+const ModuleDependencyTemplateAsRequireId = require("../core/ModuleDependencyTemplateAsRequireId");
 const ContextDependency = require("./ContextDependency");
-const ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
 
-/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
 /** @import { ContextDependencyOptions } from "./ContextDependency" */
 
 /**
@@ -71,10 +71,11 @@ class ImportMetaGlobDependency extends ContextDependency {
 	}
 }
 
-makeSerializable(
-	ImportMetaGlobDependency,
+makeSerializable(ImportMetaGlobDependency, [
+	"webpack/lib/dependencies/context/ImportMetaGlobDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/ImportMetaGlobDependency"
-);
+]);
 
 ImportMetaGlobDependency.Template = ModuleDependencyTemplateAsRequireId;
 

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

@@ -7,12 +7,12 @@
 
 const {
 	evaluateToIdentifier
-} = require("../javascript/JavascriptParserHelpers");
+} = require("../../javascript/JavascriptParserHelpers");
 const ImportMetaGlobDependency = require("./ImportMetaGlobDependency");
 const { parseImportMetaGlobCall } = require("./ImportMetaGlobHelpers");
 
 /** @import { CallExpression } from "estree" */
-/** @import JavascriptParser from "../javascript/JavascriptParser" */
+/** @import JavascriptParser from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "ImportMetaGlobDependencyParserPlugin";
 
@@ -43,7 +43,7 @@ module.exports = class ImportMetaGlobDependencyParserPlugin {
 				parser.state.module.addWarning(warning);
 			}
 			if (errors.length) {
-				for (const error of errors) parser.state.current.addError(error);
+				for (const error of errors) parser.state.module.addError(error);
 				return;
 			}
 			if (!globOptions) return;
@@ -59,7 +59,7 @@ module.exports = class ImportMetaGlobDependencyParserPlugin {
 					caseSensitive: globOptions.caseSensitive,
 					referencedExports: globOptions.referencedExports,
 					namespaceObject:
-						/** @type {import("../Module").BuildMeta} */
+						/** @type {import("../../module/Module").BuildMeta} */
 						(parser.state.module.buildMeta).strictHarmonyModule
 							? "strict"
 							: true,

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

@@ -5,11 +5,11 @@
 
 "use strict";
 
-/** @import UnsupportedFeatureWarning from "../errors/UnsupportedFeatureWarning" */
+/** @import UnsupportedFeatureWarning from "../../errors/UnsupportedFeatureWarning" */
 
 const path = require("path");
 
-const WebpackError = require("../errors/WebpackError");
+const WebpackError = require("../../errors/WebpackError");
 const {
 	commonGlobBaseDir,
 	globPatternsAreRecursive,
@@ -19,17 +19,17 @@ const {
 	normalizePathSeparators,
 	normalizePathSeparatorsForPath,
 	resolveContextModuleGlobPattern
-} = require("../util/globUtils");
-const { relativePathToRequest } = require("../util/identifier");
-const memoize = require("../util/memoize");
+} = require("../../util/globUtils");
+const { relativePathToRequest } = require("../../util/identifier");
+const memoize = require("../../util/memoize");
 
 const getUnsupportedFeatureWarning = memoize(() =>
-	require("../errors/UnsupportedFeatureWarning")
+	require("../../errors/UnsupportedFeatureWarning")
 );
 
-/** @import { ContextModuleOptions } from "../ContextModule" */
-/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
-/** @import { RawReferencedExports, DependencyLocation } from "../Dependency" */
+/** @import { ContextModuleOptions } from "../../context/ContextModule" */
+/** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
+/** @import { RawReferencedExports, DependencyLocation } from "../../graph/Dependency" */
 /**
  * @import {
  * 	CallExpression,

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

@@ -5,11 +5,11 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
+const makeSerializable = require("../../util/makeSerializable");
+const ModuleDependencyTemplateAsRequireId = require("../core/ModuleDependencyTemplateAsRequireId");
 const ContextDependency = require("./ContextDependency");
-const ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
 
-/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
 /** @import { ContextDependencyOptions } from "./ContextDependency" */
 
 class RequireContextDependency extends ContextDependency {
@@ -29,10 +29,11 @@ class RequireContextDependency extends ContextDependency {
 	}
 }
 
-makeSerializable(
-	RequireContextDependency,
+makeSerializable(RequireContextDependency, [
+	"webpack/lib/dependencies/context/RequireContextDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/RequireContextDependency"
-);
+]);
 
 RequireContextDependency.Template = ModuleDependencyTemplateAsRequireId;
 

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

@@ -7,8 +7,8 @@
 
 const RequireContextDependency = require("./RequireContextDependency");
 
-/** @import { ContextMode } from "../ContextModule" */
-/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
+/** @import { ContextMode } from "../../context/ContextModule" */
+/** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "RequireContextDependencyParserPlugin";
 

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

@@ -8,8 +8,8 @@
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC
-} = require("../ModuleTypeConstants");
-const { cachedSetProperty } = require("../util/cleverMerge");
+} = require("../../module/ModuleTypeConstants");
+const { cachedSetProperty } = require("../../util/cleverMerge");
 const ContextElementDependency = require("./ContextElementDependency");
 const RequireContextDependency = require("./RequireContextDependency");
 const RequireContextDependencyParserPlugin = require("./RequireContextDependencyParserPlugin");
@@ -18,10 +18,10 @@ const RequireContextDependencyParserPlugin = require("./RequireContextDependency
  * @import {
  * 	JavascriptParserOptions,
  * 	ResolveOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import Compiler from "../Compiler" */
-/** @import Parser from "../javascript/JavascriptParser" */
+/** @import Compiler from "../../Compiler" */
+/** @import Parser from "../../javascript/JavascriptParser" */
 
 /** @type {ResolveOptions} */
 const EMPTY_RESOLVE_OPTIONS = {};

package/lib/dependencies/{CachedConstDependency.js → core/CachedConstDependency.js}

@@ -5,22 +5,22 @@
 
 "use strict";
 
-const DependencyTemplate = require("../DependencyTemplate");
-const InitFragment = require("../InitFragment");
-const makeSerializable = require("../util/makeSerializable");
+const DependencyTemplate = require("../../template/DependencyTemplate");
+const InitFragment = require("../../template/InitFragment");
+const makeSerializable = require("../../util/makeSerializable");
 const NullDependency = require("./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" */
 
 class CachedConstDependency extends NullDependency {
 	/**
@@ -104,10 +104,11 @@ class CachedConstDependency extends NullDependency {
 CachedConstDependency.PLACE_MODULE = 10;
 CachedConstDependency.PLACE_CHUNK = 20;
 
-makeSerializable(
-	CachedConstDependency,
+makeSerializable(CachedConstDependency, [
+	"webpack/lib/dependencies/core/CachedConstDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/CachedConstDependency"
-);
+]);
 
 CachedConstDependency.Template = class CachedConstDependencyTemplate extends (
 	DependencyTemplate