webpack 5.111.1 → 5.112.1

package/lib/index.js

@@ -8,6 +8,26 @@
 const util = require("util");
 const memoize = require("./util/memoize");
 
+const getCliArguments = memoize(() => require("./config/cli"));
+const getTerminalColors = memoize(() => require("./util/terminalColors"));
+
+// `webpack.cli` is the surface webpack-cli reads, and a getter per export is
+// what keeps reading a color from parsing the options schema.
+const getCli = memoize(() => ({
+	get getArguments() {
+		return getCliArguments().getArguments;
+	},
+	get processArguments() {
+		return getCliArguments().processArguments;
+	},
+	get createColors() {
+		return getTerminalColors().createColors;
+	},
+	get isColorSupported() {
+		return getTerminalColors().isColorSupported;
+	}
+}));
+
 /** @typedef {import("../declarations/WebpackOptions").Entry} Entry */
 /** @typedef {import("../declarations/WebpackOptions").EntryNormalized} EntryNormalized */
 /** @typedef {import("../declarations/WebpackOptions").EntryObject} EntryObject */
@@ -36,19 +56,19 @@ const memoize = require("./util/memoize");
 /** @typedef {import("../declarations/WebpackOptions").WebpackPluginFunction} WebpackPluginFunction */
 /** @typedef {import("../declarations/WebpackOptions").WebpackPluginInstance} WebpackPluginInstance */
 /** @typedef {import("./asset/AssetModule").AssetModuleBuildInfo} AssetModuleBuildInfo */
-/** @typedef {import("./ChunkGroup")} ChunkGroup */
+/** @typedef {import("./graph/ChunkGroup")} ChunkGroup */
 /** @typedef {import("./Compiler").AssetEmittedInfo} AssetEmittedInfo */
 /** @typedef {import("./context/ContextModule").ContextModuleBuildInfo} ContextModuleBuildInfo */
 /** @typedef {import("./css/CssModule").CssModuleBuildInfo} CssModuleBuildInfo */
 /** @typedef {import("./css/CssModule").CssModuleBuildMeta} CssModuleBuildMeta */
-/** @typedef {import("./ExternalModule").ExternalModuleBuildInfo} ExternalModuleBuildInfo */
+/** @typedef {import("./externals/ExternalModule").ExternalModuleBuildInfo} ExternalModuleBuildInfo */
 /** @typedef {import("./html/HtmlModule").HtmlModuleBuildInfo} HtmlModuleBuildInfo */
 /** @typedef {import("./javascript/JavascriptModule").JavascriptModuleBuildInfo} JavascriptModuleBuildInfo */
 /** @typedef {import("./javascript/JavascriptModule").JavascriptModuleBuildMeta} JavascriptModuleBuildMeta */
 /** @typedef {import("./json/JsonModule").JsonModuleBuildInfo} JsonModuleBuildInfo */
-/** @typedef {import("./Module").BuildInfo} BuildInfo */
-/** @typedef {import("./Module").BuildMeta} BuildMeta */
-/** @typedef {import("./NormalModule").NormalModuleBuildInfo} NormalModuleBuildInfo */
+/** @typedef {import("./module/Module").BuildInfo} BuildInfo */
+/** @typedef {import("./module/Module").BuildMeta} BuildMeta */
+/** @typedef {import("./module/NormalModule").NormalModuleBuildInfo} NormalModuleBuildInfo */
 /** @typedef {import("./optimize/ConcatenatedModule").ConcatenatedModuleBuildInfo} ConcatenatedModuleBuildInfo */
 /** @typedef {import("./wasm-sync/SyncWasmModule").SyncWasmModuleBuildMeta} SyncWasmModuleBuildMeta */
 /** @typedef {import("./Compilation").Asset} Asset */
@@ -57,30 +77,35 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./Compilation").PathData} PathData */
 /** @typedef {import("./Compilation").PathDataChunk} PathDataChunk */
 /** @typedef {import("./Compilation").PathDataModule} PathDataModule */
