vinext 0.1.1 → 0.1.3

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

@@ -1,16 +1,20 @@
 import { createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
+import { NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
 import { reportRequestError } from "./instrumentation.js";
+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";
@@ -45,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;
@@ -140,8 +163,8 @@ function createPagesPageHandler(opts) {
 					});
 					if (methodResponse) return methodResponse;
 				}
-				const pageModuleUrl = resolveClientModuleUrl(manifest, route.filePath);
-				const appModuleUrl = resolveClientModuleUrl(manifest, appAssetPath);
+				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: {
@@ -156,23 +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,
 					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,
@@ -184,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();
 						});
@@ -203,7 +235,10 @@ function createPagesPageHandler(opts) {
 					statusCode: renderStatusCode,
 					triggerBackgroundRegeneration,
 					vinext: serializedPagesNextData.__vinext,
-					nextData: serializedPagesNextData
+					nextData: serializedPagesNextData,
+					userAgent: request.headers.get("user-agent") ?? void 0,
+					ifNoneMatch: request.headers.get("if-none-match") ?? void 0,
+					requestCacheControl: request.headers.get("cache-control") ?? void 0
 				});
 				if (pageDataResult.kind === "notFound") {
 					const notFoundRoute = findNotFoundRoute();
@@ -217,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;
@@ -251,9 +293,13 @@ function createPagesPageHandler(opts) {
 							hasUserCacheControl = true;
 							break;
 						}
-						if (!hasUserCacheControl) init.headers["Cache-Control"] = "private, no-cache, no-store, max-age=0, must-revalidate";
+						if (!hasUserCacheControl) init.headers["Cache-Control"] = NEVER_CACHE_CONTROL;
+					}
+					if (routePattern !== "/_error" && routePattern !== "/500") {
+						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);
@@ -263,18 +309,21 @@ function createPagesPageHandler(opts) {
 						manifest,
 						moduleIds: pageModuleIds,
 						scriptNonce,
-						disableOptimizedLoading: vinextConfig.disableOptimizedLoading
+						disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
+						basePath: vinextConfig.basePath,
+						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,
@@ -293,6 +342,7 @@ function createPagesPageHandler(opts) {
 					i18n: buildI18nRenderContext(i18nConfig, locale, currentDefaultLocale, domainLocales),
 					isFallback: isFallbackRender,
 					pageProps,
+					props: renderProps,
 					params,
 					renderDocumentToString(element) {
 						return renderToStringAsync(element);
@@ -305,7 +355,10 @@ function createPagesPageHandler(opts) {
 					safeJsonStringify,
 					scriptNonce,
 					statusCode: renderStatusCode,
-					nextData: serializedPagesNextData
+					nextData: serializedPagesNextData,
+					userAgent: request.headers.get("user-agent") ?? void 0,
+					ifNoneMatch: request.headers.get("if-none-match") ?? void 0,
+					requestCacheControl: request.headers.get("cache-control") ?? void 0
 				});
 			} catch (e) {
 				console.error("[vinext] SSR error:", e);

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

@@ -4,6 +4,28 @@ import { RenderPageEnhancers } from "./pages-document-initial-props.js";
 import { ComponentType, ReactNode } from "react";
 
 //#region src/server/pages-page-response.d.ts
+/**
+ * Returns true when the User-Agent belongs to a bot or crawler that cannot
+ * reliably consume a streamed HTML response.
+ */
+declare function isPagesStreamingBot(userAgent: string): boolean;
+declare function generatePagesETag(payload: string): string;
+/**
+ * Mirrors Next.js `sendEtagResponse` semantics (weak/strong comparison).
+ *
+ * A weak ETag `W/"..."` matches both `W/"..."` and `"..."` in `If-None-Match`.
+ * A strong ETag `"..."` only matches the same strong token.
+ * `*` always matches.
+ */
+declare function etagMatches(etag: string, ifNoneMatch: string): boolean;
+/**
+ * Returns true when a request `Cache-Control` header asks to bypass the 304
+ * short-circuit. Mirrors the `fresh` package's check used by Next.js's
+ * `sendEtagResponse` (`/(?:^|,)\s*?no-cache\s*?(?:,|$)/`). Shared by the
+ * fresh-MISS bot path here and the ISR HIT/STALE paths in
+ * `pages-page-data.ts` so the two cannot drift.
+ */
+declare function requestsNoCache(cacheControl: string | undefined): boolean;
 type PagesFontPreload = {
   href: string;
   type: string;
@@ -71,6 +93,7 @@ type RenderPagesPageResponseOptions = {
    */
   isFallback?: boolean;
   pageProps: Record<string, unknown>;
+  props?: Record<string, unknown>;
   params: Record<string, unknown>;
   renderDocumentToString: (element: ReactNode) => Promise<string>;
   renderToReadableStream: (element: ReactNode) => Promise<ReadableStream<Uint8Array>>;
@@ -82,10 +105,32 @@ type RenderPagesPageResponseOptions = {
   statusCode?: number;
   vinext?: VinextNextData["__vinext"];
   nextData?: PagesNextDataExtras;
+  /**
+   * The request's User-Agent string (from `request.headers.get('user-agent')`).
+   * When this matches a known crawler / bot pattern, the response is fully
+   * buffered before sending so bots receive a single complete HTML chunk with
+   * an ETag header. Omitting this field disables bot-detection (streaming as
+   * normal), which is the correct behaviour for non-HTML requests and tests.
+   */
+  userAgent?: string;
+  /**
+   * The incoming request's `If-None-Match` header value. When set and the
+   * computed ETag matches (weak-ETag semantics, mirroring Next.js's
+   * `sendEtagResponse`), a `304 Not Modified` is returned with an empty body.
+   * Only evaluated on bot/buffered responses that carry an ETag.
+   */
+  ifNoneMatch?: string;
+  /**
+   * The incoming request's `Cache-Control` header value. When the value
+   * contains `no-cache`, the 304 short-circuit is skipped and a full 200
+   * response is always returned — mirroring the `fresh` package used by
+   * Next.js's `sendEtagResponse`.
+   */
+  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>;
 //#endregion
-export { PagesGsspResponse, PagesI18nRenderContext, PagesNextDataExtras, buildPagesNextDataScript, renderPagesPageResponse };
+export { PagesGsspResponse, PagesI18nRenderContext, PagesNextDataExtras, buildPagesNextDataScript, etagMatches, generatePagesETag, isPagesStreamingBot, renderPagesPageResponse, requestsNoCache };

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

@@ -1,27 +1,76 @@
 import { getRequestExecutionContext } from "../shims/request-context.js";
 import { reportRequestError } from "./instrumentation.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
+import { fnv1a52 } from "../utils/hash.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
+import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
+import { buildMissIsrCacheControl } from "./isr-decision.js";
+import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr } from "./html.js";
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
 import { readStreamAsText } from "../utils/text-stream.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
 import { callDocumentGetInitialProps } from "./document-initial-head.js";
-import { applyCdnResponseHeaders, buildRevalidateCacheControl } from "./cache-control.js";
 import React from "react";
 //#region src/server/pages-page-response.ts
+/**
+* Crawlers that cannot handle streamed HTML: they read metadata only from
+* the first network chunk, so streaming would give them an incomplete <head>.
+* Pattern sourced from Next.js html-bots.ts (updated to match the canary).
+*/
+const HTML_LIMITED_BOT_UA_RE = /[\w-]+-Google|Google-[\w-]+|Chrome-Lighthouse|Slurp|DuckDuckBot|baiduspider|yandex|sogou|bitlybot|tumblr|vkShare|quora link preview|redditbot|ia_archiver|Bingbot|BingPreview|applebot|facebookexternalhit|facebookcatalog|Twitterbot|LinkedInBot|Slackbot|Discordbot|WhatsApp|SkypeUriPreview|Yeti|googleweblight/i;
+/**
+* Googlebot (the main search crawler) executes JavaScript via a headless
+* browser, so it too cannot safely handle mid-stream HTML mutations.
+* Matches "Googlebot" but NOT suffixed variants like "Googlebot-Image".
+*/
+const HEADLESS_BROWSER_BOT_UA_RE = /Googlebot(?!-)|Googlebot$/i;
+/**
+* Returns true when the User-Agent belongs to a bot or crawler that cannot
+* reliably consume a streamed HTML response.
+*/
+function isPagesStreamingBot(userAgent) {
+	return HEADLESS_BROWSER_BOT_UA_RE.test(userAgent) || HTML_LIMITED_BOT_UA_RE.test(userAgent);
+}
+function generatePagesETag(payload) {
+	return "\"" + fnv1a52(payload).toString(36) + payload.length.toString(36) + "\"";
+}
+/**
+* Mirrors Next.js `sendEtagResponse` semantics (weak/strong comparison).
+*
+* A weak ETag `W/"..."` matches both `W/"..."` and `"..."` in `If-None-Match`.
+* A strong ETag `"..."` only matches the same strong token.
+* `*` always matches.
+*/
+function etagMatches(etag, ifNoneMatch) {
+	if (ifNoneMatch === "*") return true;
+	const normalize = (t) => t.replace(/^W\//, "");
+	const etagNorm = normalize(etag.trim());
+	for (const token of ifNoneMatch.split(",")) if (normalize(token.trim()) === etagNorm) return true;
+	return false;
+}
+/**
+* Returns true when a request `Cache-Control` header asks to bypass the 304
+* short-circuit. Mirrors the `fresh` package's check used by Next.js's
+* `sendEtagResponse` (`/(?:^|,)\s*?no-cache\s*?(?:,|$)/`). Shared by the
+* fresh-MISS bot path here and the ISR HIT/STALE paths in
+* `pages-page-data.ts` so the two cannot drift.
+*/
+function requestsNoCache(cacheControl) {
+	return /(?:^|,)\s*no-cache\s*(?:,|$)/.test(cacheControl ?? "");
+}
 function buildPagesFontHeadHtml(fontLinks, fontPreloads, fontStyles, scriptNonce) {
 	let html = "";
 	const nonceAttr = createNonceAttribute(scriptNonce);
-	for (const link of fontLinks) html += `<link rel="stylesheet"${nonceAttr} href="${escapeHtmlAttr(link)}" />\n  `;
-	for (const preload of fontPreloads) html += `<link rel="preload"${nonceAttr} href="${escapeHtmlAttr(preload.href)}" as="font" type="${escapeHtmlAttr(preload.type)}" crossorigin />\n  `;
+	for (const link of fontLinks) html += `<link rel="stylesheet"${nonceAttr} href="${escapeHtmlAttr(appendAssetDeploymentIdQuery(link))}" />\n  `;
+	for (const preload of fontPreloads) html += `<link rel="preload"${nonceAttr} href="${escapeHtmlAttr(appendAssetDeploymentIdQuery(preload.href))}" as="font" type="${escapeHtmlAttr(preload.type)}" crossorigin />\n  `;
 	if (fontStyles.length > 0) html += `<style data-vinext-fonts${nonceAttr}>${fontStyles.join("\n")}</style>\n  `;
 	return html;
 }
 function buildPagesNextDataScript(options) {
 	const nextDataPayload = {
-		props: { pageProps: options.pageProps },
+		props: options.props ?? { pageProps: options.pageProps },
 		page: options.routePattern,
 		query: options.params,
 		buildId: options.buildId,
@@ -123,6 +172,7 @@ function applyGsspHeaders(headers, gsspRes, statusCode) {
 	return statusCode ?? gsspRes.statusCode;
 }
 async function renderPagesPageResponse(options) {
+	const renderProps = options.props ?? { pageProps: options.pageProps };
 	options.resetSSRHead?.();
 	await options.flushPreloads?.();
 	const fontHeadHTML = buildPagesFontHeadHtml(options.getFontLinks(), options.fontPreloads, options.getFontStyles(), options.scriptNonce);
@@ -131,6 +181,7 @@ async function renderPagesPageResponse(options) {
 		i18n: options.i18n,
 		isFallback: options.isFallback,
 		pageProps: options.pageProps,
+		props: renderProps,
 		params: options.params,
 		routePattern: options.routePattern,
 		safeJsonStringify: options.safeJsonStringify,
@@ -157,7 +208,7 @@ async function renderPagesPageResponse(options) {
 		controller.close();
 	} });
 	else {
-		const pageElement = withScriptNonce(React.createElement(React.Fragment, null, options.createPageElement(options.pageProps)), options.scriptNonce);
+		const pageElement = withScriptNonce(React.createElement(React.Fragment, null, options.createPageElement(renderProps)), options.scriptNonce);
 		bodyStream = await options.renderToReadableStream(pageElement);
 	}
 	if (documentRenderPage.status === "skipped") await callDocumentGetInitialProps(options.DocumentComponent, options.setDocumentInitialHead);
@@ -201,21 +252,34 @@ async function renderPagesPageResponse(options) {
 	}
 	const compositeStream = await buildPagesCompositeStream(responseBodyStream, shellPrefix, shellSuffix);
 	const userSetCacheControl = responseHeaders.has("Cache-Control");
-	if (options.scriptNonce) responseHeaders.set("Cache-Control", "no-store, must-revalidate");
+	if (options.scriptNonce) responseHeaders.set("Cache-Control", NO_STORE_CACHE_CONTROL);
 	else if (options.isrRevalidateSeconds) {
 		const isrPathname = options.routeUrl.split("?")[0];
 		const stem = isrPathname.endsWith("/") ? isrPathname.slice(0, -1) : isrPathname;
 		applyCdnResponseHeaders(responseHeaders, {
-			cacheControl: buildRevalidateCacheControl(options.isrRevalidateSeconds, options.expireSeconds),
+			cacheControl: buildMissIsrCacheControl(options.isrRevalidateSeconds, options.expireSeconds),
 			tags: [encodeCacheTag(`_N_T_${stem || "/"}`)]
 		});
 		setCacheStateHeaders(responseHeaders, "MISS");
-	} else if (options.gsspRes && !userSetCacheControl) responseHeaders.set("Cache-Control", "private, no-cache, no-store, max-age=0, must-revalidate");
+	} else if (options.gsspRes && !userSetCacheControl) responseHeaders.set("Cache-Control", NEVER_CACHE_CONTROL);
 	if (options.fontLinkHeader) responseHeaders.set("Link", options.fontLinkHeader);
+	if (options.userAgent && isPagesStreamingBot(options.userAgent)) {
+		const fullHtml = await readStreamAsText(compositeStream);
+		const etag = generatePagesETag(fullHtml);
+		responseHeaders.set("ETag", etag);
+		if (!requestsNoCache(options.requestCacheControl) && options.ifNoneMatch && etagMatches(etag, options.ifNoneMatch)) return new Response(null, {
+			status: 304,
+			headers: responseHeaders
+		});
+		return new Response(fullHtml, {
+			status: finalStatus,
+			headers: responseHeaders
+		});
+	}
 	return Object.assign(new Response(compositeStream, {
 		status: finalStatus,
 		headers: responseHeaders
 	}), { __vinextStreamedHtmlResponse: true });
 }
 //#endregion
-export { buildPagesNextDataScript, renderPagesPageResponse };
+export { buildPagesNextDataScript, etagMatches, generatePagesETag, isPagesStreamingBot, renderPagesPageResponse, requestsNoCache };

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

@@ -33,4 +33,4 @@ declare function buildPagesReadinessNextData(options: {
   hasRewrites: boolean;
 }): PagesReadinessNextData;
 //#endregion
-export { PagesReadinessNextData, buildPagesReadinessNextData };
+export { buildPagesReadinessNextData };

package/dist/server/pages-request-pipeline.d.ts

@@ -5,6 +5,7 @@ import { HeaderRecord } from "./request-pipeline.js";
 type PagesRenderOptions = {
   isDataReq?: boolean;
   renderErrorPageOnMiss?: boolean;
+  originalUrl?: string;
 };
 type MiddlewareResult = {
   continue: boolean;
@@ -62,6 +63,20 @@ type PagesPipelineDeps = {
    */
   serveStaticFile?: ((requestPathname: string, stagedHeaders: HeaderRecord) => Promise<boolean>) | null;
 };
+/**
+ * Wrap an adapter's `runMiddleware` callback so middleware receives the original
+ * (pre-basePath-stripping) URL. Adapters strip the basePath before handing the
+ * request to `runPagesRequest`, but Next.js passes the un-stripped URL to the
+ * middleware adapter so `request.nextUrl.basePath` reflects whether the URL
+ * actually had the basePath prefix. Requests outside the basePath
+ * (`hadBasePath === false`) are passed through untouched so middleware sees
+ * `nextUrl.basePath === ""` and can redirect them into the basePath
+ * (see the middleware-base-path e2e test / #1830).
+ *
+ * Shared by the Node prod server (prod-server.ts) and the generated Pages
+ * Router worker entry (deploy.ts) to keep the two adapters in sync.
+ */
+declare function wrapMiddlewareWithBasePath(runMiddleware: NonNullable<PagesPipelineDeps["runMiddleware"]>, basePath: string, hadBasePath: boolean): NonNullable<PagesPipelineDeps["runMiddleware"]>;
 type PagesPipelineResult = {
   type: "response";
   response: Response;
@@ -96,4 +111,4 @@ type PagesPipelineResult = {
  */
 declare function runPagesRequest(request: Request, deps: PagesPipelineDeps): Promise<PagesPipelineResult>;
 //#endregion
-export { MiddlewareResult, PagesPipelineDeps, PagesPipelineResult, PagesRenderOptions, runPagesRequest };
+export { MiddlewareResult, PagesPipelineDeps, PagesPipelineResult, PagesRenderOptions, runPagesRequest, wrapMiddlewareWithBasePath };