vinext 0.1.1 → 0.1.3

package/dist/server/dev-server.js

@@ -2,10 +2,14 @@ import { createRequestContext, runWithRequestContext } from "../shims/unified-re
 import { createValidFileMatcher, findFileWithExtensions } 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 { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { importModule, reportRequestError } from "./instrumentation.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
+import { isUnknownRecord } from "../utils/record.js";
 import { _runWithCacheState } from "../shims/cache.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 { ensureFetchPatch, runWithFetchCache } from "../shims/fetch-cache.js";
 import { runWithPrivateCache } from "../shims/cache-runtime.js";
@@ -25,7 +29,8 @@ import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
 import { isSerializableProps } from "./pages-serializable-props.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
 import { callDocumentGetInitialProps } from "./document-initial-head.js";
-import { loadPagesGetInitialProps } from "./pages-get-initial-props.js";
+import { hasPagesGetInitialProps, loadDevAppInitialProps, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import path from "node:path";
 import React from "react";
 import { renderToReadableStream } from "react-dom/server.edge";
@@ -57,16 +62,23 @@ async function renderIsrPassToStringAsync(element) {
 * (`buildPagesRedirectResponse`) and Next.js's `render.tsx` `__N_REDIRECT`
 * handling. See AGENTS.md "dev and prod server parity".
 */
-function writeGsspRedirect(res, redirect, isDataReq) {
+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 (isDataReq) {
-		res.writeHead(200, { "Content-Type": "application/json" });
-		res.end(JSON.stringify({ pageProps: {
-			__N_REDIRECT: dest,
-			__N_REDIRECT_STATUS: status
-		} }));
+		const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
+		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
+			}
+		}));
 		return;
 	}
 	res.writeHead(status, { Location: dest });
