webpack 5.107.2 → 5.108.0

package/lib/dependencies/JsonExportsDependency.js

@@ -14,8 +14,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../json/JsonData")} JsonData */
 /** @typedef {import("../json/JsonData").JsonValue} JsonValue */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[JsonData, number]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[JsonData, number]>} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 
 /**
@@ -79,7 +79,9 @@ class JsonExportsDependency extends NullDependency {
 	 */
 	constructor(data, exportsDepth) {
 		super();
+		/** @type {JsonData} */
 		this.data = data;
+		/** @type {number} */
 		this.exportsDepth = exportsDepth;
 	}
 
@@ -116,9 +118,7 @@ class JsonExportsDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.data);
-		write(this.exportsDepth);
+		context.write(this.data).write(this.exportsDepth);
 		super.serialize(context);
 	}
 
@@ -127,10 +127,10 @@ class JsonExportsDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.data = read();
-		this.exportsDepth = read();
-		super.deserialize(context);
+		this.data = context.read();
+		const c1 = context.rest;
+		this.exportsDepth = c1.read();
+		super.deserialize(c1.rest);
 	}
 }
 

package/lib/dependencies/LoaderImportDependency.js

@@ -17,6 +17,7 @@ class LoaderImportDependency extends ModuleDependency {
 	 */
 	constructor(request) {
 		super(request);
+		/** @type {boolean} */
 		this.weak = true;
 	}
 

package/lib/dependencies/LocalModule.js

@@ -7,8 +7,8 @@
 
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, number, boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, number, boolean]>} ObjectSerializerContext */
 
 class LocalModule {
 	/**
@@ -17,8 +17,11 @@ class LocalModule {
 	 * @param {number} idx index
 	 */
 	constructor(name, idx) {
+		/** @type {string} */
 		this.name = name;
+		/** @type {number} */
 		this.idx = idx;
+		/** @type {boolean} */
 		this.used = false;
 	}
 
@@ -39,11 +42,7 @@ class LocalModule {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.name);
-		write(this.idx);
-		write(this.used);
+		context.write(this.name).write(this.idx).write(this.used);
 	}
 
 	/**
@@ -51,11 +50,11 @@ class LocalModule {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.name = read();
-		this.idx = read();
-		this.used = read();
+		this.name = context.read();
+		const c1 = context.rest;
+		this.idx = c1.read();
+		const c2 = c1.rest;
+		this.used = c2.read();
 	}
 }
 

package/lib/dependencies/LocalModuleDependency.js

@@ -12,8 +12,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[LocalModule, Range | undefined, boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[LocalModule, Range | undefined, boolean]>} ObjectSerializerContext */
 /** @typedef {import("./LocalModule")} LocalModule */
 
 class LocalModuleDependency extends NullDependency {
@@ -26,8 +26,10 @@ class LocalModuleDependency extends NullDependency {
 	constructor(localModule, range, callNew) {
 		super();
 
+		/** @type {LocalModule} */
 		this.localModule = localModule;
 		this.range = range;
+		/** @type {boolean} */
 		this.callNew = callNew;
 	}
 
@@ -36,11 +38,7 @@ class LocalModuleDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.localModule);
-		write(this.range);
-		write(this.callNew);
+		context.write(this.localModule).write(this.range).write(this.callNew);
 
 		super.serialize(context);
 	}
@@ -50,13 +48,13 @@ class LocalModuleDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.localModule = read();
-		this.range = read();
-		this.callNew = read();
+		this.localModule = context.read();
+		const c1 = context.rest;
+		this.range = c1.read();
+		const c2 = c1.rest;
+		this.callNew = c2.read();
 
-		super.deserialize(context);
+		super.deserialize(c2.rest);
 	}
 }
 

package/lib/dependencies/ModuleDecoratorDependency.js

