webpack 5.101.2 → 5.102.0

package/lib/SourceMapDevToolModuleOptionsPlugin.js

@@ -14,9 +14,9 @@ const PLUGIN_NAME = "SourceMapDevToolModuleOptionsPlugin";
 
 class SourceMapDevToolModuleOptionsPlugin {
 	/**
-	 * @param {SourceMapDevToolPluginOptions} options options
+	 * @param {SourceMapDevToolPluginOptions=} options options
 	 */
-	constructor(options) {
+	constructor(options = {}) {
 		this.options = options;
 	}
 

package/lib/SourceMapDevToolPlugin.js

@@ -19,9 +19,7 @@ const { makePathsAbsolute } = require("./util/identifier");
 
 /** @typedef {import("webpack-sources").MapOptions} MapOptions */
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
-/** @typedef {import("./Cache").Etag} Etag */
 /** @typedef {import("./CacheFacade").ItemCacheFacade} ItemCacheFacade */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./Compilation").Asset} Asset */
@@ -109,7 +107,7 @@ const getTaskForFile = (
 		source = asset.source();
 	}
 	if (!sourceMap || typeof source !== "string") return;
-	const context = /** @type {string} */ (compilation.options.context);
+	const context = compilation.options.context;
 	const root = compilation.compiler.root;
 	const cachedAbsolutify = makePathsAbsolute.bindContextCache(context, root);
 	const modules = sourceMap.sources.map((source) => {
@@ -162,9 +160,9 @@ class SourceMapDevToolPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const outputFs = /** @type {OutputFileSystem} */ (
-			compiler.outputFileSystem
-		);
+		const outputFs =
+			/** @type {OutputFileSystem} */
+			(compiler.outputFileSystem);
 		const sourceMapFilename = this.sourceMapFilename;
 		const sourceMappingURLComment = this.sourceMappingURLComment;
 		const moduleFilenameTemplate = this.moduleFilenameTemplate;
@@ -361,7 +359,7 @@ class SourceMapDevToolPlugin {
 
 							/**
 							 * all modules in defined order (longest identifier first)
-							 * @type {Array<string | Module>}
+							 * @type {(string | Module)[]}
 							 */
 							const allModules = [...moduleToSourceNameMapping.keys()].sort(
 								(a, b) => {
@@ -488,10 +486,7 @@ class SourceMapDevToolPlugin {
 											/** @type {string} */
 											(
 												usesContentHash &&
-													createHash(
-														/** @type {HashFunction} */
-														(compilation.outputOptions.hashFunction)
-													)
+													createHash(compilation.outputOptions.hashFunction)
 														.update(sourceMapString)
 														.digest("hex")
 											);

package/lib/Stats.js

@@ -7,7 +7,6 @@
 
 /** @typedef {import("../declarations/WebpackOptions").StatsOptions} StatsOptions */
 /** @typedef {import("./Compilation")} Compilation */
-/** @typedef {import("./Compilation").NormalizedStatsOptions} NormalizedStatsOptions */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
 
 class Stats {

package/lib/Template.js

@@ -10,7 +10,7 @@ const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").Output} OutputOptions */
+/** @typedef {import("./config/defaults").OutputNormalizedWithDefaults} OutputOptions */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
@@ -49,7 +49,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  * @property {string} fullHash
  * @property {OutputOptions} outputOptions
  * @property {CodeGenerationResults} codeGenerationResults
- * @property {{javascript: ModuleTemplate}} moduleTemplates
+ * @property {{ javascript: ModuleTemplate }} moduleTemplates
  * @property {DependencyTemplates} dependencyTemplates
  * @property {RuntimeTemplate} runtimeTemplate
  * @property {ModuleGraph} moduleGraph
@@ -79,11 +79,6 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  * @property {boolean=} auxiliary
  */
 
-/**
- * @typedef {object} HasId
- * @property {number | string} id
- */
-
 /**
  * @typedef {(module: Module) => boolean} ModuleFilterPredicate
  */
@@ -226,7 +221,7 @@ class Template {
 	}
 
 	/**
-	 * @param {string|string[]} s string to create prefix for
+	 * @param {string | string[]} s string to create prefix for
 	 * @param {string} prefix prefix to compose
 	 * @returns {string} returns new prefix string
 	 */
@@ -238,7 +233,7 @@ class Template {
 	}
 
 	/**
-	 * @param {string|string[]} str string or string collection
+	 * @param {string | string[]} str string or string collection
 	 * @returns {string} returns a single string from array
 	 */
 	static asString(str) {
@@ -295,7 +290,7 @@ class Template {
 		if (modules.length === 0) {
 			return null;
 		}
-		/** @type {{id: string|number, source: Source|string}[]} */
+		/** @type {{ id: ModuleId, source: Source | "false" }[]} */
 		const allModules = modules.map((module) => ({
 			id: /** @type {ModuleId} */ (chunkGraph.getModuleId(module)),
 			source: renderModule(module) || "false"
@@ -309,7 +304,7 @@ class Template {
 				source.add(`Array(${minId}).concat(`);
 			}
 			source.add("[\n");
-			/** @type {Map<string|number, {id: string|number, source: Source|string}>} */
+			/** @type {Map<ModuleId, { id: ModuleId, source: Source | "false" }>} */
 			const modules = new Map();
 			for (const module of allModules) {
 				modules.set(module.id, module);

package/lib/TemplatedPathPlugin.js

@@ -133,7 +133,8 @@ const deprecated = (fn, message, code) => {
 	);
 };
 
-/** @typedef {string | ((pathData: PathData, assetInfo?: AssetInfo) => string)} TemplatePath */
+/** @typedef {(pathData: PathData, assetInfo?: AssetInfo) => string} TemplatePathFn */
+/** @typedef {string | TemplatePathFn} TemplatePath */
 
 /**
  * @param {TemplatePath} path the raw path

package/lib/WatchIgnorePlugin.js

@@ -9,7 +9,6 @@ const { groupBy } = require("./util/ArrayHelpers");
 const createSchemaValidation = require("./util/create-schema-validation");
 
 /** @typedef {import("../declarations/plugins/WatchIgnorePlugin").WatchIgnorePluginOptions} WatchIgnorePluginOptions */
-/** @typedef {import("../declarations/WebpackOptions").WatchOptions} WatchOptions */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./util/fs").TimeInfoEntries} TimeInfoEntries */
 /** @typedef {import("./util/fs").WatchFileSystem} WatchFileSystem */
@@ -51,12 +50,12 @@ class IgnoringWatchFileSystem {
 			);
 
 		const [ignoredFiles, notIgnoredFiles] = groupBy(
-			/** @type {Array<string>} */
+			/** @type {string[]} */
 			(files),
 			ignored
 		);
 		const [ignoredDirs, notIgnoredDirs] = groupBy(
-			/** @type {Array<string>} */
+			/** @type {string[]} */
 			(dirs),
 			ignored
 		);

package/lib/Watching.js

@@ -10,20 +10,20 @@ const Stats = require("./Stats");
 /** @typedef {import("../declarations/WebpackOptions").WatchOptions} WatchOptions */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./FileSystemInfo").FileSystemInfoEntry} FileSystemInfoEntry */
+/** @typedef {import("./Compiler").ErrorCallback} ErrorCallback */
 /** @typedef {import("./WebpackError")} WebpackError */
 /** @typedef {import("./logging/Logger").Logger} Logger */
 /** @typedef {import("./util/fs").TimeInfoEntries} TimeInfoEntries */
 /** @typedef {import("./util/fs").WatchFileSystem} WatchFileSystem */
-/** @typedef {import("./util/fs").Watcher} Watcher */
 
 /**
  * @template T
- * @callback Callback
- * @param {Error | null} err
- * @param {T=} result
+ * @template [R=void]
+ * @typedef {import("./webpack").Callback<T, R>} Callback
  */
 
+/** @typedef {Set<string>} CollectedFiles */
+
 class Watching {
 	/**
 	 * @param {Compiler} compiler the compiler
@@ -34,9 +34,9 @@ class Watching {
 		this.startTime = null;
 		this.invalid = false;
 		this.handler = handler;
-		/** @type {Callback<void>[]} */
+		/** @type {ErrorCallback[]} */
 		this.callbacks = [];
-		/** @type {Callback<void>[] | undefined} */
+		/** @type {ErrorCallback[] | undefined} */
 		this._closeCallbacks = undefined;
 		this.closed = false;
 		this.suspended = false;
@@ -66,9 +66,9 @@ class Watching {
 		this._needRecords = true;
 		this.watcher = undefined;
 		this.pausedWatcher = undefined;
-		/** @type {Set<string> | undefined} */
+		/** @type {CollectedFiles | undefined} */
 		this._collectedChangedFiles = undefined;
-		/** @type {Set<string> | undefined} */
+		/** @type {CollectedFiles | undefined} */
 		this._collectedRemovedFiles = undefined;
 		this._done = this._done.bind(this);
 		process.nextTick(() => {
@@ -88,12 +88,12 @@ class Watching {
 		} else {
 			for (const file of changedFiles) {
 				this._collectedChangedFiles.add(file);
-				/** @type {Set<string>} */
+				/** @type {CollectedFiles} */
 				(this._collectedRemovedFiles).delete(file);
 			}
 			for (const file of /** @type {ReadonlySet<string>} */ (removedFiles)) {
 				this._collectedChangedFiles.delete(file);
-				/** @type {Set<string>} */
+				/** @type {CollectedFiles} */
 				(this._collectedRemovedFiles).add(file);
 			}
 		}
@@ -262,7 +262,7 @@ class Watching {
 
 		/**
 		 * @param {Error} err error
-		 * @param {Callback<void>[]=} cbs callbacks
+		 * @param {ErrorCallback[]=} cbs callbacks
 		 */
 		const handleError = (err, cbs) => {
 			this.compiler.hooks.failed.call(err);
@@ -393,7 +393,7 @@ class Watching {
 	}
 
 	/**
-	 * @param {Callback<void>=} callback signals when the build has completed again
+	 * @param {ErrorCallback=} callback signals when the build has completed again
 	 * @returns {void}
 	 */
 	invalidate(callback) {
@@ -451,7 +451,7 @@ class Watching {
 	}
 
 	/**
-	 * @param {Callback<void>} callback signals when the watcher is closed
+	 * @param {ErrorCallback} callback signals when the watcher is closed
 	 * @returns {void}
 	 */
 	close(callback) {
@@ -481,7 +481,7 @@ class Watching {
 			const shutdown = (err) => {
 				this.compiler.hooks.watchClose.call();
 				const closeCallbacks =
-					/** @type {Callback<void>[]} */
+					/** @type {ErrorCallback[]} */
 					(this._closeCallbacks);
 				this._closeCallbacks = undefined;
 				for (const cb of closeCallbacks) cb(err);

package/lib/WebpackIsIncludedPlugin.js

@@ -16,10 +16,8 @@ const {
 	toConstantDependency
 } = require("./javascript/JavascriptParserHelpers");
 
-/** @typedef {import("enhanced-resolve").Resolver} Resolver */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("./Module")} Module */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("./javascript/JavascriptParser").Range} Range */
 

package/lib/WebpackOptionsApply.js

@@ -73,9 +73,8 @@ const DefaultStatsPrinterPlugin = require("./stats/DefaultStatsPrinterPlugin");
 
 const { cleverMerge } = require("./util/cleverMerge");
 
-/** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
 /** @typedef {import("../declarations/WebpackOptions").WebpackPluginFunction} WebpackPluginFunction */
-/** @typedef {import("../declarations/WebpackOptions").WebpackPluginInstance} WebpackPluginInstance */
+/** @typedef {import("./config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./util/fs").IntermediateFileSystem} IntermediateFileSystem */
@@ -93,7 +92,7 @@ class WebpackOptionsApply extends OptionsApply {
 	 * @returns {WebpackOptions} options object
 	 */
 	process(options, compiler) {
-		compiler.outputPath = /** @type {string} */ (options.output.path);
+		compiler.outputPath = options.output.path;
 		compiler.recordsInputPath = options.recordsInputPath || null;
 		compiler.recordsOutputPath = options.recordsOutputPath || null;
 		compiler.name = options.name;
@@ -111,115 +110,92 @@ class WebpackOptionsApply extends OptionsApply {
 			const NodeTargetPlugin = require("./node/NodeTargetPlugin");
 
 			new NodeTargetPlugin().apply(compiler);
-		}
-		if (options.externalsPresets.electronMain) {
-			// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
-			const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
-
-			new ElectronTargetPlugin("main").apply(compiler);
-		}
-		if (options.externalsPresets.electronPreload) {
-			// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
-			const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
 
-			new ElectronTargetPlugin("preload").apply(compiler);
-		}
-		if (options.externalsPresets.electronRenderer) {
-			// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
-			const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
+			// Handle external CSS `@import` and `url()`
+			if (options.experiments.css) {
+				// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+				const ExternalsPlugin = require("./ExternalsPlugin");
 
-			new ElectronTargetPlugin("renderer").apply(compiler);
-		}
-		if (
-			options.externalsPresets.electron &&
-			!options.externalsPresets.electronMain &&
-			!options.externalsPresets.electronPreload &&
-			!options.externalsPresets.electronRenderer
-		) {
-			// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
-			const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
+				new ExternalsPlugin(
+					"module",
+					({ request, dependencyType, contextInfo }, callback) => {
+						if (
+							/\.css(\?|$)/.test(contextInfo.issuer) &&
+							/^(\/\/|https?:\/\/|#)/.test(request)
+						) {
+							if (dependencyType === "url") {
+								return callback(null, `asset ${request}`);
+							} else if (
+								dependencyType === "css-import" &&
+								options.experiments.css
+							) {
+								return callback(null, `css-import ${request}`);
+							}
+						}
 
-			new ElectronTargetPlugin().apply(compiler);
+						callback();
+					}
+				).apply(compiler);
+			}
 		}
-		if (options.externalsPresets.nwjs) {
-			// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
-			const ExternalsPlugin = require("./ExternalsPlugin");
+		if (options.externalsPresets.webAsync || options.externalsPresets.web) {
+			const type = options.externalsPresets.webAsync ? "import" : "module";
 
-			new ExternalsPlugin("node-commonjs", "nw.gui").apply(compiler);
-		}
-		if (options.externalsPresets.webAsync) {
 			// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 			const ExternalsPlugin = require("./ExternalsPlugin");
 
-			new ExternalsPlugin("import", ({ request, dependencyType }, callback) => {
-				if (dependencyType === "url") {
-					if (/^(\/\/|https?:\/\/|#)/.test(/** @type {string} */ (request))) {
+			new ExternalsPlugin(type, ({ request, dependencyType }, callback) => {
+				if (/^(\/\/|https?:\/\/|#|std:|jsr:|npm:)/.test(request)) {
+					if (dependencyType === "url") {
 						return callback(null, `asset ${request}`);
-					}
-				} else if (options.experiments.css && dependencyType === "css-import") {
-					if (/^(\/\/|https?:\/\/|#)/.test(/** @type {string} */ (request))) {
-						return callback(null, `css-import ${request}`);
-					}
-				} else if (
-					options.experiments.css &&
-					/^(\/\/|https?:\/\/|std:)/.test(/** @type {string} */ (request))
-				) {
-					if (/^\.css(\?|$)/.test(/** @type {string} */ (request))) {
-						return callback(null, `css-import ${request}`);
-					}
-					return callback(null, `import ${request}`);
-				}
-				callback();
-			}).apply(compiler);
-		} else if (options.externalsPresets.web) {
-			// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
-			const ExternalsPlugin = require("./ExternalsPlugin");
-
-			new ExternalsPlugin("module", ({ request, dependencyType }, callback) => {
-				if (dependencyType === "url") {
-					if (/^(\/\/|https?:\/\/|#)/.test(/** @type {string} */ (request))) {
-						return callback(null, `asset ${request}`);
-					}
-				} else if (options.experiments.css && dependencyType === "css-import") {
-					if (/^(\/\/|https?:\/\/|#)/.test(/** @type {string} */ (request))) {
-						return callback(null, `css-import ${request}`);
-					}
-				} else if (
-					/^(\/\/|https?:\/\/|std:)/.test(/** @type {string} */ (request))
-				) {
-					if (
-						options.experiments.css &&
-						/^\.css((\?)|$)/.test(/** @type {string} */ (request))
+					} else if (
+						dependencyType === "css-import" &&
+						options.experiments.css
 					) {
 						return callback(null, `css-import ${request}`);
+					} else if (/^(\/\/|https?:\/\/|std:|jsr:|npm:)/.test(request)) {
+						return callback(null, `${type} ${request}`);
 					}
-					return callback(null, `module ${request}`);
 				}
+
 				callback();
 			}).apply(compiler);
-		} else if (options.externalsPresets.node && options.experiments.css) {
+		}
+		if (options.externalsPresets.electron) {
+			if (options.externalsPresets.electronMain) {
+				// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+				const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
+
+				new ElectronTargetPlugin("main").apply(compiler);
+			}
+			if (options.externalsPresets.electronPreload) {
+				// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+				const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
+
+				new ElectronTargetPlugin("preload").apply(compiler);
+			}
+			if (options.externalsPresets.electronRenderer) {
+				// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+				const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
+
+				new ElectronTargetPlugin("renderer").apply(compiler);
+			}
+			if (
+				!options.externalsPresets.electronMain &&
+				!options.externalsPresets.electronPreload &&
+				!options.externalsPresets.electronRenderer
+			) {
+				// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+				const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
+
+				new ElectronTargetPlugin().apply(compiler);
+			}
+		}
+		if (options.externalsPresets.nwjs) {
 			// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 			const ExternalsPlugin = require("./ExternalsPlugin");
 
-			new ExternalsPlugin("module", ({ request, dependencyType }, callback) => {
-				if (dependencyType === "url") {
-					if (/^(\/\/|https?:\/\/|#)/.test(/** @type {string} */ (request))) {
-						return callback(null, `asset ${request}`);
-					}
-				} else if (dependencyType === "css-import") {
-					if (/^(\/\/|https?:\/\/|#)/.test(/** @type {string} */ (request))) {
-						return callback(null, `css-import ${request}`);
-					}
-				} else if (
-					/^(\/\/|https?:\/\/|std:)/.test(/** @type {string} */ (request))
-				) {
-					if (/^\.css(\?|$)/.test(/** @type {string} */ (request))) {
-						return callback(null, `css-import ${request}`);
-					}
-					return callback(null, `module ${request}`);
-				}
-				callback();
-			}).apply(compiler);
+			new ExternalsPlugin("node-commonjs", "nw.gui").apply(compiler);
 		}
 
 		new ChunkPrefetchPreloadPlugin().apply(compiler);
@@ -446,11 +422,7 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 
 		new EntryOptionPlugin().apply(compiler);
-		compiler.hooks.entryOption.call(
-			/** @type {string} */
-			(options.context),
-			options.entry
-		);
+		compiler.hooks.entryOption.call(options.context, options.entry);
 
 		new RuntimePlugin().apply(compiler);
 
@@ -461,7 +433,6 @@ class WebpackOptionsApply extends OptionsApply {
 
 		new CompatibilityPlugin().apply(compiler);
 		new HarmonyModulesPlugin({
-			topLevelAwait: options.experiments.topLevelAwait,
 			deferImport: options.experiments.deferImport
 		}).apply(compiler);
 		if (options.amd !== false) {
@@ -478,9 +449,7 @@ class WebpackOptionsApply extends OptionsApply {
 
 			new NodeStuffPlugin(options.node).apply(compiler);
 		}
-		new APIPlugin({
-			module: options.output.module
-		}).apply(compiler);
+		new APIPlugin().apply(compiler);
 		new ExportsInfoApiPlugin().apply(compiler);
 		new WebpackIsIncludedPlugin().apply(compiler);
 		new ConstPlugin().apply(compiler);
@@ -703,9 +672,7 @@ class WebpackOptionsApply extends OptionsApply {
 			}).apply(compiler);
 		}
 		if (options.optimization.minimize) {
-			for (const minimizer of /** @type {(WebpackPluginInstance | WebpackPluginFunction | "...")[]} */ (
-				options.optimization.minimizer
-			)) {
+			for (const minimizer of options.optimization.minimizer) {
 				if (typeof minimizer === "function") {
 					/** @type {WebpackPluginFunction} */
 					(minimizer).call(compiler, compiler);
@@ -810,7 +777,7 @@ class WebpackOptionsApply extends OptionsApply {
 									fs:
 										/** @type {IntermediateFileSystem} */
 										(compiler.intermediateFileSystem),
-									context: /** @type {string} */ (options.context),
+									context: options.context,
 									cacheLocation:
 										/** @type {string} */
 										(cacheOptions.cacheLocation),