webpack 5.107.1 → 5.108.0

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

package/lib/dependencies/StaticExportsDependency.js

@@ -10,11 +10,11 @@ const NullDependency = require("./NullDependency");
 
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-
 /** @typedef {string[] | true} Exports */
 
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Exports, boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Exports, boolean]>} ObjectSerializerContext */
+
 class StaticExportsDependency extends NullDependency {
 	/**
 	 * Creates an instance of StaticExportsDependency.
@@ -23,7 +23,9 @@ class StaticExportsDependency extends NullDependency {
 	 */
 	constructor(exports, canMangle) {
 		super();
+		/** @type {Exports} */
 		this.exports = exports;
+		/** @type {boolean} */
 		this.canMangle = canMangle;
 	}
 
@@ -49,9 +51,7 @@ class StaticExportsDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.exports);
-		write(this.canMangle);
+		context.write(this.exports).write(this.canMangle);
 		super.serialize(context);
 	}
 
@@ -60,10 +60,10 @@ class StaticExportsDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.exports = read();
-		this.canMangle = read();
-		super.deserialize(context);
+		this.exports = context.read();
+		const c1 = context.rest;
+		this.canMangle = c1.read();
+		super.deserialize(c1.rest);
 	}
 }
 

package/lib/dependencies/SystemPlugin.js

@@ -155,8 +155,10 @@ class SystemImportDeprecationWarning extends WebpackError {
 				"For more info visit https://webpack.js.org/guides/code-splitting/"
 		);
 
+		/** @type {string} */
 		this.name = "SystemImportDeprecationWarning";
 
+		/** @type {DependencyLocation} */
 		this.loc = loc;
 	}
 }

package/lib/dependencies/URLContextDependency.js

@@ -11,8 +11,8 @@ const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTempl
 
 /** @typedef {import("../ContextModule").ContextOptions} ContextOptions */
 /** @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 */
 
 /** @typedef {ContextOptions & { request: string }} ContextDependencyOptions */
 
@@ -42,8 +42,7 @@ class URLContextDependency extends ContextDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.valueRange);
+		context.write(this.valueRange);
 		super.serialize(context);
 	}
 
@@ -52,9 +51,8 @@ class URLContextDependency extends ContextDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.valueRange = read();
-		super.deserialize(context);
+		this.valueRange = context.read();
+		super.deserialize(context.rest);
 	}
 }
 

package/lib/dependencies/URLDependency.js

@@ -22,8 +22,8 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../optimize/InnerGraph").UsedByExports} UsedByExports */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, boolean, UsedByExports | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, boolean, UsedByExports | undefined]>} ObjectSerializerContext */
 
 const getIgnoredRawDataUrlModule = memoize(
 	() => new RawDataUrlModule("data:,", "ignored-asset", "(ignored asset)")
@@ -41,6 +41,7 @@ class URLDependency extends ModuleDependency {
 		super(request);
 		this.range = range;
 		this.outerRange = outerRange;
+		/** @type {boolean} */
 		this.relative = relative || false;
 		/** @type {UsedByExports | undefined} */
 		this.usedByExports = undefined;
@@ -60,11 +61,7 @@ class URLDependency extends ModuleDependency {
 	 * @returns {null | false | GetConditionFn} function to determine if the connection is active
 	 */
 	getCondition(moduleGraph) {
-		return getDependencyUsedByExportsCondition(
-			this,
-			this.usedByExports,
-			moduleGraph
-		);
+		return getDependencyUsedByExportsCondition(this, moduleGraph);
 	}
 
 	/**
@@ -81,10 +78,10 @@ class URLDependency extends ModuleDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.outerRange);
-		write(this.relative);
-		write(this.usedByExports);
+		context
+			.write(this.outerRange)
+			.write(this.relative)
+			.write(this.usedByExports);
 		super.serialize(context);
 	}
 
@@ -93,11 +90,12 @@ class URLDependency extends ModuleDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.outerRange = read();
-		this.relative = read();
-		this.usedByExports = read();
-		super.deserialize(context);
+		this.outerRange = context.read();
+		const c1 = context.rest;
+		this.relative = c1.read();
+		const c2 = c1.rest;
+		this.usedByExports = c2.read();
+		super.deserialize(c2.rest);
 	}
 }
 

package/lib/dependencies/UnsupportedDependency.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<[string, Range]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, Range]>} ObjectSerializerContext */
 
 class UnsupportedDependency extends NullDependency {
 	/**
@@ -24,6 +24,7 @@ class UnsupportedDependency extends NullDependency {
 	constructor(request, range) {
 		super();
 
+		/** @type {string} */
 		this.request = request;
 		this.range = range;
 	}
@@ -33,11 +34,7 @@ class UnsupportedDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.request);
-		write(this.range);
-
+		context.write(this.request).write(this.range);
 		super.serialize(context);
 	}
 
@@ -46,12 +43,10 @@ class UnsupportedDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.request = read();
-		this.range = read();
-
-		super.deserialize(context);
+		this.request = context.read();
+		const c1 = context.rest;
+		this.range = c1.read();
+		super.deserialize(c1.rest);
 	}
 }
 

package/lib/dependencies/WebAssemblyExportImportedDependency.js

@@ -12,8 +12,8 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string, string]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, string, string]>} ObjectSerializerContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class WebAssemblyExportImportedDependency extends ModuleDependency {
@@ -49,7 +49,8 @@ class WebAssemblyExportImportedDependency extends ModuleDependency {
 	 * @returns {ReferencedExports} referenced exports
 	 */
 	getReferencedExports(moduleGraph, runtime) {
-		return [[this.name]];
+		// re-exporting wasm glue needs the real binding, never an inlined literal
+		return [{ name: [this.name], canInline: false }];
 	}
 
 	get type() {
@@ -65,12 +66,7 @@ class WebAssemblyExportImportedDependency extends ModuleDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.exportName);
-		write(this.name);
-		write(this.valueType);
-
+		context.write(this.exportName).write(this.name).write(this.valueType);
 		super.serialize(context);
 	}
 
@@ -79,13 +75,12 @@ class WebAssemblyExportImportedDependency extends ModuleDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.exportName = read();
-		this.name = read();
-		this.valueType = read();
-
-		super.deserialize(context);
+		this.exportName = context.read();
+		const c1 = context.rest;
+		this.name = c1.read();
+		const c2 = c1.rest;
+		this.valueType = c2.read();
+		super.deserialize(c2.rest);
 	}
 }