@depup/webpack 5.111.1-depup.2 → 5.112.0-depup.1

package/lib/dependencies/ConstDependency.js

@@ -5,123 +5,6 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const NullDependency = require("./NullDependency");
-
-/** @import { ReplaceSource } from "webpack-sources" */
-/** @import { RawRuntimeRequirements } from "./NullDependency" */
-/** @import Dependency, { UpdateHashContext } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { ConnectionState } from "../ModuleGraphConnection" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, number | Range, Set<string> | null]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, number | Range, Set<string> | null]>} ObjectSerializerContext */
-/** @import Hash from "../util/Hash" */
-
-class ConstDependency extends NullDependency {
-	/**
-	 * Creates an instance of ConstDependency.
-	 * @param {string} expression the expression
-	 * @param {number | Range} range the source range
-	 * @param {RawRuntimeRequirements | null=} runtimeRequirements runtime requirements
-	 */
-	constructor(expression, range, runtimeRequirements) {
-		super();
-		/** @type {string} */
-		this.expression = expression;
-		this.range = range;
-		/** @type {Set<string> | null} */
-		this.runtimeRequirements = runtimeRequirements
-			? new Set(runtimeRequirements)
-			: null;
-		/** @type {undefined | string} */
-		this._hashUpdate = undefined;
-	}
-
-	/**
-	 * Updates the hash with the data contributed by this instance.
-	 * @param {Hash} hash hash to be updated
-	 * @param {UpdateHashContext} context context
-	 * @returns {void}
-	 */
-	updateHash(hash, context) {
-		if (this._hashUpdate === undefined) {
-			let hashUpdate = `${this.range}|${this.expression}`;
-			if (this.runtimeRequirements) {
-				for (const item of this.runtimeRequirements) {
-					hashUpdate += "|";
-					hashUpdate += item;
-				}
-			}
-			this._hashUpdate = hashUpdate;
-		}
-		hash.update(this._hashUpdate);
-	}
-
-	/**
-	 * Gets module evaluation side effects state.
-	 * @param {ModuleGraph} moduleGraph the module graph
-	 * @returns {ConnectionState} how this dependency connects the module to referencing modules
-	 */
-	getModuleEvaluationSideEffectsState(moduleGraph) {
-		return false;
-	}
-
-	/**
-	 * Serializes this instance into the provided serializer context.
-	 * @param {ObjectSerializerContext} context context
-	 */
-	serialize(context) {
-		// chain writes so each position is type-checked against the tuple
-		context
-			.write(this.expression)
-			.write(this.range)
-			.write(this.runtimeRequirements);
-		super.serialize(context);
-	}
-
-	/**
-	 * Restores this instance from the provided deserializer context.
-	 * @param {ObjectDeserializerContext} context context
-	 */
-	deserialize(context) {
-		// advance the cursor via `rest` so each read is type-checked by position
-		this.expression = context.read();
-		const c1 = context.rest;
-		this.range = c1.read();
-		const c2 = c1.rest;
-		this.runtimeRequirements = c2.read();
-		super.deserialize(c2.rest);
-	}
-}
-
-makeSerializable(ConstDependency, "webpack/lib/dependencies/ConstDependency");
-
-ConstDependency.Template = class ConstDependencyTemplate extends (
-	NullDependency.Template
-) {
-	/**
-	 * Applies the plugin by registering its hooks on the compiler.
-	 * @param {Dependency} dependency the dependency for which the template should be applied
-	 * @param {ReplaceSource} source the current replace source which can be modified
-	 * @param {DependencyTemplateContext} templateContext the context object
-	 * @returns {void}
-	 */
-	apply(dependency, source, templateContext) {
-		const dep = /** @type {ConstDependency} */ (dependency);
-		if (dep.runtimeRequirements) {
-			for (const req of dep.runtimeRequirements) {
-				templateContext.runtimeRequirements.add(req);
-			}
-		}
-		if (typeof dep.range === "number") {
-			source.insert(dep.range, dep.expression);
-			return;
-		}
-
-		source.replace(dep.range[0], dep.range[1] - 1, dep.expression);
-	}
-};
-
-module.exports = ConstDependency;
+// TODO in the next major release: remove
+// Some old plugins use `require("webpack/lib/dependencies/ConstDependency")`, in the next major release developer should migrate to `compiler.webpack.dependencies.ConstDependency`
+module.exports = require("./core/ConstDependency");

