vinext 0.1.7 → 0.2.0

package/dist/server/app-ssr-entry.js

@@ -16,20 +16,24 @@ import DefaultGlobalError from "../shims/default-global-error.js";
 import { BfcacheStateKeyMapContext, ElementsContext, Slot } from "../shims/slot.js";
 import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
 import { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform } from "./app-ssr-stream.js";
-import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
-import { runWithRootParamsScope } from "../shims/root-params.js";
+import { setPagesClientAssets } from "./pages-client-assets.js";
 import { createInitialBfcacheMaps } from "./app-bfcache-identity.js";
 import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
 import { createClientReferencePreloader } from "./app-client-reference-preloader.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
+import { runWithRootParamsScope } from "../shims/root-params.js";
+import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
 import { renderBeforeInteractiveInlineScripts } from "./before-interactive-head.js";
 import { createInitialDevServerErrorScript } from "./dev-initial-server-error.js";
 import { ssrAppRouterInstance } from "./app-ssr-router-instance.js";
 import { Fragment, createElement, use } from "react";
 import { renderToReadableStream, renderToStaticMarkup } from "react-dom/server.edge";
+import { preinitModule } from "react-dom";
 import { createFromReadableStream } from "@vitejs/plugin-rsc/ssr";
 import clientReferences from "virtual:vite-rsc/client-references";
+import pagesClientAssets from "virtual:vinext-pages-client-assets";
 //#region src/server/app-ssr-entry.ts
+setPagesClientAssets(pagesClientAssets);
 /**
 * Default cap for the preload `Link` header, matching Next.js's
 * `defaultConfig.reactMaxHeadersLength`. Used when no config value threads
@@ -52,7 +56,10 @@ async function loadStaticPrerender() {
 		const [{ createRequire }, path] = await Promise.all([import("node:module"), import("node:path")]);
 		const reactDomPackageJson = createRequire(import.meta.url).resolve("react-dom/package.json");
 		const reactDomDir = path.dirname(reactDomPackageJson);
-		const devRenderer = await import(path.join(reactDomDir, "cjs/react-dom-server.edge.development.js"));
+		const devRenderer = await import(
+			/* @vite-ignore */
+			path.join(reactDomDir, "cjs/react-dom-server.edge.development.js")
+);
 		if (isStaticPrerenderModule(devRenderer)) return devRenderer.prerender;
 		const devRendererDefault = typeof devRenderer === "object" && devRenderer !== null && "default" in devRenderer && devRenderer.default;
 		if (isStaticPrerenderModule(devRendererDefault)) return devRendererDefault.prerender;
@@ -146,12 +153,12 @@ function buildModulePreloadHtml(bootstrapModuleUrl, nonce) {
 	if (!bootstrapModuleUrl) return "";
 	return `<link rel="modulepreload"${createNonceAttribute(nonce)} href="${escapeHtmlAttr(bootstrapModuleUrl)}" />\n`;
 }
