@qzsy/vinext 0.1.11 → 0.1.80

package/dist/server/app-server-action-execution.js

@@ -5,7 +5,7 @@ import { isExternalUrl } from "../config/config-matchers.js";
 import { internalServerErrorResponse, payloadTooLargeResponse } from "./http-error-responses.js";
 import { validateCsrfOrigin, validateServerActionPayload } from "./request-pipeline.js";
 import { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI } from "./app-rsc-render-mode.js";
-import { headersContextFromRequest, setHeadersContext } from "../shims/headers.js";
+import { headersContextFromRequest, isDraftModeRequest, setHeadersContext } from "../shims/headers.js";
 import { getAndClearActionRevalidationKind } from "../shims/cache-request-state.js";
 import { setCurrentFetchCacheMode, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault } from "../shims/fetch-cache.js";
 import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
@@ -13,6 +13,7 @@ import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityI
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { getNextErrorDigest, parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
+import { createRootParamsUsageController, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage } from "../shims/root-params.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import "./app-page-stream.js";
@@ -20,7 +21,29 @@ import { buildAppPageTags } from "./implicit-tags.js";
 import { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
 import { resolveAppPageActionRerenderTarget } from "./app-page-request.js";
 import { getSetCookieName } from "./cookie-utils.js";
+import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
 //#region src/server/app-server-action-execution.ts
+function prepareActionPageRerenderContext(options) {
+	if (options.dynamicConfig === "force-static" || options.dynamicConfig === "error") setHeadersContext(createStaticGenerationHeadersContext({
+		draftModeEnabled: isDraftModeRequest(createActionRerenderRequest({
+			draftModeCookie: options.draftModeCookie,
+			request: options.request
+		}), options.draftModeSecret),
+		draftModeSecret: options.draftModeSecret,
+		dynamicConfig: options.dynamicConfig,
+		routeKind: "page",
+		routePattern: options.routePattern
+	}));
+	return options.dynamicConfig === "force-static" ? new URLSearchParams() : options.searchParams;
+}
+function createActionRerenderRequest(options) {
+	if (!options.draftModeCookie) return options.request;
+	const headers = new Headers(options.request.headers);
+	const cookieHeader = applySetCookieMutationsToRequestCookieHeader(headers.get("cookie"), [options.draftModeCookie]);
+	if (cookieHeader === null) headers.delete("cookie");
+	else headers.set("cookie", cookieHeader);
+	return new Request(options.request.url, { headers });
+}
 /**
 * Matches Next.js' server action argument cap to prevent stack overflow in
 * Function.prototype.apply when decoding hostile action payloads.
@@ -351,11 +374,14 @@ async function handleProgressiveServerActionRequest(options) {
 		let actionRedirect = null;
 		let actionError = void 0;
 		let actionFailed = false;
+		let actionThrew = false;
 		let actionResult;
+		const rootParamsUsage = createRootParamsUsageController();
 		const previousHeadersPhase = options.setHeadersAccessPhase("action");
 		try {
-			actionResult = await action();
+			actionResult = await runWithRootParamsUsage({ kind: "server-action" }, action, rootParamsUsage);
 		} catch (error) {
+			actionThrew = true;
 			actionRedirect = getActionRedirect(error);
 			if (!actionRedirect) {
 				actionError = error;
@@ -375,8 +401,10 @@ async function handleProgressiveServerActionRequest(options) {
 			}
 		} finally {
 			options.setHeadersAccessPhase(previousHeadersPhase);
+			if (actionThrew) rootParamsUsage.transitionToRender();
 		}
 		if (!actionRedirect) {
+			if (!actionThrew) rootParamsUsage.transitionToRender();
 			const actionPendingCookies = dedupePendingCookies(options.getAndClearPendingCookies());
 			const actionDraftCookie = options.getDraftModeCookieHeader();
 			const revalidationKind = resolveActionRevalidationKind(actionPendingCookies.length > 0 || Boolean(actionDraftCookie));
@@ -544,16 +572,19 @@ async function handleServerActionRscRequest(options) {
 		let returnValue;
 		let actionRedirect = null;
 		let actionStatus = 200;
+		let actionThrew = false;
 		const actionWasForwarded = Boolean(options.request.headers.get(ACTION_FORWARDED_HEADER));
+		const rootParamsUsage = createRootParamsUsageController();
 		const previousHeadersPhase = options.setHeadersAccessPhase("action");
 		try {
 			try {
 				validateServerActionArgs(args);
 				returnValue = {
 					ok: true,
-					data: await action.apply(null, args)
+					data: await runWithRootParamsUsage({ kind: "server-action" }, () => action.apply(null, args), rootParamsUsage)
 				};
 			} catch (error) {
+				actionThrew = true;
 				actionRedirect = getActionRedirect(error);
 				if (actionRedirect) returnValue = {
 					ok: true,
@@ -568,6 +599,7 @@ async function handleServerActionRscRequest(options) {
 							data: error
 						};
 					} else {
+						actionStatus = 500;
 						console.error("[vinext] Server action error:", error);
 						returnValue = {
 							ok: false,
@@ -578,6 +610,7 @@ async function handleServerActionRscRequest(options) {
 			}
 		} finally {
 			options.setHeadersAccessPhase(previousHeadersPhase);
+			if (actionThrew && !actionWasForwarded) rootParamsUsage.transitionToRender();
 		}
 		if (actionRedirect) {
 			const actionPendingCookies = dedupePendingCookies(options.getAndClearPendingCookies());
@@ -622,35 +655,48 @@ async function handleServerActionRscRequest(options) {
 				request: options.request,
 				url: redirectTarget
 			});
-			setHeadersContext(headersContextFromRequest(redirectRenderRequest));
+			setHeadersContext(headersContextFromRequest(redirectRenderRequest, { draftModeSecret: options.draftModeSecret }));
+			const redirectDynamicConfig = options.resolveRouteDynamicConfig?.(targetMatch.route);
+			const redirectSearchParams = prepareActionPageRerenderContext({
+				draftModeCookie: actionDraftCookie,
+				draftModeSecret: options.draftModeSecret,
+				dynamicConfig: redirectDynamicConfig,
+				request: redirectRenderRequest,
+				routePattern: targetMatch.route.pattern,
+				searchParams: redirectTarget.searchParams
+			});
 			const redirectNavigationParams = resolveAppPageNavigationParams(targetMatch.route, targetMatch.params, targetPathname, null);
 			options.setNavigationContext({
 				pathname: targetPathname,
-				searchParams: redirectTarget.searchParams,
+				searchParams: redirectSearchParams,
 				params: redirectNavigationParams
 			});
 			setCurrentFetchCacheMode(options.resolveRouteFetchCacheMode?.(targetMatch.route) ?? null);
-			setCurrentForceDynamicFetchDefault(options.resolveRouteDynamicConfig?.(targetMatch.route) === "force-dynamic");
+			setCurrentForceDynamicFetchDefault(redirectDynamicConfig === "force-dynamic");
 			setCurrentFetchSoftTags(buildServerActionPageTags(targetMatch.route, targetPathname));
-			const element = options.buildPageElement({
-				cleanPathname: targetPathname,
-				interceptOpts: void 0,
-				isRscRequest: true,
-				mountedSlotsHeader: null,
-				params: targetMatch.params,
-				request: redirectRenderRequest,
-				route: targetMatch.route,
-				searchParams: redirectTarget.searchParams,
-				renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI
-			});
-			const onRenderError = options.createRscOnErrorHandler(redirectRenderRequest, targetPathname, targetMatch.route.pattern);
-			return createServerActionRscResponse(await options.renderToReadableStream({
-				root: element,
-				returnValue
-			}, {
-				temporaryReferences,
-				onError: onRenderError
-			}), {
+			return createServerActionRscResponse(await runWithRootParamsScope(pickRootParams(targetMatch.params, targetMatch.route.rootParamNames), () => runWithRootParamsUsage({ kind: "route" }, async () => {
+				const element = options.buildPageElement({
+					cleanPathname: targetPathname,
+					interceptOpts: void 0,
+					isRscRequest: true,
+					mountedSlotsHeader: null,
+					params: targetMatch.params,
+					request: redirectRenderRequest,
+					route: targetMatch.route,
+					searchParams: redirectSearchParams,
+					renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI,
+					observeMetadataSearchParamsAccess: redirectDynamicConfig !== "force-static",
+					observePageSearchParamsAccess: redirectDynamicConfig !== "force-static"
+				});
+				const onRenderError = options.createRscOnErrorHandler(redirectRenderRequest, targetPathname, targetMatch.route.pattern);
+				return options.renderToReadableStream({
+					root: element,
+					returnValue
+				}, {
+					temporaryReferences,
+					onError: onRenderError
+				});
+			})), {
 				status: shouldUseForwardedActionRedirectStatus({
 					actionWasForwarded,
 					currentPathname: options.cleanPathname,
@@ -665,7 +711,8 @@ async function handleServerActionRscRequest(options) {
 		const actionPendingCookies = dedupePendingCookies(options.getAndClearPendingCookies());
 		const actionDraftCookie = options.getDraftModeCookieHeader();
 		const actionRevalidationKind = resolveActionRevalidationKind(actionPendingCookies.length > 0 || Boolean(actionDraftCookie));
-		if (actionWasForwarded || actionStatus === 200 && actionRevalidationKind === ACTION_DID_NOT_REVALIDATE) {
+		const isHttpFallback = actionStatus === 401 || actionStatus === 403 || actionStatus === 404;
+		if (!isHttpFallback && (actionWasForwarded || actionRevalidationKind === ACTION_DID_NOT_REVALIDATE)) {
 			const onRenderError = options.createRscOnErrorHandler(options.request, options.cleanPathname, options.cleanPathname);
 			const rscStream = await options.renderToReadableStream({ returnValue }, {
 				temporaryReferences,
@@ -686,6 +733,7 @@ async function handleServerActionRscRequest(options) {
 				headers: actionHeaders
 			}, options.clearRequestContext);
 		}
+		if (!actionThrew) rootParamsUsage.transitionToRender();
 		const match = options.matchRoute(options.cleanPathname);
 		let element;
 		let errorPattern = match ? match.route.pattern : options.cleanPathname;
@@ -702,16 +750,25 @@ async function handleServerActionRscRequest(options) {
 				toInterceptOpts: options.toInterceptOpts
 			});
 			const resolvedActionNavigationParams = resolveAppPageNavigationParams(actionRerenderTarget.route, actionRerenderTarget.navigationParams, options.cleanPathname, actionRerenderTarget.interceptOpts);
+			await options.ensureRouteLoaded?.(actionRerenderTarget.route);
+			const actionRerenderDynamicConfig = options.resolveRouteDynamicConfig?.(actionRerenderTarget.route);
+			const actionRerenderSearchParams = prepareActionPageRerenderContext({
+				draftModeCookie: actionDraftCookie,
+				draftModeSecret: options.draftModeSecret,
+				dynamicConfig: actionRerenderDynamicConfig,
+				request: options.request,
+				routePattern: actionRerenderTarget.route.pattern,
+				searchParams: options.searchParams
+			});
 			options.setNavigationContext({
 				pathname: options.cleanPathname,
-				searchParams: options.searchParams,
+				searchParams: actionRerenderSearchParams,
 				params: resolvedActionNavigationParams
 			});
-			await options.ensureRouteLoaded?.(actionRerenderTarget.route);
 			setCurrentFetchCacheMode(options.resolveRouteFetchCacheMode?.(actionRerenderTarget.route) ?? null);
-			setCurrentForceDynamicFetchDefault(options.resolveRouteDynamicConfig?.(actionRerenderTarget.route) === "force-dynamic");
+			setCurrentForceDynamicFetchDefault(actionRerenderDynamicConfig === "force-dynamic");
 			setCurrentFetchSoftTags(buildServerActionPageTags(actionRerenderTarget.route, options.cleanPathname));
-			element = options.buildPageElement({
+			const buildActionRerenderElement = () => options.buildPageElement({
 				cleanPathname: options.cleanPathname,
 				interceptOpts: actionRerenderTarget.interceptOpts,
 				isRscRequest: options.isRscRequest,
@@ -719,22 +776,26 @@ async function handleServerActionRscRequest(options) {
 				params: actionRerenderTarget.params,
 				request: options.request,
 				route: actionRerenderTarget.route,
-				searchParams: options.searchParams,
-				renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI
+				searchParams: actionRerenderSearchParams,
+				renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI,
+				observeMetadataSearchParamsAccess: actionRerenderDynamicConfig !== "force-static",
+				observePageSearchParamsAccess: actionRerenderDynamicConfig !== "force-static"
 			});
+			element = actionWasForwarded && isHttpFallback ? await runWithRootParamsUsage({ kind: "route" }, async () => buildActionRerenderElement()) : buildActionRerenderElement();
 			errorPattern = actionRerenderTarget.route.pattern;
 		} else {
 			const actionRouteId = options.createPayloadRouteId(options.cleanPathname, null);
 			element = options.createNotFoundElement(actionRouteId);
 		}
 		const onRenderError = options.createRscOnErrorHandler(options.request, options.cleanPathname, errorPattern);
-		const rscStream = await options.renderToReadableStream({
+		const renderActionRerender = () => options.renderToReadableStream({
 			root: element,
 			returnValue
 		}, {
 			temporaryReferences,
 			onError: onRenderError
 		});
+		const rscStream = await (actionWasForwarded && isHttpFallback ? runWithRootParamsUsage({ kind: "route" }, renderActionRerender) : renderActionRerender());
 		const actionHeaders = new Headers({
 			"Content-Type": VINEXT_RSC_CONTENT_TYPE,
 			Vary: VINEXT_RSC_VARY_HEADER

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

@@ -16,6 +16,7 @@ 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 { setPagesClientAssets } from "./pages-client-assets.js";
 import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
 import { runWithRootParamsScope } from "../shims/root-params.js";
 import { createInitialBfcacheMaps } from "./app-bfcache-identity.js";
@@ -27,9 +28,12 @@ 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;
@@ -182,6 +189,10 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				}
 				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);

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/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-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,13 @@ 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 path from "node:path";
 import React from "react";
 import { renderToReadableStream } from "react-dom/server.edge";
@@ -248,8 +248,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 +341,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 +754,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") {

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/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

@@ -126,5 +126,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, snapToNearestAllowedWidth };
+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, snapToNearestAllowedWidth };