package/lib/dependencies/ContextElementDependency.js

@@ -5,175 +5,8 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const makeSerializable = require("../util/makeSerializable");
-const ModuleDependency = require("./ModuleDependency");
-
-/** @import ContextModule from "../context/ContextModule" */
-/** @import { RawReferencedExports, ReferencedExports } from "../Dependency" */
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import { ImportAttributes } from "../javascript/JavascriptParser" */
-/** @import { RuntimeSpec } from "../util/runtime" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string | undefined, string, RawReferencedExports | null | undefined, ImportAttributes | undefined, string | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string | undefined, string, RawReferencedExports | null | undefined, ImportAttributes | undefined, string | undefined]>} 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
-	 */
-	constructor(
-		request,
-		userRequest,
-		typePrefix,
-		category,
-		referencedExports,
-		context,
-		attributes,
-		contextRequest
-	) {
-		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;
-	}
-
-	/**
-	 * 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.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);
-		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();
-		super.deserialize(c4.rest);
-	}
-}
-
-makeSerializable(
-	ContextElementDependency,
-	"webpack/lib/dependencies/ContextElementDependency"
-);
-
-module.exports = ContextElementDependency;
+// TODO in the next major release: remove
+// Some old plugins use `require("webpack/lib/dependencies/ContextElementDependency")`;
+// it is not on `compiler.webpack`, so in the next major release they should
+// require `webpack/lib/dependencies/context/ContextElementDependency`
+module.exports = require("./context/ContextElementDependency");

package/lib/dependencies/NullDependency.js

@@ -5,40 +5,6 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
-const DependencyTemplate = require("../DependencyTemplate");
-
-/** @import { ReplaceSource } from "webpack-sources" */
-/** @import { TRANSITIVE } from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-
-/** @typedef {string[]} RawRuntimeRequirements */
-
-class NullDependency extends Dependency {
-	get type() {
-		return "null";
-	}
-
-	/**
-	 * Could affect referencing module.
-	 * @returns {boolean | TRANSITIVE} true, when changes to the referenced module could affect the referencing module; TRANSITIVE, when changes to the referenced module could affect referencing modules of the referencing module
-	 */
-	couldAffectReferencingModule() {
-		return false;
-	}
-}
-
-NullDependency.Template = class NullDependencyTemplate extends (
-	DependencyTemplate
-) {
-	/**
-	 * Applies the plugin by registering its hooks on the compiler.
-	 * @param {Dependency} dependency the dependency for which the template should be applied
-	 * @param {ReplaceSource} source the current replace source which can be modified
-	 * @param {DependencyTemplateContext} templateContext the context object
-	 * @returns {void}
-	 */
-	apply(dependency, source, templateContext) {}
-};
-
-module.exports = NullDependency;
+// TODO in the next major release: remove
+// Some old plugins use `require("webpack/lib/dependencies/NullDependency")`, in the next major release developer should migrate to `compiler.webpack.dependencies.NullDependency`
+module.exports = require("./core/NullDependency");

package/lib/dependencies/{AMDDefineDependency.js → amd/AMDDefineDependency.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 LocalModule from "./LocalModule" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
-/** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range | null, Range | null, Range | null, string | null, LocalModule | null]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range | null, Range | null, Range | null, string | null, LocalModule | null]>} ObjectSerializerContext */
+/** @import Dependency from "../../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../../template/DependencyTemplate" */
+/** @import { Range } from "../../javascript/JavascriptParser" */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range | null, Range | null, Range | null, string | null, LocalModule | null]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range | null, Range | null, Range | null, string | null, LocalModule | null]>} ObjectSerializerContext */
 
 /**
  * @typedef {object} Definition
@@ -188,10 +188,11 @@ class AMDDefineDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	AMDDefineDependency,
+makeSerializable(AMDDefineDependency, [
+	"webpack/lib/dependencies/amd/AMDDefineDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/AMDDefineDependency"
-);
+]);
 
 AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends (
 	NullDependency.Template

package/lib/dependencies/{AMDDefineDependencyParserPlugin.js → amd/AMDDefineDependencyParserPlugin.js}

@@ -5,15 +5,15 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const { recordOptimizationBailout } = require("../util/buildDiagnostics");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const { recordOptimizationBailout } = require("../../util/buildDiagnostics");
+const ContextDependencyHelpers = require("../context/ContextDependencyHelpers");
+const ConstDependency = require("../core/ConstDependency");
+const DynamicExports = require("../helpers/DynamicExports");
 const AMDDefineDependency = require("./AMDDefineDependency");
 const AMDRequireArrayDependency = require("./AMDRequireArrayDependency");
 const AMDRequireContextDependency = require("./AMDRequireContextDependency");
 const AMDRequireItemDependency = require("./AMDRequireItemDependency");
-const ConstDependency = require("./ConstDependency");
-const ContextDependencyHelpers = require("./ContextDependencyHelpers");
-const DynamicExports = require("./DynamicExports");
 const LocalModuleDependency = require("./LocalModuleDependency");
 const { addLocalModule, getLocalModule } = require("./LocalModulesHelpers");
 
@@ -33,16 +33,16 @@ const { addLocalModule, getLocalModule } = require("./LocalModulesHelpers");
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import Dependency from "../Dependency" */
-/** @import { BuildInfo } from "../Module" */
-/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
+/** @import Dependency from "../../graph/Dependency" */
+/** @import { BuildInfo } from "../../module/Module" */
+/** @import BasicEvaluatedExpression from "../../javascript/BasicEvaluatedExpression" */
 /**
  * @import JavascriptParser, {
  * 	ExportedVariableInfo,
  * 	Range
- * } from "../javascript/JavascriptParser"
+ * } from "../../javascript/JavascriptParser"
  */
 /** @import LocalModule from "./LocalModule" */
 