-/** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
-/** @typedef {import("./Entrypoint")} Entrypoint */
-/** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionCallback} ExternalItemFunctionCallback */
-/** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionData} ExternalItemFunctionData */
-/** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionDataGetResolve} ExternalItemFunctionDataGetResolve */
-/** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionDataGetResolveCallbackResult} ExternalItemFunctionDataGetResolveCallbackResult */
-/** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionDataGetResolveResult} ExternalItemFunctionDataGetResolveResult */
-/** @typedef {import("./ExternalModuleFactoryPlugin").ExternalItemFunctionPromise} ExternalItemFunctionPromise */
+/** @typedef {import("./module/CodeGenerationResults")} CodeGenerationResults */
+/** @typedef {import("./graph/Entrypoint")} Entrypoint */
+/** @typedef {import("./externals/ExternalModuleFactoryPlugin").ExternalItemFunctionCallback} ExternalItemFunctionCallback */
+/** @typedef {import("./externals/ExternalModuleFactoryPlugin").ExternalItemFunctionData} ExternalItemFunctionData */
+/** @typedef {import("./externals/ExternalModuleFactoryPlugin").ExternalItemFunctionDataGetResolve} ExternalItemFunctionDataGetResolve */
+/** @typedef {import("./externals/ExternalModuleFactoryPlugin").ExternalItemFunctionDataGetResolveCallbackResult} ExternalItemFunctionDataGetResolveCallbackResult */
+/** @typedef {import("./externals/ExternalModuleFactoryPlugin").ExternalItemFunctionDataGetResolveResult} ExternalItemFunctionDataGetResolveResult */
+/** @typedef {import("./externals/ExternalModuleFactoryPlugin").ExternalItemFunctionPromise} ExternalItemFunctionPromise */
 /** @typedef {import("./MultiCompiler").MultiCompilerOptions} MultiCompilerOptions */
+/** @typedef {import("./MultiCompiler").MultiCompilerPluginFunction} MultiCompilerPluginFunction */
+/** @typedef {import("./MultiCompiler").MultiCompilerPluginInstance} MultiCompilerPluginInstance */
 /** @typedef {import("./MultiCompiler").MultiWebpackOptions} MultiConfiguration */
-/** @typedef {import("./MultiStats")} MultiStats */
-/** @typedef {import("./MultiStats").MultiStatsOptions} MultiStatsOptions */
-/** @typedef {import("./NormalModuleFactory").ResolveData} ResolveData */
-/** @typedef {import("./Parser").ParserState} ParserState */
-/** @typedef {import("./ResolverFactory").ResolvePluginInstance} ResolvePluginInstance */
-/** @typedef {import("./ResolverFactory").Resolver} Resolver */
-/** @typedef {import("./Template").RenderManifestEntry} RenderManifestEntry */
-/** @typedef {import("./Template").RenderManifestOptions} RenderManifestOptions */
-/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
-/** @typedef {import("./Watching")} Watching */
-/** @typedef {import("./cli").Argument} Argument */
-/** @typedef {import("./cli").Problem} Problem */
-/** @typedef {import("./cli").Colors} Colors */
-/** @typedef {import("./cli").ColorsOptions} ColorsOptions */
+/** @typedef {import("./stats/MultiStats")} MultiStats */
+/** @typedef {import("./stats/MultiStats").MultiStatsOptions} MultiStatsOptions */
+/** @typedef {import("./module/NormalModuleFactory").ResolveData} ResolveData */
+/**
+ * @template {import("./module/NormalModule")} [TModule=import("./module/NormalModule")]
+ * @typedef {import("./module/Parser").ParserState<TModule>} ParserState
+ */
+/** @typedef {import("./resolve/ResolverFactory").ResolvePluginInstance} ResolvePluginInstance */
+/** @typedef {import("./resolve/ResolverFactory").Resolver} Resolver */
+/** @typedef {import("./template/Template").RenderManifestEntry} RenderManifestEntry */
+/** @typedef {import("./template/Template").RenderManifestOptions} RenderManifestOptions */
+/** @typedef {import("./template/TemplatedPathPlugin").TemplatePath} TemplatePath */
+/** @typedef {import("./watch/Watching")} Watching */
+/** @typedef {import("./config/cli").Argument} Argument */
+/** @typedef {import("./config/cli").Problem} Problem */
+/** @typedef {import("./util/terminalColors").Colors} Colors */
+/** @typedef {import("./util/terminalColors").ColorsOptions} ColorsOptions */
 /** @typedef {import("./config/defineConfig").ConfigurationFactory} ConfigurationFactory */
 /** @typedef {import("./config/defineConfig").DefineConfigInput} DefineConfigInput */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsAsset} StatsAsset */
