webpack 5.111.1 → 5.112.1

package/lib/{util → module}/extractSourceMap.js

@@ -7,9 +7,9 @@
 
 const path = require("path");
 const urlUtils = require("url");
-const { isAbsolute, join } = require("./fs");
+const { isAbsolute, join } = require("../fs/fs");
 
-/** @import { InputFileSystem } from "./fs" */
+/** @import { InputFileSystem } from "../fs/fs" */
 /** @typedef {string | Buffer<ArrayBufferLike>} StringOrBuffer */
 /** @typedef {(input: StringOrBuffer, resourcePath: string, fs: InputFileSystem) => Promise<{ source: StringOrBuffer, sourceMap: string | RawSourceMap | undefined, fileDependencies: string[] }>} SourceMapExtractorFunction */
 /** @import { RawSourceMap } from "webpack-sources" */
@@ -20,15 +20,20 @@ const { isAbsolute, join } = require("./fs");
  * @typedef {object} SourceMappingURL
  * @property {string} sourceMappingURL
  * @property {string} replacementString
+ * @property {number} replacementStart
  */
 
 // Matches only the last occurrence of sourceMappingURL
 const innerRegex = /\s*[#@]\s*sourceMappingURL\s*=\s*([^\s'"]*)\s*/;
 
 const validProtocolPattern = /^[a-z][a-z0-9+.-]*:/i;
+const whitespaceRegex = /\s/;
+const lineBreakRegex = /[\r\n\u2028\u2029]/;
+const ambiguousCommentRegex = /['"`]|\*\//;
+const ambiguousBlockCommentRegex = /['"`\]]|\*\/(?!$)/;
 
 const sourceMappingURLRegex = new RegExp(
-	"(?:" +
+	"^(?:" +
 		"/\\*" +
 		"(?:\\s*\r?\n(?://)?)?" +
 		`(?:${innerRegex.source})` +
@@ -37,7 +42,7 @@ const sourceMappingURLRegex = new RegExp(
 		"|" +
 		`//(?:${innerRegex.source})` +
 		")" +
-		"\\s*"
+		"\\s*$"
 );
 
 /**
@@ -46,24 +51,67 @@ const sourceMappingURLRegex = new RegExp(
  * @returns {SourceMappingURL} source mapping information
  */
 function getSourceMappingURL(code) {
-	const lines = code.split(/^/m);
-	/** @type {RegExpMatchArray | null | undefined} */
-	let match;
-
-	for (let i = lines.length - 1; i >= 0; i--) {
-		match = lines[i].match(sourceMappingURLRegex);
-		if (match) {
+	let end = code.length;
+	let lineStart = end;
+	// ECMA-426's non-parsing extraction stops at code or ambiguous comments.
+	// Block comments also support CSS and existing JavaScript annotations.
+	while (end > 0) {
+		while (end > 0 && whitespaceRegex.test(code[end - 1])) end--;
+		if (end === 0) break;
+		// Consecutive block comments can share a long line of generated code.
+		if (lineStart >= end) {
+			lineStart = end;
+			while (lineStart > 0 && !lineBreakRegex.test(code[lineStart - 1])) {
+				lineStart--;
+			}
+			while (lineStart < end && whitespaceRegex.test(code[lineStart])) {
+				lineStart++;
+			}
+		}
+		let start = lineStart;
+		let comment;
+		if (code.startsWith("//", start)) {
+			comment = code.slice(start, end);
+			if (ambiguousCommentRegex.test(comment)) break;
+		} else if (code.endsWith("*/", end)) {
+			start = code.lastIndexOf("/*", end - 2);
+			if (start < 0) break;
+			comment = code.slice(start, end);
+			// An escaped opener or a character class can belong to a trailing RegExp.
+			if (
+				code[start - 1] === "\\" ||
+				ambiguousBlockCommentRegex.test(comment)
+			) {
+				break;
+			}
+			// Comments cannot nest; an inner opener may only be comment text.
+			if (
+				start > 0 &&
+				code.lastIndexOf("/*", start - 1) > code.lastIndexOf("*/", start - 1)
+			) {
+				break;
+			}
+		} else {
 			break;
 		}
+		const match = sourceMappingURLRegex.exec(comment);
+		if (match) {
+			const sourceMappingURL = match[1] || match[2] || "";
+			return {
+				sourceMappingURL: sourceMappingURL
+					? decodeURI(sourceMappingURL)
+					: sourceMappingURL,
+				replacementString: comment,
+				replacementStart: start
+			};
+		}
+		end = start;
 	}
 
-	const sourceMappingURL = match ? match[1] || match[2] || "" : "";
-
 	return {
-		sourceMappingURL: sourceMappingURL
-			? decodeURI(sourceMappingURL)
-			: sourceMappingURL,
-		replacementString: match ? match[0] : ""
+		sourceMappingURL: "",
+		replacementString: "",
+		replacementStart: 0
 	};
 }
 
@@ -229,7 +277,8 @@ async function extractSourceMap(stringOrBuffer, resourcePath, readResource) {
 		source: stringOrBuffer,
 		sourceMap: inputSourceMap
 	};
-	const { sourceMappingURL, replacementString } = getSourceMappingURL(input);
+	const { sourceMappingURL, replacementString, replacementStart } =
+		getSourceMappingURL(input);
 
 	if (!sourceMappingURL) {
 		return output;
@@ -310,8 +359,10 @@ async function extractSourceMap(stringOrBuffer, resourcePath, readResource) {
 	}
 
 	return {
-		source: input.replace(replacementString, ""),
-		sourceMap: /** @type {RawSourceMap} */ (newMap)
+		source:
+			input.slice(0, replacementStart) +
+			input.slice(replacementStart + replacementString.length),
+		sourceMap: newMap
 	};
 }
 

package/lib/{util → module}/findCaseMismatch.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const { dirname, join } = require("./fs");
+const { dirname, join } = require("../fs/fs");
 
-/** @import { InputFileSystem } from "./fs" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 /** @typedef {[string, string]} CaseCorrection wrongly cased segment paired with its real name */
 /** @typedef {{ corrections: CaseCorrection[], path: string }} CaseMismatch */
@@ -68,7 +68,7 @@ const findCaseMismatch = (fs, missingPath, callback) => {
 		}
 		fs.readdir(next, (err, nextEntries) => {
 			if (err || !nextEntries) return callback();
-			walkDown(next, /** @type {string[]} */ (nextEntries), index + 1);
+			walkDown(next, nextEntries, index + 1);
 		});
 	};
 
@@ -89,7 +89,7 @@ const findCaseMismatch = (fs, missingPath, callback) => {
 				return walkUp();
 			}
 			segments.reverse();
-			walkDown(parent, /** @type {string[]} */ (entries), 0);
+			walkDown(parent, entries, 0);
 		});
 	};
 

package/lib/node/CommonJsChunkLoadingPlugin.js

@@ -5,12 +5,12 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const StartupChunkDependenciesPlugin = require("../runtime/StartupChunkDependenciesPlugin");
 
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
-/** @import { RuntimeRequirements } from "../Module" */
+/** @import { RuntimeRequirements } from "../module/Module" */
 
 /**
  * Defines the common js chunk loading plugin options type used by this module.

package/lib/{dependencies → node}/ExternalModuleDependency.js

@@ -5,18 +5,18 @@
 
 "use strict";
 
+const CachedConstDependency = require("../dependencies/core/CachedConstDependency");
 const makeSerializable = require("../util/makeSerializable");
-const CachedConstDependency = require("./CachedConstDependency");
 const ExternalModuleInitFragment = require("./ExternalModuleInitFragment");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Dependency from "../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../template/DependencyTemplate" */
 /** @import { Range } from "../javascript/JavascriptParser" */
 /**
  * @import {
  * 	ArrayImportSpecifiers
- * } from "../dependencies/ExternalModuleInitFragment"
+ * } from "./ExternalModuleInitFragment"
  */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<(string | ArrayImportSpecifiers | undefined)[]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<(string | ArrayImportSpecifiers | undefined)[]>} ObjectSerializerContext */
@@ -86,10 +86,11 @@ class ExternalModuleDependency extends CachedConstDependency {
 	}
 }
 
