webpack 5.94.0 → 5.96.0

package/lib/RuntimePlugin.js

@@ -34,6 +34,7 @@ const RuntimeIdRuntimeModule = require("./runtime/RuntimeIdRuntimeModule");
 const SystemContextRuntimeModule = require("./runtime/SystemContextRuntimeModule");
 const ShareRuntimeModule = require("./sharing/ShareRuntimeModule");
 const StringXor = require("./util/StringXor");
+const memoize = require("./util/memoize");
 
 /** @typedef {import("../declarations/WebpackOptions").LibraryOptions} LibraryOptions */
 /** @typedef {import("../declarations/WebpackOptions").OutputNormalized} OutputNormalized */
@@ -42,6 +43,11 @@ const StringXor = require("./util/StringXor");
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
 
+const getJavascriptModulesPlugin = memoize(() =>
+	require("./javascript/JavascriptModulesPlugin")
+);
+const getCssModulesPlugin = memoize(() => require("./css/CssModulesPlugin"));
+
 const GLOBALS_ON_REQUIRE = [
 	RuntimeGlobals.chunkName,
 	RuntimeGlobals.runtimeId,
@@ -261,7 +267,7 @@ class RuntimePlugin {
 				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.getChunkScriptFilename)
-				.tap("RuntimePlugin", (chunk, set) => {
+				.tap("RuntimePlugin", (chunk, set, { chunkGraph }) => {
 					if (
 						typeof compilation.outputOptions.chunkFilename === "string" &&
 						/\[(full)?hash(:\d+)?\]/.test(
@@ -277,8 +283,8 @@ class RuntimePlugin {
 							"javascript",
 							RuntimeGlobals.getChunkScriptFilename,
 							chunk =>
-								/** @type {TemplatePath} */
-								(
+								getJavascriptModulesPlugin().chunkHasJs(chunk, chunkGraph) &&
+								/** @type {TemplatePath} */ (
 									chunk.filenameTemplate ||
 										(chunk.canBeInitial()
 											? compilation.outputOptions.filename
@@ -291,7 +297,7 @@ class RuntimePlugin {
 				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.getChunkCssFilename)
-				.tap("RuntimePlugin", (chunk, set) => {
+				.tap("RuntimePlugin", (chunk, set, { chunkGraph }) => {
 					if (
 						typeof compilation.outputOptions.cssChunkFilename === "string" &&
 						/\[(full)?hash(:\d+)?\]/.test(
@@ -307,6 +313,7 @@ class RuntimePlugin {
 							"css",
 							RuntimeGlobals.getChunkCssFilename,
 							chunk =>
+								getCssModulesPlugin().chunkHasCss(chunk, chunkGraph) &&
 								getChunkFilenameTemplate(chunk, compilation.outputOptions),
 							set.has(RuntimeGlobals.hmrDownloadUpdateHandlers)
 						)

package/lib/RuntimeTemplate.js

@@ -86,7 +86,7 @@ class RuntimeTemplate {
 	 */
 	constructor(compilation, outputOptions, requestShortener) {
 		this.compilation = compilation;
-		this.outputOptions = outputOptions || {};
+		this.outputOptions = /** @type {OutputOptions} */ (outputOptions || {});
 		this.requestShortener = requestShortener;
 		this.globalObject =
 			/** @type {string} */
@@ -106,55 +106,47 @@ class RuntimeTemplate {
 	}
 
 	supportsConst() {
-		return /** @type {Environment} */ (this.outputOptions.environment).const;
+		return this.outputOptions.environment.const;
 	}
 
 	supportsArrowFunction() {
-		return /** @type {Environment} */ (this.outputOptions.environment)
-			.arrowFunction;
+		return this.outputOptions.environment.arrowFunction;
 	}
 
 	supportsAsyncFunction() {
-		return /** @type {Environment} */ (this.outputOptions.environment)
-			.asyncFunction;
+		return this.outputOptions.environment.asyncFunction;
 	}
 
 	supportsOptionalChaining() {
-		return /** @type {Environment} */ (this.outputOptions.environment)
-			.optionalChaining;
+		return this.outputOptions.environment.optionalChaining;
 	}
 
 	supportsForOf() {
-		return /** @type {Environment} */ (this.outputOptions.environment).forOf;
+		return this.outputOptions.environment.forOf;
 	}
 
 	supportsDestructuring() {
-		return /** @type {Environment} */ (this.outputOptions.environment)
-			.destructuring;
+		return this.outputOptions.environment.destructuring;
 	}
 
 	supportsBigIntLiteral() {
-		return /** @type {Environment} */ (this.outputOptions.environment)
-			.bigIntLiteral;
+		return this.outputOptions.environment.bigIntLiteral;
 	}
 
 	supportsDynamicImport() {
-		return /** @type {Environment} */ (this.outputOptions.environment)
-			.dynamicImport;
+		return this.outputOptions.environment.dynamicImport;
 	}
 
 	supportsEcmaScriptModuleSyntax() {
-		return /** @type {Environment} */ (this.outputOptions.environment).module;
+		return this.outputOptions.environment.module;
 	}
 
 	supportTemplateLiteral() {
-		return /** @type {Environment} */ (this.outputOptions.environment)
-			.templateLiteral;
+		return this.outputOptions.environment.templateLiteral;
 	}
 
 	supportNodePrefixForCoreModules() {
-		return /** @type {Environment} */ (this.outputOptions.environment)
-			.nodePrefixForCoreModules;
+		return this.outputOptions.environment.nodePrefixForCoreModules;
 	}
 
 	/**
@@ -315,7 +307,7 @@ class RuntimeTemplate {
 	 * Add a comment
 	 * @param {object} options Information content of the comment
 	 * @param {string=} options.request request string used originally
-	 * @param {string=} options.chunkName name of the chunk referenced
+	 * @param {(string | null)=} options.chunkName name of the chunk referenced
 	 * @param {string=} options.chunkReason reason information of the chunk
 	 * @param {string=} options.message additional message
 	 * @param {string=} options.exportName name of the export
@@ -1105,27 +1097,6 @@ class RuntimeTemplate {
 		runtimeRequirements.add(RuntimeGlobals.exports);
 		return `${RuntimeGlobals.makeNamespaceObject}(${exportsArgument});\n`;
 	}
-
-	/**
-	 * @param {object} options options object
-	 * @param {Module} options.module the module
-	 * @param {RuntimeSpec=} options.runtime runtime
-	 * @param {CodeGenerationResults} options.codeGenerationResults the code generation results
-	 * @returns {string} the url of the asset
-	 */
-	assetUrl({ runtime, module, codeGenerationResults }) {
-		if (!module) {
-			return "data:,";
-		}
-		const codeGen = codeGenerationResults.get(module, runtime);
-		const data = /** @type {NonNullable<CodeGenerationResult["data"]>} */ (
-			codeGen.data
-		);
-		const url = data.get("url");
-		if (url) return url.toString();
-		const assetPath = data.get("assetPathForCss");
-		return assetPath;
-	}
 }
 
 module.exports = RuntimeTemplate;

package/lib/SourceMapDevToolPlugin.js

@@ -236,11 +236,17 @@ class SourceMapDevToolPlugin {
 								fileIndex++;
 								return callback();
 							}
+
+							const chunk = fileToChunk.get(file);
+							const sourceMapNamespace = compilation.getPath(this.namespace, {
+								chunk
+							});
+
 							const cacheItem = cache.getItemCache(
 								file,
 								cache.mergeEtags(
 									cache.getLazyHashedEtag(asset.source),
-									namespace
+									sourceMapNamespace
 								)
 							);
 
@@ -270,11 +276,8 @@ class SourceMapDevToolPlugin {
 										/**
 										 * Add file to chunk, if not presented there
 										 */
-										if (cachedFile !== file) {
-											const chunk = fileToChunk.get(file);
-											if (chunk !== undefined)
-												chunk.auxiliaryFiles.add(cachedFile);
-										}
+										if (cachedFile !== file && chunk !== undefined)
+											chunk.auxiliaryFiles.add(cachedFile);
 									}
 
 									reportProgress(
@@ -326,7 +329,7 @@ class SourceMapDevToolPlugin {
 													module,
 													{
 														moduleFilenameTemplate,
-														namespace
+														namespace: sourceMapNamespace
 													},
 													{
 														requestShortener,

package/lib/TemplatedPathPlugin.js

@@ -162,19 +162,25 @@ const replacePathVariables = (path, data, assetInfo) => {
 		if (match) {
 			const ext = mime.extension(match[1]);
 			const emptyReplacer = replacer("", true);
+			// "XXXX" used for `updateHash`, so we don't need it here
+			const contentHash =
+				data.contentHash && !/X+/.test(data.contentHash)
+					? data.contentHash
+					: false;
+			const baseReplacer = contentHash ? replacer(contentHash) : emptyReplacer;
 
 			replacements.set("file", emptyReplacer);
 			replacements.set("query", emptyReplacer);
 			replacements.set("fragment", emptyReplacer);
 			replacements.set("path", emptyReplacer);
-			replacements.set("base", emptyReplacer);
-			replacements.set("name", emptyReplacer);
+			replacements.set("base", baseReplacer);
+			replacements.set("name", baseReplacer);
 			replacements.set("ext", replacer(ext ? `.${ext}` : "", true));
 			// Legacy
 			replacements.set(
 				"filebase",
 				deprecated(
-					emptyReplacer,
+					baseReplacer,
 					"[filebase] is now [base]",
 					"DEP_WEBPACK_TEMPLATE_PATH_PLUGIN_REPLACE_PATH_VARIABLES_FILENAME"
 				)

package/lib/Watching.js

@@ -77,8 +77,8 @@ class Watching {
 	}
 
 	/**
-	 * @param {ReadonlySet<string>=} changedFiles changed files
-	 * @param {ReadonlySet<string>=} removedFiles removed files
+	 * @param {ReadonlySet<string> | undefined | null} changedFiles changed files
+	 * @param {ReadonlySet<string> | undefined | null} removedFiles removed files
 	 */
 	_mergeWithCollected(changedFiles, removedFiles) {
 		if (!changedFiles) return;

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;
 						}