vinext 0.2.0 → 1.0.0-beta.0

package/dist/server/image-optimization.js

@@ -27,8 +27,20 @@ const IMAGE_OPTIMIZATION_PATH = "/_next/image";
 * for any newly generated URLs.
 */
 const VINEXT_IMAGE_OPTIMIZATION_PATH = "/_vinext/image";
-/** Returns true when `pathname` is either supported image optimization endpoint. */
+/**
+* Returns true when `pathname` is either supported image optimization
+* endpoint.
+*
+* A single trailing slash is accepted (`/_next/image/`): with
+* `trailingSlash: true`, Next.js 308-redirects `/_next/image?url=...` to
+* `/_next/image/?url=...` and then serves the slashed form — its route
+* matching strips a trailing slash before matching internal paths (see
+* getItem in packages/next/src/server/lib/router-utils/filesystem.ts).
+* Rejecting the slashed form 404'd every dev-mode next/image request under
+* `trailingSlash: true`.
+*/
 function isImageOptimizationPath(pathname) {
+	if (pathname.length > 1 && pathname.endsWith("/")) pathname = pathname.slice(0, -1);
 	return pathname === "/_next/image" || pathname === "/_vinext/image";
 }
 /**

package/dist/server/isr-cache.d.ts

@@ -1,7 +1,7 @@
-import { RenderObservation } from "./cache-proof.js";
-import { CacheHandlerValue, CachedAppPageValue, CachedPagesValue, IncrementalCacheValue } from "../shims/cache-handler.js";
 import { OnRequestErrorContext } from "./instrumentation.js";
+import { RenderObservation } from "./cache-proof.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
+import { CacheHandlerValue, CachedAppPageValue, CachedPagesValue, IncrementalCacheValue } from "../shims/cache-handler.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 
 //#region src/server/isr-cache.d.ts
@@ -34,6 +34,7 @@ declare const PRERENDER_REVALIDATE_HEADER = "x-prerender-revalidate";
  */
 declare const PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER = "x-prerender-revalidate-if-generated";
 declare function getRevalidateSecret(): string;
+declare function isRevalidateSecret(value: string | null | undefined): boolean;
 /**
  * Authorize an incoming request as an on-demand revalidation trigger. Mirrors
  * Next.js's `checkIsOnDemandRevalidate`: the {@link PRERENDER_REVALIDATE_HEADER}
@@ -101,13 +102,21 @@ declare function buildAppPageCacheValue(html: string, rscData?: ArrayBuffer, sta
  * Long pathnames are hashed to stay within KV key-length limits (512 bytes).
  */
 declare function isrCacheKey(router: string, pathname: string, buildId?: string): string;
+/**
+ * Compute an App Router ISR key for one cache artifact.
+ *
+ * App pages store HTML, RSC payloads, and route-handler responses separately.
+ * The suffix mirrors Next.js's separate on-disk app artifacts while keeping the
+ * Cloudflare KV key under its 512-byte limit for long pathnames.
+ */
+declare function appIsrCacheKey(pathname: string, suffix: string, buildId?: string | undefined): string;
 declare function appIsrHtmlKey(pathname: string): string;
 /**
  * Build the ISR cache key for an RSC payload.
  *
  * Variants are sequenced in order: `source:<hash>` (intercepted source context,
  * only when an interception context is present), `slots:<hash>` (mounted parallel
- * route slots), and optionally `<render-mode-variant>` (e.g. `preserve-ui` or
+ * route slots), and optionally `<render-mode-variant>` (for example,
  * `prefetch-loading-shell`). Existing cached entries under the old format will
  * become unreachable after deployment. This is acceptable because ISR entries
  * have TTLs and will be regenerated on the next request.
@@ -124,4 +133,4 @@ declare function setRevalidateDuration(key: string, seconds: number): void;
  */
 declare function getRevalidateDuration(key: string): number | undefined;
 //#endregion