package/lib/dependencies/{AMDPlugin.js → amd/AMDPlugin.js}

@@ -5,18 +5,19 @@
 
 "use strict";
 
-const {
-	JAVASCRIPT_MODULE_TYPE_AUTO,
-	JAVASCRIPT_MODULE_TYPE_DYNAMIC
-} = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
 const {
 	approve,
 	evaluateToIdentifier,
 	evaluateToString,
 	toConstantDependency
-} = require("../javascript/JavascriptParserHelpers");
+} = 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 AMDDefineDependency = require("./AMDDefineDependency");
 const AMDDefineDependencyParserPlugin = require("./AMDDefineDependencyParserPlugin");
 const AMDRequireArrayDependency = require("./AMDRequireArrayDependency");
@@ -28,7 +29,6 @@ const {
 	AMDDefineRuntimeModule,
 	AMDOptionsRuntimeModule
 } = require("./AMDRuntimeModules");
-const ConstDependency = require("./ConstDependency");
 const LocalModuleDependency = require("./LocalModuleDependency");
 const UnsupportedDependency = require("./UnsupportedDependency");
 
@@ -36,11 +36,11 @@ const UnsupportedDependency = require("./UnsupportedDependency");
  * @import {
  * 	Amd,
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import Compiler from "../Compiler" */
-/** @import Parser, { Range } from "../javascript/JavascriptParser" */
-/** @import { GetMembers } from "../javascript/BasicEvaluatedExpression" */
+/** @import Compiler from "../../Compiler" */
+/** @import Parser, { Range } from "../../javascript/JavascriptParser" */
+/** @import { GetMembers } from "../../javascript/BasicEvaluatedExpression" */
 
 const PLUGIN_NAME = "AMDPlugin";
 

package/lib/dependencies/{AMDRequireArrayDependency.js → amd/AMDRequireArrayDependency.js}

@@ -5,18 +5,19 @@
 
 "use strict";
 
-const DependencyTemplate = require("../DependencyTemplate");
-const makeSerializable = require("../util/makeSerializable");
-const LocalModuleDependency = require("./LocalModuleDependency");
-const NullDependency = require("./NullDependency");
+const isDependencyKind = require("../../graph/isDependencyKind");
+const DependencyTemplate = require("../../template/DependencyTemplate");
+const makeSerializable = require("../../util/makeSerializable");
+const NullDependency = require("../core/NullDependency");
 
+/** @import LocalModuleDependency from "./LocalModuleDependency" */
 /** @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 AMDRequireItemDependency from "./AMDRequireItemDependency" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[(string | LocalModuleDependency | AMDRequireItemDependency)[], Range]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[(string | LocalModuleDependency | AMDRequireItemDependency)[], Range]>} ObjectSerializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectDeserializerContext<[(string | LocalModuleDependency | AMDRequireItemDependency)[], Range]>} ObjectDeserializerContext */
+/** @typedef {import("../../serialization/ObjectMiddleware").ObjectSerializerContext<[(string | LocalModuleDependency | AMDRequireItemDependency)[], Range]>} ObjectSerializerContext */
 
 class AMDRequireArrayDependency extends NullDependency {
 	/**
@@ -62,10 +63,11 @@ class AMDRequireArrayDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	AMDRequireArrayDependency,
+makeSerializable(AMDRequireArrayDependency, [
+	"webpack/lib/dependencies/amd/AMDRequireArrayDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/AMDRequireArrayDependency"
-);
+]);
 
 AMDRequireArrayDependency.Template = class AMDRequireArrayDependencyTemplate extends (
 	DependencyTemplate
@@ -110,7 +112,7 @@ AMDRequireArrayDependency.Template = class AMDRequireArrayDependencyTemplate ext
 			return dep;
 		}
 
-		if (dep instanceof LocalModuleDependency) {
+		if (isDependencyKind(dep, "local-module")) {
 			return dep.localModule.variableName();
 		}
 

package/lib/dependencies/{AMDRequireContextDependency.js → amd/AMDRequireContextDependency.js}

@@ -5,13 +5,13 @@
 
 "use strict";
 
-const makeSerializable = require("../util/makeSerializable");
-const ContextDependency = require("./ContextDependency");
+const makeSerializable = require("../../util/makeSerializable");
+const ContextDependency = require("../context/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 "./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 AMDRequireContextDependency extends ContextDependency {
 	/**
@@ -58,11 +58,12 @@ class AMDRequireContextDependency extends ContextDependency {
 	}
 }
 
-makeSerializable(
-	AMDRequireContextDependency,
+makeSerializable(AMDRequireContextDependency, [
+	"webpack/lib/dependencies/amd/AMDRequireContextDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/AMDRequireContextDependency"
-);
+]);
 
-AMDRequireContextDependency.Template = require("./ContextDependencyTemplateAsRequireCall");
+AMDRequireContextDependency.Template = require("../context/ContextDependencyTemplateAsRequireCall");
 
 module.exports = AMDRequireContextDependency;

package/lib/dependencies/{AMDRequireDependenciesBlock.js → amd/AMDRequireDependenciesBlock.js}

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

package/lib/dependencies/{AMDRequireDependenciesBlockParserPlugin.js → amd/AMDRequireDependenciesBlockParserPlugin.js}

@@ -5,23 +5,23 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const memoize = require("../util/memoize");
+const RuntimeGlobals = require("../../runtime/RuntimeGlobals");
+const memoize = require("../../util/memoize");
 
+const ContextDependencyHelpers = require("../context/ContextDependencyHelpers");
+const ConstDependency = require("../core/ConstDependency");
+const getFunctionExpression = require("../helpers/getFunctionExpression");
 const AMDRequireArrayDependency = require("./AMDRequireArrayDependency");
 const AMDRequireContextDependency = require("./AMDRequireContextDependency");
 const AMDRequireDependenciesBlock = require("./AMDRequireDependenciesBlock");
 const AMDRequireDependency = require("./AMDRequireDependency");
 const AMDRequireItemDependency = require("./AMDRequireItemDependency");
-const ConstDependency = require("./ConstDependency");
-const ContextDependencyHelpers = require("./ContextDependencyHelpers");
 const LocalModuleDependency = require("./LocalModuleDependency");
 const { getLocalModule } = require("./LocalModulesHelpers");
 const UnsupportedDependency = require("./UnsupportedDependency");
-const getFunctionExpression = require("./getFunctionExpression");
 
 const getUnsupportedFeatureWarning = memoize(() =>
-	require("../errors/UnsupportedFeatureWarning")
+	require("../../errors/UnsupportedFeatureWarning")
 );
 
 /**
@@ -36,11 +36,11 @@ const getUnsupportedFeatureWarning = memoize(() =>
 /**
  * @import {
  * 	JavascriptParserOptions
- * } from "../../declarations/WebpackOptions"
+ * } from "../../../declarations/WebpackOptions"
  */
-/** @import Dependency, { DependencyLocation } from "../Dependency" */
-/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
-/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
+/** @import Dependency, { DependencyLocation } from "../../graph/Dependency" */
+/** @import BasicEvaluatedExpression from "../../javascript/BasicEvaluatedExpression" */
+/** @import JavascriptParser, { Range } from "../../javascript/JavascriptParser" */
 /** @import LocalModule from "./LocalModule" */
 
 const PLUGIN_NAME = "AMDRequireDependenciesBlockParserPlugin";