-function buildHeadInjectionHtml(navContext, bootstrapModuleUrl, formState, insertedHTML, fontHTML, scriptNonce) {
+function buildHeadInjectionHtml(navContext, bootstrapModuleUrl, formState, insertedHTML, fontHTML, dynamicStaleTimeSeconds, scriptNonce) {
 	const navPayload = {
 		pathname: navContext.pathname,
 		searchParams: [...navContext.searchParams.entries()]
 	};
-	return createInlineScriptTag(createNavigationRuntimeRscMetadataScript(navContext.params, navPayload), scriptNonce) + (formState === null ? "" : createInlineScriptTag("self[" + safeJsonStringify(RSC_FORM_STATE_GLOBAL) + "]=" + safeJsonStringify(formState), scriptNonce)) + buildModulePreloadHtml(bootstrapModuleUrl, scriptNonce) + insertedHTML + fontHTML;
+	return createInlineScriptTag(createNavigationRuntimeRscMetadataScript(navContext.params, navPayload, dynamicStaleTimeSeconds), scriptNonce) + (formState === null ? "" : createInlineScriptTag("self[" + safeJsonStringify(RSC_FORM_STATE_GLOBAL) + "]=" + safeJsonStringify(formState), scriptNonce)) + buildModulePreloadHtml(bootstrapModuleUrl, scriptNonce) + insertedHTML + fontHTML;
 }
 function requireNavigationContext(navContext) {
 	if (!navContext) throw new Error("App SSR requires navigation context for BFCache state keys");
@@ -173,15 +180,19 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				let rscEmbed;
 				if (options?.sideStream) {
 					ssrStream = rscStream;
-					rscEmbed = createRscEmbedTransform(options.sideStream, options?.scriptNonce);
+					rscEmbed = createRscEmbedTransform(options.sideStream, options?.scriptNonce, options?.getInitialNavigationCacheMetadata);
 					if (options.capturedRscDataRef) options.capturedRscDataRef.value = rscEmbed.getRawBuffer();
 				} else {
 					const [s1, s2] = rscStream.tee();
 					ssrStream = s1;
-					rscEmbed = createRscEmbedTransform(s2, options?.scriptNonce);
+					rscEmbed = createRscEmbedTransform(s2, options?.scriptNonce, options?.getInitialNavigationCacheMetadata);
 				}
 				let flightRoot = null;
 				function VinextFlightRoot() {
+					for (const moduleUrl of pagesClientAssets.appBootstrapPreinitModules ?? []) preinitModule(moduleUrl, {
+						as: "script",
+						nonce: options?.scriptNonce
+					});
 					if (!flightRoot) flightRoot = createFromReadableStream(ssrStream);
 					const wireElements = use(flightRoot);
 					const elements = AppElementsWire.decode(wireElements);
@@ -267,7 +278,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 					const initialDevServerErrorHTML = createInitialDevServerErrorScript(options?.initialDevServerError, options?.scriptNonce);
 					if (didInjectHeadHTML) return insertedHTML + errorMetaHTML;
 					didInjectHeadHTML = true;
-					return buildHeadInjectionHtml(ssrNavigationContext, bootstrapModuleUrl, options?.formState ?? null, insertedHTML + errorMetaHTML + getTraceMetaHTML() + initialDevServerErrorHTML, fontHTML, options?.scriptNonce);
+					return buildHeadInjectionHtml(ssrNavigationContext, bootstrapModuleUrl, options?.formState ?? null, insertedHTML + errorMetaHTML + getTraceMetaHTML() + initialDevServerErrorHTML, fontHTML, options?.dynamicStaleTimeSeconds, options?.scriptNonce);
 				};
 				const getBeforeInteractiveHeadHTML = () => renderBeforeInteractiveInlineScripts(beforeInteractiveInlineScripts);
 				return {

package/dist/server/app-ssr-stream.d.ts

@@ -6,11 +6,15 @@ type RscEmbedTransform = {
 };
 type HtmlInsertion = string | (() => string);
 type InlineCssManifest = Record<string, string>;
+type InitialNavigationCacheMetadata = {
+  kind: "dynamic" | "static";
+  dynamicStaleTimeSeconds?: number;
+};
 declare function navigationRuntimeRscBootstrapExpression(): string;
 declare function createNavigationRuntimeRscMetadataScript(params: Record<string, string | string[]>, nav: {
   pathname: string;
   searchParams: [string, string][];
-}): string;
+}, dynamicStaleTimeSeconds?: number): string;
 /**
  * Fix invalid preload "as" values in RSC Flight hint lines before they reach
  * the client. React Flight emits HL hints with as="stylesheet" for CSS, but
@@ -21,7 +25,7 @@ declare function fixFlightHints(text: string): string;
  * Create a helper that progressively embeds RSC chunks as inline <script> tags.
  * The browser entry turns the embedded chunks back into Uint8Array data.
  */
-declare function createRscEmbedTransform(embedStream: ReadableStream<Uint8Array>, scriptNonce?: string): RscEmbedTransform;
+declare function createRscEmbedTransform(embedStream: ReadableStream<Uint8Array>, scriptNonce?: string, getInitialNavigationCacheMetadata?: () => InitialNavigationCacheMetadata): RscEmbedTransform;
 /**
  * Fix invalid preload "as" values in server-rendered HTML.
  * React Fizz emits <link rel="preload" as="stylesheet"> for CSS, but the
@@ -57,4 +61,4 @@ declare function fixPreloadAs(html: string): string;
  */
 declare function createTickBufferedTransform(rscEmbed: RscEmbedTransform, injectHTML?: HtmlInsertion, injectAfterHeadOpenHTML?: HtmlInsertion, inlineCssManifest?: InlineCssManifest, inlineCssPrependCss?: string, inlineCssPrependFallbackHTML?: string, inlineCssScriptNonce?: string): TransformStream<Uint8Array, Uint8Array>;
 //#endregion
-export { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, fixFlightHints, fixPreloadAs, navigationRuntimeRscBootstrapExpression };
+export { InitialNavigationCacheMetadata, createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, fixFlightHints, fixPreloadAs, navigationRuntimeRscBootstrapExpression };

package/dist/server/app-ssr-stream.js

@@ -6,14 +6,18 @@ const NAVIGATION_RUNTIME_REFERENCE = `self[Symbol.for(${safeJsonStringify(NAVIGA
 function navigationRuntimeRscBootstrapExpression() {
 	return `((${NAVIGATION_RUNTIME_REFERENCE}??={bootstrap:{routeManifest:null},functions:{}}).bootstrap.rsc??={rsc:[]})`;
 }
-function createNavigationRuntimeRscMetadataScript(params, nav) {
-	return "Object.assign(" + navigationRuntimeRscBootstrapExpression() + ",{params:" + safeJsonStringify(params) + ",nav:" + safeJsonStringify(nav) + "})";
+function createNavigationRuntimeRscMetadataScript(params, nav, dynamicStaleTimeSeconds) {
+	return "Object.assign(" + navigationRuntimeRscBootstrapExpression() + ",{params:" + safeJsonStringify(params) + ",nav:" + safeJsonStringify(nav) + (dynamicStaleTimeSeconds === void 0 ? "" : ",dynamicStaleTimeSeconds:" + safeJsonStringify(dynamicStaleTimeSeconds)) + "})";
 }
 function createNavigationRuntimeRscChunkScript(chunk) {
 	return navigationRuntimeRscBootstrapExpression() + ".rsc.push(" + safeJsonStringify(chunk) + ")";
 }
-function createNavigationRuntimeRscDoneScript() {
-	return navigationRuntimeRscBootstrapExpression() + ".done=true";
+function createNavigationRuntimeRscDoneScript(metadata) {
+	const bootstrap = navigationRuntimeRscBootstrapExpression();
+	return (metadata === void 0 ? "" : "Object.assign(" + bootstrap + "," + safeJsonStringify({
+		initialCacheKind: metadata.kind,
+		...metadata.dynamicStaleTimeSeconds === void 0 ? {} : { dynamicStaleTimeSeconds: metadata.dynamicStaleTimeSeconds }
+	}) + ");") + bootstrap + ".done=true";
 }
 /**
 * Fix invalid preload "as" values in RSC Flight hint lines before they reach
@@ -27,7 +31,7 @@ function fixFlightHints(text) {
 * Create a helper that progressively embeds RSC chunks as inline <script> tags.
 * The browser entry turns the embedded chunks back into Uint8Array data.
 */
-function createRscEmbedTransform(embedStream, scriptNonce) {
+function createRscEmbedTransform(embedStream, scriptNonce, getInitialNavigationCacheMetadata) {
 	const reader = embedStream.getReader();
 	let pendingChunks = [];
 	const rawChunks = [];
@@ -67,7 +71,7 @@ function createRscEmbedTransform(embedStream, scriptNonce) {
 		async finalize() {
 			await pumpPromise;
 			let scripts = this.flush();
-			scripts += createInlineScriptTag(createNavigationRuntimeRscDoneScript(), scriptNonce);
+			scripts += createInlineScriptTag(createNavigationRuntimeRscDoneScript(getInitialNavigationCacheMetadata?.()), scriptNonce);
 			return scripts;
 		},
 		async getRawBuffer() {

package/dist/server/app-static-generation.d.ts

@@ -3,6 +3,7 @@ import { HeadersContext } from "../shims/headers.js";
 //#region src/server/app-static-generation.d.ts
 type AppStaticGenerationRouteKind = "page" | "route";
 type CreateStaticGenerationHeadersContextOptions = {
+  draftModeEnabled?: boolean;
   draftModeSecret?: string;
   dynamicConfig?: string;
   routeKind: AppStaticGenerationRouteKind;

package/dist/server/app-static-generation.js

@@ -9,6 +9,7 @@ function createStaticGenerationHeadersContext(options) {
 	const context = {
 		headers: new Headers(),
 		cookies: /* @__PURE__ */ new Map(),
+		draftModeEnabled: options.draftModeEnabled,
 		draftModeSecret: options.draftModeSecret
 	};
 	if (options.dynamicConfig === "force-static") context.forceStatic = true;

package/dist/server/app-visited-response-cache.d.ts

@@ -1,17 +1,23 @@
+import { AppElements } from "./app-elements-wire.js";
 import { CachedRscResponse } from "../shims/navigation.js";
 
 //#region src/server/app-visited-response-cache.d.ts
 type VisitedResponseCacheNavigationKind = "navigate" | "refresh" | "traverse";
 type VisitedResponseCacheEntry = {
   createdAt: number;
+  elements?: AppElements;
   expiresAt: number;
+  mountedSlotsHeader: string | null;
   params: Record<string, string | string[]>;
   response: CachedRscResponse;
 };
 declare const VISITED_RESPONSE_CACHE_TTL: number;
 declare const MAX_TRAVERSAL_CACHE_TTL: number;
 declare function createVisitedResponseCacheEntry(options: {
+  elements?: AppElements;
+  fallbackTtlMs?: number;
   now: number;
+  mountedSlotsHeader?: string | null;
   params: Record<string, string | string[]>;
   response: CachedRscResponse;
 }): VisitedResponseCacheEntry;

package/dist/server/app-visited-response-cache.js

@@ -5,7 +5,9 @@ const MAX_TRAVERSAL_CACHE_TTL = 30 * 6e4;
 function createVisitedResponseCacheEntry(options) {
 	return {
 		createdAt: options.now,
-		expiresAt: resolveCachedRscResponseExpiresAt(options.now, options.response, VISITED_RESPONSE_CACHE_TTL),
+		...options.elements ? { elements: options.elements } : {},
+		expiresAt: resolveCachedRscResponseExpiresAt(options.now, options.response, options.fallbackTtlMs ?? 3e5),
+		mountedSlotsHeader: options.mountedSlotsHeader ?? null,
 		params: options.params,
 		response: options.response
 	};

package/dist/server/client-trace-metadata.js

@@ -24,7 +24,32 @@ const carrierSetter = { set(carrier, key, value) {
 		value
 	});
 } };
+const OPEN_TELEMETRY_API_SYMBOL = Symbol.for("opentelemetry.js.api.1");
+const OPEN_TELEMETRY_SPAN_SYMBOL = Symbol.for("OpenTelemetry Context Key SPAN");
+function getRegisteredOpenTelemetryTraceData() {
+	let metadataSpan = null;
+	try {
+		const registry = globalThis[OPEN_TELEMETRY_API_SYMBOL];
+		if (!registry?.context || !registry.propagation) return null;
+		const contextApi = registry.context;
+		const propagation = registry.propagation;
+		const activeContext = contextApi.active();
+		metadataSpan = activeContext.getValue(OPEN_TELEMETRY_SPAN_SYMBOL) !== void 0 ? null : registry.trace?.getTracer("vinext").startSpan("vinext.clientTraceMetadata", void 0, activeContext) ?? null;
+		const context = metadataSpan ? activeContext.setValue(OPEN_TELEMETRY_SPAN_SYMBOL, metadataSpan) : activeContext;
+		const entries = [];
+		contextApi.with(context, () => {
+			propagation.inject(context, entries, carrierSetter);
+		});
+		return entries;
+	} catch {
+		return [];
+	} finally {
+		metadataSpan?.end();
+	}
+}
 function getOpenTelemetryTraceData() {
+	const registeredEntries = getRegisteredOpenTelemetryTraceData();
+	if (registeredEntries) return registeredEntries;
 	let api;
 	try {
 		const req = globalThis.require;
@@ -75,6 +100,7 @@ function renderClientTraceMetadataTags(entries) {
 */
 function getClientTraceMetadataHTML(allowList) {
 	if (!allowList || allowList.length === 0) return "";
+	if (typeof process !== "undefined" && process.env.VINEXT_PRERENDER === "1") return "";
 	return renderClientTraceMetadataTags(filterClientTraceMetadata(getOpenTelemetryTraceData(), allowList));
 }
 //#endregion

package/dist/server/default-global-not-found-module.d.ts

@@ -0,0 +1,14 @@
+import React from "react";
+
+//#region src/server/default-global-not-found-module.d.ts
+declare function DefaultGlobalNotFound(): React.ReactElement;
+/**
+ * Module-shaped wrapper around Next.js's built-in global not-found document.
+ * Unlike the regular default not-found boundary, this component owns the
+ * document shell because global not-found responses skip the root layout.
+ */
+declare const DEFAULT_GLOBAL_NOT_FOUND_MODULE: {
+  readonly default: typeof DefaultGlobalNotFound;
+};
+//#endregion
+export { DEFAULT_GLOBAL_NOT_FOUND_MODULE };

package/dist/server/default-global-not-found-module.js

@@ -0,0 +1,14 @@
+import DefaultNotFound from "../shims/default-not-found.js";
+import React from "react";
+//#region src/server/default-global-not-found-module.ts
+function DefaultGlobalNotFound() {
+	return React.createElement("html", null, React.createElement("body", null, React.createElement(DefaultNotFound)));
+}
+/**
+* Module-shaped wrapper around Next.js's built-in global not-found document.
+* Unlike the regular default not-found boundary, this component owns the
+* document shell because global not-found responses skip the root layout.
+*/
+const DEFAULT_GLOBAL_NOT_FOUND_MODULE = { default: DefaultGlobalNotFound };
+//#endregion
+export { DEFAULT_GLOBAL_NOT_FOUND_MODULE };

package/dist/server/dev-route-files.js

@@ -48,6 +48,10 @@ function isRootGlobalError(parts, matcher) {
 function isMetadataRouteFile(parts) {
 	const fileName = parts[parts.length - 1];
 	if (!fileName) return false;
+	if (fileName.endsWith(".alt.txt")) {
+		const imageBaseName = fileName.slice(0, -8);
+		return matchMetadataFileBaseName("opengraph-image", imageBaseName) !== null || matchMetadataFileBaseName("twitter-image", imageBaseName) !== null;
+	}
 	const { baseName, extension } = stripLastExtension(fileName);
 	if (!extension) return false;
 	const routePrefix = visibleRoutePrefix(parts);

package/dist/server/dev-server.js

@@ -3,7 +3,6 @@ import { createValidFileMatcher, findFileWithExtensions } from "../routing/file-
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { matchRoute } from "../routing/pages-router.js";
 import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
-import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
 import { isUnknownRecord } from "../utils/record.js";
@@ -26,12 +25,14 @@ import { detectLocaleFromAcceptLanguage, extractLocaleFromUrl as extractLocaleFr
 import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
 import { buildPagesReadinessNextData } from "./pages-readiness.js";
 import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
-import { createPagesDevModuleUrl } from "./pages-dev-module-url.js";
-import { isSerializableProps } from "./pages-serializable-props.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
 import { callDocumentGetInitialProps } from "./document-initial-head.js";
 import { hasPagesGetInitialProps, loadDevAppInitialProps, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
+import { isSerializableProps } from "./pages-serializable-props.js";
 import { isBotUserAgent } from "../utils/html-limited-bots.js";
+import { getPagesRouteParams, matchesPagesStaticPath } from "./pages-page-data.js";
+import { createPagesDevModuleUrl } from "./pages-dev-module-url.js";
+import { attachPagesRequestCookies } from "./pages-node-compat.js";
 import path from "node:path";
 import React from "react";
 import { renderToReadableStream } from "react-dom/server.edge";
@@ -101,7 +102,7 @@ const STREAM_BODY_MARKER = "<!--VINEXT_STREAM_BODY-->";
 * shell sooner).
 */
 async function streamPageToResponse(res, element, options) {
-	const { url, server, fontHeadHTML, scripts, DocumentComponent, statusCode = 200, extraHeaders, getHeadHTML, enhancePageElement, scriptNonce, documentContext, setDocumentInitialHead, bufferBodyBeforeHeaders = false } = options;
+	const { url, server, fontHeadHTML, scripts, DocumentComponent, statusCode, extraHeaders, getHeadHTML, enhancePageElement, scriptNonce, documentContext, setDocumentInitialHead, bufferBodyBeforeHeaders = false } = options;
 	const documentRenderPage = await runDocumentRenderPage({
 		DocumentComponent,
 		enhancePageElement,
@@ -110,6 +111,7 @@ async function streamPageToResponse(res, element, options) {
 		scriptNonce,
 		context: documentContext
 	});
+	if (res.headersSent || res.writableEnded) return;
 	let bodyStream;
 	if (documentRenderPage.status === "rendered") {
 		const synthesised = documentRenderPage.bodyHtml;
@@ -152,7 +154,7 @@ async function streamPageToResponse(res, element, options) {
 	};
 	if (extraHeaders) for (const [key, val] of Object.entries(extraHeaders)) if (Array.isArray(val)) res.setHeader(key, val);
 	else headers[key] = val;
-	res.writeHead(statusCode, headers);
+	res.writeHead(statusCode ?? res.statusCode, headers);
 	res.write(prefix);
 	if (bufferedBody !== null) {
 		res.end(bufferedBody + suffix);
@@ -211,6 +213,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 		const _reqStart = now();
 		let _compileEnd;
 		let _renderEnd;
+		attachPagesRequestCookies(req);
 		res.on("finish", () => {
 			const totalMs = now() - _reqStart;
 			const compileMs = _compileEnd !== void 0 ? Math.round(_compileEnd - _reqStart) : void 0;
@@ -248,8 +251,9 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 			if (isDataReq) {
 				const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
 				const notFoundHeaders = { "Content-Type": "application/json" };
+				if (hasMiddleware) notFoundHeaders["x-nextjs-matched-path"] = `${locale ? `/${locale}` : ""}${localeStrippedUrl}`;
 				if (deploymentId) notFoundHeaders[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
-				res.writeHead(404, notFoundHeaders);
+				res.writeHead(hasMiddleware ? 200 : 404, notFoundHeaders);
 				res.end("{}");
 				return;
 			}
@@ -340,17 +344,8 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					});
 					const fallback = pathsResult?.fallback ?? false;
 					const paths = pathsResult?.paths ?? [];
-					const currentPathname = normalizeStaticPathname(url);
-					const isValidPath = paths.some((p) => {
-						if (typeof p === "string") return normalizeStaticPathname(p) === currentPathname;
-						const entryParams = p.params;
-						if (entryParams === void 0 || entryParams === null) return false;
-						return Object.entries(entryParams).every(([key, val]) => {
-							const actual = params[key];
-							if (Array.isArray(val)) return Array.isArray(actual) && val.join("/") === actual.join("/");
-							return String(val) === String(actual);
-						});
-					});
+					const routeParams = getPagesRouteParams(patternToNextFormat(route.pattern));
+					const isValidPath = paths.some((pathEntry) => matchesPagesStaticPath(pathEntry, params, routeParams, url));
 					if (fallback === false && !isValidPath) {
 						if (isDataReq) {
 							const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
@@ -762,6 +757,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						setRevalidateDuration(cacheKey, revalidateSeconds);
 					}
 					const dataHeaders = { "Content-Type": "application/json" };
+					if ((statusCode ?? 200) === 200) dataHeaders["x-nextjs-matched-path"] = `${locale ? `/${locale}` : ""}${patternToNextFormat(route.pattern)}`;
 					if (gsspExtraHeaders) for (const [k, v] of Object.entries(gsspExtraHeaders)) dataHeaders[k] = v;
 					const dataRoutePattern = patternToNextFormat(route.pattern);
 					if (dataRoutePattern !== "/_error" && dataRoutePattern !== "/500") {
@@ -935,7 +931,11 @@ hydrate();
 					documentContext: {
 						pathname: patternToNextFormat(route.pattern),
 						query,
-						asPath: requestAsPath
+						asPath: requestAsPath,
+						...pagesNextData.autoExport === true ? {} : {
+							req,
+							res
+						}
 					},
 					enhancePageElement: (renderPageOpts) => {
 						let FinalApp = AppComponent;
@@ -1004,6 +1004,7 @@ hydrate();
 * - other: pages/_error.tsx -> default
 */
 async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCode, wrapWithRouterContext, fileMatcher, err) {
+	attachPagesRequestCookies(req);
 	const matcher = fileMatcher ?? createValidFileMatcher();
 	const candidates = statusCode === 404 ? ["404", "_error"] : statusCode === 500 ? ["500", "_error"] : ["_error"];
 	for (const candidate of candidates) try {

package/dist/server/dev-stack-sourcemap.d.ts

@@ -1,4 +1,4 @@
-import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "./dev-stack-sourcemap-endpoint.js";
+import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "../utils/dev-stack-sourcemap-endpoint.js";
 import { ViteDevServer } from "vite";
 
 //#region src/server/dev-stack-sourcemap.d.ts

package/dist/server/dev-stack-sourcemap.js

@@ -1,4 +1,4 @@
-import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "./dev-stack-sourcemap-endpoint.js";
+import { VINEXT_ORIGINAL_STACK_TRACE_ENDPOINT } from "../utils/dev-stack-sourcemap-endpoint.js";
 import { readFile } from "node:fs/promises";
 import { fileURLToPath, pathToFileURL } from "node:url";
 //#region src/server/dev-stack-sourcemap.ts

package/dist/server/fetch-handler.d.ts

@@ -0,0 +1,2 @@
+import handler from "virtual:vinext-worker-entry";
+export { handler as default };

package/dist/server/fetch-handler.js

@@ -0,0 +1,18 @@
+import handler from "virtual:vinext-worker-entry";
+//#region src/server/fetch-handler.ts
+/**
+* Default Cloudflare fetch handler for vinext.
+*
+* Use this directly in wrangler.jsonc:
+*   "main": "vinext/server/fetch-handler"
+*
+* Or import and delegate to it from a custom worker:
+*   import handler from "vinext/server/fetch-handler";
+*   return handler.fetch(request, env, ctx);
+*
+* The vinext plugin resolves this to the App Router or Pages Router handler
+* for the current project at build time.
+*/
+var fetch_handler_default = handler;
+//#endregion
+export { fetch_handler_default as default };

package/dist/server/headers.d.ts

@@ -1,3 +1,5 @@
+import { MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_SET_COOKIE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER } from "../utils/protocol-headers.js";
+
 //#region src/server/headers.d.ts
 /**
  * Internal HTTP header name constants used throughout vinext.
@@ -15,14 +17,8 @@ declare const VINEXT_CACHE_HEADER = "X-Vinext-Cache";
 declare const NEXTJS_CACHE_HEADER = "x-nextjs-cache";
 /** Static file signal — value is URL-encoded pathname. */
 declare const VINEXT_STATIC_FILE_HEADER = "x-vinext-static-file";
-/** Serialized middleware context (JSON) forwarded from dev server to RSC entry. */
-declare const VINEXT_MW_CTX_HEADER = "x-vinext-mw-ctx";
 /** Timing metrics: `handlerStart,compileMs,renderMs`. */
 declare const VINEXT_TIMING_HEADER = "x-vinext-timing";
-/** Build-time prerender authentication secret. */
-declare const VINEXT_PRERENDER_SECRET_HEADER = "x-vinext-prerender-secret";
-/** URL-encoded JSON route params for build-time prerender renders. */
-declare const VINEXT_PRERENDER_ROUTE_PARAMS_HEADER = "x-vinext-prerender-route-params";
 /** Internal endpoint used to evaluate App Router generateStaticParams exports. */
 declare const VINEXT_PRERENDER_STATIC_PARAMS_PATH = "/__vinext/prerender/static-params";
 /** Internal endpoint used to evaluate Pages Router getStaticPaths exports. */
@@ -81,22 +77,16 @@ declare const ACTION_REDIRECT_HEADER = "x-action-redirect";
 declare const ACTION_REDIRECT_TYPE_HEADER = "x-action-redirect-type";
 /** HTTP status for a Server Action redirect (e.g. "308"). */
 declare const ACTION_REDIRECT_STATUS_HEADER = "x-action-redirect-status";
-/** Prefix for forwarded request headers (e.g. `x-middleware-request-cookie`). */
-declare const MIDDLEWARE_REQUEST_HEADER_PREFIX = "x-middleware-request-";
-/** Comma-separated list of header names that middleware wants to override. */
-declare const MIDDLEWARE_OVERRIDE_HEADERS = "x-middleware-override-headers";
-/** Carries cookies set by middleware for same-render reads. */
-declare const MIDDLEWARE_SET_COOKIE_HEADER = "x-middleware-set-cookie";
 /** Signal from `NextResponse.next()` — value "1" means "continue to next handler". */
 declare const MIDDLEWARE_NEXT_HEADER = "x-middleware-next";
 /** Rewrite destination URL set by `NextResponse.rewrite()`. */
 declare const MIDDLEWARE_REWRITE_HEADER = "x-middleware-rewrite";
-/** Generic prefix for all middleware internal headers. */
-declare const MIDDLEWARE_HEADER_PREFIX = "x-middleware-";
 declare const NEXT_ROUTER_STATE_TREE_HEADER = "Next-Router-State-Tree";
 declare const NEXT_ROUTER_PREFETCH_HEADER = "Next-Router-Prefetch";
 declare const NEXT_ROUTER_SEGMENT_PREFETCH_HEADER = "Next-Router-Segment-Prefetch";
 declare const NEXT_URL_HEADER = "Next-Url";
+declare const NEXT_REQUEST_ID_HEADER = "x-nextjs-request-id";
+declare const NEXT_HTML_REQUEST_ID_HEADER = "x-nextjs-html-request-id";
 /** Lowercase flight header variants used in middleware forwarding. */
 declare const FLIGHT_HEADERS: readonly string[];
 /**
@@ -111,4 +101,4 @@ declare const INTERNAL_HEADERS: string[];
 /** Vinext-only internal headers stripped alongside Next.js protocol internals. */
 declare const VINEXT_INTERNAL_HEADERS: string[];
 //#endregion
-export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };
+export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };

package/dist/server/headers.js

@@ -1,3 +1,4 @@
+import { MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_SET_COOKIE_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER } from "../utils/protocol-headers.js";
 //#region src/server/headers.ts
 /**
 * Internal HTTP header name constants used throughout vinext.
@@ -15,14 +16,8 @@ const VINEXT_CACHE_HEADER = "X-Vinext-Cache";
 const NEXTJS_CACHE_HEADER = "x-nextjs-cache";
 /** Static file signal — value is URL-encoded pathname. */
 const VINEXT_STATIC_FILE_HEADER = "x-vinext-static-file";
-/** Serialized middleware context (JSON) forwarded from dev server to RSC entry. */
-const VINEXT_MW_CTX_HEADER = "x-vinext-mw-ctx";
 /** Timing metrics: `handlerStart,compileMs,renderMs`. */
 const VINEXT_TIMING_HEADER = "x-vinext-timing";
-/** Build-time prerender authentication secret. */
-const VINEXT_PRERENDER_SECRET_HEADER = "x-vinext-prerender-secret";
-/** URL-encoded JSON route params for build-time prerender renders. */
-const VINEXT_PRERENDER_ROUTE_PARAMS_HEADER = "x-vinext-prerender-route-params";
 /** Internal endpoint used to evaluate App Router generateStaticParams exports. */
 const VINEXT_PRERENDER_STATIC_PARAMS_PATH = "/__vinext/prerender/static-params";
 /** Internal endpoint used to evaluate Pages Router getStaticPaths exports. */
@@ -81,12 +76,6 @@ const ACTION_REDIRECT_HEADER = "x-action-redirect";
 const ACTION_REDIRECT_TYPE_HEADER = "x-action-redirect-type";
 /** HTTP status for a Server Action redirect (e.g. "308"). */
 const ACTION_REDIRECT_STATUS_HEADER = "x-action-redirect-status";
-/** Prefix for forwarded request headers (e.g. `x-middleware-request-cookie`). */
-const MIDDLEWARE_REQUEST_HEADER_PREFIX = "x-middleware-request-";
-/** Comma-separated list of header names that middleware wants to override. */
-const MIDDLEWARE_OVERRIDE_HEADERS = "x-middleware-override-headers";
-/** Carries cookies set by middleware for same-render reads. */
-const MIDDLEWARE_SET_COOKIE_HEADER = "x-middleware-set-cookie";
 /** Signal from `NextResponse.next()` — value "1" means "continue to next handler". */
 const MIDDLEWARE_NEXT_HEADER = "x-middleware-next";
 /** Rewrite destination URL set by `NextResponse.rewrite()`. */
@@ -95,12 +84,12 @@ const MIDDLEWARE_REWRITE_HEADER = "x-middleware-rewrite";
 const MIDDLEWARE_REDIRECT_HEADER = "x-middleware-redirect";
 /** Skip-middleware signal. */
 const MIDDLEWARE_SKIP_HEADER = "x-middleware-skip";
-/** Generic prefix for all middleware internal headers. */
-const MIDDLEWARE_HEADER_PREFIX = "x-middleware-";
 const NEXT_ROUTER_STATE_TREE_HEADER = "Next-Router-State-Tree";
 const NEXT_ROUTER_PREFETCH_HEADER = "Next-Router-Prefetch";
 const NEXT_ROUTER_SEGMENT_PREFETCH_HEADER = "Next-Router-Segment-Prefetch";
 const NEXT_URL_HEADER = "Next-Url";
+const NEXT_REQUEST_ID_HEADER = "x-nextjs-request-id";
+const NEXT_HTML_REQUEST_ID_HEADER = "x-nextjs-html-request-id";
 /** Lowercase flight header variants used in middleware forwarding. */
 const FLIGHT_HEADERS = [
 	"rsc",
@@ -133,4 +122,4 @@ const INTERNAL_HEADERS = [
 /** Vinext-only internal headers stripped alongside Next.js protocol internals. */
 const VINEXT_INTERNAL_HEADERS = [VINEXT_PRERENDER_ROUTE_PARAMS_HEADER];
 //#endregion
-export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };
+export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_HTML_REQUEST_ID_HEADER, NEXT_REQUEST_ID_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_PAGES_STATIC_PATHS_PATH, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_PRERENDER_STATIC_PARAMS_PATH, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };

package/dist/server/image-optimization.d.ts

@@ -121,5 +121,55 @@ type ImageHandlers = {
  * cache headers.
  */
 declare function handleImageOptimization(request: Request, handlers: ImageHandlers, allowedWidths?: number[], imageConfig?: ImageConfig): Promise<Response>;
+/**
+ * A server-side image optimizer: the transform backend that resizes/transcodes
+ * a source image. Produced by an adapter factory (e.g. `imagesOptimizer()` from
+ * `@vinext/cloudflare/images/images-optimizer`) and registered via
+ * {@link setImageOptimizer}.
+ */
+type ImageOptimizer = {
+  /** Transform the source image (resize, format, quality). */transformImage: (body: ReadableStream, options: {
+    width: number;
+    format: string;
+    quality: number;
+  }) => Promise<Response>;
+};
+/**
+ * Register the active image optimizer (transform backend). An explicit
+ * registration always wins; passing `null` clears it (falling back to
+ * unoptimized passthrough).
+ *
+ * Configure this declaratively via the `images.optimizer` option on the
+ * `vinext()` plugin in your `vite.config.ts` rather than calling it directly.
+ * On Cloudflare Workers:
+ *
+ * ```ts
+ * import { vinext } from "vinext";
+ * import { imagesOptimizer } from "@vinext/cloudflare/images/images-optimizer";
+ *
+ * export default defineConfig({
+ *   plugins: [vinext({ images: { optimizer: imagesOptimizer() } })],
+ * });
+ * ```
+ *
+ * The plugin registers the optimizer across every runtime/router entry, so you
+ * don't have to wire `env.IMAGES` into a custom worker entry. This setter
+ * remains the internal registration target.
+ */
+declare function setImageOptimizer(optimizer: ImageOptimizer | null): void;
+/** Get the active image optimizer, or `null` when none is configured. */
+declare function getImageOptimizer(): ImageOptimizer | null;
+/**
+ * Handle an image optimization request using the configured optimizer (if any).
+ *
+ * This is the single entry point every runtime/router seam (App Router worker,
+ * Pages worker, Node prod server) should call: it reads the registered
+ * {@link ImageOptimizer} and wires its `transformImage` into
+ * {@link handleImageOptimization}, with the caller supplying the runtime's
+ * `fetchAsset` (e.g. the Cloudflare `ASSETS` binding, or filesystem reads on
+ * Node). When no optimizer is registered, the request is served unoptimized
+ * (passthrough) with the same security/cache headers.
+ */
+declare function handleConfiguredImageOptimization(request: Request, fetchAsset: (path: string, request: Request) => Promise<Response>, allowedWidths?: number[], imageConfig?: ImageConfig): Promise<Response>;
 //#endregion
-export { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, IMAGE_CACHE_CONTROL, IMAGE_CONTENT_SECURITY_POLICY, IMAGE_OPTIMIZATION_PATH, ImageConfig, ImageHandlers, ParseImageParamsOptions, VINEXT_IMAGE_OPTIMIZATION_PATH, handleImageOptimization, isImageOptimizationPath, isSafeImageContentType, negotiateImageFormat, parseImageParams, resolveDevImageRedirect };
+export { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, IMAGE_CACHE_CONTROL, IMAGE_CONTENT_SECURITY_POLICY, IMAGE_OPTIMIZATION_PATH, ImageConfig, ImageHandlers, ImageOptimizer, ParseImageParamsOptions, VINEXT_IMAGE_OPTIMIZATION_PATH, getImageOptimizer, handleConfiguredImageOptimization, handleImageOptimization, isImageOptimizationPath, isSafeImageContentType, negotiateImageFormat, parseImageParams, resolveDevImageRedirect, setImageOptimizer };