-makeSerializable(
-	ExternalModuleDependency,
+makeSerializable(ExternalModuleDependency, [
+	"webpack/lib/node/ExternalModuleDependency",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/ExternalModuleDependency"
-);
+]);
 
 ExternalModuleDependency.Template = class ExternalModuleDependencyTemplate extends (
 	CachedConstDependency.Template

package/lib/{dependencies → node}/ExternalModuleInitFragment.js

@@ -5,11 +5,11 @@
 
 "use strict";
 
-const InitFragment = require("../InitFragment");
+const InitFragment = require("../template/InitFragment");
 const makeSerializable = require("../util/makeSerializable");
 
 /** @import { Source } from "webpack-sources" */
-/** @import { GenerateContext } from "../Generator" */
+/** @import { ChunkRenderContext as GenerateContext } from "../javascript/JavascriptModulesPlugin" */
 /** @typedef {{ name: string, value?: string }[]} ArrayImportSpecifiers */
 /** @typedef {Set<string>} ImportSpecifier */
 /** @typedef {Map<string, ImportSpecifier>} ImportSpecifiers */
@@ -81,7 +81,7 @@ class ExternalModuleInitFragment extends InitFragment {
 	 * @param {GenerateContext} context context
 	 * @returns {string | Source | undefined} the source code that will be included as initialization code
 	 */
-	getContent({ runtimeRequirements }) {
+	getContent(context) {
 		/** @type {string[]} */
 		const namedImports = [];
 
@@ -134,9 +134,10 @@ class ExternalModuleInitFragment extends InitFragment {
 	}
 }
 
-makeSerializable(
-	ExternalModuleInitFragment,
+makeSerializable(ExternalModuleInitFragment, [
+	"webpack/lib/node/ExternalModuleInitFragment",
+	// TODO in the next major release: remove, they restore pre-move cache packs
 	"webpack/lib/dependencies/ExternalModuleInitFragment"
-);
+]);
 
 module.exports = ExternalModuleInitFragment;

package/lib/{dependencies → node}/ExternalModuleInitFragmentDependency.js

@@ -5,18 +5,18 @@
 
 "use strict";
 
-const DependencyTemplate = require("../DependencyTemplate");
+const NullDependency = require("../dependencies/core/NullDependency");
+const DependencyTemplate = require("../template/DependencyTemplate");
 const makeSerializable = require("../util/makeSerializable");
 const ExternalModuleInitFragment = require("./ExternalModuleInitFragment");
-const NullDependency = require("./NullDependency");
 
 /** @import { ReplaceSource } from "webpack-sources" */
-/** @import Dependency from "../Dependency" */
-/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Dependency from "../graph/Dependency" */
+/** @import { DependencyTemplateContext } from "../template/DependencyTemplate" */
 /**
  * @import {
  * 	ArrayImportSpecifiers
- * } from "../dependencies/ExternalModuleInitFragment"
+ * } from "./ExternalModuleInitFragment"
  */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, ArrayImportSpecifiers, string | undefined]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, ArrayImportSpecifiers, string | undefined]>} ObjectSerializerContext */
