webpack 5.108.1 → 5.108.3

package/lib/runtime/LoadScriptRuntimeModule.js

@@ -5,9 +5,10 @@
 "use strict";
 
 const { SyncWaterfallHook } = require("tapable");
-const Compilation = require("../Compilation");
+/** @typedef {import("../Compilation")} Compilation */
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
+const createHooksRegistry = require("../util/createHooksRegistry");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
 
 /** @typedef {import("../Chunk")} Chunk */
@@ -17,30 +18,7 @@ const HelperRuntimeModule = require("./HelperRuntimeModule");
  * @property {SyncWaterfallHook<[string, Chunk]>} createScript
  */
 
-/** @type {WeakMap<Compilation, LoadScriptCompilationHooks>} */
-const compilationHooksMap = new WeakMap();
-
 class LoadScriptRuntimeModule extends HelperRuntimeModule {
-	/**
-	 * @param {Compilation} compilation the compilation
-	 * @returns {LoadScriptCompilationHooks} hooks
-	 */
-	static getCompilationHooks(compilation) {
-		if (!(compilation instanceof Compilation)) {
-			throw new TypeError(
-				"The 'compilation' argument must be an instance of Compilation"
-			);
-		}
-		let hooks = compilationHooksMap.get(compilation);
-		if (hooks === undefined) {
-			hooks = {
-				createScript: new SyncWaterfallHook(["source", "chunk"])
-			};
-			compilationHooksMap.set(compilation, hooks);
-		}
-		return hooks;
-	}
-
 	/**
 	 * @param {boolean=} withCreateScriptUrl use create script url for trusted types
 	 * @param {boolean=} withFetchPriority use `fetchPriority` attribute
@@ -177,4 +155,11 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 	}
 }
 
+LoadScriptRuntimeModule.getCompilationHooks = createHooksRegistry(
+	() =>
+		/** @type {LoadScriptCompilationHooks} */ ({
+			createScript: new SyncWaterfallHook(["source", "chunk"])
+		})
+);
+
 module.exports = LoadScriptRuntimeModule;

package/lib/util/createHooksRegistry.js

@@ -0,0 +1,35 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+*/
+
+"use strict";
+
+const memoize = require("./memoize");
+
+const getCompilation = memoize(() => require("../Compilation"));
+
+/**
+ * @template T
+ * @param {() => T} createHooks factory that returns a fresh hooks object
+ * @returns {(compilation: import("../Compilation")) => T} getter that returns (or creates) hooks for the compilation
+ */
+const createHooksRegistry = (createHooks) => {
+	/** @type {WeakMap<import("../Compilation"), T>} */
+	const map = new WeakMap();
+	return (compilation) => {
+		const Compilation = getCompilation();
+		if (!(compilation instanceof Compilation)) {
+			throw new TypeError(
+				"The 'compilation' argument must be an instance of Compilation"
+			);
+		}
+		let hooks = map.get(compilation);
+		if (hooks === undefined) {
+			hooks = createHooks();
+			map.set(compilation, hooks);
+		}
+		return hooks;
+	};
+};
+
+module.exports = createHooksRegistry;

package/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js

@@ -6,12 +6,12 @@
 "use strict";
 
 const { SyncWaterfallHook } = require("tapable");
-const Compilation = require("../Compilation");
 const Generator = require("../Generator");
 const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("../ModuleTypeConstants");
 const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
 const { tryRunOrWebpackError } = require("../errors/HookWebpackError");
 const { compareModulesByFullName } = require("../util/comparators");
+const createHooksRegistry = require("../util/createHooksRegistry");
 const memoize = require("../util/memoize");
 const AsyncWasmModule = require("./AsyncWasmModule");
 
