webpack 5.95.0 → 5.96.1

package/lib/WebpackOptionsApply.js

@@ -56,6 +56,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("./Compiler")} Compiler */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./util/fs").IntermediateFileSystem} IntermediateFileSystem */
@@ -123,16 +125,16 @@ class WebpackOptionsApply extends OptionsApply {
 			const ExternalsPlugin = require("./ExternalsPlugin");
 			new ExternalsPlugin("import", ({ request, dependencyType }, callback) => {
 				if (dependencyType === "url") {
-					if (/^(\/\/|https?:\/\/|#)/.test(request))
+					if (/^(\/\/|https?:\/\/|#)/.test(/** @type {string} */ (request)))
 						return callback(null, `asset ${request}`);
 				} else if (options.experiments.css && dependencyType === "css-import") {
-					if (/^(\/\/|https?:\/\/|#)/.test(request))
+					if (/^(\/\/|https?:\/\/|#)/.test(/** @type {string} */ (request)))
 						return callback(null, `css-import ${request}`);
 				} else if (
 					options.experiments.css &&
-					/^(\/\/|https?:\/\/|std:)/.test(request)
+					/^(\/\/|https?:\/\/|std:)/.test(/** @type {string} */ (request))
 				) {
-					if (/^\.css(\?|$)/.test(request))
+					if (/^\.css(\?|$)/.test(/** @type {string} */ (request)))
 						return callback(null, `css-import ${request}`);
 					return callback(null, `import ${request}`);
 				}
@@ -143,13 +145,18 @@ class WebpackOptionsApply extends OptionsApply {
 			const ExternalsPlugin = require("./ExternalsPlugin");
 			new ExternalsPlugin("module", ({ request, dependencyType }, callback) => {
 				if (dependencyType === "url") {
-					if (/^(\/\/|https?:\/\/|#)/.test(request))
+					if (/^(\/\/|https?:\/\/|#)/.test(/** @type {string} */ (request)))
 						return callback(null, `asset ${request}`);
 				} else if (options.experiments.css && dependencyType === "css-import") {
-					if (/^(\/\/|https?:\/\/|#)/.test(request))
+					if (/^(\/\/|https?:\/\/|#)/.test(/** @type {string} */ (request)))
 						return callback(null, `css-import ${request}`);
-				} else if (/^(\/\/|https?:\/\/|std:)/.test(request)) {
-					if (options.experiments.css && /^\.css((\?)|$)/.test(request))
+				} else if (
+					/^(\/\/|https?:\/\/|std:)/.test(/** @type {string} */ (request))
+				) {
+					if (
+						options.experiments.css &&
+						/^\.css((\?)|$)/.test(/** @type {string} */ (request))
+					)
 						return callback(null, `css-import ${request}`);
 					return callback(null, `module ${request}`);
 				}
@@ -160,13 +167,15 @@ class WebpackOptionsApply extends OptionsApply {
 			const ExternalsPlugin = require("./ExternalsPlugin");
 			new ExternalsPlugin("module", ({ request, dependencyType }, callback) => {
 				if (dependencyType === "url") {
-					if (/^(\/\/|https?:\/\/|#)/.test(request))
+					if (/^(\/\/|https?:\/\/|#)/.test(/** @type {string} */ (request)))
 						return callback(null, `asset ${request}`);
 				} else if (dependencyType === "css-import") {
-					if (/^(\/\/|https?:\/\/|#)/.test(request))
+					if (/^(\/\/|https?:\/\/|#)/.test(/** @type {string} */ (request)))
 						return callback(null, `css-import ${request}`);
-				} else if (/^(\/\/|https?:\/\/|std:)/.test(request)) {
-					if (/^\.css(\?|$)/.test(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}`);
 				}
@@ -488,8 +497,12 @@ class WebpackOptionsApply extends OptionsApply {
 		if (options.optimization.realContentHash) {
 			const RealContentHashPlugin = require("./optimize/RealContentHashPlugin");
 			new RealContentHashPlugin({
-				hashFunction: options.output.hashFunction,
-				hashDigest: options.output.hashDigest
+				hashFunction:
+					/** @type {NonNullable<WebpackOptions["output"]["hashFunction"]>} */
+					(options.output.hashFunction),
+				hashDigest:
+					/** @type {NonNullable<WebpackOptions["output"]["hashDigest"]>} */
+					(options.output.hashDigest)
 			}).apply(compiler);
 		}
 		if (options.optimization.checkWasmTypes) {
@@ -587,9 +600,12 @@ class WebpackOptionsApply extends OptionsApply {
 			}).apply(compiler);
 		}
 		if (options.optimization.minimize) {
-			for (const minimizer of options.optimization.minimizer) {
+			for (const minimizer of /** @type {(WebpackPluginInstance | WebpackPluginFunction | "...")[]} */ (
+				options.optimization.minimizer
+			)) {
 				if (typeof minimizer === "function") {
-					minimizer.call(compiler, compiler);
+					/** @type {WebpackPluginFunction} */
+					(minimizer).call(compiler, compiler);
 				} else if (minimizer !== "..." && minimizer) {
 					minimizer.apply(compiler);
 				}
@@ -661,7 +677,9 @@ class WebpackOptionsApply extends OptionsApply {
 						// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 						const MemoryWithGcCachePlugin = require("./cache/MemoryWithGcCachePlugin");
 						new MemoryWithGcCachePlugin({
-							maxGenerations: cacheOptions.maxMemoryGenerations
+							maxGenerations:
+								/** @type {number} */
+								(cacheOptions.maxMemoryGenerations)
 						}).apply(compiler);
 					}
 					if (cacheOptions.memoryCacheUnaffected) {
@@ -686,7 +704,7 @@ class WebpackOptionsApply extends OptionsApply {
 									cacheLocation:
 										/** @type {string} */
 										(cacheOptions.cacheLocation),
-									version: cacheOptions.version,
+									version: /** @type {string} */ (cacheOptions.version),
 									logger: compiler.getInfrastructureLogger(
 										"webpack.cache.PackFileCacheStrategy"
 									),
@@ -697,9 +715,12 @@ class WebpackOptionsApply extends OptionsApply {
 									compression: cacheOptions.compression,
 									readonly: cacheOptions.readonly
 								}),
-								cacheOptions.idleTimeout,
-								cacheOptions.idleTimeoutForInitialStore,
-								cacheOptions.idleTimeoutAfterLargeChanges
+								/** @type {number} */
+								(cacheOptions.idleTimeout),
+								/** @type {number} */
+								(cacheOptions.idleTimeoutForInitialStore),
+								/** @type {number} */
+								(cacheOptions.idleTimeoutAfterLargeChanges)
 							).apply(compiler);
 							break;
 						}