vinext 0.2.1 → 1.0.0-beta.1

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,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 { PagesPreviewData } from "./pages-preview.js";
 import { PagesGsspResponse, PagesI18nRenderContext, PagesNextDataExtras } from "./pages-page-response.js";
 import { ReactNode } from "react";
 

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 });
@@ -248,6 +248,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 +258,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 +276,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.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;
@@ -126,6 +138,7 @@ function createPagesPageHandler(opts) {
 			} else return buildDefaultPagesNotFoundResponse();
 		}
 		const { route, params } = match;
+		const routerAsPath = i18nConfig ? extractLocaleFromUrl(renderAsPath ?? routeUrl, i18nConfig, locale).url : renderAsPath ?? routeUrl;
 		return runWithRequestContext(createRequestContext({ executionContext: getRequestExecutionContext() }), async () => {
 			ensureFetchPatch();
 			try {
@@ -134,17 +147,26 @@ function createPagesPageHandler(opts) {
 				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 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 = typeof getPagesNavigationIsReadyFromSerializedState === "function" ? getPagesNavigationIsReadyFromSerializedState(routePattern, new URL(routerAsPath, "http://_").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 +182,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) {
@@ -190,13 +215,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,12 +250,12 @@ 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,
 					params,
 					query,
-					asPath: renderAsPath ?? routeUrl,
+					asPath: routerAsPath,
 					resolvedUrl: pagesResolvedUrl,
 					renderIsrPassToStringAsync,
 					route: { isDynamic: route.isDynamic },
@@ -252,18 +280,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
@@ -280,7 +312,7 @@ function createPagesPageHandler(opts) {
 				if (isFallbackRender && typeof setSSRContext === "function") setSSRContext({
 					pathname: routePattern,
 					query,
-					asPath: renderAsPath ?? routeUrl,
+					asPath: routerAsPath,
 					navigationIsReady: false,
 					locale,
 					locales: i18nConfig ? i18nConfig.locales : void 0,
@@ -316,12 +348,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,
@@ -380,7 +412,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)), {

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

@@ -33,11 +33,11 @@ type PagesFontPreload = {
 /**
  * The `__NEXT_DATA__` fields beyond the always-present core that the Pages
  * renderer serializes: the `__vinext` block plus the readiness flags
- * (gssp/gsp/gip/appGip/autoExport/isExperimentalCompile) the client uses to
+ * (gssp/gsp/gip/appGip/autoExport/nextExport/isExperimentalCompile) the client uses to
  * recompute the initial `router.isReady`. Shared by every render path
  * (initial, ISR regeneration) so they emit identical readiness state.
  */
-type PagesNextDataExtras = Pick<VinextNextData, "__vinext" | "appGip" | "autoExport" | "gip" | "gsp" | "gssp" | "isExperimentalCompile">;
+type PagesNextDataExtras = Pick<VinextNextData, "__vinext" | "appGip" | "autoExport" | "gip" | "gsp" | "gssp" | "isExperimentalCompile" | "nextExport">;
 type PagesI18nRenderContext = {
   locale?: string;
   locales?: string[];

package/dist/server/pages-page-response.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) {

package/dist/server/pages-preview.d.ts

@@ -0,0 +1,26 @@
+//#region src/server/pages-preview.d.ts
+declare const PAGES_PREVIEW_CACHE_CONTROL = "private, no-cache, no-store, max-age=0, must-revalidate";
+type PagesPreviewData = object | string;
+type PagesPreviewState = {
+  data: PagesPreviewData | false;
+  shouldClear: boolean;
+};
+type PreviewResponse = {
+  getHeader(name: string): string | number | boolean | string[] | undefined;
+  setHeader(name: string, value: string | number | boolean | string[]): unknown;
+};
+declare function getPagesPreviewModeId(): string;
+declare function getPagesPreviewState(cookieHeader: string | string[] | null | undefined, options?: {
+  isOnDemandRevalidate?: boolean;
+}): PagesPreviewState;
+declare function setPagesDraftMode(response: PreviewResponse, enabled: boolean): void;
+declare function setPagesPreviewData(response: PreviewResponse, data: PagesPreviewData, options?: {
+  maxAge?: number;
+  path?: string;
+}): void;
+declare function clearPagesPreviewData(response: PreviewResponse, options?: {
+  path?: string;
+}): void;
+declare function appendPagesPreviewClearCookies(headers: Headers): void;
+//#endregion
+export { PAGES_PREVIEW_CACHE_CONTROL, PagesPreviewData, PagesPreviewState, appendPagesPreviewClearCookies, clearPagesPreviewData, getPagesPreviewModeId, getPagesPreviewState, setPagesDraftMode, setPagesPreviewData };

package/dist/server/pages-preview.js

@@ -0,0 +1,165 @@
+import { parseCookieHeader } from "../utils/parse-cookie.js";
+import { createCipheriv, createDecipheriv, createHmac, randomBytes, timingSafeEqual } from "node:crypto";
+//#region src/server/pages-preview.ts
+const PAGES_PREVIEW_CACHE_CONTROL = "private, no-cache, no-store, max-age=0, must-revalidate";
+const pagesPreviewCookiesCleared = Symbol("__prerender_bypass");
+let devCredentials;
+function decodeKey(value) {
+	if (!value || !/^[0-9a-f]{64}$/i.test(value)) return null;
+	return Buffer.from(value, "hex");
+}
+function getPagesPreviewCredentials() {
+	const bypassId = process.env.__VINEXT_PREVIEW_MODE_ID;
+	const encryptionKey = decodeKey(process.env.__VINEXT_PREVIEW_MODE_ENCRYPTION_KEY);
+	const signingKey = decodeKey(process.env.__VINEXT_PREVIEW_MODE_SIGNING_KEY);
+	if (bypassId && encryptionKey && signingKey) return {
+		bypassId,
+		encryptionKey,
+		signingKey
+	};
+	if (!devCredentials) devCredentials = {
+		bypassId: randomBytes(16).toString("hex"),
+		encryptionKey: randomBytes(32),
+		signingKey: randomBytes(32)
+	};
+	return devCredentials;
+}
+function getPagesPreviewModeId() {
+	return getPagesPreviewCredentials().bypassId;
+}
+function serializeCookie(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 serializeClearedCookie(name, options = {}) {
+	return [
+		`${name}=`,
+		"Expires=Thu, 01 Jan 1970 00:00:00 GMT",
+		"HttpOnly",
+		`Path=${options.path ?? "/"}`,
+		process.env.NODE_ENV !== "development" ? "SameSite=None" : "SameSite=Lax",
+		...process.env.NODE_ENV !== "development" ? ["Secure"] : []
+	].join("; ");
+}
+function normalizeSetCookie(value) {
+	if (value === void 0) return [];
+	return Array.isArray(value) ? value.map(String) : [String(value)];
+}
+function encodePayload(data, maxAge) {
+	const iv = randomBytes(12);
+	const credentials = getPagesPreviewCredentials();
+	const cipher = createCipheriv("aes-256-gcm", credentials.encryptionKey, iv);
+	const plaintext = JSON.stringify({
+		data,
+		...maxAge === void 0 ? {} : { expiresAt: Date.now() + maxAge * 1e3 }
+	});
+	const encryptedToken = [
+		iv,
+		Buffer.concat([cipher.update(plaintext, "utf8"), cipher.final()]),
+		cipher.getAuthTag()
+	].map((part) => part.toString("base64url")).join(".");
+	return `${encryptedToken}.${createHmac("sha256", credentials.signingKey).update(encryptedToken).digest("base64url")}`;
+}
+function decodePayload(payload) {
+	try {
+		const [ivValue, encryptedValue, tagValue, signatureValue, ...extra] = payload.split(".");
+		if (!ivValue || !encryptedValue || !tagValue || !signatureValue || extra.length > 0) return false;
+		const encryptedToken = `${ivValue}.${encryptedValue}.${tagValue}`;
+		const credentials = getPagesPreviewCredentials();
+		const expected = createHmac("sha256", credentials.signingKey).update(encryptedToken).digest();
+		const signature = Buffer.from(signatureValue, "base64url");
+		if (signature.length !== expected.length || !timingSafeEqual(signature, expected)) return false;
+		const decipher = createDecipheriv("aes-256-gcm", credentials.encryptionKey, Buffer.from(ivValue, "base64url"));
+		decipher.setAuthTag(Buffer.from(tagValue, "base64url"));
+		const decoded = Buffer.concat([decipher.update(Buffer.from(encryptedValue, "base64url")), decipher.final()]).toString("utf8");
+		const value = JSON.parse(decoded);
+		if (typeof value !== "object" || value === null || !("data" in value)) return false;
+		const expiresAt = "expiresAt" in value ? value.expiresAt : void 0;
+		if (typeof expiresAt === "number" && Date.now() >= expiresAt) return false;
+		const data = value.data;
+		return typeof data === "object" && data !== null ? data : String(data);
+	} catch {
+		return false;
+	}
+}
+function getPagesPreviewState(cookieHeader, options = {}) {
+	if (options.isOnDemandRevalidate) return {
+		data: false,
+		shouldClear: false
+	};
+	const cookies = parseCookieHeader(Array.isArray(cookieHeader) ? cookieHeader.join("; ") : cookieHeader);
+	const bypass = cookies.__prerender_bypass;
+	const payload = cookies.__next_preview_data;
+	if (!bypass && !payload) return {
+		data: false,
+		shouldClear: false
+	};
+	if (!bypass || bypass !== getPagesPreviewCredentials().bypassId) return {
+		data: false,
+		shouldClear: true
+	};
+	if (!payload) return {
+		data: {},
+		shouldClear: false
+	};
+	const data = decodePayload(payload);
+	return {
+		data,
+		shouldClear: data === false
+	};
+}
+function setPagesDraftMode(response, enabled) {
+	const cookie = enabled ? serializeCookie("__prerender_bypass", getPagesPreviewModeId()) : serializeClearedCookie("__prerender_bypass");
+	response.setHeader("Set-Cookie", [...normalizeSetCookie(response.getHeader("Set-Cookie")), cookie]);
+}
+function setPagesPreviewData(response, data, options = {}) {
+	const payload = encodePayload(data, options.maxAge);
+	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");
+	response.setHeader("Set-Cookie", [
+		...normalizeSetCookie(response.getHeader("Set-Cookie")),
+		serializeCookie("__prerender_bypass", getPagesPreviewModeId(), options),
+		serializeCookie("__next_preview_data", payload, options)
+	]);
+}
+function clearPagesPreviewData(response, options = {}) {
+	if (pagesPreviewCookiesCleared in response) return;
+	response.setHeader("Set-Cookie", [
+		...normalizeSetCookie(response.getHeader("Set-Cookie")),
+		serializeClearedCookie("__prerender_bypass", options),
+		serializeClearedCookie("__next_preview_data", options)
+	]);
+	Object.defineProperty(response, pagesPreviewCookiesCleared, {
+		value: true,
+		enumerable: false
+	});
+}
+function appendPagesPreviewClearCookies(headers) {
+	const cookies = headers.getSetCookie();
+	const hasExpiredCookie = (name) => cookies.some((cookie) => {
+		const [cookieValue, ...attributes] = cookie.split(";").map((part) => part.trim());
+		if (!cookieValue?.startsWith(`${name}=`)) return false;
+		let expiresAtEpoch = false;
+		let path;
+		let hasDomain = false;
+		for (const attribute of attributes) {
+			const separator = attribute.indexOf("=");
+			const attributeName = (separator === -1 ? attribute : attribute.slice(0, separator)).trim().toLowerCase();
+			const attributeValue = separator === -1 ? "" : attribute.slice(separator + 1).trim();
+			if (attributeName === "expires") expiresAtEpoch = Date.parse(attributeValue) === 0;
+			if (attributeName === "path") path = attributeValue;
+			if (attributeName === "domain") hasDomain = true;
+		}
+		return expiresAtEpoch && path === "/" && !hasDomain;
+	});
+	if (!hasExpiredCookie("__prerender_bypass")) headers.append("Set-Cookie", serializeClearedCookie("__prerender_bypass"));
+	if (!hasExpiredCookie("__next_preview_data")) headers.append("Set-Cookie", serializeClearedCookie("__next_preview_data"));
+}
+//#endregion
+export { PAGES_PREVIEW_CACHE_CONTROL, appendPagesPreviewClearCookies, clearPagesPreviewData, getPagesPreviewModeId, getPagesPreviewState, setPagesDraftMode, setPagesPreviewData };