webpack 5.91.0 → 5.92.0

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -22,7 +22,7 @@ const plural = (n, singular, plural) => (n === 1 ? singular : plural);
 
 /**
  * @param {Record<string, number>} sizes sizes by source type
- * @param {Object} options options
+ * @param {object} options options
  * @param {(number) => string=} options.formatSize size formatter
  * @returns {string} text
  */

package/lib/stats/StatsFactory.js

@@ -18,7 +18,7 @@ const smartGrouping = require("../util/smartGrouping");
 /** @typedef {import("../util/smartGrouping").GroupConfig<any, object>} GroupConfig */
 
 /**
- * @typedef {Object} KnownStatsFactoryContext
+ * @typedef {object} KnownStatsFactoryContext
  * @property {string} type
  * @property {function(string): string=} makePathsRelative
  * @property {Compilation=} compilation
@@ -35,7 +35,7 @@ const smartGrouping = require("../util/smartGrouping");
 class StatsFactory {
 	constructor() {
 		this.hooks = Object.freeze({
-			/** @type {HookMap<SyncBailHook<[Object, any, StatsFactoryContext]>>} */
+			/** @type {HookMap<SyncBailHook<[object, any, StatsFactoryContext]>>} */
 			extract: new HookMap(
 				() => new SyncBailHook(["object", "data", "context"])
 			),

package/lib/stats/StatsPrinter.js

