webpack 5.111.1 → 5.112.1

package/lib/{RuntimeModule.js → runtime/RuntimeModule.js}

@@ -7,22 +7,24 @@
 
 const { RawSource } = require("webpack-sources");
 const OriginalSource = require("webpack-sources").OriginalSource;
-const Module = require("./Module");
+const Module = require("../module/Module");
 const {
 	JAVASCRIPT_TYPES,
 	RUNTIME_TYPES
-} = require("./ModuleSourceTypeConstants");
-const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
+} = require("../module/ModuleSourceTypeConstants");
+const {
+	WEBPACK_MODULE_TYPE_RUNTIME
+} = require("../module/ModuleTypeConstants");
 
 /**
  * @import {
  * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
- * } from "./config/defaults"
+ * } from "../config/defaults"
  */
-/** @import Chunk from "./Chunk" */
-/** @import ChunkGraph from "./ChunkGraph" */
-/** @import Compilation from "./Compilation" */
-/** @import { UpdateHashContext } from "./Dependency" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
+/** @import Compilation from "../Compilation" */
+/** @import { UpdateHashContext } from "../graph/Dependency" */
 /**
  * @import {
  * 	BuildMeta,
@@ -34,13 +36,14 @@ const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
  * 	NeedBuildContext,
  * 	Sources,
  * 	BasicSourceTypes,
- * 	SourceTypes
- * } from "./Module"
+ * 	SourceTypes,
+ * 	ModuleKinds
+ * } from "../module/Module"
  */
-/** @import RequestShortener from "./RequestShortener" */
-/** @import { ResolverWithOptions } from "./ResolverFactory" */
-/** @import Hash from "./util/Hash" */
-/** @import { InputFileSystem } from "./util/fs" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
+/** @import Hash from "../util/Hash" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 class RuntimeModule extends Module {
 	/**
@@ -138,12 +141,21 @@ class RuntimeModule extends Module {
 		hash.update(`${this.stage}`);
 		// A failing `generate()` propagates: hashing its message instead pins the etag
 		// of the code generation cache to a constant, which then serves stale code.
-		const code =
-			this.fullHash || this.dependentHash
-				? // Do not use getGeneratedCode here, because i. e. compilation hash might be not
-					// ready at this point. We will cache it later instead.
-					this.generate()
-				: this.getGeneratedCode();
+		/** @type {string | null} */
+		let code;
+		try {
+			code =
+				this.fullHash || this.dependentHash
+					? // Do not use getGeneratedCode here, because i. e. compilation hash might be not
+						// ready at this point. We will cache it later instead.
+						this.generate()
+					: this.getGeneratedCode();
+		} catch (err) {
+			const { toError } = require("../errors/ErrorHelpers");
+			const RuntimeModuleGenerationError = require("../errors/RuntimeModuleGenerationError");
+
+			throw new RuntimeModuleGenerationError(this, toError(err));
+		}
 		if (code !== null && code !== undefined) {
 			hash.update(code);
 		}