@@ -99,26 +124,24 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsProfile} StatsProfile */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
-/** @typedef {import("./util/fs").OutputFileSystem} OutputFileSystem */
+/** @typedef {import("./fs/fs").InputFileSystem} InputFileSystem */
+/** @typedef {import("./fs/fs").OutputFileSystem} OutputFileSystem */
 
 /**
  * Returns function.
- * @template {EXPECTED_FUNCTION} T
+ * @template {(...args: never[]) => void} T
  * @param {() => T} factory factory function
  * @returns {T} function
  */
 const lazyFunction = (factory) => {
 	const fac = memoize(factory);
-	const f = /** @type {unknown} */ (
-		/**
-		 * Handles the callback logic for this hook.
-		 * @param {...EXPECTED_ANY} args args
-		 * @returns {T} result
-		 */
-		(...args) => fac()(...args)
-	);
-	return /** @type {T} */ (f);
+	/**
+	 * Handles the callback logic for this hook.
+	 * @param {Parameters<T>} args args
+	 * @returns {ReturnType<T>} result
+	 */
+	const f = (...args) => /** @type {ReturnType<T>} */ (fac()(...args));
+	return /** @type {T} */ (/** @type {T | typeof f} */ (f));
 };
 
 /**
@@ -162,6 +185,8 @@ module.exports = mergeExports(fn, {
 	get webpack() {
 		return require("./webpack");
 	},
+	// Stays at the top level rather than only under `config`: every config file
+	// calls it, and a scope would put three names in front of each one.
 	get defineConfig() {
 		return require("./config/defineConfig");
 	},
@@ -180,9 +205,9 @@ module.exports = mergeExports(fn, {
 			 * @returns {(configuration: Configuration | MultiConfiguration) => void} validate fn
 			 */
 			() => {
-				const validateSchema = require("./validateSchema");
+				const validateSchema = require("./config/validateSchema");
 				const webpackOptionsSchema =
-					/** @type {EXPECTED_ANY} */
+					/** @type {Parameters<typeof validateSchema>[0]} */
 					(require("../schemas/WebpackOptions.json"));
 
 				return (options) => validateSchema(webpackOptionsSchema, options);
@@ -194,38 +219,53 @@ module.exports = mergeExports(fn, {
 			}
 		};
 	},
+	/**
+	 * Validates a value against a JSON schema.
+	 * @deprecated use `config.validateSchema` — TODO in the next major release: remove
+	 * @returns {typeof import("./config/validateSchema")} the schema validator
+	 */
 	get validateSchema() {
-		const validateSchema = require("./validateSchema");
+		const validateSchema = require("./config/validateSchema");
 
 		return validateSchema;
 	},
 	get version() {
-		return /** @type {string} */ (require("../package.json").version);
+		return require("../package.json").version;
 	},
 
 	get cli() {
-		return require("./cli");
+		return getCli();
 	},
+	/**
+	 * Resolves every module of the last build eagerly.
+	 * @deprecated use `prefetch.AutomaticPrefetchPlugin` — TODO in the next major release: remove
+	 * @returns {typeof import("./prefetch/AutomaticPrefetchPlugin")} the moved export
+	 */
 	get AutomaticPrefetchPlugin() {
-		return require("./AutomaticPrefetchPlugin");
+		return require("./prefetch/AutomaticPrefetchPlugin");
 	},
 	get AsyncDependenciesBlock() {
-		return require("./AsyncDependenciesBlock");
+		return require("./graph/AsyncDependenciesBlock");
 	},
 	get BannerPlugin() {
-		return require("./BannerPlugin");
+		return require("./output/BannerPlugin");
 	},
