vinext 1.0.0-beta.8 → 1.0.0

package/dist/plugins/import-meta-url.js

@@ -1,11 +1,11 @@
 import path, { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
-import { canonicalizeFilePath, isPathInsideOrEqual, stripViteModuleQuery } from "../utils/path.js";
+import { SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, isIdentifierNamed, scriptParserLanguage } from "./ast-utils.js";
 import { magicStringTransformResult } from "./transform-result.js";
+import { canonicalizeFilePath, isPathInsideOrEqual, stripViteModuleQuery } from "../utils/path.js";
 import { VIRTUAL_MODULE_ID_RE } from "../utils/virtual-module.js";
-import { SCRIPT_MODULE_ID_RE, collectBindingNames, forEachAstChild, hasRange, isAstRecord, isIdentifierNamed, nodeArray, scriptParserLanguage } from "./ast-utils.js";
 import fs from "node:fs";
-import { parseAst } from "vite";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { parseAst } from "vite";
 import { randomUUID } from "node:crypto";
 import MagicString from "magic-string";
 //#region src/plugins/import-meta-url.ts
@@ -372,7 +372,8 @@ function excludedRelativePrefixes(canonicalRoot, options) {
 		"out"
 	]);
 	for (const outputDir of options.outputDirs ?? []) {
-		const canonicalOutputDir = canonicalizeFilePath(path.isAbsolute(outputDir) ? outputDir : path.resolve(canonicalRoot, outputDir));
+		const absoluteOutputDir = path.isAbsolute(outputDir) ? outputDir : path.resolve(canonicalRoot, outputDir);
+		const canonicalOutputDir = canonicalizeFilePath(absoluteOutputDir);
 		if (!isPathInsideOrEqual(canonicalRoot, canonicalOutputDir)) continue;
 		const relativePath = path.relative(canonicalRoot, canonicalOutputDir);
 		if (relativePath && relativePath !== ".") prefixes.add(relativePath);
@@ -389,7 +390,6 @@ function importMetaUrlValue(canonicalId, rootPaths, environment) {
 function collectImportMetaUrlRanges(ast) {
 	const ranges = [];
 	function visit(value) {
-		if (!isAstRecord(value)) return;
 		if (isImportMetaUrlNode(value)) {
 			ranges.push({
 				start: value.start,
@@ -405,7 +405,7 @@ function collectImportMetaUrlRanges(ast) {
 			return;
 		}
 		if (isNewUrlExpression(value)) {
-			const args = nodeArray(value.arguments);
+			const args = value.arguments;
 			for (let index = 0; index < args.length; index += 1) {
 				if (index === 1 && isImportMetaUrlBaseNode(args[index])) continue;
 				visit(args[index]);
@@ -441,47 +441,41 @@ function analyzeServerCjsGlobals(ast) {
 		for (const name of names) if (isCjsGlobalName(name)) moduleBindings.add(name);
 	}
 	function recordDirectTopLevelBindings(statement) {
-		if (statement.declare === true) return;
 		switch (statement.type) {
 			case "ImportDeclaration":
-				for (const specifier of nodeArray(statement.specifiers)) {
-					if (!isAstRecord(specifier)) continue;
+				if (statement.importKind === "type") return;
+				for (const specifier of statement.specifiers) {
+					if (specifier.type === "ImportSpecifier" && specifier.importKind === "type") continue;
 					recordBinding(specifier.local);
 				}
 				return;
 			case "VariableDeclaration":
-				if (statement.kind === "var") return;
-				for (const declarator of nodeArray(statement.declarations)) {
-					if (!isAstRecord(declarator) || declarator.type !== "VariableDeclarator") continue;
-					recordBinding(declarator.id);
-				}
+				if (statement.kind === "var" || statement.declare === true) return;
+				for (const declarator of statement.declarations) recordBinding(declarator.id);
 				return;
 			case "FunctionDeclaration":
 			case "ClassDeclaration":
+				if (statement.declare === true) return;
 				recordBinding(statement.id);
 				return;
 			case "ExportNamedDeclaration":
 			case "ExportDefaultDeclaration":
-				if (isAstRecord(statement.declaration)) recordDirectTopLevelBindings(statement.declaration);
+				if (statement.declaration) recordDirectTopLevelBindings(statement.declaration);
 				return;
 		}
 	}
 	function recordModuleScopedVarBindings(node) {
-		if (!isAstRecord(node)) return;
+		if (!node) return;
 		switch (node.type) {
 			case "Program":
-				for (const statement of nodeArray(node.body)) {
-					if (!isAstRecord(statement)) continue;
+				for (const statement of node.body) {
 					recordDirectTopLevelBindings(statement);
 					recordModuleScopedVarBindings(statement);
 				}
 				return;
 			case "VariableDeclaration":
 				if (node.kind !== "var" || node.declare === true) return;
-				for (const declarator of nodeArray(node.declarations)) {
-					if (!isAstRecord(declarator) || declarator.type !== "VariableDeclarator") continue;
-					recordBinding(declarator.id);
-				}
+				for (const declarator of node.declarations) recordBinding(declarator.id);
 				return;
 			case "FunctionDeclaration":
 			case "FunctionExpression":
@@ -493,10 +487,10 @@ function analyzeServerCjsGlobals(ast) {
 	}
 	function moduleScopeChildren(node) {
 		switch (node.type) {
-			case "BlockStatement": return nodeArray(node.body);
+			case "BlockStatement": return node.body;
 			case "IfStatement": return [node.consequent, node.alternate];
-			case "SwitchStatement": return nodeArray(node.cases);
-			case "SwitchCase": return nodeArray(node.consequent);
+			case "SwitchStatement": return node.cases;
+			case "SwitchCase": return node.consequent;
 			case "TryStatement": return [
 				node.block,
 				node.handler,
@@ -516,7 +510,7 @@ function analyzeServerCjsGlobals(ast) {
 		}
 	}
 	function recordReads(value) {
-		if (!isAstRecord(value)) return;
+		if (!value) return;
 		switch (value.type) {
 			case "Identifier":
 				if (isCjsGlobalName(value.name)) reads.add(value.name);
@@ -537,15 +531,13 @@ function analyzeServerCjsGlobals(ast) {
 			case "ImportDeclaration": return;
 			case "ExportAllDeclaration": return;
 			case "ExportNamedDeclaration":
-				if (isAstRecord(value.declaration)) recordReads(value.declaration);
-				else if (!value.source) {
-					for (const specifier of nodeArray(value.specifiers)) if (isAstRecord(specifier)) recordReads(specifier.local);
-				}
+				if (value.declaration) recordReads(value.declaration);
+				else if (!value.source) for (const specifier of value.specifiers) recordReads(specifier.local);
 				return;
 			default: forEachAstChild(value, recordReads);
 		}
 	}
-	if (isAstRecord(ast) && ast.type === "Program") recordModuleScopedVarBindings(ast);
+	recordModuleScopedVarBindings(ast);
 	recordReads(ast);
 	return {
 		reads,
@@ -553,33 +545,29 @@ function analyzeServerCjsGlobals(ast) {
 	};
 }
 function isImportMetaNode(value) {
-	return isAstRecord(value) && value.type === "MetaProperty" && isIdentifierNamed(value.meta, "import") && isIdentifierNamed(value.property, "meta");
+	return value.type === "MetaProperty" && isIdentifierNamed(value.meta, "import") && isIdentifierNamed(value.property, "meta");
 }
 function isImportMetaUrlNode(value) {
-	return isAstRecord(value) && value.type === "MemberExpression" && hasRange(value) && isImportMetaNode(value.object) && isIdentifierNamed(value.property, "url");
+	return value.type === "MemberExpression" && isImportMetaNode(value.object) && isIdentifierNamed(value.property, "url");
 }
 function isImportMetaUrlOrChainedNode(value) {
 	if (isImportMetaUrlNode(value)) return true;
-	return isAstRecord(value) && value.type === "ChainExpression" && isImportMetaUrlNode(value.expression);
+	return value.type === "ChainExpression" && isImportMetaUrlNode(value.expression);
 }
 function isImportMetaUrlBaseNode(value) {
 	if (isImportMetaUrlOrChainedNode(value)) return true;
-	return isAstRecord(value) && value.type === "BinaryExpression" && value.operator === "+" && isAstRecord(value.left) && value.left.type === "Literal" && value.left.value === "" && isImportMetaUrlOrChainedNode(value.right);
+	return value.type === "BinaryExpression" && value.operator === "+" && value.left.type === "Literal" && value.left.value === "" && isImportMetaUrlOrChainedNode(value.right);
 }
 function isChainExpressionWrappingImportMetaUrl(value) {
-	return isAstRecord(value) && value.type === "ChainExpression" && hasRange(value) && isImportMetaUrlNode(value.expression);
+	return value.type === "ChainExpression" && isImportMetaUrlNode(value.expression);
 }
 function isNewUrlExpression(value) {
 	return value.type === "NewExpression" && isIdentifierNamed(value.callee, "URL");
 }
 function findDirectivePrologueEnd(ast) {
-	if (!isAstRecord(ast) || ast.type !== "Program") return 0;
-	let end = 0;
-	const hashbang = ast.hashbang;
-	const hashbangEnd = typeof hashbang === "object" && hashbang !== null ? Reflect.get(hashbang, "end") : null;
-	if (typeof hashbangEnd === "number") end = hashbangEnd;
-	for (const statement of nodeArray(ast.body)) {
-		if (!isAstRecord(statement) || statement.type !== "ExpressionStatement" || !isAstRecord(statement.expression) || statement.expression.type !== "Literal" || typeof statement.expression.value !== "string" || typeof statement.end !== "number") break;
+	let end = ast.hashbang?.end ?? 0;
+	for (const statement of ast.body) {
+		if (statement.type !== "ExpressionStatement" || statement.expression.type !== "Literal" || typeof statement.expression.value !== "string") break;
 		end = statement.end;
 	}
 	return end;

package/dist/plugins/instrumentation-client.d.ts

@@ -1,5 +1,5 @@
 import { Plugin } from "vite";
 //#region src/plugins/instrumentation-client.d.ts
-declare function createInstrumentationClientTransformPlugin(getInstrumentationClientPath: () => string | null): Plugin;
-//#endregion
-export { createInstrumentationClientTransformPlugin };
+export declare function createInstrumentationServerTransformPlugin(getInstrumentationPath: () => string | null, getValues: () => Record<string, unknown>): Plugin;
+export declare function createInstrumentationClientTransformPlugin(getInstrumentationClientPath: () => string | null, getRouteManifest: () => string | undefined): Plugin;
+//#endregion

package/dist/plugins/instrumentation-client.js

@@ -1,26 +1,62 @@
-import { stripViteModuleQuery } from "../utils/path.js";
 import { magicStringTransformResult } from "./transform-result.js";
+import { stripViteModuleQuery } from "../utils/path.js";
 import { normalizePath, parseAst } from "vite";
 import MagicString from "magic-string";
 //#region src/plugins/instrumentation-client.ts
-function createInstrumentationClientTransformPlugin(getInstrumentationClientPath) {
+function insertionPositionAfterDirectives(code) {
+	const ast = parseAst(code);
+	let insertPos = 0;
+	for (const node of ast.body) {
+		if (node.type !== "ExpressionStatement" || node.directive === void 0) break;
+		insertPos = node.end;
+	}
+	return insertPos;
+}
+function createInstrumentationServerTransformPlugin(getInstrumentationPath, getValues) {
+	return {
+		name: "vinext:instrumentation-server-values",
+		applyToEnvironment(environment) {
+			return environment.name !== "client";
+		},
+		transform(code, id) {
+			const instrumentationPath = getInstrumentationPath();
+			if (!instrumentationPath) return null;
+			if (normalizePath(stripViteModuleQuery(id)) !== instrumentationPath) return null;
+			const entries = Object.entries(getValues());
+			if (entries.length === 0 || code.includes("__vinextInstrumentationServerValues")) return null;
+			const assignments = entries.map(([key, value]) => {
+				const serialized = JSON.stringify(value);
+				return `globalThis[${JSON.stringify(key)}] = ${serialized ?? "undefined"};`;
+			}).join("\n");
+			const s = new MagicString(code);
+			s.appendLeft(insertionPositionAfterDirectives(code), `\n/* __vinextInstrumentationServerValues */\n${assignments}\n`);
+			return magicStringTransformResult(s, { hires: true });
+		}
+	};
+}
+function createInstrumentationClientTransformPlugin(getInstrumentationClientPath, getRouteManifest) {
+	let isDev = false;
 	return {
 		name: "vinext:instrumentation-client",
-		apply: "serve",
+		configResolved(config) {
+			isDev = config.command === "serve";
+		},
 		transform(code, id) {
 			const instrumentationClientPath = getInstrumentationClientPath();
 			if (!instrumentationClientPath) return null;
 			if (normalizePath(stripViteModuleQuery(id)) !== instrumentationClientPath) return null;
-			if (code.includes("__vinextInstrumentationClientStart")) return null;
-			const ast = parseAst(code);
-			let insertPos = 0;
-			for (const node of ast.body) if (node.type === "ImportDeclaration") insertPos = node.end;
+			const routeManifest = getRouteManifest();
+			const shouldInjectManifest = routeManifest !== void 0 && !code.includes("globalThis[\"_sentryRouteManifest\"]");
+			const shouldInjectDevTimer = isDev && !code.includes("__vinextInstrumentationClientStart");
+			if (!shouldInjectManifest && !shouldInjectDevTimer) return null;
+			const insertPos = insertionPositionAfterDirectives(code);
 			const s = new MagicString(code);
-			s.appendLeft(insertPos, "\nconst __vinextInstrumentationClientStart = performance.now();\n");
-			s.append("\nconst __vinextInstrumentationClientEnd = performance.now();\nconst __vinextInstrumentationClientDuration = __vinextInstrumentationClientEnd - __vinextInstrumentationClientStart;\n// Match Next.js: only report slow client instrumentation during dev.\n// Production should execute the hook without additional timing overhead.\nif (__vinextInstrumentationClientDuration > 16) {\n  console.log(`[Client Instrumentation Hook] Slow execution detected: ${__vinextInstrumentationClientDuration.toFixed(0)}ms (Note: Code download overhead is not included in this measurement)`);\n}\n");
+			const preamble = [shouldInjectManifest ? `globalThis["_sentryRouteManifest"] = ${JSON.stringify(routeManifest)};` : "", shouldInjectDevTimer ? "const __vinextInstrumentationClientStart = performance.now();" : ""].filter(Boolean).join("\n");
+			s.appendLeft(insertPos, `\n${preamble}\n`);
+			if (shouldInjectDevTimer) s.append("\nconst __vinextInstrumentationClientEnd = performance.now();\nconst __vinextInstrumentationClientDuration = __vinextInstrumentationClientEnd - __vinextInstrumentationClientStart;\n// Match Next.js: only report slow client instrumentation during dev.\n// Production should execute the hook without additional timing overhead.\nif (__vinextInstrumentationClientDuration > 16) {\n  console.log(`[Client Instrumentation Hook] Slow execution detected: ${__vinextInstrumentationClientDuration.toFixed(0)}ms (Note: Code download overhead is not included in this measurement)`);\n}\n");
 			return magicStringTransformResult(s, { hires: true });
 		}
 	};
 }
 //#endregion
-export { createInstrumentationClientTransformPlugin };
+export { createInstrumentationClientTransformPlugin, createInstrumentationServerTransformPlugin };

package/dist/plugins/middleware-export-validation.d.ts

@@ -1,5 +1,4 @@
 //#region src/plugins/middleware-export-validation.d.ts
-declare function hasValidMiddlewareModuleExport(source: string, id: string, isProxy: boolean): boolean;
-declare function validateMiddlewareModuleExports(source: string, id: string, filePath: string, isProxy: boolean): void;
-//#endregion
-export { hasValidMiddlewareModuleExport, validateMiddlewareModuleExports };
+export declare function hasValidMiddlewareModuleExport(source: string, id: string, isProxy: boolean): boolean;
+export declare function validateMiddlewareModuleExports(source: string, id: string, filePath: string, isProxy: boolean): void;
+//#endregion

package/dist/plugins/middleware-export-validation.js

@@ -1,5 +1,5 @@
-import { createMiddlewareMissingExportError } from "../server/middleware-runtime.js";
 import { getAstName, scriptParserLanguage } from "./ast-utils.js";
+import { createMiddlewareMissingExportError } from "../server/middleware-runtime.js";
 import { parseAst } from "vite";
 //#region src/plugins/middleware-export-validation.ts
 function hasValidMiddlewareModuleExport(source, id, isProxy) {
@@ -11,9 +11,9 @@ function hasValidMiddlewareModuleExport(source, id, isProxy) {
 		const declaration = statement.declaration;
 		if (declaration?.type === "FunctionDeclaration" && getAstName(declaration.id) === expectedExport) return true;
 		if (declaration?.type === "VariableDeclaration") {
-			for (const declarator of declaration.declarations ?? []) if (getAstName(declarator.id) === expectedExport) return true;
+			for (const declarator of declaration.declarations) if (getAstName(declarator.id) === expectedExport) return true;
 		}
-		for (const specifier of statement.specifiers ?? []) if (getAstName(specifier.exported ?? specifier.local) === expectedExport) return true;
+		for (const specifier of statement.specifiers) if (getAstName(specifier.exported) === expectedExport) return true;
 	}
 	return false;
 }

package/dist/plugins/middleware-server-only.d.ts

@@ -44,11 +44,10 @@ import { Plugin } from "vite";
  * `WEBPACK_LAYERS.GROUP.neutralTarget`:
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/webpack-config.ts
  */
-declare function createMiddlewareServerOnlyPlugin(options: {
+export declare function createMiddlewareServerOnlyPlugin(options: {
   getMiddlewarePath: () => string | null;
   getCanonicalMiddlewarePath: () => string | null;
   isNeutralServerModule?: (id: string) => boolean;
   serverOnlyShimPath: string;
 }): Plugin;
-//#endregion
-export { createMiddlewareServerOnlyPlugin };
+//#endregion

package/dist/plugins/og-asset-ownership.d.ts

@@ -1,10 +1,10 @@
 import { Alias } from "vite";
 //#region src/plugins/og-asset-ownership.d.ts
-type OgAssetModuleBoundary = {
+export type OgAssetModuleBoundary = {
   assetRoot: string;
   moduleDir: string;
 };
-declare class OgAssetOwnership {
+export declare class OgAssetOwnership {
   private projectRoot;
   private readonly linkedPackageRoots;
   private readonly dependencyPackageNames;
@@ -22,5 +22,4 @@ declare class OgAssetOwnership {
   private resolveAliasPackageRoot;
   private resolveConfiguredAliasRoot;
 }
-//#endregion
-export { OgAssetModuleBoundary, OgAssetOwnership };
+//#endregion

package/dist/plugins/og-assets.d.ts

@@ -10,7 +10,7 @@ import { Plugin } from "vite";
  * correctly inside Cloudflare Workers where `import.meta.url` is not a
  * valid file URL.
  */
-declare function createOgInlineFetchAssetsPlugin(): Plugin;
+export declare function createOgInlineFetchAssetsPlugin(): Plugin;
 /**
  * Copy a single root copy of each requested WASM asset from `sourceDir` into
  * `outDir`, skipping any asset whose source is missing or whose destination
@@ -21,7 +21,7 @@ declare function createOgInlineFetchAssetsPlugin(): Plugin;
  * install (whose `yoga.wasm` is only materialized as a side effect of the
  * `vinext:og-font-patch` transform during a build).
  */
-declare function copyMissingOgWasm(opts: {
+export declare function copyMissingOgWasm(opts: {
   outDir: string;
   sourceDir: string;
   assets: readonly string[];
@@ -44,6 +44,5 @@ declare function copyMissingOgWasm(opts: {
  * The decision keys off "did the bundler emit this asset?", never the deploy
  * target — so it helps Node/self-hosted builds as well as Cloudflare Workers.
  */
-declare function createOgAssetsPlugin(): Plugin;
-//#endregion
-export { copyMissingOgWasm, createOgAssetsPlugin, createOgInlineFetchAssetsPlugin };
+export declare function createOgAssetsPlugin(): Plugin;
+//#endregion

package/dist/plugins/og-assets.js

@@ -1,5 +1,6 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { magicStringTransformResult } from "./transform-result.js";
+import { resolveHarfbuzzWasmPath } from "./og-harfbuzz.js";
 import { OgAssetOwnership } from "./og-asset-ownership.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
@@ -94,7 +95,11 @@ function createOgInlineFetchAssetsPlugin() {
 		}
 	};
 }
-const OG_WASM_ASSETS = ["resvg.wasm", "yoga.wasm"];
+const OG_WASM_ASSETS = [
+	"resvg.wasm",
+	"yoga.wasm",
+	"hb.wasm"
+];
 /**
 * Find an emitted WASM asset in the output bundle whose name corresponds to the
 * given base file (e.g. base `resvg.wasm` matches the emitted `resvg-HASH.wasm`).
@@ -105,15 +110,20 @@ const OG_WASM_ASSETS = ["resvg.wasm", "yoga.wasm"];
 *
 * @returns the emitted asset's `fileName` (relative to outDir), or null.
 */
-function findEmittedWasmAsset(bundle, baseName) {
+function findEmittedWasmAsset(bundle, baseName, expectedSource) {
 	const stem = baseName.replace(/\.wasm$/, "");
 	const re = new RegExp(`^${stem}(?:[-.][\\w-]+)?\\.wasm$`);
 	for (const output of Object.values(bundle)) {
 		if (output.type !== "asset") continue;
-		if (re.test(path.basename(output.fileName))) return output.fileName;
+		if (!re.test(path.basename(output.fileName))) continue;
+		if (expectedSource && !isSameBytes(output.source, expectedSource)) continue;
+		return output.fileName;
 	}
 	return null;
 }
+function isSameBytes(source, expected) {
+	return source instanceof Uint8Array && Buffer.from(source).equals(expected);
+}
 /**
 * Build the regex that matches the Node.js fallback reference
 * `new URL("./<base>", import.meta.url)` for a given WASM base name.
@@ -162,7 +172,7 @@ function copyMissingOgWasm(opts) {
 * target — so it helps Node/self-hosted builds as well as Cloudflare Workers.
 */
 function createOgAssetsPlugin() {
-	let dedupedBases = /* @__PURE__ */ new Set();
+	const dedupedBasesByEnvironment = /* @__PURE__ */ new Map();
 	return {
 		name: "vinext:og-assets",
 		apply: "build",
@@ -170,17 +180,18 @@ function createOgAssetsPlugin() {
 		generateBundle: {
 			order: "post",
 			handler(_options, bundle) {
-				if (this.environment?.name !== "rsc") return;
-				dedupedBases = /* @__PURE__ */ new Set();
+				const envName = this.environment?.name;
+				if (envName !== "rsc" && envName !== "ssr") return;
+				const dedupedBases = /* @__PURE__ */ new Set();
+				dedupedBasesByEnvironment.set(envName, dedupedBases);
 				const chunks = Object.values(bundle).filter((o) => o.type === "chunk");
 				for (const base of OG_WASM_ASSETS) {
 					if (!chunks.some((c) => c.code.includes(base))) continue;
-					const emitted = findEmittedWasmAsset(bundle, base);
-					if (!emitted) continue;
+					const emitted = findEmittedWasmAsset(bundle, base, base === "hb.wasm" ? fs.readFileSync(resolveHarfbuzzWasmPath(createRequire(import.meta.url).resolve("@vercel/og"))) : void 0);
 					for (const chunk of chunks) {
 						const re = fallbackUrlRegex(base);
 						const chunkDir = path.dirname(chunk.fileName);
-						const rel = path.relative(chunkDir, emitted);
+						const rel = path.relative(chunkDir, emitted ?? base);
 						const ref = rel.startsWith(".") ? rel : `./${rel}`;
 						const s = new MagicString(chunk.code);
 						let edited = false;
@@ -197,7 +208,7 @@ function createOgAssetsPlugin() {
 							source: chunk.fileName
 						});
 					}
-					dedupedBases.add(base);
+					if (emitted) dedupedBases.add(base);
 				}
 			}
 		},
@@ -205,18 +216,26 @@ function createOgAssetsPlugin() {
 			sequential: true,
 			order: "post",
 			async handler(options, bundle) {
-				if (this.environment?.name !== "rsc") return;
+				const envName = this.environment?.name;
+				if (envName !== "rsc" && envName !== "ssr") return;
 				const outDir = options.dir;
 				if (!outDir) return;
 				const chunkCode = Object.values(bundle).map((output) => output.type === "chunk" ? output.code : "").join("\n");
-				const referencedAssets = OG_WASM_ASSETS.filter((asset) => chunkCode.includes(asset) && !dedupedBases.has(asset));
+				const dedupedBases = dedupedBasesByEnvironment.get(envName);
+				dedupedBasesByEnvironment.delete(envName);
+				const referencedAssets = OG_WASM_ASSETS.filter((asset) => chunkCode.includes(asset) && !dedupedBases?.has(asset));
 				if (referencedAssets.length === 0) return;
 				try {
 					const ogPkgPath = createRequire(import.meta.url).resolve("@vercel/og/package.json");
 					copyMissingOgWasm({
 						outDir,
 						sourceDir: path.join(path.dirname(ogPkgPath), "dist"),
-						assets: referencedAssets
+						assets: referencedAssets.filter((asset) => asset !== "hb.wasm")
+					});
+					if (referencedAssets.includes("hb.wasm")) copyMissingOgWasm({
+						outDir,
+						sourceDir: path.dirname(resolveHarfbuzzWasmPath(ogPkgPath)),
+						assets: ["hb.wasm"]
 					});
 				} catch {}
 			}

package/dist/plugins/og-harfbuzz.d.ts

@@ -0,0 +1,24 @@
+import { Plugin } from "vite";
+//#region src/plugins/og-harfbuzz.d.ts
+/**
+ * Resolve the `hb.wasm` binary that matches the glue inlined in @vercel/og.
+ * @vercel/og and satori pin exact versions, so resolving through
+ * @vercel/og → satori → harfbuzzjs yields the build the bundle was made from.
+ */
+export declare function resolveHarfbuzzWasmPath(ogEntry: string): string;
+/**
+ * Read every function type in a WASM binary as an Emscripten signature (result
+ * letter, or `v` for none, then parameters). Any callback HarfBuzz calls
+ * through its function table must have one of these types, so adapters for
+ * all of them cover every callback the glue can register.
+ */
+export declare function readWasmFunctionSignatures(wasm: Uint8Array): string[];
+/**
+ * Build the module Emscripten's `convertJsFunctionToWasm` compiles for a
+ * signature: it imports a JavaScript function as `e.f` and re-exports it as
+ * `f`. Every section in it is shorter than 128 bytes, so each length and count
+ * is a single LEB128 byte.
+ */
+export declare function createHarfbuzzCallbackWasm(signature: string): Uint8Array<ArrayBuffer>;
+export declare function createOgHarfbuzzPlugin(): Plugin;
+//#endregion