@@ -61,10 +61,15 @@ class ExternalModuleInitFragmentDependency extends NullDependency {
 	}
 }
 
-makeSerializable(
-	ExternalModuleInitFragmentDependency,
-	"webpack/lib/dependencies/ExternalModuleInitFragmentDependency"
-);
+makeSerializable(ExternalModuleInitFragmentDependency, [
+	"webpack/lib/node/ExternalModuleInitFragmentDependency",
+	// TODO in the next major release: remove, it restores caches written
+	// before this moved into lib/node/
+	"webpack/lib/dependencies/ExternalModuleInitFragmentDependency",
+	// TODO in the next major release: remove, it restores caches written
+	// before it was renamed from ExternalModuleConstDependency
+	"webpack/lib/dependencies/ExternalModuleConstDependency"
+]);
 
 ExternalModuleInitFragmentDependency.Template = class ExternalModuleInitFragmentDependencyTemplate extends (
 	DependencyTemplate

package/lib/node/NodeEnvironmentPlugin.js

@@ -17,7 +17,7 @@ const nodeConsole = require("./nodeConsole");
  * } from "../../declarations/WebpackOptions"
  */
 /** @import Compiler from "../Compiler" */
-/** @import { InputFileSystem } from "../util/fs" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 /**
  * Defines the node environment plugin options type used by this module.
@@ -76,6 +76,16 @@ class NodeEnvironmentPlugin {
 				inputFileSystem.purge();
 			}
 		});
+		// Nothing reports a change made while no watcher runs, so a later `watch`
+		// would build from cached content.
+		compiler.hooks.watchClose.tap(PLUGIN_NAME, () => {
+			if (
+				compiler.inputFileSystem === inputFileSystem &&
+				inputFileSystem.purge
+			) {
+				inputFileSystem.purge();
+			}
+		});
 		compiler.hooks.beforeRun.tap(PLUGIN_NAME, (compiler) => {
 			if (
 				compiler.inputFileSystem === inputFileSystem &&

package/lib/{NodeStuffPlugin.js → node/NodeStuffPlugin.js}

@@ -5,24 +5,24 @@
 
 "use strict";
 
+const CachedConstDependency = require("../dependencies/core/CachedConstDependency");
+const ConstDependency = require("../dependencies/core/ConstDependency");
+const ImportMetaPlugin = require("../dependencies/import-meta/ImportMetaPlugin");
+const { relative } = require("../fs/fs");
+const { evaluateToString } = require("../javascript/JavascriptParserHelpers");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("./ModuleTypeConstants");
-const RuntimeGlobals = require("./RuntimeGlobals");
-const CachedConstDependency = require("./dependencies/CachedConstDependency");
-const ConstDependency = require("./dependencies/ConstDependency");
-const ExternalModuleDependency = require("./dependencies/ExternalModuleDependency");
-const ExternalModuleInitFragmentDependency = require("./dependencies/ExternalModuleInitFragmentDependency");
-const ImportMetaPlugin = require("./dependencies/ImportMetaPlugin");
-const { evaluateToString } = require("./javascript/JavascriptParserHelpers");
-const { relative } = require("./util/fs");
-const { parseResource } = require("./util/identifier");
-const memoize = require("./util/memoize");
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const { parseResource } = require("../util/identifier");
+const memoize = require("../util/memoize");
+const ExternalModuleDependency = require("./ExternalModuleDependency");
+const ExternalModuleInitFragmentDependency = require("./ExternalModuleInitFragmentDependency");
 
 const getNodeStuffInWebError = memoize(() =>
-	require("./errors/NodeStuffInWebError")
+	require("../errors/NodeStuffInWebError")
 );
 
 /** @import { Expression } from "estree" */