@@ -226,7 +238,7 @@ class RuntimeModule extends Module {
 	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		const AbstractMethodError = require("./errors/AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}
@@ -280,4 +292,7 @@ RuntimeModule.STAGE_ATTACH = 10;
  */
 RuntimeModule.STAGE_TRIGGER = 20;
 
+/** @type {Set<keyof ModuleKinds>} */
+RuntimeModule.KINDS = new Set([...Module.KINDS, "runtime"]);
+
 module.exports = RuntimeModule;

package/lib/{RuntimePlugin.js → runtime/RuntimePlugin.js}

@@ -5,133 +5,131 @@
 
 "use strict";
 
-const RuntimeGlobals = require("./RuntimeGlobals");
+const CssModulesPlugin = require("../css/CssModulesPlugin");
+const RuntimeRequirementsDependency = require("../dependencies/core/RuntimeRequirementsDependency");
+const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
 const {
 	getPresentKinds,
 	usesFullHashDigest
-} = require("./TemplatedPathPlugin");
-const CssModulesPlugin = require("./css/CssModulesPlugin");
-const RuntimeRequirementsDependency = require("./dependencies/RuntimeRequirementsDependency");
-const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
-const StringXor = require("./util/StringXor");
-const lazyModule = require("./util/lazyModule");
+} = require("../template/TemplatedPathPlugin");
+const StringXor = require("../util/StringXor");
+const lazyModule = require("../util/lazyModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
-/** @import { LibraryOptions } from "../declarations/WebpackOptions" */
-/** @import Chunk from "./Chunk" */
-/** @import { RuntimeRequirements } from "./Module" */
-/** @import Compiler from "./Compiler" */
+/** @import { LibraryOptions } from "../../declarations/WebpackOptions.d.ts" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import { RuntimeRequirements } from "../module/Module" */
+/** @import Compiler from "../Compiler" */
 /** @import RuntimeModule from "./RuntimeModule" */
 
 // Each runtime module below is loaded by `_attachPendingRuntimeModules`, so only
 // the builds that emit one pay for it — most reach ~10 of these 30.
 const getCssServerStylesRuntimeModule = lazyModule(() =>
-	require("./css/CssServerStylesRuntimeModule")
+	require("../css/CssServerStylesRuntimeModule")
 );
 const getAsyncModuleGeneratorRuntimeModule = lazyModule(() =>
-	require("./runtime/AsyncModuleGeneratorRuntimeModule")
+	require("./AsyncModuleGeneratorRuntimeModule")
 );
 const getAsyncModuleRuntimeModule = lazyModule(() =>
-	require("./runtime/AsyncModuleRuntimeModule")
+	require("./AsyncModuleRuntimeModule")
 );
 const getAutoPublicPathRuntimeModule = lazyModule(() =>
-	require("./runtime/AutoPublicPathRuntimeModule")
+	require("./AutoPublicPathRuntimeModule")
 );
 const getBaseUriRuntimeModule = lazyModule(() =>
-	require("./runtime/BaseUriRuntimeModule")
+	require("./BaseUriRuntimeModule")
 );
 const getCompatGetDefaultExportRuntimeModule = lazyModule(() =>
-	require("./runtime/CompatGetDefaultExportRuntimeModule")
+	require("./CompatGetDefaultExportRuntimeModule")
 );
 const getCompatRuntimeModule = lazyModule(() =>
-	require("./runtime/CompatRuntimeModule")
+	require("./CompatRuntimeModule")
 );
 const getConcatenationWrapRuntimeModule = lazyModule(() =>
-	require("./runtime/ConcatenationWrapRuntimeModule")
+	require("./ConcatenationWrapRuntimeModule")
 );
 const getConstructRequireRuntimeModule = lazyModule(() =>
-	require("./runtime/ConstructRequireRuntimeModule")
+	require("./ConstructRequireRuntimeModule")
 );
 const getCreateFakeNamespaceObjectRuntimeModule = lazyModule(() =>
-	require("./runtime/CreateFakeNamespaceObjectRuntimeModule")
+	require("./CreateFakeNamespaceObjectRuntimeModule")
 );
 const getCreateScriptRuntimeModule = lazyModule(() =>
-	require("./runtime/CreateScriptRuntimeModule")
+	require("./CreateScriptRuntimeModule")
 );
 const getCreateScriptUrlRuntimeModule = lazyModule(() =>
-	require("./runtime/CreateScriptUrlRuntimeModule")
+	require("./CreateScriptUrlRuntimeModule")
 );
 const getDefinePropertyGettersRuntimeModule = lazyModule(() =>
-	require("./runtime/DefinePropertyGettersRuntimeModule")
+	require("./DefinePropertyGettersRuntimeModule")
 );
 const getEnsureChunkRuntimeModule = lazyModule(() =>
-	require("./runtime/EnsureChunkRuntimeModule")
+	require("./EnsureChunkRuntimeModule")
 );
 const getGetChunkFilenameRuntimeModule = lazyModule(() =>
-	require("./runtime/GetChunkFilenameRuntimeModule")
+	require("./GetChunkFilenameRuntimeModule")
 );
 const getGetMainFilenameRuntimeModule = lazyModule(() =>
-	require("./runtime/GetMainFilenameRuntimeModule")
+	require("./GetMainFilenameRuntimeModule")
 );
 const getGetTrustedTypesPolicyRuntimeModule = lazyModule(() =>
-	require("./runtime/GetTrustedTypesPolicyRuntimeModule")
+	require("./GetTrustedTypesPolicyRuntimeModule")
 );
 const getGetWorkletBootstrapRuntimeModule = lazyModule(() =>
-	require("./runtime/GetWorkletBootstrapRuntimeModule")
+	require("./GetWorkletBootstrapRuntimeModule")
 );
 const getGlobalRuntimeModule = lazyModule(() =>
-	require("./runtime/GlobalRuntimeModule")
+	require("./GlobalRuntimeModule")
 );
 const getSpecNamespaceObjectRuntimeModule = lazyModule(() =>
-	require("./runtime/SpecNamespaceObjectRuntimeModule")
+	require("./SpecNamespaceObjectRuntimeModule")
 );
 const getHasOwnPropertyRuntimeModule = lazyModule(() =>
-	require("./runtime/HasOwnPropertyRuntimeModule")
+	require("./HasOwnPropertyRuntimeModule")
 );
 const getLoadScriptRuntimeModule = lazyModule(() =>
-	require("./runtime/LoadScriptRuntimeModule")
+	require("./LoadScriptRuntimeModule")
 );
 const getMakeDeferredNamespaceObjectRuntimeModule = lazyModule(
 	() =>
-		require("./runtime/MakeDeferredNamespaceObjectRuntime")
+		require("./MakeDeferredNamespaceObjectRuntime")
 			.MakeDeferredNamespaceObjectRuntimeModule
 );
 const getMakeOptimizedDeferredNamespaceObjectRuntimeModule = lazyModule(
 	() =>
-		require("./runtime/MakeDeferredNamespaceObjectRuntime")
+		require("./MakeDeferredNamespaceObjectRuntime")
 			.MakeOptimizedDeferredNamespaceObjectRuntimeModule
 );
 const getMakeNamespaceObjectRuntimeModule = lazyModule(() =>
-	require("./runtime/MakeNamespaceObjectRuntimeModule")
-);
-const getNonceRuntimeModule = lazyModule(() =>
-	require("./runtime/NonceRuntimeModule")
+	require("./MakeNamespaceObjectRuntimeModule")
 );
+const getNonceRuntimeModule = lazyModule(() => require("./NonceRuntimeModule"));
 const getOnChunksLoadedRuntimeModule = lazyModule(() =>
-	require("./runtime/OnChunksLoadedRuntimeModule")
+	require("./OnChunksLoadedRuntimeModule")
 );
 const getPublicPathRuntimeModule = lazyModule(() =>
-	require("./runtime/PublicPathRuntimeModule")
+	require("./PublicPathRuntimeModule")
 );
 const getRelativeUrlRuntimeModule = lazyModule(() =>
-	require("./runtime/RelativeUrlRuntimeModule")
+	require("./RelativeUrlRuntimeModule")
 );
 const getRuntimeIdRuntimeModule = lazyModule(() =>
-	require("./runtime/RuntimeIdRuntimeModule")
+	require("./RuntimeIdRuntimeModule")
 );
 const getSetAnonymousDefaultNameRuntimeModule = lazyModule(() =>
-	require("./runtime/SetAnonymousDefaultNameRuntimeModule")
+	require("./SetAnonymousDefaultNameRuntimeModule")
 );
 const getSystemContextRuntimeModule = lazyModule(() =>
-	require("./runtime/SystemContextRuntimeModule")
+	require("./SystemContextRuntimeModule")
 );
 const getToBinaryRuntimeModule = lazyModule(() =>
-	require("./runtime/ToBinaryRuntimeModule")
+	require("./ToBinaryRuntimeModule")
 );
 const getWorkerRuntimeModule = lazyModule(() =>
-	require("./runtime/WorkerRuntimeModule")
+	require("./WorkerRuntimeModule")
 );
 const getShareRuntimeModule = lazyModule(() =>
-	require("./sharing/ShareRuntimeModule")
+	require("../sharing/ShareRuntimeModule")
 );
 
 const GLOBALS_ON_REQUIRE = [
@@ -145,6 +143,7 @@ const GLOBALS_ON_REQUIRE = [
 	RuntimeGlobals.definePropertyGetters,
 	RuntimeGlobals.ensureChunk,
 	RuntimeGlobals.entryModuleId,
+	RuntimeGlobals.cssInjectStyle,
 	RuntimeGlobals.getCssServerStyles,
 	RuntimeGlobals.getFullHash,
 	RuntimeGlobals.global,
@@ -158,7 +157,7 @@ const GLOBALS_ON_REQUIRE = [
 	RuntimeGlobals.prefetchAsset,
 	RuntimeGlobals.preloadAsset,
 	RuntimeGlobals.relativeUrl,
-	// TODO webpack 6 - rename to nonce, because we use it for CSS too
+	// TODO in the next major release: rename to nonce, because we use it for CSS too
 	RuntimeGlobals.scriptNonce,
 	RuntimeGlobals.uncaughtErrorHandler,
 	RuntimeGlobals.asyncModule,
@@ -183,6 +182,7 @@ const MODULE_DEPENDENCIES = {
 };
 
 const TREE_DEPENDENCIES = {
+	[RuntimeGlobals.asyncModuleExportSymbol]: [RuntimeGlobals.asyncModule],
 	[RuntimeGlobals.definePropertyGetters]: [RuntimeGlobals.hasOwnProperty],
 	[RuntimeGlobals.compatGetDefaultExport]: [
 		RuntimeGlobals.definePropertyGetters
@@ -709,7 +709,7 @@ class RuntimePlugin {
 						return true;
 					}
 				});
-			// TODO webpack 6: remove CompatRuntimeModule
+			// TODO in the next major release: remove CompatRuntimeModule
 			compilation.hooks.additionalTreeRuntimeRequirements.tap(
 				PLUGIN_NAME,
 				(chunk, _set) => {

package/lib/runtime/SetAnonymousDefaultNameRuntimeModule.js

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

package/lib/runtime/SpecNamespaceObjectRuntimeModule.js

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

package/lib/runtime/StartupChunkDependenciesPlugin.js

@@ -4,11 +4,11 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
 const lazyModule = require("../util/lazyModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
 /** @import { ChunkLoadingType } from "../../declarations/WebpackOptions" */
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
 
 // only a chunk with startup dependencies emits these

package/lib/runtime/StartupChunkDependenciesRuntimeModule.js

@@ -5,12 +5,12 @@
 
 "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 Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /** @import Compilation from "../Compilation" */
 
 class StartupChunkDependenciesRuntimeModule extends RuntimeModule {

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";
 
@@ -1148,8 +1204,7 @@ class HttpUriPlugin {
 									resolveContent(url, null, (err, result) => {
 										if (err) return callback(err);
 										storeResult(
-											/** @type {Lockfile} */
-											(lockfile),
+											lockfile,
 											url,
 											/** @type {ResolveContentResult} */
 											(result),

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,64 @@ const DEFAULT_SCHEME = "virtual";
 const PLUGIN_NAME = "VirtualUrlPlugin";
 
 /** @import Compiler from "../Compiler" */
+
+/**
+ * @jsonType boolean
+ * @inline
+ * @typedef {true} VirtualModuleVersion
+ */
+
+/**
+ * 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.
+ */
+
+/**
+ * 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<LoaderOptions>) => Promise<string | Buffer> | string | Buffer} SourceFn
+ */
 /**
- * @import {
- * 	VirtualModule as VirtualModuleConfig,
- * 	VirtualModuleContent as VirtualModuleInput,
- * 	VirtualUrlOptions
- * } from "../../declarations/plugins/schemes/VirtualUrlPlugin"
+ * @inline
+ * @tsType import('./VirtualUrlPlugin').VersionFn
+ * @typedef {() => string} VersionFn
  */
+/** @typedef {{ [key: string]: VirtualModuleContent }} VirtualModules */
 
-/** @typedef {(loaderContext: LoaderContext<EXPECTED_ANY>) => Promise<string | Buffer> | string | Buffer} SourceFn */
-/** @typedef {() => string} VersionFn */
-/** @typedef {{ [key: string]: VirtualModuleInput }} VirtualModules */
+/** @import { LoaderOptions } from "../loaders/LoaderRunner" */
 
 /**
  * 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 +97,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 +308,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];