webpack 5.88.0 → 5.88.2

package/lib/util/runtime.js

@@ -53,7 +53,7 @@ exports.getEntryRuntime = (compilation, name, options) => {
 
 /**
  * @param {RuntimeSpec} runtime runtime
- * @param {function(string): void} fn functor
+ * @param {function(string | undefined): void} fn functor
  * @param {boolean} deterministicOrder enforce a deterministic order
  * @returns {void}
  */
@@ -70,6 +70,11 @@ exports.forEachRuntime = (runtime, fn, deterministicOrder = false) => {
 	}
 };
 
+/**
+ * @template T
+ * @param {SortableSet<T>} set set
+ * @returns {string} runtime key
+ */
 const getRuntimesKey = set => {
 	set.sort();
 	return Array.from(set).join("\n");
@@ -98,6 +103,11 @@ const keyToRuntime = key => {
 };
 exports.keyToRuntime = keyToRuntime;
 
+/**
+ * @template T
+ * @param {SortableSet<T>} set set
+ * @returns {string} runtime string
+ */
 const getRuntimesString = set => {
 	set.sort();
 	return Array.from(set).join("+");
@@ -415,6 +425,11 @@ exports.filterRuntime = (runtime, filter) => {
 	return result;
 };
 
+/**
+ * @template T
+ * @typedef {Map<string, T>} RuntimeSpecMapInnerMap
+ * */
+
 /**
  * @template T
  */
@@ -426,9 +441,9 @@ class RuntimeSpecMap {
 		this._mode = clone ? clone._mode : 0; // 0 = empty, 1 = single entry, 2 = map
 		/** @type {RuntimeSpec} */
 		this._singleRuntime = clone ? clone._singleRuntime : undefined;
-		/** @type {T} */
+		/** @type {T | undefined} */
 		this._singleValue = clone ? clone._singleValue : undefined;
-		/** @type {Map<string, T> | undefined} */
+		/** @type {RuntimeSpecMapInnerMap<T> | undefined} */
 		this._map = clone && clone._map ? new Map(clone._map) : undefined;
 	}
 
@@ -445,7 +460,9 @@ class RuntimeSpecMap {
 					? this._singleValue
 					: undefined;
 			default:
-				return this._map.get(getRuntimeKey(runtime));
+				return /** @type {RuntimeSpecMapInnerMap<T>} */ (this._map).get(
+					getRuntimeKey(runtime)
+				);
 		}
 	}
 
@@ -460,10 +477,16 @@ class RuntimeSpecMap {
 			case 1:
 				return runtimeEqual(this._singleRuntime, runtime);
 			default:
-				return this._map.has(getRuntimeKey(runtime));
+				return /** @type {RuntimeSpecMapInnerMap<T>} */ (this._map).has(
+					getRuntimeKey(runtime)
+				);
 		}
 	}
 
+	/**
+	 * @param {RuntimeSpec} runtime the runtimes
+	 * @param {T} value the value
+	 */
 	set(runtime, value) {
 		switch (this._mode) {
 			case 0:
@@ -478,15 +501,24 @@ class RuntimeSpecMap {
 				}
 				this._mode = 2;
 				this._map = new Map();
-				this._map.set(getRuntimeKey(this._singleRuntime), this._singleValue);
+				this._map.set(
+					getRuntimeKey(this._singleRuntime),
+					/** @type {T} */ (this._singleValue)
+				);
 				this._singleRuntime = undefined;
 				this._singleValue = undefined;
 			/* falls through */
 			default:
-				this._map.set(getRuntimeKey(runtime), value);
+				/** @type {RuntimeSpecMapInnerMap<T>} */
+				(this._map).set(getRuntimeKey(runtime), value);
 		}
 	}
 