@@ -30,12 +30,12 @@ const getNodeStuffInWebError = memoize(() =>
  * @import {
  * 	JavascriptParserOptions,
  * 	NodeOptions
- * } from "../declarations/WebpackOptions"
+ * } from "../../declarations/WebpackOptions"
  */
-/** @import Compiler from "./Compiler" */
-/** @import NormalModule from "./NormalModule" */
-/** @import JavascriptParser, { Range } from "./javascript/JavascriptParser" */
-/** @import { InputFileSystem } from "./util/fs" */
+/** @import Compiler from "../Compiler" */
+/** @import NormalModule from "../module/NormalModule" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 const PLUGIN_NAME = "NodeStuffPlugin";
 const URL_MODULE_CONSTANT_FUNCTION_NAME = "__webpack_fileURLToPath__";

package/lib/node/NodeTargetPlugin.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const ExternalsPlugin = require("../ExternalsPlugin");
+const ExternalsPlugin = require("../externals/ExternalsPlugin");
 const { builtins } = require("./nodeBuiltins");
 
 /** @import { ExternalsType } from "../../declarations/WebpackOptions" */

package/lib/node/NodeWatchFileSystem.js

@@ -19,7 +19,7 @@ const getWatchpack = memoize(() => require("watchpack"));
  * 	WatchMethod,
  * 	Changes,
  * 	Removals
- * } from "../util/fs"
+ * } from "../fs/fs"
  */
 
 // Watchpack pools DirectoryWatchers per options object identity; interning by
@@ -76,6 +76,19 @@ const getCanonicalWatchOptions = (options) => {
 	return snapshot;
 };
 
