webpack 5.91.0 → 5.92.0

package/lib/NormalModule.js

@@ -89,7 +89,7 @@ const memoize = require("./util/memoize");
 /** @typedef {UnsafeCacheData & { parser: undefined | Parser, parserOptions: undefined | ParserOptions, generator: undefined | Generator, generatorOptions: undefined | GeneratorOptions }} NormalModuleUnsafeCacheData */
 
 /**
- * @typedef {Object} SourceMap
+ * @typedef {object} SourceMap
  * @property {number} version
  * @property {string[]} sources
  * @property {string} mappings
@@ -107,7 +107,7 @@ const getValidate = memoize(() => require("schema-utils").validate);
 const ABSOLUTE_PATH_REGEX = /^([a-zA-Z]:\\|\\\\|\/)/;
 
 /**
- * @typedef {Object} LoaderItem
+ * @typedef {object} LoaderItem
  * @property {string} loader
  * @property {any} options
  * @property {string?} ident
@@ -117,7 +117,7 @@ const ABSOLUTE_PATH_REGEX = /^([a-zA-Z]:\\|\\\\|\/)/;
 /**
  * @param {string} context absolute context path
  * @param {string} source a source 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} new source path
  */
 const contextifySourceUrl = (context, source, associatedObjectForCache) => {
@@ -132,7 +132,7 @@ const contextifySourceUrl = (context, source, associatedObjectForCache) => {
 /**
  * @param {string} context absolute context path
  * @param {SourceMap} sourceMap a source map
- * @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 {SourceMap} new source map
  */
 const contextifySourceMap = (context, sourceMap, associatedObjectForCache) => {
@@ -199,7 +199,7 @@ makeSerializable(
 );
 
 /**
- * @typedef {Object} NormalModuleCompilationHooks
+ * @typedef {object} NormalModuleCompilationHooks
  * @property {SyncHook<[object, NormalModule]>} loader
  * @property {SyncHook<[LoaderItem[], NormalModule, object]>} beforeLoaders
  * @property {SyncHook<[NormalModule]>} beforeParse
@@ -210,7 +210,7 @@ makeSerializable(
  */
 
 /**
- * @typedef {Object} NormalModuleCreateData
+ * @typedef {object} NormalModuleCreateData
  * @property {string=} layer an optional layer in which the module is
  * @property {JavaScriptModuleTypes | ""} type module type. When deserializing, this is set to an empty string "".
  * @property {string} request request string
@@ -344,12 +344,12 @@ class NormalModule extends Module {
 		/**
 		 * @private
 		 * @type {Map<string, number> | undefined}
-		 **/
+		 */
 		this._sourceSizes = undefined;
 		/**
 		 * @private
 		 * @type {undefined | SourceTypes}
-		 **/
+		 */
 		this._sourceTypes = undefined;
 
 		// Cache
@@ -499,7 +499,7 @@ class NormalModule extends Module {
 	 * @param {string} name the asset name
 	 * @param {string | Buffer} content the content
 	 * @param {(string | SourceMap)=} sourceMap an optional source map
-	 * @param {Object=} associatedObjectForCache object for caching
+	 * @param {object=} associatedObjectForCache object for caching
 	 * @returns {Source} the created source
 	 */
 	createSourceForAsset(
@@ -776,7 +776,7 @@ class NormalModule extends Module {
 	 * @param {string} context the compilation context
 	 * @param {string | Buffer} content the content
 	 * @param {(string | SourceMapSource)=} sourceMap an optional source map
-	 * @param {Object=} associatedObjectForCache object for caching
+	 * @param {object=} associatedObjectForCache object for caching
 	 * @returns {Source} the created source
 	 */
 	createSource(context, content, sourceMap, associatedObjectForCache) {
@@ -1327,7 +1327,6 @@ class NormalModule extends Module {
 		moduleGraph,
 		chunkGraph,
 		runtime,
-		runtimes,
 		concatenationScope,
 		codeGenerationResults,
 		sourceTypes
@@ -1361,7 +1360,6 @@ class NormalModule extends Module {
 						chunkGraph,
 						runtimeRequirements,
 						runtime,
-						runtimes,
 						concatenationScope,
 						codeGenerationResults,
 						getData,

package/lib/NormalModuleFactory.js

@@ -56,7 +56,7 @@ const {
 /** @typedef {Partial<NormalModuleCreateData & {settings: ModuleSettings}>} CreateData */
 
 /**
- * @typedef {Object} ResolveData
+ * @typedef {object} ResolveData
  * @property {ModuleFactoryCreateData["contextInfo"]} contextInfo
  * @property {ModuleFactoryCreateData["resolveOptions"]} resolveOptions
  * @property {string} context
@@ -72,7 +72,7 @@ const {
  */
 
 /**
- * @typedef {Object} ResourceData
+ * @typedef {object} ResourceData
  * @property {string} resource
  * @property {string=} path
  * @property {string=} query
@@ -83,7 +83,7 @@ const {
 /** @typedef {ResourceData & { data: Record<string, any> }} ResourceDataWithData */
 
 /**
- * @typedef {Object} ParsedLoaderRequest
+ * @typedef {object} ParsedLoaderRequest
  * @property {string} loader loader
  * @property {string|undefined} options options
  */
@@ -227,7 +227,16 @@ const ruleSetCompiler = new RuleSetCompiler([
 	new BasicMatcherRulePlugin("issuer"),
 	new BasicMatcherRulePlugin("compiler"),
 	new BasicMatcherRulePlugin("issuerLayer"),
-	new ObjectMatcherRulePlugin("assert", "assertions"),
+	new ObjectMatcherRulePlugin(
+		"assert",
+		"assertions",
+		value => value && /** @type {any} */ (value)._isLegacyAssert !== undefined
+	),
+	new ObjectMatcherRulePlugin(
+		"with",
+		"assertions",
+		value => value && !(/** @type {any} */ (value)._isLegacyAssert)
+	),
 	new ObjectMatcherRulePlugin("descriptionData"),
 	new BasicEffectRulePlugin("type"),
 	new BasicEffectRulePlugin("sideEffects"),
@@ -240,12 +249,12 @@ const ruleSetCompiler = new RuleSetCompiler([
 
 class NormalModuleFactory extends ModuleFactory {
 	/**
-	 * @param {Object} param params
+	 * @param {object} param params
 	 * @param {string=} param.context context
 	 * @param {InputFileSystem} param.fs file system
 	 * @param {ResolverFactory} param.resolverFactory resolverFactory
 	 * @param {ModuleOptions} param.options options
-	 * @param {Object=} param.associatedObjectForCache an object to which the cache will be attached
+	 * @param {object=} param.associatedObjectForCache an object to which the cache will be attached
 	 * @param {boolean=} param.layers enable layers
 	 */
 	constructor({
@@ -308,9 +317,9 @@ class NormalModuleFactory extends ModuleFactory {
 		this.fs = fs;
 		this._globalParserOptions = options.parser;
 		this._globalGeneratorOptions = options.generator;
-		/** @type {Map<string, WeakMap<Object, Parser>>} */
+		/** @type {Map<string, WeakMap<object, Parser>>} */
 		this.parserCache = new Map();
-		/** @type {Map<string, WeakMap<Object, Generator>>} */
+		/** @type {Map<string, WeakMap<object, Generator>>} */
 		this.generatorCache = new Map();
 		/** @type {Set<Module>} */
 		this._restoredUnsafeCacheEntries = new Set();

package/lib/Parser.js

@@ -11,7 +11,7 @@
 /** @typedef {Record<string, any>} PreparsedAst */
 
 /**
- * @typedef {Object} ParserStateBase
+ * @typedef {object} ParserStateBase
  * @property {string | Buffer} source
  * @property {NormalModule} current
  * @property {NormalModule} module

package/lib/PlatformPlugin.js

@@ -0,0 +1,39 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Authors Ivan Kopeykin @vankop
+*/
+
+"use strict";
+
+/** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./config/target").PlatformTargetProperties} PlatformTargetProperties */
+
+/**
+ * Should be used only for "target === false" or
+ * when you want to overwrite platform target properties
+ */
+class PlatformPlugin {
+	/**
+	 * @param {Partial<PlatformTargetProperties>} platform target properties
+	 */
+	constructor(platform) {
+		/** @type {Partial<PlatformTargetProperties>} */
+		this.platform = platform;
+	}
+
+	/**
+	 * Apply the plugin
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		compiler.hooks.environment.tap("PlatformPlugin", () => {
+			compiler.platform = {
+				...compiler.platform,
+				...this.platform
+			};
+		});
+	}
+}
+
+module.exports = PlatformPlugin;

package/lib/ProgressPlugin.js

@@ -21,7 +21,7 @@ const { contextify } = require("./util/identifier");
 /** @typedef {import("./logging/Logger").Logger} Logger */
 
 /**
- * @typedef {Object} CountsData
+ * @typedef {object} CountsData
  * @property {number} modulesCount modules count
  * @property {number} dependenciesCount dependencies count
  */

package/lib/RecordIdsPlugin.js

@@ -13,28 +13,28 @@ const identifierUtils = require("./util/identifier");
 /** @typedef {import("./Module")} Module */
 
 /**
- * @typedef {Object} RecordsChunks
+ * @typedef {object} RecordsChunks
  * @property {Record<string, number>=} byName
  * @property {Record<string, number>=} bySource
  * @property {number[]=} usedIds
  */
 
 /**
- * @typedef {Object} RecordsModules
+ * @typedef {object} RecordsModules
  * @property {Record<string, number>=} byIdentifier
  * @property {Record<string, number>=} bySource
  * @property {number[]=} usedIds
  */
 
 /**
- * @typedef {Object} Records
+ * @typedef {object} Records
  * @property {RecordsChunks=} chunks
  * @property {RecordsModules=} modules
  */
 
 class RecordIdsPlugin {
 	/**
-	 * @param {Object} options Options object
+	 * @param {object} options Options object
 	 * @param {boolean=} options.portableIds true, when ids need to be portable
 	 */
 	constructor(options) {

package/lib/ResolverFactory.js

@@ -22,7 +22,7 @@ const {
 
 /** @typedef {WebpackResolveOptions & {dependencyType?: string, resolveToContext?: boolean }} ResolveOptionsWithDependencyType */
 /**
- * @typedef {Object} WithOptions
+ * @typedef {object} WithOptions
  * @property {function(Partial<ResolveOptionsWithDependencyType>): ResolverWithOptions} withOptions create a resolver with additional/different options
  */
 
@@ -68,8 +68,8 @@ const convertToResolveOptions = resolveOptionsWithDepType => {
 };
 
 /**
- * @typedef {Object} ResolverCache
- * @property {WeakMap<Object, ResolverWithOptions>} direct
+ * @typedef {object} ResolverCache
+ * @property {WeakMap<object, ResolverWithOptions>} direct
  * @property {Map<string, ResolverWithOptions>} stringified
  */
 

package/lib/RuntimeTemplate.js

@@ -151,6 +151,11 @@ class RuntimeTemplate {
 			.templateLiteral;
 	}
 
+	supportNodePrefixForCoreModules() {
+		return /** @type {Environment} */ (this.outputOptions.environment)
+			.nodePrefixForCoreModules;
+	}
+
 	/**
 	 * @param {string} returnValue return value
 	 * @param {string} args arguments
@@ -389,7 +394,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {Module} options.module the module
 	 * @param {string=} options.request the request that should be printed as comment
@@ -426,7 +431,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {Module} options.module the module
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {string=} options.request the request that should be printed as comment
@@ -455,7 +460,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {Module | null} options.module the module
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {string=} options.request the request that should be printed as comment
@@ -498,7 +503,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {Module | null} options.module the module
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {string} options.request the request that should be printed as comment
@@ -517,7 +522,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {Module} options.module the module
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {string} options.request the request that should be printed as comment
@@ -586,7 +591,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {AsyncDependenciesBlock=} options.block the current dependencies block
 	 * @param {Module} options.module the module
@@ -736,7 +741,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {RuntimeSpec=} options.runtime runtime for which this code will be generated
 	 * @param {RuntimeSpec | boolean=} options.runtimeCondition only execute the statement in some runtimes
@@ -774,7 +779,7 @@ class RuntimeTemplate {
 
 	/**
 	 *
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {boolean=} options.update whether a new variable should be created or the existing one updated
 	 * @param {Module} options.module the module
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
@@ -851,7 +856,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options
+	 * @param {object} options options
 	 * @param {ModuleGraph} options.moduleGraph the module graph
 	 * @param {Module} options.module the module
 	 * @param {string} options.request the request
@@ -974,7 +979,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options
+	 * @param {object} options options
 	 * @param {AsyncDependenciesBlock | undefined} options.block the async block
 	 * @param {string} options.message the message
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
@@ -1041,7 +1046,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options
+	 * @param {object} options options
 	 * @param {AsyncDependenciesBlock} options.block the async block
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
@@ -1073,7 +1078,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options
+	 * @param {object} options options
 	 * @param {Dependency} options.dependency the dependency
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
@@ -1094,7 +1099,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options
+	 * @param {object} options options
 	 * @param {string} options.exportsArgument the name of the exports object
 	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {string} statement
@@ -1106,14 +1111,13 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {Module} options.module the module
-	 * @param {string} options.publicPath the public path
 	 * @param {RuntimeSpec=} options.runtime runtime
 	 * @param {CodeGenerationResults} options.codeGenerationResults the code generation results
 	 * @returns {string} the url of the asset
 	 */
-	assetUrl({ publicPath, runtime, module, codeGenerationResults }) {
+	assetUrl({ runtime, module, codeGenerationResults }) {
 		if (!module) {
 			return "data:,";
 		}
@@ -1123,8 +1127,8 @@ class RuntimeTemplate {
 		);
 		const url = data.get("url");
 		if (url) return url.toString();
-		const filename = data.get("filename");
-		return publicPath + filename;
+		const assetPath = data.get("assetPathForCss");
+		return assetPath;
 	}
 }
 

package/lib/Stats.js

@@ -35,7 +35,7 @@ class Stats {
 	 */
 	hasWarnings() {
 		return (
-			this.compilation.warnings.length > 0 ||
+			this.compilation.getWarnings().length > 0 ||
 			this.compilation.children.some(child => child.getStats().hasWarnings())
 		);
 	}

package/lib/Template.js

@@ -41,7 +41,7 @@ const PATH_NAME_NORMALIZE_REPLACE_REGEX = /[^a-zA-Z0-9_!§$()=\-^°]+/g;
 const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
 /**
- * @typedef {Object} RenderManifestOptions
+ * @typedef {object} RenderManifestOptions
  * @property {Chunk} chunk the chunk used to render
  * @property {string} hash
  * @property {string} fullHash
@@ -57,7 +57,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 /** @typedef {RenderManifestEntryTemplated | RenderManifestEntryStatic} RenderManifestEntry */
 
 /**
- * @typedef {Object} RenderManifestEntryTemplated
+ * @typedef {object} RenderManifestEntryTemplated
  * @property {function(): Source} render
  * @property {string | function(PathData, AssetInfo=): string} filenameTemplate
  * @property {PathData=} pathOptions
@@ -68,7 +68,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  */
 
 /**
- * @typedef {Object} RenderManifestEntryStatic
+ * @typedef {object} RenderManifestEntryStatic
  * @property {function(): Source} render
  * @property {string} filename
  * @property {AssetInfo} info
@@ -78,7 +78,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  */
 
 /**
- * @typedef {Object} HasId
+ * @typedef {object} HasId
  * @property {number | string} id
  */
 
@@ -252,7 +252,7 @@ class Template {
 	}
 
 	/**
-	 * @typedef {Object} WithId
+	 * @typedef {object} WithId
 	 * @property {string|number} id
 	 */
 

package/lib/TemplatedPathPlugin.js

@@ -37,7 +37,22 @@ const prepareId = id => {
 	return id.replace(/(^[.-]|[^a-zA-Z0-9_-])+/g, "_");
 };
 
+/**
+ * @callback ReplacerFunction
+ * @param {string} match
+ * @param {string | undefined} arg
+ * @param {string} input
+ */
+
+/**
+ * @param {ReplacerFunction} replacer replacer
+ * @param {((arg0: number) => string) | undefined} handler handler
+ * @param {AssetInfo | undefined} assetInfo asset info
+ * @param {string} hashName hash name
+ * @returns {ReplacerFunction} hash replacer function
+ */
 const hashLength = (replacer, handler, assetInfo, hashName) => {
+	/** @type {ReplacerFunction} */
 	const fn = (match, arg, input) => {
 		let result;
 		const length = arg && parseInt(arg, 10);
@@ -117,7 +132,7 @@ const deprecated = (fn, message, code) => {
 /**
  * @param {string | function(PathData, AssetInfo=): string} path the raw path
  * @param {PathData} data context data
- * @param {AssetInfo} assetInfo extra info about the asset (will be written to)
+ * @param {AssetInfo | undefined} assetInfo extra info about the asset (will be written to)
  * @returns {string} the interpolated path
  */
 const replacePathVariables = (path, data, assetInfo) => {

package/lib/asset/AssetGenerator.js

@@ -12,6 +12,7 @@ const ConcatenationScope = require("../ConcatenationScope");
 const Generator = require("../Generator");
 const { ASSET_MODULE_TYPE } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
+const CssUrlDependency = require("../dependencies/CssUrlDependency");
 const createHash = require("../util/createHash");
 const { makePathsRelative } = require("../util/identifier");
 const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
@@ -321,6 +322,7 @@ class AssetGenerator extends Generator {
 							}
 						);
 					let assetPath;
+					let assetPathForCss;
 					if (this.publicPath !== undefined) {
 						const { path, info } =
 							runtimeTemplate.compilation.getAssetPathWithInfo(
@@ -335,12 +337,24 @@ class AssetGenerator extends Generator {
 							);
 						assetInfo = mergeAssetInfo(assetInfo, info);
 						assetPath = JSON.stringify(path + filename);
+						assetPathForCss = path + filename;
 					} else {
 						runtimeRequirements.add(RuntimeGlobals.publicPath); // add __webpack_require__.p
 						assetPath = runtimeTemplate.concatenation(
 							{ expr: RuntimeGlobals.publicPath },
 							filename
 						);
+						const compilation = runtimeTemplate.compilation;
+						const path =
+							compilation.outputOptions.publicPath === "auto"
+								? CssUrlDependency.PUBLIC_PATH_AUTO
+								: compilation.getAssetPath(
+										compilation.outputOptions.publicPath,
+										{
+											hash: compilation.hash
+										}
+									);
+						assetPathForCss = path + filename;
 					}
 					assetInfo = {
 						sourceFilename,
@@ -371,6 +385,7 @@ class AssetGenerator extends Generator {
 						data.set("fullContentHash", fullHash);
 						data.set("filename", filename);
 						data.set("assetInfo", assetInfo);
+						data.set("assetPathForCss", assetPathForCss);
 					}
 					content = assetPath;
 				}

package/lib/buildChunkGraph.js

@@ -25,7 +25,7 @@ const { getEntryRuntime, mergeRuntime } = require("./util/runtime");
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
 /**
- * @typedef {Object} QueueItem
+ * @typedef {object} QueueItem
  * @property {number} action
  * @property {DependenciesBlock} block
  * @property {Module} module
@@ -35,7 +35,7 @@ const { getEntryRuntime, mergeRuntime } = require("./util/runtime");
  */
 
 /**
- * @typedef {Object} ChunkGroupInfo
+ * @typedef {object} ChunkGroupInfo
  * @property {ChunkGroup} chunkGroup the chunk group
  * @property {RuntimeSpec} runtime the runtimes
  * @property {bigint | undefined} minAvailableModules current minimal set of modules available at this point
@@ -53,7 +53,7 @@ const { getEntryRuntime, mergeRuntime } = require("./util/runtime");
  */
 
 /**
- * @typedef {Object} BlockChunkGroupConnection
+ * @typedef {object} BlockChunkGroupConnection
  * @property {ChunkGroupInfo} originChunkGroupInfo origin chunk group
  * @property {ChunkGroup} chunkGroup referenced chunk group
  */

package/lib/cache/MemoryWithGcCachePlugin.js

@@ -14,7 +14,7 @@ const Cache = require("../Cache");
 
 class MemoryWithGcCachePlugin {
 	/**
-	 * @param {Object} options Options
+	 * @param {object} options Options
 	 * @param {number} options.maxGenerations max generations
 	 */
 	constructor({ maxGenerations }) {

package/lib/cache/PackFileCacheStrategy.js

@@ -34,7 +34,7 @@ const {
 
 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 {BuildDependencies} buildDependencies list of all unresolved build dependencies captured
@@ -1027,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

package/lib/cache/ResolverCachePlugin.js

@@ -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) => {