vinext 0.0.37 → 0.0.38

package/dist/index.js

@@ -4,12 +4,12 @@ import { createValidFileMatcher } from "./routing/file-matcher.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "./server/middleware-request-headers.js";
 import { isExternalUrl, matchConfigPattern, matchHeaders, matchRedirect, matchRewrite, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "./config/config-matchers.js";
-import { normalizePath } from "./server/normalize-path.js";
+import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { findMiddlewareFile, runMiddleware } from "./server/middleware.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
 import { appRouter, invalidateAppRouteCache } from "./routing/app-router.js";
-import { findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
+import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
 import { hasBasePath } from "./utils/base-path.js";
 import { logRequest, now } from "./server/request-log.js";
 import { createSSRHandler } from "./server/dev-server.js";
@@ -25,20 +25,24 @@ import { scanMetadataFiles } from "./server/metadata-routes.js";
 import { manifestFileWithBase, manifestFilesWithBase, normalizeManifestFile } from "./utils/manifest-paths.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
+import { createInstrumentationClientTransformPlugin } from "./plugins/instrumentation-client.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
+import { fixUseServerClosureCollisionPlugin } from "./plugins/fix-use-server-closure-collision.js";
+import { createOgInlineFetchAssetsPlugin, ogAssetsPlugin } from "./plugins/og-assets.js";
+import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
 import { formatMissingCloudflarePluginError, hasWranglerConfig } from "./deploy.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
 import { loadEnv, parseAst } from "vite";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { pathToFileURL } from "node:url";
 import { randomBytes } from "node:crypto";
 import MagicString from "magic-string";
 import tsconfigPaths from "vite-tsconfig-paths";
 import commonjs from "vite-plugin-commonjs";
 //#region src/index.ts
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const __dirname = import.meta.dirname;
 function resolveOptionalDependency(projectRoot, specifier) {
 	try {
 		return createRequire(path.join(projectRoot, "package.json")).resolve(specifier);
@@ -55,113 +59,8 @@ function resolveShimModulePath(shimsDir, moduleName) {
 	}
 	return path.join(shimsDir, `${moduleName}.js`);
 }
-/**
-* Fetch Google Fonts CSS, download .woff2 files, cache locally, and return
-* @font-face CSS with local file references.
-*
-* Cache dir structure: .vinext/fonts/<family-hash>/
-*   - style.css (the rewritten @font-face CSS)
-*   - *.woff2 (downloaded font files)
-*/
-async function fetchAndCacheFont(cssUrl, family, cacheDir) {
-	const { createHash } = await import("node:crypto");
-	const urlHash = createHash("md5").update(cssUrl).digest("hex").slice(0, 12);
-	const fontDir = path.join(cacheDir, `${family.toLowerCase().replace(/\s+/g, "-")}-${urlHash}`);
-	const cachedCSSPath = path.join(fontDir, "style.css");
-	if (fs.existsSync(cachedCSSPath)) return fs.readFileSync(cachedCSSPath, "utf-8");
-	const cssResponse = await fetch(cssUrl, { headers: { "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" } });
-	if (!cssResponse.ok) throw new Error(`Failed to fetch Google Fonts CSS: ${cssResponse.status}`);
-	let css = await cssResponse.text();
-	const urlRe = /url\((https:\/\/fonts\.gstatic\.com\/[^)]+)\)/g;
-	const urls = /* @__PURE__ */ new Map();
-	let urlMatch;
-	while ((urlMatch = urlRe.exec(css)) !== null) {
-		const fontUrl = urlMatch[1];
-		if (!urls.has(fontUrl)) {
-			const ext = fontUrl.includes(".woff2") ? ".woff2" : fontUrl.includes(".woff") ? ".woff" : ".ttf";
-			const fileHash = createHash("md5").update(fontUrl).digest("hex").slice(0, 8);
-			urls.set(fontUrl, `${family.toLowerCase().replace(/\s+/g, "-")}-${fileHash}${ext}`);
-		}
-	}
-	fs.mkdirSync(fontDir, { recursive: true });
-	for (const [fontUrl, filename] of urls) {
-		const filePath = path.join(fontDir, filename);
-		if (!fs.existsSync(filePath)) {
-			const fontResponse = await fetch(fontUrl);
-			if (fontResponse.ok) {
-				const buffer = Buffer.from(await fontResponse.arrayBuffer());
-				fs.writeFileSync(filePath, buffer);
-			}
-		}
-		css = css.split(fontUrl).join(filePath);
-	}
-	fs.writeFileSync(cachedCSSPath, css);
-	return css;
-}
-/**
-* Safely parse a static JS object literal string into a plain object.
-* Uses Vite's parseAst (Rollup/acorn) so no code is ever evaluated.
-* Returns null if the expression contains anything dynamic (function calls,
-* template literals, identifiers, computed properties, etc.).
-*
-* Supports: string literals, numeric literals, boolean literals,
-* arrays of the above, and nested object literals.
-*/
-function parseStaticObjectLiteral(objectStr) {
-	let ast;
-	try {
-		ast = parseAst(`(${objectStr})`);
-	} catch {
-		return null;
-	}
-	const body = ast.body;
-	if (body.length !== 1 || body[0].type !== "ExpressionStatement") return null;
-	const expr = body[0].expression;
-	if (expr.type !== "ObjectExpression") return null;
-	const result = extractStaticValue(expr);
-	return result === void 0 ? null : result;
-}
-/**
-* Recursively extract a static value from an ESTree AST node.
-* Returns undefined (not null) if the node contains any dynamic expression.
-*
-* Uses `any` for the node parameter because Rollup's internal ESTree types
-* (estree.Expression, estree.ObjectExpression, etc.) aren't re-exported by Vite,
-* and the recursive traversal touches many different node shapes.
-*/
-function extractStaticValue(node) {
-	switch (node.type) {
-		case "Literal": return node.value;
-		case "UnaryExpression":
-			if (node.operator === "-" && node.argument?.type === "Literal" && typeof node.argument.value === "number") return -node.argument.value;
-			return;
-		case "ArrayExpression": {
-			const arr = [];
-			for (const elem of node.elements) {
-				if (!elem) return void 0;
-				const val = extractStaticValue(elem);
-				if (val === void 0) return void 0;
-				arr.push(val);
-			}
-			return arr;
-		}
-		case "ObjectExpression": {
-			const obj = {};
-			for (const prop of node.properties) {
-				if (prop.type !== "Property") return void 0;
-				if (prop.computed) return void 0;
-				let key;
-				if (prop.key.type === "Identifier") key = prop.key.name;
-				else if (prop.key.type === "Literal" && typeof prop.key.value === "string") key = prop.key.value;
-				else return;
-				const val = extractStaticValue(prop.value);
-				if (val === void 0) return void 0;
-				obj[key] = val;
-			}
-			return obj;
-		}
-		default: return;
-	}
+function toRelativeFileEntry(root, absPath) {
+	return path.relative(root, absPath).split(path.sep).join("/");
 }
 function isRecord(value) {
 	return !!value && typeof value === "object" && !Array.isArray(value);
@@ -378,18 +277,9 @@ const VIRTUAL_APP_SSR_ENTRY = "virtual:vinext-app-ssr-entry";
 const RESOLVED_APP_SSR_ENTRY = "\0" + VIRTUAL_APP_SSR_ENTRY;
 const VIRTUAL_APP_BROWSER_ENTRY = "virtual:vinext-app-browser-entry";
 const RESOLVED_APP_BROWSER_ENTRY = "\0" + VIRTUAL_APP_BROWSER_ENTRY;
-const VIRTUAL_GOOGLE_FONTS = "virtual:vinext-google-fonts";
-const RESOLVED_VIRTUAL_GOOGLE_FONTS = "\0" + VIRTUAL_GOOGLE_FONTS;
 /** Image file extensions handled by the vinext:image-imports plugin.
 *  Shared between the Rolldown hook filter and the transform handler regex. */
 const IMAGE_EXTS = "png|jpe?g|gif|webp|avif|svg|ico|bmp|tiff?";
-const GOOGLE_FONT_UTILITY_EXPORTS = new Set([
-	"buildGoogleFontsUrl",
-	"getSSRFontLinks",
-	"getSSRFontStyles",
-	"getSSRFontPreloads",
-	"createFontLoader"
-]);
 /**
 * Extract the npm package name from a module ID (file path).
 * Returns null if not in node_modules.
@@ -410,101 +300,6 @@ function getPackageName(id) {
 /** Absolute path to vinext's shims directory, used by clientManualChunks. */
 const _shimsDir = path.resolve(__dirname, "shims") + "/";
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
-function parseGoogleFontNamedSpecifiers(specifiersStr, forceType = false) {
-	return specifiersStr.split(",").map((spec) => spec.trim()).filter(Boolean).map((raw) => {
-		const isType = forceType || raw.startsWith("type ");
-		const asParts = (isType ? raw.replace(/^type\s+/, "") : raw).split(/\s+as\s+/);
-		return {
-			imported: asParts[0]?.trim() ?? "",
-			local: (asParts[1] || asParts[0] || "").trim(),
-			isType,
-			raw
-		};
-	}).filter((spec) => spec.imported.length > 0 && spec.local.length > 0);
-}
-function parseGoogleFontImportClause(clause) {
-	const trimmed = clause.trim();
-	if (trimmed.startsWith("type ")) {
-		const braceStart = trimmed.indexOf("{");
-		const braceEnd = trimmed.lastIndexOf("}");
-		if (braceStart === -1 || braceEnd === -1) return {
-			defaultLocal: null,
-			namespaceLocal: null,
-			named: []
-		};
-		return {
-			defaultLocal: null,
-			namespaceLocal: null,
-			named: parseGoogleFontNamedSpecifiers(trimmed.slice(braceStart + 1, braceEnd), true)
-		};
-	}
-	const braceStart = trimmed.indexOf("{");
-	const braceEnd = trimmed.lastIndexOf("}");
-	if (braceStart !== -1 && braceEnd !== -1) return {
-		defaultLocal: trimmed.slice(0, braceStart).trim().replace(/,\s*$/, "").trim() || null,
-		namespaceLocal: null,
-		named: parseGoogleFontNamedSpecifiers(trimmed.slice(braceStart + 1, braceEnd))
-	};
-	const commaIndex = trimmed.indexOf(",");
-	if (commaIndex !== -1) {
-		const defaultLocal = trimmed.slice(0, commaIndex).trim() || null;
-		const rest = trimmed.slice(commaIndex + 1).trim();
-		if (rest.startsWith("* as ")) return {
-			defaultLocal,
-			namespaceLocal: rest.slice(5).trim() || null,
-			named: []
-		};
-	}
-	if (trimmed.startsWith("* as ")) return {
-		defaultLocal: null,
-		namespaceLocal: trimmed.slice(5).trim() || null,
-		named: []
-	};
-	return {
-		defaultLocal: trimmed || null,
-		namespaceLocal: null,
-		named: []
-	};
-}
-function encodeGoogleFontsVirtualId(payload) {
-	const params = new URLSearchParams();
-	if (payload.hasDefault) params.set("default", "1");
-	if (payload.fonts.length > 0) params.set("fonts", payload.fonts.join(","));
-	if (payload.utilities.length > 0) params.set("utilities", payload.utilities.join(","));
-	return `${VIRTUAL_GOOGLE_FONTS}?${params.toString()}`;
-}
-function parseGoogleFontsVirtualId(id) {
-	const cleanId = id.startsWith("\0") ? id.slice(1) : id;
-	if (!cleanId.startsWith(VIRTUAL_GOOGLE_FONTS)) return null;
-	const queryIndex = cleanId.indexOf("?");
-	const params = new URLSearchParams(queryIndex === -1 ? "" : cleanId.slice(queryIndex + 1));
-	return {
-		hasDefault: params.get("default") === "1",
-		fonts: params.get("fonts")?.split(",").map((value) => value.trim()).filter(Boolean) ?? [],
-		utilities: params.get("utilities")?.split(",").map((value) => value.trim()).filter(Boolean) ?? []
-	};
-}
-function generateGoogleFontsVirtualModule(id) {
-	const payload = parseGoogleFontsVirtualId(id);
-	if (!payload) return null;
-	const utilities = Array.from(new Set(payload.utilities));
-	const fonts = Array.from(new Set(payload.fonts));
-	const lines = [];
-	lines.push(`import { createFontLoader } from ${JSON.stringify(_fontGoogleShimPath)};`);
-	const reExports = [];
-	if (payload.hasDefault) reExports.push("default");
-	reExports.push(...utilities);
-	if (reExports.length > 0) lines.push(`export { ${reExports.join(", ")} } from ${JSON.stringify(_fontGoogleShimPath)};`);
-	for (const fontName of fonts) {
-		const family = fontName.replace(/_/g, " ");
-		lines.push(`export const ${fontName} = /*#__PURE__*/ createFontLoader(${JSON.stringify(family)});`);
-	}
-	lines.push("");
-	return lines.join("\n");
-}
-function propertyNameToGoogleFontFamily(prop) {
-	return prop.replace(/_/g, " ").replace(/([a-z])([A-Z])/g, "$1 $2");
-}
 /**
 * manualChunks function for client builds.
 *
@@ -554,6 +349,12 @@ const clientOutputConfig = {
 	manualChunks: clientManualChunks,
 	experimentalMinChunkSize: 1e4
 };
+const clientCodeSplittingConfig = {
+	minSize: 1e4,
+	groups: [{ name(moduleId) {
+		return clientManualChunks(moduleId) ?? null;
+	} }]
+};
 /**
 * Rollup treeshake configuration for production client builds.
 *
@@ -583,6 +384,16 @@ const clientTreeshakeConfig = {
 	preset: "recommended",
 	moduleSideEffects: "no-external"
 };
+function getBuildBundlerOptions(build) {
+	const buildConfig = build;
+	return buildConfig?.rolldownOptions ?? buildConfig?.rollupOptions;
+}
+function withBuildBundlerOptions(viteMajorVersion, bundlerOptions) {
+	return viteMajorVersion >= 8 ? { rolldownOptions: bundlerOptions } : { rollupOptions: bundlerOptions };
+}
+function getClientOutputConfigForVite(viteMajorVersion) {
+	return viteMajorVersion >= 8 ? { codeSplitting: clientCodeSplittingConfig } : clientOutputConfig;
+}
 /**
 * Compute the set of chunk filenames that are ONLY reachable through dynamic
 * imports (i.e. behind React.lazy(), next/dynamic, or manual import()).
@@ -702,13 +513,12 @@ function vinext(options = {}) {
 	let fileMatcher;
 	let middlewarePath = null;
 	let instrumentationPath = null;
+	let instrumentationClientPath = null;
 	let hasCloudflarePlugin = false;
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
 	const shimsDir = path.resolve(__dirname, "shims");
 	let nextShimMap = {};
-	const _ogInlineCache = /* @__PURE__ */ new Map();
-	let _ogInlineIsBuild = false;
 	/**
 	* Generate the virtual SSR server entry module.
 	* This is the entry point for `vite build --ssr`.
@@ -764,183 +574,7 @@ function vinext(options = {}) {
 		...viteMajorVersion >= 8 ? [] : [tsconfigPaths()],
 		reactPluginPromise,
 		commonjs(),
-		(
-		// @vitejs/plugin-rsc uses `periscopic` to find closure variables for
-		{
-			name: "vinext:fix-use-server-closure-collision",
-			enforce: "pre",
-			transform(code, id) {
-				if (!code.includes("use server")) return null;
-				if (!/\.(js|jsx|ts|tsx|mjs|cjs)$/.test(id.split("?")[0])) return null;
-				let ast;
-				try {
-					ast = parseAst(code);
-				} catch {
-					return null;
-				}
-				function collectPatternNames(pattern, names) {
-					if (!pattern) return;
-					if (pattern.type === "Identifier") names.add(pattern.name);
-					else if (pattern.type === "ObjectPattern") for (const prop of pattern.properties) collectPatternNames(prop.value ?? prop.argument, names);
-					else if (pattern.type === "ArrayPattern") for (const elem of pattern.elements) collectPatternNames(elem, names);
-					else if (pattern.type === "RestElement" || pattern.type === "AssignmentPattern") collectPatternNames(pattern.left ?? pattern.argument, names);
-				}
-				function hasUseServerDirective(body) {
-					for (const stmt of body) {
-						if (stmt.type === "ExpressionStatement" && stmt.expression?.type === "Literal" && typeof stmt.expression.value === "string") {
-							if (stmt.expression.value === "use server") return true;
-							continue;
-						}
-						break;
-					}
-					return false;
-				}
-				const s = new MagicString(code);
-				const renamedRanges = /* @__PURE__ */ new Set();
-				let changed = false;
-				function visitNode(node, ancestorNames) {
-					if (!node || typeof node !== "object") return;
-					if (!(node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression")) {
-						const namesForChildren = new Set(ancestorNames);
-						if (node.type === "CatchClause" && node.param) collectPatternNames(node.param, namesForChildren);
-						collectFunctionScopedNames(node, namesForChildren);
-						const immediateStmts = node.type === "Program" ? node.body : node.type === "BlockStatement" ? node.body : [];
-						for (const stmt of immediateStmts) if (stmt?.type === "VariableDeclaration") for (const decl of stmt.declarations) collectPatternNames(decl.id, namesForChildren);
-						else if (stmt?.type === "ClassDeclaration" && stmt.id?.name) namesForChildren.add(stmt.id.name);
-						else if (stmt?.type === "ImportDeclaration") {
-							for (const spec of stmt.specifiers ?? []) if (spec.local?.name) namesForChildren.add(spec.local.name);
-						}
-						for (const key of Object.keys(node)) {
-							if (key === "type") continue;
-							const child = node[key];
-							if (Array.isArray(child)) for (const c of child) visitNode(c, namesForChildren);
-							else if (child && typeof child === "object" && child.type) visitNode(child, namesForChildren);
-						}
-						return;
-					}
-					const namesForBody = new Set(ancestorNames);
-					for (const p of node.params ?? []) collectPatternNames(p, namesForBody);
-					const bodyStmts = node.body?.type === "BlockStatement" ? node.body.body : [];
-					if (hasUseServerDirective(bodyStmts)) {
-						const localDecls = /* @__PURE__ */ new Set();
-						collectAllDeclaredNames(node.body, localDecls);
-						const collisionRenames = /* @__PURE__ */ new Map();
-						for (const name of localDecls) if (namesForBody.has(name)) {
-							let to = `__local_${name}`;
-							let suffix = 0;
-							while (localDecls.has(to) || namesForBody.has(to)) {
-								to = `__local_${suffix}_${name}`;
-								suffix++;
-							}
-							collisionRenames.set(name, to);
-						}
-						if (collisionRenames.size > 0) {
-							for (const [name, to] of collisionRenames) renamingWalk(node.body, name, to);
-							changed = true;
-						}
-						const namesForChildren = new Set(namesForBody);
-						for (const name of localDecls) if (collisionRenames.has(name)) {
-							namesForChildren.delete(name);
-							namesForChildren.add(collisionRenames.get(name));
-						} else namesForChildren.add(name);
-						for (const stmt of bodyStmts) visitNode(stmt, namesForChildren);
-						for (const p of node.params ?? []) visitNode(p, ancestorNames);
-						return;
-					}
-					const namesForChildren = new Set(namesForBody);
-					collectFunctionScopedNames(node.body, namesForChildren);
-					for (const stmt of bodyStmts) if (stmt?.type === "VariableDeclaration" && stmt.kind !== "var") for (const decl of stmt.declarations) collectPatternNames(decl.id, namesForChildren);
-					for (const key of Object.keys(node)) {
-						if (key === "type") continue;
-						const child = node[key];
-						if (Array.isArray(child)) for (const c of child) visitNode(c, namesForChildren);
-						else if (child && typeof child === "object" && child.type) visitNode(child, namesForChildren);
-					}
-				}
-				function renamingWalk(node, from, to, parent) {
-					if (!node || typeof node !== "object") return;
-					if (node.type === "Identifier" && node.name === from) {
-						if (parent?.type === "MemberExpression" && parent.property === node && !parent.computed) return;
-						if (parent?.type === "Property" && parent.key === node && !parent.computed) {
-							if (parent.shorthand) {
-								const rangeKey = `${node.start}:${node.end}`;
-								if (!renamedRanges.has(rangeKey)) {
-									renamedRanges.add(rangeKey);
-									s.update(node.start, node.end, `${from}: ${to}`);
-								}
-							}
-							return;
-						}
-						if (parent?.type === "Property" && parent.shorthand && parent.value === node) return;
-						if (parent?.type === "LabeledStatement" && parent.label === node) return;
-						if ((parent?.type === "BreakStatement" || parent?.type === "ContinueStatement") && parent.label === node) return;
-						const rangeKey = `${node.start}:${node.end}`;
-						if (!renamedRanges.has(rangeKey)) {
-							renamedRanges.add(rangeKey);
-							s.update(node.start, node.end, to);
-						}
-						return;
-					}
-					if (node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") {
-						const nestedDecls = /* @__PURE__ */ new Set();
-						for (const p of node.params ?? []) collectPatternNames(p, nestedDecls);
-						collectAllDeclaredNames(node.body, nestedDecls);
-						if (nestedDecls.has(from)) return;
-						if (node.body?.type === "BlockStatement" && hasUseServerDirective(node.body.body)) return;
-					}
-					for (const key of Object.keys(node)) {
-						if (key === "type" || key === "start" || key === "end") continue;
-						const child = node[key];
-						if (Array.isArray(child)) for (const c of child) renamingWalk(c, from, to, node);
-						else if (child && typeof child === "object" && child.type) renamingWalk(child, from, to, node);
-					}
-				}
-				function collectFunctionScopedNames(node, names) {
-					if (!node || typeof node !== "object") return;
-					if (node.type === "FunctionDeclaration") {
-						if (node.id?.name) names.add(node.id.name);
-						return;
-					}
-					if (node.type === "ClassDeclaration") {
-						if (node.id?.name) names.add(node.id.name);
-						return;
-					}
-					if (node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") return;
-					if (node.type === "VariableDeclaration" && node.kind === "var") for (const decl of node.declarations) collectPatternNames(decl.id, names);
-					for (const key of Object.keys(node)) {
-						if (key === "type") continue;
-						const child = node[key];
-						if (Array.isArray(child)) for (const c of child) collectFunctionScopedNames(c, names);
-						else if (child && typeof child === "object" && child.type) collectFunctionScopedNames(child, names);
-					}
-				}
-				function collectAllDeclaredNames(node, names) {
-					if (!node || typeof node !== "object") return;
-					if (node.type === "VariableDeclaration") for (const decl of node.declarations) collectPatternNames(decl.id, names);
-					if (node.type === "FunctionDeclaration") {
-						if (node.id?.name) names.add(node.id.name);
-						return;
-					}
-					if (node.type === "ClassDeclaration") {
-						if (node.id?.name) names.add(node.id.name);
-						return;
-					}
-					if (node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") return;
-					for (const key of Object.keys(node)) {
-						if (key === "type") continue;
-						const child = node[key];
-						if (Array.isArray(child)) for (const c of child) collectAllDeclaredNames(c, names);
-						else if (child && typeof child === "object" && child.type) collectAllDeclaredNames(child, names);
-					}
-				}
-				visitNode(ast, /* @__PURE__ */ new Set());
-				if (!changed) return null;
-				return {
-					code: s.toString(),
-					map: s.generateMap({ hires: "boundary" })
-				};
-			}
-		}),
+		fixUseServerClosureCollisionPlugin,
 		{
 			name: "vinext:config",
 			enforce: "pre",
@@ -985,6 +619,7 @@ function vinext(options = {}) {
 				nextConfig = await resolveNextConfig(rawConfig, root);
 				fileMatcher = createValidFileMatcher(nextConfig.pageExtensions);
 				instrumentationPath = findInstrumentationFile(root, fileMatcher);
+				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
 				middlewarePath = findMiddlewareFile(root, fileMatcher);
 				const defines = getNextPublicEnvDefines();
 				if (!config.define || typeof config.define !== "object" || !("process.env.NODE_ENV" in config.define)) defines["process.env.NODE_ENV"] = JSON.stringify(resolvedNodeEnv);
@@ -1072,8 +707,11 @@ function vinext(options = {}) {
 					"vinext/head-state": path.join(shimsDir, "head-state"),
 					"vinext/i18n-state": path.join(shimsDir, "i18n-state"),
 					"vinext/i18n-context": path.join(shimsDir, "i18n-context"),
+					"vinext/cache": path.resolve(__dirname, "cache"),
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
-					"vinext/html": path.resolve(__dirname, "server", "html")
+					"vinext/instrumentation-client": path.resolve(__dirname, "client", "instrumentation-client"),
+					"vinext/html": path.resolve(__dirname, "server", "html"),
+					"private-next-instrumentation-client": instrumentationClientPath ?? path.resolve(__dirname, "client", "empty-module")
 				}).flatMap(([k, v]) => k.startsWith("next/") ? [[k, v], [`${k}.js`, v]] : [[k, v]]));
 				const pluginsFlat = [];
 				function flattenPlugins(arr) {
@@ -1104,9 +742,9 @@ function vinext(options = {}) {
 				const isMultiEnv = hasAppDir || hasCloudflarePlugin || hasNitroPlugin;
 				const viteConfig = {
 					appType: "custom",
-					build: { rollupOptions: {
+					build: { ...withBuildBundlerOptions(viteMajorVersion, {
 						onwarn: (() => {
-							const userOnwarn = config.build?.rollupOptions?.onwarn;
+							const userOnwarn = getBuildBundlerOptions(config.build)?.onwarn;
 							return (warning, defaultHandler) => {
 								if (warning.code === "MODULE_LEVEL_DIRECTIVE" && (warning.message?.includes("\"use client\"") || warning.message?.includes("\"use server\""))) return;
 								if (warning.code === "IMPORT_IS_UNDEFINED" && warning.message?.includes("generateStaticParams")) return;
@@ -1115,8 +753,8 @@ function vinext(options = {}) {
 							};
 						})(),
 						...!isSSR && !isMultiEnv ? { treeshake: clientTreeshakeConfig } : {},
-						...!isSSR && !isMultiEnv ? { output: clientOutputConfig } : {}
-					} },
+						...!isSSR && !isMultiEnv ? { output: getClientOutputConfigForVite(viteMajorVersion) } : {}
+					}) },
 					server: { cors: {
 						preflightContinue: true,
 						origin: /^https?:\/\/(?:(?:[^:]+\.)?localhost|127\.0\.0\.1|\[::1\])(?::\d+)?$/
@@ -1160,8 +798,11 @@ function vinext(options = {}) {
 					])],
 					...incomingInclude.length > 0 ? { include: incomingInclude } : {}
 				};
+				const pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
 				if (hasAppDir) {
 					const appEntries = [`${path.relative(root, appDir)}/**/*.{tsx,ts,jsx,js}`];
+					const explicitInstrumentationEntries = [instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : []);
+					const optimizeEntries = [...new Set([...appEntries, ...explicitInstrumentationEntries])];
 					viteConfig.environments = {
 						rsc: {
 							...hasCloudflarePlugin || hasNitroPlugin ? {} : { resolve: {
@@ -1179,11 +820,11 @@ function vinext(options = {}) {
 									"vinext",
 									"@vercel/og"
 								])],
-								entries: appEntries
+								entries: optimizeEntries
 							},
 							build: {
 								outDir: options.rscOutDir ?? "dist/server",
-								rollupOptions: { input: { index: VIRTUAL_RSC_ENTRY } }
+								...withBuildBundlerOptions(viteMajorVersion, { input: { index: VIRTUAL_RSC_ENTRY } })
 							}
 						},
 						ssr: {
@@ -1197,11 +838,11 @@ function vinext(options = {}) {
 									"vinext",
 									"@vercel/og"
 								])],
-								entries: appEntries
+								entries: optimizeEntries
 							},
 							build: {
 								outDir: options.ssrOutDir ?? "dist/server/ssr",
-								rollupOptions: { input: { index: VIRTUAL_APP_SSR_ENTRY } }
+								...withBuildBundlerOptions(viteMajorVersion, { input: { index: VIRTUAL_APP_SSR_ENTRY } })
 							}
 						},
 						client: {
@@ -1213,7 +854,7 @@ function vinext(options = {}) {
 									"@vercel/og",
 									...nextServerExternal
 								])],
-								entries: appEntries,
+								entries: optimizeEntries,
 								include: [...new Set([
 									...incomingInclude,
 									"react",
@@ -1225,26 +866,64 @@ function vinext(options = {}) {
 							},
 							build: {
 								...hasCloudflarePlugin ? { manifest: true } : {},
-								rollupOptions: {
+								...withBuildBundlerOptions(viteMajorVersion, {
 									input: { index: VIRTUAL_APP_BROWSER_ENTRY },
-									output: clientOutputConfig,
+									output: getClientOutputConfigForVite(viteMajorVersion),
 									treeshake: clientTreeshakeConfig
-								}
+								})
 							}
 						}
 					};
 				} else if (hasCloudflarePlugin) viteConfig.environments = { client: {
 					consumer: "client",
+					optimizeDeps: pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : void 0,
 					build: {
 						manifest: true,
 						ssrManifest: true,
-						rollupOptions: {
+						...withBuildBundlerOptions(viteMajorVersion, {
 							input: { index: VIRTUAL_CLIENT_ENTRY },
-							output: clientOutputConfig,
+							output: getClientOutputConfigForVite(viteMajorVersion),
 							treeshake: clientTreeshakeConfig
-						}
+						})
 					}
 				} };
+				else if (!isSSR && !getBuildBundlerOptions(config.build)?.input) viteConfig.environments = {
+					client: {
+						consumer: "client",
+						optimizeDeps: pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : void 0,
+						build: {
+							outDir: "dist/client",
+							manifest: true,
+							ssrManifest: true,
+							...withBuildBundlerOptions(viteMajorVersion, {
+								input: { index: VIRTUAL_CLIENT_ENTRY },
+								output: getClientOutputConfigForVite(viteMajorVersion),
+								treeshake: clientTreeshakeConfig
+							})
+						}
+					},
+					ssr: {
+						resolve: {
+							external: [
+								"react",
+								"react-dom",
+								"react-dom/server"
+							],
+							noExternal: true
+						},
+						build: {
+							outDir: "dist/server",
+							...withBuildBundlerOptions(viteMajorVersion, {
+								input: { index: VIRTUAL_SERVER_ENTRY },
+								output: { entryFileNames: "entry.js" }
+							})
+						}
+					}
+				};
+				if (pagesOptimizeEntries.length > 0 && !hasCloudflarePlugin) viteConfig.optimizeDeps = {
+					...viteConfig.optimizeDeps,
+					entries: pagesOptimizeEntries
+				};
 				return viteConfig;
 			},
 			configResolved(config) {
@@ -1275,13 +954,13 @@ function vinext(options = {}) {
 					if (cleanId === VIRTUAL_RSC_ENTRY) return RESOLVED_RSC_ENTRY;
 					if (cleanId === VIRTUAL_APP_SSR_ENTRY) return RESOLVED_APP_SSR_ENTRY;
 					if (cleanId === VIRTUAL_APP_BROWSER_ENTRY) return RESOLVED_APP_BROWSER_ENTRY;
-					if (cleanId.startsWith(VIRTUAL_GOOGLE_FONTS + "?")) return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(27);
+					if (cleanId.startsWith("virtual:vinext-google-fonts?")) return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(VIRTUAL_GOOGLE_FONTS.length);
 					if (cleanId.endsWith("/" + VIRTUAL_RSC_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_RSC_ENTRY)) return RESOLVED_RSC_ENTRY;
 					if (cleanId.endsWith("/" + VIRTUAL_APP_SSR_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_APP_SSR_ENTRY)) return RESOLVED_APP_SSR_ENTRY;
 					if (cleanId.endsWith("/" + VIRTUAL_APP_BROWSER_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_APP_BROWSER_ENTRY)) return RESOLVED_APP_BROWSER_ENTRY;
-					if (cleanId.includes("/" + VIRTUAL_GOOGLE_FONTS + "?") || cleanId.includes("\\" + VIRTUAL_GOOGLE_FONTS + "?")) {
+					if (cleanId.includes("/virtual:vinext-google-fonts?") || cleanId.includes("\\virtual:vinext-google-fonts?")) {
 						const queryIndex = cleanId.indexOf(VIRTUAL_GOOGLE_FONTS + "?");
-						return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(queryIndex + 27);
+						return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(queryIndex + VIRTUAL_GOOGLE_FONTS.length);
 					}
 				}
 			},
@@ -1305,10 +984,11 @@ function vinext(options = {}) {
 				}
 				if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) return generateSsrEntry(hasPagesDir);
 				if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) return generateBrowserEntry();
-				if (id.startsWith(RESOLVED_VIRTUAL_GOOGLE_FONTS + "?")) return generateGoogleFontsVirtualModule(id);
+				if (id.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
 			}
 		},
 		asyncHooksStubPlugin,
+		createInstrumentationClientTransformPlugin(() => instrumentationClientPath),
 		...options.experimental?.clientReferenceDedup ? [clientReferenceDedupPlugin()] : [],
 		{
 			name: "vinext:mdx",
@@ -1522,7 +1202,7 @@ function vinext(options = {}) {
 								return;
 							}
 							try {
-								pathname = normalizePath(normalizePathnameForRouteMatchStrict(pathname));
+								pathname = normalizePath$1(normalizePathnameForRouteMatchStrict(pathname));
 							} catch {
 								res.writeHead(400);
 								res.end("Bad Request");
@@ -1575,6 +1255,7 @@ function vinext(options = {}) {
 									headers: nodeRequestHeaders
 								});
 								const result = await runMiddleware(getPagesRunner(), middlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath);
+								if (result.waitUntilPromises?.length) Promise.allSettled(result.waitUntilPromises);
 								if (!result.continue) {
 									if (result.redirectUrl) {
 										const redirectHeaders = { Location: result.redirectUrl };
@@ -1781,198 +1462,8 @@ function vinext(options = {}) {
 				}
 			}
 		},
-		{
-			name: "vinext:google-fonts",
-			enforce: "pre",
-			_isBuild: false,
-			_fontCache: /* @__PURE__ */ new Map(),
-			_cacheDir: "",
-			configResolved(config) {
-				this._isBuild = config.command === "build";
-				this._cacheDir = path.join(config.root, ".vinext", "fonts");
-			},
-			transform: {
-				filter: {
-					id: { include: /\.(tsx?|jsx?|mjs)$/ },
-					code: "next/font/google"
-				},
-				async handler(code, id) {
-					if (id.startsWith("\0")) return null;
-					if (!id.match(/\.(tsx?|jsx?|mjs)$/)) return null;
-					if (!code.includes("next/font/google")) return null;
-					if (id.startsWith(_shimsDir)) return null;
-					const s = new MagicString(code);
-					let hasChanges = false;
-					let proxyImportCounter = 0;
-					const overwrittenRanges = [];
-					const fontLocals = /* @__PURE__ */ new Map();
-					const proxyObjectLocals = /* @__PURE__ */ new Set();
-					const importRe = /^[ \t]*import\s+([^;]+?)\s+from\s*(["'])next\/font\/google\2\s*;?/gm;
-					let importMatch;
-					while ((importMatch = importRe.exec(code)) !== null) {
-						const [fullMatch, clause] = importMatch;
-						const matchStart = importMatch.index;
-						const matchEnd = matchStart + fullMatch.length;
-						const parsed = parseGoogleFontImportClause(clause);
-						const utilityImports = parsed.named.filter((spec) => !spec.isType && GOOGLE_FONT_UTILITY_EXPORTS.has(spec.imported));
-						const fontImports = parsed.named.filter((spec) => !spec.isType && !GOOGLE_FONT_UTILITY_EXPORTS.has(spec.imported));
-						if (parsed.defaultLocal) proxyObjectLocals.add(parsed.defaultLocal);
-						for (const fontImport of fontImports) fontLocals.set(fontImport.local, fontImport.imported);
-						if (fontImports.length > 0) {
-							const virtualId = encodeGoogleFontsVirtualId({
-								hasDefault: Boolean(parsed.defaultLocal),
-								fonts: Array.from(new Set(fontImports.map((spec) => spec.imported))),
-								utilities: Array.from(new Set(utilityImports.map((spec) => spec.imported)))
-							});
-							s.overwrite(matchStart, matchEnd, `import ${clause} from ${JSON.stringify(virtualId)};`);
-							overwrittenRanges.push([matchStart, matchEnd]);
-							hasChanges = true;
-							continue;
-						}
-						if (parsed.namespaceLocal) {
-							const proxyImportName = `__vinext_google_fonts_proxy_${proxyImportCounter++}`;
-							const replacementLines = [`import ${proxyImportName} from ${JSON.stringify(_fontGoogleShimPath)};`];
-							if (parsed.defaultLocal) replacementLines.push(`var ${parsed.defaultLocal} = ${proxyImportName};`);
-							replacementLines.push(`var ${parsed.namespaceLocal} = ${proxyImportName};`);
-							s.overwrite(matchStart, matchEnd, replacementLines.join("\n"));
-							overwrittenRanges.push([matchStart, matchEnd]);
-							proxyObjectLocals.add(parsed.namespaceLocal);
-							hasChanges = true;
-						}
-					}
-					const exportRe = /^[ \t]*export\s*\{([^}]+)\}\s*from\s*(["'])next\/font\/google\2\s*;?/gm;
-					let exportMatch;
-					while ((exportMatch = exportRe.exec(code)) !== null) {
-						const [fullMatch, specifiers] = exportMatch;
-						const matchStart = exportMatch.index;
-						const matchEnd = matchStart + fullMatch.length;
-						const namedExports = parseGoogleFontNamedSpecifiers(specifiers);
-						const utilityExports = namedExports.filter((spec) => !spec.isType && GOOGLE_FONT_UTILITY_EXPORTS.has(spec.imported));
-						const fontExports = namedExports.filter((spec) => !spec.isType && !GOOGLE_FONT_UTILITY_EXPORTS.has(spec.imported));
-						if (fontExports.length === 0) continue;
-						const virtualId = encodeGoogleFontsVirtualId({
-							hasDefault: false,
-							fonts: Array.from(new Set(fontExports.map((spec) => spec.imported))),
-							utilities: Array.from(new Set(utilityExports.map((spec) => spec.imported)))
-						});
-						s.overwrite(matchStart, matchEnd, `export { ${specifiers.trim()} } from ${JSON.stringify(virtualId)};`);
-						overwrittenRanges.push([matchStart, matchEnd]);
-						hasChanges = true;
-					}
-					const cacheDir = this._cacheDir;
-					const fontCache = this._fontCache;
-					async function injectSelfHostedCss(callStart, callEnd, optionsStr, family, calleeSource) {
-						let options = {};
-						try {
-							const parsed = parseStaticObjectLiteral(optionsStr);
-							if (!parsed) return;
-							options = parsed;
-						} catch {
-							return;
-						}
-						const weights = options.weight ? Array.isArray(options.weight) ? options.weight : [options.weight] : [];
-						const styles = options.style ? Array.isArray(options.style) ? options.style : [options.style] : [];
-						const display = options.display ?? "swap";
-						let spec = family.replace(/\s+/g, "+");
-						if (weights.length > 0) if (styles.includes("italic")) {
-							const pairs = [];
-							for (const w of weights) {
-								pairs.push(`0,${w}`);
-								pairs.push(`1,${w}`);
-							}
-							spec += `:ital,wght@${pairs.join(";")}`;
-						} else spec += `:wght@${weights.join(";")}`;
-						else if (styles.length === 0) spec += `:wght@100..900`;
-						const params = new URLSearchParams();
-						params.set("family", spec);
-						params.set("display", display);
-						const cssUrl = `https://fonts.googleapis.com/css2?${params.toString()}`;
-						let localCSS = fontCache.get(cssUrl);
-						if (!localCSS) try {
-							localCSS = await fetchAndCacheFont(cssUrl, family, cacheDir);
-							fontCache.set(cssUrl, localCSS);
-						} catch {
-							return;
-						}
-						const escapedCSS = JSON.stringify(localCSS);
-						const closingBrace = optionsStr.lastIndexOf("}");
-						const replacement = `${calleeSource}(${optionsStr.slice(0, closingBrace) + (optionsStr.slice(0, closingBrace).trim().endsWith("{") ? "" : ", ") + `_selfHostedCSS: ${escapedCSS}` + optionsStr.slice(closingBrace)})`;
-						s.overwrite(callStart, callEnd, replacement);
-						hasChanges = true;
-					}
-					if (this._isBuild) {
-						const namedCallRe = /\b([A-Za-z_$][A-Za-z0-9_$]*)\s*\(\s*(\{[^}]*\})\s*\)/g;
-						let namedCallMatch;
-						while ((namedCallMatch = namedCallRe.exec(code)) !== null) {
-							const [fullMatch, localName, optionsStr] = namedCallMatch;
-							const importedName = fontLocals.get(localName);
-							if (!importedName) continue;
-							const callStart = namedCallMatch.index;
-							const callEnd = callStart + fullMatch.length;
-							if (overwrittenRanges.some(([start, end]) => callStart < end && callEnd > start)) continue;
-							await injectSelfHostedCss(callStart, callEnd, optionsStr, importedName.replace(/_/g, " "), localName);
-						}
-						const memberCallRe = /\b([A-Za-z_$][A-Za-z0-9_$]*)\.([A-Za-z_$][A-Za-z0-9_$]*)\s*\(\s*(\{[^}]*\})\s*\)/g;
-						let memberCallMatch;
-						while ((memberCallMatch = memberCallRe.exec(code)) !== null) {
-							const [fullMatch, objectName, propName, optionsStr] = memberCallMatch;
-							if (!proxyObjectLocals.has(objectName)) continue;
-							const callStart = memberCallMatch.index;
-							const callEnd = callStart + fullMatch.length;
-							if (overwrittenRanges.some(([start, end]) => callStart < end && callEnd > start)) continue;
-							await injectSelfHostedCss(callStart, callEnd, optionsStr, propertyNameToGoogleFontFamily(propName), `${objectName}.${propName}`);
-						}
-					}
-					if (!hasChanges) return null;
-					return {
-						code: s.toString(),
-						map: s.generateMap({ hires: "boundary" })
-					};
-				}
-			}
-		},
-		{
-			name: "vinext:local-fonts",
-			enforce: "pre",
-			transform: {
-				filter: {
-					id: {
-						include: /\.(tsx?|jsx?|mjs)$/,
-						exclude: /node_modules/
-					},
-					code: "next/font/local"
-				},
-				handler(code, id) {
-					if (id.includes("node_modules")) return null;
-					if (id.startsWith("\0")) return null;
-					if (!id.match(/\.(tsx?|jsx?|mjs)$/)) return null;
-					if (!code.includes("next/font/local")) return null;
-					if (id.includes("font-local")) return null;
-					if (!/import\s+\w+\s+from\s*['"]next\/font\/local['"]/.test(code)) return null;
-					const s = new MagicString(code);
-					let hasChanges = false;
-					let fontImportCounter = 0;
-					const imports = [];
-					const fontPathRe = /((?:path|src)\s*:\s*)(['"])([^'"]+\.(?:woff2?|ttf|otf|eot))\2/g;
-					let match;
-					while ((match = fontPathRe.exec(code)) !== null) {
-						const [fullMatch, prefix, _quote, fontPath] = match;
-						const varName = `__vinext_local_font_${fontImportCounter++}`;
-						imports.push(`import ${varName} from ${JSON.stringify(fontPath)};`);
-						const matchStart = match.index;
-						const matchEnd = matchStart + fullMatch.length;
-						s.overwrite(matchStart, matchEnd, `${prefix}${varName}`);
-						hasChanges = true;
-					}
-					if (!hasChanges) return null;
-					s.prepend(imports.join("\n") + "\n");
-					return {
-						code: s.toString(),
-						map: s.generateMap({ hires: "boundary" })
-					};
-				}
-			}
-		},
+		createGoogleFontsPlugin(_fontGoogleShimPath, _shimsDir),
+		createLocalFontsPlugin(),
 		createOptimizeImportsPlugin(() => nextConfig, () => root),
 		{
 			name: "vinext:use-cache",
@@ -2071,94 +1562,8 @@ function vinext(options = {}) {
 				}
 			}
 		},
-		{
-			name: "vinext:og-inline-fetch-assets",
-			enforce: "pre",
-			configResolved(config) {
-				_ogInlineIsBuild = config.command === "build";
-			},
-			buildStart() {
-				if (_ogInlineIsBuild) _ogInlineCache.clear();
-			},
-			async transform(code, id) {
-				if (!code.includes("import.meta.url")) return null;
-				const useCache = _ogInlineIsBuild;
-				const moduleDir = path.dirname(id);
-				let newCode = code;
-				let didReplace = false;
-				if (code.includes("fetch(")) for (const match of code.matchAll(/fetch\(\s*new URL\(\s*(["'])(\.\/[^"']+)\1\s*,\s*import\.meta\.url\s*\)\s*\)(?:\.then\(\s*(?:function\s*\([^)]*\)|\([^)]*\)\s*=>)\s*\{?\s*return\s+[^.]+\.arrayBuffer\(\)\s*\}?\s*\)|\.then\(\s*\([^)]*\)\s*=>\s*[^.]+\.arrayBuffer\(\)\s*\))/g)) {
-					const fullMatch = match[0];
-					const relPath = match[2];
-					const absPath = path.resolve(moduleDir, relPath);
-					let fileBase64 = useCache ? _ogInlineCache.get(absPath) : void 0;
-					if (fileBase64 === void 0) try {
-						fileBase64 = (await fs.promises.readFile(absPath)).toString("base64");
-						if (useCache) _ogInlineCache.set(absPath, fileBase64);
-					} catch {
-						continue;
-					}
-					const inlined = [
-						`(function(){`,
-						`var b=${JSON.stringify(fileBase64)};`,
-						`var r=atob(b);`,
-						`var a=new Uint8Array(r.length);`,
-						`for(var i=0;i<r.length;i++)a[i]=r.charCodeAt(i);`,
-						`return Promise.resolve(a.buffer);`,
-						`})()`
-					].join("");
-					newCode = newCode.replaceAll(fullMatch, inlined);
-					didReplace = true;
-				}
-				if (code.includes("readFileSync(")) for (const match of newCode.matchAll(/[a-zA-Z_$][a-zA-Z0-9_$]*\.readFileSync\(\s*(?:[a-zA-Z_$][a-zA-Z0-9_$]*\.)?fileURLToPath\(\s*new URL\(\s*(["'])(\.\/[^"']+)\1\s*,\s*import\.meta\.url\s*\)\s*\)\s*\)/g)) {
-					const fullMatch = match[0];
-					const relPath = match[2];
-					const absPath = path.resolve(moduleDir, relPath);
-					let fileBase64 = useCache ? _ogInlineCache.get(absPath) : void 0;
-					if (fileBase64 === void 0) try {
-						fileBase64 = (await fs.promises.readFile(absPath)).toString("base64");
-						if (useCache) _ogInlineCache.set(absPath, fileBase64);
-					} catch {
-						continue;
-					}
-					const inlined = `Buffer.from(${JSON.stringify(fileBase64)},"base64")`;
-					newCode = newCode.replaceAll(fullMatch, inlined);
-					didReplace = true;
-				}
-				if (!didReplace) return null;
-				return {
-					code: newCode,
-					map: null
-				};
-			}
-		},
-		{
-			name: "vinext:og-assets",
-			apply: "build",
-			enforce: "post",
-			writeBundle: {
-				sequential: true,
-				order: "post",
-				async handler(options) {
-					if (this.environment?.name !== "rsc") return;
-					const outDir = options.dir;
-					if (!outDir) return;
-					const indexPath = path.join(outDir, "index.js");
-					if (!fs.existsSync(indexPath)) return;
-					const content = fs.readFileSync(indexPath, "utf-8");
-					const referencedAssets = ["resvg.wasm"].filter((asset) => content.includes(asset));
-					if (referencedAssets.length === 0) return;
-					try {
-						const ogPkgPath = createRequire(import.meta.url).resolve("@vercel/og/package.json");
-						const ogDistDir = path.join(path.dirname(ogPkgPath), "dist");
-						for (const asset of referencedAssets) {
-							const src = path.join(ogDistDir, asset);
-							const dest = path.join(outDir, asset);
-							if (fs.existsSync(src) && !fs.existsSync(dest)) fs.copyFileSync(src, dest);
-						}
-					} catch {}
-				}
-			}
-		},
+		createOgInlineFetchAssetsPlugin(),
+		ogAssetsPlugin,
 		{
 			name: "vinext:image-config",
 			apply: "build",
@@ -2557,6 +1962,6 @@ function scanDirForMdx(dir) {
 	return false;
 }
 //#endregion
-export { asyncHooksStubPlugin as _asyncHooksStubPlugin, augmentSsrManifestFromBundle as _augmentSsrManifestFromBundle, hasMdxFiles as _hasMdxFiles, _mdxScanCache, parseStaticObjectLiteral as _parseStaticObjectLiteral, _postcssCache, resolvePostcssStringPlugins as _resolvePostcssStringPlugins, stripServerExports as _stripServerExports, clientManualChunks, clientOutputConfig, clientTreeshakeConfig, computeLazyChunks, vinext as default, matchConfigPattern, staticExportApp, staticExportPages };
+export { asyncHooksStubPlugin as _asyncHooksStubPlugin, augmentSsrManifestFromBundle as _augmentSsrManifestFromBundle, hasMdxFiles as _hasMdxFiles, _mdxScanCache, parseStaticObjectLiteral as _parseStaticObjectLiteral, _postcssCache, resolvePostcssStringPlugins as _resolvePostcssStringPlugins, stripServerExports as _stripServerExports, clientManualChunks, clientOutputConfig, clientTreeshakeConfig, computeLazyChunks, vinext as default, getClientOutputConfigForVite, matchConfigPattern, staticExportApp, staticExportPages };
 
 //# sourceMappingURL=index.js.map