+/** @typedef {Iterable<string> & { has(item: string): boolean }} Lookup */
+
+/**
+ * Returns the items as they are when they have `has`, else as a set, which
+ * also keeps a later change by the caller or a one-shot iterable from mattering.
+ * @param {Iterable<string>} items items
+ * @returns {Lookup} the items, as something with `has`
+ */
+const toLookup = (items) =>
+	typeof (/** @type {Set<string>} */ (items).has) === "function"
+		? /** @type {Set<string>} */ (items)
+		: new Set(items);
+
 class NodeWatchFileSystem {
 	/**
 	 * Creates an instance of NodeWatchFileSystem.
@@ -91,6 +104,39 @@ class NodeWatchFileSystem {
 		// `watch` replaces this with a watcher built from its own options
 		/** @type {Watchpack | null} */
 		this.watcher = null;
+		/** @type {{ files: Lookup, directories: Lookup, missing: Lookup } | undefined} */
+		this._watched = undefined;
+	}
+
+	/**
+	 * Purges what the previous call watched and this one does not: an edit to a
+	 * path nobody watches is never reported, so its cached stat and content would
+	 * be read stale once the path is watched again.
+	 * @param {Lookup} files files to watch
+	 * @param {Lookup} directories directories to watch
+	 * @param {Lookup} missing missing paths to watch
+	 * @returns {void}
+	 */
+	_purgeUnwatched(files, directories, missing) {
+		const previous = this._watched;
+		this._watched = { files, directories, missing };
+		const fs = this.inputFileSystem;
+		if (previous === undefined || !fs || !fs.purge) return;
+		/** @type {string[]} */
+		const dropped = [];
+		for (const list of [
+			previous.files,
+			previous.directories,
+			previous.missing
+		]) {
+			for (const item of list) {
+				if (!files.has(item) && !directories.has(item) && !missing.has(item)) {
+					dropped.push(item);
+				}
+			}
+		}
+		// a prefix purge scans the whole cache once per path
+		if (dropped.length > 0) fs.purge(dropped, { exact: true });
 	}
 
 	/** @type {WatchMethod} */
@@ -124,6 +170,10 @@ class NodeWatchFileSystem {
 		if (typeof callbackUndelayed !== "function" && callbackUndelayed) {
 			throw new Error("Invalid arguments: 'callbackUndelayed'");
 		}
+		const filesLookup = toLookup(files);
+		const directoriesLookup = toLookup(directories);
+		const missingLookup = toLookup(missing);
+		this._purgeUnwatched(filesLookup, directoriesLookup, missingLookup);
 		const oldWatcher = this.watcher;
 		this.watcher = new (getWatchpack())(getCanonicalWatchOptions(options));
 
@@ -144,9 +194,6 @@ class NodeWatchFileSystem {
 			}
 			return { fileTimeInfoEntries, contextTimeInfoEntries };
 		};
-		const directoriesSet =
-			directories instanceof Set ? directories : new Set(directories);
-
 		// Watchpack reports a watched directory whenever its contents change, and
 		// `fs.purge(dir)` matches by prefix, wiping every file's stat cache with it.
 		// Only its own entry is purged; the batch's file events carry the rest.
