vinext 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/server/dev-server.js

@@ -1,23 +1,19 @@
-import { createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { createValidFileMatcher, findFileWithExtensions, findFileWithExts } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { matchRoute } from "../routing/pages-router.js";
-import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
+import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
+import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { isDangerousScheme } from "../shims/url-safety.js";
+import { sanitizeDestination } from "../config/config-matchers.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
-import { buildCacheStateHeaders } from "./cache-headers.js";
-import { isUnknownRecord } from "../utils/record.js";
-import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL } from "./cache-control.js";
-import { buildMissIsrCacheControl, decideIsr } from "./isr-decision.js";
-import { PRERENDER_REVALIDATE_HEADER, buildPagesCacheValue, getRevalidateDuration, isOnDemandRevalidateRequest, isrCacheKey, isrGet, isrSet, setRevalidateDuration, triggerBackgroundRegeneration } from "./isr-cache.js";
-import { _runWithCacheState } from "../shims/cache-request-state.js";
-import { ensureFetchPatch, runWithFetchCache } from "../shims/fetch-cache.js";
-import { runWithPrivateCache } from "../shims/cache-runtime.js";
+import { NEVER_CACHE_CONTROL } from "./cache-control.js";
+import { buildMissIsrCacheControl } from "./isr-decision.js";
+import { isOnDemandRevalidateRequest } from "./isr-cache.js";
+import { ensureFetchPatch } from "../shims/fetch-cache.js";
 import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
 import "../shims/router-state.js";
-import { runWithHeadState } from "../shims/head-state.js";
-import { runWithServerInsertedHTMLState } from "../shims/navigation-state.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr, safeJsonStringify } from "./html.js";
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
@@ -29,10 +25,10 @@ import { buildPagesReadinessNextData } from "./pages-readiness.js";
 import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
 import { callDocumentGetInitialProps } from "./document-initial-head.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { hasPagesGetInitialProps, loadDevAppInitialProps, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { isSerializableProps } from "./pages-serializable-props.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
-import { getPagesRouteParams, matchesPagesStaticPath } from "./pages-page-data.js";
+import { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds } from "./pages-page-data.js";
 import { createPagesDevAssetUrl, createPagesDevModuleUrl } from "./pages-dev-module-url.js";
 import { createPagesDevHydrationScript } from "./pages-dev-hydration.js";
 import { getManifestFilesForModule } from "./pages-asset-tags.js";
@@ -78,8 +74,15 @@ function applyDevPagesPreviewResponse(res, preview) {
 	applyDevPagesPreviewHeaders(headers, preview);
 	for (const [name, value] of Object.entries(headers)) res.setHeader(name, value);
 }
