webpack 5.90.3 → 5.92.0

package/lib/runtime/GetTrustedTypesPolicyRuntimeModule.js

@@ -9,10 +9,11 @@ const Template = require("../Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
 
 /** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
 
 class GetTrustedTypesPolicyRuntimeModule extends HelperRuntimeModule {
 	/**
-	 * @param {ReadonlySet<string>} runtimeRequirements runtime requirements
+	 * @param {ReadOnlyRuntimeRequirements} runtimeRequirements runtime requirements
 	 */
 	constructor(runtimeRequirements) {
 		super("trusted types policy");

package/lib/runtime/LoadScriptRuntimeModule.js

@@ -14,7 +14,7 @@ const HelperRuntimeModule = require("./HelperRuntimeModule");
 /** @typedef {import("../Compiler")} Compiler */
 
 /**
- * @typedef {Object} LoadScriptCompilationHooks
+ * @typedef {object} LoadScriptCompilationHooks
  * @property {SyncWaterfallHook<[string, Chunk]>} createScript
  */
 

package/lib/runtime/StartupChunkDependenciesPlugin.js

@@ -13,7 +13,7 @@ const StartupEntrypointRuntimeModule = require("./StartupEntrypointRuntimeModule
 /** @typedef {import("../Compiler")} Compiler */
 
 /**
- * @typedef {Object} Options
+ * @typedef {object} Options
  * @property {ChunkLoadingType} chunkLoading
  * @property {boolean=} asyncChunkLoading
  */

package/lib/schemes/HttpUriPlugin.js

@@ -151,7 +151,7 @@ const parseCacheControl = (cacheControl, requestTime) => {
 };
 
 /**
- * @typedef {Object} LockfileEntry
+ * @typedef {object} LockfileEntry
  * @property {string} resolved
  * @property {string} integrity
  * @property {string} contentType

package/lib/serialization/BinaryMiddleware.js

@@ -143,7 +143,7 @@ const identifyBigInt = n => {
 class BinaryMiddleware extends SerializerMiddleware {
 	/**
 	 * @param {DeserializedType} data data
-	 * @param {Object} context context object
+	 * @param {object} context context object
 	 * @returns {SerializedType|Promise<SerializedType>} serialized data
 	 */
 	serialize(data, context) {
@@ -158,7 +158,7 @@ class BinaryMiddleware extends SerializerMiddleware {
 
 	/**
 	 * @param {DeserializedType} data data
-	 * @param {Object} context context object
+	 * @param {object} context context object
 	 * @param {{ leftOverBuffer: Buffer | null, allocationSize: number, increaseCounter: number }} allocationScope allocation scope
 	 * @returns {SerializedType} serialized data
 	 */
@@ -629,7 +629,7 @@ class BinaryMiddleware extends SerializerMiddleware {
 
 	/**
 	 * @param {SerializedType} data data
-	 * @param {Object} context context object
+	 * @param {object} context context object
 	 * @returns {DeserializedType|Promise<DeserializedType>} deserialized data
 	 */
 	deserialize(data, context) {
@@ -653,7 +653,7 @@ class BinaryMiddleware extends SerializerMiddleware {
 
 	/**
 	 * @param {SerializedType} data data
-	 * @param {Object} context context object
+	 * @param {object} context context object
 	 * @returns {DeserializedType} deserialized data
 	 */
 	_deserialize(data, context) {

package/lib/serialization/FileMiddleware.js

@@ -79,7 +79,7 @@ const readUInt64LE = Buffer.prototype.readBigUInt64LE
 		};
 
 /**
- * @typedef {Object} SerializeResult
+ * @typedef {object} SerializeResult
  * @property {string | false} name
  * @property {number} size
  * @property {Promise=} backgroundJob
@@ -427,7 +427,7 @@ class FileMiddleware extends SerializerMiddleware {
 	}
 	/**
 	 * @param {DeserializedType} data data
-	 * @param {Object} context context object
+	 * @param {object} context context object
 	 * @returns {SerializedType|Promise<SerializedType>} serialized data
 	 */
 	serialize(data, context) {
@@ -555,7 +555,7 @@ class FileMiddleware extends SerializerMiddleware {
 
 	/**
 	 * @param {SerializedType} data data
-	 * @param {Object} context context object
+	 * @param {object} context context object
 	 * @returns {DeserializedType|Promise<DeserializedType>} deserialized data
 	 */
 	deserialize(data, context) {
@@ -576,6 +576,7 @@ class FileMiddleware extends SerializerMiddleware {
 					/** @type {number | undefined} */
 					let currentBufferUsed;
 					const buf = [];
+					/** @type {import("zlib").Zlib & import("stream").Transform | undefined} */
 					let decompression;
 					if (file.endsWith(".gz")) {
 						decompression = createGunzip({

package/lib/serialization/NullPrototypeObjectSerializer.js

@@ -9,7 +9,7 @@
 
 class NullPrototypeObjectSerializer {
 	/**
-	 * @template {Object} T
+	 * @template {object} T
 	 * @param {T} obj null object
 	 * @param {ObjectSerializerContext} context context
 	 */
@@ -25,7 +25,7 @@ class NullPrototypeObjectSerializer {
 		}
 	}
 	/**
-	 * @template {Object} T
+	 * @template {object} T
 	 * @param {ObjectDeserializerContext} context context
 	 * @returns {T} null object
 	 */

package/lib/serialization/ObjectMiddleware.js

@@ -44,19 +44,21 @@ Technically any value can be used.
 */
 
 /**
- * @typedef {Object} ObjectSerializerContext
+ * @typedef {object} ObjectSerializerContext
  * @property {function(any): void} write
+ * @property {(function(any): void)=} writeLazy
+ * @property {(function(any, object=): (() => Promise<any> | any))=} writeSeparate
  * @property {function(any): void} setCircularReference
  */
 
 /**
- * @typedef {Object} ObjectDeserializerContext
+ * @typedef {object} ObjectDeserializerContext
  * @property {function(): any} read
  * @property {function(any): void} setCircularReference
  */
 
 /**
- * @typedef {Object} ObjectSerializer
+ * @typedef {object} ObjectSerializer
  * @property {function(any, ObjectSerializerContext): void} serialize
  * @property {function(ObjectDeserializerContext): any} deserialize
  */
@@ -136,6 +138,7 @@ jsTypes.set(TypeError, new ErrorObjectSerializer(TypeError));
 // real Object and Array types to. These types may occur in the wild too, e. g. when
 // using Structured Clone in postMessage.
 if (exports.constructor !== Object) {
+	// eslint-disable-next-line jsdoc/check-types
 	const Obj = /** @type {typeof Object} */ (exports.constructor);
 	const Fn = /** @type {typeof Function} */ (Obj.constructor);
 	for (const [type, config] of Array.from(jsTypes)) {
@@ -287,7 +290,7 @@ class ObjectMiddleware extends SerializerMiddleware {
 
 	/**
 	 * @param {DeserializedType} data data
-	 * @param {Object} context context object
+	 * @param {object} context context object
 	 * @returns {SerializedType|Promise<SerializedType>} serialized data
 	 */
 	serialize(data, context) {
@@ -591,7 +594,7 @@ class ObjectMiddleware extends SerializerMiddleware {
 
 	/**
 	 * @param {SerializedType} data data
-	 * @param {Object} context context object
+	 * @param {object} context context object
 	 * @returns {DeserializedType|Promise<DeserializedType>} deserialized data
 	 */
 	deserialize(data, context) {

package/lib/serialization/PlainObjectSerializer.js

@@ -45,7 +45,7 @@ const getCachedKeys = (keys, cacheAssoc) => {
 
 class PlainObjectSerializer {
 	/**
-	 * @param {Object} obj plain object
+	 * @param {object} obj plain object
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(obj, context) {
@@ -72,7 +72,7 @@ class PlainObjectSerializer {
 	}
 	/**
 	 * @param {ObjectDeserializerContext} context context
-	 * @returns {Object} plain object
+	 * @returns {object} plain object
 	 */
 	deserialize(context) {
 		const keys = context.read();

package/lib/serialization/Serializer.js

@@ -4,13 +4,27 @@
 
 "use strict";
 
+/**
+ * @template T, K
+ * @typedef {import("./SerializerMiddleware")<T, K>} SerializerMiddleware
+ */
+
 class Serializer {
+	/**
+	 * @param {SerializerMiddleware<any, any>[]} middlewares serializer middlewares
+	 * @param {TODO=} context context
+	 */
 	constructor(middlewares, context) {
 		this.serializeMiddlewares = middlewares.slice();
 		this.deserializeMiddlewares = middlewares.slice().reverse();
 		this.context = context;
 	}
 
+	/**
+	 * @param {any} obj object
+	 * @param {TODO} context content
+	 * @returns {Promise<any>} result
+	 */
 	serialize(obj, context) {
 		const ctx = { ...context, ...this.context };
 		let current = obj;
@@ -28,6 +42,11 @@ class Serializer {
 		return current;
 	}
 
+	/**
+	 * @param {any} value value
+	 * @param {TODO} context context
+	 * @returns {Promise<any>} result
+	 */
 	deserialize(value, context) {
 		const ctx = { ...context, ...this.context };
 		/** @type {any} */

package/lib/serialization/SerializerMiddleware.js

@@ -18,7 +18,7 @@ class SerializerMiddleware {
 	/**
 	 * @abstract
 	 * @param {DeserializedType} data data
-	 * @param {Object} context context object
+	 * @param {object} context context object
 	 * @returns {SerializedType|Promise<SerializedType>} serialized data
 	 */
 	serialize(data, context) {
@@ -30,7 +30,7 @@ class SerializerMiddleware {
 	/**
 	 * @abstract
 	 * @param {SerializedType} data data
-	 * @param {Object} context context object
+	 * @param {object} context context object
 	 * @returns {DeserializedType|Promise<DeserializedType>} deserialized data
 	 */
 	deserialize(data, context) {

package/lib/serialization/SingleItemMiddleware.js

@@ -14,7 +14,7 @@ const SerializerMiddleware = require("./SerializerMiddleware");
 class SingleItemMiddleware extends SerializerMiddleware {
 	/**
 	 * @param {DeserializedType} data data
-	 * @param {Object} context context object
+	 * @param {object} context context object
 	 * @returns {SerializedType|Promise<SerializedType>} serialized data
 	 */
 	serialize(data, context) {
@@ -23,7 +23,7 @@ class SingleItemMiddleware extends SerializerMiddleware {
 
 	/**
 	 * @param {SerializedType} data data
-	 * @param {Object} context context object
+	 * @param {object} context context object
 	 * @returns {DeserializedType|Promise<DeserializedType>} deserialized data
 	 */
 	deserialize(data, context) {

package/lib/serialization/types.js

@@ -4,7 +4,7 @@
 
 "use strict";
 
-/** @typedef {undefined|null|number|string|boolean|Buffer|Object|(() => ComplexSerializableType[] | Promise<ComplexSerializableType[]>)} ComplexSerializableType */
+/** @typedef {undefined | null | number | string | boolean | Buffer | object | (() => ComplexSerializableType[] | Promise<ComplexSerializableType[]>)} ComplexSerializableType */
 
 /** @typedef {undefined|null|number|bigint|string|boolean|Buffer|(() => PrimitiveSerializableType[] | Promise<PrimitiveSerializableType[]>)} PrimitiveSerializableType */
 

package/lib/sharing/ConsumeSharedModule.js

@@ -36,13 +36,13 @@ const ConsumeSharedFallbackDependency = require("./ConsumeSharedFallbackDependen
 /** @typedef {import("../util/semver").SemVerRange} SemVerRange */
 
 /**
- * @typedef {Object} ConsumeOptions
+ * @typedef {object} ConsumeOptions
  * @property {string=} import fallback request
  * @property {string=} importResolved resolved fallback request
  * @property {string} shareKey global share key
  * @property {string} shareScope share scope
  * @property {SemVerRange | false | undefined} requiredVersion version requirement
- * @property {string} packageName package name to determine required version automatically
+ * @property {string=} packageName package name to determine required version automatically
  * @property {boolean} strictVersion don't use shared version even if version isn't valid
  * @property {boolean} singleton use single global version
  * @property {boolean} eager include the fallback module in a sync way

package/lib/sharing/ConsumeSharedPlugin.js

@@ -117,7 +117,12 @@ class ConsumeSharedPlugin {
 					normalModuleFactory
 				);
 
-				let unresolvedConsumes, resolvedConsumes, prefixedConsumes;
+				/** @type {Map<string, ConsumeOptions>} */
+				let unresolvedConsumes;
+				/** @type {Map<string, ConsumeOptions>} */
+				let resolvedConsumes;
+				/** @type {Map<string, ConsumeOptions>} */
+				let prefixedConsumes;
 				const promise = resolveMatchedConfigs(compilation, this._consumes).then(
 					({ resolved, unresolved, prefixed }) => {
 						resolvedConsumes = resolved;
@@ -138,6 +143,9 @@ class ConsumeSharedPlugin {
 				 * @returns {Promise<ConsumeSharedModule>} create module
 				 */
 				const createConsumeSharedModule = (context, request, config) => {
+					/**
+					 * @param {string} details details
+					 */
 					const requiredVersionWarning = details => {
 						const error = new WebpackError(
 							`No required version specified and unable to automatically determine one. ${details}`
@@ -293,9 +301,15 @@ class ConsumeSharedPlugin {
 						) {
 							return Promise.resolve();
 						}
-						const options = resolvedConsumes.get(resource);
+						const options = resolvedConsumes.get(
+							/** @type {string} */ (resource)
+						);
 						if (options !== undefined) {
-							return createConsumeSharedModule(context, resource, options);
+							return createConsumeSharedModule(
+								context,
+								/** @type {string} */ (resource),
+								options
+							);
 						}
 						return Promise.resolve();
 					}

package/lib/sharing/ConsumeSharedRuntimeModule.js

@@ -17,14 +17,16 @@ const {
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../Chunk").ChunkId} ChunkId */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
 /** @typedef {import("./ConsumeSharedModule")} ConsumeSharedModule */
 
 class ConsumeSharedRuntimeModule extends RuntimeModule {
 	/**
-	 * @param {ReadonlySet<string>} runtimeRequirements runtime requirements
+	 * @param {ReadOnlyRuntimeRequirements} runtimeRequirements runtime requirements
 	 */
 	constructor(runtimeRequirements) {
 		super("consumes", RuntimeModule.STAGE_ATTACH);
@@ -38,6 +40,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 		const compilation = /** @type {Compilation} */ (this.compilation);
 		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
 		const { runtimeTemplate, codeGenerationResults } = compilation;
+		/** @type {Record<ChunkId, (string | number)[]>} */
 		const chunkToModuleMapping = {};
 		/** @type {Map<string | number, Source>} */
 		const moduleIdToSourceMapping = new Map();
@@ -70,7 +73,11 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 				"consume-shared"
 			);
 			if (!modules) continue;
-			addModules(modules, chunk, (chunkToModuleMapping[chunk.id] = []));
+			addModules(
+				modules,
+				chunk,
+				(chunkToModuleMapping[/** @type {ChunkId} */ (chunk.id)] = [])
+			);
 		}
 		for (const chunk of /** @type {Chunk} */ (
 			this.chunk

package/lib/sharing/ProvideSharedPlugin.js

@@ -15,6 +15,7 @@ const ProvideSharedModuleFactory = require("./ProvideSharedModuleFactory");
 /** @typedef {import("../../declarations/plugins/sharing/ProvideSharedPlugin").ProvideSharedPluginOptions} ProvideSharedPluginOptions */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../NormalModuleFactory").NormalModuleCreateData} NormalModuleCreateData */
 
 const validate = createSchemaValidation(
 	require("../../schemas/plugins/sharing/ProvideSharedPlugin.check.js"),
@@ -26,7 +27,7 @@ const validate = createSchemaValidation(
 );
 
 /**
- * @typedef {Object} ProvideOptions
+ * @typedef {object} ProvideOptions
  * @property {string} shareKey
  * @property {string} shareScope
  * @property {string | undefined | false} version
@@ -112,6 +113,12 @@ class ProvideSharedPlugin {
 					}
 				}
 				compilationData.set(compilation, resolvedProvideMap);
+				/**
+				 * @param {string} key key
+				 * @param {ProvideOptions} config config
+				 * @param {NormalModuleCreateData["resource"]} resource resource
+				 * @param {NormalModuleCreateData["resourceResolveData"]} resourceResolveData resource resolve data
+				 */
 				const provideSharedModule = (
 					key,
 					config,
@@ -151,7 +158,7 @@ class ProvideSharedPlugin {
 				normalModuleFactory.hooks.module.tap(
 					"ProvideSharedPlugin",
 					(module, { resource, resourceResolveData }, resolveData) => {
-						if (resolvedProvideMap.has(resource)) {
+						if (resolvedProvideMap.has(/** @type {string} */ (resource))) {
 							return module;
 						}
 						const { request } = resolveData;
@@ -161,7 +168,7 @@ class ProvideSharedPlugin {
 								provideSharedModule(
 									request,
 									config,
-									resource,
+									/** @type {string} */ (resource),
 									resourceResolveData
 								);
 								resolveData.cacheable = false;
@@ -171,12 +178,12 @@ class ProvideSharedPlugin {
 							if (request.startsWith(prefix)) {
 								const remainder = request.slice(prefix.length);
 								provideSharedModule(
-									resource,
+									/** @type {string} */ (resource),
 									{
 										...config,
 										shareKey: config.shareKey + remainder
 									},
-									resource,
+									/** @type {string} */ (resource),
 									resourceResolveData
 								);
 								resolveData.cacheable = false;
@@ -209,7 +216,7 @@ class ProvideSharedPlugin {
 								},
 								err => {
 									if (err) return reject(err);
-									resolve();
+									resolve(null);
 								}
 							);
 						})

package/lib/sharing/resolveMatchedConfigs.js

@@ -13,7 +13,7 @@ const LazySet = require("../util/LazySet");
 
 /**
  * @template T
- * @typedef {Object} MatchedConfigs
+ * @typedef {object} MatchedConfigs
  * @property {Map<string, T>} resolved
  * @property {Map<string, T>} unresolved
  * @property {Map<string, T>} prefixed
@@ -64,10 +64,10 @@ exports.resolveMatchedConfigs = (compilation, configs) => {
 										name: `shared module ${request}`
 									})
 								);
-								return resolve();
+								return resolve(null);
 							}
 							resolved.set(/** @type {string} */ (result), config);
-							resolve();
+							resolve(null);
 						}
 					);
 				});

package/lib/sharing/utils.js

@@ -8,6 +8,8 @@
 const { join, dirname, readJson } = require("../util/fs");
 
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
+/** @typedef {import("../util/fs").JsonObject} JsonObject */
+/** @typedef {import("../util/fs").JsonPrimitive} JsonPrimitive */
 
 // Extreme shorthand only for github. eg: foo/bar
 const RE_URL_GITHUB_EXTREME_SHORT = /^[^/@:.\s][^/@:\s]*\/[^@:\s]*[^/@:\s]#\S+/;
@@ -373,9 +375,9 @@ exports.getDescriptionFile = getDescriptionFile;
 
 /**
  *
- * @param {object} data description file data i.e.: package.json
+ * @param {JsonObject} data description file data i.e.: package.json
  * @param {string} packageName name of the dependency
- * @returns {string} normalized version
+ * @returns {string | undefined} normalized version
  */
 const getRequiredVersionFromDescriptionFile = (data, packageName) => {
 	const dependencyTypes = [
@@ -386,12 +388,17 @@ const getRequiredVersionFromDescriptionFile = (data, packageName) => {
 	];
 
 	for (const dependencyType of dependencyTypes) {
+		const dependency = /** @type {JsonObject} */ (data[dependencyType]);
 		if (
-			data[dependencyType] &&
-			typeof data[dependencyType] === "object" &&
-			packageName in data[dependencyType]
+			dependency &&
+			typeof dependency === "object" &&
+			packageName in dependency
 		) {
-			return normalizeVersion(data[dependencyType][packageName]);
+			return normalizeVersion(
+				/** @type {Exclude<JsonPrimitive, null | boolean| number>} */ (
+					dependency[packageName]
+				)
+			);
 		}
 	}
 };