webpack 5.107.2 → 5.108.0

package/lib/WarnCaseSensitiveModulesPlugin.js

@@ -75,6 +75,7 @@ ${modulesList}`);
 
 		/** @type {string} */
 		this.name = "CaseSensitiveModulesWarning";
+		/** @type {Module} */
 		this.module = sortedModules[0];
 	}
 }

package/lib/WarnDeprecatedOptionPlugin.js

@@ -19,8 +19,11 @@ class WarnDeprecatedOptionPlugin {
 	 * @param {string} suggestion the suggestion replacement
 	 */
 	constructor(option, value, suggestion) {
+		/** @type {string} */
 		this.option = option;
+		/** @type {string | number} */
 		this.value = value;
+		/** @type {string} */
 		this.suggestion = suggestion;
 	}
 
@@ -50,6 +53,7 @@ class DeprecatedOptionWarning extends WebpackError {
 
 		/** @type {string} */
 		this.name = "DeprecatedOptionWarning";
+		/** @type {string} */
 		this.message =
 			"configuration\n" +
 			`The value '${value}' for option '${option}' is deprecated. ` +

package/lib/WarnNoModeSetPlugin.js

@@ -13,6 +13,7 @@ class NoModeWarning extends WebpackError {
 
 		/** @type {string} */
 		this.name = "NoModeWarning";
+		/** @type {string} */
 		this.message =
 			"configuration\n" +
 			"The 'mode' option has not been set, webpack will fallback to 'production' for this value.\n" +

package/lib/WatchIgnorePlugin.js

@@ -23,6 +23,7 @@ class IgnoringWatchFileSystem {
 	 * @param {WatchIgnorePluginOptions["paths"]} paths ignored paths
 	 */
 	constructor(wfs, paths) {
+		/** @type {WatchFileSystem} */
 		this.wfs = wfs;
 		this.paths = paths;
 	}

package/lib/Watching.js

@@ -35,6 +35,7 @@ class Watching {
 	constructor(compiler, watchOptions, handler) {
 		/** @type {null | number} */
 		this.startTime = null;
+		/** @type {boolean} */
 		this.invalid = false;
 		/** @type {Callback<Stats>} */
 		this.handler = handler;
@@ -42,8 +43,11 @@ class Watching {
 		this.callbacks = [];
 		/** @type {ErrorCallback[] | undefined} */
 		this._closeCallbacks = undefined;
+		/** @type {boolean} */
 		this.closed = false;
+		/** @type {boolean} */
 		this.suspended = false;
+		/** @type {boolean} */
 		this.blocked = false;
 		this._isBlocked = () => false;
 		this._onChange = () => {};
@@ -63,10 +67,15 @@ class Watching {
 		if (typeof this.watchOptions.aggregateTimeout !== "number") {
 			this.watchOptions.aggregateTimeout = 20;
 		}
+		/** @type {Compiler} */
 		this.compiler = compiler;
+		/** @type {boolean} */
 		this.running = false;
+		/** @type {boolean} */
 		this._initial = true;
+		/** @type {boolean} */
 		this._invalidReported = true;
+		/** @type {boolean} */
 		this._needRecords = true;
 		/** @type {undefined | null | Watcher} */
 		this.watcher = undefined;

package/lib/WebpackOptionsApply.js

@@ -149,6 +149,16 @@ class WebpackOptionsApply extends OptionsApply {
 				).apply(compiler);
 			}
 		}
+		if (options.externalsPresets.deno) {
+			const DenoTargetPlugin = require("./deno/DenoTargetPlugin");
+
+			new DenoTargetPlugin().apply(compiler);
+		}
+		if (options.externalsPresets.bun) {
+			const BunTargetPlugin = require("./bun/BunTargetPlugin");
+
+			new BunTargetPlugin().apply(compiler);
+		}
 		if (options.externalsPresets.webAsync || options.externalsPresets.web) {
 			const type = options.externalsPresets.webAsync ? "import" : "module";
 
@@ -175,23 +185,42 @@ class WebpackOptionsApply extends OptionsApply {
 			}).apply(compiler);
 		}
 		if (options.externalsPresets.electron) {
+			// Use ESM imports only when the targeted electron version supports them
+			const type =
+				options.output.module && options.output.environment.module
+					? "module-import"
+					: "node-commonjs";
+
+			// Warn when ESM output is requested but the electron version lacks it (added in electron 28)
+			if (options.output.module && !options.output.environment.module) {
+				const WebpackError = require("./WebpackError");
+
+				compiler.hooks.thisCompilation.tap(CLASS_NAME, (compilation) => {
+					compilation.warnings.push(
+						new WebpackError(
+							"'output.module' is enabled, but the targeted electron version does not support ECMAScript modules (added in electron 28). Electron built-in modules are externalized as 'node-commonjs'."
+						)
+					);
+				});
+			}
+
 			if (options.externalsPresets.electronMain) {
 				// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 				const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
 
-				new ElectronTargetPlugin("main").apply(compiler);
+				new ElectronTargetPlugin("main", type).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);
+				new ElectronTargetPlugin("preload", type).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);
+				new ElectronTargetPlugin("renderer", type).apply(compiler);
 			}
 			if (
 				!options.externalsPresets.electronMain &&
@@ -201,7 +230,7 @@ class WebpackOptionsApply extends OptionsApply {
 				// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 				const ElectronTargetPlugin = require("./electron/ElectronTargetPlugin");
 
-				new ElectronTargetPlugin().apply(compiler);
+				new ElectronTargetPlugin(undefined, type).apply(compiler);
 			}
 		}
 		if (options.externalsPresets.nwjs) {
@@ -372,6 +401,7 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 
 		new JavascriptModulesPlugin().apply(compiler);
+
 		new JsonModulesPlugin().apply(compiler);
 		new AssetModulesPlugin({
 			sideEffectFree: options.experiments.futureDefaults
@@ -610,7 +640,9 @@ class WebpackOptionsApply extends OptionsApply {
 			const FlagDependencyUsagePlugin = require("./FlagDependencyUsagePlugin");
 
 			new FlagDependencyUsagePlugin(
-				options.optimization.usedExports === "global"
+				options.optimization.usedExports === "global",
+				// Keep an escaping module's exports mangleable when mangling is on.
+				Boolean(options.optimization.mangleExports)
 			).apply(compiler);
 		}
 		if (options.optimization.innerGraph) {
@@ -618,6 +650,19 @@ class WebpackOptionsApply extends OptionsApply {
 
 			new InnerGraphPlugin().apply(compiler);
 		}
+
+		if (options.mode === "production") {
+			const CircularModulesPlugin = require("./CircularModulesPlugin");
+
+			new CircularModulesPlugin().apply(compiler);
+		}
+
+		const ConstExportsPlugin = require("./optimize/ConstExportsPlugin");
+
+		new ConstExportsPlugin({
+			inlineExports: options.optimization.inlineExports
+		}).apply(compiler);
+
 		if (options.optimization.mangleExports) {
 			const MangleExportsPlugin = require("./optimize/MangleExportsPlugin");
 

package/lib/asset/AssetBytesGenerator.js

@@ -28,14 +28,15 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../NormalModule")} NormalModule */
 
-class AssetSourceGenerator extends Generator {
+class AssetBytesGenerator extends Generator {
 	/**
-	 * Creates an instance of AssetSourceGenerator.
+	 * Creates an instance of AssetBytesGenerator.
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 */
 	constructor(moduleGraph) {
 		super();
 
+		/** @type {ModuleGraph} */
 		this._moduleGraph = moduleGraph;
 	}
 
@@ -161,6 +162,13 @@ class AssetSourceGenerator extends Generator {
 		return NO_TYPES;
 	}
 
+	/**
+	 * @returns {boolean} whether getTypes() depends on the module's incoming connections
+	 */
+	getTypesDependOnIncomingConnections() {
+		return true;
+	}
+
 	/**
 	 * Returns the estimated size for the requested source type.
 	 * @param {NormalModule} module the module
@@ -179,4 +187,4 @@ class AssetSourceGenerator extends Generator {
 	}
 }
 
-module.exports = AssetSourceGenerator;
+module.exports = AssetBytesGenerator;

package/lib/asset/AssetGenerator.js

@@ -25,11 +25,14 @@ const {
 } = require("../ModuleSourceTypeConstants");
 const { ASSET_MODULE_TYPE } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
-const CssUrlDependency = require("../dependencies/CssUrlDependency");
 const createHash = require("../util/createHash");
 const { makePathsRelative } = require("../util/identifier");
 const memoize = require("../util/memoize");
 const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
+const {
+	PUBLIC_PATH_AUTO,
+	PUBLIC_PATH_FULL_HASH
+} = require("../util/publicPathPlaceholder");
 const { updateHashFromSource } = require("../util/source");
 
 const getMimeTypes = memoize(() => require("../util/mimeTypes"));
@@ -47,7 +50,7 @@ const getMimeTypes = memoize(() => require("../util/mimeTypes"));
 /** @typedef {import("../Generator").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").NameForCondition} NameForCondition */
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
+/** @typedef {import("./AssetModule").AssetModuleBuildInfo} AssetModuleBuildInfo */
 /** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
 /** @typedef {import("../Module").SourceType} SourceType */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
@@ -286,13 +289,15 @@ class AssetGenerator extends Generator {
 	 * @param {Pick<AssetResourceGeneratorOptions, "filename" | "outputPath">} generatorOptions generator options
 	 * @param {{ runtime: RuntimeSpec, runtimeTemplate: RuntimeTemplate, chunkGraph: ChunkGraph }} generateContext context for generate
 	 * @param {string} contentHash the content hash
+	 * @param {string=} fullContentHash untruncated content hash, so `[contenthash:<digest>]` re-encodes from full entropy
 	 * @returns {{ filename: string, originalFilename: string, assetInfo: AssetInfo }} info
 	 */
 	static getFilenameWithInfo(
 		module,
 		generatorOptions,
 		{ runtime, runtimeTemplate, chunkGraph },
-		contentHash
+		contentHash,
+		fullContentHash
 	) {
 		const assetModuleFilename =
 			generatorOptions.filename ||
@@ -308,7 +313,8 @@ class AssetGenerator extends Generator {
 				runtime,
 				filename: sourceFilename,
 				chunkGraph,
-				contentHash
+				contentHash,
+				contentHashFull: fullContentHash
 			});
 
 		const originalFilename = filename;
@@ -322,7 +328,8 @@ class AssetGenerator extends Generator {
 						runtime,
 						filename: sourceFilename,
 						chunkGraph,
-						contentHash
+						contentHash,
+						contentHashFull: fullContentHash
 					}
 				);
 			filename = path.posix.join(outputPath, filename);
@@ -340,6 +347,7 @@ class AssetGenerator extends Generator {
 	 * @param {string} filename the filename
 	 * @param {AssetInfo} assetInfo the asset info
 	 * @param {string} contentHash the content hash
+	 * @param {string=} fullContentHash untruncated content hash, so `[contenthash:<digest>]` re-encodes from full entropy
 	 * @returns {{ assetPath: string, assetInfo: AssetInfo }} asset path and info
 	 */
 	static getAssetPathWithInfo(
@@ -348,7 +356,8 @@ class AssetGenerator extends Generator {
 		{ runtime, runtimeTemplate, type, chunkGraph, runtimeRequirements },
 		filename,
 		assetInfo,
-		contentHash
+		contentHash,
+		fullContentHash
 	) {
 		const sourceFilename = AssetGenerator.getSourceFileName(
 			module,
@@ -366,7 +375,8 @@ class AssetGenerator extends Generator {
 					runtime,
 					filename: sourceFilename,
 					chunkGraph,
-					contentHash
+					contentHash,
+					contentHashFull: fullContentHash
 				}
 			);
 			assetInfo = mergeAssetInfo(assetInfo, info);
@@ -382,7 +392,8 @@ class AssetGenerator extends Generator {
 					runtime,
 					filename: sourceFilename,
 					chunkGraph,
-					contentHash
+					contentHash,
+					contentHashFull: fullContentHash
 				}
 			);
 			assetInfo = mergeAssetInfo(assetInfo, info);
@@ -398,15 +409,13 @@ class AssetGenerator extends Generator {
 			const compilation = runtimeTemplate.compilation;
 			const path =
 				compilation.outputOptions.publicPath === "auto"
-					? CssUrlDependency.PUBLIC_PATH_AUTO
+					? PUBLIC_PATH_AUTO
 					: compilation.getAssetPath(compilation.outputOptions.publicPath, {
-							hash:
-								compilation.hash ||
-								`${CssUrlDependency.PUBLIC_PATH_FULL_HASH}0__`,
+							hash: compilation.hash || `${PUBLIC_PATH_FULL_HASH}0__`,
 							hashWithLength: (length) =>
 								compilation.hash
 									? compilation.hash.slice(0, length)
-									: `${CssUrlDependency.PUBLIC_PATH_FULL_HASH}${length}__`
+									: `${PUBLIC_PATH_FULL_HASH}${length}__`
 						});
 
 			assetPath = path + filename;
@@ -564,7 +573,7 @@ class AssetGenerator extends Generator {
 		const data = getData ? getData() : undefined;
 
 		if (
-			/** @type {BuildInfo} */
+			/** @type {AssetModuleBuildInfo} */
 			(module.buildInfo).dataUrl &&
 			needContent
 		) {
@@ -588,7 +597,7 @@ class AssetGenerator extends Generator {
 				data.set("contentHash", contentHash);
 			}
 
-			/** @type {BuildInfo} */
+			/** @type {AssetModuleBuildInfo} */
 			(module.buildInfo).fullContentHash = fullContentHash;
 
 			const { originalFilename, filename, assetInfo } =
@@ -596,7 +605,8 @@ class AssetGenerator extends Generator {
 					module,
 					{ filename: this.filename, outputPath: this.outputPath },
 					generateContext,
-					contentHash
+					contentHash,
+					fullContentHash
 				);
 
 			if (data) {
@@ -610,7 +620,8 @@ class AssetGenerator extends Generator {
 					generateContext,
 					originalFilename,
 					assetInfo,
-					contentHash
+					contentHash,
+					fullContentHash
 				);
 
 			if (data && (type === JAVASCRIPT_TYPE || type === ASSET_URL_TYPE)) {
@@ -632,10 +643,10 @@ class AssetGenerator extends Generator {
 			// Due to code generation caching module.buildInfo.XXX can't used to store such information
 			// It need to be stored in the code generation results instead, where it's cached too
 			// TODO webpack 6 For back-compat reasons we also store in on module.buildInfo
-			/** @type {BuildInfo} */
+			/** @type {AssetModuleBuildInfo} */
 			(module.buildInfo).filename = filename;
 
-			/** @type {BuildInfo} */
+			/** @type {AssetModuleBuildInfo} */
 			(module.buildInfo).assetInfo = newAssetInfo;
 
 			content = assetPath;
@@ -704,7 +715,11 @@ class AssetGenerator extends Generator {
 			sourceTypes.add(connection.originModule.type.split("/")[0]);
 		}
 
-		if ((module.buildInfo && module.buildInfo.dataUrl) || this.emit === false) {
+		if (
+			(module.buildInfo &&
+				/** @type {AssetModuleBuildInfo} */ (module.buildInfo).dataUrl) ||
+			this.emit === false
+		) {
 			if (sourceTypes.size > 0) {
 				if (
 					sourceTypes.has(JAVASCRIPT_TYPE) &&
@@ -735,6 +750,13 @@ class AssetGenerator extends Generator {
 		return ASSET_TYPES;
 	}
 
+	/**
+	 * @returns {boolean} whether getTypes() depends on the module's incoming connections
+	 */
+	getTypesDependOnIncomingConnections() {
+		return true;
+	}
+
 	/**
 	 * Returns the estimated size for the requested source type.
 	 * @param {NormalModule} module the module
@@ -753,7 +775,10 @@ class AssetGenerator extends Generator {
 				return originalSource.size();
 			}
 			default:
-				if (module.buildInfo && module.buildInfo.dataUrl) {
+				if (
+					module.buildInfo &&
+					/** @type {AssetModuleBuildInfo} */ (module.buildInfo).dataUrl
+				) {
 					const originalSource = module.originalSource();
 
 					if (!originalSource) {
@@ -781,7 +806,7 @@ class AssetGenerator extends Generator {
 		const { module } = updateHashContext;
 
 		if (
-			/** @type {BuildInfo} */
+			/** @type {AssetModuleBuildInfo} */
 			(module.buildInfo).dataUrl
 		) {
 			hash.update("data-url");

package/lib/asset/AssetModule.js

@@ -0,0 +1,47 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+*/
+
+"use strict";
+
+const NormalModule = require("../NormalModule");
+const makeSerializable = require("../util/makeSerializable");
+
+/** @typedef {import("../Compilation").AssetInfo} AssetInfo */
+/** @typedef {import("../NormalModule").NormalModuleBuildInfo} NormalModuleBuildInfo */
+/** @typedef {import("../NormalModule").NormalModuleCreateData} NormalModuleCreateData */
+
+/**
+ * Defines the build info properties specific to asset modules.
+ * @typedef {object} KnownAssetModuleBuildInfo
+ * @property {boolean=} dataUrl whether the asset is inlined as a data url
+ * @property {string=} filename
+ * @property {AssetInfo=} assetInfo
+ * @property {string=} fullContentHash
+ */
+
+/** @typedef {NormalModuleBuildInfo & KnownAssetModuleBuildInfo} AssetModuleBuildInfo */
+
+/**
+ * Module class for all `asset/*` modules. Asset-specific properties should live here instead of `NormalModule`.
+ */
+class AssetModule extends NormalModule {
+	/**
+	 * @param {NormalModuleCreateData} options options object
+	 * @param {boolean=} sideEffectFree whether asset modules are side-effect-free (`AssetModulesPluginOptions`)
+	 */
+	constructor(options, sideEffectFree) {
+		super(options);
+
+		// Redeclared with the asset specific shape
+		/** @type {AssetModuleBuildInfo | undefined} */
+		this.buildInfo = undefined;
+		if (sideEffectFree) {
+			this.factoryMeta = { sideEffectFree: true };
+		}
+	}
+}
+
+makeSerializable(AssetModule, "webpack/lib/asset/AssetModule");
+
+module.exports = AssetModule;