-async function renderIsrPassToStringAsync(element) {
-	return await runWithServerInsertedHTMLState(() => runWithHeadState(() => _runWithCacheState(() => runWithPrivateCache(() => runWithFetchCache(async () => renderToStringAsync(element))))));
+const DEV_PAGES_CACHE_CONTROL = "no-cache, must-revalidate";
+const PAGES_CACHE_ONE_YEAR_SECONDS = 31536e3;
+function applyDevPagesCacheHeaders(res, state, cacheControl = DEV_PAGES_CACHE_CONTROL) {
+	res.setHeader(NEXTJS_CACHE_HEADER, state);
+	res.setHeader("Cache-Control", cacheControl);
+}
+function buildDevPagesTerminalCacheControl(revalidateSeconds, expireSeconds) {
+	if (revalidateSeconds === false) return `s-maxage=${PAGES_CACHE_ONE_YEAR_SECONDS}`;
+	return buildMissIsrCacheControl(revalidateSeconds, expireSeconds);
 }
 const DEV_STYLESHEET_ASSET_RE = /\.(?:css|scss|sass)$/i;
 const transformedStylesheetAssetsCache = /* @__PURE__ */ new WeakMap();
@@ -172,11 +175,17 @@ async function collectDevInitialStylesheetHeadHTML(server, runner, moduleIds, no
 * (`buildPagesRedirectResponse`) and Next.js's `render.tsx` `__N_REDIRECT`
 * handling. See AGENTS.md "dev and prod server parity".
 */
-function writeGsspRedirect(res, redirect, isDataReq, props) {
-	const status = redirect.statusCode ?? (redirect.permanent ? 308 : 307);
-	let dest = redirect.destination;
-	if (!dest.startsWith("http://") && !dest.startsWith("https://")) dest = dest.replace(/^[\\/]+/, "/");
-	if (isDangerousScheme(dest)) {
+function writeGsspRedirect(res, redirect, isDataReq, props, options) {
+	const resolved = resolvePagesRedirect(redirect, {
+		method: options.method,
+		routeUrl: options.routeUrl,
+		sanitizeDestination
+	});
+	const redirectProps = buildPagesRedirectProps(resolved, {
+		...props,
+		pageProps: props.pageProps
+	});
+	if (isDangerousScheme(resolved.destination)) {
 		const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
 		const headers = {
 			"Cache-Control": "private, no-cache, no-store, max-age=0, must-revalidate",
@@ -192,18 +201,15 @@ function writeGsspRedirect(res, redirect, isDataReq, props) {
 		const dataHeaders = { "Content-Type": "application/json" };
 		if (deploymentId) dataHeaders[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
 		res.writeHead(200, dataHeaders);
-		res.end(JSON.stringify({
-			...props,
-			pageProps: {
-				...isUnknownRecord(props.pageProps) ? props.pageProps : {},
-				__N_REDIRECT: dest,
-				__N_REDIRECT_STATUS: status
-			}
-		}));
+		res.end(JSON.stringify({ ...redirectProps }));
 		return;
 	}
-	res.writeHead(status, { Location: dest });
-	res.end();
+	const location = resolvePagesRedirectLocation(resolved, options.basePath);
+	res.writeHead(resolved.statusCode, {
+		Location: location,
+		...resolved.statusCode === 308 ? { Refresh: `0;url=${location}` } : {}
+	});
+	res.end(location);
 }
 /** Body placeholder used to split the document shell for streaming. */
 const STREAM_BODY_MARKER = "<!--VINEXT_STREAM_BODY-->";
@@ -324,7 +330,7 @@ function parseCookieLocale(req, i18nConfig) {
 * 4. Render the component to HTML
 * 5. Wrap in _document shell and send response
 */
-function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatcher, basePath = "", trailingSlash = false, hasMiddleware = false, hasRewrites = false, clientTraceMetadata, htmlLimitedBots, reactStrictMode = false) {
+function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatcher, basePath = "", trailingSlash = false, hasMiddleware = false, hasRewrites = false, clientTraceMetadata, htmlLimitedBots, reactStrictMode = false, expireTime = PAGES_CACHE_ONE_YEAR_SECONDS) {
 	const matcher = fileMatcher ?? createValidFileMatcher();
 	const pagePatterns = routes.map((r) => patternToNextFormat(r.pattern));
 	const _alsRegistration = Promise.all([runner.import("vinext/head-state"), runner.import("vinext/router-state")]);
@@ -350,22 +356,24 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 		let locale;
 		let localeStrippedUrl = url;
 		let currentDefaultLocale;
-		let currentDomainLocaleDomain;
 		const domainLocales = i18nConfig?.domains;
 		if (i18nConfig) {
 			const resolved = resolvePagesI18nRequest(url, i18nConfig, req.headers, req.headers.host, basePath, trailingSlash);
 			locale = resolved.locale;
 			localeStrippedUrl = resolved.url;
 			currentDefaultLocale = resolved.domainLocale?.defaultLocale ?? i18nConfig.defaultLocale;
-			currentDomainLocaleDomain = resolved.domainLocale?.domain;
 			if (resolved.redirectUrl) {
 				res.writeHead(307, { Location: resolved.redirectUrl });
 				res.end();
 				return;
 			}
 		}
-		const i18nCacheVariant = i18nConfig ? currentDomainLocaleDomain ? "domain:" + currentDomainLocaleDomain.toLowerCase() : "locale:" + String(locale) : null;
-		const pagesIsrCacheKey = i18nCacheVariant ? (pathname) => isrCacheKey("pages", pathname + "::i18n=" + encodeURIComponent(i18nCacheVariant), process.env.__VINEXT_BUILD_ID) : (pathname) => isrCacheKey("pages", pathname, process.env.__VINEXT_BUILD_ID);
+		const errorPageContext = {
+			basePath,
+			locale: locale ?? currentDefaultLocale,
+			locales: i18nConfig?.locales,
+			defaultLocale: currentDefaultLocale
+		};
 		const match = matchRoute(localeStrippedUrl, routes);
 		if (!match) {
 			if (isDataReq) {
@@ -377,9 +385,13 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				res.end("{}");
 				return;
 			}
-			await runWithRequestContext(createRequestContext(), async () => {
+			const requestContext = createRequestContext();
+			const closeRequest = () => void closeAfterResponse(requestContext);
+			res.on("finish", closeRequest);
+			res.on("close", closeRequest);
+			await runWithRequestContext(requestContext, async () => {
 				await _alsRegistration;
-				await renderErrorPage(server, runner, req, res, url, pagesDir, 404, void 0, matcher, void 0, reactStrictMode);
+				await renderErrorPage(server, runner, req, res, url, pagesDir, 404, void 0, matcher, void 0, reactStrictMode, errorPageContext);
 			});
 			return;
 		}
@@ -391,7 +403,11 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 		let requestAsPath = isDataReq ? gsspResolvedUrl : i18nConfig ? extractLocaleFromUrl$1(originalUrl, i18nConfig, locale).url : originalUrl;
 		const userFacingParams = route.isDynamic ? params : null;
 		let query = mergeRouteParamsIntoQuery(parseQueryString(url), params);
-		return runWithRequestContext(createRequestContext(), async () => {
+		const requestContext = createRequestContext();
+		const closeRequest = () => void closeAfterResponse(requestContext);
+		res.on("finish", closeRequest);
+		res.on("close", closeRequest);
+		return runWithRequestContext(requestContext, async () => {
 			ensureFetchPatch();
 			try {
 				await _alsRegistration;
@@ -472,10 +488,9 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				let pageProps = {};
 				let renderProps = { pageProps };
 				if (requestPreviewData !== false) renderProps.__N_PREVIEW = true;
-				let isrRevalidateSeconds = null;
+				let isOnDemandRevalidate = false;
+				let staticPropsRevalidateSeconds = false;
 				let isFallbackRender = false;
-				let shouldPersistFallbackData = false;
-				let staticPropsPreviewData = requestPreviewData;
 				if (typeof pageModule.getStaticPaths === "function" && route.isDynamic) {
 					const pathsResult = await pageModule.getStaticPaths({
 						locales: i18nConfig?.locales ?? [],
@@ -491,17 +506,17 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 							const notFoundHeaders = { "Content-Type": "application/json" };
 							if (deploymentId) notFoundHeaders[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
 							res.writeHead(404, notFoundHeaders);
-							res.end("{}");
+							res.end("{\"notFound\":true}");
 							return;
 						}
-						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext, matcher, void 0, reactStrictMode);
+						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext, matcher, void 0, reactStrictMode, errorPageContext);
 						return;
 					}
 					const userAgentHeader = req.headers["user-agent"];
 					const userAgent = Array.isArray(userAgentHeader) ? userAgentHeader[0] : userAgentHeader;
 					const isBotRequest = !!userAgent && isBotUserAgent(userAgent, htmlLimitedBots);
 					if (fallback === true && !isValidPath && !isDataReq && !isBotRequest && requestPreviewData === false) {
-						isFallbackRender = (await isrGet(pagesIsrCacheKey(url.split("?")[0])))?.value.value?.kind !== "PAGES";
+						isFallbackRender = true;
 						if (isFallbackRender && typeof routerShim.setSSRContext === "function") routerShim.setSSRContext({
 							pathname: patternToNextFormat(route.pattern),
 							query: {},
@@ -514,7 +529,6 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 							isFallback: true
 						});
 					}
-					shouldPersistFallbackData = fallback === true && !isValidPath && isDataReq;
 				}
 				const gsspExtraHeaders = {};
 				const hasAppGetInitialProps = hasPagesGetInitialProps(AppComponent);
@@ -526,7 +540,6 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 							const appTree = React.createElement(AppComponent, {
 								...appTreeProps,
 								Component: PageComponent,
-								pageProps: appTreeProps.pageProps,
 								router: routerShim.default
 							});
 							return typeof routerShim.wrapWithRouterContext === "function" ? routerShim.wrapWithRouterContext(appTree) : appTree;
@@ -577,17 +590,18 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					const result = await pageModule.getServerSideProps(context);
 					if (res.writableEnded) return;
 					if (result && "props" in result) {
-						pageProps = {
-							...pageProps,
-							...await Promise.resolve(result.props)
-						};
+						pageProps = mergePagesDataProps(renderProps.pageProps, await Promise.resolve(result.props));
 						renderProps = {
 							...renderProps,
 							pageProps
 						};
 					}
 					if (result && "redirect" in result) {
-						writeGsspRedirect(res, result.redirect, isDataReq, renderProps);
+						writeGsspRedirect(res, result.redirect, isDataReq, renderProps, {
+							basePath,
+							method: "getServerSideProps",
+							routeUrl: url
+						});
 						return;
 					}
 					if (result && "notFound" in result && result.notFound) {
@@ -597,10 +611,10 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 							const notFoundHeaders = { "Content-Type": "application/json" };
 							if (deploymentId) notFoundHeaders[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
 							res.writeHead(404, notFoundHeaders);
-							res.end("{}");
+							res.end("{\"notFound\":true}");
 							return;
 						}
-						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext, void 0, void 0, reactStrictMode);
+						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext, void 0, void 0, reactStrictMode, errorPageContext);
 						return;
 					}
 					if (result && "props" in result) isSerializableProps(patternToNextFormat(route.pattern), "getServerSideProps", pageProps);
@@ -616,216 +630,19 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				}
 				const responseHeaders = typeof res.getHeaders === "function" ? res.getHeaders() : void 0;
 				const scriptNonce = getScriptNonceFromNodeHeaderSources(req.headers, responseHeaders);
-				let earlyFontLinkHeader = "";
-				try {
-					const earlyPreloads = [];
-					const fontGoogleEarly = await importModule(runner, "next/font/google");
-					if (typeof fontGoogleEarly.getSSRFontPreloads === "function") earlyPreloads.push(...fontGoogleEarly.getSSRFontPreloads());
-					const fontLocalEarly = await importModule(runner, "next/font/local");
-					if (typeof fontLocalEarly.getSSRFontPreloads === "function") earlyPreloads.push(...fontLocalEarly.getSSRFontPreloads());
-					if (earlyPreloads.length > 0) earlyFontLinkHeader = earlyPreloads.map((p) => `<${p.href}>; rel=preload; as=font; type=${p.type}; crossorigin`).join(", ");
-				} catch {}
 				if (typeof pageModule.getStaticProps === "function" && !isFallbackRender) {
-					const cacheKey = pagesIsrCacheKey(url.split("?")[0]);
-					const cached = await isrGet(cacheKey);
-					const isOnDemandRevalidate = isOnDemandRevalidateRequest(req.headers[PRERENDER_REVALIDATE_HEADER]);
+					isOnDemandRevalidate = isOnDemandRevalidateRequest(req.headers[PRERENDER_REVALIDATE_HEADER]);
+					if (isOnDemandRevalidate && req.headers["x-prerender-revalidate-if-generated"] !== void 0) {
+						res.writeHead(404, { [NEXTJS_CACHE_HEADER]: "REVALIDATED" });
+						res.end("This page could not be found");
+						return;
+					}
 					const previewData = requestPreviewData;
-					staticPropsPreviewData = previewData;
 					const previewContext = previewData === false ? {} : {
 						draftMode: true,
 						preview: true,
 						previewData
 					};
-					if (!isOnDemandRevalidate && cached && !cached.isStale && cached.value.value?.kind === "PAGES" && !cached.value.value.generatedFromDataRequest && !scriptNonce && !isDataReq && previewData === false) {
-						const cachedHtml = cached.value.value.html;
-						const transformedHtml = await server.transformIndexHtml(url, cachedHtml);
-						const { cacheControl: hitCacheControl } = decideIsr({
-							cacheState: "HIT",
-							kind: "dev",
-							revalidateSeconds: getRevalidateDuration(cacheKey) ?? 60
-						});
-						const hitHeaders = {
-							"Content-Type": "text/html; charset=utf-8",
-							...buildCacheStateHeaders("HIT"),
-							"Cache-Control": hitCacheControl
-						};
-						if (earlyFontLinkHeader) hitHeaders["Link"] = earlyFontLinkHeader;
-						res.writeHead(200, hitHeaders);
-						res.end(transformedHtml);
-						return;
-					}
-					if (!isOnDemandRevalidate && cached && cached.isStale && cached.value.value?.kind === "PAGES" && !cached.value.value.generatedFromDataRequest && !scriptNonce && !isDataReq && previewData === false) {
-						const cachedHtml = cached.value.value.html;
-						const transformedHtml = await server.transformIndexHtml(url, cachedHtml);
-						triggerBackgroundRegeneration(cacheKey, async () => {
-							return runWithRequestContext(createRequestContext({
-								executionContext: null,
-								ssrContext: {
-									pathname: patternToNextFormat(route.pattern),
-									query,
-									asPath: requestAsPath,
-									navigationIsReady,
-									locale: locale ?? currentDefaultLocale,
-									locales: i18nConfig?.locales,
-									defaultLocale: currentDefaultLocale
-								},
-								i18nContext: i18nConfig ? {
-									locale: locale ?? currentDefaultLocale,
-									locales: i18nConfig.locales,
-									defaultLocale: currentDefaultLocale,
-									domainLocales,
-									hostname: req.headers.host?.split(":", 1)[0]
-								} : null
-							}), async () => {
-								ensureFetchPatch();
-								let freshPageProps = {};
-								let freshRenderProps = { pageProps: freshPageProps };
-								let RegenApp = null;
-								const appPath = path.join(pagesDir, "_app");
-								if (findFileWithExtensions(appPath, matcher)) try {
-									RegenApp = (await runner.import(appPath)).default ?? null;
-								} catch {}
-								if (RegenApp && hasPagesGetInitialProps(RegenApp)) {
-									const regenReq = {
-										url: req.url,
-										headers: req.headers,
-										method: req.method
-									};
-									const regenRes = {
-										headersSent: false,
-										writableEnded: false,
-										statusCode: 200,
-										getHeaders() {
-											return {};
-										}
-									};
-									const initialProps = await loadPagesGetInitialProps(RegenApp, {
-										AppTree: (appTreeProps) => {
-											const appTree = React.createElement(RegenApp, {
-												...appTreeProps,
-												Component: pageModule.default,
-												pageProps: appTreeProps.pageProps,
-												router: routerShim.default
-											});
-											return typeof routerShim.wrapWithRouterContext === "function" ? routerShim.wrapWithRouterContext(appTree) : appTree;
-										},
-										Component: pageModule.default,
-										router: routerShim.default,
-										ctx: {
-											req: regenReq,
-											res: regenRes,
-											pathname: patternToNextFormat(route.pattern),
-											query,
-											asPath: requestAsPath,
-											locale: locale ?? currentDefaultLocale,
-											locales: i18nConfig?.locales,
-											defaultLocale: currentDefaultLocale
-										}
-									});
-									if (regenRes.headersSent || regenRes.writableEnded) return;
-									if (initialProps) {
-										freshRenderProps = initialProps;
-										freshPageProps = isUnknownRecord(initialProps.pageProps) ? initialProps.pageProps : {};
-									}
-								}
-								const freshResult = await pageModule.getStaticProps({
-									params: userFacingParams,
-									locale: locale ?? currentDefaultLocale,
-									locales: i18nConfig?.locales,
-									defaultLocale: currentDefaultLocale,
-									revalidateReason: "stale"
-								});
-								if (freshResult && "props" in freshResult) {
-									const revalidate = typeof freshResult.revalidate === "number" ? freshResult.revalidate : cached.value.cacheControl?.revalidate ?? 0;
-									if (revalidate > 0) {
-										freshPageProps = {
-											...freshPageProps,
-											...freshResult.props
-										};
-										freshRenderProps = {
-											...freshRenderProps,
-											pageProps: freshPageProps
-										};
-										if (typeof routerShim.setSSRContext === "function") routerShim.setSSRContext({
-											pathname: patternToNextFormat(route.pattern),
-											query,
-											asPath: requestAsPath,
-											navigationIsReady,
-											locale: locale ?? currentDefaultLocale,
-											locales: i18nConfig?.locales,
-											defaultLocale: currentDefaultLocale,
-											domainLocales
-										});
-										if (i18nConfig) {
-											await runner.import("vinext/i18n-state");
-											const i18nCtx = await importModule(runner, "vinext/i18n-context");
-											if (typeof i18nCtx.setI18nContext === "function") i18nCtx.setI18nContext({
-												locale: locale ?? currentDefaultLocale,
-												locales: i18nConfig.locales,
-												defaultLocale: currentDefaultLocale,
-												domainLocales,
-												hostname: req.headers.host?.split(":", 1)[0]
-											});
-										}
-										let el = RegenApp ? React.createElement(RegenApp, {
-											...freshRenderProps,
-											Component: pageModule.default,
-											pageProps: freshRenderProps.pageProps,
-											router: routerShim.default
-										}) : React.createElement(pageModule.default, freshPageProps);
-										if (routerShim.wrapWithRouterContext) el = routerShim.wrapWithRouterContext(el);
-										const freshBody = await renderIsrPassToStringAsync(withScriptNonce(el, scriptNonce));
-										const viteRoot = server.config.root;
-										const viteBase = server.config.base;
-										const regenPageUrl = createPagesDevModuleUrl(viteRoot, route.filePath, viteBase);
-										const regenAppUrl = RegenApp ? createPagesDevModuleUrl(viteRoot, path.join(pagesDir, "_app"), viteBase) : null;
-										const freshPagesNextData = {
-											...pagesNextData,
-											__vinext: {
-												...pagesNextData.__vinext,
-												pageModuleUrl: regenPageUrl,
-												appModuleUrl: regenAppUrl,
-												hasMiddleware,
-												routeUrl: requestAsPath
-											}
-										};
-										const freshHtml = `<!DOCTYPE html><html><head></head><body><div id="__next">${freshBody}</div>${`<script id="__NEXT_DATA__" type="application/json">${safeJsonStringify({
-											props: freshRenderProps,
-											page: patternToNextFormat(route.pattern),
-											query: params,
-											buildId: process.env.__VINEXT_BUILD_ID,
-											isFallback: false,
-											locale: locale ?? currentDefaultLocale,
-											locales: i18nConfig?.locales,
-											defaultLocale: currentDefaultLocale,
-											domainLocales,
-											...freshPagesNextData
-										})}<\/script>`}\n  ${cachedHtml.match(/<script type="module">[\s\S]*?<\/script>/)?.[0] ?? ""}</body></html>`;
-										await isrSet(cacheKey, buildPagesCacheValue(freshHtml, freshRenderProps), revalidate);
-										setRevalidateDuration(cacheKey, revalidate);
-									}
-								}
-							});
-						}, {
-							routerKind: "Pages Router",
-							routePath: route.pattern,
-							routeType: "render"
-						});
-						const { cacheControl: staleCacheControl } = decideIsr({
-							cacheState: "STALE",
-							kind: "dev",
-							revalidateSeconds: getRevalidateDuration(cacheKey) ?? 60
-						});
-						const staleHeaders = {
-							"Content-Type": "text/html; charset=utf-8",
-							...buildCacheStateHeaders("STALE"),
-							"Cache-Control": staleCacheControl
-						};
-						if (earlyFontLinkHeader) staleHeaders["Link"] = earlyFontLinkHeader;
-						res.writeHead(200, staleHeaders);
-						res.end(transformedHtml);
-						return;
-					}
 					const context = {
 						params: userFacingParams,
 						locale: locale ?? currentDefaultLocale,
@@ -834,43 +651,47 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						revalidateReason: isOnDemandRevalidate ? "on-demand" : "stale",
 						...previewContext
 					};
-					const generatedPageData = !isOnDemandRevalidate && previewData === false && cached?.isStale === false && cached?.value.value?.kind === "PAGES" && cached.value.value.generatedFromDataRequest && isUnknownRecord(cached.value.value.pageData) ? cached.value.value.pageData : null;
-					if (!generatedPageData && await loadAppInitialProps()) return;
-					const result = generatedPageData ? null : await pageModule.getStaticProps(context);
-					if (generatedPageData) {
-						renderProps = generatedPageData;
-						pageProps = isUnknownRecord(renderProps.pageProps) ? renderProps.pageProps : {};
-					}
+					if (await loadAppInitialProps()) return;
+					const result = await pageModule.getStaticProps(context);
+					const routePattern = patternToNextFormat(route.pattern);
+					assertPages404DoesNotReturnNotFound(routePattern, result);
+					if (result) staticPropsRevalidateSeconds = resolvePagesRevalidateSeconds(result, routePattern);
 					if (result && "props" in result) {
-						pageProps = {
-							...pageProps,
-							...await Promise.resolve(result.props)
-						};
+						pageProps = mergePagesDataProps(renderProps.pageProps, await Promise.resolve(result.props));
 						renderProps = {
 							...renderProps,
 							pageProps
 						};
 					}
 					if (result && "redirect" in result) {
-						writeGsspRedirect(res, result.redirect, isDataReq, renderProps);
+						if (previewData === false) resolvePagesRedirect(result.redirect, {
+							method: "getStaticProps",
+							routeUrl: url,
+							sanitizeDestination
+						});
+						applyDevPagesCacheHeaders(res, isOnDemandRevalidate ? "REVALIDATED" : "HIT", buildDevPagesTerminalCacheControl(staticPropsRevalidateSeconds, expireTime));
+						writeGsspRedirect(res, result.redirect, isDataReq, renderProps, {
+							basePath,
+							method: "getStaticProps",
+							routeUrl: url
+						});
 						return;
 					}
 					if (result && "notFound" in result && result.notFound) {
+						applyDevPagesCacheHeaders(res, isOnDemandRevalidate ? "REVALIDATED" : "HIT", isDataReq ? buildDevPagesTerminalCacheControl(staticPropsRevalidateSeconds, expireTime) : DEV_PAGES_CACHE_CONTROL);
 						applyDevPagesPreviewResponse(res, requestPreview);
 						if (isDataReq) {
 							const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
 							const notFoundHeaders = { "Content-Type": "application/json" };
 							if (deploymentId) notFoundHeaders[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
 							res.writeHead(404, notFoundHeaders);
-							res.end("{}");
+							res.end("{\"notFound\":true}");
 							return;
 						}
-						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext, void 0, void 0, reactStrictMode);
+						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext, void 0, void 0, reactStrictMode, errorPageContext);
 						return;
 					}
-					if (result && "props" in result) isSerializableProps(patternToNextFormat(route.pattern), "getStaticProps", pageProps);
-					if (previewData === false && typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
-					else if (previewData === false && cached?.value.value?.kind === "PAGES" && cached.value.value.generatedFromDataRequest) isrRevalidateSeconds = cached.value.cacheControl?.revalidate ?? 31536e3;
+					if (result && "props" in result) isSerializableProps(routePattern, "getStaticProps", pageProps);
 				}
 				if (typeof pageModule.getServerSideProps !== "function" && typeof pageModule.getStaticProps !== "function" && hasAppGetInitialProps) {
 					if (await loadAppInitialProps()) return;
@@ -899,20 +720,11 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					}
 				}
 				if (isDataReq) {
-					if (shouldPersistFallbackData && staticPropsPreviewData === false) {
-						const cacheKey = pagesIsrCacheKey(url.split("?")[0]);
-						const revalidateSeconds = isrRevalidateSeconds ?? 31536e3;
-						await isrSet(cacheKey, {
-							kind: "PAGES",
-							html: "",
-							pageData: renderProps,
-							generatedFromDataRequest: true,
-							headers: void 0,
-							status: void 0
-						}, revalidateSeconds);
-						setRevalidateDuration(cacheKey, revalidateSeconds);
-					}
 					const dataHeaders = { "Content-Type": "application/json" };
+					if (typeof pageModule.getStaticProps === "function") {
+						dataHeaders["Cache-Control"] = DEV_PAGES_CACHE_CONTROL;
+						dataHeaders[NEXTJS_CACHE_HEADER] = isOnDemandRevalidate ? "REVALIDATED" : "HIT";
+					}
 					if ((statusCode ?? 200) === 200) dataHeaders["x-nextjs-matched-path"] = `${locale ? `/${locale}` : ""}${patternToNextFormat(route.pattern)}`;
 					if (gsspExtraHeaders) for (const [k, v] of Object.entries(gsspExtraHeaders)) dataHeaders[k] = v;
 					applyDevPagesPreviewHeaders(dataHeaders, requestPreview);
@@ -932,7 +744,6 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				if (AppComponent) element = createElement(AppComponent, {
 					...renderProps,
 					Component: PageComponent,
-					pageProps: renderProps.pageProps,
 					router: routerShim.default
 				});
 				else element = createElement(PageComponent, pageProps);
@@ -1011,10 +822,9 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				} catch {}
 				const allScripts = `${nextDataScript}\n  ${createInlineScriptTag(`window.__VINEXT_PAGE_PATTERNS__=${safeJsonStringify(pagePatterns)}`, scriptNonce)}\n  ${hydrationScript}`;
 				const extraHeaders = { ...gsspExtraHeaders };
-				if (requestPreviewData === false && isrRevalidateSeconds) if (scriptNonce) extraHeaders["Cache-Control"] = NO_STORE_CACHE_CONTROL;
-				else {
-					extraHeaders["Cache-Control"] = buildMissIsrCacheControl(isrRevalidateSeconds);
-					Object.assign(extraHeaders, buildCacheStateHeaders("MISS"));
+				if (typeof pageModule.getStaticProps === "function") {
+					extraHeaders["Cache-Control"] = DEV_PAGES_CACHE_CONTROL;
+					extraHeaders[NEXTJS_CACHE_HEADER] = isFallbackRender ? "MISS" : isOnDemandRevalidate ? "REVALIDATED" : "HIT";
 				}
 				applyDevPagesPreviewHeaders(extraHeaders, requestPreview);
 				if (allFontPreloads.length > 0) extraHeaders["Link"] = allFontPreloads.map((p) => `<${p.href}>; rel=preload; as=font; type=${p.type}; crossorigin`).join(", ");
@@ -1046,7 +856,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						if (FinalApp) enhancedElement = createElement(FinalApp, {
 							...renderProps,
 							Component: FinalComp,
-							pageProps
+							router: routerShim.default
 						});
 						else enhancedElement = createElement(FinalComp, pageProps);
 						if (wrapWithRouterContext) enhancedElement = wrapWithRouterContext(enhancedElement);
@@ -1062,18 +872,6 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				});
 				_renderEnd = now();
 				if (typeof routerShim.setSSRContext === "function") routerShim.setSSRContext(null);
-				if (!scriptNonce && isrRevalidateSeconds !== null && isrRevalidateSeconds > 0) {
-					let isrElement = AppComponent ? createElement(AppComponent, {
-						...renderProps,
-						Component: pageModule.default,
-						pageProps
-					}) : createElement(pageModule.default, pageProps);
-					if (wrapWithRouterContext) isrElement = wrapWithRouterContext(isrElement);
-					const isrHtml = `<!DOCTYPE html><html><head>${assetHeadHTML}</head><body><div id="__next">${await renderIsrPassToStringAsync(withScriptNonce(isrElement, scriptNonce))}</div>${allScripts}</body></html>`;
-					const cacheKey = pagesIsrCacheKey(url.split("?")[0]);
-					await isrSet(cacheKey, buildPagesCacheValue(isrHtml, pageProps), isrRevalidateSeconds);
-					setRevalidateDuration(cacheKey, isrRevalidateSeconds);
-				}
 			} catch (e) {
 				console.error(e);
 				reportRequestError(e instanceof Error ? e : new Error(String(e)), {
@@ -1086,7 +884,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					routeType: "render"
 				}).catch(() => {});
 				try {
-					await renderErrorPage(server, runner, req, res, url, pagesDir, 500, void 0, matcher, e instanceof Error ? e : new Error(String(e)), reactStrictMode);
+					await renderErrorPage(server, runner, req, res, url, pagesDir, 500, void 0, matcher, e instanceof Error ? e : new Error(String(e)), reactStrictMode, errorPageContext);
 				} catch (fallbackErr) {
 					res.statusCode = 500;
 					res.end(`Internal Server Error: ${fallbackErr.message}`);
@@ -1103,16 +901,20 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 * - 500: pages/500.tsx -> pages/_error.tsx -> default
 * - other: pages/_error.tsx -> default
 */
-async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCode, wrapWithRouterContext, fileMatcher, err, reactStrictMode = false) {
+async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCode, wrapWithRouterContext, fileMatcher, err, reactStrictMode = false, context = { basePath: "" }) {
 	attachPagesRequestCookies(req);
 	const matcher = fileMatcher ?? createValidFileMatcher();
 	const candidates = statusCode === 404 ? ["404", "_error"] : statusCode === 500 ? ["500", "_error"] : ["_error"];
 	for (const candidate of candidates) {
 		let errorRouterShim = null;
+		let candidateLoaded = false;
+		let errorAssetPath = null;
 		try {
-			const errorAssetPath = findFileWithExts(pagesDir, candidate, matcher);
+			errorAssetPath = findFileWithExts(pagesDir, candidate, matcher);
 			if (!errorAssetPath && candidate !== "_error") continue;
-			const ErrorComponent = (await importModule(runner, errorAssetPath ?? "next/error")).default;
+			const errorModule = await importModule(runner, errorAssetPath ?? "next/error");
+			candidateLoaded = true;
+			const ErrorComponent = errorModule.default;
 			if (!ErrorComponent) continue;
 			let AppComponent = null;
 			const appPathErr = path.join(pagesDir, "_app");
@@ -1146,10 +948,36 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 				asPath: url
 			});
 			if (res.headersSent || res.writableEnded) return;
-			const errorProps = {
+			let errorProps = {
 				...initialErrorProps,
 				statusCode
 			};
+			if (typeof errorModule.getStaticProps === "function") {
+				const isOnDemandRevalidate = isOnDemandRevalidateRequest(req.headers[PRERENDER_REVALIDATE_HEADER]);
+				const staticResult = await errorModule.getStaticProps({
+					locale: context.locale,
+					locales: context.locales,
+					defaultLocale: context.defaultLocale,
+					revalidateReason: isOnDemandRevalidate ? "on-demand" : "stale"
+				});
+				assertPages404DoesNotReturnNotFound(errorPage, staticResult);
+				if (staticResult?.redirect) {
+					applyDevPagesCacheHeaders(res, isOnDemandRevalidate ? "REVALIDATED" : "HIT", NEVER_CACHE_CONTROL);
+					writeGsspRedirect(res, staticResult.redirect, false, { pageProps: errorProps }, {
+						basePath: context.basePath,
+						method: "getStaticProps",
+						routeUrl: url
+					});
+					return;
+				}
+				if (staticResult?.props !== void 0) {
+					const staticProps = await Promise.resolve(staticResult.props);
+					isSerializableProps(errorPage, "getStaticProps", staticProps);
+					errorProps = mergePagesDataProps(errorProps, staticProps);
+				}
+				if (staticResult) resolvePagesRevalidateSeconds(staticResult, errorPage);
+				applyDevPagesCacheHeaders(res, isOnDemandRevalidate ? "REVALIDATED" : "HIT");
+			}
 			let renderProps;
 			if (AppComponent && hasPagesGetInitialProps(AppComponent)) {
 				const appInitialProps = await loadPagesGetInitialProps(AppComponent, {
@@ -1173,7 +1001,11 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 					}
 				});
 				if (res.headersSent || res.writableEnded) return;
-				renderProps = appInitialProps ?? {};
+				const appRenderProps = appInitialProps ?? {};
+				renderProps = Object.hasOwn(appRenderProps, "pageProps") ? {
+					...appRenderProps,
+					pageProps: mergePagesDataProps(appRenderProps.pageProps, errorProps)
+				} : appRenderProps;
 			} else renderProps = { pageProps: errorProps };
 			let DocumentComponent = null;
 			const docPathErr = path.join(pagesDir, "_document");
@@ -1257,8 +1089,9 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 				res.end(transformedHtml);
 			}
 			return;
-		} catch {
+		} catch (error) {
 			if (res.headersSent || res.writableEnded) return;
+			if (errorAssetPath || candidateLoaded) throw error;
 			continue;
 		} finally {
 			if (typeof errorRouterShim?.setSSRContext === "function") errorRouterShim.setSSRContext(null);