+	/**
+	 * @param {RuntimeSpec} runtime the runtimes
+	 * @param {() => TODO} computer function to compute the value
+	 * @returns {TODO} true, when the runtime was deleted
+	 */
 	provide(runtime, computer) {
 		switch (this._mode) {
 			case 0:
@@ -495,11 +527,14 @@ class RuntimeSpecMap {
 				return (this._singleValue = computer());
 			case 1: {
 				if (runtimeEqual(this._singleRuntime, runtime)) {
-					return this._singleValue;
+					return /** @type {T} */ (this._singleValue);
 				}
 				this._mode = 2;
 				this._map = new Map();
-				this._map.set(getRuntimeKey(this._singleRuntime), this._singleValue);
+				this._map.set(
+					getRuntimeKey(this._singleRuntime),
+					/** @type {T} */ (this._singleValue)
+				);
 				this._singleRuntime = undefined;
 				this._singleValue = undefined;
 				const newValue = computer();
@@ -508,10 +543,11 @@ class RuntimeSpecMap {
 			}
 			default: {
 				const key = getRuntimeKey(runtime);
-				const value = this._map.get(key);
+				const value = /** @type {Map<string, T>} */ (this._map).get(key);
 				if (value !== undefined) return value;
 				const newValue = computer();
-				this._map.set(key, newValue);
+				/** @type {Map<string, T>} */
+				(this._map).set(key, newValue);
 				return newValue;
 			}
 		}
@@ -532,10 +568,15 @@ class RuntimeSpecMap {
 				}
 				return;
 			default:
-				this._map.delete(getRuntimeKey(runtime));
+				/** @type {RuntimeSpecMapInnerMap<T>} */
+				(this._map).delete(getRuntimeKey(runtime));
 		}
 	}
 
+	/**
+	 * @param {RuntimeSpec} runtime the runtimes
+	 * @param {function(T | undefined): T} fn function to update the value
+	 */
 	update(runtime, fn) {
 		switch (this._mode) {
 			case 0:
@@ -549,7 +590,10 @@ class RuntimeSpecMap {
 				if (newValue !== undefined) {
 					this._mode = 2;
 					this._map = new Map();
-					this._map.set(getRuntimeKey(this._singleRuntime), this._singleValue);
+					this._map.set(
+						getRuntimeKey(this._singleRuntime),
+						/** @type {T} */ (this._singleValue)
+					);
 					this._singleRuntime = undefined;
 					this._singleValue = undefined;
 					this._map.set(getRuntimeKey(runtime), newValue);
@@ -558,9 +602,11 @@ class RuntimeSpecMap {
 			}
 			default: {
 				const key = getRuntimeKey(runtime);
-				const oldValue = this._map.get(key);
+				const oldValue = /** @type {Map<string, T>} */ (this._map).get(key);
 				const newValue = fn(oldValue);
-				if (newValue !== oldValue) this._map.set(key, newValue);
+				if (newValue !== oldValue)
+					/** @type {RuntimeSpecMapInnerMap<T>} */
+					(this._map).set(key, newValue);
 			}
 		}
 	}
@@ -572,7 +618,11 @@ class RuntimeSpecMap {
 			case 1:
 				return [this._singleRuntime];
 			default:
-				return Array.from(this._map.keys(), keyToRuntime);
+				return Array.from(
+					/** @type {RuntimeSpecMapInnerMap<T>} */
+					(this._map).keys(),
+					keyToRuntime
+				);
 		}
 	}
 
@@ -581,15 +631,15 @@ class RuntimeSpecMap {
 			case 0:
 				return [][Symbol.iterator]();
 			case 1:
-				return [this._singleValue][Symbol.iterator]();
+				return [/** @type {T} */ (this._singleValue)][Symbol.iterator]();
 			default:
-				return this._map.values();
+				return /** @type {Map<string, T>} */ (this._map).values();
 		}
 	}
 
 	get size() {
-		if (this._mode <= 1) return this._mode;
-		return this._map.size;
+		if (/** @type {number} */ (this._mode) <= 1) return this._mode;
+		return /** @type {Map<string, T>} */ (this._map).size;
 	}
 }
 

package/lib/util/semver.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {(string|number|undefined|[])[]} SemVerRange */
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.88.0",
+  "version": "5.88.2",
   "author": "Tobias Koppers @sokra",
   "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.",
   "license": "MIT",

package/schemas/WebpackOptions.json

