webpack 5.92.1 → 5.94.0

package/lib/util/deprecation.js

@@ -15,7 +15,10 @@ const deprecationCache = new Map();
  * @property {true} _fakeHook it's a fake hook
  */
 
-/** @template T @typedef {T & FakeHookMarker} FakeHook<T> */
+/**
+ * @template T
+ * @typedef {T & FakeHookMarker} FakeHook<T>
+ */
 
 /**
  * @param {string} message deprecation message
@@ -28,7 +31,7 @@ const createDeprecation = (message, code) => {
 	const fn = util.deprecate(
 		() => {},
 		message,
-		"DEP_WEBPACK_DEPRECATION_" + code
+		`DEP_WEBPACK_DEPRECATION_${code}`
 	);
 	deprecationCache.set(message, fn);
 	return fn;
@@ -69,7 +72,7 @@ const DISABLED_METHODS = [
  * @param {string} name property name
  * @returns {void}
  */
-exports.arrayToSetDeprecation = (set, name) => {
+module.exports.arrayToSetDeprecation = (set, name) => {
 	for (const method of COPY_METHODS) {
 		if (set[method]) continue;
 		const d = createDeprecation(
@@ -84,7 +87,11 @@ exports.arrayToSetDeprecation = (set, name) => {
 		set[method] = function () {
 			d();
 			const array = Array.from(this);
-			return Array.prototype[method].apply(array, arguments);
+			return Array.prototype[/** @type {keyof COPY_METHODS} */ (method)].apply(
+				array,
+				// eslint-disable-next-line prefer-rest-params
+				arguments
+			);
 		};
 	}
 	const dPush = createDeprecation(
@@ -106,6 +113,7 @@ exports.arrayToSetDeprecation = (set, name) => {
 	 */
 	set.push = function () {
 		dPush();
+		// eslint-disable-next-line prefer-rest-params
 		for (const item of Array.from(arguments)) {
 			this.add(item);
 		}
@@ -128,13 +136,13 @@ exports.arrayToSetDeprecation = (set, name) => {
 		 * @this {Set<any>} a Set
 		 * @returns {any} the value at this location
 		 */
+		// eslint-disable-next-line func-style
 		const fn = function () {
 			dIndexer();
 			let i = 0;
 			for (const item of this) {
 				if (i++ === index) return item;
 			}
-			return undefined;
 		};
 		return fn;
 	};
@@ -171,14 +179,17 @@ exports.arrayToSetDeprecation = (set, name) => {
 	set[Symbol.isConcatSpreadable] = true;
 };
 
-exports.createArrayToSetDeprecationSet = name => {
+module.exports.createArrayToSetDeprecationSet = name => {
 	let initialized = false;
 	class SetDeprecatedArray extends Set {
 		constructor(items) {
 			super(items);
 			if (!initialized) {
 				initialized = true;
-				exports.arrayToSetDeprecation(SetDeprecatedArray.prototype, name);
+				module.exports.arrayToSetDeprecation(
+					SetDeprecatedArray.prototype,
+					name
+				);
 			}
 		}
 	}
@@ -186,14 +197,13 @@ exports.createArrayToSetDeprecationSet = name => {
 };
 
 /**
- * @template T
  * @param {object} obj object
  * @param {string} name property name
  * @param {string} code deprecation code
  * @param {string} note additional note
- * @returns {object} frozen object with deprecation when modifying
+ * @returns {Proxy<object>} frozen object with deprecation when modifying
  */
-exports.soonFrozenObjectDeprecation = (obj, name, code, note = "") => {
+module.exports.soonFrozenObjectDeprecation = (obj, name, code, note = "") => {
 	const message = `${name} will be frozen in future, all modifications are deprecated.${
 		note && `\n${note}`
 	}`;
@@ -260,7 +270,7 @@ const deprecateAllProperties = (obj, message, code) => {
 	}
 	return /** @type {T} */ (newObj);
 };
-exports.deprecateAllProperties = deprecateAllProperties;
+module.exports.deprecateAllProperties = deprecateAllProperties;
 
 /**
  * @template T
@@ -269,7 +279,7 @@ exports.deprecateAllProperties = deprecateAllProperties;
  * @param {string=} code deprecation code (not deprecated when unset)
  * @returns {FakeHook<T>} fake hook which redirects
  */
-exports.createFakeHook = (fakeHook, message, code) => {
+module.exports.createFakeHook = (fakeHook, message, code) => {
 	if (message && code) {
 		fakeHook = deprecateAllProperties(fakeHook, message, code);
 	}

package/lib/util/deterministicGrouping.js

@@ -25,7 +25,6 @@
 // 3.2% that 5 or more groups are invalidated
 
 /**
- *
  * @param {string} a key
  * @param {string} b key
  * @returns {number} the similarity as number
@@ -116,9 +115,7 @@ const isTooBig = (size, maxSize) => {
 		const s = size[key];
 		if (s === 0) continue;
 		const maxSizeValue = maxSize[key];
-		if (typeof maxSizeValue === "number") {
-			if (s > maxSizeValue) return true;
-		}
+		if (typeof maxSizeValue === "number" && s > maxSizeValue) return true;
 	}
 	return false;
 };
@@ -133,9 +130,7 @@ const isTooSmall = (size, minSize) => {
 		const s = size[key];
 		if (s === 0) continue;
 		const minSizeValue = minSize[key];
-		if (typeof minSizeValue === "number") {
-			if (s < minSizeValue) return true;
-		}
+		if (typeof minSizeValue === "number" && s < minSizeValue) return true;
 	}
 	return false;
 };
@@ -151,9 +146,7 @@ const getTooSmallTypes = (size, minSize) => {
 		const s = size[key];
 		if (s === 0) continue;
 		const minSizeValue = minSize[key];
-		if (typeof minSizeValue === "number") {
-			if (s < minSizeValue) types.add(key);
-		}
+		if (typeof minSizeValue === "number" && s < minSizeValue) types.add(key);
 	}
 	return types;
 };
@@ -236,14 +229,14 @@ class Group {
 					newSimilarities.push(
 						lastNode === this.nodes[i - 1]
 							? /** @type {number[]} */ (this.similarities)[i - 1]
-							: similarity(lastNode.key, node.key)
+							: similarity(/** @type {Node<T>} */ (lastNode).key, node.key)
 					);
 				}
 				newNodes.push(node);
 				lastNode = node;
 			}
 		}
-		if (resultNodes.length === this.nodes.length) return undefined;
+		if (resultNodes.length === this.nodes.length) return;
 		this.nodes = newNodes;
 		this.similarities = newSimilarities;
 		this.size = sumSize(newNodes);
@@ -260,7 +253,7 @@ const getSimilarities = nodes => {
 	// calculate similarities between lexically adjacent nodes
 	/** @type {number[]} */
 	const similarities = [];
-	let last = undefined;
+	let last;
 	for (const node of nodes) {
 		if (last !== undefined) {
 			similarities.push(similarity(last.key, node.key));
@@ -371,9 +364,8 @@ module.exports = ({ maxSize, minSize, items, getSize, getKey }) => {
 					result.push(new Group(problemNodes, null));
 				}
 				return true;
-			} else {
-				return false;
 			}
+			return false;
 		};
 
 		if (initialGroup.nodes.length > 0) {
@@ -398,14 +390,14 @@ module.exports = ({ maxSize, minSize, items, getSize, getKey }) => {
 				// going minSize from left and right
 				// at least one node need to be included otherwise we get stuck
 				let left = 1;
-				let leftSize = Object.create(null);
+				const leftSize = Object.create(null);
 				addSizeTo(leftSize, group.nodes[0].size);
 				while (left < group.nodes.length && isTooSmall(leftSize, minSize)) {
 					addSizeTo(leftSize, group.nodes[left].size);
 					left++;
 				}
 				let right = group.nodes.length - 2;
-				let rightSize = Object.create(null);
+				const rightSize = Object.create(null);
 				addSizeTo(rightSize, group.nodes[group.nodes.length - 1].size);
 				while (right >= 0 && isTooSmall(rightSize, minSize)) {
 					addSizeTo(rightSize, group.nodes[right].size);
@@ -453,7 +445,7 @@ module.exports = ({ maxSize, minSize, items, getSize, getKey }) => {
 					let best = -1;
 					let bestSimilarity = Infinity;
 					let pos = left;
-					let rightSize = sumSize(group.nodes.slice(pos));
+					const rightSize = sumSize(group.nodes.slice(pos));
 
 					//       pos v   v right
 					// [ O O O ] O O O [ O O O ]
@@ -536,12 +528,13 @@ module.exports = ({ maxSize, minSize, items, getSize, getKey }) => {
 	}
 
 	// return the results
-	return result.map(group => {
-		/** @type {GroupedItems<T>} */
-		return {
-			key: group.key,
-			items: group.nodes.map(node => node.item),
-			size: group.size
-		};
-	});
+	return result.map(
+		group =>
+			/** @type {GroupedItems<T>} */
+			({
+				key: group.key,
+				items: group.nodes.map(node => node.item),
+				size: group.size
+			})
+	);
 };

package/lib/util/findGraphRoots.js

@@ -225,7 +225,7 @@ module.exports = (items, getDependencies) => {
 	// When roots were found, return them
 	if (roots.size > 0) {
 		return Array.from(roots, r => r.item);
-	} else {
-		throw new Error("Implementation of findGraphRoots is broken");
 	}
+
+	throw new Error("Implementation of findGraphRoots is broken");
 };

package/lib/util/fs.js

@@ -80,23 +80,28 @@ const path = require("path");
 /** @typedef {function(NodeJS.ErrnoException | null, number=): void} NumberCallback */
 /** @typedef {function(NodeJS.ErrnoException | Error | null, JsonObject=): void} ReadJsonCallback */
 
+/** @typedef {Map<string, FileSystemInfoEntry | "ignore">} TimeInfoEntries */
+
 /**
  * @typedef {object} WatcherInfo
  * @property {Set<string>} changes get current aggregated changes that have not yet send to callback
  * @property {Set<string>} removals get current aggregated removals that have not yet send to callback
- * @property {Map<string, FileSystemInfoEntry | "ignore">} fileTimeInfoEntries get info about files
- * @property {Map<string, FileSystemInfoEntry | "ignore">} contextTimeInfoEntries get info about directories
+ * @property {TimeInfoEntries} fileTimeInfoEntries get info about files
+ * @property {TimeInfoEntries} contextTimeInfoEntries get info about directories
  */
 
+/** @typedef {Set<string>} Changes */
+/** @typedef {Set<string>} Removals */
+
 // TODO webpack 6 deprecate missing getInfo
 /**
  * @typedef {object} Watcher
  * @property {function(): void} close closes the watcher and all underlying file watchers
  * @property {function(): void} pause closes the watcher, but keeps underlying file watchers alive until the next watch call
- * @property {function(): Set<string>=} getAggregatedChanges get current aggregated changes that have not yet send to callback
- * @property {function(): Set<string>=} getAggregatedRemovals get current aggregated removals that have not yet send to callback
- * @property {function(): Map<string, FileSystemInfoEntry | "ignore">} getFileTimeInfoEntries get info about files
- * @property {function(): Map<string, FileSystemInfoEntry | "ignore">} getContextTimeInfoEntries get info about directories
+ * @property {function(): Changes=} getAggregatedChanges get current aggregated changes that have not yet send to callback
+ * @property {function(): Removals=} getAggregatedRemovals get current aggregated removals that have not yet send to callback
+ * @property {function(): TimeInfoEntries} getFileTimeInfoEntries get info about files
+ * @property {function(): TimeInfoEntries} getContextTimeInfoEntries get info about directories
  * @property {function(): WatcherInfo=} getInfo get info about timestamps and changes
  */
 
@@ -107,7 +112,7 @@ const path = require("path");
  * @param {Iterable<string>} missing watched existence entries
  * @param {number} startTime timestamp of start time
  * @param {WatchOptions} options options object
- * @param {function(Error | null, Map<string, FileSystemInfoEntry | "ignore">, Map<string, FileSystemInfoEntry | "ignore">, Set<string>, Set<string>): void} callback aggregated callback
+ * @param {function(Error | null, TimeInfoEntries=, TimeInfoEntries=, Changes=, Removals=): void} callback aggregated callback
  * @param {function(string, number): void} callbackUndelayed callback when the first change was detected
  * @returns {Watcher} a watcher
  */
@@ -451,7 +456,6 @@ const path = require("path");
 /** @typedef {InputFileSystem & OutputFileSystem & IntermediateFileSystemExtras} IntermediateFileSystem */
 
 /**
- *
  * @param {InputFileSystem|OutputFileSystem|undefined} fs a file system
  * @param {string} rootPath the root path
  * @param {string} targetPath the target path
@@ -464,13 +468,12 @@ const relative = (fs, rootPath, targetPath) => {
 		return path.posix.relative(rootPath, targetPath);
 	} else if (path.win32.isAbsolute(rootPath)) {
 		return path.win32.relative(rootPath, targetPath);
-	} else {
-		throw new Error(
-			`${rootPath} is neither a posix nor a windows path, and there is no 'relative' method defined in the file system`
-		);
 	}
+	throw new Error(
+		`${rootPath} is neither a posix nor a windows path, and there is no 'relative' method defined in the file system`
+	);
 };
-exports.relative = relative;
+module.exports.relative = relative;
 
 /**
  * @param {InputFileSystem|OutputFileSystem|undefined} fs a file system
@@ -485,13 +488,12 @@ const join = (fs, rootPath, filename) => {
 		return path.posix.join(rootPath, filename);
 	} else if (path.win32.isAbsolute(rootPath)) {
 		return path.win32.join(rootPath, filename);
-	} else {
-		throw new Error(
-			`${rootPath} is neither a posix nor a windows path, and there is no 'join' method defined in the file system`
-		);
 	}
+	throw new Error(
+		`${rootPath} is neither a posix nor a windows path, and there is no 'join' method defined in the file system`
+	);
 };
-exports.join = join;
+module.exports.join = join;
 
 /**
  * @param {InputFileSystem|OutputFileSystem|undefined} fs a file system
@@ -505,13 +507,12 @@ const dirname = (fs, absPath) => {
 		return path.posix.dirname(absPath);
 	} else if (path.win32.isAbsolute(absPath)) {
 		return path.win32.dirname(absPath);
-	} else {
-		throw new Error(
-			`${absPath} is neither a posix nor a windows path, and there is no 'dirname' method defined in the file system`
-		);
 	}
+	throw new Error(
+		`${absPath} is neither a posix nor a windows path, and there is no 'dirname' method defined in the file system`
+	);
 };
-exports.dirname = dirname;
+module.exports.dirname = dirname;
 
 /**
  * @param {OutputFileSystem} fs a file system
@@ -556,7 +557,7 @@ const mkdirp = (fs, p, callback) => {
 		callback();
 	});
 };
-exports.mkdirp = mkdirp;
+module.exports.mkdirp = mkdirp;
 
 /**
  * @param {IntermediateFileSystem} fs a file system
@@ -583,7 +584,7 @@ const mkdirpSync = (fs, p) => {
 		}
 	}
 };
-exports.mkdirpSync = mkdirpSync;
+module.exports.mkdirpSync = mkdirpSync;
 
 /**
  * @param {InputFileSystem} fs a file system
@@ -601,13 +602,13 @@ const readJson = (fs, p, callback) => {
 		let data;
 		try {
 			data = JSON.parse(/** @type {Buffer} */ (buf).toString("utf-8"));
-		} catch (e) {
-			return callback(/** @type {Error} */ (e));
+		} catch (err1) {
+			return callback(/** @type {Error} */ (err1));
 		}
 		return callback(null, data);
 	});
 };
-exports.readJson = readJson;
+module.exports.readJson = readJson;
 
 /**
  * @param {InputFileSystem} fs a file system
@@ -641,11 +642,10 @@ const lstatReadlinkAbsolute = (fs, p, callback) => {
 					callback(null, stats);
 				}
 			);
-		} else {
-			return fs.stat(p, callback);
 		}
+		return fs.stat(p, callback);
 	};
 	if ("lstat" in fs) return doStat();
 	doReadLink();
 };
-exports.lstatReadlinkAbsolute = lstatReadlinkAbsolute;
+module.exports.lstatReadlinkAbsolute = lstatReadlinkAbsolute;

package/lib/util/hash/md4.js

@@ -7,7 +7,7 @@
 
 const create = require("./wasm-hash");
 
-//#region wasm code: md4 (../../../assembly/hash/md4.asm.ts) --initialMemory 1
+// #region wasm code: md4 (../../../assembly/hash/md4.asm.ts) --initialMemory 1
 const md4 = new WebAssembly.Module(
 	Buffer.from(
 		// 2154 bytes
@@ -15,6 +15,6 @@ const md4 = new WebAssembly.Module(
 		"base64"
 	)
 );
-//#endregion
+// #endregion
 
 module.exports = create.bind(null, md4, [], 64, 32);

package/lib/util/hash/wasm-hash.js

@@ -149,14 +149,14 @@ const create = (wasmModule, instancesPool, chunkSize, digestSize) => {
 		const old = instancesPool.pop();
 		old.reset();
 		return old;
-	} else {
-		return new WasmHash(
-			new WebAssembly.Instance(wasmModule),
-			instancesPool,
-			chunkSize,
-			digestSize
-		);
 	}
+
+	return new WasmHash(
+		new WebAssembly.Instance(wasmModule),
+		instancesPool,
+		chunkSize,
+		digestSize
+	);
 };
 
 module.exports = create;

package/lib/util/hash/xxhash64.js

@@ -7,7 +7,7 @@
 
 const create = require("./wasm-hash");
 
-//#region wasm code: xxhash64 (../../../assembly/hash/xxhash64.asm.ts) --initialMemory 1
+// #region wasm code: xxhash64 (../../../assembly/hash/xxhash64.asm.ts) --initialMemory 1
 const xxhash64 = new WebAssembly.Module(
 	Buffer.from(
 		// 1160 bytes
@@ -15,6 +15,6 @@ const xxhash64 = new WebAssembly.Module(
 		"base64"
 	)
 );
-//#endregion
+// #endregion
 
 module.exports = create.bind(null, xxhash64, [], 32, 16);