@@ -16,8 +16,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, boolean]>} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
@@ -29,7 +29,9 @@ class ModuleDecoratorDependency extends NullDependency {
 	 */
 	constructor(decorator, allowExportsAccess) {
 		super();
+		/** @type {string} */
 		this.decorator = decorator;
+		/** @type {boolean} */
 		this.allowExportsAccess = allowExportsAccess;
 		/** @type {undefined | string} */
 		this._hashUpdate = undefined;
@@ -85,9 +87,7 @@ class ModuleDecoratorDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.decorator);
-		write(this.allowExportsAccess);
+		context.write(this.decorator).write(this.allowExportsAccess);
 		super.serialize(context);
 	}
 
@@ -96,10 +96,10 @@ class ModuleDecoratorDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.decorator = read();
-		this.allowExportsAccess = read();
-		super.deserialize(context);
+		this.decorator = context.read();
+		const c1 = context.rest;
+		this.allowExportsAccess = c1.read();
+		super.deserialize(c1.rest);
 	}
 }
 

package/lib/dependencies/ModuleDependency.js

@@ -23,13 +23,18 @@ class ModuleDependency extends Dependency {
 	 */
 	constructor(request, sourceOrder) {
 		super();
+		/** @type {string} */
 		this.request = request;
+		/** @type {string} */
 		this.userRequest = request;
+		/** @type {number | undefined} */
 		this.sourceOrder = sourceOrder;
 		/** @type {Range | undefined} */
 		this.range = undefined;
 		/** @type {undefined | string} */
 		this._context = undefined;
+		/** @type {boolean} */
+		this.weak = false;
 	}
 
 	/**
@@ -84,6 +89,7 @@ class ModuleDependency extends Dependency {
 		write(this._context);
 		write(this.range);
 		write(this.sourceOrder);
+		write(this.weak);
 		super.serialize(context);
 	}
 
@@ -98,6 +104,7 @@ class ModuleDependency extends Dependency {
 		this._context = read();
 		this.range = read();
 		this.sourceOrder = read();
+		this.weak = read();
 		super.deserialize(context);
 	}
 }

package/lib/dependencies/ModuleHotAcceptDependency.js

@@ -20,6 +20,7 @@ class ModuleHotAcceptDependency extends ModuleDependency {
 	constructor(request, range) {
 		super(request, Infinity);
 		this.range = range;
+		/** @type {boolean} */
 		this.weak = true;
 	}
 

package/lib/dependencies/ModuleHotDeclineDependency.js

@@ -21,6 +21,7 @@ class ModuleHotDeclineDependency extends ModuleDependency {
 		super(request);
 
 		this.range = range;
+		/** @type {boolean} */
 		this.weak = true;
 	}
 

package/lib/dependencies/ModuleInitFragmentDependency.js

@@ -12,8 +12,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, string[], string | undefined]>} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string[], string | undefined]>} ObjectDeserializerContext */
 /**
  * A dependency that adds an init fragment to the module
  */
@@ -26,8 +26,11 @@ class ModuleInitFragmentDependency extends NullDependency {
 	 */
 	constructor(initCode, runtimeRequirements, key) {
 		super();
+		/** @type {string} */
 		this.initCode = initCode;
+		/** @type {string[]} */
 		this.runtimeRequirements = runtimeRequirements;
+		/** @type {string | undefined} */
 		this.key = key;
 	}
 
@@ -36,10 +39,10 @@ class ModuleInitFragmentDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.initCode);
-		write(this.runtimeRequirements);
-		write(this.key);
+		context
+			.write(this.initCode)
+			.write(this.runtimeRequirements)
+			.write(this.key);
 		super.serialize(context);
 	}
 
@@ -48,11 +51,12 @@ class ModuleInitFragmentDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.initCode = read();
-		this.runtimeRequirements = read();
-		this.key = read();
-		super.deserialize(context);
+		this.initCode = context.read();
+		const c1 = context.rest;
+		this.runtimeRequirements = c1.read();
+		const c2 = c1.rest;
+		this.key = c2.read();
+		super.deserialize(c2.rest);
 	}
 }
 

package/lib/dependencies/ProvidedDependency.js

@@ -7,7 +7,10 @@
 
 const Dependency = require("../Dependency");
 const InitFragment = require("../InitFragment");
+const Template = require("../Template");
+const { InlinedUsedName } = require("../optimize/InlineExports");
 const makeSerializable = require("../util/makeSerializable");