@@ -1009,7 +1009,7 @@
         {
           "description": "The function is called on each dependency (`function(context, request, callback(err, result))`).",
           "instanceof": "Function",
-          "tsType": "(((data: ExternalItemFunctionData, callback: (err?: Error, result?: ExternalItemValue) => void) => void) | ((data: ExternalItemFunctionData) => Promise<ExternalItemValue>))"
+          "tsType": "(((data: ExternalItemFunctionData, callback: (err?: (Error | null), result?: ExternalItemValue) => void) => void) | ((data: ExternalItemFunctionData) => Promise<ExternalItemValue>))"
         }
       ]
     },

package/types.d.ts

@@ -821,7 +821,7 @@ declare interface BuildInfo {
 }
 type BuildMeta = KnownBuildMeta & Record<string, any>;
 declare abstract class ByTypeGenerator extends Generator {
-	map: any;
+	map: Record<string, Generator>;
 }
 declare const CIRCULAR_CONNECTION: unique symbol;
 declare class Cache {
@@ -2233,7 +2233,7 @@ declare class Compiler {
 	parentCompilation?: Compilation;
 	root: Compiler;
 	outputPath: string;
-	watching: Watching;
+	watching?: Watching;
 	outputFileSystem: OutputFileSystem;
 	intermediateFileSystem: IntermediateFileSystem;
 	inputFileSystem: InputFileSystem;
@@ -2243,11 +2243,14 @@ declare class Compiler {
 	records: object;
 	managedPaths: Set<string | RegExp>;
 	immutablePaths: Set<string | RegExp>;
-	modifiedFiles: ReadonlySet<string>;
-	removedFiles: ReadonlySet<string>;
-	fileTimestamps: ReadonlyMap<string, null | FileSystemInfoEntry | "ignore">;
-	contextTimestamps: ReadonlyMap<string, null | FileSystemInfoEntry | "ignore">;
-	fsStartTime: number;
+	modifiedFiles?: ReadonlySet<string>;
+	removedFiles?: ReadonlySet<string>;
+	fileTimestamps?: ReadonlyMap<string, null | FileSystemInfoEntry | "ignore">;
+	contextTimestamps?: ReadonlyMap<
+		string,
+		null | FileSystemInfoEntry | "ignore"
+	>;
+	fsStartTime?: number;
 	resolverFactory: ResolverFactory;
 	infrastructureLogger: any;
 	options: WebpackOptionsNormalized;
@@ -2417,7 +2420,7 @@ declare interface Configuration {
 		| ((
 				data: ExternalItemFunctionData,
 				callback: (
-					err?: Error,
+					err?: null | Error,
 					result?: string | boolean | string[] | { [index: string]: any }
 				) => void
 		  ) => void)
@@ -2572,7 +2575,7 @@ declare interface Configuration {
 	/**
 	 * Options affecting how file system snapshots are created and validated.
 	 */
-	snapshot?: SnapshotOptions;
+	snapshot?: SnapshotOptionsWebpackOptions;
 
 	/**
 	 * Stats options object or preset name.
@@ -3082,7 +3085,7 @@ declare interface DependencyTemplateContext {
 	codeGenerationResults: CodeGenerationResults;
 }
 declare abstract class DependencyTemplates {
-	get(dependency: DependencyConstructor): DependencyTemplate;
+	get(dependency: DependencyConstructor): undefined | DependencyTemplate;
 	set(
 		dependency: DependencyConstructor,
 		dependencyTemplate: DependencyTemplate
@@ -4177,7 +4180,7 @@ type ExternalItem =
 	| ((
 			data: ExternalItemFunctionData,
 			callback: (
-				err?: Error,
+				err?: null | Error,
 				result?: string | boolean | string[] | { [index: string]: any }
 			) => void
 	  ) => void)
@@ -4266,7 +4269,7 @@ type Externals =
 	| ((
 			data: ExternalItemFunctionData,
 			callback: (
-				err?: Error,
+				err?: null | Error,
 				result?: string | boolean | string[] | { [index: string]: any }
 			) => void
 	  ) => void)
@@ -4614,7 +4617,7 @@ declare abstract class FileSystemInfo {
 	): void;
 	getFileHash(
 		path: string,
-		callback: (arg0?: null | WebpackError, arg1?: string) => void
+		callback: (arg0?: null | WebpackError, arg1?: null | string) => void
 	): void;
 	getContextHash(
 		path: string,
@@ -4640,20 +4643,11 @@ declare abstract class FileSystemInfo {
 		callback: (arg0?: null | Error, arg1?: boolean) => void
 	): void;
 	createSnapshot(
-		startTime: number,
+		startTime: undefined | null | number,
 		files: Iterable<string>,
 		directories: Iterable<string>,
 		missing: Iterable<string>,
-		options: {
-			/**
-			 * Use hashes of the content of the files/directories to determine invalidation.
-			 */
-			hash?: boolean;
-			/**
-			 * Use timestamps of the files/directories to determine invalidation.
-			 */
-			timestamp?: boolean;
-		},
+		options: undefined | null | SnapshotOptionsFileSystemInfo,
 		callback: (arg0?: null | WebpackError, arg1?: null | Snapshot) => void
 	): void;
 	mergeSnapshots(snapshot1: Snapshot, snapshot2: Snapshot): Snapshot;
@@ -4734,7 +4728,7 @@ declare class Generator {
 		context: ConcatenationBailoutReasonContext
 	): undefined | string;
 	updateHash(hash: Hash, __1: UpdateHashContextGenerator): void;
-	static byType(map?: any): ByTypeGenerator;
+	static byType(map: Record<string, Generator>): ByTypeGenerator;
 }
 type GeneratorOptionsByModuleType = GeneratorOptionsByModuleTypeKnown &
 	GeneratorOptionsByModuleTypeUnknown;
@@ -11238,10 +11232,10 @@ declare class RuntimeSpecMap<T> {
 	constructor(clone?: RuntimeSpecMap<T>);
 	get(runtime: RuntimeSpec): undefined | T;
 	has(runtime: RuntimeSpec): boolean;
-	set(runtime?: any, value?: any): void;
-	provide(runtime?: any, computer?: any): any;
+	set(runtime: RuntimeSpec, value: T): void;
+	provide(runtime: RuntimeSpec, computer: () => any): any;
 	delete(runtime: RuntimeSpec): void;
-	update(runtime?: any, fn?: any): void;
+	update(runtime: RuntimeSpec, fn: (arg0?: T) => T): void;
 	keys(): RuntimeSpec[];
 	values(): IterableIterator<T>;
 	get size(): number;
@@ -11864,11 +11858,22 @@ declare abstract class Snapshot {
 	getContextIterable(): Iterable<string>;
 	getMissingIterable(): Iterable<string>;
 }
+declare interface SnapshotOptionsFileSystemInfo {
+	/**
+	 * should use hash to snapshot
+	 */
+	hash?: boolean;
+
+	/**
+	 * should use timestamp to snapshot
+	 */
+	timestamp?: boolean;
+}
 
 /**
  * Options affecting how file system snapshots are created and validated.
  */
-declare interface SnapshotOptions {
+declare interface SnapshotOptionsWebpackOptions {
 	/**
 	 * Options for snapshotting build dependencies to determine if the whole cache need to be invalidated.
 	 */
@@ -13439,7 +13444,7 @@ declare interface WebpackOptionsNormalized {
 	/**
 	 * Options affecting how file system snapshots are created and validated.
 	 */
-	snapshot: SnapshotOptions;
+	snapshot: SnapshotOptionsWebpackOptions;
 
 	/**
 	 * Stats options object or preset name.
@@ -13932,7 +13937,7 @@ declare namespace exports {
 			) => RuntimeSpec;
 			export let forEachRuntime: (
 				runtime: RuntimeSpec,
-				fn: (arg0: string) => void,
+				fn: (arg0?: string) => void,
 				deterministicOrder?: boolean
 			) => void;
 			export let getRuntimeKey: (runtime: RuntimeSpec) => string;