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

package/lib/runtime/StartupEntrypointRuntimeModule.js

@@ -4,11 +4,11 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
 const { entryModuleIdExpression } = require("../javascript/StartupHelpers");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compilation from "../Compilation" */
 
 class StartupEntrypointRuntimeModule extends RuntimeModule {

package/lib/runtime/SystemContextRuntimeModule.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 
 class SystemContextRuntimeModule extends RuntimeModule {
 	constructor() {

package/lib/runtime/ToBinaryRuntimeModule.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const Template = require("../template/Template");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 
 /** @import Compilation from "../Compilation" */
 

package/lib/runtime/WorkerRuntimeModule.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
 /** @import Compilation from "../Compilation" */
 

package/lib/runtime/baseUri.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
 const SCHEME_REGEXP = /^[a-z][a-z\d+\-.]*:/i;
 

package/lib/schemes/DataUriPlugin.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const NormalModule = require("../NormalModule");
+const NormalModule = require("../module/NormalModule");
 const { URIRegEx, decodeDataURI } = require("../util/dataURL");
 
 /** @import Compiler from "../Compiler" */

package/lib/schemes/HttpUriPlugin.js

@@ -14,9 +14,9 @@ const {
 	createGunzip,
 	createInflate
 } = require("zlib");
-const NormalModule = require("../NormalModule");
+const { dirname, join, mkdirp } = require("../fs/fs");
+const NormalModule = require("../module/NormalModule");
 const createHash = require("../util/createHash");
-const { dirname, join, mkdirp } = require("../util/fs");
 const memoize = require("../util/memoize");
 
 const getHttps = memoize(() => require("https"));
@@ -32,16 +32,68 @@ const getHttp = memoize(() => require("http"));
  */
 /** @import { Socket } from "net" */
 /** @import { Readable } from "stream" */
+/** @import Compiler from "../Compiler" */
+/** @import { Snapshot } from "../fs/FileSystemInfo" */
+/** @import { ResourceDataWithData } from "../module/NormalModuleFactory" */
+/** @import { IntermediateFileSystem } from "../fs/fs" */
+/** @import { NormalModuleBuildInfo } from "../module/NormalModule" */
+
 /**
- * @import {
- * 	HttpUriPluginOptions
- * } from "../../declarations/plugins/schemes/HttpUriPlugin"
+ * @inline
+ * @absolutePath true
+ * @typedef {string} AbsolutePath
+ */
+
+/**
+ * @inline
+ * @pattern ^https?://
+ * @typedef {string} HttpUrl
+ */
+
+/**
+ * Allowed URI pattern.
+ * @inline
+ * @typedef {RegExp} HttpUriOptionsAllowedUrisItemBranch1
+ */
+
+/**
+ * Allowed URI (resp. the beginning of it).
+ * @inline
+ * @typedef {HttpUrl} HttpUriOptionsAllowedUrisItemBranch2
+ */
+
+/**
+ * Allowed URI filter function.
+ * @inline
+ * @typedef {import("./HttpUriPlugin").AllowedUriFn} HttpUriOptionsAllowedUrisItemBranch3
+ */
+
+/**
+ * List of allowed URIs (resp. the beginning of them).
+ * @inline
+ * @typedef {HttpUriOptionsAllowedUrisItemBranch1 | HttpUriOptionsAllowedUrisItemBranch2 | HttpUriOptionsAllowedUrisItemBranch3} HttpUriOptionsAllowedUrisItem
+ */
+
+/**
+ * Options for building http resources.
+ * @typedef {object} HttpUriOptions
+ * @property {HttpUriOptionsAllowedUris} allowedUris
+ * @property {false | AbsolutePath=} cacheLocation Location where resource content is stored for lockfile entries. It's also possible to disable storing by passing false.
+ * @property {boolean=} frozen When set, anything that would lead to a modification of the lockfile or any resource content, will result in an error.
+ * @property {AbsolutePath=} lockfileLocation Location of the lockfile.
+ * @property {string=} proxy Proxy configuration, which can be used to specify a proxy server to use for HTTP requests.
+ * @property {boolean=} upgrade When set, resources of existing lockfile entries will be fetched and entries will be upgraded when resource content has changed.
+ */
+
+/**
+ * List of allowed URIs (resp. the beginning of them).
+ * @typedef {HttpUriOptionsAllowedUrisItem[]} HttpUriOptionsAllowedUris
+ */
+
+/**
+ * @schema plugins/schemes/HttpUriPlugin
+ * @typedef {HttpUriOptions} HttpUriPluginOptions
  */
-/** @import Compiler from "../Compiler" */
-/** @import { Snapshot } from "../FileSystemInfo" */
-/** @import { ResourceDataWithData } from "../NormalModuleFactory" */
-/** @import { IntermediateFileSystem } from "../util/fs" */
-/** @import { NormalModuleBuildInfo } from "../NormalModule" */
 
 const MAX_REDIRECTS = 5;
 
@@ -510,7 +562,11 @@ const cachedWithKey = (fn, forceFn = fn) => {
 /** @typedef {FetchResultMeta & { entry: LockfileEntry, content: Buffer }} ContentFetchResult */
 /** @typedef {RedirectFetchResult | ContentFetchResult} FetchResult */
 
-/** @typedef {(uri: string) => boolean} AllowedUriFn */
+/**
+ * @inline
+ * @tsType import('./HttpUriPlugin').AllowedUriFn
+ * @typedef {(uri: string) => boolean} AllowedUriFn
+ */
 
 const PLUGIN_NAME = "HttpUriPlugin";
 

package/lib/schemes/VirtualUrlPlugin.js

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const NormalModule = require("../NormalModule");
-
+const { isAbsolute, join } = require("../fs/fs");
 const { getContext } = require("../loaders/LoaderRunner");
-const { isAbsolute, join } = require("../util/fs");
+const NormalModule = require("../module/NormalModule");
+
 const { parseResourceWithoutFragment } = require("../util/identifier");
 const memoize = require("../util/memoize");
 
@@ -21,28 +21,62 @@ const DEFAULT_SCHEME = "virtual";
 const PLUGIN_NAME = "VirtualUrlPlugin";
 
 /** @import Compiler from "../Compiler" */
+
+/**
+ * @jsonType boolean
+ * @inline
+ * @typedef {true} VirtualModuleVersion
+ */
+
 /**
- * @import {
- * 	VirtualModule as VirtualModuleConfig,
- * 	VirtualModuleContent as VirtualModuleInput,
- * 	VirtualUrlOptions
- * } from "../../declarations/plugins/schemes/VirtualUrlPlugin"
+ * A virtual module definition.
+ * @typedef {object} VirtualModule
+ * @property {string=} context The context for the virtual module. A string path. Defaults to 'auto', which will try to resolve the context from the module id.
+ * @property {SourceFn} source The source function that provides the virtual content.
+ * @property {string=} type The module type.
+ * @property {VirtualModuleVersion | string | VersionFn=} version Optional version function or value for cache invalidation.
  */
 
-/** @typedef {(loaderContext: LoaderContext<EXPECTED_ANY>) => Promise<string | Buffer> | string | Buffer} SourceFn */
-/** @typedef {() => string} VersionFn */
-/** @typedef {{ [key: string]: VirtualModuleInput }} VirtualModules */
+/**
+ * A virtual module can be a string, a function, or a VirtualModule object.
+ * @typedef {string | SourceFn | VirtualModule} VirtualModuleContent
+ */
+
+/**
+ * Options for building virtual resources.
+ * @typedef {object} VirtualUrlOptions
+ * @property {string=} context The default context for virtual modules. A string path. Defaults to 'auto', which will try to resolve the context from the module id.
+ * @property {{ [key: string]: VirtualModuleContent }} modules The virtual modules configuration.
+ * @property {string=} scheme The URL scheme to use for virtual resources.
+ */
+
+/**
+ * @schema plugins/schemes/VirtualUrlPlugin
+ * @typedef {VirtualUrlOptions} VirtualUrlPluginOptions
+ */
+
+/**
+ * @inline
+ * @tsType import('./VirtualUrlPlugin').SourceFn
+ * @typedef {(loaderContext: LoaderContext<EXPECTED_ANY>) => Promise<string | Buffer> | string | Buffer} SourceFn
+ */
+/**
+ * @inline
+ * @tsType import('./VirtualUrlPlugin').VersionFn
+ * @typedef {() => string} VersionFn
+ */
+/** @typedef {{ [key: string]: VirtualModuleContent }} VirtualModules */
 
 /**
  * Defines the loader context type used by this module.
  * @template T
- * @typedef {import("../NormalModule").LoaderContext<T>} LoaderContext
+ * @typedef {import("../module/NormalModule").LoaderContext<T>} LoaderContext
  */
 
 /**
  * Normalizes a virtual module definition into a standard format
- * @param {VirtualModuleInput} virtualConfig The virtual module to normalize
- * @returns {VirtualModuleConfig} The normalized virtual module
+ * @param {VirtualModuleContent} virtualConfig The virtual module to normalize
+ * @returns {VirtualModule} The normalized virtual module
  */
 function normalizeModule(virtualConfig) {
 	if (typeof virtualConfig === "string") {
@@ -61,7 +95,7 @@ function normalizeModule(virtualConfig) {
 	return virtualConfig;
 }
 
-/** @typedef {{ [key: string]: VirtualModuleConfig }} NormalizedModules */
+/** @typedef {{ [key: string]: VirtualModule }} NormalizedModules */
 
 /**
  * Normalizes all virtual modules with the given scheme
@@ -272,7 +306,7 @@ class VirtualUrlPlugin {
 	/**
 	 * Finds virtual module config by id.
 	 * @param {string} id The module id
-	 * @returns {VirtualModuleConfig} The virtual module config
+	 * @returns {VirtualModule} The virtual module config
 	 */
 	findVirtualModuleConfigById(id) {
 		const config = this.modules[id];

package/lib/serialization/AggregateErrorSerializer.js

@@ -8,7 +8,7 @@
 /** @typedef {import("./ObjectMiddleware").ObjectDeserializerContext<ComplexSerializableType[]>} ObjectDeserializerContext */
 /** @typedef {import("./ObjectMiddleware").ObjectSerializerContext<ComplexSerializableType[]>} ObjectSerializerContext */
 
-/** @typedef {Error & { cause?: unknown, errors: EXPECTED_ANY[] }} AggregateError */
+/** @typedef {Error & { cause?: unknown, errors: ComplexSerializableType[] }} AggregateError */
 
 class AggregateErrorSerializer {
 	/**
@@ -29,7 +29,7 @@ class AggregateErrorSerializer {
 	 * @returns {AggregateError} error
 	 */
 	deserialize(context) {
-		const errors = /** @type {EXPECTED_ANY[]} */ (context.read());
+		const errors = /** @type {ComplexSerializableType[]} */ (context.read());
 		// eslint-disable-next-line n/no-unsupported-features/es-builtins, n/no-unsupported-features/es-syntax, unicorn/error-message
 		const err = new AggregateError(errors);
 

package/lib/serialization/FileMiddleware.js

@@ -42,13 +42,13 @@ const {
 	zstdDecompress
 } = require("zlib");
 const { DEFAULTS } = require("../config/defaults");
+const { dirname, join, mkdirp } = require("../fs/fs");
 const createHash = require("../util/createHash");
-const { dirname, join, mkdirp } = require("../util/fs");
 const memoize = require("../util/memoize");
 const SerializerMiddleware = require("./SerializerMiddleware");
 
 /** @import { HashFunction } from "../util/Hash" */
-/** @import { IStats, IntermediateFileSystem } from "../util/fs" */
+/** @import { IStats, IntermediateFileSystem } from "../fs/fs" */
 /** @import { BufferSerializableType } from "./types" */
 
 // "wpc" + 1 in little-endian
@@ -1013,7 +1013,7 @@ const getReferencedFilenamesUncompressed = (fs, file) =>
 					// otherwise pointer reads land on wrong bytes and under-report
 					fs.stat(file, (err, stats) => {
 						if (err) return fail(err);
-						const stat = /** @type {import("../util/fs").IStats} */ (stats);
+						const stat = /** @type {import("../fs/fs").IStats} */ (stats);
 						if (stat.size !== position) {
 							return fail(
 								new Error(`Section table does not match size of ${file}`)

package/lib/serialization/ObjectMiddleware.js

@@ -41,7 +41,7 @@ const SetObjectSerializer = require("./SetObjectSerializer");
 
 /** @import { Logger } from "../logging/Logger" */
 /** @import { HashFunction } from "../util/Hash" */
-/** @import { LazyOptions } from "./SerializerMiddleware" */
+/** @import { LazyOptions, LazyTarget } from "./SerializerMiddleware" */
 /**
  * @import {
  * 	ComplexSerializableType,
@@ -67,13 +67,13 @@ const SetObjectSerializer = require("./SetObjectSerializer");
 /**
  * First tuple element; element type for an open array; `EXPECTED_ANY` once exhausted.
  * @template {readonly EXPECTED_ANY[]} T
- * @typedef {T extends readonly [infer H, ...EXPECTED_ANY[]] ? H : T extends readonly [] ? EXPECTED_ANY : T extends readonly (infer E)[] ? E : never} Head
+ * @typedef {T extends readonly [infer H, ...infer _Rest] ? H : T extends readonly [] ? EXPECTED_ANY : T extends readonly (infer E)[] ? E : never} Head
  */
 
 /**
  * Tuple without its first element; unchanged when `T` is an open array.
  * @template {readonly EXPECTED_ANY[]} T
- * @typedef {T extends readonly [EXPECTED_ANY, ...infer R] ? R : T} Tail
+ * @typedef {T extends readonly [infer _First, ...infer R] ? R : T} Tail
  */
 
 /**
@@ -85,8 +85,8 @@ const SetObjectSerializer = require("./SetObjectSerializer");
  * @property {(value: ReferenceableItem) => void} setCircularReference
  * @property {() => ObjectSerializerSnapshot} snapshot
  * @property {(snapshot: ObjectSerializerSnapshot) => void} rollback
- * @property {((item: EXPECTED_ANY | (() => EXPECTED_ANY)) => void)=} writeLazy
- * @property {((item: (EXPECTED_ANY | (() => EXPECTED_ANY)), obj: LazyOptions | undefined) => import("./SerializerMiddleware").LazyFunction<EXPECTED_ANY, EXPECTED_ANY, EXPECTED_ANY, LazyOptions>)=} writeSeparate
+ * @property {((item: ComplexSerializableType) => void)=} writeLazy
+ * @property {((item: ComplexSerializableType, obj: LazyOptions | undefined) => import("./SerializerMiddleware").LazyFunction<EXPECTED_ANY, EXPECTED_ANY, LazyTarget, LazyOptions>)=} writeSeparate
  */
 
 /**
@@ -223,7 +223,7 @@ const loaders = new Map();
 /** @typedef {PrimitiveSerializableType[]} SerializedType */
 /** @typedef {{ logger: Logger }} Context */
 
-/** @typedef {(context: ObjectSerializerContext<EXPECTED_ANY> | ObjectDeserializerContext<EXPECTED_ANY>) => void} ExtendContext */
+/** @typedef {(context: ObjectSerializerContext<ComplexSerializableType[]> | ObjectDeserializerContext<ComplexSerializableType[]>) => void} ExtendContext */
 
 /**
  * Represents ObjectMiddleware.
@@ -285,6 +285,37 @@ class ObjectMiddleware extends SerializerMiddleware {
 		serializerInversed.set(key, serializer);
 	}
 
+	/**
+	 * Accepts a historical request/name as an extra deserialization key for an
+	 * already registered constructor, so caches written before a move restore.
+	 * @param {Constructor} Constructor the constructor, already registered
+	 * @param {string} request the historical request
+	 * @param {(string | null)=} name the historical name
+	 * @returns {void}
+	 */
+	static registerLegacyRequest(Constructor, request, name = null) {
+		const config = serializers.get(Constructor);
+
+		if (config === undefined || config === NOT_SERIALIZABLE) {
+			throw new Error(
+				`ObjectMiddleware.registerLegacyRequest: serializer for ${Constructor.name} is not registered`
+			);
+		}
+
+		const key = `${request}/${name}`;
+
+		if (serializerInversed.has(key)) {
+			throw new Error(
+				`ObjectMiddleware.registerLegacyRequest: serializer for ${key} is already registered`
+			);
+		}
+
+		serializerInversed.set(
+			key,
+			/** @type {SerializerConfigWithSerializer} */ (config).serializer
+		);
+	}
+
 	/**
 	 * Register not serializable.
 	 * @param {Constructor} Constructor the constructor
@@ -302,7 +333,7 @@ class ObjectMiddleware extends SerializerMiddleware {
 
 	/**
 	 * Gets serializer for.
-	 * @param {EXPECTED_ANY} object for serialization
+	 * @param {ComplexSerializableType} object for serialization
 	 * @returns {SerializerConfigWithSerializer} Serializer config
 	 */
 	static getSerializerFor(object) {
@@ -335,7 +366,7 @@ class ObjectMiddleware extends SerializerMiddleware {
 	/**
 	 * Gets deserializer for.
 	 * @param {string} request request
-	 * @param {string} name name
+	 * @param {string | null} name name
 	 * @returns {ObjectSerializer} serializer
 	 */
 	static getDeserializerFor(request, name) {
@@ -352,7 +383,7 @@ class ObjectMiddleware extends SerializerMiddleware {
 	/**
 	 * Get deserializer for without error.
 	 * @param {string} request request
-	 * @param {string} name name
+	 * @param {string | null} name name
 	 * @returns {ObjectSerializer | undefined} serializer
 	 */
 	static _getDeserializerForWithoutError(request, name) {
@@ -491,13 +522,13 @@ class ObjectMiddleware extends SerializerMiddleware {
 								return `Object { ${Object.keys(item).join(", ")} }`;
 							}
 							if (item.constructor === Map) {
-								return `Map { ${/** @type {Map<EXPECTED_ANY, EXPECTED_ANY>} */ (item).size} items }`;
+								return `Map { ${/** @type {Map<ComplexSerializableType, ComplexSerializableType>} */ (item).size} items }`;
 							}
 							if (item.constructor === Array) {
-								return `Array { ${/** @type {EXPECTED_ANY[]} */ (item).length} items }`;
+								return `Array { ${/** @type {ComplexSerializableType[]} */ (item).length} items }`;
 							}
 							if (item.constructor === Set) {
-								return `Set { ${/** @type {Set<EXPECTED_ANY>} */ (item).size} items }`;
+								return `Set { ${/** @type {Set<ComplexSerializableType>} */ (item).size} items }`;
 							}
 							if (item.constructor === RegExp) {
 								return /** @type {RegExp} */ (item).toString();
@@ -542,7 +573,7 @@ class ObjectMiddleware extends SerializerMiddleware {
 		/**
 		 * Writes one item into the output; the context is returned so writes chain.
 		 * @param {ComplexSerializableType} item item to serialize
-		 * @returns {ObjectSerializerContext<EXPECTED_ANY>} context
+		 * @returns {ObjectSerializerContext<ComplexSerializableType[]>} context
 		 */
 		const process = (item) => {
 			switch (typeof item) {
@@ -723,7 +754,7 @@ class ObjectMiddleware extends SerializerMiddleware {
 			}
 			return ctx;
 		};
-		/** @type {ObjectSerializerContext<EXPECTED_ANY>} */
+		/** @type {ObjectSerializerContext<ComplexSerializableType[]>} */
 		let ctx = {
 			write: process,
 			setCircularReference(ref) {
@@ -821,10 +852,10 @@ class ObjectMiddleware extends SerializerMiddleware {
 		let objectTypeLookup = [];
 		/** @type {ComplexSerializableType[]} */
 		let result = [];
-		/** @type {ObjectDeserializerContext<EXPECTED_ANY>} */
+		/** @type {ObjectDeserializerContext<ComplexSerializableType[]>} */
 		let ctx = {
 			read() {
-				return /** @type {EXPECTED_ANY} */ (decodeValue());
+				return decodeValue();
 			},
 			// type-only cursor advance; same object, retyped to the tuple tail
 			get rest() {

package/lib/serialization/SerializerMiddleware.js

@@ -10,7 +10,7 @@ const LAZY_TARGET = Symbol("lazy serialization target");
 const LAZY_SERIALIZED_VALUE = Symbol("lazy serialization data");
 
 /** @typedef {SerializerMiddleware<EXPECTED_ANY, EXPECTED_ANY, Record<string, EXPECTED_ANY>>} LazyTarget */
-/** @typedef {Record<string, EXPECTED_ANY>} LazyOptions */
+/** @typedef {{ name?: string, size?: number }} LazyOptions */
 
 /**
  * Defines the lazy function type used by this module.
@@ -102,7 +102,7 @@ class SerializerMiddleware {
 	 * @template TLazyInputValue
 	 * @template TLazyOutputValue
 	 * @template {LazyTarget} TLazyTarget
-	 * @template {Record<string, EXPECTED_ANY>} TLazyOptions
+	 * @template {LazyOptions} TLazyOptions
 	 * @param {LazyFunction<TLazyInputValue, TLazyOutputValue, TLazyTarget, TLazyOptions>} fn lazy function
 	 * @returns {LazyOptions | undefined} options
 	 */

package/lib/serialization/SingleItemMiddleware.js

@@ -6,8 +6,10 @@
 
 const SerializerMiddleware = require("./SerializerMiddleware");
 
-/** @typedef {EXPECTED_ANY} DeserializedType */
-/** @typedef {EXPECTED_ANY[]} SerializedType */
+/** @import { ComplexSerializableType } from "./types" */
+
+/** @typedef {ComplexSerializableType} DeserializedType */
+/** @typedef {ComplexSerializableType[]} SerializedType */
 /** @typedef {EXPECTED_OBJECT} Context */
 
 /**

package/lib/sharing/ConsumeSharedFallbackDependency.js

@@ -5,7 +5,9 @@
 
 "use strict";
 
-const ModuleDependency = require("../dependencies/ModuleDependency");
+/** @import { DependencyKinds } from "../graph/Dependency" */
+
+const ModuleDependency = require("../dependencies/core/ModuleDependency");
 const makeSerializable = require("../util/makeSerializable");
 
 class ConsumeSharedFallbackDependency extends ModuleDependency {
@@ -31,4 +33,10 @@ makeSerializable(
 	"webpack/lib/sharing/ConsumeSharedFallbackDependency"
 );
 
+/** @type {Set<keyof DependencyKinds>} */
+ConsumeSharedFallbackDependency.KINDS = new Set([
+	...ModuleDependency.KINDS,
+	"sharing-request"
+]);
+
 module.exports = ConsumeSharedFallbackDependency;

package/lib/sharing/ConsumeSharedModule.js

@@ -6,19 +6,19 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
-const Module = require("../Module");
+const AsyncDependenciesBlock = require("../graph/AsyncDependenciesBlock");
+const Module = require("../module/Module");
 const {
 	CONSUME_SHARED_TYPES,
 	JAVASCRIPT_TYPES
-} = require("../ModuleSourceTypeConstants");
+} = require("../module/ModuleSourceTypeConstants");
 const {
 	WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE
-} = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
-const { rangeToString, stringifyHoley } = require("../util/semver");
 const ConsumeSharedFallbackDependency = require("./ConsumeSharedFallbackDependency");
+const { rangeToString, stringifyHoley } = require("./semver");
 
 /** @type {WeakMap<ModuleGraph, WeakMap<ConsumeSharedModule, Module | null>>} */
 const fallbackModuleCache = new WeakMap();
@@ -29,7 +29,7 @@ const fallbackModuleCache = new WeakMap();
  * } from "../config/defaults"
  */
 /** @import Compilation from "../Compilation" */
-/** @import { UpdateHashContext } from "../Dependency" */
+/** @import { UpdateHashContext } from "../graph/Dependency" */
 /**
  * @import {
  * 	BuildCallback,
@@ -42,17 +42,18 @@ const fallbackModuleCache = new WeakMap();
  * 	Sources,
  * 	SourceTypes,
  * 	ExportsType,
- * 	BasicSourceTypes
- * } from "../Module"
+ * 	BasicSourceTypes,
+ * 	ModuleKinds
+ * } from "../module/Module"
  */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import RequestShortener from "../RequestShortener" */
-/** @import { ResolverWithOptions } from "../ResolverFactory" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[ConsumeOptions]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[ConsumeOptions]>} ObjectSerializerContext */
 /** @import Hash from "../util/Hash" */
-/** @import { InputFileSystem } from "../util/fs" */
-/** @import { SemVerRange } from "../util/semver" */
+/** @import { InputFileSystem } from "../fs/fs" */
+/** @import { SemVerRange } from "./semver" */
 
 /**
  * Represents the consume shared module runtime component.
@@ -364,4 +365,7 @@ makeSerializable(
 	"webpack/lib/sharing/ConsumeSharedModule"
 );
 
+/** @type {Set<keyof ModuleKinds>} */
+ConsumeSharedModule.KINDS = new Set([...Module.KINDS, "consume-shared"]);
+
 module.exports = ConsumeSharedModule;