-export { ISRCacheEntry, PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER, appIsrHtmlKey, appIsrRouteKey, appIsrRscKey, buildAppPageCacheValue, buildPagesCacheValue, getRevalidateDuration, getRevalidateSecret, isOnDemandRevalidateRequest, isrCacheKey, isrGet, isrSet, isrSetPrerenderedAppPage, normalizeMountedSlotsHeader, setRevalidateDuration, triggerBackgroundRegeneration };
+export { ISRCacheEntry, PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER, appIsrCacheKey, appIsrHtmlKey, appIsrRouteKey, appIsrRscKey, buildAppPageCacheValue, buildPagesCacheValue, getRevalidateDuration, getRevalidateSecret, isOnDemandRevalidateRequest, isRevalidateSecret, isrCacheKey, isrGet, isrSet, isrSetPrerenderedAppPage, normalizeMountedSlotsHeader, setRevalidateDuration, triggerBackgroundRegeneration };

package/dist/server/isr-cache.js

@@ -80,6 +80,10 @@ function safeEqual(a, b) {
 	for (let i = 0; i < a.length; i++) mismatch |= a.charCodeAt(i) ^ b.charCodeAt(i);
 	return mismatch === 0;
 }
+function isRevalidateSecret(value) {
+	if (typeof value !== "string" || value.length === 0) return false;
+	return safeEqual(value, getRevalidateSecret());
+}
 /**
 * Authorize an incoming request as an on-demand revalidation trigger. Mirrors
 * Next.js's `checkIsOnDemandRevalidate`: the {@link PRERENDER_REVALIDATE_HEADER}
@@ -87,8 +91,8 @@ function safeEqual(a, b) {
 * NOT sufficient — see the security note on {@link PRERENDER_REVALIDATE_HEADER}.
 */
 function isOnDemandRevalidateRequest(headerValue) {
-	if (typeof headerValue !== "string" || headerValue.length === 0) return false;
-	return safeEqual(headerValue, getRevalidateSecret());
+	if (typeof headerValue !== "string") return false;
+	return isRevalidateSecret(headerValue);
 }
 /**
 * Get a cache entry with staleness information.
@@ -238,7 +242,7 @@ function normalizeInterceptionContextForCacheKey(interceptionContext) {
 *
 * Variants are sequenced in order: `source:<hash>` (intercepted source context,
 * only when an interception context is present), `slots:<hash>` (mounted parallel
-* route slots), and optionally `<render-mode-variant>` (e.g. `preserve-ui` or
+* route slots), and optionally `<render-mode-variant>` (for example,
 * `prefetch-loading-shell`). Existing cached entries under the old format will
 * become unreachable after deployment. This is acceptable because ISR entries
 * have TTLs and will be regenerated on the next request.
@@ -279,4 +283,4 @@ function getRevalidateDuration(key) {
 	return revalidateDurations.get(key);
 }
 //#endregion
-export { PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER, appIsrHtmlKey, appIsrRouteKey, appIsrRscKey, buildAppPageCacheValue, buildPagesCacheValue, getRevalidateDuration, getRevalidateSecret, isOnDemandRevalidateRequest, isrCacheKey, isrGet, isrSet, isrSetPrerenderedAppPage, normalizeMountedSlotsHeader, setRevalidateDuration, triggerBackgroundRegeneration };
+export { PRERENDER_REVALIDATE_HEADER, PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER, appIsrCacheKey, appIsrHtmlKey, appIsrRouteKey, appIsrRscKey, buildAppPageCacheValue, buildPagesCacheValue, getRevalidateDuration, getRevalidateSecret, isOnDemandRevalidateRequest, isRevalidateSecret, isrCacheKey, isrGet, isrSet, isrSetPrerenderedAppPage, normalizeMountedSlotsHeader, setRevalidateDuration, triggerBackgroundRegeneration };

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

@@ -51,6 +51,7 @@ declare function isNextDataPathname(pathname: string): boolean;
  * `/_next/data/<buildId>/about`              → null  (missing .json suffix)
  */
 declare function parseNextDataPathname(pathname: string, buildId: string): NextDataMatch | null;
+declare function normalizeNextDataPagePathname(pagePathname: string, trailingSlash?: boolean): string;
 /**
  * Build the JSON envelope returned by `/_next/data/<buildId>/<page>.json`.
  * Mirrors Next.js' `RenderResult(JSON.stringify(props))` path in
@@ -79,6 +80,7 @@ declare function buildNextDataPropsJsonResponse(props: Record<string, unknown>,
  * before checking the status code.
  */
 declare function buildNextDataNotFoundResponse(): Response;