@@ -184,12 +196,12 @@ 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) {
+function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatcher, basePath = "", trailingSlash = false, hasMiddleware = false, hasRewrites = false, clientTraceMetadata, htmlLimitedBots) {
 	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")]);
 	_alsRegistration.catch(() => {});
-	return async (req, res, url, statusCode, isDataReq = false) => {
+	return async (req, res, url, statusCode, isDataReq = false, originalUrl = url) => {
 		const _reqStart = now();
 		let _compileEnd;
 		let _renderEnd;
@@ -228,7 +240,10 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 		const match = matchRoute(localeStrippedUrl, routes);
 		if (!match) {
 			if (isDataReq) {
-				res.writeHead(404, { "Content-Type": "application/json" });
+				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("{}");
 				return;
 			}
@@ -236,6 +251,11 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 			return;
 		}
 		const { route, params } = match;
+		req.url = originalUrl;
+		const parsedResolvedUrl = new URL(localeStrippedUrl, "http://vinext.local");
+		const originalRequestSearch = new URL(originalUrl, "http://vinext.local").search;
+		const gsspResolvedUrl = parsedResolvedUrl.pathname + originalRequestSearch;
+		const requestAsPath = isDataReq ? gsspResolvedUrl : originalUrl;
 		const userFacingParams = route.isDynamic ? params : null;
 		const query = mergeRouteParamsIntoQuery(parseQueryString(url), params);
 		return runWithRequestContext(createRequestContext(), async () => {
@@ -269,7 +289,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				if (typeof routerShim.setSSRContext === "function") routerShim.setSSRContext({
 					pathname: patternToNextFormat(route.pattern),
 					query,
-					asPath: url,
+					asPath: requestAsPath,
 					navigationIsReady,
 					nextData: pagesNextData,
 					locale: locale ?? currentDefaultLocale,
@@ -303,8 +323,10 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					}
 				}
 				let pageProps = {};
+				let renderProps = { pageProps };
 				let isrRevalidateSeconds = null;
 				let isFallbackRender = false;
+				let shouldPersistFallbackData = false;
 				if (typeof pageModule.getStaticPaths === "function" && route.isDynamic) {
 					const pathsResult = await pageModule.getStaticPaths({
 						locales: i18nConfig?.locales ?? [],
@@ -325,19 +347,25 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					});
 					if (fallback === false && !isValidPath) {
 						if (isDataReq) {
-							res.writeHead(404, { "Content-Type": "application/json" });
+							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("{}");
 							return;
 						}
 						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext, matcher);
 						return;
 					}
-					if (fallback === true && !isValidPath && !isDataReq) {
-						isFallbackRender = true;
-						if (typeof routerShim.setSSRContext === "function") routerShim.setSSRContext({
+					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) {
+						isFallbackRender = (await isrGet(pagesIsrCacheKey(url.split("?")[0])))?.value.value?.kind !== "PAGES";
+						if (isFallbackRender && typeof routerShim.setSSRContext === "function") routerShim.setSSRContext({
 							pathname: patternToNextFormat(route.pattern),
 							query,
-							asPath: url,
+							asPath: requestAsPath,
 							navigationIsReady: false,
 							locale: locale ?? currentDefaultLocale,
 							locales: i18nConfig?.locales,
@@ -346,30 +374,79 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 							isFallback: true
 						});
 					}
+					shouldPersistFallbackData = fallback === true && !isValidPath && isDataReq;
 				}
 				const gsspExtraHeaders = {};
+				const hasAppGetInitialProps = hasPagesGetInitialProps(AppComponent);
+				async function loadAppInitialProps() {
+					if (!hasAppGetInitialProps) return false;
+					const appResult = await loadDevAppInitialProps({
+						appComponent: AppComponent,
+						appTree: (appTreeProps) => {
+							const appTree = React.createElement(AppComponent, {
+								...appTreeProps,
+								Component: PageComponent,
+								pageProps: appTreeProps.pageProps,
+								router: routerShim.default
+							});
+							return typeof routerShim.wrapWithRouterContext === "function" ? routerShim.wrapWithRouterContext(appTree) : appTree;
+						},
+						component: PageComponent,
+						req,
+						res,
+						pathname: patternToNextFormat(route.pattern),
+						query,
+						asPath: requestAsPath,
+						locale: locale ?? currentDefaultLocale,
+						locales: i18nConfig?.locales,
+						defaultLocale: currentDefaultLocale
+					});
+					if (appResult.kind === "response-sent") return true;
+					if (appResult.kind === "render") {
+						pageProps = appResult.pageProps;
+						renderProps = appResult.renderProps;
+					}
+					return false;
+				}
 				if (typeof pageModule.getServerSideProps === "function" && !isFallbackRender) {
+					if (await loadAppInitialProps()) return;
+					renderProps = {
+						...renderProps,
+						__N_SSP: true
+					};
 					const headersBeforeGSSP = new Set(Object.keys(res.getHeaders()));
 					const context = {
 						params: userFacingParams,
 						req,
 						res,
 						query,
-						resolvedUrl: localeStrippedUrl,
+						resolvedUrl: gsspResolvedUrl,
 						locale: locale ?? currentDefaultLocale,
 						locales: i18nConfig?.locales,
 						defaultLocale: currentDefaultLocale
 					};
 					const result = await pageModule.getServerSideProps(context);
 					if (res.writableEnded) return;
-					if (result && "props" in result) pageProps = await Promise.resolve(result.props);
+					if (result && "props" in result) {
+						pageProps = {
+							...pageProps,
+							...await Promise.resolve(result.props)
+						};
+						renderProps = {
+							...renderProps,
+							pageProps
+						};
+					}
 					if (result && "redirect" in result) {
-						writeGsspRedirect(res, result.redirect, isDataReq);
+						writeGsspRedirect(res, result.redirect, isDataReq, renderProps);
 						return;
 					}
 					if (result && "notFound" in result && result.notFound) {
 						if (isDataReq) {
-							res.writeHead(404, { "Content-Type": "application/json" });
+							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("{}");
 							return;
 						}
@@ -385,7 +462,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						if (Array.isArray(val)) gsspExtraHeaders[key] = val.map(String);
 						else gsspExtraHeaders[key] = String(val);
 					}
-					if (!Object.keys(gsspExtraHeaders).some((k) => k.toLowerCase() === "cache-control")) gsspExtraHeaders["Cache-Control"] = "private, no-cache, no-store, max-age=0, must-revalidate";
+					if (!Object.keys(gsspExtraHeaders).some((k) => k.toLowerCase() === "cache-control")) gsspExtraHeaders["Cache-Control"] = NEVER_CACHE_CONTROL;
 				}
 				const responseHeaders = typeof res.getHeaders === "function" ? res.getHeaders() : void 0;
 				const scriptNonce = getScriptNonceFromNodeHeaderSources(req.headers, responseHeaders);
@@ -402,26 +479,102 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					const cacheKey = pagesIsrCacheKey(url.split("?")[0]);
 					const cached = await isrGet(cacheKey);
 					const isOnDemandRevalidate = isOnDemandRevalidateRequest(req.headers[PRERENDER_REVALIDATE_HEADER]);
-					if (!isOnDemandRevalidate && cached && !cached.isStale && cached.value.value?.kind === "PAGES" && !scriptNonce && !isDataReq) {
+					if (!isOnDemandRevalidate && cached && !cached.isStale && cached.value.value?.kind === "PAGES" && !cached.value.value.generatedFromDataRequest && !scriptNonce && !isDataReq) {
 						const cachedHtml = cached.value.value.html;
 						const transformedHtml = await server.transformIndexHtml(url, cachedHtml);
-						const revalidateSecs = getRevalidateDuration(cacheKey) ?? 60;
+						const { cacheControl: hitCacheControl } = decideIsr({
+							cacheState: "HIT",
+							kind: "dev",
+							revalidateSeconds: getRevalidateDuration(cacheKey) ?? 60
+						});
 						const hitHeaders = {
 							"Content-Type": "text/html",
 							...buildCacheStateHeaders("HIT"),
-							"Cache-Control": `s-maxage=${revalidateSecs}, stale-while-revalidate`
+							"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" && !scriptNonce && !isDataReq) {
+					if (!isOnDemandRevalidate && cached && cached.isStale && cached.value.value?.kind === "PAGES" && !cached.value.value.generatedFromDataRequest && !scriptNonce && !isDataReq) {
 						const cachedHtml = cached.value.value.html;
 						const transformedHtml = await server.transformIndexHtml(url, cachedHtml);
 						triggerBackgroundRegeneration(cacheKey, async () => {
-							return runWithRequestContext(createRequestContext({ executionContext: null }), 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: {
+											pathname: patternToNextFormat(route.pattern),
+											query,
+											asPath: requestAsPath
+										},
+										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,
@@ -430,13 +583,20 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 									revalidateReason: "stale"
 								});
 								if (freshResult && "props" in freshResult) {
-									const revalidate = typeof freshResult.revalidate === "number" ? freshResult.revalidate : 0;
+									const revalidate = typeof freshResult.revalidate === "number" ? freshResult.revalidate : cached.value.cacheControl?.revalidate ?? 0;
 									if (revalidate > 0) {
-										const freshProps = freshResult.props;
+										freshPageProps = {
+											...freshPageProps,
+											...freshResult.props
+										};
+										freshRenderProps = {
+											...freshRenderProps,
+											pageProps: freshPageProps
+										};
 										if (typeof routerShim.setSSRContext === "function") routerShim.setSSRContext({
 											pathname: patternToNextFormat(route.pattern),
 											query,
-											asPath: url,
+											asPath: requestAsPath,
 											navigationIsReady,
 											locale: locale ?? currentDefaultLocale,
 											locales: i18nConfig?.locales,
@@ -454,15 +614,12 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 												hostname: req.headers.host?.split(":", 1)[0]
 											});
 										}
-										let RegenApp = null;
-										const appPath = path.join(pagesDir, "_app");
-										if (findFileWithExtensions(appPath, matcher)) try {
-											RegenApp = (await runner.import(appPath)).default ?? null;
-										} catch {}
 										let el = RegenApp ? React.createElement(RegenApp, {
+											...freshRenderProps,
 											Component: pageModule.default,
-											pageProps: freshProps
-										}) : React.createElement(pageModule.default, freshProps);
+											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;
@@ -478,7 +635,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 											}
 										};
 										await isrSet(cacheKey, buildPagesCacheValue(`<!DOCTYPE html><html><head></head><body><div id="__next">${freshBody}</div>${`<script>window.__NEXT_DATA__ = ${safeJsonStringify({
-											props: { pageProps: freshProps },
+											props: freshRenderProps,
 											page: patternToNextFormat(route.pattern),
 											query: params,
 											buildId: process.env.__VINEXT_BUILD_ID,
@@ -488,7 +645,7 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 											defaultLocale: currentDefaultLocale,
 											domainLocales,
 											...freshPagesNextData
-										})}${i18nConfig ? `;window.__VINEXT_LOCALE__=${safeJsonStringify(locale ?? currentDefaultLocale)};window.__VINEXT_LOCALES__=${safeJsonStringify(i18nConfig.locales)};window.__VINEXT_DEFAULT_LOCALE__=${safeJsonStringify(currentDefaultLocale)}` : ""}<\/script>`}\n  ${cachedHtml.match(/<script type="module">[\s\S]*?<\/script>/)?.[0] ?? ""}</body></html>`, freshProps), revalidate);
+										})}${i18nConfig ? `;window.__VINEXT_LOCALE__=${safeJsonStringify(locale ?? currentDefaultLocale)};window.__VINEXT_LOCALES__=${safeJsonStringify(i18nConfig.locales)};window.__VINEXT_DEFAULT_LOCALE__=${safeJsonStringify(currentDefaultLocale)}` : ""}<\/script>`}\n  ${cachedHtml.match(/<script type="module">[\s\S]*?<\/script>/)?.[0] ?? ""}</body></html>`, freshRenderProps), revalidate);
 										setRevalidateDuration(cacheKey, revalidate);
 									}
 								}
@@ -498,11 +655,15 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 							routePath: route.pattern,
 							routeType: "render"
 						});
-						const revalidateSecs = getRevalidateDuration(cacheKey) ?? 60;
+						const { cacheControl: staleCacheControl } = decideIsr({
+							cacheState: "STALE",
+							kind: "dev",
+							revalidateSeconds: getRevalidateDuration(cacheKey) ?? 60
+						});
 						const staleHeaders = {
 							"Content-Type": "text/html",
 							...buildCacheStateHeaders("STALE"),
-							"Cache-Control": `s-maxage=${revalidateSecs}, stale-while-revalidate`
+							"Cache-Control": staleCacheControl
 						};
 						if (earlyFontLinkHeader) staleHeaders["Link"] = earlyFontLinkHeader;
 						res.writeHead(200, staleHeaders);
@@ -516,15 +677,33 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 						defaultLocale: currentDefaultLocale,
 						revalidateReason: isOnDemandRevalidate ? "on-demand" : "stale"
 					};