@@ -59,37 +59,9 @@ const getAsyncWebAssemblyParser = memoize(() =>
  * @property {boolean=} mangleImports mangle imports
  */
 
-/** @type {WeakMap<Compilation, CompilationHooks>} */
-const compilationHooksMap = new WeakMap();
-
 const PLUGIN_NAME = "AsyncWebAssemblyModulesPlugin";
 
 class AsyncWebAssemblyModulesPlugin {
-	/**
-	 * Returns the attached hooks.
-	 * @param {Compilation} compilation the compilation
-	 * @returns {CompilationHooks} the attached hooks
-	 */
-	static getCompilationHooks(compilation) {
-		if (!(compilation instanceof Compilation)) {
-			throw new TypeError(
-				"The 'compilation' argument must be an instance of Compilation"
-			);
-		}
-		let hooks = compilationHooksMap.get(compilation);
-		if (hooks === undefined) {
-			hooks = {
-				renderModuleContent: new SyncWaterfallHook([
-					"source",
-					"module",
-					"renderContext"
-				])
-			};
-			compilationHooksMap.set(compilation, hooks);
-		}
-		return hooks;
-	}
-
 	/**
 	 * Creates an instance of AsyncWebAssemblyModulesPlugin.
 	 * @param {AsyncWebAssemblyModulesPluginOptions} options options
@@ -224,4 +196,15 @@ class AsyncWebAssemblyModulesPlugin {
 	}
 }
 
+AsyncWebAssemblyModulesPlugin.getCompilationHooks = createHooksRegistry(
+	() =>
+		/** @type {CompilationHooks} */ ({
+			renderModuleContent: new SyncWaterfallHook([
+				"source",
+				"module",
+				"renderContext"
+			])
+		})
+);
+
 module.exports = AsyncWebAssemblyModulesPlugin;

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -5,7 +5,7 @@
 "use strict";
 
 const { SyncWaterfallHook } = require("tapable");
-const Compilation = require("../Compilation");
+/** @typedef {import("../Compilation")} Compilation */
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
@@ -15,6 +15,7 @@ const {
 const chunkHasJs = require("../javascript/JavascriptModulesPlugin").chunkHasJs;
 const { getInitialChunkIds } = require("../javascript/StartupHelpers");
 const compileBooleanMatcher = require("../util/compileBooleanMatcher");
+const createHooksRegistry = require("../util/createHooksRegistry");
 
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
@@ -26,31 +27,7 @@ const compileBooleanMatcher = require("../util/compileBooleanMatcher");
  * @property {SyncWaterfallHook<[string, Chunk]>} linkPrefetch
  */
 
-/** @type {WeakMap<Compilation, JsonpCompilationPluginHooks>} */
-const compilationHooksMap = new WeakMap();
-
 class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
-	/**
-	 * @param {Compilation} compilation the compilation
-	 * @returns {JsonpCompilationPluginHooks} hooks
-	 */
-	static getCompilationHooks(compilation) {
-		if (!(compilation instanceof Compilation)) {
-			throw new TypeError(
-				"The 'compilation' argument must be an instance of Compilation"
-			);
-		}
-		let hooks = compilationHooksMap.get(compilation);
-		if (hooks === undefined) {
-			hooks = {
-				linkPreload: new SyncWaterfallHook(["source", "chunk"]),
-				linkPrefetch: new SyncWaterfallHook(["source", "chunk"])
-			};
-			compilationHooksMap.set(compilation, hooks);
-		}
-		return hooks;
-	}
-
 	/**
 	 * @param {ReadOnlyRuntimeRequirements} runtimeRequirements runtime requirements
 	 */
@@ -459,4 +436,12 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 	}
 }
 
+JsonpChunkLoadingRuntimeModule.getCompilationHooks = createHooksRegistry(
+	() =>
+		/** @type {JsonpCompilationPluginHooks} */ ({
+			linkPreload: new SyncWaterfallHook(["source", "chunk"]),
+			linkPrefetch: new SyncWaterfallHook(["source", "chunk"])
+		})
+);
+
 module.exports = JsonpChunkLoadingRuntimeModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.108.1",