@@ -159,7 +206,7 @@ class NodeWatchFileSystem {
 			if (!fs || !fs.purge) return;
 			if (changes) {
 				for (const item of changes) {
-					if (directoriesSet.has(item)) {
+					if (directoriesLookup.has(item)) {
 						fs.purge(item, { exact: true });
 					} else {
 						fs.purge(item);
@@ -197,7 +244,12 @@ class NodeWatchFileSystem {
 			}
 		);
 
-		this.watcher.watch({ files, directories, missing, startTime });
+		this.watcher.watch({
+			files: filesLookup,
+			directories: directoriesLookup,
+			missing: missingLookup,
+			startTime
+		});
 
 		if (oldWatcher) {
 			oldWatcher.close();

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -4,22 +4,22 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
 const {
 	generateJavascriptHMR
 } = require("../hmr/JavascriptHotModuleReplacementHelper");
 const { chunkHasJs } = require("../javascript/JavascriptModulesPlugin");
 const { getInitialChunkIds } = require("../javascript/StartupHelpers");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const RuntimeModule = require("../runtime/RuntimeModule");
 const { renderBaseUri } = require("../runtime/baseUri");
+const Template = require("../template/Template");
 const compileBooleanMatcher = require("../util/compileBooleanMatcher");
 
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /** @import Compilation from "../Compilation" */
-/** @import RuntimeTemplate from "../RuntimeTemplate" */
-/** @import { ReadOnlyRuntimeRequirements } from "../Module" */
+/** @import RuntimeTemplate from "../template/RuntimeTemplate" */
+/** @import { ReadOnlyRuntimeRequirements } from "../module/Module" */
 
 class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 	/**

package/lib/node/ReadFileCompileAsyncWasmPlugin.js

@@ -5,15 +5,17 @@
 
 "use strict";
 
-const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
-const { usesFullHashDigest } = require("../TemplatedPathPlugin");
+const {
+	WEBASSEMBLY_MODULE_TYPE_ASYNC
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const Template = require("../template/Template");
+const { usesFullHashDigest } = require("../template/TemplatedPathPlugin");
+const AsyncWasmCompileRuntimeModule = require("../wasm/AsyncWasmCompileRuntimeModule");
+const AsyncWasmLoadingRuntimeModule = require("../wasm/AsyncWasmLoadingRuntimeModule");
 const { needsRuntimeFullHash } = require("../wasm/wasmModuleFilename");
-const AsyncWasmCompileRuntimeModule = require("../wasm-async/AsyncWasmCompileRuntimeModule");
-const AsyncWasmLoadingRuntimeModule = require("../wasm-async/AsyncWasmLoadingRuntimeModule");
 
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 
@@ -152,9 +154,7 @@ class ReadFileCompileAsyncWasmPlugin {
 							chunk.runtime
 						) &&
 						needsRuntimeFullHash(
-							/** @type {string} */ (
-								compilation.outputOptions.webassemblyModuleFilename
-							)
+							compilation.outputOptions.webassemblyModuleFilename
 						)
 					) {
 						set.add(RuntimeGlobals.getFullHash);
@@ -163,9 +163,7 @@ class ReadFileCompileAsyncWasmPlugin {
 						chunk,
 						new AsyncWasmLoadingRuntimeModule({
 							fullHashDigest: usesFullHashDigest(
-								/** @type {string} */ (
-									compilation.outputOptions.webassemblyModuleFilename
-								)
+								compilation.outputOptions.webassemblyModuleFilename
 							),
 							generateLoadBinaryCode,
 							supportsStreaming: false
@@ -194,9 +192,7 @@ class ReadFileCompileAsyncWasmPlugin {
 							chunk.runtime
 						) &&
 						needsRuntimeFullHash(
-							/** @type {string} */ (
-								compilation.outputOptions.webassemblyModuleFilename
-							)
+							compilation.outputOptions.webassemblyModuleFilename
 						)
 					) {
 						set.add(RuntimeGlobals.getFullHash);
@@ -205,9 +201,7 @@ class ReadFileCompileAsyncWasmPlugin {
 						chunk,
 						new AsyncWasmCompileRuntimeModule({
 							fullHashDigest: usesFullHashDigest(
-								/** @type {string} */ (
-									compilation.outputOptions.webassemblyModuleFilename
-								)
+								compilation.outputOptions.webassemblyModuleFilename
 							),
 							generateLoadBinaryCode,
 							supportsStreaming: false

package/lib/node/ReadFileCompileWasmPlugin.js

@@ -5,14 +5,16 @@
 
 "use strict";
 
-const { WEBASSEMBLY_MODULE_TYPE_SYNC } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
-const { usesFullHashDigest } = require("../TemplatedPathPlugin");
+const {
+	WEBASSEMBLY_MODULE_TYPE_SYNC
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const Template = require("../template/Template");
+const { usesFullHashDigest } = require("../template/TemplatedPathPlugin");
 const { needsRuntimeFullHash } = require("../wasm/wasmModuleFilename");
 const WasmChunkLoadingRuntimeModule = require("../wasm-sync/WasmChunkLoadingRuntimeModule");
 
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
 
 /**
@@ -135,9 +137,7 @@ class ReadFileCompileWasmPlugin {
 					set.add(RuntimeGlobals.moduleCache);
 					if (
 						needsRuntimeFullHash(
-							/** @type {string} */ (
-								compilation.outputOptions.webassemblyModuleFilename
-							)
+							compilation.outputOptions.webassemblyModuleFilename
 						)
 					) {
 						set.add(RuntimeGlobals.getFullHash);
@@ -146,9 +146,7 @@ class ReadFileCompileWasmPlugin {
 						chunk,
 						new WasmChunkLoadingRuntimeModule({
 							fullHashDigest: usesFullHashDigest(
-								/** @type {string} */ (
-									compilation.outputOptions.webassemblyModuleFilename
-								)
+								compilation.outputOptions.webassemblyModuleFilename
 							),
 							generateLoadBinaryCode,
 							supportsStreaming: false,