+const { propertyAccess } = require("../util/property");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
@@ -18,21 +21,11 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, ExportInfoName[]]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, ExportInfoName[]]>} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
-/**
- * Returns the converted path.
- * @param {string[] | null} path the property path array
- * @returns {string} the converted path
- */
-const pathToString = (path) =>
-	path !== null && path.length > 0
-		? path.map((part) => `[${JSON.stringify(part)}]`).join("")
-		: "";
-
 class ProvidedDependency extends ModuleDependency {
 	/**
 	 * Creates an instance of ProvidedDependency.
@@ -43,7 +36,9 @@ class ProvidedDependency extends ModuleDependency {
 	 */
 	constructor(request, identifier, ids, range) {
 		super(request);
+		/** @type {string} */
 		this.identifier = identifier;
+		/** @type {string[]} */
 		this.ids = ids;
 		this.range = range;
 		/** @type {undefined | string} */
@@ -88,9 +83,7 @@ class ProvidedDependency extends ModuleDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.identifier);
-		write(this.ids);
+		context.write(this.identifier).write(this.ids);
 		super.serialize(context);
 	}
 
@@ -99,10 +92,10 @@ class ProvidedDependency extends ModuleDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.identifier = read();
-		this.ids = read();
-		super.deserialize(context);
+		this.identifier = context.read();
+		const c1 = context.rest;
+		this.ids = c1.read();
+		super.deserialize(c1.rest);
 	}
 }
 
@@ -137,16 +130,27 @@ class ProvidedDependencyTemplate extends ModuleDependency.Template {
 			(moduleGraph.getConnection(dep));
 		const exportsInfo = moduleGraph.getExportsInfo(connection.module);
 		const usedName = exportsInfo.getUsedName(dep.ids, runtime);
+
+		const moduleRaw = runtimeTemplate.moduleRaw({
+			module: moduleGraph.getModule(dep),
+			chunkGraph,
+			request: dep.request,
+			runtimeRequirements
+		});
+
+		const provided = !usedName
+			? moduleRaw
+			: usedName instanceof InlinedUsedName
+				? `(${moduleRaw}, ${usedName.render(
+						Template.toNormalComment(
+							`inlined export ${propertyAccess(dep.ids)}`
+						)
+					)})`
+				: `${moduleRaw}${propertyAccess(usedName, 0)}`;
+
 		initFragments.push(
 			new InitFragment(
-				`/* provided dependency */ var ${
-					dep.identifier
-				} = ${runtimeTemplate.moduleExports({
-					module: moduleGraph.getModule(dep),
-					chunkGraph,
-					request: dep.request,
-					runtimeRequirements
-				})}${pathToString(/** @type {string[] | null} */ (usedName))};\n`,
+				`/* provided dependency */ var ${dep.identifier} = ${provided};\n`,
 				InitFragment.STAGE_PROVIDES,
 				1,
 				`provided ${dep.identifier}`

package/lib/dependencies/PureExpressionDependency.js

@@ -19,8 +19,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Set<string> | false]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Set<string> | false]>} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 
 class PureExpressionDependency extends NullDependency {
@@ -100,9 +100,7 @@ class PureExpressionDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.range);
-		write(this.usedByExports);
+		context.write(this.range).write(this.usedByExports);
 		super.serialize(context);
 	}
 
@@ -111,10 +109,10 @@ class PureExpressionDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.range = read();
-		this.usedByExports = read();
-		super.deserialize(context);
+		this.range = context.read();
+		const c1 = context.rest;
+		this.usedByExports = c1.read();
+		super.deserialize(c1.rest);
 	}
 }
 

package/lib/dependencies/RequireEnsureDependency.js

