vinext 0.1.2 → 0.1.3

package/dist/server/pages-asset-tags.d.ts

@@ -30,7 +30,7 @@ declare function getManifestFilesForModule(manifest: Record<string, string[]> |
  * asset URLs. SSR-manifest values are base-anchored; re-anchor under any
  * configured `assetPrefix` (default `""` keeps the legacy `"/" + file`).
  */
-declare function resolveClientModuleUrl(manifest: Record<string, string[]> | null | undefined, moduleId: string | null | undefined, basePath?: string, assetPrefix?: string): string | undefined;
+declare function resolveClientModuleUrl(manifest: Record<string, string[]> | null | undefined, moduleId: string | null | undefined, basePath?: string, assetPrefix?: string, _deploymentId?: string): string | undefined;
 type CollectAssetTagsOptions = {
   /**
    * SSR manifest mapping module file paths to their associated asset list.
@@ -57,6 +57,7 @@ type CollectAssetTagsOptions = {
    */
   basePath?: string;
   assetPrefix?: string;
+  deploymentId?: string;
 };
 /**
  * Build the HTML `<link>` and `<script>` tag string for the SSR response.

package/dist/server/pages-asset-tags.js

@@ -1,3 +1,4 @@
+import { appendDeploymentIdQuery } from "../utils/deployment-id.js";
 import { createNonceAttribute } from "./html.js";
 import { assetServingUrlFromBaseAnchored } from "../utils/manifest-paths.js";
 //#region src/server/pages-asset-tags.ts
@@ -41,7 +42,7 @@ function getManifestFilesForModule(manifest, moduleId) {
 * asset URLs. SSR-manifest values are base-anchored; re-anchor under any
 * configured `assetPrefix` (default `""` keeps the legacy `"/" + file`).
 */
-function resolveClientModuleUrl(manifest, moduleId, basePath = "", assetPrefix = "") {
+function resolveClientModuleUrl(manifest, moduleId, basePath = "", assetPrefix = "", _deploymentId) {
 	const files = getManifestFilesForModule(resolveSsrManifest(manifest), moduleId);
 	if (!files) return void 0;
 	for (let i = 0; i < files.length; i++) {
@@ -72,7 +73,10 @@ function collectAssetTags(options) {
 	const deferAttr = options.disableOptimizedLoading ? "" : " defer";
 	const basePath = options.basePath ?? "";
 	const assetPrefix = options.assetPrefix ?? "";
-	const href = (value) => assetServingUrlFromBaseAnchored(value, basePath, assetPrefix);
+	const href = (value) => {
+		const url = assetServingUrlFromBaseAnchored(value, basePath, assetPrefix);
+		return value.endsWith(".js") ? url : appendDeploymentIdQuery(url, options.deploymentId);
+	};
 	const lazyChunks = typeof globalThis !== "undefined" && globalThis.__VINEXT_LAZY_CHUNKS__ || null;
 	const lazySet = lazyChunks && lazyChunks.length > 0 ? new Set(lazyChunks) : null;
 	if (typeof globalThis !== "undefined" && globalThis.__VINEXT_CLIENT_ENTRY__) {

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

@@ -60,6 +60,13 @@ declare function parseNextDataPathname(pathname: string, buildId: string): NextD
  *   { pageProps: {...}, /* optional locale data, redirect markers, etc. *\/ }
  */
 declare function buildNextDataJsonResponse(pageProps: Record<string, unknown>, safeJsonStringify: (value: unknown) => string, init?: ResponseInit): Response;
+/**
+ * Build a `_next/data` JSON response from the full Pages props object returned
+ * through `_app.getInitialProps`. Next.js serializes the same outer props
+ * object that would be passed to `<App />`, so custom app-level props remain
+ * siblings of `pageProps` in the data envelope.
+ */
+declare function buildNextDataPropsJsonResponse(props: Record<string, unknown>, safeJsonStringify: (value: unknown) => string, init?: ResponseInit): Response;
 /**
  * Build the 404 response Next.js returns for an unknown `_next/data` page.
  * Next.js renders this as a normal 404 page, but the body shape that clients
@@ -111,4 +118,4 @@ type NormalizePagesDataRequestResult = {
  */
 declare function normalizePagesDataRequest(request: Request, buildId: string | null): NormalizePagesDataRequestResult;
 //#endregion
-export { buildNextDataJsonResponse, buildNextDataNotFoundResponse, isNextDataPathname, normalizePagesDataRequest, parseNextDataPathname };
+export { buildNextDataJsonResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, isNextDataPathname, normalizePagesDataRequest, parseNextDataPathname };

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

@@ -66,7 +66,16 @@ function parseNextDataPathname(pathname, buildId) {
 *   { pageProps: {...}, /* optional locale data, redirect markers, etc. *\/ }
 */
 function buildNextDataJsonResponse(pageProps, safeJsonStringify, init) {
-	const body = safeJsonStringify({ pageProps });
+	return buildNextDataPropsJsonResponse({ pageProps }, safeJsonStringify, init);
+}
+/**
+* Build a `_next/data` JSON response from the full Pages props object returned
+* through `_app.getInitialProps`. Next.js serializes the same outer props
+* object that would be passed to `<App />`, so custom app-level props remain
+* siblings of `pageProps` in the data envelope.
+*/
+function buildNextDataPropsJsonResponse(props, safeJsonStringify, init) {
+	const body = safeJsonStringify(props);
 	return new Response(body, {
 		status: init?.status ?? 200,
 		statusText: init?.statusText,
@@ -142,4 +151,4 @@ function normalizePagesDataRequest(request, buildId) {
 	};
 }
 //#endregion
-export { buildNextDataJsonResponse, buildNextDataNotFoundResponse, isNextDataPathname, normalizePagesDataRequest, parseNextDataPathname };
+export { buildNextDataJsonResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, isNextDataPathname, normalizePagesDataRequest, parseNextDataPathname };

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

@@ -3,6 +3,48 @@ type PagesGetInitialPropsContext = {
   req?: unknown;
   res?: unknown;
   err?: unknown;
+  pathname?: string;
+  query?: Record<string, unknown>;
+  asPath?: string;
+  locale?: string;
+  locales?: string[];
+  defaultLocale?: string;
+} & Record<string, unknown>;
+declare function hasPagesGetInitialProps(component: unknown): boolean;
+declare function isResponseSent(res: unknown): boolean;
+declare function loadPagesGetInitialProps(component: unknown, context: PagesGetInitialPropsContext): Promise<Record<string, unknown> | null>;
+/**
+ * Decision returned by {@link loadDevAppInitialProps}.
+ *
+ * - `skip`: the custom `App` has no `getInitialProps`; the caller renders with
+ *   its existing props unchanged.
+ * - `response-sent`: `_app.getInitialProps` ended the response itself (wrote
+ *   headers / body); the caller must stop and not render.
+ * - `render`: the caller should render with the returned `pageProps` /
+ *   `renderProps`.
+ */
+type DevAppInitialPropsResult = {
+  kind: "skip";
+} | {
+  kind: "response-sent";
+} | {
+  kind: "render";
+  pageProps: Record<string, unknown>;
+  renderProps: Record<string, unknown> & {
+    pageProps: unknown;
+  };
+};
+type DevAppInitialPropsContext = {
+  appComponent: unknown;
+  /**
+   * Builds the `AppTree` element passed to `getInitialProps`. Injected so this
+   * module stays free of React; the dev SSR handler supplies the real
+   * `React.createElement` closure.
+   */
+  appTree: (appTreeProps: Record<string, unknown>) => unknown;
+  component: unknown;
+  req: unknown;
+  res: unknown;
   pathname: string;
   query: Record<string, unknown>;
   asPath: string;
@@ -10,8 +52,16 @@ type PagesGetInitialPropsContext = {
   locales?: string[];
   defaultLocale?: string;
 };
-declare function hasPagesGetInitialProps(component: unknown): boolean;
-declare function isResponseSent(res: unknown): boolean;
-declare function loadPagesGetInitialProps(component: unknown, context: PagesGetInitialPropsContext): Promise<Record<string, unknown> | null>;
+/**
+ * Run the custom `App`'s `getInitialProps` for the dev SSR render path and
+ * return a decision the caller applies.
+ *
+ * This is the dev-server counterpart to the production page-data resolver's
+ * app-initial-props loading. It is invoked lazily — only when a request is
+ * actually going to render (cache miss / on-demand revalidation), never on an
+ * ISR cache HIT/STALE that serves cached HTML verbatim — so userland `App`
+ * data code does not run on the cache hot path.
+ */
+declare function loadDevAppInitialProps(ctx: DevAppInitialPropsContext): Promise<DevAppInitialPropsResult>;
 //#endregion
-export { hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps };
+export { DevAppInitialPropsContext, DevAppInitialPropsResult, hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };

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

@@ -46,5 +46,47 @@ async function loadPagesGetInitialProps(component, context) {
 	if (!isPropsObject(result)) throw new Error(`"${getDisplayName(component)}.getInitialProps()" should resolve to an object. But found "${describeInitialPropsValue(result)}" instead.`);
 	return result;
 }
+/**
+* Run the custom `App`'s `getInitialProps` for the dev SSR render path and
+* return a decision the caller applies.
+*
+* This is the dev-server counterpart to the production page-data resolver's
+* app-initial-props loading. It is invoked lazily — only when a request is
+* actually going to render (cache miss / on-demand revalidation), never on an
+* ISR cache HIT/STALE that serves cached HTML verbatim — so userland `App`
+* data code does not run on the cache hot path.
+*/
+async function loadDevAppInitialProps(ctx) {
+	if (!hasPagesGetInitialProps(ctx.appComponent)) return { kind: "skip" };
+	const initialProps = await loadPagesGetInitialProps(ctx.appComponent, {
+		AppTree: ctx.appTree,
+		Component: ctx.component,
+		router: {
+			pathname: ctx.pathname,
+			query: ctx.query,
+			asPath: ctx.asPath
+		},
+		ctx: {
+			req: ctx.req,
+			res: ctx.res,
+			pathname: ctx.pathname,
+			query: ctx.query,
+			asPath: ctx.asPath,
+			locale: ctx.locale,
+			locales: ctx.locales,
+			defaultLocale: ctx.defaultLocale
+		}
+	});
+	if (isResponseSent(ctx.res)) return { kind: "response-sent" };
+	const initialPageProps = isPropsObject(initialProps) ? initialProps.pageProps : void 0;
+	return {
+		kind: "render",
+		pageProps: isPropsObject(initialPageProps) ? initialPageProps : {},
+		renderProps: isPropsObject(initialProps) ? {
+			...initialProps,
+			pageProps: initialPageProps
+		} : { pageProps: initialPageProps }
+	};
+}
 //#endregion
-export { hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps };
+export { hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };

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

@@ -1,4 +1,4 @@
-import { parseCookies } from "../config/config-matchers.js";
+import { parseCookieHeader } from "../utils/parse-cookie.js";
 import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
 import { PagesBodyParseError, getMediaType, isJsonMediaType } from "./pages-media-type.js";
 import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT } from "./pages-body-parser-config.js";
@@ -217,7 +217,7 @@ function createPagesReqRes(options) {
 		headers: headersObj,
 		query: options.query,
 		body: options.body,
-		cookies: parseCookies(options.request.headers.get("cookie"))
+		cookies: parseCookieHeader(options.request.headers.get("cookie"))
 	});
 	let resolveResponse;
 	let rejectResponse;

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

@@ -33,6 +33,9 @@ type PagesGsspContextResponse = {
   res: PagesMutableGsspResponse;
   responsePromise: Promise<Response>;
 };
+type PagesRenderProps = Record<string, unknown> & {
+  pageProps: unknown;
+};
 type PagesPageModule = {
   default?: unknown;
   getStaticPaths?: (context: {
@@ -82,9 +85,10 @@ type PagesPageModule = {
 type RenderPagesIsrHtmlOptions = {
   buildId: string | null;
   cachedHtml: string;
-  createPageElement: (pageProps: Record<string, unknown>) => ReactNode;
+  createPageElement: (props: Record<string, unknown>) => ReactNode;
   i18n: PagesI18nRenderContext;
   pageProps: Record<string, unknown>;
+  props?: Record<string, unknown>;
   params: Record<string, unknown>;
   renderIsrPassToStringAsync: (element: ReactNode) => Promise<string>;
   routePattern: string;
@@ -106,7 +110,8 @@ type ResolvePagesPageDataOptions = {
   isDataReq?: boolean;
   err?: unknown;
   createGsspReqRes: () => PagesGsspContextResponse;
-  createPageElement: (pageProps: Record<string, unknown>) => ReactNode;
+  createAppTree?: (props: Record<string, unknown>) => ReactNode;
+  createPageElement: (props: Record<string, unknown>) => ReactNode;
   fontLinkHeader: string;
   i18n: PagesI18nRenderContext;
   isrCacheKey: (router: string, pathname: string) => string;
@@ -145,10 +150,13 @@ type ResolvePagesPageDataOptions = {
    * Typically sourced from `process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID`.
    */
   deploymentId?: string;
+  htmlLimitedBots?: string;
   pageModule: PagesPageModule;
+  AppComponent?: unknown;
   params: Record<string, unknown>;
   query: Record<string, unknown>;
   asPath?: string;
+  resolvedUrl?: string;
   route: Pick<Route, "isDynamic">;
   routePattern: string;
   routeUrl: string;
@@ -192,6 +200,7 @@ type ResolvePagesPageDataRenderResult = {
   gsspRes: PagesGsspResponse | null;
   isrRevalidateSeconds: number | null;
   pageProps: Record<string, unknown>;
+  props: PagesRenderProps;
   /**
    * True when `getStaticPaths` returned `fallback: true` AND the requested path
    * is not in the pre-rendered list. The caller renders a loading shell with

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

@@ -1,12 +1,14 @@
 import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
+import { isUnknownRecord } from "../utils/record.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { decideIsr } from "./isr-decision.js";
 import { buildPagesCacheValue } from "./isr-cache.js";
 import { isSerializableProps } from "./pages-serializable-props.js";
 import { hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
-import { buildNextDataJsonResponse } from "./pages-data-route.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
+import { buildNextDataPropsJsonResponse } from "./pages-data-route.js";
 import { buildPagesNextDataScript, etagMatches, generatePagesETag, isPagesStreamingBot, requestsNoCache } from "./pages-page-response.js";
 //#region src/server/pages-page-data.ts
 function buildPagesDataNotFoundResponse(deploymentId) {
@@ -27,6 +29,65 @@ function buildPagesNotFoundResult(options) {
 function resolvePagesRedirectStatus(redirect) {
 	return redirect.statusCode != null ? redirect.statusCode : redirect.permanent ? 308 : 307;
 }
+function normalizePagesRenderProps(props) {
+	return {
+		...props,
+		pageProps: props.pageProps
+	};
+}
+/**
+* Load `_app.getInitialProps` and return the normalized render props and the
+* extracted `pageProps`. This is shared between the foreground render path and
+* the stale-while-revalidate background regeneration path so both produce the
+* same full props envelope (app-level props plus the page's `pageProps`).
+*
+* `getSharedReqRes` lets callers share the same mock req/res with other
+* data-fetching steps (e.g. `getServerSideProps`) when they run in the same
+* request context.
+*/
+async function loadPagesAppInitialRenderProps(options, getSharedReqRes) {
+	let pageProps = {};
+	let renderProps = { pageProps };
+	if (!hasPagesGetInitialProps(options.AppComponent)) return {
+		kind: "props",
+		pageProps,
+		renderProps
+	};
+	const { req, res, responsePromise } = getSharedReqRes();
+	const initialProps = await loadPagesGetInitialProps(options.AppComponent, {
+		AppTree: options.createAppTree ?? options.createPageElement,
+		Component: options.pageModule.default,
+		router: {
+			pathname: options.routePattern,
+			query: options.query,
+			asPath: options.asPath ?? options.routeUrl
+		},
+		ctx: {
+			req,
+			res,
+			err: options.err,
+			pathname: options.routePattern,
+			query: options.query,
+			asPath: options.asPath ?? options.routeUrl,
+			locale: options.i18n.locale,
+			locales: options.i18n.locales,
+			defaultLocale: options.i18n.defaultLocale
+		}
+	});
+	if (isResponseSent(res)) return {
+		kind: "response",
+		response: responsePromise
+	};
+	if (initialProps) {
+		renderProps = normalizePagesRenderProps(initialProps);
+		pageProps = isUnknownRecord(renderProps.pageProps) ? renderProps.pageProps : {};
+	}
+	return {
+		kind: "props",
+		pageProps,
+		renderProps
+	};
+}
 /**
 * Build the response for a `getServerSideProps` / `getStaticProps`
 * `{ redirect }` result.
@@ -48,14 +109,18 @@ function resolvePagesRedirectStatus(redirect) {
 * redirects (search `__N_REDIRECT`), consumed in
 * `packages/next/src/shared/lib/router/router.ts` (`pageProps.__N_REDIRECT`).
 */
-function buildPagesRedirectResponse(redirect, options) {
+function buildPagesRedirectResponse(redirect, options, props = { pageProps: {} }) {
 	const destination = options.sanitizeDestination(redirect.destination);
 	if (options.isDataReq) {
 		const init = { headers: {} };
 		if (options.deploymentId) init.headers[NEXTJS_DEPLOYMENT_ID_HEADER] = options.deploymentId;
-		return buildNextDataJsonResponse({
-			__N_REDIRECT: destination,
-			__N_REDIRECT_STATUS: resolvePagesRedirectStatus(redirect)
+		return buildNextDataPropsJsonResponse({
+			...props,
+			pageProps: {
+				...isUnknownRecord(props.pageProps) ? props.pageProps : {},
+				__N_REDIRECT: destination,
+				__N_REDIRECT_STATUS: resolvePagesRedirectStatus(redirect)
+			}
 		}, options.safeJsonStringify, init);
 	}
 	return new Response(null, {
@@ -145,11 +210,13 @@ function rewritePagesCachedHtml(cachedHtml, freshBody, nextDataScript) {
 	return "<!DOCTYPE html>\n<html>\n<head>\n</head>\n<body>\n  <div id=\"__next\">" + freshBody + "</div>\n  " + nextDataScript + "\n</body>\n</html>";
 }
 async function renderPagesIsrHtml(options) {
-	const freshBody = await options.renderIsrPassToStringAsync(options.createPageElement(options.pageProps));
+	const renderProps = options.props ?? { pageProps: options.pageProps };
+	const freshBody = await options.renderIsrPassToStringAsync(options.createPageElement(renderProps));
 	const nextDataScript = buildPagesNextDataScript({
 		buildId: options.buildId,
 		i18n: options.i18n,
 		pageProps: options.pageProps,
+		props: renderProps,
 		params: options.params,
 		routePattern: options.routePattern,
 		safeJsonStringify: options.safeJsonStringify,
@@ -161,6 +228,7 @@ async function renderPagesIsrHtml(options) {
 async function resolvePagesPageData(options) {
 	const userFacingParams = options.route.isDynamic ? options.params : null;
 	let isFallback = false;
+	let shouldPersistFallbackData = false;
 	if (typeof options.pageModule.getStaticPaths === "function" && options.route.isDynamic) {
 		const pathsResult = await options.pageModule.getStaticPaths({
 			locales: options.i18n.locales ?? [],
@@ -169,25 +237,62 @@ async function resolvePagesPageData(options) {
 		const fallback = pathsResult?.fallback ?? false;
 		const isValidPath = (pathsResult?.paths ?? []).some((pathEntry) => matchesPagesStaticPath(pathEntry, options.params, options.routeUrl));
 		if (fallback === false && !isValidPath) return buildPagesNotFoundResult(options);
-		if (fallback === true && !isValidPath && !options.isDataReq) isFallback = true;
+		const isBotRequest = !!options.userAgent && isBotUserAgent(options.userAgent, options.htmlLimitedBots);
+		if (fallback === true && !isValidPath && !options.isDataReq && !isBotRequest) isFallback = true;
+		shouldPersistFallbackData = fallback === true && !isValidPath && options.isDataReq === true;
 	}
 	let pageProps = {};
 	let gsspRes = null;
-	if (isFallback) return {
-		kind: "render",
-		gsspRes: null,
-		isrRevalidateSeconds: null,
-		pageProps,
-		isFallback: true
-	};
+	let sharedReqRes = null;
+	function getSharedReqRes() {
+		sharedReqRes ??= options.createGsspReqRes();
+		return sharedReqRes;
+	}
+	let renderProps = { pageProps };
+	async function loadForegroundAppInitialRenderProps() {
+		const result = await loadPagesAppInitialRenderProps(options, getSharedReqRes);
+		if (result.kind === "response") return {
+			kind: "response",
+			response: await result.response
+		};
+		renderProps = result.renderProps;
+		pageProps = result.pageProps;
+		return null;
+	}
+	if (isFallback) {
+		const pathname = options.routeUrl.split("?")[0];
+		if ((await options.isrGet(options.isrCacheKey("pages", pathname)))?.value.value?.kind !== "PAGES") {
+			const appShortCircuit = await loadForegroundAppInitialRenderProps();
+			if (appShortCircuit) return appShortCircuit;
+			pageProps = {};
+			renderProps = {
+				...renderProps,
+				pageProps
+			};
+			return {
+				kind: "render",
+				gsspRes: null,
+				isrRevalidateSeconds: null,
+				pageProps,
+				props: renderProps,
+				isFallback: true
+			};
+		}
+	}
 	if (typeof options.pageModule.getServerSideProps === "function") {
-		const { req, res, responsePromise } = options.createGsspReqRes();
+		const shortCircuit = await loadForegroundAppInitialRenderProps();
+		if (shortCircuit) return shortCircuit;
+		renderProps = {
+			...renderProps,
+			__N_SSP: true
+		};
+		const { req, res, responsePromise } = getSharedReqRes();
 		const result = await options.pageModule.getServerSideProps({
 			params: userFacingParams,
 			req,
 			res,
 			query: options.query,
-			resolvedUrl: options.routeUrl,
+			resolvedUrl: options.resolvedUrl ?? options.routeUrl,
 			locale: options.i18n.locale,
 			locales: options.i18n.locales,
 			defaultLocale: options.i18n.defaultLocale
@@ -196,10 +301,19 @@ async function resolvePagesPageData(options) {
 			kind: "response",
 			response: await responsePromise
 		};
-		if (result?.props) pageProps = await Promise.resolve(result.props);
+		if (result?.props) {
+			pageProps = {
+				...pageProps,
+				...await Promise.resolve(result.props)
+			};
+			renderProps = {
+				...renderProps,
+				pageProps
+			};
+		}
 		if (result?.redirect) return {
 			kind: "response",
-			response: buildPagesRedirectResponse(result.redirect, options)
+			response: buildPagesRedirectResponse(result.redirect, options, renderProps)
 		};
 		if (result?.notFound) return buildPagesNotFoundResult(options);
 		if (result?.props !== void 0) isSerializableProps(options.routePattern, "getServerSideProps", pageProps);
@@ -211,7 +325,7 @@ async function resolvePagesPageData(options) {
 		const cacheKey = options.isrCacheKey("pages", pathname);
 		const cached = await options.isrGet(cacheKey);
 		const cachedValue = cached?.value.value;
-		if (!options.isOnDemandRevalidate && cachedValue?.kind === "PAGES" && cached && !cached.isStale && !options.scriptNonce && !options.isDataReq) {
+		if (!options.isOnDemandRevalidate && cached?.isStale === false && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && !cached.isStale && !options.scriptNonce && !options.isDataReq) {
 			const hitResponse = buildPagesCacheResponse(cachedValue.html, "HIT", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, cachedValue.status);
 			const hitBotResult = applyBotETagAndCheck(hitResponse, cachedValue.html, options);
 			if (hitBotResult) return hitBotResult;
@@ -220,9 +334,14 @@ async function resolvePagesPageData(options) {
 				response: hitResponse
 			};
 		}
-		if (!options.isOnDemandRevalidate && cachedValue?.kind === "PAGES" && cached && cached.isStale && !options.scriptNonce && !options.isDataReq) {
+		if (!options.isOnDemandRevalidate && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && cached.isStale && !options.scriptNonce && !options.isDataReq) {
 			options.triggerBackgroundRegeneration(cacheKey, async function() {
 				return options.runInFreshUnifiedContext(async () => {
+					options.applyRequestContexts();
+					const freshAppResult = await loadPagesAppInitialRenderProps(options, () => options.createGsspReqRes());
+					if (freshAppResult.kind === "response") return;
+					let freshPageProps = freshAppResult.pageProps;
+					let freshRenderProps = freshAppResult.renderProps;
 					const freshResult = await options.pageModule.getStaticProps?.({
 						params: userFacingParams,
 						locale: options.i18n.locale,
@@ -230,14 +349,25 @@ async function resolvePagesPageData(options) {
 						defaultLocale: options.i18n.defaultLocale,
 						revalidateReason: "stale"
 					});
-					if (freshResult?.props && typeof freshResult.revalidate === "number" && freshResult.revalidate > 0) {
-						options.applyRequestContexts();
+					if (freshResult?.props) {
+						freshPageProps = {
+							...freshPageProps,
+							...freshResult.props
+						};
+						freshRenderProps = {
+							...freshRenderProps,
+							pageProps: freshPageProps
+						};
+					}
+					const freshRevalidateSeconds = typeof freshResult?.revalidate === "number" && freshResult.revalidate > 0 ? freshResult.revalidate : cached.value.cacheControl?.revalidate;
+					if (freshResult?.props && freshRevalidateSeconds && freshRevalidateSeconds > 0) {
 						const freshHtml = await renderPagesIsrHtml({
 							buildId: options.buildId,
 							cachedHtml: cachedValue.html,
 							createPageElement: options.createPageElement,
 							i18n: options.i18n,
-							pageProps: freshResult.props,
+							pageProps: freshPageProps,
+							props: freshRenderProps,
 							params: options.params,
 							renderIsrPassToStringAsync: options.renderIsrPassToStringAsync,
 							routePattern: options.routePattern,
@@ -245,7 +375,7 @@ async function resolvePagesPageData(options) {
 							nextData: options.nextData,
 							vinext: options.vinext
 						});
-						await options.isrSet(cacheKey, buildPagesCacheValue(freshHtml, freshResult.props, options.statusCode), freshResult.revalidate, void 0, options.expireSeconds);
+						await options.isrSet(cacheKey, buildPagesCacheValue(freshHtml, freshRenderProps, options.statusCode), freshRevalidateSeconds, void 0, options.expireSeconds);
 					}
 				});
 			}, {
@@ -261,24 +391,58 @@ async function resolvePagesPageData(options) {
 				response: staleResponse
 			};
 		}
-		const result = await options.pageModule.getStaticProps({
+		const generatedPageData = !options.isOnDemandRevalidate && cached?.isStale === false && cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest && isUnknownRecord(cachedValue.pageData) ? cachedValue.pageData : null;
+		if (!generatedPageData) {
+			const shortCircuit = await loadForegroundAppInitialRenderProps();
+			if (shortCircuit) return shortCircuit;
+		}
+		const result = generatedPageData ? null : await options.pageModule.getStaticProps({
 			params: userFacingParams,
 			locale: options.i18n.locale,
 			locales: options.i18n.locales,
 			defaultLocale: options.i18n.defaultLocale,
 			revalidateReason: options.isOnDemandRevalidate ? "on-demand" : options.isBuildTimePrerendering ? "build" : "stale"
 		});
-		if (result?.props) pageProps = result.props;
+		if (generatedPageData) {
+			renderProps = generatedPageData;
+			pageProps = isUnknownRecord(renderProps.pageProps) ? renderProps.pageProps : {};
+		}
+		if (result?.props) {
+			pageProps = {
+				...pageProps,
+				...result.props
+			};
+			renderProps = {
+				...renderProps,
+				pageProps
+			};
+		}
 		if (result?.redirect) return {
 			kind: "response",
-			response: buildPagesRedirectResponse(result.redirect, options)
+			response: buildPagesRedirectResponse(result.redirect, options, renderProps)
 		};
 		if (result?.notFound) return buildPagesNotFoundResult(options);
 		if (result?.props !== void 0) isSerializableProps(options.routePattern, "getStaticProps", pageProps);
 		if (typeof result?.revalidate === "number" && result.revalidate > 0) isrRevalidateSeconds = result.revalidate;
+		else if (cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest) isrRevalidateSeconds = cached?.value.cacheControl?.revalidate ?? 31536e3;
+		if (shouldPersistFallbackData) {
+			const revalidateSeconds = isrRevalidateSeconds ?? 31536e3;
+			await options.isrSet(cacheKey, {
+				kind: "PAGES",
+				html: "",
+				pageData: renderProps,
+				generatedFromDataRequest: true,
+				headers: void 0,
+				status: void 0
+			}, revalidateSeconds, void 0, options.expireSeconds);
+		}
 	}
-	if (typeof options.pageModule.getServerSideProps !== "function" && typeof options.pageModule.getStaticProps !== "function" && hasPagesGetInitialProps(options.pageModule.default)) {
-		const { req, res, responsePromise } = options.createGsspReqRes();
+	if (typeof options.pageModule.getServerSideProps !== "function" && typeof options.pageModule.getStaticProps !== "function" && hasPagesGetInitialProps(options.AppComponent)) {
+		const shortCircuit = await loadForegroundAppInitialRenderProps();
+		if (shortCircuit) return shortCircuit;
+	}
+	if (typeof options.pageModule.getServerSideProps !== "function" && typeof options.pageModule.getStaticProps !== "function" && !hasPagesGetInitialProps(options.AppComponent) && hasPagesGetInitialProps(options.pageModule.default)) {
+		const { req, res, responsePromise } = getSharedReqRes();
 		const initialProps = await loadPagesGetInitialProps(options.pageModule.default, {
 			req,
 			res,
@@ -294,16 +458,23 @@ async function resolvePagesPageData(options) {
 			kind: "response",
 			response: await responsePromise
 		};
-		if (initialProps) pageProps = {
-			...pageProps,
-			...initialProps
-		};
+		if (initialProps) {
+			pageProps = {
+				...pageProps,
+				...initialProps
+			};
+			renderProps = {
+				...renderProps,
+				pageProps
+			};
+		}
 	}
 	return {
 		kind: "render",
 		gsspRes,
 		isrRevalidateSeconds,
 		pageProps,
+		props: renderProps,
 		isFallback: false
 	};
 }