vinext 0.1.2 → 0.1.4

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, {
@@ -133,7 +198,9 @@ function applyBotETagAndCheck(cachedResponse, html, options) {
 function rewritePagesCachedHtml(cachedHtml, freshBody, nextDataScript) {
 	const bodyStart = cachedHtml.indexOf("<div id=\"__next\">");
 	const contentStart = bodyStart >= 0 ? bodyStart + 17 : -1;
-	const nextDataStart = cachedHtml.indexOf("<script>window.__NEXT_DATA__");
+	const canonicalNextDataStart = cachedHtml.search(/<script\b(?=[^>]*\bid=["']__NEXT_DATA__["'])(?=[^>]*\btype=["']application\/json["'])[^>]*>/);
+	const legacyNextDataStart = cachedHtml.indexOf("<script>window.__NEXT_DATA__");
+	const nextDataStart = canonicalNextDataStart >= 0 ? canonicalNextDataStart : legacyNextDataStart;
 	if (contentStart >= 0 && nextDataStart >= 0) {
 		const region = cachedHtml.slice(contentStart, nextDataStart);
 		const lastCloseDiv = region.lastIndexOf("</div>");
@@ -145,11 +212,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 +230,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 +239,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 +303,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 +327,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 +336,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 +351,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 +377,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 +393,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 +460,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
 	};
 }

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

@@ -31,6 +31,7 @@ type VinextConfigSubset = {
   assetPrefix: string;
   trailingSlash: boolean;
   expireTime?: number;
+  htmlLimitedBots?: string;
   clientTraceMetadata?: readonly string[];
   disableOptimizedLoading: boolean;
 };
@@ -73,8 +74,8 @@ type CreatePagesPageHandlerOptions = {
   renderIsrPassToStringAsync: (element: ReactNode) => Promise<string>; /** `safeJsonStringify` from `vinext/html`. */
   safeJsonStringify: (value: unknown) => string; /** `sanitizeDestination` from the config-matchers module. */
   sanitizeDestination: (dest: string) => string; /** Build the React page element for a given set of page props. */
-  createPageElement: (PageComponent: ComponentType, AppComponent: ComponentType | null, pageProps: Record<string, unknown>) => ReactNode; /** Build the element with optional App/Component enhancers (for _document). */
-  enhancePageElement: (PageComponent: ComponentType, AppComponent: ComponentType | null, pageProps: Record<string, unknown>, opts: RenderPageEnhancers) => ReactNode; /** The `_app` page component (or null). */
+  createPageElement: (PageComponent: ComponentType, AppComponent: ComponentType | null, props: Record<string, unknown>) => ReactNode; /** Build the element with optional App/Component enhancers (for _document). */
+  enhancePageElement: (PageComponent: ComponentType, AppComponent: ComponentType | null, props: Record<string, unknown>, opts: RenderPageEnhancers) => ReactNode; /** The `_app` page component (or null). */
   AppComponent: ComponentType | null; /** The `_document` page component (or null). */
   DocumentComponent: ComponentType | null;
 };
@@ -82,6 +83,7 @@ type RenderPageOptions = {
   isDataReq?: boolean;
   statusCode?: number;
   asPath?: string;
+  originalUrl?: string;
   renderErrorPageOnMiss?: boolean;
   __isInternalErrorRender?: boolean;
   __forcedRoute?: PageRoute;

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

@@ -7,13 +7,14 @@ import { NEVER_CACHE_CONTROL } from "./cache-control.js";
 import "./isr-decision.js";
 import { PRERENDER_REVALIDATE_HEADER, isOnDemandRevalidateRequest, isrCacheKey, isrGet, isrSet, triggerBackgroundRegeneration } from "./isr-cache.js";
 import { ensureFetchPatch } from "../shims/fetch-cache.js";
+import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
 import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
 import { getScriptNonceFromHeaderSources } from "./csp.js";
 import { resolvePagesI18nRequest } from "./pages-i18n.js";
 import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
 import { buildPagesReadinessNextData } from "./pages-readiness.js";
 import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
-import { buildNextDataJsonResponse, buildNextDataNotFoundResponse, normalizePagesDataRequest } from "./pages-data-route.js";
+import { buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, normalizePagesDataRequest, parseNextDataPathname } from "./pages-data-route.js";
 import { createPagesReqRes } from "./pages-node-compat.js";
 import { collectAssetTags, resolveClientModuleUrl } from "./pages-asset-tags.js";
 import { renderPagesPageResponse } from "./pages-page-response.js";
@@ -48,19 +49,38 @@ function createPagesPageHandler(opts) {
 	}
 	async function renderPage(request, url, manifest, middlewareHeaders, options) {
 		let isDataReq = !!(options && options.isDataReq);
+		const requestUrl = new URL(request.url);
+		const rawOriginalUrl = options && typeof options.originalUrl === "string" ? options.originalUrl : requestUrl.pathname + requestUrl.search;
+		const originalRequestUrl = new URL(rawOriginalUrl, requestUrl);
+		const originalRequestPathAndSearch = originalRequestUrl.pathname + originalRequestUrl.search;
+		let dataRequestPathname = null;
+		let dataRequestSearch = "";
+		const initialDataNorm = normalizePagesDataRequest(request, buildId);
 		if (!isDataReq) {
-			const dataNorm = normalizePagesDataRequest(request, buildId);
-			if (dataNorm.notFoundResponse) return dataNorm.notFoundResponse;
-			if (dataNorm.isDataReq) {
+			if (initialDataNorm.notFoundResponse) return initialDataNorm.notFoundResponse;
+			if (initialDataNorm.isDataReq) {
 				isDataReq = true;
+				dataRequestPathname = initialDataNorm.normalizedPathname;
+				dataRequestSearch = initialDataNorm.search;
 				if (url && url.startsWith("/_next/data/")) {
 					const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-					url = dataNorm.normalizedPathname + qs;
+					url = initialDataNorm.normalizedPathname + qs;
 				}
 			}
+		} else if (initialDataNorm.isDataReq) {
+			dataRequestPathname = initialDataNorm.normalizedPathname;
+			dataRequestSearch = initialDataNorm.search;
+		}
+		if (isDataReq && dataRequestPathname === null && buildId) {
+			const originalDataMatch = parseNextDataPathname(originalRequestUrl.pathname, buildId);
+			if (originalDataMatch) {
+				dataRequestPathname = originalDataMatch.pagePathname;
+				dataRequestSearch = originalRequestUrl.search;
+			}
 		}
 		const statusCode = options && typeof options.statusCode === "number" ? options.statusCode : void 0;
-		const asPath = options && typeof options.asPath === "string" ? options.asPath : void 0;
+		const defaultAsPath = isDataReq && dataRequestPathname ? dataRequestPathname + dataRequestSearch : originalRequestPathAndSearch;
+		const asPath = options && typeof options.asPath === "string" ? options.asPath : defaultAsPath;
 		const renderErrorPageOnMiss = !(options && options.renderErrorPageOnMiss === false);
 		const isInternalErrorRender = !!(options && options.__isInternalErrorRender);
 		const err = options && options.err;
@@ -143,8 +163,8 @@ function createPagesPageHandler(opts) {
 					});
 					if (methodResponse) return methodResponse;
 				}
-				const pageModuleUrl = resolveClientModuleUrl(manifest, route.filePath, vinextConfig.basePath, vinextConfig.assetPrefix);
-				const appModuleUrl = resolveClientModuleUrl(manifest, appAssetPath, vinextConfig.basePath, vinextConfig.assetPrefix);
+				const pageModuleUrl = resolveClientModuleUrl(manifest, route.filePath, vinextConfig.basePath, vinextConfig.assetPrefix, process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID);
+				const appModuleUrl = resolveClientModuleUrl(manifest, appAssetPath, vinextConfig.basePath, vinextConfig.assetPrefix, process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID);
 				const serializedPagesNextData = {
 					...pagesNextData,
 					__vinext: {
@@ -159,24 +179,30 @@ function createPagesPageHandler(opts) {
 				let allFontPreloads = [];
 				try {
 					allFontPreloads = getFontPreloads();
-					if (allFontPreloads.length > 0) fontLinkHeader = allFontPreloads.map((p) => "<" + p.href + ">; rel=preload; as=font; type=" + p.type + "; crossorigin").join(", ");
+					if (allFontPreloads.length > 0) fontLinkHeader = allFontPreloads.map((p) => "<" + appendAssetDeploymentIdQuery(p.href) + ">; rel=preload; as=font; type=" + p.type + "; crossorigin").join(", ");
 				} catch {}
+				const pagesResolvedUrl = (new URL(routeUrl, originalRequestUrl).pathname || "/") + originalRequestUrl.search;
 				const pageDataResult = await resolvePagesPageData({
 					isDataReq,
-					err,
+					err: err instanceof Error ? err : void 0,
 					applyRequestContexts: applySSRContext,
 					buildId,
 					deploymentId: process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID,
+					htmlLimitedBots: vinextConfig.htmlLimitedBots,
 					createGsspReqRes() {
 						return createPagesReqRes({
 							body: void 0,
 							query,
 							request,
-							url: routeUrl
+							url: originalRequestPathAndSearch
 						});
 					},
-					createPageElement(currentPageProps) {
-						const el = createPageElement(PageComponent, AppComponent, currentPageProps);
+					createAppTree(appTreeProps) {
+						const el = createPageElement(PageComponent, AppComponent, appTreeProps);
+						return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
+					},
+					createPageElement(currentProps) {
+						const el = createPageElement(PageComponent, AppComponent, currentProps);
 						return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
 					},
 					fontLinkHeader,
@@ -188,15 +214,17 @@ function createPagesPageHandler(opts) {
 					isBuildTimePrerendering: typeof process !== "undefined" && process.env && process.env.VINEXT_PRERENDER === "1",
 					isOnDemandRevalidate: isOnDemandRevalidateRequest(request.headers.get(PRERENDER_REVALIDATE_HEADER)),
 					pageModule,
+					AppComponent,
 					params,
 					query,
 					asPath: renderAsPath ?? routeUrl,
+					resolvedUrl: pagesResolvedUrl,
 					renderIsrPassToStringAsync,
 					route: { isDynamic: route.isDynamic },
 					routePattern,
 					routeUrl,
 					runInFreshUnifiedContext(callback) {
-						return runWithRequestContext(createRequestContext({ executionContext: getRequestExecutionContext() }), async () => {
+						return runWithRequestContext(createRequestContext({ executionContext: null }), async () => {
 							ensureFetchPatch();
 							return callback();
 						});
@@ -224,10 +252,17 @@ function createPagesPageHandler(opts) {
 				}
 				if (pageDataResult.kind === "response") return pageDataResult.response;
 				let pageProps = pageDataResult.pageProps;
-				if (routePattern === "/_error" && typeof renderStatusCode === "number") pageProps = {
-					...pageProps,
-					statusCode: renderStatusCode
-				};
+				let renderProps = pageDataResult.props;
+				if (routePattern === "/_error" && typeof renderStatusCode === "number") {
+					pageProps = {
+						...pageProps,
+						statusCode: renderStatusCode
+					};
+					renderProps = {
+						...renderProps,
+						pageProps
+					};
+				}
 				const gsspRes = pageDataResult.gsspRes;
 				const isrRevalidateSeconds = pageDataResult.isrRevalidateSeconds;
 				const isFallbackRender = pageDataResult.isFallback === true;
@@ -264,7 +299,7 @@ function createPagesPageHandler(opts) {
 						const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
 						if (deploymentId) init.headers[NEXTJS_DEPLOYMENT_ID_HEADER] = deploymentId;
 					}
-					return buildNextDataJsonResponse(pageProps, safeJsonStringify, init);
+					return buildNextDataPropsJsonResponse(renderProps, safeJsonStringify, init);
 				}
 				const pageModuleIds = [];
 				if (route.filePath) pageModuleIds.push(route.filePath);
@@ -276,21 +311,23 @@ function createPagesPageHandler(opts) {
 						scriptNonce,
 						disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
 						basePath: vinextConfig.basePath,
-						assetPrefix: vinextConfig.assetPrefix
+						assetPrefix: vinextConfig.assetPrefix,
+						deploymentId: process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID
 					}),
 					buildId,
 					clearSsrContext() {
 						if (typeof setSSRContext === "function") setSSRContext(null);
 					},
-					createPageElement(currentPageProps) {
-						const el = createPageElement(PageComponent, AppComponent, currentPageProps);
+					createPageElement(currentProps) {
+						const el = createPageElement(PageComponent, AppComponent, currentProps);
 						return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
 					},
 					enhancePageElement(renderPageOpts) {
-						const el = enhancePageElement(PageComponent, AppComponent, pageProps, renderPageOpts);
+						const el = enhancePageElement(PageComponent, AppComponent, renderProps, renderPageOpts);
 						return typeof wrapWithRouterContext === "function" ? wrapWithRouterContext(el) : el;
 					},
 					DocumentComponent,
+					err: err instanceof Error ? err : void 0,
 					flushPreloads: typeof flushPreloads === "function" ? flushPreloads : void 0,
 					fontLinkHeader,
 					fontPreloads: allFontPreloads,
@@ -306,7 +343,9 @@ function createPagesPageHandler(opts) {
 					i18n: buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domainLocales),
 					isFallback: isFallbackRender,
 					pageProps,
+					props: renderProps,
 					params,
+					query,
 					renderDocumentToString(element) {
 						return renderToStringAsync(element);
 					},

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

@@ -66,6 +66,7 @@ type RenderPagesPageResponseOptions = {
    */
   enhancePageElement?: ((opts: RenderPageEnhancers) => ReactNode) | undefined;
   DocumentComponent: ComponentType | null;
+  err?: Error;
   flushPreloads?: (() => Promise<void> | void) | undefined;
   fontLinkHeader: string;
   fontPreloads: PagesFontPreload[];
@@ -93,7 +94,9 @@ type RenderPagesPageResponseOptions = {
    */
   isFallback?: boolean;
   pageProps: Record<string, unknown>;
+  props?: Record<string, unknown>;
   params: Record<string, unknown>;
+  query?: Record<string, unknown>;
   renderDocumentToString: (element: ReactNode) => Promise<string>;
   renderToReadableStream: (element: ReactNode) => Promise<ReadableStream<Uint8Array>>;
   resetSSRHead?: (() => void) | undefined;
@@ -127,7 +130,7 @@ type RenderPagesPageResponseOptions = {
    */
   requestCacheControl?: string;
 };
-declare function buildPagesNextDataScript(options: Pick<RenderPagesPageResponseOptions, "buildId" | "i18n" | "isFallback" | "pageProps" | "params" | "routePattern" | "safeJsonStringify" | "scriptNonce" | "nextData"> & {
+declare function buildPagesNextDataScript(options: Pick<RenderPagesPageResponseOptions, "buildId" | "i18n" | "isFallback" | "pageProps" | "props" | "params" | "routePattern" | "safeJsonStringify" | "scriptNonce" | "nextData"> & {
   vinext?: VinextNextData["__vinext"];
 }): string;
 declare function renderPagesPageResponse(options: RenderPagesPageResponseOptions): Promise<Response>;