@@ -14,8 +14,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range, Range | false]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, Range | false]>} ObjectSerializerContext */
 
 class RequireEnsureDependency extends NullDependency {
 	/**
@@ -41,11 +41,10 @@ class RequireEnsureDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.range);
-		write(this.contentRange);
-		write(this.errorHandlerRange);
+		context
+			.write(this.range)
+			.write(this.contentRange)
+			.write(this.errorHandlerRange);
 
 		super.serialize(context);
 	}
@@ -55,13 +54,13 @@ class RequireEnsureDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.range = read();
-		this.contentRange = read();
-		this.errorHandlerRange = read();
+		this.range = context.read();
+		const c1 = context.rest;
+		this.contentRange = c1.read();
+		const c2 = c1.rest;
+		this.errorHandlerRange = c2.read();
 
-		super.deserialize(context);
+		super.deserialize(c2.rest);
 	}
 }
 

package/lib/dependencies/RequireHeaderDependency.js

@@ -13,8 +13,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
 
 class RequireHeaderDependency extends NullDependency {
 	/**
@@ -32,8 +32,7 @@ class RequireHeaderDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.range);
+		context.write(this.range);
 		super.serialize(context);
 	}
 

package/lib/dependencies/RequireIncludeDependencyParserPlugin.js

@@ -25,6 +25,7 @@ module.exports = class RequireIncludeDependencyParserPlugin {
 	 * @param {boolean} warn true: warn about deprecation, false: don't warn
 	 */
 	constructor(warn) {
+		/** @type {boolean} */
 		this.warn = warn;
 	}
 
@@ -90,8 +91,10 @@ class RequireIncludeDeprecationWarning extends WebpackError {
 	constructor(loc) {
 		super("require.include() is deprecated and will be removed soon.");
 
+		/** @type {string} */
 		this.name = "RequireIncludeDeprecationWarning";
 
+		/** @type {DependencyLocation} */
 		this.loc = loc;
 	}
 }

package/lib/dependencies/RequireResolveContextDependency.js

@@ -10,8 +10,8 @@ const ContextDependency = require("./ContextDependency");
 const ContextDependencyTemplateAsId = require("./ContextDependencyTemplateAsId");
 
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range]>} ObjectSerializerContext */
 /** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */
 
 class RequireResolveContextDependency extends ContextDependency {
@@ -38,10 +38,7 @@ class RequireResolveContextDependency extends ContextDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.range);
-		write(this.valueRange);
+		context.write(this.range).write(this.valueRange);
 
 		super.serialize(context);
 	}
@@ -51,12 +48,11 @@ class RequireResolveContextDependency extends ContextDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.range = read();
-		this.valueRange = read();
+		this.range = context.read();
+		const c1 = context.rest;
+		this.valueRange = c1.read();
 
-		super.deserialize(context);
+		super.deserialize(c1.rest);
 	}
 }
 

package/lib/dependencies/RequireResolveDependency.js

@@ -26,6 +26,7 @@ class RequireResolveDependency extends ModuleDependency {
 		super(request);
 
 		this.range = range;
+		/** @type {string | undefined} */
 		this._context = context;
 	}
 

package/lib/dependencies/RequireResolveHeaderDependency.js

@@ -12,8 +12,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
 
 class RequireResolveHeaderDependency extends NullDependency {
 	/**
@@ -33,9 +33,7 @@ class RequireResolveHeaderDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.range);
+		context.write(this.range);
 
 		super.serialize(context);
 	}

package/lib/dependencies/RuntimeRequirementsDependency.js

@@ -13,8 +13,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Set<string>]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Set<string>]>} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 
 class RuntimeRequirementsDependency extends NullDependency {
@@ -24,6 +24,7 @@ class RuntimeRequirementsDependency extends NullDependency {
 	 */
 	constructor(runtimeRequirements) {
 		super();
+		/** @type {Set<string>} */
 		this.runtimeRequirements = new Set(runtimeRequirements);
 		/** @type {undefined | string} */
 		this._hashUpdate = undefined;
@@ -47,8 +48,7 @@ class RuntimeRequirementsDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.runtimeRequirements);
+		context.write(this.runtimeRequirements);
 		super.serialize(context);
 	}
 
@@ -57,9 +57,8 @@ class RuntimeRequirementsDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.runtimeRequirements = read();
-		super.deserialize(context);
+		this.runtimeRequirements = context.read();
+		super.deserialize(context.rest);
 	}
 }