webpack 5.101.3 → 5.102.0

package/lib/cache/ResolverCachePlugin.js

@@ -26,10 +26,7 @@ const makeSerializable = require("../util/makeSerializable");
  * @typedef {import("tapable").SyncHook<T>} SyncHook
  */
 
-/**
- * @template H
- * @typedef {import("tapable").HookMapInterceptor<H>} HookMapInterceptor
- */
+/** @typedef {Set<string>} Dependencies  */
 
 class CacheEntry {
 	/**
@@ -163,11 +160,8 @@ class ResolverCachePlugin {
 			const newResolveContext = {
 				...resolveContext,
 				stack: new Set(),
-				/** @type {LazySet<string>} */
 				missingDependencies: new LazySet(),
-				/** @type {LazySet<string>} */
 				fileDependencies: new LazySet(),
-				/** @type {LazySet<string>} */
 				contextDependencies: new LazySet()
 			};
 			/** @type {ResolveRequest[] | undefined} */
@@ -186,8 +180,8 @@ class ResolverCachePlugin {
 			const propagate = (key) => {
 				if (resolveContext[key]) {
 					addAllToSet(
-						/** @type {Set<string>} */ (resolveContext[key]),
-						/** @type {Set<string>} */ (newResolveContext[key])
+						/** @type {Dependencies} */ (resolveContext[key]),
+						/** @type {Dependencies} */ (newResolveContext[key])
 					);
 				}
 			};
@@ -207,11 +201,11 @@ class ResolverCachePlugin {
 					const missingDependencies = newResolveContext.missingDependencies;
 					fileSystemInfo.createSnapshot(
 						resolveTime,
-						/** @type {Set<string>} */
+						/** @type {Dependencies} */
 						(fileDependencies),
-						/** @type {Set<string>} */
+						/** @type {Dependencies} */
 						(contextDependencies),
-						/** @type {Set<string>} */
+						/** @type {Dependencies} */
 						(missingDependencies),
 						snapshotOptions,
 						(err, snapshot) => {
@@ -404,21 +398,21 @@ class ResolverCachePlugin {
 										cachedResolves++;
 										if (resolveContext.missingDependencies) {
 											addAllToSet(
-												/** @type {Set<string>} */
+												/** @type {Dependencies} */
 												(resolveContext.missingDependencies),
 												snapshot.getMissingIterable()
 											);
 										}
 										if (resolveContext.fileDependencies) {
 											addAllToSet(
-												/** @type {Set<string>} */
+												/** @type {Dependencies} */
 												(resolveContext.fileDependencies),
 												snapshot.getFileIterable()
 											);
 										}
 										if (resolveContext.contextDependencies) {
 											addAllToSet(
-												/** @type {Set<string>} */
+												/** @type {Dependencies} */
 												(resolveContext.contextDependencies),
 												snapshot.getContextIterable()
 											);

package/lib/config/defaults.js

@@ -9,8 +9,10 @@ const fs = require("fs");
 const path = require("path");
 const {
 	ASSET_MODULE_TYPE,
+	ASSET_MODULE_TYPE_BYTES,
 	ASSET_MODULE_TYPE_INLINE,
 	ASSET_MODULE_TYPE_RESOURCE,
+	ASSET_MODULE_TYPE_SOURCE,
 	CSS_MODULE_TYPE,
 	CSS_MODULE_TYPE_AUTO,
 	CSS_MODULE_TYPE_GLOBAL,
@@ -30,14 +32,11 @@ const {
 	getTargetsProperties
 } = require("./target");
 
-/** @typedef {import("../../declarations/WebpackOptions").CacheOptions} CacheOptions */
 /** @typedef {import("../../declarations/WebpackOptions").CacheOptionsNormalized} CacheOptionsNormalized */
 /** @typedef {import("../../declarations/WebpackOptions").Context} Context */
 /** @typedef {import("../../declarations/WebpackOptions").CssGeneratorOptions} CssGeneratorOptions */
-/** @typedef {import("../../declarations/WebpackOptions").CssParserOptions} CssParserOptions */
 /** @typedef {import("../../declarations/WebpackOptions").EntryDescription} EntryDescription */
 /** @typedef {import("../../declarations/WebpackOptions").EntryNormalized} Entry */
-/** @typedef {import("../../declarations/WebpackOptions").EntryStaticNormalized} EntryStaticNormalized */
 /** @typedef {import("../../declarations/WebpackOptions").Environment} Environment */
 /** @typedef {import("../../declarations/WebpackOptions").Experiments} Experiments */
 /** @typedef {import("../../declarations/WebpackOptions").ExperimentsNormalized} ExperimentsNormalized */
@@ -50,13 +49,12 @@ const {
 /** @typedef {import("../../declarations/WebpackOptions").JsonGeneratorOptions} JsonGeneratorOptions */
 /** @typedef {import("../../declarations/WebpackOptions").Library} Library */
 /** @typedef {import("../../declarations/WebpackOptions").LibraryName} LibraryName */
-/** @typedef {import("../../declarations/WebpackOptions").LibraryOptions} LibraryOptions */
 /** @typedef {import("../../declarations/WebpackOptions").LibraryType} LibraryType */
 /** @typedef {import("../../declarations/WebpackOptions").Loader} Loader */
 /** @typedef {import("../../declarations/WebpackOptions").Mode} Mode */
 /** @typedef {import("../../declarations/WebpackOptions").ModuleOptionsNormalized} ModuleOptions */
 /** @typedef {import("../../declarations/WebpackOptions").Node} WebpackNode */
-/** @typedef {import("../../declarations/WebpackOptions").Optimization} Optimization */
+/** @typedef {import("../../declarations/WebpackOptions").OptimizationNormalized} Optimization */
 /** @typedef {import("../../declarations/WebpackOptions").OptimizationSplitChunksOptions} OptimizationSplitChunksOptions */
 /** @typedef {import("../../declarations/WebpackOptions").OutputNormalized} Output */
 /** @typedef {import("../../declarations/WebpackOptions").ParserOptionsByModuleTypeKnown} ParserOptionsByModuleTypeKnown */
@@ -64,14 +62,149 @@ const {
 /** @typedef {import("../../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
 /** @typedef {import("../../declarations/WebpackOptions").RuleSetRules} RuleSetRules */
 /** @typedef {import("../../declarations/WebpackOptions").SnapshotOptions} SnapshotOptions */
-/** @typedef {import("../../declarations/WebpackOptions").Target} Target */
-/** @typedef {import("../../declarations/WebpackOptions").WebpackOptions} WebpackOptions */
 /** @typedef {import("../../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptionsNormalized */
-/** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("./target").PlatformTargetProperties} PlatformTargetProperties */
 /** @typedef {import("./target").TargetProperties} TargetProperties */
 
+/**
+ * @template T
+ * @typedef {{ [P in keyof T]-?: T[P] extends object ? RecursiveNonNullable<NonNullable<T[P]>> : NonNullable<T[P]> }} RecursiveNonNullable
+ */
+
+/**
+ * @typedef {Output & {
+ * uniqueName: NonNullable<Output["uniqueName"]>,
+ * filename: NonNullable<Output["filename"]>,
+ * cssFilename: NonNullable<Output["cssFilename"]>,
+ * chunkFilename: NonNullable<Output["chunkFilename"]>,
+ * cssChunkFilename: NonNullable<Output["cssChunkFilename"]>,
+ * hotUpdateChunkFilename: NonNullable<Output["hotUpdateChunkFilename"]>,
+ * hotUpdateGlobal: NonNullable<Output["hotUpdateGlobal"]>,
+ * assetModuleFilename: NonNullable<Output["assetModuleFilename"]>,
+ * webassemblyModuleFilename: NonNullable<Output["webassemblyModuleFilename"]>
+ * sourceMapFilename: NonNullable<Output["sourceMapFilename"]>,
+ * hotUpdateMainFilename: NonNullable<Output["hotUpdateMainFilename"]>,
+ * devtoolNamespace: NonNullable<Output["devtoolNamespace"]>,
+ * publicPath: NonNullable<Output["publicPath"]>
+ * workerPublicPath: NonNullable<Output["workerPublicPath"]>
+ * workerWasmLoading: NonNullable<Output["workerWasmLoading"]>
+ * workerChunkLoading: NonNullable<Output["workerChunkLoading"]>
+ * chunkFormat: NonNullable<Output["chunkFormat"]>,
+ * module: NonNullable<Output["module"]>,
+ * asyncChunks: NonNullable<Output["asyncChunks"]>,
+ * charset: NonNullable<Output["charset"]>,
+ * iife: NonNullable<Output["iife"]>,
+ * globalObject: NonNullable<Output["globalObject"]>,
+ * scriptType: NonNullable<Output["scriptType"]>,
+ * path: NonNullable<Output["path"]>,
+ * pathinfo: NonNullable<Output["pathinfo"]>,
+ * hashFunction: NonNullable<Output["hashFunction"]>,
+ * hashDigest: NonNullable<Output["hashDigest"]>,
+ * hashDigestLength: NonNullable<Output["hashDigestLength"]>,
+ * chunkLoadTimeout: NonNullable<Output["chunkLoadTimeout"]>,
+ * chunkLoading: NonNullable<Output["chunkLoading"]>,
+ * chunkLoadingGlobal: NonNullable<Output["chunkLoadingGlobal"]>,
+ * compareBeforeEmit: NonNullable<Output["compareBeforeEmit"]>,
+ * strictModuleErrorHandling: NonNullable<Output["strictModuleErrorHandling"]>,
+ * strictModuleExceptionHandling: NonNullable<Output["strictModuleExceptionHandling"]>,
+ * importFunctionName: NonNullable<Output["importFunctionName"]>,
+ * importMetaName: NonNullable<Output["importMetaName"]>,
+ * environment: RecursiveNonNullable<Output["environment"]>,
+ * crossOriginLoading: NonNullable<Output["crossOriginLoading"]>,
+ * wasmLoading: NonNullable<Output["wasmLoading"]>,
+ * }} OutputNormalizedWithDefaults
+ */
+
+/**
+ * @typedef {SnapshotOptions & {
+ * managedPaths: NonNullable<SnapshotOptions["managedPaths"]>,
+ * unmanagedPaths: NonNullable<SnapshotOptions["unmanagedPaths"]>,
+ * immutablePaths: NonNullable<SnapshotOptions["immutablePaths"]>,
+ * resolveBuildDependencies: NonNullable<SnapshotOptions["resolveBuildDependencies"]>,
+ * buildDependencies: NonNullable<SnapshotOptions["buildDependencies"]>,
+ * module: NonNullable<SnapshotOptions["module"]>,
+ * resolve: NonNullable<SnapshotOptions["resolve"]>,
+ * }} SnapshotNormalizedWithDefaults
+ */
+
+/**
+ * @typedef {Optimization & {
+ * runtimeChunk: NonNullable<Optimization["runtimeChunk"]>,
+ * splitChunks: NonNullable<Optimization["splitChunks"]>,
+ * mergeDuplicateChunks: NonNullable<Optimization["mergeDuplicateChunks"]>,
+ * removeAvailableModules: NonNullable<Optimization["removeAvailableModules"]>,
+ * removeEmptyChunks: NonNullable<Optimization["removeEmptyChunks"]>,
+ * flagIncludedChunks: NonNullable<Optimization["flagIncludedChunks"]>,
+ * moduleIds: NonNullable<Optimization["moduleIds"]>,
+ * chunkIds: NonNullable<Optimization["chunkIds"]>,
+ * sideEffects: NonNullable<Optimization["sideEffects"]>,
+ * providedExports: NonNullable<Optimization["providedExports"]>,
+ * usedExports: NonNullable<Optimization["usedExports"]>,
+ * mangleExports: NonNullable<Optimization["mangleExports"]>,
+ * innerGraph: NonNullable<Optimization["innerGraph"]>,
+ * concatenateModules: NonNullable<Optimization["concatenateModules"]>,
+ * avoidEntryIife: NonNullable<Optimization["avoidEntryIife"]>,
+ * emitOnErrors: NonNullable<Optimization["emitOnErrors"]>,
+ * checkWasmTypes: NonNullable<Optimization["checkWasmTypes"]>,
+ * mangleWasmImports: NonNullable<Optimization["mangleWasmImports"]>,
+ * portableRecords: NonNullable<Optimization["portableRecords"]>,
+ * realContentHash: NonNullable<Optimization["realContentHash"]>,
+ * minimize: NonNullable<Optimization["minimize"]>,
+ * minimizer: NonNullable<Exclude<Optimization["minimizer"], "...">>,
+ * nodeEnv: NonNullable<Optimization["nodeEnv"]>,
+ * }} OptimizationNormalizedWithDefaults
+ */
+
+/**
+ * @typedef {ExternalsPresets & {
+ * web: NonNullable<ExternalsPresets["web"]>,
+ * node: NonNullable<ExternalsPresets["node"]>,
+ * nwjs: NonNullable<ExternalsPresets["nwjs"]>,
+ * electron: NonNullable<ExternalsPresets["electron"]>,
+ * electronMain: NonNullable<ExternalsPresets["electronMain"]>,
+ * electronPreload: NonNullable<ExternalsPresets["electronPreload"]>,
+ * electronRenderer: NonNullable<ExternalsPresets["electronRenderer"]>,
+ * }} ExternalsPresetsNormalizedWithDefaults
+ */
+
+/**
+ * @typedef {InfrastructureLogging & {
+ * stream: NonNullable<InfrastructureLogging["stream"]>,
+ * level: NonNullable<InfrastructureLogging["level"]>,
+ * debug: NonNullable<InfrastructureLogging["debug"]>,
+ * colors: NonNullable<InfrastructureLogging["colors"]>,
+ * appendOnly: NonNullable<InfrastructureLogging["appendOnly"]>,
+ * }} InfrastructureLoggingNormalizedWithDefaults
+ */
+
+/**
+ * @typedef {WebpackOptionsNormalized
+ * & { context: NonNullable<WebpackOptionsNormalized["context"]> }
+ * & { infrastructureLogging: InfrastructureLoggingNormalizedWithDefaults }
+ * } WebpackOptionsNormalizedWithBaseDefaults
+ */
+
+/**
+ * @typedef {WebpackOptionsNormalizedWithBaseDefaults
+ * & { target: NonNullable<WebpackOptionsNormalized["target"]> }
+ * & { output: OutputNormalizedWithDefaults }
+ * & { optimization: OptimizationNormalizedWithDefaults }
+ * & { devtool: NonNullable<WebpackOptionsNormalized["devtool"]> }
+ * & { stats: NonNullable<WebpackOptionsNormalized["stats"]>  }
+ * & { node: NonNullable<WebpackOptionsNormalized["node"]> }
+ * & { profile: NonNullable<WebpackOptionsNormalized["profile"]> }
+ * & { parallelism: NonNullable<WebpackOptionsNormalized["parallelism"]> }
+ * & { snapshot: SnapshotNormalizedWithDefaults }
+ * & { externalsPresets: ExternalsPresetsNormalizedWithDefaults }
+ * & { externalsType: NonNullable<WebpackOptionsNormalized["externalsType"]> }
+ * & { watch: NonNullable<WebpackOptionsNormalized["watch"]> }
+ * & { performance: NonNullable<WebpackOptionsNormalized["performance"]> }
+ * & { recordsInputPath: NonNullable<WebpackOptionsNormalized["recordsInputPath"]> }
+ * & { recordsOutputPath: NonNullable<WebpackOptionsNormalized["recordsOutputPath"]>
+ * }} WebpackOptionsNormalizedWithDefaults
+ */
+
 /**
  * @typedef {object} ResolvedOptions
  * @property {PlatformTargetProperties | false} platform - platform target properties
@@ -140,9 +273,9 @@ const A = (obj, prop, factory) => {
 					newArray = value.slice(0, i);
 					obj[prop] = /** @type {T[P]} */ (/** @type {unknown} */ (newArray));
 				}
-				const items = /** @type {EXPECTED_ANY[]} */ (
-					/** @type {unknown} */ (factory())
-				);
+				const items =
+					/** @type {EXPECTED_ANY[]} */
+					(/** @type {unknown} */ (factory()));
 				if (items !== undefined) {
 					for (const item of items) {
 						newArray.push(item);
@@ -383,20 +516,12 @@ const applyExperimentsDefaults = (
 	D(experiments, "syncWebAssembly", false);
 	D(experiments, "asyncWebAssembly", experiments.futureDefaults);
 	D(experiments, "outputModule", false);
-	D(experiments, "layers", false);
 	D(experiments, "lazyCompilation", undefined);
 	D(experiments, "buildHttp", undefined);
 	D(experiments, "cacheUnaffected", experiments.futureDefaults);
 	D(experiments, "deferImport", false);
 	F(experiments, "css", () => (experiments.futureDefaults ? true : undefined));
 
-	// TODO webpack 6: remove this. topLevelAwait should be enabled by default
-	let shouldEnableTopLevelAwait = true;
-	if (typeof experiments.topLevelAwait === "boolean") {
-		shouldEnableTopLevelAwait = experiments.topLevelAwait;
-	}
-	D(experiments, "topLevelAwait", shouldEnableTopLevelAwait);
-
 	if (typeof experiments.buildHttp === "object") {
 		D(experiments.buildHttp, "frozen", production);
 		D(experiments.buildHttp, "upgrade", false);
@@ -556,6 +681,7 @@ const applySnapshotDefaults = (snapshot, { production, futureDefaults }) => {
 	F(snapshot, "module", () =>
 		production ? { timestamp: true, hash: true } : { timestamp: true }
 	);
+	F(snapshot, "contextModule", () => ({ timestamp: true }));
 	F(snapshot, "resolve", () =>
 		production ? { timestamp: true, hash: true } : { timestamp: true }
 	);
@@ -931,12 +1057,20 @@ const applyModuleDefaults = (
 				]
 			},
 			{
-				assert: { type: JSON_MODULE_TYPE },
+				with: { type: JSON_MODULE_TYPE },
 				type: JSON_MODULE_TYPE
 			},
 			{
-				with: { type: JSON_MODULE_TYPE },
+				assert: { type: JSON_MODULE_TYPE },
 				type: JSON_MODULE_TYPE
+			},
+			{
+				with: { type: "text" },
+				type: ASSET_MODULE_TYPE_SOURCE
+			},
+			{
+				with: { type: "bytes" },
+				type: ASSET_MODULE_TYPE_BYTES
 			}
 		);
 		return rules;

package/lib/config/normalization.js

@@ -15,13 +15,13 @@ const util = require("util");
 /** @typedef {import("../../declarations/WebpackOptions").LibraryName} LibraryName */
 /** @typedef {import("../../declarations/WebpackOptions").LibraryOptions} LibraryOptions */
 /** @typedef {import("../../declarations/WebpackOptions").ModuleOptionsNormalized} ModuleOptionsNormalized */
+/** @typedef {import("../../declarations/WebpackOptions").OptimizationNormalized} OptimizationNormalized */
 /** @typedef {import("../../declarations/WebpackOptions").OptimizationRuntimeChunk} OptimizationRuntimeChunk */
 /** @typedef {import("../../declarations/WebpackOptions").OptimizationRuntimeChunkNormalized} OptimizationRuntimeChunkNormalized */
 /** @typedef {import("../../declarations/WebpackOptions").OutputNormalized} OutputNormalized */
-/** @typedef {import("../../declarations/WebpackOptions").Plugins} Plugins */
+/** @typedef {import("../../declarations/WebpackOptions").PluginsNormalized} PluginsNormalized */
 /** @typedef {import("../../declarations/WebpackOptions").WebpackOptions} WebpackOptions */
 /** @typedef {import("../../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptionsNormalized */
-/** @typedef {import("../Entrypoint")} Entrypoint */
 /** @typedef {import("../WebpackError")} WebpackError */
 
 const handledDeprecatedNoEmitOnErrors = util.deprecate(
@@ -287,6 +287,12 @@ const getNormalizedWebpackOptions = (config) => ({
 					cacheGroups: cloneObject(splitChunks.cacheGroups)
 				}
 		),
+		minimizer:
+			optimization.minimizer !== undefined
+				? /** @type {OptimizationNormalized["minimizer"]} */ (
+						nestedArray(optimization.minimizer, (p) => p.filter(Boolean))
+					)
+				: optimization.minimizer,
 		emitOnErrors:
 			optimization.noEmitOnErrors !== undefined
 				? handledDeprecatedNoEmitOnErrors(
@@ -410,7 +416,9 @@ const getNormalizedWebpackOptions = (config) => ({
 			...performance
 		};
 	}),
-	plugins: /** @type {Plugins} */ (nestedArray(config.plugins, (p) => [...p])),
+	plugins: /** @type {PluginsNormalized} */ (
+		nestedArray(config.plugins, (p) => p.filter(Boolean))
+	),
 	profile: config.profile,
 	recordsInputPath:
 		config.recordsInputPath !== undefined
@@ -448,6 +456,13 @@ const getNormalizedWebpackOptions = (config) => ({
 			timestamp: module.timestamp,
 			hash: module.hash
 		})),
+		contextModule: optionalNestedConfig(
+			snapshot.contextModule,
+			(contextModule) => ({
+				timestamp: contextModule.timestamp,
+				hash: contextModule.hash
+			})
+		),
 		immutablePaths: optionalNestedArray(snapshot.immutablePaths, (p) => [...p]),
 		managedPaths: optionalNestedArray(snapshot.managedPaths, (p) => [...p]),
 		unmanagedPaths: optionalNestedArray(snapshot.unmanagedPaths, (p) => [...p])

package/lib/container/ContainerEntryDependency.js

@@ -8,7 +8,6 @@
 const Dependency = require("../Dependency");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("./ContainerEntryModule").ExposeOptions} ExposeOptions */
 /** @typedef {import("./ContainerEntryModule").ExposesList} ExposesList */
 
 class ContainerEntryDependency extends Dependency {

package/lib/container/ContainerEntryModule.js

@@ -16,25 +16,21 @@ const StaticExportsDependency = require("../dependencies/StaticExportsDependency
 const makeSerializable = require("../util/makeSerializable");
 const ContainerExposedDependency = require("./ContainerExposedDependency");
 
-/** @typedef {import("../../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../ChunkGroup")} ChunkGroup */
+/** @typedef {import("../config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Module").BuildCallback} BuildCallback */
 /** @typedef {import("../Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
+/** @typedef {import("../Module").LibIdent} LibIdent */
 /** @typedef {import("../Module").NeedBuildCallback} NeedBuildCallback */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("../WebpackError")} WebpackError */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
-/** @typedef {import("./ContainerEntryDependency")} ContainerEntryDependency */
 
 /**
  * @typedef {object} ExposeOptions
@@ -83,7 +79,7 @@ class ContainerEntryModule extends Module {
 
 	/**
 	 * @param {LibIdentOptions} options options
-	 * @returns {string | null} an identifier for library inclusion
+	 * @returns {LibIdent | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
 		return `${this.layer ? `(${this.layer})/` : ""}webpack/container/entry/${

package/lib/container/ContainerPlugin.js

@@ -14,7 +14,6 @@ const { parseOptions } = require("./options");
 
 /** @typedef {import("../../declarations/plugins/container/ContainerPlugin").ContainerPluginOptions} ContainerPluginOptions */
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("./ContainerEntryModule").ExposeOptions} ExposeOptions */
 /** @typedef {import("./ContainerEntryModule").ExposesList} ExposesList */
 
 const getModuleFederationPlugin = memoize(() =>
@@ -83,7 +82,7 @@ class ContainerPlugin {
 			const dep = new ContainerEntryDependency(name, exposes, shareScope);
 			dep.loc = { name };
 			compilation.addEntry(
-				/** @type {string} */ (compilation.options.context),
+				compilation.options.context,
 				dep,
 				{
 					name,

package/lib/container/ContainerReferencePlugin.js

@@ -17,7 +17,6 @@ const RemoteToExternalDependency = require("./RemoteToExternalDependency");
 const { parseOptions } = require("./options");
 
 /** @typedef {import("../../declarations/plugins/container/ContainerReferencePlugin").ContainerReferencePluginOptions} ContainerReferencePluginOptions */
-/** @typedef {import("../../declarations/plugins/container/ContainerReferencePlugin").RemotesConfig} RemotesConfig */
 /** @typedef {import("../Compiler")} Compiler */
 
 const validate = createSchemaValidation(

package/lib/container/FallbackDependency.js

@@ -8,12 +8,13 @@
 const Dependency = require("../Dependency");
 const makeSerializable = require("../util/makeSerializable");
 
+/** @typedef {import("./RemoteModule").ExternalRequests} ExternalRequests */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
 class FallbackDependency extends Dependency {
 	/**
-	 * @param {string[]} requests requests
+	 * @param {ExternalRequests} requests requests
 	 */
 	constructor(requests) {
 		super();

package/lib/container/FallbackModule.js

@@ -14,31 +14,30 @@ const Template = require("../Template");
 const makeSerializable = require("../util/makeSerializable");
 const FallbackItemDependency = require("./FallbackItemDependency");
 
-/** @typedef {import("../../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
+/** @typedef {import("../config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
 /** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../ChunkGroup")} ChunkGroup */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Module").BuildCallback} BuildCallback */
 /** @typedef {import("../Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
+/** @typedef {import("../Module").LibIdent} LibIdent */
+/** @typedef {import("../Module").NameForCondition} NameForCondition */
 /** @typedef {import("../Module").NeedBuildCallback} NeedBuildCallback */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("../WebpackError")} WebpackError */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
+/** @typedef {import("./RemoteModule").ExternalRequests} ExternalRequests */
 
 const RUNTIME_REQUIREMENTS = new Set([RuntimeGlobals.module]);
 
 class FallbackModule extends Module {
 	/**
-	 * @param {string[]} requests list of requests to choose one
+	 * @param {ExternalRequests} requests list of requests to choose one
 	 */
 	constructor(requests) {
 		super(WEBPACK_MODULE_TYPE_FALLBACK);
@@ -63,7 +62,7 @@ class FallbackModule extends Module {
 
 	/**
 	 * @param {LibIdentOptions} options options
-	 * @returns {string | null} an identifier for library inclusion
+	 * @returns {LibIdent | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
 		return `${this.layer ? `(${this.layer})/` : ""}webpack/container/fallback/${

package/lib/container/ModuleFederationPlugin.js

@@ -16,7 +16,6 @@ const HoistContainerReferences = require("./HoistContainerReferencesPlugin");
 
 /** @typedef {import("../../declarations/plugins/container/ModuleFederationPlugin").ExternalsType} ExternalsType */
 /** @typedef {import("../../declarations/plugins/container/ModuleFederationPlugin").ModuleFederationPluginOptions} ModuleFederationPluginOptions */
-/** @typedef {import("../../declarations/plugins/container/ModuleFederationPlugin").Shared} Shared */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Dependency")} Dependency */
 

package/lib/container/RemoteModule.js

@@ -16,31 +16,31 @@ const makeSerializable = require("../util/makeSerializable");
 const FallbackDependency = require("./FallbackDependency");
 const RemoteToExternalDependency = require("./RemoteToExternalDependency");
 
-/** @typedef {import("../../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../ChunkGroup")} ChunkGroup */
+/** @typedef {import("../config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Module").BuildCallback} BuildCallback */
 /** @typedef {import("../Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
+/** @typedef {import("../Module").LibIdent} LibIdent */
+/** @typedef {import("../Module").NameForCondition} NameForCondition */
 /** @typedef {import("../Module").NeedBuildCallback} NeedBuildCallback */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("../WebpackError")} WebpackError */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 
 const RUNTIME_REQUIREMENTS = new Set([RuntimeGlobals.module]);
 
+/** @typedef {string[]} ExternalRequests */
+
 class RemoteModule extends Module {
 	/**
 	 * @param {string} request request string
-	 * @param {string[]} externalRequests list of external requests to containers
+	 * @param {ExternalRequests} externalRequests list of external requests to containers
 	 * @param {string} internalRequest name of exposed module in container
 	 * @param {string} shareScope the used share scope name
 	 */
@@ -72,7 +72,7 @@ class RemoteModule extends Module {
 
 	/**
 	 * @param {LibIdentOptions} options options
-	 * @returns {string | null} an identifier for library inclusion
+	 * @returns {LibIdent | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
 		return `${this.layer ? `(${this.layer})/` : ""}webpack/container/remote/${
@@ -131,7 +131,7 @@ class RemoteModule extends Module {
 	}
 
 	/**
-	 * @returns {string | null} absolute path which should be used for condition matching (usually the resource path)
+	 * @returns {NameForCondition | null} absolute path which should be used for condition matching (usually the resource path)
 	 */
 	nameForCondition() {
 		return this.request;

package/lib/container/RemoteRuntimeModule.js

@@ -28,9 +28,9 @@ class RemoteRuntimeModule extends RuntimeModule {
 		const compilation = /** @type {Compilation} */ (this.compilation);
 		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
 		const { runtimeTemplate, moduleGraph } = compilation;
-		/** @type {Record<ChunkId, (string | number)[]>} */
+		/** @type {Record<ChunkId, ModuleId[]>} */
 		const chunkToRemotesMapping = {};
-		/** @type {Record<ModuleId, [string, string, string | number | null]>} */
+		/** @type {Record<ModuleId, [string, string, ModuleId]>} */
 		const idToExternalAndNameMapping = {};
 		for (const chunk of /** @type {Chunk} */ (
 			this.chunk

package/lib/css/CssGenerator.js

@@ -24,6 +24,7 @@ const memoize = require("../util/memoize");
 /** @typedef {import("../../declarations/WebpackOptions").CssAutoGeneratorOptions} CssAutoGeneratorOptions */
 /** @typedef {import("../../declarations/WebpackOptions").CssGlobalGeneratorOptions} CssGlobalGeneratorOptions */
 /** @typedef {import("../../declarations/WebpackOptions").CssModuleGeneratorOptions} CssModuleGeneratorOptions */
+/** @typedef {import("../Compilation").DependencyConstructor} DependencyConstructor */
 /** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").CssData} CssData */
@@ -124,7 +125,7 @@ class CssGenerator extends Generator {
 		 */
 		const handleDependency = (dependency) => {
 			const constructor =
-				/** @type {new (...args: EXPECTED_ANY[]) => Dependency} */
+				/** @type {DependencyConstructor} */
 				(dependency.constructor);
 			const template = generateContext.dependencyTemplates.get(constructor);
 			if (!template) {
@@ -170,11 +171,7 @@ class CssGenerator extends Generator {
 						usedIdentifiers.add(identifier);
 						generateContext.concatenationScope.registerExport(name, identifier);
 						source.add(
-							`${
-								generateContext.runtimeTemplate.supportsConst()
-									? "const"
-									: "var"
-							} ${identifier} = ${JSON.stringify(v)};\n`
+							`${generateContext.runtimeTemplate.renderConst()} ${identifier} = ${JSON.stringify(v)};\n`
 						);
 					}
 					return source;