+declare function buildMiddlewarePrefetchSkipResponse(matchedPathname: string): Response;
 type NormalizePagesDataRequestResult = {
   isDataReq: false;
   request: Request;
@@ -116,6 +118,6 @@ type NormalizePagesDataRequestResult = {
  * Extracted from `entries/pages-server-entry.ts` so both `renderPage` and
  * `runMiddleware` share a single implementation.
  */
-declare function normalizePagesDataRequest(request: Request, buildId: string | null, basePath?: string): NormalizePagesDataRequestResult;
+declare function normalizePagesDataRequest(request: Request, buildId: string | null, basePath?: string, trailingSlash?: boolean): NormalizePagesDataRequestResult;
 //#endregion
-export { buildNextDataJsonResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, isNextDataPathname, normalizePagesDataRequest, parseNextDataPathname };
+export { buildMiddlewarePrefetchSkipResponse, buildNextDataJsonResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, isNextDataPathname, normalizeNextDataPagePathname, normalizePagesDataRequest, parseNextDataPathname };

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

@@ -1,4 +1,5 @@
 import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
+import { MIDDLEWARE_SKIP_HEADER } from "../utils/protocol-headers.js";
 import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 //#region src/server/pages-data-route.ts
 /**
@@ -58,6 +59,10 @@ function parseNextDataPathname(pathname, buildId) {
 	if (rest.startsWith("index/")) return { pagePathname: `/${rest.slice(6)}` };
 	return { pagePathname: `/${rest}` };
 }
+function normalizeNextDataPagePathname(pagePathname, trailingSlash = false) {
+	if (!trailingSlash || pagePathname === "/" || pagePathname.endsWith("/")) return pagePathname;
+	return `${pagePathname}/`;
+}
 /**
 * Build the JSON envelope returned by `/_next/data/<buildId>/<page>.json`.
 * Mirrors Next.js' `RenderResult(JSON.stringify(props))` path in
@@ -106,6 +111,14 @@ function buildNextDataNotFoundResponse() {
 		headers
 	});
 }
+function buildMiddlewarePrefetchSkipResponse(matchedPathname) {
+	return new Response("{}", { headers: {
+		"Content-Type": "application/json",
+		"x-matched-path": matchedPathname,
+		[MIDDLEWARE_SKIP_HEADER]: "1",
+		"Cache-Control": "private, no-cache, no-store, max-age=0, must-revalidate"
+	} });
+}
 /**
 * Detect and normalize `/_next/data/<buildId>/<page>.json` requests in one
 * place so the Pages Router pipeline and middleware shim do not need to know
@@ -124,7 +137,7 @@ function buildNextDataNotFoundResponse() {
 * Extracted from `entries/pages-server-entry.ts` so both `renderPage` and
 * `runMiddleware` share a single implementation.
 */
-function normalizePagesDataRequest(request, buildId, basePath = "") {
+function normalizePagesDataRequest(request, buildId, basePath = "", trailingSlash = false) {
 	const reqUrl = new URL(request.url);
 	const hadBasePath = !!basePath && hasBasePath(reqUrl.pathname, basePath);
 	const dataPathname = basePath ? stripBasePath(reqUrl.pathname, basePath) : reqUrl.pathname;
@@ -143,15 +156,16 @@ function normalizePagesDataRequest(request, buildId, basePath = "") {
 		search: "",
 		notFoundResponse: buildNextDataNotFoundResponse()
 	};
+	const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, trailingSlash);
 	const normalizedUrl = new URL(reqUrl);
-	normalizedUrl.pathname = hadBasePath ? addBasePathToPathname(dataMatch.pagePathname, basePath) : dataMatch.pagePathname;
+	normalizedUrl.pathname = hadBasePath ? addBasePathToPathname(pagePathname, basePath) : pagePathname;
 	return {
 		isDataReq: true,
 		request: new Request(normalizedUrl, request),
-		normalizedPathname: dataMatch.pagePathname,
+		normalizedPathname: pagePathname,
 		search: reqUrl.search,
 		notFoundResponse: null
 	};
 }
 //#endregion
-export { buildNextDataJsonResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, isNextDataPathname, normalizePagesDataRequest, parseNextDataPathname };
+export { buildMiddlewarePrefetchSkipResponse, buildNextDataJsonResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, isNextDataPathname, normalizeNextDataPagePathname, normalizePagesDataRequest, parseNextDataPathname };

package/dist/server/pages-dev-module-url.d.ts

@@ -1,4 +1,5 @@
 //#region src/server/pages-dev-module-url.d.ts
+declare function createPagesDevAssetUrl(assetPath: string): string;
 declare function createPagesDevModuleUrl(viteRoot: string, moduleFilePath: string, viteBase: string): string;
 //#endregion
-export { createPagesDevModuleUrl };
+export { createPagesDevAssetUrl, createPagesDevModuleUrl };

package/dist/server/pages-dev-module-url.js

@@ -4,12 +4,15 @@ function normalizeBase(base) {
 	if (!base || base === "/") return "/";
 	return `/${base.replace(/^\/+|\/+$/g, "")}/`;
 }
-function encodeModulePath(modulePath) {
+function encodePagesDevModulePath(modulePath) {
 	return encodeURI(modulePath).replace(/%5B/gi, "[").replace(/%5D/gi, "]").replace(/\?/g, "%3F").replace(/#/g, "%23");
 }
+function createPagesDevAssetUrl(assetPath) {
+	return "/" + encodePagesDevModulePath(assetPath.replace(/^\/+/, ""));
+}
 function createPagesDevModuleUrl(viteRoot, moduleFilePath, viteBase) {
 	const relativePath = (/^[A-Za-z]:[\\/]/.test(viteRoot) ? path.win32 : path).relative(viteRoot, moduleFilePath).replace(/\\/g, "/");
-	return normalizeBase(viteBase) + encodeModulePath(relativePath);
+	return normalizeBase(viteBase) + encodePagesDevModulePath(relativePath);
 }
 //#endregion
-export { createPagesDevModuleUrl };
+export { createPagesDevAssetUrl, createPagesDevModuleUrl };

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

@@ -27,6 +27,10 @@ type PagesReqResResponse = Writable & {
   redirect: (statusOrUrl: number | string, url?: string) => void;
   getHeaders: () => PagesReqResHeaders;
   revalidate: (urlPath: string, opts?: RevalidateOptions) => Promise<void>;
+  setPreviewData: (data: object | string, options?: {
+    maxAge?: number;
+    path?: string;
+  }) => PagesReqResResponse;
 };
 type PagesRequestCookiesCarrier = {
   headers: {
@@ -45,6 +49,7 @@ 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.
  *
@@ -56,7 +61,13 @@ type CreatePagesReqResResult = {
  * @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 createPagesReqRes(options: CreatePagesReqResOptions): CreatePagesReqResResult;
 //#endregion
-export { PagesBodyParseError as PagesApiBodyParseError, PagesReqResRequest, PagesReqResResponse, PagesRequestQuery, attachPagesRequestCookies, createPagesReqRes, parsePagesApiBody };
+export { PagesBodyParseError as PagesApiBodyParseError, PagesPreviewData, PagesReqResRequest, PagesReqResResponse, PagesRequestQuery, attachPagesRequestCookies, createPagesReqRes, getPagesPreviewData, getPagesPreviewDataFromCookieHeader, parsePagesApiBody };

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

@@ -1,4 +1,5 @@
 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";
@@ -64,6 +65,44 @@ 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);
+}
+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", {
@@ -170,6 +209,16 @@ var PagesResponseStream = class extends Writable {
 	async revalidate(urlPath, opts) {
 		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)
+		]);
+		return this;
+	}
 	_write(chunk, encoding, callback) {
 		const buffer = typeof chunk === "string" ? Buffer.from(chunk, encoding) : Buffer.from(chunk);
 		if (this.controller && !this.streamEnded) try {
@@ -260,4 +309,4 @@ function createPagesReqRes(options) {
 	};
 }
 //#endregion
-export { PagesBodyParseError as PagesApiBodyParseError, attachPagesRequestCookies, createPagesReqRes, parsePagesApiBody };
+export { PagesBodyParseError as PagesApiBodyParseError, attachPagesRequestCookies, createPagesReqRes, getPagesPreviewData, getPagesPreviewDataFromCookieHeader, parsePagesApiBody };

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

@@ -2,6 +2,7 @@ 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 { PagesGsspResponse, PagesI18nRenderContext, PagesNextDataExtras } from "./pages-page-response.js";
 import { ReactNode } from "react";
 
@@ -62,12 +63,18 @@ type PagesPageModule = {
     locale?: string;
     locales?: string[];
     defaultLocale?: string;
+    draftMode?: true;
+    preview?: true;
+    previewData?: PagesPreviewData;
   }) => Promise<PagesPagePropsResult> | PagesPagePropsResult;
   getStaticProps?: (context: {
     params: Record<string, unknown> | null;
     locale?: string;
     locales?: string[];
     defaultLocale?: string;
+    draftMode?: true;
+    preview?: true;
+    previewData?: PagesPreviewData;
     /**
      * Indicates why `getStaticProps` was invoked.
      *
@@ -127,6 +134,7 @@ type ResolvePagesPageDataOptions = {
    * `.nextjs-ref/packages/next/src/server/render.tsx`.
    */
   isBuildTimePrerendering?: boolean;
+  validatePropsSerialization?: boolean;
   /**
    * When true, this dispatch was triggered by an on-demand revalidation
    * request (e.g. `res.revalidate()` in a Pages Router API route, or an
@@ -143,6 +151,7 @@ type ResolvePagesPageDataOptions = {
    * presence — see the security note in `isr-cache.ts`.
    */
   isOnDemandRevalidate?: boolean;
+  previewData?: PagesPreviewData | false;
   /**
    * The deployment ID used for deployment-skew protection. When set, it is
    * included as `x-nextjs-deployment-id` on all `_next/data` responses

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

@@ -179,7 +179,7 @@ function buildPagesCacheResponse(html, cacheState, fontLinkHeader, revalidateSec
 		cacheControlMeta: cacheControl
 	});
 	const headers = new Headers({
-		"Content-Type": "text/html",
+		"Content-Type": "text/html; charset=utf-8",
 		...buildCacheStateHeaders(cacheState)
 	});
 	applyCdnResponseHeaders(headers, { cacheControl: cacheControlHeader });
@@ -264,6 +264,12 @@ async function resolvePagesPageData(options) {
 	}
 	let pageProps = {};
 	let gsspRes = null;
+	const previewData = options.isOnDemandRevalidate ? false : options.previewData ?? false;
+	const previewContext = previewData === false ? {} : {
+		draftMode: true,
+		preview: true,
+		previewData
+	};
 	let sharedReqRes = null;
 	function getSharedReqRes() {
 		sharedReqRes ??= options.createGsspReqRes();
@@ -317,7 +323,8 @@ async function resolvePagesPageData(options) {
 			resolvedUrl: options.resolvedUrl ?? options.routeUrl,
 			locale: options.i18n.locale,
 			locales: options.i18n.locales,
-			defaultLocale: options.i18n.defaultLocale
+			defaultLocale: options.i18n.defaultLocale,
+			...previewContext
 		});
 		if (isResponseSent(res)) return {
 			kind: "response",
@@ -338,7 +345,7 @@ async function resolvePagesPageData(options) {
 			response: buildPagesRedirectResponse(result.redirect, options, renderProps)
 		};
 		if (result?.notFound) return buildPagesNotFoundResult(options);
-		if (result?.props !== void 0) isSerializableProps(options.routePattern, "getServerSideProps", pageProps);
+		if (result?.props !== void 0 && options.validatePropsSerialization !== false) isSerializableProps(options.routePattern, "getServerSideProps", pageProps);
 		gsspRes = res;
 	}
 	let isrRevalidateSeconds = null;
@@ -347,7 +354,7 @@ async function resolvePagesPageData(options) {
 		const cacheKey = options.isrCacheKey("pages", pathname);
 		const cached = await options.isrGet(cacheKey);
 		const cachedValue = cached?.value.value;
-		if (!options.isOnDemandRevalidate && cached?.isStale === false && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && !cached.isStale && !options.scriptNonce && !options.isDataReq) {
+		if (!options.isOnDemandRevalidate && cached?.isStale === false && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && !cached.isStale && !options.scriptNonce && !options.isDataReq && previewData === false) {
 			const hitResponse = buildPagesCacheResponse(cachedValue.html, "HIT", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, cachedValue.status);
 			const hitBotResult = applyBotETagAndCheck(hitResponse, cachedValue.html, options);
 			if (hitBotResult) return hitBotResult;
@@ -356,7 +363,7 @@ async function resolvePagesPageData(options) {
 				response: hitResponse
 			};
 		}
-		if (!options.isOnDemandRevalidate && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && cached.isStale && !options.scriptNonce && !options.isDataReq) {
+		if (!options.isOnDemandRevalidate && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && cached.isStale && !options.scriptNonce && !options.isDataReq && previewData === false) {
 			options.triggerBackgroundRegeneration(cacheKey, async function() {
 				return options.runInFreshUnifiedContext(async () => {
 					options.applyRequestContexts();
@@ -413,7 +420,7 @@ async function resolvePagesPageData(options) {
 				response: staleResponse
 			};
 		}
-		const generatedPageData = !options.isOnDemandRevalidate && cached?.isStale === false && cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest && isUnknownRecord(cachedValue.pageData) ? cachedValue.pageData : null;
+		const generatedPageData = !options.isOnDemandRevalidate && previewData === false && cached?.isStale === false && cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest && isUnknownRecord(cachedValue.pageData) ? cachedValue.pageData : null;
 		if (!generatedPageData) {
 			const shortCircuit = await loadForegroundAppInitialRenderProps();
 			if (shortCircuit) return shortCircuit;
@@ -423,6 +430,7 @@ async function resolvePagesPageData(options) {
 			locale: options.i18n.locale,
 			locales: options.i18n.locales,
 			defaultLocale: options.i18n.defaultLocale,
+			...previewContext,
 			revalidateReason: options.isOnDemandRevalidate ? "on-demand" : options.isBuildTimePrerendering ? "build" : "stale"
 		});
 		if (generatedPageData) {
@@ -444,10 +452,10 @@ async function resolvePagesPageData(options) {
 			response: buildPagesRedirectResponse(result.redirect, options, renderProps)
 		};
 		if (result?.notFound) return buildPagesNotFoundResult(options);
-		if (result?.props !== void 0) isSerializableProps(options.routePattern, "getStaticProps", pageProps);
-		if (typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
-		else if (cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest) isrRevalidateSeconds = cached?.value.cacheControl?.revalidate ?? 31536e3;
-		if (shouldPersistFallbackData) {
+		if (result?.props !== void 0 && options.validatePropsSerialization !== false) isSerializableProps(options.routePattern, "getStaticProps", pageProps);
+		if (previewData === false && typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
+		else if (previewData === false && cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest) isrRevalidateSeconds = cached?.value.cacheControl?.revalidate ?? 31536e3;
+		if (shouldPersistFallbackData && previewData === false) {
 			const revalidateSeconds = isrRevalidateSeconds ?? 31536e3;
 			await options.isrSet(cacheKey, {
 				kind: "PAGES",

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

@@ -3,8 +3,8 @@ import { patternToNextFormat } from "../routing/route-validation.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { reportRequestError } from "./instrumentation.js";
-import { NEVER_CACHE_CONTROL } from "./cache-control.js";
-import "./isr-decision.js";
+import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, applyCdnResponseHeaders, shouldUseNextDeployCacheControl } from "./cache-control.js";
+import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { PRERENDER_REVALIDATE_HEADER, isOnDemandRevalidateRequest, isrCacheKey, isrGet, isrSet, triggerBackgroundRegeneration } from "./isr-cache.js";
 import { ensureFetchPatch } from "../shims/fetch-cache.js";
 import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
@@ -18,8 +18,8 @@ import { renderPagesPageResponse } from "./pages-page-response.js";
 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 { createPagesReqRes } from "./pages-node-compat.js";
 import { collectAssetTags, resolveClientModuleUrl } from "./pages-asset-tags.js";
+import { createPagesReqRes, getPagesPreviewData } from "./pages-node-compat.js";
 //#region src/server/pages-page-handler.ts
 function shouldEmitPagesClientTraceMetadata(pageModule, appComponent) {
 	if (typeof pageModule.getServerSideProps === "function") return true;
@@ -61,7 +61,7 @@ function createPagesPageHandler(opts) {
 		const originalRequestPathAndSearch = originalRequestUrl.pathname + originalRequestUrl.search;
 		let dataRequestPathname = null;
 		let dataRequestSearch = "";
-		const initialDataNorm = normalizePagesDataRequest(request, buildId);
+		const initialDataNorm = normalizePagesDataRequest(request, buildId, vinextConfig.basePath, hasMiddleware && vinextConfig.trailingSlash);
 		if (!isDataReq) {
 			if (initialDataNorm.notFoundResponse) return initialDataNorm.notFoundResponse;
 			if (initialDataNorm.isDataReq) {
@@ -133,6 +133,7 @@ function createPagesPageHandler(opts) {
 				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,
@@ -177,7 +178,8 @@ function createPagesPageHandler(opts) {
 						...pagesNextData.__vinext,
 						pageModuleUrl,
 						appModuleUrl,
-						hasMiddleware
+						hasMiddleware,
+						routeUrl
 					}
 				};
 				const scriptNonce = getScriptNonceFromHeaderSources(request.headers, middlewareHeaders);
@@ -194,6 +196,7 @@ function createPagesPageHandler(opts) {
 					request,
 					url: originalRequestPathAndSearch
 				});
+				const isOnDemandRevalidate = isOnDemandRevalidateRequest(request.headers.get(PRERENDER_REVALIDATE_HEADER));
 				const pageDataResult = await resolvePagesPageData({
 					isDataReq,
 					err: err instanceof Error ? err : void 0,
@@ -217,7 +220,9 @@ function createPagesPageHandler(opts) {
 					isrSet,
 					expireSeconds: vinextConfig.expireTime,
 					isBuildTimePrerendering: typeof process !== "undefined" && process.env && process.env.VINEXT_PRERENDER === "1",
-					isOnDemandRevalidate: isOnDemandRevalidateRequest(request.headers.get(PRERENDER_REVALIDATE_HEADER)),
+					validatePropsSerialization: process.env.NODE_ENV !== "production" || process.env.VINEXT_PRERENDER === "1",
+					isOnDemandRevalidate,
+					previewData: getPagesPreviewData(request, { isOnDemandRevalidate }),
 					pageModule,
 					AppComponent,
 					params,
@@ -300,6 +305,12 @@ function createPagesPageHandler(opts) {
 							break;
 						}
 						if (!hasUserCacheControl) init.headers["Cache-Control"] = NEVER_CACHE_CONTROL;
+					} else if (isStaticPropsRoute) {
+						if (isrRevalidateSeconds) {
+							const headers = new Headers(init.headers);
+							applyCdnResponseHeaders(headers, { cacheControl: buildMissIsrCacheControl(isrRevalidateSeconds, vinextConfig.expireTime) });
+							for (const [key, value] of headers) init.headers[key] = value;
+						} else if (shouldUseNextDeployCacheControl()) init.headers["Cache-Control"] = BROWSER_REVALIDATE_CACHE_CONTROL;
 					}
 					if (routePattern !== "/_error" && routePattern !== "/500") {
 						const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
@@ -308,8 +319,8 @@ function createPagesPageHandler(opts) {
 					return buildNextDataPropsJsonResponse(renderProps, safeJsonStringify, init);
 				}
 				const pageModuleIds = [];
-				if (route.filePath) pageModuleIds.push(route.filePath);
 				if (appAssetPath) pageModuleIds.push(appAssetPath);
+				if (route.filePath) pageModuleIds.push(route.filePath);
 				return await renderPagesPageResponse({
 					assetTags: collectAssetTags({
 						manifest,
@@ -346,6 +357,7 @@ function createPagesPageHandler(opts) {
 					isrCacheKey: pageIsrCacheKey,
 					expireSeconds: vinextConfig.expireTime,
 					isrRevalidateSeconds,
+					isStaticPropsRoute,
 					isrSet,
 					i18n: buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domainLocales),
 					isFallback: isFallbackRender,

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

@@ -91,6 +91,7 @@ type RenderPagesPageResponseOptions = {
   isrCacheKey: (router: string, pathname: string) => string;
   expireSeconds?: number;
   isrRevalidateSeconds: number | null;
+  isStaticPropsRoute?: boolean;
   isrSet: (key: string, data: CachedPagesValue, revalidateSeconds: number, tags?: string[], expireSeconds?: number) => Promise<void>;
   i18n: PagesI18nRenderContext;
   /**

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

@@ -1,7 +1,7 @@
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { reportRequestError } from "./instrumentation.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
-import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
+import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders, shouldUseNextDeployCacheControl } from "./cache-control.js";
 import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { fnv1a52 } from "../utils/hash.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
@@ -167,7 +167,7 @@ function applyGsspHeaders(headers, gsspRes, statusCode) {
 		}
 		if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") headers.set(key, String(value));
 	}
-	headers.set("Content-Type", "text/html");
+	headers.set("Content-Type", "text/html; charset=utf-8");
 	return statusCode ?? gsspRes.statusCode;
 }
 async function renderPagesPageResponse(options) {
@@ -232,7 +232,7 @@ async function renderPagesPageResponse(options) {
 	const markerIndex = shellHtml.indexOf(bodyMarker);
 	const shellPrefix = shellHtml.slice(0, markerIndex);
 	const shellSuffix = shellHtml.slice(markerIndex + 25);
-	const responseHeaders = new Headers({ "Content-Type": "text/html" });
+	const responseHeaders = new Headers({ "Content-Type": "text/html; charset=utf-8" });
 	const finalStatus = applyGsspHeaders(responseHeaders, options.gsspRes ?? options.documentReqRes?.res ?? null, options.statusCode);
 	let responseBodyStream = bodyStream;
 	if (!options.scriptNonce && options.isrRevalidateSeconds !== null && options.isrRevalidateSeconds > 0) {
@@ -264,7 +264,8 @@ async function renderPagesPageResponse(options) {
 			tags: [encodeCacheTag(`_N_T_${stem || "/"}`)]
 		});
 		setCacheStateHeaders(responseHeaders, "MISS");
-	} else if (options.gsspRes && !userSetCacheControl) responseHeaders.set("Cache-Control", NEVER_CACHE_CONTROL);
+	} else if (options.isStaticPropsRoute && shouldUseNextDeployCacheControl()) responseHeaders.set("Cache-Control", BROWSER_REVALIDATE_CACHE_CONTROL);
+	else if (options.gsspRes && !userSetCacheControl) responseHeaders.set("Cache-Control", NEVER_CACHE_CONTROL);
 	if (options.fontLinkHeader) responseHeaders.set("Link", options.fontLinkHeader);
 	if (options.userAgent && isPagesStreamingBot(options.userAgent)) {
 		const fullHtml = await readStreamAsText(compositeStream);

package/dist/server/pages-request-pipeline.d.ts

@@ -8,6 +8,13 @@ type PagesRenderOptions = {
   originalUrl?: string;
 };
 type FilesystemRoutePhase = "direct" | "beforeFiles" | "afterFiles" | "fallback";
+type PageRouteMatch = {
+  route: {
+    isDynamic: boolean;
+    pattern?: string;
+    dataKind?: "static" | "server" | "none";
+  };
+};
 declare function fetchWorkerFilesystemRoute(request: Request, requestPathname: string, phase: FilesystemRoutePhase, fetchAsset: (request: Request) => Promise<Response>): Promise<Response | false>;
 type MiddlewareResult = {
   continue: boolean;
@@ -37,12 +44,7 @@ type PagesPipelineDeps = {
   hasMiddleware: boolean;
   ctx?: unknown;
   rawSearch?: string;
-  matchPageRoute?: ((pathname: string, request: Request) => {
-    route: {
-      isDynamic: boolean;
-      pattern?: string;
-    };
-  } | null) | null;
+  matchPageRoute?: ((pathname: string, request: Request) => PageRouteMatch | null) | null;
   runMiddleware?: ((request: Request, ctx: unknown, opts: {
     isDataRequest: boolean;
   }) => Promise<MiddlewareResult>) | null;