package/lib/asset/AssetModulesPlugin.js

@@ -23,7 +23,7 @@ const memoize = require("../util/memoize");
 /** @typedef {import("../../declarations/WebpackOptions").AssetModuleFilename} AssetModuleFilename */
 /** @typedef {import("../Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
+/** @typedef {import("./AssetModule").AssetModuleBuildInfo} AssetModuleBuildInfo */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../NormalModule")} NormalModule */
 
@@ -56,7 +56,7 @@ const getAssetSourceGenerator = memoize(() =>
 	require("./AssetSourceGenerator")
 );
 const getAssetBytesGenerator = memoize(() => require("./AssetBytesGenerator"));
-const getNormalModule = memoize(() => require("../NormalModule"));
+const getAssetModule = memoize(() => require("./AssetModule"));
 
 const type = ASSET_MODULE_TYPE;
 const PLUGIN_NAME = "AssetModulesPlugin";
@@ -73,6 +73,7 @@ class AssetModulesPlugin {
 	 * @param {AssetModulesPluginOptions} options options
 	 */
 	constructor(options) {
+		/** @type {AssetModulesPluginOptions} */
 		this.options = options;
 	}
 
@@ -85,7 +86,7 @@ class AssetModulesPlugin {
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
-				const NormalModule = getNormalModule();
+				const AssetModule = getAssetModule();
 				for (const type of [
 					ASSET_MODULE_TYPE,
 					ASSET_MODULE_TYPE_BYTES,
@@ -95,15 +96,11 @@ class AssetModulesPlugin {
 				]) {
 					normalModuleFactory.hooks.createModuleClass
 						.for(type)
-						.tap(PLUGIN_NAME, (createData, _resolveData) => {
-							// TODO create the module via new AssetModule with its own properties
-							const module = new NormalModule(createData);
-							if (this.options.sideEffectFree) {
-								module.factoryMeta = { sideEffectFree: true };
-							}
-
-							return module;
-						});
+						.tap(
+							PLUGIN_NAME,
+							(createData, _resolveData) =>
+								new AssetModule(createData, this.options.sideEffectFree)
+						);
 				}
 
 				normalModuleFactory.hooks.createParser
@@ -279,7 +276,9 @@ class AssetModulesPlugin {
 									module,
 									chunk.runtime
 								);
-								const buildInfo = /** @type {BuildInfo} */ (module.buildInfo);
+								const buildInfo = /** @type {AssetModuleBuildInfo} */ (
+									module.buildInfo
+								);
 								const data =
 									/** @type {NonNullable<CodeGenerationResult["data"]>} */
 									(codeGenResult.data);
@@ -316,7 +315,8 @@ class AssetModulesPlugin {
 												runtimeTemplate,
 												chunkGraph
 											},
-											contentHash
+											contentHash,
+											fullContentHash
 										);
 									entryFilename = filename;
 									entryInfo = assetInfo;

package/lib/asset/AssetParser.js

@@ -10,7 +10,7 @@ const Parser = require("../Parser");
 /** @typedef {import("../../declarations/WebpackOptions").AssetParserDataUrlOptions} AssetParserDataUrlOptions */
 /** @typedef {import("../../declarations/WebpackOptions").AssetParserOptions} AssetParserOptions */
 /** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
+/** @typedef {import("./AssetModule").AssetModuleBuildInfo} AssetModuleBuildInfo */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
@@ -40,7 +40,7 @@ class AssetParser extends Parser {
 		}
 
 		const buildInfo =
-			/** @type {BuildInfo} */
+			/** @type {AssetModuleBuildInfo} */
 			(state.module.buildInfo);
 		buildInfo.strict = true;
 		const buildMeta =

package/lib/asset/AssetSourceGenerator.js

@@ -36,6 +36,7 @@ class AssetSourceGenerator extends Generator {
 	constructor(moduleGraph) {
 		super();
 
+		/** @type {ModuleGraph} */
 		this._moduleGraph = moduleGraph;
 	}
 
@@ -160,6 +161,13 @@ class AssetSourceGenerator extends Generator {
 		return NO_TYPES;
 	}
 
+	/**
+	 * @returns {boolean} whether getTypes() depends on the module's incoming connections
+	 */
+	getTypesDependOnIncomingConnections() {
+		return true;
+	}
+
 	/**
 	 * Returns the estimated size for the requested source type.
 	 * @param {NormalModule} module the module

package/lib/asset/RawDataUrlModule.js

@@ -29,8 +29,8 @@ const makeSerializable = require("../util/makeSerializable");
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Buffer | undefined, string, string]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Buffer | undefined, string, string]>} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 
@@ -161,11 +161,10 @@ class RawDataUrlModule extends Module {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.urlBuffer);
-		write(this.identifierStr);
-		write(this.readableIdentifierStr);
+		context
+			.write(this.urlBuffer)
+			.write(this.identifierStr)
+			.write(this.readableIdentifierStr);
 
 		super.serialize(context);
 	}
@@ -175,13 +174,13 @@ class RawDataUrlModule extends Module {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.urlBuffer = read();
-		this.identifierStr = read();
-		this.readableIdentifierStr = read();
+		this.urlBuffer = context.read();
+		const c1 = context.rest;
+		this.identifierStr = c1.read();
+		const c2 = c1.rest;
+		this.readableIdentifierStr = c2.read();
 
-		super.deserialize(context);
+		super.deserialize(c2.rest);
 	}
 }