vinext 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/server/pages-get-initial-props.d.ts

@@ -1,3 +1,5 @@
+import { NextRouter } from "../shims/router.js";
+
 //#region src/server/pages-get-initial-props.d.ts
 type PagesGetInitialPropsContext = {
   req?: unknown;
@@ -10,6 +12,16 @@ type PagesGetInitialPropsContext = {
   locales?: string[];
   defaultLocale?: string;
 } & Record<string, unknown>;
+type PagesGetInitialPropsRouter = Omit<Pick<NextRouter, "route" | "pathname" | "query" | "asPath">, "query"> & {
+  query: Record<string, unknown>;
+};
+/**
+ * Build the URL-state subset of Next.js's ServerRouter used by isolated
+ * initial-props helpers. Real request handlers pass their full `next/router`
+ * instance; this fallback keeps direct helper callers and tests aligned with
+ * the same required fields.
+ */
+declare function createPagesGetInitialPropsRouter(pathname: string, query: Record<string, unknown>, asPath: string): PagesGetInitialPropsRouter;
 declare function hasPagesGetInitialProps(component: unknown): boolean;
 declare function isResponseSent(res: unknown): boolean;
 declare function loadPagesGetInitialProps(component: unknown, context: PagesGetInitialPropsContext): Promise<Record<string, unknown> | null>;
@@ -47,7 +59,8 @@ type DevAppInitialPropsContext = {
   res: unknown;
   pathname: string;
   query: Record<string, unknown>;
-  asPath: string;
+  asPath: string; /** The request-scoped `next/router` server instance when available. */
+  router?: PagesGetInitialPropsRouter;
   locale?: string;
   locales?: string[];
   defaultLocale?: string;
@@ -64,4 +77,4 @@ type DevAppInitialPropsContext = {
  */
 declare function loadDevAppInitialProps(ctx: DevAppInitialPropsContext): Promise<DevAppInitialPropsResult>;
 //#endregion
-export { DevAppInitialPropsContext, DevAppInitialPropsResult, hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };
+export { DevAppInitialPropsContext, DevAppInitialPropsResult, PagesGetInitialPropsRouter, createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };

package/dist/server/pages-get-initial-props.js

@@ -1,4 +1,18 @@
 //#region src/server/pages-get-initial-props.ts
+/**
+* Build the URL-state subset of Next.js's ServerRouter used by isolated
+* initial-props helpers. Real request handlers pass their full `next/router`
+* instance; this fallback keeps direct helper callers and tests aligned with
+* the same required fields.
+*/
+function createPagesGetInitialPropsRouter(pathname, query, asPath) {
+	return {
+		route: pathname.replace(/\/$/, "") || "/",
+		pathname,
+		query,
+		asPath
+	};
+}
 function isObjectLike(value) {
 	return typeof value === "object" && value !== null || typeof value === "function";
 }
@@ -61,11 +75,7 @@ async function loadDevAppInitialProps(ctx) {
 	const initialProps = await loadPagesGetInitialProps(ctx.appComponent, {
 		AppTree: ctx.appTree,
 		Component: ctx.component,
-		router: {
-			pathname: ctx.pathname,
-			query: ctx.query,
-			asPath: ctx.asPath
-		},
+		router: ctx.router ?? createPagesGetInitialPropsRouter(ctx.pathname, ctx.query, ctx.asPath),
 		ctx: {
 			req: ctx.req,
 			res: ctx.res,
@@ -89,4 +99,4 @@ async function loadDevAppInitialProps(ctx) {
 	};
 }
 //#endregion
-export { hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };
+export { createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };

package/dist/server/pages-node-compat.d.ts

@@ -1,5 +1,6 @@
 import { PagesBodyParseError } from "./pages-media-type.js";
 import { RevalidateOptions } from "./pages-revalidate.js";
+import { PagesPreviewData } from "./pages-preview.js";
 import { Readable, Writable } from "node:stream";
 
 //#region src/server/pages-node-compat.d.ts
@@ -11,6 +12,9 @@ type PagesReqResRequest = Readable & {
   query: PagesRequestQuery;
   body: unknown;
   cookies: Record<string, string>;
+  preview?: true;
+  draftMode?: true;
+  previewData: PagesPreviewData | false;
 };
 type PagesReqResHeaders = {
   [key: string]: string | number | boolean | string[];
@@ -24,13 +28,19 @@ type PagesReqResResponse = Writable & {
   status: (code: number) => PagesReqResResponse;
   json: (data: unknown) => void;
   send: (data: unknown) => void;
-  redirect: (statusOrUrl: number | string, url?: string) => void;
+  redirect: (statusOrUrl: number | string, url?: string) => PagesReqResResponse;
   getHeaders: () => PagesReqResHeaders;
   revalidate: (urlPath: string, opts?: RevalidateOptions) => Promise<void>;
   setPreviewData: (data: object | string, options?: {
     maxAge?: number;
     path?: string;
   }) => PagesReqResResponse;
+  clearPreviewData: (options?: {
+    path?: string;
+  }) => PagesReqResResponse;
+  setDraftMode: (options?: {
+    enable?: boolean;
+  }) => PagesReqResResponse;
 };
 type PagesRequestCookiesCarrier = {
   headers: {
@@ -49,7 +59,6 @@ type CreatePagesReqResResult = {
   res: PagesReqResResponse;
   responsePromise: Promise<Response>;
 };
-type PagesPreviewData = object | string;
 /**
  * Read and parse a Pages Router API request body for the Workers/prod path.
  *
@@ -61,13 +70,11 @@ type PagesPreviewData = object | string;
  * @see https://nextjs.org/docs/pages/building-your-application/routing/api-routes#custom-config
  */
 declare function parsePagesApiBody(request: Request, maxBytes?: number): Promise<unknown>;
-declare function getPagesPreviewDataFromCookieHeader(cookieHeader: string | string[] | null | undefined, options?: {
-  isOnDemandRevalidate?: boolean;
-}): PagesPreviewData | false;
 declare function getPagesPreviewData(request: Request, options?: {
   isOnDemandRevalidate?: boolean;
 }): PagesPreviewData | false;
 declare function attachPagesRequestCookies(req: PagesRequestCookiesCarrier): void;
+declare function attachPagesPreviewApi(req: PagesReqResRequest, res: PagesReqResResponse): void;
 declare function createPagesReqRes(options: CreatePagesReqResOptions): CreatePagesReqResResult;
 //#endregion
-export { PagesBodyParseError as PagesApiBodyParseError, PagesPreviewData, PagesReqResRequest, PagesReqResResponse, PagesRequestQuery, attachPagesRequestCookies, createPagesReqRes, getPagesPreviewData, getPagesPreviewDataFromCookieHeader, parsePagesApiBody };
+export { PagesBodyParseError as PagesApiBodyParseError, PagesReqResRequest, PagesReqResResponse, PagesRequestQuery, attachPagesPreviewApi, attachPagesRequestCookies, createPagesReqRes, getPagesPreviewData, parsePagesApiBody };

package/dist/server/pages-node-compat.js

@@ -1,9 +1,9 @@
 import { parseCookieHeader } from "../utils/parse-cookie.js";
-import { getRevalidateSecret, isRevalidateSecret } from "./isr-cache.js";
 import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
 import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT } from "./pages-body-parser-config.js";
 import { PagesBodyParseError, getMediaType, isJsonMediaType } from "./pages-media-type.js";
 import { performOnDemandRevalidate } from "./pages-revalidate.js";
+import { clearPagesPreviewData, getPagesPreviewState, setPagesDraftMode, setPagesPreviewData } from "./pages-preview.js";
 import { decode } from "node:querystring";
 import { Readable, Writable } from "node:stream";
 //#region src/server/pages-node-compat.ts
@@ -65,44 +65,12 @@ function createRequestReadable(request) {
 function parsePagesRequestCookies(cookieHeader) {
 	return parseCookieHeader(Array.isArray(cookieHeader) ? cookieHeader.join("; ") : cookieHeader);
 }
-function serializePreviewCookie(name, value, options = {}) {
-	const parts = [
-		`${name}=${encodeURIComponent(value)}`,
-		"HttpOnly",
-		`Path=${options.path ?? "/"}`,
-		process.env.NODE_ENV !== "development" ? "SameSite=None" : "SameSite=Lax"
-	];
-	if (process.env.NODE_ENV !== "development") parts.push("Secure");
-	if (options.maxAge !== void 0) parts.push(`Max-Age=${Math.trunc(options.maxAge)}`);
-	return parts.join("; ");
-}
-function decodePagesPreviewPayload(payload) {
-	try {
-		const decoded = Buffer.from(payload, "base64url").toString("utf8");
-		const value = JSON.parse(decoded);
-		return typeof value === "object" && value !== null ? value : String(value);
-	} catch {
-		return false;
-	}
-}
 function getPagesPreviewDataFromCookieHeader(cookieHeader, options = {}) {
-	if (options.isOnDemandRevalidate) return false;
-	const cookies = parsePagesRequestCookies(cookieHeader);
-	const bypass = cookies.__prerender_bypass;
-	const payload = cookies.__next_preview_data;
-	if (!bypass && !payload) return false;
-	if (!isRevalidateSecret(bypass)) return false;
-	if (!payload) return {};
-	return decodePagesPreviewPayload(payload);
+	return getPagesPreviewState(cookieHeader, options).data;
 }
 function getPagesPreviewData(request, options = {}) {
 	return getPagesPreviewDataFromCookieHeader(request.headers.get("cookie"), options);
 }
-function normalizeSetCookieHeader(value) {
-	if (value === void 0) return [];
-	if (Array.isArray(value)) return value.map(String);
-	return [String(value)];
-}
 function attachPagesRequestCookies(req) {
 	if (Object.hasOwn(req, "cookies")) return;
 	Object.defineProperty(req, "cookies", {
@@ -128,6 +96,27 @@ function attachPagesRequestCookies(req) {
 		}
 	});
 }
+function attachPagesPreviewApi(req, res) {
+	const preview = getPagesPreviewState(req.headers.cookie);
+	req.previewData = preview.data;
+	if (preview.data !== false) {
+		req.preview = true;
+		req.draftMode = true;
+	}
+	res.setPreviewData = (data, options = {}) => {
+		setPagesPreviewData(res, data, options);
+		return res;
+	};
+	res.clearPreviewData = (options = {}) => {
+		clearPagesPreviewData(res, options);
+		return res;
+	};
+	res.setDraftMode = (options = { enable: true }) => {
+		setPagesDraftMode(res, options.enable !== false);
+		return res;
+	};
+	if (preview.shouldClear) clearPagesPreviewData(res);
+}
 var PagesResponseStream = class extends Writable {
 	resolveResponse;
 	rejectResponse;
@@ -197,9 +186,15 @@ var PagesResponseStream = class extends Writable {
 		this.end(String(data));
 	}
 	redirect(statusOrUrl, url) {
-		if (typeof statusOrUrl === "string") this.writeHead(307, { Location: statusOrUrl });
-		else this.writeHead(statusOrUrl, { Location: url ?? "" });
+		if (typeof statusOrUrl === "string") {
+			url = statusOrUrl;
+			statusOrUrl = 307;
+		}
+		if (typeof statusOrUrl !== "number" || typeof url !== "string") throw new Error("Invalid redirect arguments. Please use a single argument URL, e.g. res.redirect('/destination') or use a status code and URL, e.g. res.redirect(307, '/destination').");
+		this.writeHead(statusOrUrl, { Location: url });
+		this.write(url);
 		this.end();
+		return this;
 	}
 	getHeaders() {
 		const headers = { ...this.resHeaders };
@@ -210,13 +205,15 @@ var PagesResponseStream = class extends Writable {
 		await performOnDemandRevalidate(this.requestHeaders, urlPath, opts);
 	}
 	setPreviewData(data, options = {}) {
-		const payload = Buffer.from(JSON.stringify(data)).toString("base64url");
-		if (payload.length > 2048) throw new Error("Preview data is limited to 2KB currently, reduce how much data you are storing as preview data to continue");
-		this.setHeader("Set-Cookie", [
-			...normalizeSetCookieHeader(this.getHeader("Set-Cookie")),
-			serializePreviewCookie("__prerender_bypass", getRevalidateSecret(), options),
-			serializePreviewCookie("__next_preview_data", payload, options)
-		]);
+		setPagesPreviewData(this, data, options);
+		return this;
+	}
+	clearPreviewData(options = {}) {
+		clearPagesPreviewData(this, options);
+		return this;
+	}
+	setDraftMode(options = { enable: true }) {
+		setPagesDraftMode(this, options.enable !== false);
 		return this;
 	}
 	_write(chunk, encoding, callback) {
@@ -302,11 +299,13 @@ function createPagesReqRes(options) {
 		resolveResponse = resolve;
 		rejectResponse = reject;
 	});
+	const res = new PagesResponseStream(resolveResponse, rejectResponse, options.request.headers);
+	attachPagesPreviewApi(req, res);
 	return {
 		req,
-		res: new PagesResponseStream(resolveResponse, rejectResponse, options.request.headers),
+		res,
 		responsePromise
 	};
 }
 //#endregion
-export { PagesBodyParseError as PagesApiBodyParseError, attachPagesRequestCookies, createPagesReqRes, getPagesPreviewData, getPagesPreviewDataFromCookieHeader, parsePagesApiBody };
+export { PagesBodyParseError as PagesApiBodyParseError, attachPagesPreviewApi, attachPagesRequestCookies, createPagesReqRes, getPagesPreviewData, parsePagesApiBody };

package/dist/server/pages-page-data.d.ts

@@ -2,7 +2,8 @@ import { Route } from "../routing/pages-router.js";
 import { VinextNextData } from "../client/vinext-next-data.js";
 import { CachedPagesValue } from "../shims/cache-handler.js";
 import { ISRCacheEntry } from "./isr-cache.js";
-import { PagesPreviewData } from "./pages-node-compat.js";
+import { PagesPreviewData } from "./pages-preview.js";
+import { PagesGetInitialPropsRouter } from "./pages-get-initial-props.js";
 import { PagesGsspResponse, PagesI18nRenderContext, PagesNextDataExtras } from "./pages-page-response.js";
 import { ReactNode } from "react";
 
@@ -161,7 +162,8 @@ type ResolvePagesPageDataOptions = {
   deploymentId?: string;
   htmlLimitedBots?: string;
   pageModule: PagesPageModule;
-  AppComponent?: unknown;
+  AppComponent?: unknown; /** The request-scoped `next/router` server instance when available. */
+  router?: PagesGetInitialPropsRouter;
   params: Record<string, unknown>;
   query: Record<string, unknown>;
   asPath?: string;

package/dist/server/pages-page-data.js

@@ -1,4 +1,6 @@
+import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
+import { isDangerousScheme } from "../shims/url-safety.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
@@ -6,7 +8,7 @@ import { decideIsr } from "./isr-decision.js";
 import { buildPagesCacheValue } from "./isr-cache.js";
 import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { buildPagesNextDataScript, etagMatches, generatePagesETag, isPagesStreamingBot, requestsNoCache } from "./pages-page-response.js";
-import { hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
+import { createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { buildNextDataPropsJsonResponse } from "./pages-data-route.js";
 import { isSerializableProps } from "./pages-serializable-props.js";
 import { isBotUserAgent } from "../utils/html-limited-bots.js";
@@ -57,11 +59,7 @@ async function loadPagesAppInitialRenderProps(options, getSharedReqRes) {
 	const initialProps = await loadPagesGetInitialProps(options.AppComponent, {
 		AppTree: options.createAppTree ?? options.createPageElement,
 		Component: options.pageModule.default,
-		router: {
-			pathname: options.routePattern,
-			query: options.query,
-			asPath: options.asPath ?? options.routeUrl
-		},
+		router: options.router ?? createPagesGetInitialPropsRouter(options.routePattern, options.query, options.asPath ?? options.routeUrl),
 		ctx: {
 			req,
 			res,
@@ -111,6 +109,17 @@ async function loadPagesAppInitialRenderProps(options, getSharedReqRes) {
 */
 function buildPagesRedirectResponse(redirect, options, props = { pageProps: {} }) {
 	const destination = options.sanitizeDestination(redirect.destination);
+	if (isDangerousScheme(destination)) {
+		const headers = new Headers({
+			"Cache-Control": "private, no-cache, no-store, max-age=0, must-revalidate",
+			"Content-Type": "text/plain; charset=utf-8"
+		});
+		if (options.deploymentId) headers.set(NEXTJS_DEPLOYMENT_ID_HEADER, options.deploymentId);
+		return new Response("Invalid redirect destination", {
+			status: 500,
+			headers
+		});
+	}
 	if (options.isDataReq) {
 		const init = { headers: {} };
 		if (options.deploymentId) init.headers[NEXTJS_DEPLOYMENT_ID_HEADER] = options.deploymentId;
@@ -152,7 +161,7 @@ function getPagesRouteParams(routePattern) {
 	}).filter((param) => param !== null);
 }
 function matchesPagesStaticPath(pathEntry, params, routeParams, routeUrl) {
-	if (typeof pathEntry === "string") return normalizeStaticPathname(pathEntry) === normalizeStaticPathname(routeUrl);
+	if (typeof pathEntry === "string") return normalizePathnameForRouteMatch(normalizeStaticPathname(pathEntry)) === normalizePathnameForRouteMatch(normalizeStaticPathname(routeUrl));
 	const entryParams = pathEntry.params;
 	if (entryParams === void 0 || entryParams === null) return false;
 	return routeParams.every(({ key, repeat, optional }) => {
@@ -248,6 +257,7 @@ async function resolvePagesPageData(options) {
 	const userFacingParams = options.route.isDynamic ? options.params : null;
 	let isFallback = false;
 	let shouldPersistFallbackData = false;
+	const previewData = options.isOnDemandRevalidate ? false : options.previewData ?? false;
 	if (typeof options.pageModule.getStaticPaths === "function" && options.route.isDynamic) {
 		const pathsResult = await options.pageModule.getStaticPaths({
 			locales: options.i18n.locales ?? [],
@@ -257,14 +267,13 @@ async function resolvePagesPageData(options) {
 		const paths = pathsResult?.paths ?? [];
 		const routeParams = getPagesRouteParams(options.routePattern);
 		const isValidPath = paths.some((pathEntry) => matchesPagesStaticPath(pathEntry, options.params, routeParams, options.routeUrl));
-		if (fallback === false && !isValidPath) return buildPagesNotFoundResult(options);
+		if (fallback === false && !isValidPath && previewData === false) return buildPagesNotFoundResult(options);
 		const isBotRequest = !!options.userAgent && isBotUserAgent(options.userAgent, options.htmlLimitedBots);
-		if (fallback === true && !isValidPath && !options.isDataReq && !isBotRequest) isFallback = true;
+		if (fallback === true && !isValidPath && !options.isDataReq && !isBotRequest && previewData === false) isFallback = true;
 		shouldPersistFallbackData = fallback === true && !isValidPath && options.isDataReq === true;
 	}
 	let pageProps = {};
 	let gsspRes = null;
-	const previewData = options.isOnDemandRevalidate ? false : options.previewData ?? false;
 	const previewContext = previewData === false ? {} : {
 		draftMode: true,
 		preview: true,
@@ -276,6 +285,7 @@ async function resolvePagesPageData(options) {
 		return sharedReqRes;
 	}
 	let renderProps = { pageProps };
+	if (previewData !== false) renderProps.__N_PREVIEW = true;
 	async function loadForegroundAppInitialRenderProps() {
 		const result = await loadPagesAppInitialRenderProps(options, getSharedReqRes);
 		if (result.kind === "response") return {

package/dist/server/pages-page-handler.d.ts

@@ -1,4 +1,5 @@
 import { RenderPageEnhancers } from "./pages-document-initial-props.js";
+import { PagesGetInitialPropsRouter } from "./pages-get-initial-props.js";
 import { PagesPageModule } from "./pages-page-data.js";
 import { ComponentType, ReactNode } from "react";
 
@@ -23,7 +24,7 @@ type I18nConfig = {
     domain: string;
     defaultLocale: string;
     locales?: string[];
-    http?: boolean;
+    http?: true;
   }>;
 } | null;
 type VinextConfigSubset = {
@@ -60,7 +61,8 @@ type CreatePagesPageHandlerOptions = {
    */
   getPagesNavigationIsReadyFromSerializedState: ((routePattern: string | undefined, searchString: string, nextData?: Record<string, unknown>) => boolean) | null; /** `setI18nContext` from `vinext/i18n-context`. */
   setI18nContext: ((ctx: Record<string, unknown>) => void) | null; /** `wrapWithRouterContext` from `next/router`. */
-  wrapWithRouterContext: ((element: ReactNode) => ReactNode) | null; /** `resetSSRHead` from `next/head`. */
+  wrapWithRouterContext: ((element: ReactNode) => ReactNode) | null; /** Request-scoped `next/router` server instance. */
+  router?: PagesGetInitialPropsRouter; /** `resetSSRHead` from `next/head`. */
   resetSSRHead: (() => void) | undefined; /** `getSSRHeadHTML` from `next/head`. */
   getSSRHeadHTML: (() => string) | undefined; /** `setDocumentInitialHead` from `next/head`. */
   setDocumentInitialHead: ((head: ReactNode[]) => void) | undefined; /** `flushPreloads` from `next/dynamic`. */

package/dist/server/pages-page-handler.js

@@ -10,7 +10,7 @@ import { ensureFetchPatch } from "../shims/fetch-cache.js";
 import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
 import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
 import { getScriptNonceFromHeaderSources } from "./csp.js";
-import { resolvePagesI18nRequest } from "./pages-i18n.js";
+import { extractLocaleFromUrl, resolvePagesI18nRequest } from "./pages-i18n.js";
 import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
 import { buildPagesReadinessNextData } from "./pages-readiness.js";
 import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
@@ -19,8 +19,20 @@ import { hasPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, normalizePagesDataRequest, parseNextDataPathname } from "./pages-data-route.js";
 import { resolvePagesPageData } from "./pages-page-data.js";
 import { collectAssetTags, resolveClientModuleUrl } from "./pages-asset-tags.js";
-import { createPagesReqRes, getPagesPreviewData } from "./pages-node-compat.js";
+import { PAGES_PREVIEW_CACHE_CONTROL, appendPagesPreviewClearCookies, getPagesPreviewState } from "./pages-preview.js";
+import { createPagesReqRes } from "./pages-node-compat.js";
 //#region src/server/pages-page-handler.ts
+function finalizePagesPreviewResponse(response, preview) {
+	if (preview.data === false && !preview.shouldClear) return response;
+	const headers = new Headers(response.headers);
+	if (preview.data !== false) headers.set("Cache-Control", PAGES_PREVIEW_CACHE_CONTROL);
+	if (preview.shouldClear) appendPagesPreviewClearCookies(headers);
+	return new Response(response.body, {
+		headers,
+		status: response.status,
+		statusText: response.statusText
+	});
+}
 function shouldEmitPagesClientTraceMetadata(pageModule, appComponent) {
 	if (typeof pageModule.getServerSideProps === "function") return true;
 	if (typeof pageModule.getStaticProps === "function") return false;
@@ -41,7 +53,7 @@ function buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domain
 * accepts the same options shape the generated entry always passed inline.
 */
 function createPagesPageHandler(opts) {
-	const { pageRoutes, errorPageRoute, matchRoute, i18nConfig, vinextConfig, buildId, hasMiddleware, appAssetPath, hasRewrites, setSSRContext, getPagesNavigationIsReadyFromSerializedState, setI18nContext, wrapWithRouterContext, resetSSRHead, getSSRHeadHTML, setDocumentInitialHead, flushPreloads, getFontLinks, getFontStyles, getFontPreloads, renderToReadableStream, renderIsrPassToStringAsync, safeJsonStringify, sanitizeDestination, createPageElement, enhancePageElement, AppComponent, DocumentComponent } = opts;
+	const { pageRoutes, errorPageRoute, matchRoute, i18nConfig, vinextConfig, buildId, hasMiddleware, appAssetPath, hasRewrites, setSSRContext, getPagesNavigationIsReadyFromSerializedState, setI18nContext, wrapWithRouterContext, router, resetSSRHead, getSSRHeadHTML, setDocumentInitialHead, flushPreloads, getFontLinks, getFontStyles, getFontPreloads, renderToReadableStream, renderIsrPassToStringAsync, safeJsonStringify, sanitizeDestination, createPageElement, enhancePageElement, AppComponent, DocumentComponent } = opts;
 	function renderToStringAsync(element) {
 		return renderToReadableStream(element).then((stream) => new Response(stream).text());
 	}
@@ -126,25 +138,38 @@ function createPagesPageHandler(opts) {
 			} else return buildDefaultPagesNotFoundResponse();
 		}
 		const { route, params } = match;
+		const pageModule = route.module;
+		const isStaticPropsRoute = typeof pageModule.getStaticProps === "function";
+		const isStaticPropsRender = isStaticPropsRoute && typeof pageModule.getServerSideProps !== "function";
+		const renderRouteUrl = isStaticPropsRender ? routeUrl.split("?")[0] : routeUrl;
+		const routerAsPathSource = isStaticPropsRender ? renderRouteUrl : renderAsPath ?? renderRouteUrl;
+		const routerAsPath = i18nConfig ? extractLocaleFromUrl(routerAsPathSource, i18nConfig, locale).url : routerAsPathSource;
 		return runWithRequestContext(createRequestContext({ executionContext: getRequestExecutionContext() }), async () => {
 			ensureFetchPatch();
 			try {
 				const routePattern = patternToNextFormat(route.pattern);
 				const renderStatusCode = renderStatusCodeOverride ?? (routePattern === "/404" ? 404 : void 0);
-				const query = mergeRouteParamsIntoQuery(parseQueryString(routeUrl), params);
-				const pageModule = route.module;
-				const isStaticPropsRoute = typeof pageModule.getStaticProps === "function";
-				const pagesNextData = buildPagesReadinessNextData({
-					pageModule,
-					appComponent: AppComponent,
-					hasRewrites
-				});
-				const navigationIsReady = typeof getPagesNavigationIsReadyFromSerializedState === "function" ? getPagesNavigationIsReadyFromSerializedState(routePattern, new URL(renderAsPath ?? routeUrl, "http://_").search, pagesNextData) : true;
+				const query = mergeRouteParamsIntoQuery(parseQueryString(renderRouteUrl), params);
+				const isOnDemandRevalidate = isOnDemandRevalidateRequest(request.headers.get(PRERENDER_REVALIDATE_HEADER));
+				const preview = isStaticPropsRoute || typeof pageModule.getServerSideProps === "function" ? getPagesPreviewState(request.headers.get("cookie"), { isOnDemandRevalidate }) : {
+					data: false,
+					shouldClear: false
+				};
+				const previewData = preview.data;
+				const pagesNextData = {
+					...buildPagesReadinessNextData({
+						pageModule,
+						appComponent: AppComponent,
+						hasRewrites
+					}),
+					...previewData === false ? {} : { isPreview: true }
+				};
+				const navigationIsReady = isStaticPropsRender ? false : typeof getPagesNavigationIsReadyFromSerializedState === "function" ? getPagesNavigationIsReadyFromSerializedState(routePattern, originalRequestUrl.search, pagesNextData) : true;
 				function applySSRContext(extra) {
 					if (typeof setSSRContext === "function") setSSRContext({
 						pathname: routePattern,
 						query,
-						asPath: renderAsPath ?? routeUrl,
+						asPath: routerAsPath,
 						navigationIsReady,
 						locale,
 						locales: i18nConfig ? i18nConfig.locales : void 0,
@@ -160,7 +185,10 @@ function createPagesPageHandler(opts) {
 						hostname: new URL(request.url).hostname
 					});
 				}
-				applySSRContext({ nextData: pagesNextData });
+				applySSRContext({
+					isPreview: previewData !== false,
+					nextData: pagesNextData
+				});
 				const PageComponent = pageModule.default;
 				if (!PageComponent) return new Response("Page has no default export", { status: 500 });
 				if (!isDataReq && routePattern !== "/_error" && routePattern !== "/404" && routePattern !== "/500" && renderStatusCodeOverride === void 0) {
@@ -179,7 +207,7 @@ function createPagesPageHandler(opts) {
 						pageModuleUrl,
 						appModuleUrl,
 						hasMiddleware,
-						routeUrl
+						routeUrl: renderRouteUrl
 					}
 				};
 				const scriptNonce = getScriptNonceFromHeaderSources(request.headers, middlewareHeaders);
@@ -190,13 +218,16 @@ function createPagesPageHandler(opts) {
 					if (allFontPreloads.length > 0) fontLinkHeader = allFontPreloads.map((p) => "<" + appendAssetDeploymentIdQuery(p.href) + ">; rel=preload; as=font; type=" + p.type + "; crossorigin").join(", ");
 				} catch {}
 				const pagesResolvedUrl = (new URL(routeUrl, originalRequestUrl).pathname || "/") + originalRequestUrl.search;
-				const createPageReqRes = () => createPagesReqRes({
-					body: void 0,
-					query,
-					request,
-					url: originalRequestPathAndSearch
-				});
-				const isOnDemandRevalidate = isOnDemandRevalidateRequest(request.headers.get(PRERENDER_REVALIDATE_HEADER));
+				const createPageReqRes = () => {
+					const reqRes = createPagesReqRes({
+						body: void 0,
+						query,
+						request,
+						url: originalRequestPathAndSearch
+					});
+					if (typeof renderStatusCode === "number") reqRes.res.statusCode = renderStatusCode;
+					return reqRes;
+				};
 				const pageDataResult = await resolvePagesPageData({
 					isDataReq,
 					err: err instanceof Error ? err : void 0,
@@ -222,17 +253,18 @@ function createPagesPageHandler(opts) {
 					isBuildTimePrerendering: typeof process !== "undefined" && process.env && process.env.VINEXT_PRERENDER === "1",
 					validatePropsSerialization: process.env.NODE_ENV !== "production" || process.env.VINEXT_PRERENDER === "1",
 					isOnDemandRevalidate,
-					previewData: getPagesPreviewData(request, { isOnDemandRevalidate }),
+					previewData,
 					pageModule,
 					AppComponent,
+					router,
 					params,
 					query,
-					asPath: renderAsPath ?? routeUrl,
+					asPath: routerAsPath,
 					resolvedUrl: pagesResolvedUrl,
 					renderIsrPassToStringAsync,
 					route: { isDynamic: route.isDynamic },
 					routePattern,
-					routeUrl,
+					routeUrl: renderRouteUrl,
 					runInFreshUnifiedContext(callback) {
 						return runWithRequestContext(createRequestContext({ executionContext: null }), async () => {
 							ensureFetchPatch();
@@ -252,18 +284,22 @@ function createPagesPageHandler(opts) {
 				});
 				if (pageDataResult.kind === "notFound") {
 					const notFoundRoute = findNotFoundRoute();
-					if (notFoundRoute && routePattern !== "/404" && routePattern !== "/_error") return renderPage(request, url, manifest, middlewareHeaders, {
+					if (notFoundRoute && routePattern !== "/404" && routePattern !== "/_error") return finalizePagesPreviewResponse(await renderPage(request, url, manifest, middlewareHeaders, {
 						statusCode: 404,
-						asPath: renderAsPath ?? routeUrl,
+						asPath: routerAsPath,
 						renderErrorPageOnMiss: false,
 						__forcedRoute: notFoundRoute
-					});
-					return buildDefaultPagesNotFoundResponse();
+					}), preview);
+					return finalizePagesPreviewResponse(buildDefaultPagesNotFoundResponse(), preview);
 				}
-				if (pageDataResult.kind === "response") return pageDataResult.response;
+				if (pageDataResult.kind === "response") return finalizePagesPreviewResponse(pageDataResult.response, preview);
 				let pageProps = pageDataResult.pageProps;
 				let renderProps = pageDataResult.props;
-				if (routePattern === "/_error" && typeof renderStatusCode === "number") {
+				if (previewData !== false) renderProps = {
+					...renderProps,
+					__N_PREVIEW: true
+				};
+				if (routePattern === "/_error" && typeof renderStatusCode === "number" && renderProps.pageProps !== void 0) {
 					pageProps = {
 						...pageProps,
 						statusCode: renderStatusCode
@@ -277,15 +313,10 @@ function createPagesPageHandler(opts) {
 				const documentReqRes = serializedPagesNextData.autoExport === true ? null : pageDataResult.documentReqRes ?? createPageReqRes();
 				const isrRevalidateSeconds = pageDataResult.isrRevalidateSeconds;
 				const isFallbackRender = pageDataResult.isFallback === true;
-				if (isFallbackRender && typeof setSSRContext === "function") setSSRContext({
-					pathname: routePattern,
-					query,
-					asPath: renderAsPath ?? routeUrl,
+				if (isFallbackRender) applySSRContext({
+					query: {},
+					asPath: routePattern,
 					navigationIsReady: false,
-					locale,
-					locales: i18nConfig ? i18nConfig.locales : void 0,
-					defaultLocale: currentDefaultLocale,
-					domainLocales,
 					isFallback: true
 				});
 				if (isDataReq) {
@@ -316,12 +347,12 @@ function createPagesPageHandler(opts) {
 						const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
 						if (deploymentId) init.headers[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
 					}
-					return buildNextDataPropsJsonResponse(renderProps, safeJsonStringify, init);
+					return finalizePagesPreviewResponse(buildNextDataPropsJsonResponse(renderProps, safeJsonStringify, init), preview);
 				}
 				const pageModuleIds = [];
 				if (appAssetPath) pageModuleIds.push(appAssetPath);
 				if (route.filePath) pageModuleIds.push(route.filePath);
-				return await renderPagesPageResponse({
+				return finalizePagesPreviewResponse(await renderPagesPageResponse({
 					assetTags: collectAssetTags({
 						manifest,
 						moduleIds: pageModuleIds,
@@ -372,7 +403,7 @@ function createPagesPageHandler(opts) {
 					resetSSRHead: typeof resetSSRHead === "function" ? resetSSRHead : void 0,
 					setDocumentInitialHead: typeof setDocumentInitialHead === "function" ? setDocumentInitialHead : void 0,
 					routePattern,
-					routeUrl,
+					routeUrl: renderRouteUrl,
 					safeJsonStringify,
 					scriptNonce,
 					statusCode: renderStatusCode,
@@ -380,7 +411,7 @@ function createPagesPageHandler(opts) {
 					userAgent: request.headers.get("user-agent") ?? void 0,
 					ifNoneMatch: request.headers.get("if-none-match") ?? void 0,
 					requestCacheControl: request.headers.get("cache-control") ?? void 0
-				});
+				}), preview);
 			} catch (e) {
 				console.error("[vinext] SSR error:", e);
 				reportRequestError(e instanceof Error ? e : new Error(String(e)), {