-					const result = await pageModule.getStaticProps(context);
-					if (result && "props" in result) pageProps = result.props;
+					const generatedPageData = !isOnDemandRevalidate && 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 (result && "props" in result) {
+						pageProps = {
+							...pageProps,
+							...await Promise.resolve(result.props)
+						};
+						renderProps = {
+							...renderProps,
+							pageProps
+						};
+					}
 					if (result && "redirect" in result) {
-						writeGsspRedirect(res, result.redirect, isDataReq);
+						writeGsspRedirect(res, result.redirect, isDataReq, renderProps);
 						return;
 					}
 					if (result && "notFound" in result && result.notFound) {
 						if (isDataReq) {
-							res.writeHead(404, { "Content-Type": "application/json" });
+							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("{}");
 							return;
 						}
@@ -533,29 +712,57 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 					}
 					if (result && "props" in result) isSerializableProps(patternToNextFormat(route.pattern), "getStaticProps", pageProps);
 					if (typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
+					else if (cached?.value.value?.kind === "PAGES" && cached.value.value.generatedFromDataRequest) isrRevalidateSeconds = cached.value.cacheControl?.revalidate ?? 31536e3;
 				}
-				if (typeof pageModule.getServerSideProps !== "function" && typeof pageModule.getStaticProps !== "function") {
+				if (typeof pageModule.getServerSideProps !== "function" && typeof pageModule.getStaticProps !== "function" && hasAppGetInitialProps) {
+					if (await loadAppInitialProps()) return;
+				}
+				if (typeof pageModule.getServerSideProps !== "function" && typeof pageModule.getStaticProps !== "function" && !hasAppGetInitialProps) {
 					const initialProps = await loadPagesGetInitialProps(PageComponent, {
 						req,
 						res,
 						pathname: patternToNextFormat(route.pattern),
 						query,
-						asPath: url,
+						asPath: requestAsPath,
 						locale: locale ?? currentDefaultLocale,
 						locales: i18nConfig?.locales,
 						defaultLocale: currentDefaultLocale
 					});
 					if (res.headersSent || res.writableEnded) return;
-					if (initialProps) pageProps = {
-						...pageProps,
-						...initialProps
-					};
+					if (initialProps) {
+						pageProps = {
+							...pageProps,
+							...initialProps
+						};
+						renderProps = {
+							...renderProps,
+							pageProps
+						};
+					}
 				}
 				if (isDataReq) {
+					if (shouldPersistFallbackData) {
+						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 (gsspExtraHeaders) for (const [k, v] of Object.entries(gsspExtraHeaders)) dataHeaders[k] = v;
+					const dataRoutePattern = patternToNextFormat(route.pattern);
+					if (dataRoutePattern !== "/_error" && dataRoutePattern !== "/500") {
+						const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
+						if (deploymentId) dataHeaders[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
+					}
 					res.writeHead(statusCode ?? 200, dataHeaders);
-					res.end(JSON.stringify({ pageProps }));
+					res.end(JSON.stringify(renderProps));
 					_renderEnd = now();
 					return;
 				}
@@ -563,8 +770,10 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 				let element;
 				const wrapWithRouterContext = routerShim.wrapWithRouterContext;
 				if (AppComponent) element = createElement(AppComponent, {
+					...renderProps,
 					Component: PageComponent,
-					pageProps
+					pageProps: renderProps.pageProps,
+					router: routerShim.default
 				});
 				else element = createElement(PageComponent, pageProps);
 				if (wrapWithRouterContext) element = wrapWithRouterContext(element);
@@ -616,11 +825,14 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 import "vinext/instrumentation-client";
 import React from "react";
 import { hydrateRoot } from "react-dom/client";
-import { installPagesRouterRuntime } from "vinext/pages-router-runtime";
-import { wrapWithRouterContext } from "next/router";
+import Router, { wrapWithRouterContext } from "next/router";
 
 const nextData = window.__NEXT_DATA__;
-const { pageProps } = nextData.props;
+const props = nextData.props && typeof nextData.props === "object" ? nextData.props : {};
+const rawPageProps = props.pageProps;
+const pageProps = rawPageProps && typeof rawPageProps === "object" ? rawPageProps : {};
+window.__VINEXT_PAGE_LOADERS__ = { [nextData.page]: () => import("${pageModuleUrl}") };
+window.__VINEXT_APP_LOADER__ = ${appModuleUrl ? `() => import("${appModuleUrl}")` : "undefined"};
 
 async function hydrate() {
   let hydrateRootOptions;
@@ -642,24 +854,34 @@ async function hydrate() {
   const appModule = await import("${appModuleUrl}");
   const AppComponent = appModule.default;
   window.__VINEXT_APP__ = AppComponent;
-  element = React.createElement(AppComponent, { Component: PageComponent, pageProps });
+  element = React.createElement(AppComponent, {
+    ...props,
+    Component: PageComponent,
+    pageProps: rawPageProps,
+    router: Router,
+  });
   ` : `
   element = React.createElement(PageComponent, pageProps);
   `}
-  element = wrapWithRouterContext(element);
+  let resolveHydrationCommit;
+  const hydrationCommitted = new Promise((resolve) => { resolveHydrationCommit = resolve; });
+  element = wrapWithRouterContext(element, resolveHydrationCommit);
   const root = hydrateRoot(document.getElementById("__next"), element, hydrateRootOptions);
   window.__VINEXT_ROOT__ = root;
-  installPagesRouterRuntime();
+  await hydrationCommitted;
   const hydratedAt = performance.now();
   window.__VINEXT_HYDRATED_AT = hydratedAt;
   window.__NEXT_HYDRATED = true;
   window.__NEXT_HYDRATED_AT = hydratedAt;
   window.__NEXT_HYDRATED_CB?.();
+  if (nextData.isFallback) {
+    await Router.replace(window.location.pathname + window.location.search + window.location.hash, undefined, { _h: 1, scroll: false });
+  }
 }
 hydrate();
 <\/script>`;
 				const nextDataScript = createInlineScriptTag(`window.__NEXT_DATA__ = ${safeJsonStringify({
-					props: { pageProps },
+					props: renderProps,
 					page: patternToNextFormat(route.pattern),
 					query: params,
 					buildId: process.env.__VINEXT_BUILD_ID,
@@ -677,9 +899,9 @@ hydrate();
 				} catch {}
 				const allScripts = `${nextDataScript}\n  ${createInlineScriptTag(`window.__VINEXT_PAGE_PATTERNS__=${safeJsonStringify(pagePatterns)}`, scriptNonce)}\n  ${hydrationScript}`;
 				const extraHeaders = { ...gsspExtraHeaders };
-				if (isrRevalidateSeconds) if (scriptNonce) extraHeaders["Cache-Control"] = "no-store, must-revalidate";
+				if (isrRevalidateSeconds) if (scriptNonce) extraHeaders["Cache-Control"] = NO_STORE_CACHE_CONTROL;
 				else {
-					extraHeaders["Cache-Control"] = `s-maxage=${isrRevalidateSeconds}, stale-while-revalidate`;
+					extraHeaders["Cache-Control"] = buildMissIsrCacheControl(isrRevalidateSeconds);
 					Object.assign(extraHeaders, buildCacheStateHeaders("MISS"));
 				}
 				if (allFontPreloads.length > 0) extraHeaders["Link"] = allFontPreloads.map((p) => `<${p.href}>; rel=preload; as=font; type=${p.type}; crossorigin`).join(", ");
@@ -695,7 +917,7 @@ hydrate();
 					documentContext: {
 						pathname: patternToNextFormat(route.pattern),
 						query,
-						asPath: url
+						asPath: requestAsPath
 					},
 					enhancePageElement: (renderPageOpts) => {
 						let FinalApp = AppComponent;
@@ -704,6 +926,7 @@ hydrate();
 						if (renderPageOpts && typeof renderPageOpts.enhanceComponent === "function") FinalComp = renderPageOpts.enhanceComponent(FinalComp);
 						let enhancedElement;
 						if (FinalApp) enhancedElement = createElement(FinalApp, {
+							...renderProps,
 							Component: FinalComp,
 							pageProps
 						});
@@ -722,6 +945,7 @@ hydrate();
 				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);
@@ -736,7 +960,7 @@ hydrate();
 				reportRequestError(e instanceof Error ? e : new Error(String(e)), {
 					path: url,
 					method: req.method ?? "GET",
-					headers: Object.fromEntries(Object.entries(req.headers).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v ?? "")]))
+					headers: Object.fromEntries(Object.entries(req.headers).filter(([k]) => !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v ?? "")]))
 				}, {
 					routerKind: "Pages Router",
 					routePath: route.pattern,

package/dist/server/headers.d.ts

@@ -60,6 +60,13 @@ declare const RSC_ACTION_HEADER = "x-rsc-action";
 declare const NEXT_ACTION_HEADER = "next-action";
 /** Next.js action-not-found indicator (value "1"). */
 declare const NEXTJS_ACTION_NOT_FOUND_HEADER = "x-nextjs-action-not-found";
+/**
+ * Deployment ID header used by the Pages Router for deployment-skew
+ * protection. Set on every `/_next/data/` response so the client can detect
+ * when a new deployment has been rolled out and trigger a hard navigation.
+ * Mirrors `NEXT_NAV_DEPLOYMENT_ID_HEADER` from Next.js `lib/constants.ts`.
+ */
+declare const NEXTJS_DEPLOYMENT_ID_HEADER = "x-nextjs-deployment-id";
 /** Forwarded action marker — set when a request has already been forwarded between workers. */
 declare const ACTION_FORWARDED_HEADER = "x-action-forwarded";
 /** Indicates revalidation occurred — value is JSON kind (1 = path/tag, 2 = dynamic-only). */
@@ -100,4 +107,4 @@ declare const INTERNAL_HEADERS: string[];
 /** Vinext-only internal headers stripped alongside Next.js protocol internals. */
 declare const VINEXT_INTERNAL_HEADERS: string[];
 //#endregion
-export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };
+export { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER, FLIGHT_HEADERS, INTERNAL_HEADERS, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_NEXT_HEADER, MIDDLEWARE_OVERRIDE_HEADERS, MIDDLEWARE_REQUEST_HEADER_PREFIX, MIDDLEWARE_REWRITE_HEADER, MIDDLEWARE_SET_COOKIE_HEADER, NEXTJS_ACTION_NOT_FOUND_HEADER, NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, NEXT_ACTION_HEADER, NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, NEXT_ROUTER_STATE_TREE_HEADER, NEXT_URL_HEADER, RSC_ACTION_HEADER, RSC_HEADER, VINEXT_CACHE_HEADER, VINEXT_CLIENT_REUSE_MANIFEST_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_INTERCEPTION_CONTEXT_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HEADER, VINEXT_RSC_MARKER_HEADER, VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_STATIC_FILE_HEADER, VINEXT_TIMING_HEADER };