+	/**
+	 * The cache a compilation stores and restores through.
+	 * @deprecated use `cache.Cache` — TODO in the next major release: remove
+	 * @returns {typeof import("./cache/Cache")} the moved export
+	 */
 	get Cache() {
-		return require("./Cache");
+		return require("./cache/Cache");
 	},
 	get Chunk() {
-		return require("./Chunk");
+		return require("./graph/Chunk");
 	},
 	get ChunkGraph() {
-		return require("./ChunkGraph");
+		return require("./graph/ChunkGraph");
 	},
 	get CleanPlugin() {
-		return require("./CleanPlugin");
+		return require("./output/CleanPlugin");
 	},
 	get Compilation() {
 		return require("./Compilation");
@@ -233,8 +273,13 @@ module.exports = mergeExports(fn, {
 	get Compiler() {
 		return require("./Compiler");
 	},
+	/**
+	 * The protocol scope hoisting renders through.
+	 * @deprecated use `optimize.ConcatenationScope` — TODO in the next major release: remove
+	 * @returns {typeof import("./optimize/ConcatenationScope")} the moved export
+	 */
 	get ConcatenationScope() {
-		return require("./ConcatenationScope");
+		return require("./optimize/ConcatenationScope");
 	},
 	get ContextExclusionPlugin() {
 		return require("./context/ContextExclusionPlugin");
@@ -243,55 +288,55 @@ module.exports = mergeExports(fn, {
 		return require("./context/ContextReplacementPlugin");
 	},
 	get CopyPlugin() {
-		return require("./CopyPlugin");
+		return require("./output/CopyPlugin");
 	},
 	get DefinePlugin() {
-		return require("./DefinePlugin");
+		return require("./define/DefinePlugin");
 	},
 	get Dependency() {
-		return require("./Dependency");
+		return require("./graph/Dependency");
 	},
 	get DynamicEntryPlugin() {
-		return require("./DynamicEntryPlugin");
+		return require("./entry/DynamicEntryPlugin");
 	},
 	get DotenvPlugin() {
-		return require("./DotenvPlugin");
+		return require("./define/DotenvPlugin");
 	},
 	get EntryOptionPlugin() {
-		return require("./EntryOptionPlugin");
+		return require("./entry/EntryOptionPlugin");
 	},
 	get EntryPlugin() {
-		return require("./EntryPlugin");
+		return require("./entry/EntryPlugin");
 	},
 	get EnvironmentPlugin() {
-		return require("./EnvironmentPlugin");
+		return require("./define/EnvironmentPlugin");
 	},
 	get EvalDevToolModulePlugin() {
-		return require("./EvalDevToolModulePlugin");
+		return require("./devtool/EvalDevToolModulePlugin");
 	},
 	get EvalSourceMapDevToolPlugin() {
-		return require("./EvalSourceMapDevToolPlugin");
+		return require("./devtool/EvalSourceMapDevToolPlugin");
 	},
 	get ExternalModule() {
-		return require("./ExternalModule");
+		return require("./externals/ExternalModule");
 	},
 	get ExternalsPlugin() {
-		return require("./ExternalsPlugin");
+		return require("./externals/ExternalsPlugin");
 	},
 	get Generator() {
-		return require("./Generator");
+		return require("./module/Generator");
 	},
 	get HotUpdateChunk() {
-		return require("./HotUpdateChunk");
+		return require("./graph/HotUpdateChunk");
 	},
 	get HotModuleReplacementPlugin() {
-		return require("./HotModuleReplacementPlugin");
+		return require("./hmr/HotModuleReplacementPlugin");
 	},
 	get InitFragment() {
-		return require("./InitFragment");
+		return require("./template/InitFragment");
 	},
 	get IgnorePlugin() {
-		return require("./IgnorePlugin");
+		return require("./resolve/IgnorePlugin");
 	},
 	get JavascriptModulesPlugin() {
 		return util.deprecate(
@@ -302,107 +347,140 @@ module.exports = mergeExports(fn, {
 	},
 	get LibraryTemplatePlugin() {
 		return util.deprecate(
-			() => require("./LibraryTemplatePlugin"),
+			() => require("./library/LibraryTemplatePlugin"),
 			"webpack.LibraryTemplatePlugin is deprecated and has been replaced by compilation.outputOptions.library or compilation.addEntry + passing a library option",
 			"DEP_WEBPACK_LIBRARY_TEMPLATE_PLUGIN"
 		)();
 	},
 	get LoaderOptionsPlugin() {
-		return require("./LoaderOptionsPlugin");
+		return require("./loaders/LoaderOptionsPlugin");
 	},
 	get LoaderTargetPlugin() {
-		return require("./LoaderTargetPlugin");
+		return require("./loaders/LoaderTargetPlugin");
 	},
 	get Module() {
-		return require("./Module");
+		return require("./module/Module");
 	},
 	get ModuleFactory() {
-		return require("./ModuleFactory");
+		return require("./module/ModuleFactory");
 	},
 	get ModuleFilenameHelpers() {
-		return require("./ModuleFilenameHelpers");
+		return require("./devtool/ModuleFilenameHelpers");
 	},
 	get ModuleGraph() {
-		return require("./ModuleGraph");
+		return require("./graph/ModuleGraph");
 	},
 	get ModuleGraphConnection() {
-		return require("./ModuleGraphConnection");
+		return require("./graph/ModuleGraphConnection");
 	},
 	get NoEmitOnErrorsPlugin() {
-		return require("./NoEmitOnErrorsPlugin");
+		return require("./diagnostics/NoEmitOnErrorsPlugin");
 	},
 	get NormalModule() {
-		return require("./NormalModule");
+		return require("./module/NormalModule");
 	},
 	get NormalModuleReplacementPlugin() {
-		return require("./NormalModuleReplacementPlugin");
+		return require("./resolve/NormalModuleReplacementPlugin");
 	},
 	get MultiCompiler() {
 		return require("./MultiCompiler");
 	},
+	/**
+	 * The stage constants the optimization hooks are tapped at.
+	 * @deprecated use `optimize.OptimizationStages` — TODO in the next major release: remove
+	 * @returns {typeof import("./optimize/OptimizationStages")} the moved export
+	 */
 	get OptimizationStages() {
-		return require("./OptimizationStages");
+		return require("./optimize/OptimizationStages");
 	},
 	get Parser() {
-		return require("./Parser");
+		return require("./module/Parser");
 	},
+	/**
+	 * Pins the target platform a `target: false` build cannot infer.
+	 * @deprecated use `config.PlatformPlugin` — TODO in the next major release: remove
+	 * @returns {typeof import("./config/PlatformPlugin")} the moved export
+	 */
 	get PlatformPlugin() {
-		return require("./PlatformPlugin");
+		return require("./config/PlatformPlugin");
 	},
+	/**
+	 * Resolves one request eagerly at build time.
+	 * @deprecated use `prefetch.PrefetchPlugin` — TODO in the next major release: remove
+	 * @returns {typeof import("./prefetch/PrefetchPlugin")} the moved export
+	 */
 	get PrefetchPlugin() {
-		return require("./PrefetchPlugin");
+		return require("./prefetch/PrefetchPlugin");
 	},
 	get ProgressPlugin() {
-		return require("./ProgressPlugin");
+		return require("./logging/ProgressPlugin");
 	},
 	get ProvidePlugin() {
-		return require("./ProvidePlugin");
+		return require("./provide/ProvidePlugin");
 	},
+	/**
+	 * The symbols a runtime module may declare a requirement on.
+	 * @deprecated use `runtime.RuntimeGlobals` — TODO in the next major release: remove
+	 * @returns {typeof import("./runtime/RuntimeGlobals")} the moved export
+	 */
 	get RuntimeGlobals() {
-		return require("./RuntimeGlobals");
+		return require("./runtime/RuntimeGlobals");
 	},
+	/**
+	 * The base class every emitted runtime module extends.
+	 * @deprecated use `runtime.RuntimeModule` — TODO in the next major release: remove
+	 * @returns {typeof import("./runtime/RuntimeModule")} the moved export
+	 */
 	get RuntimeModule() {
-		return require("./RuntimeModule");
+		return require("./runtime/RuntimeModule");
 	},
 	get SingleEntryPlugin() {
 		return util.deprecate(
-			() => require("./EntryPlugin"),
+			() => require("./entry/EntryPlugin"),
 			"SingleEntryPlugin was renamed to EntryPlugin",
 			"DEP_WEBPACK_SINGLE_ENTRY_PLUGIN"
 		)();
 	},
+	get SSRManifestPlugin() {
+		return require("./output/SSRManifestPlugin");
+	},
 	get SourceMapDevToolPlugin() {
-		return require("./SourceMapDevToolPlugin");
+		return require("./devtool/SourceMapDevToolPlugin");
 	},
 	get Stats() {
-		return require("./Stats");
+		return require("./stats/Stats");
 	},
 	get ManifestPlugin() {
-		return require("./ManifestPlugin");
+		return require("./output/ManifestPlugin");
 	},
 	get Template() {
-		return require("./Template");
+		return require("./template/Template");
 	},
 	get UsageState() {
-		return require("./ExportsInfo").UsageState;
+		return require("./graph/ExportsInfo").UsageState;
 	},
 	get WatchIgnorePlugin() {
-		return require("./WatchIgnorePlugin");
+		return require("./watch/WatchIgnorePlugin");
 	},
 	get WebpackError() {
 		return require("./errors/WebpackError");
 	},
+	/**
+	 * Reads a resolved configuration into the plugins it implies.
+	 * @deprecated use `config.WebpackOptionsApply` — TODO in the next major release: remove
+	 * @returns {typeof import("./config/WebpackOptionsApply")} the moved export
+	 */
 	get WebpackOptionsApply() {
-		return require("./WebpackOptionsApply");
+		return require("./config/WebpackOptionsApply");
 	},
 	get WebpackOptionsDefaulter() {
 		return util.deprecate(
-			() => require("./WebpackOptionsDefaulter"),
+			() => require("./config/WebpackOptionsDefaulter"),
 			"webpack.WebpackOptionsDefaulter is deprecated and has been replaced by webpack.config.getNormalizedWebpackOptions and webpack.config.applyWebpackOptionsDefaults",
 			"DEP_WEBPACK_OPTIONS_DEFAULTER"
 		)();
 	},
-	// TODO webpack 6 remove
+	// TODO in the next major release: remove
 	get WebpackOptionsValidationError() {
 		return require("schema-utils").ValidationError;
 	},
@@ -411,12 +489,27 @@ module.exports = mergeExports(fn, {
 	},
 
 	cache: {
+		get Cache() {
+			return require("./cache/Cache");
+		},
 		get MemoryCachePlugin() {
 			return require("./cache/MemoryCachePlugin");
 		}
 	},
 
 	config: {
+		get PlatformPlugin() {
+			return require("./config/PlatformPlugin");
+		},
+		get WebpackOptionsApply() {
+			return require("./config/WebpackOptionsApply");
+		},
+		get defineConfig() {
+			return require("./config/defineConfig");
+		},
+		get validateSchema() {
+			return require("./config/validateSchema");
+		},
 		get getNormalizedWebpackOptions() {
 			return require("./config/normalization").getNormalizedWebpackOptions;
 		},
@@ -427,16 +520,24 @@ module.exports = mergeExports(fn, {
 
 	dependencies: {
 		get ModuleDependency() {
-			return require("./dependencies/ModuleDependency");
+			return require("./dependencies/core/ModuleDependency");
+		},
+		get ESMImportDependency() {
+			return require("./dependencies/esm/ESMImportDependency");
 		},
+		/**
+		 * The dependency an ESM `import` declaration makes.
+		 * @deprecated use `dependencies.ESMImportDependency` — TODO in the next major release: remove
+		 * @returns {typeof import("./dependencies/esm/ESMImportDependency")} the dependency
+		 */
 		get HarmonyImportDependency() {
-			return require("./dependencies/HarmonyImportDependency");
+			return require("./dependencies/esm/ESMImportDependency");
 		},
 		get ConstDependency() {
-			return require("./dependencies/ConstDependency");
+			return require("./dependencies/core/ConstDependency");
 		},
 		get NullDependency() {
-			return require("./dependencies/NullDependency");
+			return require("./dependencies/core/NullDependency");
 		}
 	},
 
@@ -479,10 +580,21 @@ module.exports = mergeExports(fn, {
 		},
 		get JavascriptParser() {
 			return require("./javascript/JavascriptParser");
+		},
+		// The parser a build reads source with and the printer it writes minified
+		// source back out with, each loaded only where it is asked for.
+		get syntax() {
+			return require("./javascript/syntax");
 		}
 	},
 
 	optimize: {
+		get ConcatenationScope() {
+			return require("./optimize/ConcatenationScope");
+		},
+		get OptimizationStages() {
+			return require("./optimize/OptimizationStages");
+		},
 		get AggressiveMergingPlugin() {
 			return require("./optimize/AggressiveMergingPlugin");
 		},
@@ -523,6 +635,12 @@ module.exports = mergeExports(fn, {
 	},
 
 	runtime: {
+		get RuntimeGlobals() {
+			return require("./runtime/RuntimeGlobals");
+		},
+		get RuntimeModule() {
+			return require("./runtime/RuntimeModule");
+		},
 		get GetChunkFilenameRuntimeModule() {
 			return require("./runtime/GetChunkFilenameRuntimeModule");
 		},
@@ -531,7 +649,25 @@ module.exports = mergeExports(fn, {
 		}
 	},
 
+	module: {
+		get NullFactory() {
+			return require("./module/NullFactory");
+		}
+	},
+
+	template: {
+		get DependencyTemplate() {
+			return require("./template/DependencyTemplate");
+		}
+	},
+
 	prefetch: {
+		get AutomaticPrefetchPlugin() {
+			return require("./prefetch/AutomaticPrefetchPlugin");
+		},
+		get PrefetchPlugin() {
+			return require("./prefetch/PrefetchPlugin");
+		},
 		get ChunkPrefetchPreloadPlugin() {
 			return require("./prefetch/ChunkPrefetchPreloadPlugin");
 		}
@@ -550,6 +686,11 @@ module.exports = mergeExports(fn, {
 		get JsonpTemplatePlugin() {
 			return require("./web/JsonpTemplatePlugin");
 		},
+		/**
+		 * The runtime module that loads a chunk's CSS.
+		 * @deprecated use `css.CssLoadingRuntimeModule`, the scope this module lives in — TODO in the next major release: remove
+		 * @returns {typeof import("./css/CssLoadingRuntimeModule")} the runtime module
+		 */
 		get CssLoadingRuntimeModule() {
 			return require("./css/CssLoadingRuntimeModule");
 		}
@@ -594,19 +735,50 @@ module.exports = mergeExports(fn, {
 		}
 	},
 
+	bun: {
+		get BunTargetPlugin() {
+			return require("./bun/BunTargetPlugin");
+		}
+	},
+
+	deno: {
+		get DenoTargetPlugin() {
+			return require("./deno/DenoTargetPlugin");
+		}
+	},
+
 	wasm: {
 		get AsyncWebAssemblyModulesPlugin() {
-			return require("./wasm-async/AsyncWebAssemblyModulesPlugin");
+			return require("./wasm/AsyncWebAssemblyModulesPlugin");
 		},
 		get EnableWasmLoadingPlugin() {
 			return require("./wasm/EnableWasmLoadingPlugin");
 		}
 	},
 
+	asset: {
+		get AssetModulesPlugin() {
+			return require("./asset/AssetModulesPlugin");
+		}
+	},
+
+	json: {
+		get JsonModulesPlugin() {
+			return require("./json/JsonModulesPlugin");
+		}
+	},
+
 	css: {
+		get CssLoadingRuntimeModule() {
+			return require("./css/CssLoadingRuntimeModule");
+		},
 		get CssModulesPlugin() {
 			return require("./css/CssModulesPlugin");
 		},
+		// The minifier `optimization.minimizer` dispatches CSS to by default.
+		get cssMinify() {
+			return require("./css/cssMinify");
+		},
 		// Experimental native CSS parser + safe minifying serializer (its
 		// `SourceProcessor` / `printer` exports carry the `@experimental` tag).
 		get syntax() {
@@ -615,13 +787,26 @@ module.exports = mergeExports(fn, {
 	},
 
 	html: {
+		// Minifies what a document embeds, by handing each body back to webpack's
+		// own minifier for that language.
+		get builtinEmbeddedRenderer() {
+			return require("./html/builtinEmbeddedRenderer").builtinEmbeddedRenderer;
+		},
 		get HtmlModulesPlugin() {
 			return require("./html/HtmlModulesPlugin");
 		},
+		// The minifier `optimization.minimizer` dispatches HTML to by default.
+		get htmlMinify() {
+			return require("./html/htmlMinify");
+		},
 		// Experimental native HTML parser + safe minifying serializer (its
 		// `SourceProcessor` / `printer` exports carry the `@experimental` tag).
 		get syntax() {
 			return require("./html/syntax");
+		},
+		// The minifier `optimization.minimizer` dispatches `.svg` and `.xml` to.
+		get xmlMinify() {
+			return require("./html/xmlMinify");
 		}
 	},
 
@@ -634,7 +819,7 @@ module.exports = mergeExports(fn, {
 		}
 	},
 
-	// TODO remove in webpack 6 in favor of `dll` scope
+	// TODO in the next major release: remove in favor of `dll` scope
 	get DelegatedPlugin() {
 		return require("./dll/DelegatedPlugin");
 	},
@@ -712,14 +897,31 @@ module.exports = mergeExports(fn, {
 		get serialization() {
 			return require("./util/serialization");
 		},
+		// The wrapper `serialization.register` is normally reached through: a
+		// dependency or module a plugin adds must call it to survive the cache.
+		get makeSerializable() {
+			return require("./util/makeSerializable");
+		},
 		get cleverMerge() {
 			return require("./util/cleverMerge").cachedCleverMerge;
 		},
 		get LazySet() {
 			return require("./util/LazySet");
 		},
+		get RequestShortener() {
+			return require("./util/RequestShortener");
+		},
 		get compileBooleanMatcher() {
 			return require("./util/compileBooleanMatcher");
+		},
+		// Reading and writing `data:` URLs, and the helpers a minifier drives a
+		// caller's `renderEmbeddedSource` through.
+		get dataURL() {
+			return require("./util/dataURL");
+		},
+		// The `extractComments` reading the CSS and HTML minifiers share.
+		get extractComments() {
+			return require("./util/extractComments");
 		}
 	},
 
@@ -740,6 +942,11 @@ module.exports = mergeExports(fn, {
 			get SyncModuleIdsPlugin() {
 				return require("./ids/SyncModuleIdsPlugin");
 			}
+		},
+		typescript: {
+			get TypeScriptPlugin() {
+				return require("./typescript/TypeScriptPlugin");
+			}
 		}
 	}
 });
@@ -784,5 +991,5 @@ module.exports = mergeExports(fn, {
 
 /**
  * @template OptionsType
- * @typedef {import("./NormalModule").LoaderContext<OptionsType>} LoaderContext
+ * @typedef {import("./module/NormalModule").LoaderContext<OptionsType>} LoaderContext
  */