@@ -17,13 +17,13 @@ const { HookMap, SyncWaterfallHook, SyncBailHook } = require("tapable");
 /** @typedef {import("./DefaultStatsFactoryPlugin").StatsModuleReason} StatsModuleReason */
 
 /**
- * @typedef {Object} PrintedElement
+ * @typedef {object} PrintedElement
  * @property {string} element
  * @property {string} content
  */
 
 /**
- * @typedef {Object} KnownStatsPrinterContext
+ * @typedef {object} KnownStatsPrinterContext
  * @property {string=} type
  * @property {StatsCompilation=} compilation
  * @property {StatsChunkGroup=} chunkGroup
@@ -147,8 +147,8 @@ class StatsPrinter {
 
 	/**
 	 * @param {string} type The type
-	 * @param {Object} object Object to print
-	 * @param {Object=} baseContext The base context
+	 * @param {object} object Object to print
+	 * @param {object=} baseContext The base context
 	 * @returns {string} printed result
 	 */
 	print(type, object, baseContext) {
@@ -168,8 +168,8 @@ class StatsPrinter {
 	/**
 	 * @private
 	 * @param {string} type type
-	 * @param {Object} object object
-	 * @param {Object=} baseContext context
+	 * @param {object} object object
+	 * @param {object=} baseContext context
 	 * @returns {string} printed result
 	 */
 	_print(type, object, baseContext) {

package/lib/util/ArrayQueue.js

@@ -13,9 +13,15 @@ class ArrayQueue {
 	 * @param {Iterable<T>=} items The initial elements.
 	 */
 	constructor(items) {
-		/** @private @type {T[]} */
+		/**
+		 * @private
+		 * @type {T[]}
+		 */
 		this._list = items ? Array.from(items) : [];
-		/** @private @type {T[]} */
+		/**
+		 * @private
+		 * @type {T[]}
+		 */
 		this._listReversed = [];
 	}
 
@@ -77,31 +83,18 @@ class ArrayQueue {
 	}
 
 	[Symbol.iterator]() {
-		let i = -1;
-		let reversed = false;
 		return {
 			next: () => {
-				if (!reversed) {
-					i++;
-					if (i < this._list.length) {
-						return {
-							done: false,
-							value: this._list[i]
-						};
-					}
-					reversed = true;
-					i = this._listReversed.length;
-				}
-				i--;
-				if (i < 0) {
+				const item = this.dequeue();
+				if (item) {
 					return {
-						done: true,
-						value: undefined
+						done: false,
+						value: item
 					};
 				}
 				return {
-					done: false,
-					value: this._listReversed[i]
+					done: true,
+					value: undefined
 				};
 			}
 		};

package/lib/util/AsyncQueue.js

@@ -53,7 +53,7 @@ class AsyncQueueEntry {
  */
 class AsyncQueue {
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {string=} options.name name of the queue
 	 * @param {number=} options.parallelism how many items should be processed at once
 	 * @param {AsyncQueue<any, any, any>=} options.parent parent queue, which will have priority over this queue and with shared parallelism

package/lib/util/Queue.js

@@ -13,9 +13,15 @@ class Queue {
 	 * @param {Iterable<T>=} items The initial elements.
 	 */
 	constructor(items) {
-		/** @private @type {Set<T>} */
+		/**
+		 * @private
+		 * @type {Set<T>}
+		 */
 		this._set = new Set(items);
-		/** @private @type {Iterator<T>} */
+		/**
+		 * @private
+		 * @type {Iterator<T>}
+		 */
 		this._iterator = this._set[Symbol.iterator]();
 	}
 

package/lib/util/SortableSet.js

@@ -21,13 +21,25 @@ class SortableSet extends Set {
 	 */
 	constructor(initialIterable, defaultSort) {
 		super(initialIterable);
-		/** @private @type {undefined | function(T, T): number}} */
+		/**
+		 * @private
+		 * @type {undefined | function(T, T): number}}
+		 */
 		this._sortFn = defaultSort;
-		/** @private @type {typeof NONE | undefined | function(T, T): number}} */
+		/**
+		 * @private
+		 * @type {typeof NONE | undefined | function(T, T): number}}
+		 */
 		this._lastActiveSortFn = NONE;
-		/** @private @type {Map<Function, any> | undefined} */
+		/**
+		 * @private
+		 * @type {Map<Function, any> | undefined}
+		 */
 		this._cache = undefined;
-		/** @private @type {Map<Function, any> | undefined} */
+		/**
+		 * @private
+		 * @type {Map<Function, any> | undefined}
+		 */
 		this._cacheOrderIndependent = undefined;
 	}
 

package/lib/util/TupleQueue.js

@@ -15,9 +15,15 @@ class TupleQueue {
 	 * @param {Iterable<T>=} items The initial elements.
 	 */
 	constructor(items) {
-		/** @private @type {TupleSet<T>} */
+		/**
+		 * @private
+		 * @type {TupleSet<T>}
+		 */
 		this._set = new TupleSet(items);
-		/** @private @type {Iterator<T>} */
+		/**
+		 * @private
+		 * @type {Iterator<T>}
+		 */
 		this._iterator = this._set[Symbol.iterator]();
 	}
 

package/lib/util/WeakTupleMap.js

@@ -33,17 +33,17 @@ class WeakTupleMap {
 		/**
 		 * @private
 		 * @type {any}
-		 **/
+		 */
 		this.v = undefined;
 		/**
 		 * @private
 		 * @type {M<T, V> | undefined}
-		 **/
+		 */
 		this.m = undefined;
 		/**
 		 * @private
 		 * @type {W<T, V> | undefined}
-		 **/
+		 */
 		this.w = undefined;
 	}
 

package/lib/util/binarySearchBounds.js

@@ -75,7 +75,7 @@ const compileSearch = (funcName, predicate, reversed, extraArgs, earlyOut) => {
  * @param {boolean} reversed Whether the search should be reversed.
  * @param {SearchPredicateSuffix} suffix The suffix to be used in the function name.
  * @param {boolean=} earlyOut Whether the search should return as soon as a match is found.
- * @returns {function} The compiled binary search function.
+ * @returns {Function} The compiled binary search function.
  */
 const compileBoundsSearch = (predicate, reversed, suffix, earlyOut) => {
 	const arg1 = compileSearch(

package/lib/util/cleverMerge.js

@@ -81,14 +81,14 @@ const cachedSetProperty = (obj, property, value) => {
 };
 
 /**
- * @typedef {Object} ObjectParsedPropertyEntry
+ * @typedef {object} ObjectParsedPropertyEntry
  * @property {any | undefined} base base value
  * @property {string | undefined} byProperty the name of the selector property
  * @property {Map<string, any>} byValues value depending on selector property, merged with base
  */
 
 /**
- * @typedef {Object} ParsedObject
+ * @typedef {object} ParsedObject
  * @property {Map<string, ObjectParsedPropertyEntry>} static static properties (key is property name)
  * @property {{ byProperty: string, fn: Function } | undefined} dynamic dynamic part
  */

package/lib/util/comparators.js

@@ -279,7 +279,10 @@ exports.compareChunkGroupsByIndex = compareChunkGroupsByIndex;
  */
 class TwoKeyWeakMap {
 	constructor() {
-		/** @private @type {WeakMap<any, WeakMap<any, T | undefined>>} */
+		/**
+		 * @private
+		 * @type {WeakMap<any, WeakMap<any, T | undefined>>}
+		 */
 		this._map = new WeakMap();
 	}
 
@@ -408,7 +411,6 @@ const compareIterables = elementComparator => {
 	const result = (a, b) => {
 		const aI = a[Symbol.iterator]();
 		const bI = b[Symbol.iterator]();
-		// eslint-disable-next-line no-constant-condition
 		while (true) {
 			const aItem = aI.next();
 			const bItem = bI.next();

package/lib/util/conventions.js

@@ -9,7 +9,7 @@
 
 /**
  * @param {string} input input
- * @param {CssGeneratorExportsConvention} convention convention
+ * @param {CssGeneratorExportsConvention | undefined} convention convention
  * @returns {Set<string>} results
  */
 exports.cssExportConvention = (input, convention) => {

package/lib/util/createHash.js

@@ -11,7 +11,7 @@ const BULK_SIZE = 2000;
 
 // We are using an object instead of a Map as this will stay static during the runtime
 // so access to it can be optimized by v8
-/** @type {Object<string, Map<string, string>>} */
+/** @type {{[key: string]: Map<string, string>}} */
 const digestCaches = {};
 
 /** @typedef {function(): Hash} HashFactory */
@@ -143,7 +143,7 @@ let BatchedHash = undefined;
 
 /**
  * Creates a hash by name or function
- * @param {string | typeof Hash | undefined} algorithm the algorithm name or a constructor creating a hash
+ * @param {string | typeof Hash} algorithm the algorithm name or a constructor creating a hash
  * @returns {Hash} the hash
  */
 module.exports = algorithm => {
@@ -184,9 +184,7 @@ module.exports = algorithm => {
 			if (crypto === undefined) crypto = require("crypto");
 			return new BulkUpdateDecorator(
 				() =>
-					/** @type {typeof import("crypto")} */ (crypto).createHash(
-						/** @type {string} */ (algorithm)
-					),
+					/** @type {typeof import("crypto")} */ (crypto).createHash(algorithm),
 				algorithm
 			);
 	}

package/lib/util/deprecation.js

@@ -11,7 +11,7 @@ const util = require("util");
 const deprecationCache = new Map();
 
 /**
- * @typedef {Object} FakeHookMarker
+ * @typedef {object} FakeHookMarker
  * @property {true} _fakeHook it's a fake hook
  */
 
@@ -187,11 +187,11 @@ exports.createArrayToSetDeprecationSet = name => {
 
 /**
  * @template T
- * @param {Object} obj object
+ * @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 {object} frozen object with deprecation when modifying
  */
 exports.soonFrozenObjectDeprecation = (obj, name, code, note = "") => {
 	const message = `${name} will be frozen in future, all modifications are deprecated.${

package/lib/util/deterministicGrouping.js

@@ -272,7 +272,7 @@ const getSimilarities = nodes => {
 
 /**
  * @template T
- * @typedef {Object} GroupedItems<T>
+ * @typedef {object} GroupedItems<T>
  * @property {string} key
  * @property {T[]} items
  * @property {Record<string, number>} size
@@ -280,7 +280,7 @@ const getSimilarities = nodes => {
 
 /**
  * @template T
- * @typedef {Object} Options
+ * @typedef {object} Options
  * @property {Record<string, number>} maxSize maximum size of a group
  * @property {Record<string, number>} minSize minimum size of a group (preferred over maximum size)
  * @property {Iterable<T>} items a list of items

package/lib/util/findGraphRoots.js

@@ -41,7 +41,7 @@ class Cycle {
 
 /**
  * @template T
- * @typedef {Object} StackEntry
+ * @typedef {object} StackEntry
  * @property {Node<T>} node
  * @property {Node<T>[]} openEdges
  */

package/lib/util/fs.js

@@ -12,7 +12,7 @@ const path = require("path");
 
 /**
  * @template T
- * @typedef {Object} IStatsBase
+ * @typedef {object} IStatsBase
  * @property {() => boolean} isFile
  * @property {() => boolean} isDirectory
  * @property {() => boolean} isBlockDevice
@@ -49,7 +49,7 @@ const path = require("path");
  */
 
 /**
- * @typedef {Object} Dirent
+ * @typedef {object} Dirent
  * @property {() => boolean} isFile
  * @property {() => boolean} isDirectory
  * @property {() => boolean} isBlockDevice
@@ -81,7 +81,7 @@ const path = require("path");
 /** @typedef {function(NodeJS.ErrnoException | Error | null, JsonObject=): void} ReadJsonCallback */
 
 /**
- * @typedef {Object} WatcherInfo
+ * @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
@@ -90,7 +90,7 @@ const path = require("path");
 
 // TODO webpack 6 deprecate missing getInfo
 /**
- * @typedef {Object} Watcher
+ * @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
@@ -123,7 +123,7 @@ const path = require("path");
  */
 
 /**
- * @typedef {Object} ObjectEncodingOptions
+ * @typedef {object} ObjectEncodingOptions
  * @property {BufferEncoding | null | undefined} [encoding]
  */
 
@@ -153,12 +153,12 @@ const path = require("path");
  */
 
 /**
- * @typedef {Object} StatOptions
+ * @typedef {object} StatOptions
  * @property {(boolean | undefined)=} bigint
  */
 
 /**
- * @typedef {Object} StatSyncOptions
+ * @typedef {object} StatSyncOptions
  * @property {(boolean | undefined)=} bigint
  * @property {(boolean | undefined)=} throwIfNoEntry
  */
@@ -271,7 +271,7 @@ const path = require("path");
  */
 
 /**
- * @typedef {Object} InputFileSystem
+ * @typedef {object} InputFileSystem
  * @property {ReadFile} readFile
  * @property {ReadFileSync=} readFileSync
  * @property {Readlink} readlink
@@ -336,7 +336,7 @@ const path = require("path");
  */
 
 /**
- * @typedef {Object} OutputFileSystem
+ * @typedef {object} OutputFileSystem
  * @property {WriteFile} writeFile
  * @property {Mkdir} mkdir
  * @property {Readdir=} readdir
@@ -351,7 +351,7 @@ const path = require("path");
  */
 
 /**
- * @typedef {Object} WatchFileSystem
+ * @typedef {object} WatchFileSystem
  * @property {WatchMethod} watch
  */
 
@@ -364,7 +364,7 @@ const path = require("path");
  */
 
 /**
- * @typedef {Object} StreamOptions
+ * @typedef {object} StreamOptions
  * @property {(string | undefined)=} flags
  * @property {(BufferEncoding | undefined)} encoding
  * @property {(number | any | undefined)=} fd
@@ -376,7 +376,7 @@ const path = require("path");
  */
 
 /**
- * @typedef {Object} FSImplementation
+ * @typedef {object} FSImplementation
  * @property {((...args: any[]) => any)=} open
  * @property {((...args: any[]) => any)=} close
  */
@@ -410,7 +410,7 @@ const path = require("path");
  */
 
 /**
- * @typedef {Object} ReadSyncOptions
+ * @typedef {object} ReadSyncOptions
  * @property {(number | undefined)=} offset
  * @property {(number | undefined)=} length
  * @property {(ReadPosition | null | undefined)=} position
@@ -418,7 +418,7 @@ const path = require("path");
 
 /**
  * @template {NodeJS.ArrayBufferView} TBuffer
- * @typedef {Object} ReadAsyncOptions
+ * @typedef {object} ReadAsyncOptions
  * @property {(number | undefined)=} offset
  * @property {(number | undefined)=} length
  * @property {(ReadPosition | null | undefined)=} position
@@ -439,7 +439,7 @@ const path = require("path");
 /** @typedef {function(PathLike, PathLike, NoParamCallback): void} Rename */
 
 /**
- * @typedef {Object} IntermediateFileSystemExtras
+ * @typedef {object} IntermediateFileSystemExtras
  * @property {MkdirSync} mkdirSync
  * @property {CreateWriteStream} createWriteStream
  * @property {Open} open

package/lib/util/identifier.js

@@ -11,7 +11,7 @@ const SEGMENTS_SPLIT_REGEXP = /([|!])/;
 const WINDOWS_PATH_SEPARATOR_REGEXP = /\\/g;
 
 /**
- * @typedef {Object} MakeRelativePathsCache
+ * @typedef {object} MakeRelativePathsCache
  * @property {Map<string, Map<string, string>>=} relativePaths
  */
 
@@ -100,7 +100,7 @@ const makeCacheable = realFn => {
 
 	/**
 	 * @param {string} str the path with query and fragment
-	 * @param {Object=} associatedObjectForCache an object to which the cache will be attached
+	 * @param {object=} associatedObjectForCache an object to which the cache will be attached
 	 * @returns {ParsedResource} parsed parts
 	 */
 	const fn = (str, associatedObjectForCache) => {
@@ -134,7 +134,7 @@ const makeCacheableWithContext = fn => {
 	/**
 	 * @param {string} context context used to create relative path
 	 * @param {string} identifier identifier used to create relative path
-	 * @param {Object=} associatedObjectForCache an object to which the cache will be attached
+	 * @param {object=} associatedObjectForCache an object to which the cache will be attached
 	 * @returns {string} the returned relative path
 	 */
 	const cachedFn = (context, identifier, associatedObjectForCache) => {
@@ -164,7 +164,7 @@ const makeCacheableWithContext = fn => {
 	};
 
 	/**
-	 * @param {Object=} associatedObjectForCache an object to which the cache will be attached
+	 * @param {object=} associatedObjectForCache an object to which the cache will be attached
 	 * @returns {function(string, string): string} cached function
 	 */
 	cachedFn.bindCache = associatedObjectForCache => {
@@ -207,7 +207,7 @@ const makeCacheableWithContext = fn => {
 
 	/**
 	 * @param {string} context context used to create relative path
-	 * @param {Object=} associatedObjectForCache an object to which the cache will be attached
+	 * @param {object=} associatedObjectForCache an object to which the cache will be attached
 	 * @returns {function(string): string} cached function
 	 */
 	cachedFn.bindContextCache = (context, associatedObjectForCache) => {

package/lib/util/mergeScope.js

@@ -0,0 +1,79 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+/** @typedef {import("eslint-scope").Reference} Reference */
+/** @typedef {import("eslint-scope").Variable} Variable */
+/** @typedef {import("../javascript/JavascriptParser").AnyNode} AnyNode */
+/** @typedef {import("../javascript/JavascriptParser").Program} Program */
+
+/**
+ * @param {Variable} variable variable
+ * @returns {Reference[]} references
+ */
+const getAllReferences = variable => {
+	let set = variable.references;
+	// Look for inner scope variables too (like in class Foo { t() { Foo } })
+	const identifiers = new Set(variable.identifiers);
+	for (const scope of variable.scope.childScopes) {
+		for (const innerVar of scope.variables) {
+			if (innerVar.identifiers.some(id => identifiers.has(id))) {
+				set = set.concat(innerVar.references);
+				break;
+			}
+		}
+	}
+	return set;
+};
+
+/**
+ * @param {Program | Program[]} ast ast
+ * @param {AnyNode} node node
+ * @returns {undefined | AnyNode[]} result
+ */
+const getPathInAst = (ast, node) => {
+	if (ast === node) {
+		return [];
+	}
+
+	const nr = node.range;
+
+	const enterNode = n => {
+		if (!n) return undefined;
+		const r = n.range;
+		if (r) {
+			if (r[0] <= nr[0] && r[1] >= nr[1]) {
+				const path = getPathInAst(n, node);
+				if (path) {
+					path.push(n);
+					return path;
+				}
+			}
+		}
+		return undefined;
+	};
+
+	if (Array.isArray(ast)) {
+		for (let i = 0; i < ast.length; i++) {
+			const enterResult = enterNode(ast[i]);
+			if (enterResult !== undefined) return enterResult;
+		}
+	} else if (ast && typeof ast === "object") {
+		const keys = Object.keys(ast);
+		for (let i = 0; i < keys.length; i++) {
+			const value = ast[keys[i]];
+			if (Array.isArray(value)) {
+				const pathResult = getPathInAst(value, node);
+				if (pathResult !== undefined) return pathResult;
+			} else if (value && typeof value === "object") {
+				const enterResult = enterNode(value);
+				if (enterResult !== undefined) return enterResult;
+			}
+		}
+	}
+};
+
+module.exports = { getAllReferences, getPathInAst };

package/lib/util/runtime.js

@@ -229,22 +229,6 @@ const mergeRuntime = (a, b) => {
 };
 exports.mergeRuntime = mergeRuntime;
 
-/**
- * @param {RuntimeSpec[] | undefined} runtimes first
- * @param {RuntimeSpec} runtime second
- * @returns {RuntimeSpec} merged
- */
-exports.deepMergeRuntime = (runtimes, runtime) => {
-	if (!Array.isArray(runtimes)) {
-		return runtime;
-	}
-	let merged = runtime;
-	for (const r of runtimes) {
-		merged = mergeRuntime(runtime, r);
-	}
-	return merged;
-};
-
 /**
  * @param {RuntimeCondition} a first
  * @param {RuntimeCondition} b second
@@ -390,6 +374,7 @@ const subtractRuntime = (a, b) => {
 			}
 			const set = new SortableSet(a);
 			set.delete(b);
+			return set;
 		} else {
 			const set = new SortableSet();
 			for (const item of a) {
@@ -445,7 +430,7 @@ exports.filterRuntime = (runtime, filter) => {
 /**
  * @template T
  * @typedef {Map<string, T>} RuntimeSpecMapInnerMap
- * */
+ */
 
 /**
  * @template T

package/lib/util/semver.js

@@ -153,6 +153,9 @@ exports.parseRange = str => {
 				}
 				return [1, ...remainder.slice(1)];
 			case "~":
+				if (remainder.length === 2 && remainder[0] === 0) {
+					return [1, ...remainder.slice(1)];
+				}
 				return [2, ...remainder.slice(1)];
 			case ">=":
 				return remainder;