webpack 5.90.3 → 5.92.0

package/lib/cache/PackFileCacheStrategy.js

@@ -28,13 +28,16 @@ const {
 /** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
 
 /** @typedef {Map<string, string | false>} ResolveResults */
+/** @typedef {Set<string>} Items */
+/** @typedef {Set<string>} BuildDependencies */
+/** @typedef {Map<string, PackItemInfo>} ItemInfo */
 
 class PackContainer {
 	/**
-	 * @param {Object} data stored data
+	 * @param {object} data stored data
 	 * @param {string} version version identifier
 	 * @param {Snapshot} buildSnapshot snapshot of all build dependencies
-	 * @param {Set<string>} buildDependencies list of all unresolved build dependencies captured
+	 * @param {BuildDependencies} buildDependencies list of all unresolved build dependencies captured
 	 * @param {ResolveResults} resolveResults result of the resolved build dependencies
 	 * @param {Snapshot} resolveBuildDependenciesSnapshot snapshot of the dependencies of the build dependencies resolving
 	 */
@@ -54,13 +57,17 @@ class PackContainer {
 		this.resolveBuildDependenciesSnapshot = resolveBuildDependenciesSnapshot;
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize({ write, writeLazy }) {
 		write(this.version);
 		write(this.buildSnapshot);
 		write(this.buildDependencies);
 		write(this.resolveResults);
 		write(this.resolveBuildDependenciesSnapshot);
-		writeLazy(this.data);
+		/** @type {NonNullable<ObjectSerializerContext["writeLazy"]>} */
+		(writeLazy)(this.data);
 	}
 
 	/**
@@ -104,13 +111,17 @@ class PackItemInfo {
 }
 
 class Pack {
+	/**
+	 * @param {Logger} logger a logger
+	 * @param {number} maxAge max age of cache items
+	 */
 	constructor(logger, maxAge) {
-		/** @type {Map<string, PackItemInfo>} */
+		/** @type {ItemInfo} */
 		this.itemInfo = new Map();
 		/** @type {(string | undefined)[]} */
 		this.requests = [];
 		this.requestsTimeout = undefined;
-		/** @type {Map<string, PackItemInfo>} */
+		/** @type {ItemInfo} */
 		this.freshContent = new Map();
 		/** @type {(undefined | PackContent)[]} */
 		this.content = [];
@@ -224,12 +235,18 @@ class Pack {
 		return i;
 	}
 
+	/**
+	 * @private
+	 * @param {Items} items items
+	 * @param {Items} usedItems used items
+	 * @param {number} newLoc new location
+	 */
 	_gcAndUpdateLocation(items, usedItems, newLoc) {
 		let count = 0;
 		let lastGC;
 		const now = Date.now();
 		for (const identifier of items) {
-			const info = this.itemInfo.get(identifier);
+			const info = /** @type {PackItemInfo} */ (this.itemInfo.get(identifier));
 			if (now - info.lastAccess > this.maxAge) {
 				this.itemInfo.delete(identifier);
 				items.delete(identifier);
@@ -263,7 +280,7 @@ class Pack {
 				const loc = this._findLocation();
 				this.content[loc] = null; // reserve
 				const pack = {
-					/** @type {Set<string>} */
+					/** @type {Items} */
 					items: new Set(),
 					/** @type {Map<string, any>} */
 					map: new Map(),
@@ -372,9 +389,9 @@ class Pack {
 		}
 
 		// 4. Determine merged items
-		/** @type {Set<string>} */
+		/** @type {Items} */
 		const mergedItems = new Set();
-		/** @type {Set<string>} */
+		/** @type {Items} */
 		const mergedUsedItems = new Set();
 		/** @type {(function(Map<string, any>): Promise<void>)[]} */
 		const addToMergedMap = [];
@@ -544,6 +561,9 @@ class Pack {
 		}
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize({ write, writeSeparate }) {
 		this._persistFreshContent();
 		this._optimizeSmallContent();
@@ -571,6 +591,9 @@ class Pack {
 		write(null); // null as marker of the end of items
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext & { logger: Logger }} context context
+	 */
 	deserialize({ read, logger }) {
 		this.logger = logger;
 		{
@@ -629,6 +652,9 @@ class PackContentItems {
 		this.map = map;
 	}
 
+	/**
+	 * @param {ObjectSerializerContext & { snapshot: TODO, rollback: TODO, logger: Logger, profile: boolean | undefined  }} context context
+	 */
 	serialize({ write, snapshot, rollback, logger, profile }) {
 		if (profile) {
 			write(false);
@@ -695,6 +721,9 @@ class PackContentItems {
 		}
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext & { logger: Logger, profile: boolean | undefined }} context context
+	 */
 	deserialize({ read, logger, profile }) {
 		if (read()) {
 			this.map = read();
@@ -760,17 +789,17 @@ class PackContent {
 	*/
 
 	/**
-	 * @param {Set<string>} items keys
-	 * @param {Set<string>} usedItems used keys
+	 * @param {Items} items keys
+	 * @param {Items} usedItems used keys
 	 * @param {PackContentItems | function(): Promise<PackContentItems>} dataOrFn sync or async content
 	 * @param {Logger=} logger logger for logging
 	 * @param {string=} lazyName name of dataOrFn for logging
 	 */
 	constructor(items, usedItems, dataOrFn, logger, lazyName) {
 		this.items = items;
-		/** @type {function(): Promise<PackContentItems> | PackContentItems} */
+		/** @type {(function(): Promise<PackContentItems> | PackContentItems) | undefined} */
 		this.lazy = typeof dataOrFn === "function" ? dataOrFn : undefined;
-		/** @type {Map<string, any>} */
+		/** @type {Map<string, any> | undefined} */
 		this.content = typeof dataOrFn === "function" ? undefined : dataOrFn.map;
 		this.outdated = false;
 		this.used = usedItems;
@@ -778,6 +807,10 @@ class PackContent {
 		this.lazyName = lazyName;
 	}
 
+	/**
+	 * @param {string} identifier identifier
+	 * @returns {string | Promise<string>} result
+	 */
 	get(identifier) {
 		this.used.add(identifier);
 		if (this.content) {
@@ -994,7 +1027,7 @@ const allowCollectingMemory = buf => {
 
 class PackFileCacheStrategy {
 	/**
-	 * @param {Object} options options
+	 * @param {object} options options
 	 * @param {Compiler} options.compiler the compiler
 	 * @param {IntermediateFileSystem} options.fs the filesystem
 	 * @param {string} options.context the context directory
@@ -1049,7 +1082,7 @@ class PackFileCacheStrategy {
 					? ".pack.gz"
 					: ".pack";
 		this.snapshot = snapshot;
-		/** @type {Set<string>} */
+		/** @type {BuildDependencies} */
 		this.buildDependencies = new Set();
 		/** @type {LazySet<string>} */
 		this.newBuildDependencies = new LazySet();
@@ -1081,9 +1114,9 @@ class PackFileCacheStrategy {
 		const { logger, profile, cacheLocation, version } = this;
 		/** @type {Snapshot} */
 		let buildSnapshot;
-		/** @type {Set<string>} */
+		/** @type {BuildDependencies} */
 		let buildDependencies;
-		/** @type {Set<string>} */
+		/** @type {BuildDependencies} */
 		let newBuildDependencies;
 		/** @type {Snapshot} */
 		let resolveBuildDependenciesSnapshot;
@@ -1272,7 +1305,7 @@ class PackFileCacheStrategy {
 	}
 
 	/**
-	 * @param {LazySet<string>} dependencies dependencies to store
+	 * @param {LazySet<string> | Iterable<string>} dependencies dependencies to store
 	 */
 	storeBuildDependencies(dependencies) {
 		if (this.readonly) return;

package/lib/cache/ResolverCachePlugin.js

@@ -8,7 +8,7 @@
 const LazySet = require("../util/LazySet");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("enhanced-resolve/lib/Resolver")} Resolver */
+/** @typedef {import("enhanced-resolve").Resolver} Resolver */
 /** @typedef {import("../CacheFacade").ItemCacheFacade} ItemCacheFacade */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../FileSystemInfo")} FileSystemInfo */
@@ -50,7 +50,7 @@ const addAllToSet = (set, otherSet) => {
 };
 
 /**
- * @param {Object} object an object
+ * @param {object} object an object
  * @param {boolean} excludeContext if true, context is not included in string
  * @returns {string} stringified version
  */
@@ -104,9 +104,9 @@ class ResolverCachePlugin {
 		/**
 		 * @param {ItemCacheFacade} itemCache cache
 		 * @param {Resolver} resolver the resolver
-		 * @param {Object} resolveContext context for resolving meta info
-		 * @param {Object} request the request info object
-		 * @param {function((Error | null)=, Object=): void} callback callback function
+		 * @param {object} resolveContext context for resolving meta info
+		 * @param {object} request the request info object
+		 * @param {function((Error | null)=, object=): void} callback callback function
 		 * @returns {void}
 		 */
 		const doRealResolve = (
@@ -188,16 +188,16 @@ class ResolverCachePlugin {
 		};
 		compiler.resolverFactory.hooks.resolver.intercept({
 			factory(type, hook) {
-				/** @type {Map<string, (function(Error=, Object=): void)[]>} */
+				/** @type {Map<string, (function(Error=, object=): void)[]>} */
 				const activeRequests = new Map();
-				/** @type {Map<string, [function(Error=, Object=): void, function(Error=, Object=): void][]>} */
+				/** @type {Map<string, [function(Error=, object=): void, function(Error=, object=): void][]>} */
 				const activeRequestsWithYield = new Map();
 				hook.tap(
 					"ResolverCachePlugin",
 					/**
 					 * @param {Resolver} resolver the resolver
-					 * @param {Object} options resolve options
-					 * @param {Object} userOptions resolve options passed by the user
+					 * @param {object} options resolve options
+					 * @param {object} userOptions resolve options passed by the user
 					 * @returns {void}
 					 */
 					(resolver, options, userOptions) => {
@@ -213,7 +213,10 @@ class ResolverCachePlugin {
 								stage: -100
 							},
 							(request, resolveContext, callback) => {
-								if (request._ResolverCachePluginCacheMiss || !fileSystemInfo) {
+								if (
+									/** @type {TODO} */ (request)._ResolverCachePluginCacheMiss ||
+									!fileSystemInfo
+								) {
 									return callback();
 								}
 								const withYield = typeof resolveContext.yield === "function";
@@ -225,7 +228,9 @@ class ResolverCachePlugin {
 									const activeRequest = activeRequestsWithYield.get(identifier);
 									if (activeRequest) {
 										activeRequest[0].push(callback);
-										activeRequest[1].push(resolveContext.yield);
+										activeRequest[1].push(
+											/** @type {TODO} */ (resolveContext.yield)
+										);
 										return;
 									}
 								} else {
@@ -303,19 +308,22 @@ class ResolverCachePlugin {
 												cachedResolves++;
 												if (resolveContext.missingDependencies) {
 													addAllToSet(
-														resolveContext.missingDependencies,
+														/** @type {LazySet<string>} */
+														(resolveContext.missingDependencies),
 														snapshot.getMissingIterable()
 													);
 												}
 												if (resolveContext.fileDependencies) {
 													addAllToSet(
-														resolveContext.fileDependencies,
+														/** @type {LazySet<string>} */
+														(resolveContext.fileDependencies),
 														snapshot.getFileIterable()
 													);
 												}
 												if (resolveContext.contextDependencies) {
 													addAllToSet(
-														resolveContext.contextDependencies,
+														/** @type {LazySet<string>} */
+														(resolveContext.contextDependencies),
 														snapshot.getContextIterable()
 													);
 												}

package/lib/cache/getLazyHashedEtag.js

@@ -11,7 +11,7 @@ const createHash = require("../util/createHash");
 /** @typedef {typeof import("../util/Hash")} HashConstructor */
 
 /**
- * @typedef {Object} HashableObject
+ * @typedef {object} HashableObject
  * @property {function(Hash): void} updateHash
  */
 
@@ -47,7 +47,7 @@ const mapObjects = new WeakMap();
 
 /**
  * @param {HashableObject} obj object with updateHash method
- * @param {string | HashConstructor} hashFunction the hash function to use
+ * @param {(string | HashConstructor)=} hashFunction the hash function to use
  * @returns {LazyHashedEtag} etag
  */
 const getter = (obj, hashFunction = "md4") => {

package/lib/cli.js

@@ -10,7 +10,7 @@ const webpackSchema = require("../schemas/WebpackOptions.json");
 
 // TODO add originPath to PathItem for better errors
 /**
- * @typedef {Object} PathItem
+ * @typedef {object} PathItem
  * @property {any} schema the part of the schema
  * @property {string} path the path in the config
  */
@@ -18,7 +18,7 @@ const webpackSchema = require("../schemas/WebpackOptions.json");
 /** @typedef {"unknown-argument" | "unexpected-non-array-in-path" | "unexpected-non-object-in-path" | "multiple-values-unexpected" | "invalid-value"} ProblemType */
 
 /**
- * @typedef {Object} Problem
+ * @typedef {object} Problem
  * @property {ProblemType} type
  * @property {string} path
  * @property {string} argument
@@ -28,14 +28,14 @@ const webpackSchema = require("../schemas/WebpackOptions.json");
  */
 
 /**
- * @typedef {Object} LocalProblem
+ * @typedef {object} LocalProblem
  * @property {ProblemType} type
  * @property {string} path
  * @property {string=} expected
  */
 
 /**
- * @typedef {Object} ArgumentConfig
+ * @typedef {object} ArgumentConfig
  * @property {string} description
  * @property {string} [negatedDescription]
  * @property {string} path
@@ -45,7 +45,7 @@ const webpackSchema = require("../schemas/WebpackOptions.json");
  */
 
 /**
- * @typedef {Object} Argument
+ * @typedef {object} Argument
  * @property {string} description
  * @property {"string"|"number"|"boolean"} simpleType
  * @property {boolean} multiple

package/lib/config/browserslistTargetHandler.js

@@ -16,7 +16,7 @@ const path = require("path");
 const inputRx = /^(?:((?:[A-Z]:)?[/\\].*?))?(?::(.+?))?$/i;
 
 /**
- * @typedef {Object} BrowserslistHandlerConfig
+ * @typedef {object} BrowserslistHandlerConfig
  * @property {string=} configPath
  * @property {string=} env
  * @property {string=} query
@@ -344,6 +344,12 @@ const resolve = browsers => {
 		importScripts: false,
 		importScriptsInWorker: true,
 		nodeBuiltins: nodeProperty,
+		nodePrefixForCoreModules:
+			nodeProperty &&
+			!browsers.some(b => /^node 15/.test(b)) &&
+			rawChecker({
+				node: [14, 18]
+			}),
 		require: nodeProperty
 	};
 };