webpack 5.98.0 → 5.99.1

package/lib/ProgressPlugin.js

@@ -479,8 +479,7 @@ class ProgressPlugin {
 			compilation.hooks.failedEntry.tap("ProgressPlugin", entryDone);
 			compilation.hooks.succeedEntry.tap("ProgressPlugin", entryDone);
 
-			// avoid dynamic require if bundled with webpack
-			// @ts-expect-error
+			// @ts-expect-error avoid dynamic require if bundled with webpack
 			if (typeof __webpack_require__ !== "function") {
 				const requiredLoaders = new Set();
 				NormalModule.getCompilationHooks(compilation).beforeLoaders.tap(

package/lib/RawModule.js

@@ -18,8 +18,10 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("./DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("./Generator").SourceTypes} SourceTypes */
+/** @typedef {import("./Module").BuildCallback} BuildCallback */
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
+/** @typedef {import("./Module").NeedBuildCallback} NeedBuildCallback */
 /** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
 /** @typedef {import("./Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
 /** @typedef {import("./RequestShortener")} RequestShortener */
@@ -80,7 +82,7 @@ class RawModule extends Module {
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {NeedBuildCallback} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {
@@ -92,7 +94,7 @@ class RawModule extends Module {
 	 * @param {Compilation} compilation the compilation
 	 * @param {ResolverWithOptions} resolver the resolver
 	 * @param {InputFileSystem} fs the file system
-	 * @param {function(WebpackError=): void} callback callback function
+	 * @param {BuildCallback} callback callback function
 	 * @returns {void}
 	 */
 	build(options, compilation, resolver, fs, callback) {

package/lib/RecordIdsPlugin.js

@@ -32,10 +32,14 @@ const identifierUtils = require("./util/identifier");
  * @property {RecordsModules=} modules
  */
 
+/**
+ * @typedef {object} RecordIdsPluginOptions
+ * @property {boolean=} portableIds true, when ids need to be portable
+ */
+
 class RecordIdsPlugin {
 	/**
-	 * @param {object} options Options object
-	 * @param {boolean=} options.portableIds true, when ids need to be portable
+	 * @param {RecordIdsPluginOptions} [options] object
 	 */
 	constructor(options) {
 		this.options = options || {};

package/lib/RequestShortener.js

@@ -7,10 +7,12 @@
 
 const { contextify } = require("./util/identifier");
 
+/** @typedef {import("./util/identifier").AssociatedObjectForCache} AssociatedObjectForCache */
+
 class RequestShortener {
 	/**
 	 * @param {string} dir the directory
-	 * @param {object=} associatedObjectForCache an object to which the cache will be attached
+	 * @param {AssociatedObjectForCache=} associatedObjectForCache an object to which the cache will be attached
 	 */
 	constructor(dir, associatedObjectForCache) {
 		this.contextify = contextify.bindContextCache(

package/lib/ResolverFactory.js

@@ -20,15 +20,16 @@ const {
 /** @typedef {import("../declarations/WebpackOptions").ResolveOptions} WebpackResolveOptions */
 /** @typedef {import("../declarations/WebpackOptions").ResolvePluginInstance} ResolvePluginInstance */
 
-/** @typedef {WebpackResolveOptions & {dependencyType?: string, resolveToContext?: boolean }} ResolveOptionsWithDependencyType */
+/** @typedef {WebpackResolveOptions & { dependencyType?: string, resolveToContext?: boolean }} ResolveOptionsWithDependencyType */
 /**
  * @typedef {object} WithOptions
- * @property {function(Partial<ResolveOptionsWithDependencyType>): ResolverWithOptions} withOptions create a resolver with additional/different options
+ * @property {(options: Partial<ResolveOptionsWithDependencyType>) => ResolverWithOptions} withOptions create a resolver with additional/different options
  */
 
 /** @typedef {Resolver & WithOptions} ResolverWithOptions */
 
 // need to be hoisted on module level for caching identity
+/** @type {ResolveOptionsWithDependencyType} */
 const EMPTY_RESOLVE_OPTIONS = {};
 
 /**
@@ -39,7 +40,7 @@ const convertToResolveOptions = resolveOptionsWithDepType => {
 	const { dependencyType, plugins, ...remaining } = resolveOptionsWithDepType;
 
 	// check type compat
-	/** @type {Partial<ResolveOptions>} */
+	/** @type {Partial<ResolveOptionsWithDependencyType>} */
 	const partialOptions = {
 		...remaining,
 		plugins:
@@ -56,20 +57,22 @@ const convertToResolveOptions = resolveOptionsWithDepType => {
 	}
 	// These weird types validate that we checked all non-optional properties
 	const options =
-		/** @type {Partial<ResolveOptions> & Pick<ResolveOptions, "fileSystem">} */ (
+		/** @type {Partial<ResolveOptionsWithDependencyType> & Pick<ResolveOptionsWithDependencyType, "fileSystem">} */ (
 			partialOptions
 		);
 
-	return removeOperations(
-		resolveByProperty(options, "byDependency", dependencyType),
-		// Keep the `unsafeCache` because it can be a `Proxy`
-		["unsafeCache"]
+	return /** @type {ResolveOptions} */ (
+		removeOperations(
+			resolveByProperty(options, "byDependency", dependencyType),
+			// Keep the `unsafeCache` because it can be a `Proxy`
+			["unsafeCache"]
+		)
 	);
 };
 
 /**
  * @typedef {object} ResolverCache
- * @property {WeakMap<object, ResolverWithOptions>} direct
+ * @property {WeakMap<ResolveOptionsWithDependencyType, ResolverWithOptions>} direct
  * @property {Map<string, ResolverWithOptions>} stringified
  */
 

package/lib/RuntimeModule.js

@@ -18,8 +18,10 @@ const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("./Generator").SourceTypes} SourceTypes */
+/** @typedef {import("./Module").BuildCallback} BuildCallback */
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
+/** @typedef {import("./Module").NeedBuildCallback} NeedBuildCallback */
 /** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
@@ -79,7 +81,7 @@ class RuntimeModule extends Module {
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {NeedBuildCallback} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {
@@ -91,7 +93,7 @@ class RuntimeModule extends Module {
 	 * @param {Compilation} compilation the compilation
 	 * @param {ResolverWithOptions} resolver the resolver
 	 * @param {InputFileSystem} fs the file system
-	 * @param {function(WebpackError=): void} callback callback function
+	 * @param {BuildCallback} callback callback function
 	 * @returns {void}
 	 */
 	build(options, compilation, resolver, fs, callback) {

package/lib/RuntimeTemplate.js

@@ -853,6 +853,7 @@ class RuntimeTemplate {
 	}
 
 	/**
+	 * @template GenerateContext
 	 * @param {object} options options
 	 * @param {ModuleGraph} options.moduleGraph the module graph
 	 * @param {Module} options.module the module
@@ -864,7 +865,7 @@ class RuntimeTemplate {
 	 * @param {boolean | null} options.callContext when false, call context will not be preserved
 	 * @param {boolean} options.defaultInterop when true and accessing the default exports, interop code will be generated
 	 * @param {string} options.importVar the identifier name of the import variable
-	 * @param {InitFragment<TODO>[]} options.initFragments init fragments will be added here
+	 * @param {InitFragment<GenerateContext>[]} options.initFragments init fragments will be added here
 	 * @param {RuntimeSpec} options.runtime runtime for which this code will be generated
 	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {string} expression

package/lib/SelfModuleFactory.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
+/** @typedef {import("./ModuleFactory").ModuleFactoryCallback} ModuleFactoryCallback */
 /** @typedef {import("./ModuleFactory").ModuleFactoryCreateData} ModuleFactoryCreateData */
-/** @typedef {import("./ModuleFactory").ModuleFactoryResult} ModuleFactoryResult */
 /** @typedef {import("./ModuleGraph")} ModuleGraph */
 
 class SelfModuleFactory {
@@ -19,7 +19,7 @@ class SelfModuleFactory {
 
 	/**
 	 * @param {ModuleFactoryCreateData} data data object
-	 * @param {function((Error | null)=, ModuleFactoryResult=): void} callback callback
+	 * @param {ModuleFactoryCallback} callback callback
 	 * @returns {void}
 	 */
 	create(data, callback) {

package/lib/SourceMapDevToolPlugin.js

@@ -146,16 +146,12 @@ class SourceMapDevToolPlugin {
 				? false
 				: // eslint-disable-next-line no-useless-concat
 					options.append || "\n//# source" + "MappingURL=[url]";
-		/** @type {string | Function} */
 		this.moduleFilenameTemplate =
 			options.moduleFilenameTemplate || "webpack://[namespace]/[resourcePath]";
-		/** @type {string | Function} */
 		this.fallbackModuleFilenameTemplate =
 			options.fallbackModuleFilenameTemplate ||
 			"webpack://[namespace]/[resourcePath]?[hash]";
-		/** @type {string} */
 		this.namespace = options.namespace || "";
-		/** @type {SourceMapDevToolPluginOptions} */
 		this.options = options;
 	}
 
@@ -196,10 +192,6 @@ class SourceMapDevToolPlugin {
 					const cache = compilation.getCache("SourceMapDevToolPlugin");
 					/** @type {Map<string | Module, string>} */
 					const moduleToSourceNameMapping = new Map();
-					/**
-					 * @type {Function}
-					 * @returns {void}
-					 */
 					const reportProgress =
 						ProgressPlugin.getReporter(compilation.compiler) || (() => {});
 

package/lib/Template.js

@@ -60,7 +60,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
 /**
  * @typedef {object} RenderManifestEntryTemplated
- * @property {function(): Source} render
+ * @property {() => Source} render
  * @property {TemplatePath} filenameTemplate
  * @property {PathData=} pathOptions
  * @property {AssetInfo=} info
@@ -71,7 +71,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
 /**
  * @typedef {object} RenderManifestEntryStatic
- * @property {function(): Source} render
+ * @property {() => Source} render
  * @property {string} filename
  * @property {AssetInfo} info
  * @property {string} identifier
@@ -85,12 +85,13 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  */
 
 /**
- * @typedef {function(Module, number): boolean} ModuleFilterPredicate
+ * @typedef {(module: Module) => boolean} ModuleFilterPredicate
  */
 
 class Template {
 	/**
-	 * @param {Function} fn a runtime function (.runtime.js) "template"
+	 * @template {EXPECTED_FUNCTION} T
+	 * @param {T} fn a runtime function (.runtime.js) "template"
 	 * @returns {string} the updated and normalized function string
 	 */
 	static getFunctionContent(fn) {
@@ -284,7 +285,7 @@ class Template {
 	/**
 	 * @param {ChunkRenderContext} renderContext render context
 	 * @param {Module[]} modules modules to render (should be ordered by identifier)
-	 * @param {function(Module): Source | null} renderModule function to render a module
+	 * @param {(module: Module) => Source | null} renderModule function to render a module
 	 * @param {string=} prefix applying prefix strings
 	 * @returns {Source | null} rendered chunk modules in a Source object or null if no modules
 	 */

package/lib/TemplatedPathPlugin.js

@@ -50,10 +50,10 @@ const prepareId = id => {
  * @param {((arg0: number) => string) | undefined} handler handler
  * @param {AssetInfo | undefined} assetInfo asset info
  * @param {string} hashName hash name
- * @returns {ReplacerFunction} hash replacer function
+ * @returns {Replacer} hash replacer function
  */
 const hashLength = (replacer, handler, assetInfo, hashName) => {
-	/** @type {ReplacerFunction} */
+	/** @type {Replacer} */
 	const fn = (match, arg, input) => {
 		let result;
 		const length = arg && Number.parseInt(arg, 10);
@@ -81,7 +81,7 @@ const hashLength = (replacer, handler, assetInfo, hashName) => {
 	return fn;
 };
 
-/** @typedef {(match: string, arg?: string, input?: string) => string} Replacer */
+/** @typedef {(match: string, arg: string | undefined, input: string) => string} Replacer */
 
 /**
  * @param {string | number | null | undefined | (() => string | number | null | undefined)} value value
@@ -113,10 +113,11 @@ const replacer = (value, allowEmpty) => {
 const deprecationCache = new Map();
 const deprecatedFunction = (() => () => {})();
 /**
- * @param {Function} fn function
+ * @template {(...args: EXPECTED_ANY[]) => EXPECTED_ANY} T
+ * @param {T} fn function
  * @param {string} message message
  * @param {string} code code
- * @returns {function(...any[]): void} function with deprecation output
+ * @returns {T} function with deprecation output
  */
 const deprecated = (fn, message, code) => {
 	let d = deprecationCache.get(message);
@@ -124,13 +125,15 @@ const deprecated = (fn, message, code) => {
 		d = util.deprecate(deprecatedFunction, message, code);
 		deprecationCache.set(message, d);
 	}
-	return (...args) => {
-		d();
-		return fn(...args);
-	};
+	return /** @type {T} */ (
+		(...args) => {
+			d();
+			return fn(...args);
+		}
+	);
 };
 
-/** @typedef {string | function(PathData, AssetInfo=): string} TemplatePath */
+/** @typedef {string | ((pathData: PathData, assetInfo?: AssetInfo) => string)} TemplatePath */
 
 /**
  * @param {TemplatePath} path the raw path
@@ -141,7 +144,7 @@ const deprecated = (fn, message, code) => {
 const replacePathVariables = (path, data, assetInfo) => {
 	const chunkGraph = data.chunkGraph;
 
-	/** @type {Map<string, Function>} */
+	/** @type {Map<string, Replacer>} */
 	const replacements = new Map();
 
 	// Filename context
@@ -366,7 +369,7 @@ const replacePathVariables = (path, data, assetInfo) => {
 			const [, kind, arg] = contentMatch;
 			const replacer = replacements.get(kind);
 			if (replacer !== undefined) {
-				return replacer(match, arg, path);
+				return replacer(match, arg, /** @type {string} */ (path));
 			}
 		} else if (match.startsWith("[\\") && match.endsWith("\\]")) {
 			return `[${match.slice(2, -2)}]`;

package/lib/WebpackOptionsApply.js

@@ -395,7 +395,7 @@ class WebpackOptionsApply extends OptionsApply {
 			new RequireJsStuffPlugin().apply(compiler);
 		}
 		new CommonJsPlugin().apply(compiler);
-		new LoaderPlugin({}).apply(compiler);
+		new LoaderPlugin().apply(compiler);
 		if (options.node !== false) {
 			const NodeStuffPlugin = require("./NodeStuffPlugin");
 			new NodeStuffPlugin(options.node).apply(compiler);