+  "version": "5.108.3",
   "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "homepage": "https://github.com/webpack/webpack",
   "bugs": "https://github.com/webpack/webpack/issues",

package/types.d.ts

@@ -679,13 +679,9 @@ declare class AsyncWebAssemblyModulesPlugin {
 		renderContext: WebAssemblyRenderContext,
 		hooks: CompilationHooksAsyncWebAssemblyModulesPlugin
 	): Source;
-
-	/**
-	 * Returns the attached hooks.
-	 */
-	static getCompilationHooks(
+	static getCompilationHooks: (
 		compilation: Compilation
-	): CompilationHooksAsyncWebAssemblyModulesPlugin;
+	) => CompilationHooksAsyncWebAssemblyModulesPlugin;
 }
 declare interface AsyncWebAssemblyModulesPluginOptions {
 	/**
@@ -2757,6 +2753,13 @@ declare interface ChunkRenderContextCssModulesPlugin {
 	 */
 	moduleSourceContent: Source;
 }
+
+/**
+ * Renames an inlined module's top-level declaration (and all its references) when
+ * its name is already taken in the shared startup scope, recording the chosen name
+ * in `allUsedNames`. Lets inlined modules be emitted without a per-entry/per-chunk
+ * IIFE by resolving name collisions instead of isolating each module.
+ */
 declare interface ChunkRenderContextJavascriptModulesPlugin {
 	/**
 	 * the chunk
@@ -2904,13 +2907,9 @@ declare class CleanPlugin {
 	 * Applies the plugin by registering its hooks on the compiler.
 	 */
 	apply(compiler: Compiler): void;
-
-	/**
-	 * Returns the attached hooks.
-	 */
-	static getCompilationHooks(
+	static getCompilationHooks: (
 		compilation: Compilation
-	): CleanPluginCompilationHooks;
+	) => CleanPluginCompilationHooks;
 }
 declare interface CleanPluginCompilationHooks {
 	/**
@@ -3974,6 +3973,13 @@ declare interface CompilationHooksCssModulesPlugin {
 		undefined | void | Module[]
 	>;
 }
+
+/**
+ * Renames an inlined module's top-level declaration (and all its references) when
+ * its name is already taken in the shared startup scope, recording the chosen name
+ * in `allUsedNames`. Lets inlined modules be emitted without a per-entry/per-chunk
+ * IIFE by resolving name collisions instead of isolating each module.
+ */
 declare interface CompilationHooksJavascriptModulesPlugin {
 	renderModuleContent: SyncWaterfallHook<
 		[Source, Module, ModuleRenderContext],
@@ -4172,18 +4178,18 @@ declare class Compiler {
 	fileTimestamps?: Map<
 		string,
 		| null
+		| "ignore"
 		| EntryTypesIndex
 		| OnlySafeTimeEntry
 		| ExistenceOnlyTimeEntryTypesIndex
-		| "ignore"
 	>;
 	contextTimestamps?: Map<
 		string,
 		| null
+		| "ignore"
 		| EntryTypesIndex
 		| OnlySafeTimeEntry
 		| ExistenceOnlyTimeEntryTypesIndex
-		| "ignore"
 	>;
 	fsStartTime?: number;
 	resolverFactory: ResolverFactory;
@@ -5154,8 +5160,8 @@ declare interface ContextResolveData {
 }
 type ContextTimestamp =
 	| null
-	| ContextFileSystemInfoEntry
 	| "ignore"
+	| ContextFileSystemInfoEntry
 	| ExistenceOnlyTimeEntryFileSystemInfo;
 declare interface ContextTimestampAndHash {
 	safeTime: number;
@@ -5399,9 +5405,9 @@ declare interface CssImportDependencyMeta {
 type CssLayer = undefined | string;
 declare class CssLoadingRuntimeModule extends RuntimeModule {
 	constructor(runtimeRequirements: ReadonlySet<string>);
-	static getCompilationHooks(
+	static getCompilationHooks: (
 		compilation: Compilation
-	): CssLoadingRuntimeModulePluginHooks;
+	) => CssLoadingRuntimeModulePluginHooks;
 
 	/**
 	 * Runtime modules without any dependencies to other runtime modules
@@ -5599,13 +5605,6 @@ declare class CssModulesPlugin {
 		hooks: CompilationHooksCssModulesPlugin
 	): Source;
 
-	/**
-	 * Returns the attached hooks.
-	 */
-	static getCompilationHooks(
-		compilation: Compilation
-	): CompilationHooksCssModulesPlugin;
-
 	/**
 	 * Renders css module source.
 	 */
@@ -5627,6 +5626,9 @@ declare class CssModulesPlugin {
 	 * Returns true, when the chunk has css.
 	 */
 	static chunkHasCss(chunk: Chunk, chunkGraph: ChunkGraph): boolean;
+	static getCompilationHooks: (
+		compilation: Compilation
+	) => CompilationHooksCssModulesPlugin;
 }
 declare abstract class CssParser extends ParserClass {
 	defaultMode: "global" | "auto" | "local" | "pure";
@@ -5752,11 +5754,6 @@ declare class DefinePlugin {
 	 */
 	apply(compiler: Compiler): void;
 
-	/**
-	 * Returns the attached hooks.
-	 */
-	static getCompilationHooks(compilation: Compilation): DefinePluginHooks;
-
 	/**
 	 * Returns runtime value.
 	 */
@@ -5768,6 +5765,7 @@ declare class DefinePlugin {
 		}) => CodeValuePrimitive,
 		options?: true | string[] | RuntimeValueOptions
 	): RuntimeValue;
+	static getCompilationHooks: (compilation: Compilation) => DefinePluginHooks;
 }
 declare interface DefinePluginHooks {
 	definitions: SyncWaterfallHook<
@@ -8136,11 +8134,7 @@ declare class ExternalModule extends Module {
 		unsafeCacheData: UnsafeCacheData,
 		normalModuleFactory: NormalModuleFactory
 	): void;
-
-	/**
-	 * Returns the attached hooks.
-	 */
-	static getCompilationHooks(compilation: Compilation): ExternalModuleHooks;
+	static getCompilationHooks: (compilation: Compilation) => ExternalModuleHooks;
 	static ModuleExternalInitFragment: typeof ModuleExternalInitFragment;
 	static getExternalModuleNodeCommonjsInitFragment: (
 		runtimeTemplate: RuntimeTemplate,
@@ -8693,7 +8687,7 @@ declare abstract class FileSystemInfo {
 		path: string,
 		callback: (
 			err?: null | WebpackError,
-			fileTimestamp?: null | FileSystemInfoEntry | "ignore"
+			fileTimestamp?: null | "ignore" | FileSystemInfoEntry
 		) => void
 	): void;
 
@@ -8791,8 +8785,8 @@ declare interface FileSystemInfoEntry {
 }
 type FileTimestamp =
 	| null
-	| FileSystemInfoEntry
 	| "ignore"
+	| FileSystemInfoEntry
 	| ExistenceOnlyTimeEntryFileSystemInfo;
 type FilterItemTypes = string | RegExp | ((value: string) => boolean);
 declare interface Flags {
@@ -10466,13 +10460,6 @@ declare class JavascriptModulesPlugin {
 		hooks: CompilationHooksJavascriptModulesPlugin
 	): string;
 
-	/**
-	 * Returns the attached hooks.
-	 */
-	static getCompilationHooks(
-		compilation: Compilation
-	): CompilationHooksJavascriptModulesPlugin;
-
 	/**
 	 * Gets chunk filename template.
 	 */
@@ -10480,6 +10467,9 @@ declare class JavascriptModulesPlugin {
 		chunk: Chunk,
 		outputOptions: OutputNormalizedWithDefaults
 	): ChunkFilenameTemplate;
+	static getCompilationHooks: (
+		compilation: Compilation
+	) => CompilationHooksJavascriptModulesPlugin;
 	static chunkHasJs: (chunk: Chunk, chunkGraph: ChunkGraph) => boolean;
 }
 declare class JavascriptParser extends ParserClass {
@@ -12881,9 +12871,9 @@ type JsonValueTypes =
 	| JsonValueTypes[];
 declare class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 	constructor(runtimeRequirements: ReadonlySet<string>);
-	static getCompilationHooks(
+	static getCompilationHooks: (
 		compilation: Compilation
-	): JsonpCompilationPluginHooks;
+	) => JsonpCompilationPluginHooks;
 
 	/**
 	 * Runtime modules without any dependencies to other runtime modules
@@ -14015,9 +14005,9 @@ declare interface LoadScriptCompilationHooks {
 }
 declare class LoadScriptRuntimeModule extends HelperRuntimeModule {
 	constructor(withCreateScriptUrl?: boolean, withFetchPriority?: boolean);
-	static getCompilationHooks(
+	static getCompilationHooks: (
 		compilation: Compilation
-	): LoadScriptCompilationHooks;
+	) => LoadScriptCompilationHooks;
 
 	/**
 	 * Runtime modules without any dependencies to other runtime modules
@@ -14369,6 +14359,13 @@ type LogTypeEnum =
 	| "status";
 declare const MEASURE_END_OPERATION: unique symbol;
 declare const MEASURE_START_OPERATION: unique symbol;
+
+/**
+ * Renames an inlined module's top-level declaration (and all its references) when
+ * its name is already taken in the shared startup scope, recording the chosen name
+ * in `allUsedNames`. Lets inlined modules be emitted without a per-entry/per-chunk
+ * IIFE by resolving name collisions instead of isolating each module.
+ */
 declare interface MainRenderContext {
 	/**
 	 * the chunk
@@ -15171,13 +15168,9 @@ declare class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 	 * Creates an instance of ModuleChunkLoadingRuntimeModule.
 	 */
 	constructor(runtimeRequirements: ReadonlySet<string>);
-
-	/**
-	 * Returns hooks.
-	 */
-	static getCompilationHooks(
+	static getCompilationHooks: (
 		compilation: Compilation
-	): JsonpCompilationPluginHooks;
+	) => JsonpCompilationPluginHooks;
 
 	/**
 	 * Runtime modules without any dependencies to other runtime modules
@@ -15375,13 +15368,9 @@ declare class ModuleFederationPlugin {
 	 * Applies the plugin by registering its hooks on the compiler.
 	 */
 	apply(compiler: Compiler): void;
-
-	/**
-	 * Get the compilation hooks associated with this plugin.
-	 */
-	static getCompilationHooks(
+	static getCompilationHooks: (
 		compilation: Compilation
-	): CompilationHooksModuleFederationPlugin;
+	) => CompilationHooksModuleFederationPlugin;
 }
 declare interface ModuleFederationPluginOptions {
 	/**
@@ -16200,6 +16189,13 @@ declare interface ModuleReferenceOptions {
 	 */
 	asiSafe?: boolean;
 }
+
+/**
+ * Renames an inlined module's top-level declaration (and all its references) when
+ * its name is already taken in the shared startup scope, recording the chosen name
+ * in `allUsedNames`. Lets inlined modules be emitted without a per-entry/per-chunk
+ * IIFE by resolving name collisions instead of isolating each module.
+ */
 declare interface ModuleRenderContext {
 	/**
 	 * the chunk
@@ -20597,13 +20593,9 @@ declare class RealContentHashPlugin {
 	 * Applies the plugin by registering its hooks on the compiler.
 	 */
 	apply(compiler: Compiler): void;
-
-	/**
-	 * Returns the attached hooks.
-	 */
-	static getCompilationHooks(
+	static getCompilationHooks: (
 		compilation: Compilation
-	): CompilationHooksRealContentHashPlugin;
+	) => CompilationHooksRealContentHashPlugin;
 }
 declare interface RealContentHashPluginOptions {
 	/**
@@ -20818,6 +20810,13 @@ declare interface RemotesConfig {
 declare interface RemotesObject {
 	[index: string]: string | RemotesConfig | string[];
 }
+
+/**
+ * Renames an inlined module's top-level declaration (and all its references) when
+ * its name is already taken in the shared startup scope, recording the chosen name
+ * in `allUsedNames`. Lets inlined modules be emitted without a per-entry/per-chunk
+ * IIFE by resolving name collisions instead of isolating each module.
+ */
 declare interface RenderBootstrapContext {
 	/**
 	 * the chunk
@@ -20890,6 +20889,13 @@ declare interface RenderContextCssModulesPlugin {
 	 */
 	modules: CssModule[];
 }
+
+/**
+ * Renames an inlined module's top-level declaration (and all its references) when
+ * its name is already taken in the shared startup scope, recording the chosen name
+ * in `allUsedNames`. Lets inlined modules be emitted without a per-entry/per-chunk
+ * IIFE by resolving name collisions instead of isolating each module.
+ */
 declare interface RenderContextJavascriptModulesPlugin {
 	/**
 	 * the chunk
@@ -24037,6 +24043,13 @@ declare interface StarListSerializerContext {
 		obj?: LazyOptions
 	) => LazyFunction<any, any, any, LazyOptions>;
 }
+
+/**
+ * Renames an inlined module's top-level declaration (and all its references) when
+ * its name is already taken in the shared startup scope, recording the chosen name
+ * in `allUsedNames`. Lets inlined modules be emitted without a per-entry/per-chunk
+ * IIFE by resolving name collisions instead of isolating each module.
+ */
 declare interface StartupRenderContext {
 	/**
 	 * the chunk
@@ -25406,18 +25419,18 @@ declare interface WatchFileSystem {
 			timeInfoEntries1?: Map<
 				string,
 				| null
+				| "ignore"
 				| EntryTypesIndex
 				| OnlySafeTimeEntry
 				| ExistenceOnlyTimeEntryTypesIndex
-				| "ignore"
 			>,
 			timeInfoEntries2?: Map<
 				string,
 				| null
+				| "ignore"
 				| EntryTypesIndex
 				| OnlySafeTimeEntry
 				| ExistenceOnlyTimeEntryTypesIndex
-				| "ignore"
 			>,
 			changes?: Set<string>,
 			removals?: Set<string>
@@ -25504,10 +25517,10 @@ declare interface Watcher {
 	getFileTimeInfoEntries: () => Map<
 		string,
 		| null
+		| "ignore"
 		| EntryTypesIndex
 		| OnlySafeTimeEntry
 		| ExistenceOnlyTimeEntryTypesIndex
-		| "ignore"
 	>;
 
 	/**
@@ -25516,10 +25529,10 @@ declare interface Watcher {
 	getContextTimeInfoEntries: () => Map<
 		string,
 		| null
+		| "ignore"
 		| EntryTypesIndex
 		| OnlySafeTimeEntry
 		| ExistenceOnlyTimeEntryTypesIndex
-		| "ignore"
 	>;
 
 	/**
@@ -25548,10 +25561,10 @@ declare interface WatcherInfo {
 	fileTimeInfoEntries: Map<
 		string,
 		| null
+		| "ignore"
 		| EntryTypesIndex
 		| OnlySafeTimeEntry
 		| ExistenceOnlyTimeEntryTypesIndex
-		| "ignore"
 	>;
 
 	/**
@@ -25560,10 +25573,10 @@ declare interface WatcherInfo {
 	contextTimeInfoEntries: Map<
 		string,
 		| null
+		| "ignore"
 		| EntryTypesIndex
 		| OnlySafeTimeEntry
 		| ExistenceOnlyTimeEntryTypesIndex
-		| "ignore"
 	>;
 }
 declare abstract class Watching {