vinext 1.1.0 → 1.2.0

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

@@ -2,7 +2,7 @@ import { NextI18nConfig } from "../config/next-config.js";
 import { Route } from "../routing/pages-router.js";
 import { ExecutionContextLike } from "../shims/request-context.js";
 import { EdgeApiExecutionRuntime } from "./edge-api-runtime.js";
-import { PagesReqResRequest, PagesReqResResponse, PagesRequestQuery } from "./pages-node-compat.js";
+import { PagesApiReqResResponse, PagesReqResRequest, PagesRequestQuery } from "./pages-node-compat.js";
 //#region src/server/pages-api-route.d.ts
 type PagesApiRouteConfig = {
   runtime?: string;
@@ -36,7 +36,7 @@ type PagesApiRouteConfig = {
     externalResolver?: boolean;
   };
 };
-type PagesNodeApiRouteHandler = (req: PagesReqResRequest, res: PagesReqResResponse) => unknown;
+type PagesNodeApiRouteHandler = (req: PagesReqResRequest, res: PagesApiReqResResponse) => unknown;
 type PagesEdgeApiRouteHandler = (request: Request) => Response | Promise<Response>;
 type PagesApiRouteModule = {
   /**
@@ -80,6 +80,7 @@ type HandlePagesApiRouteOptions = {
     allowedRevalidateHeaderKeys?: readonly string[];
     i18n?: NextI18nConfig | null;
     trailingSlash?: boolean;
+    skipTrailingSlashRedirect?: boolean;
   };
   trustedRevalidateOrigin?: string;
 };

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

@@ -9,7 +9,7 @@ import { mergeRouteParamsIntoQuery, parseQueryString, urlQueryToSearchParams } f
 import { tracePagesApiHandler } from "./pages-execution-tracing.js";
 import { resolveBodyParserConfig } from "./pages-body-parser-config.js";
 import { PagesBodyParseError } from "./pages-media-type.js";
-import { createPagesReqRes, markVinextStreamedApiResponse, parsePagesApiBody } from "./pages-node-compat.js";
+import { createPagesApiReqRes, markVinextStreamedApiResponse, parsePagesApiBody } from "./pages-node-compat.js";
 import { finalizeEdgeApiResponse, isEdgeApiRuntime } from "./edge-api-runtime.js";
 //#region src/server/pages-api-route.ts
 function resolveModuleRuntime(module) {
@@ -47,7 +47,8 @@ async function _handlePagesApiRoute(options) {
 			const nextRequest = new NextRequest(createEdgeApiRequest(options.request, options.url, params), options.nextConfig ? { nextConfig: {
 				basePath: options.nextConfig.basePath,
 				i18n: options.nextConfig.i18n ?? void 0,
-				trailingSlash: options.nextConfig.trailingSlash
+				trailingSlash: options.nextConfig.trailingSlash,
+				skipTrailingSlashRedirect: options.nextConfig.skipTrailingSlashRedirect
 			} } : void 0);
 			const response = await tracePagesApiHandler(route.pattern, () => handler(nextRequest));
 			if (response instanceof Response) {
@@ -70,7 +71,7 @@ async function _handlePagesApiRoute(options) {
 		const query = buildPagesApiQuery(options.url, params);
 		const bodyParserConfig = resolveBodyParserConfig(route.module.config);
 		const body = bodyParserConfig.enabled ? await parsePagesApiBody(options.request, bodyParserConfig.sizeLimit) : void 0;
-		const { req, res, responsePromise } = createPagesReqRes({
+		const { req, res, responsePromise } = createPagesApiReqRes({
 			allowedRevalidateHeaderKeys: options.nextConfig?.allowedRevalidateHeaderKeys,
 			body,
 			initialResponseHeaders: options.initialResponseHeaders,

package/dist/server/pages-cache-tag.d.ts

@@ -0,0 +1,12 @@
+//#region src/server/pages-cache-tag.d.ts
+/**
+ * Build the edge path tag for a Pages ISR pathname.
+ *
+ * Every spelling of one pathname shares a single ISR entry, because
+ * `pagesIsrCacheKey()` decodes each segment first. The tag must use that same
+ * decoded identity. Otherwise `/users/%40alice` is stored at the edge under its
+ * own tag, and `res.revalidate("/users/@alice")` or
+ * `revalidatePath("/users/@alice")` never purges it.
+ */
+export declare function pagesPathCacheTag(isrPathname: string): string;
+//#endregion

package/dist/server/pages-cache-tag.js

@@ -0,0 +1,19 @@
+import { normalizePathnameForRouteMatch } from "../routing/utils.js";
+import { encodeCacheTag } from "../utils/encode-cache-tag.js";
+//#region src/server/pages-cache-tag.ts
+/**
+* Build the edge path tag for a Pages ISR pathname.
+*
+* Every spelling of one pathname shares a single ISR entry, because
+* `pagesIsrCacheKey()` decodes each segment first. The tag must use that same
+* decoded identity. Otherwise `/users/%40alice` is stored at the edge under its
+* own tag, and `res.revalidate("/users/@alice")` or
+* `revalidatePath("/users/@alice")` never purges it.
+*/
+function pagesPathCacheTag(isrPathname) {
+	const pathname = normalizePathnameForRouteMatch(isrPathname);
+	const stem = pathname.endsWith("/") ? pathname.slice(0, -1) : pathname;
+	return encodeCacheTag(`_N_T_${stem || "/"}`);
+}
+//#endregion
+export { pagesPathCacheTag };

package/dist/server/pages-client-assets.d.ts

@@ -14,6 +14,8 @@ export type PagesClientAssets = {
   dynamicPreloads?: Record<string, string[]>;
   /** next.config crossOrigin, defaulting to anonymous for Vite's CORS-fetched assets. */
   crossOrigin?: AssetCrossOrigin;
+  /** Client bundle files outside `_next/static`, as URL pathnames. */
+  clientBuildFiles?: string[];
 };
 export declare function setPagesClientAssets(assets: PagesClientAssets | undefined): void;
 export declare function getPagesClientAssets(): PagesClientAssets;

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

@@ -61,6 +61,16 @@ export declare function encodeUrlParserIgnoredCharacters(pathname: string): stri
  * `/_next/data/<buildId>/about`              → null  (missing .json suffix)
  */
 export declare function parseNextDataPathname(pathname: string, buildId: string): NextDataMatch | null;
+/**
+ * The page pathname a `_next/data` URL addresses, whatever its buildId. Next.js
+ * compiles every middleware matcher with an optional `/_next/data/<buildId>`
+ * prefix and `.json` suffix, so a matcher written for `/admin` also guards that
+ * page's data URL, even one with a stale buildId. Middleware matching uses this
+ * when the request reaches middleware with its raw data URL
+ * (`skipProxyUrlNormalize`).
+ * https://github.com/vercel/next.js/blob/v16.2.7/packages/next/src/build/analysis/get-page-static-info.ts
+ */
+export declare function nextDataMiddlewareMatchPathname(pathname: string): string | null;
 export declare function normalizeNextDataPagePathname(pagePathname: string, trailingSlash?: boolean): string;
 /**
  * Next.js only applies `trailingSlash` while normalizing a data URL for

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

@@ -67,7 +67,24 @@ function parseNextDataPathname(pathname, buildId) {
 	if (!isNextDataPathname(pathname)) return null;
 	const expectedPrefix = `${NEXT_DATA_PREFIX}${buildId}/`;
 	if (!pathname.startsWith(expectedPrefix)) return null;
-	const rest = pathname.slice(expectedPrefix.length, -5);
+	return pageFromNextDataRest(pathname.slice(expectedPrefix.length, -5));
+}
+/**
+* The page pathname a `_next/data` URL addresses, whatever its buildId. Next.js
+* compiles every middleware matcher with an optional `/_next/data/<buildId>`
+* prefix and `.json` suffix, so a matcher written for `/admin` also guards that
+* page's data URL, even one with a stale buildId. Middleware matching uses this
+* when the request reaches middleware with its raw data URL
+* (`skipProxyUrlNormalize`).
+* https://github.com/vercel/next.js/blob/v16.2.7/packages/next/src/build/analysis/get-page-static-info.ts
+*/
+function nextDataMiddlewareMatchPathname(pathname) {
+	if (!isNextDataPathname(pathname)) return null;
+	const buildIdEnd = pathname.indexOf("/", 12);
+	if (buildIdEnd <= 12) return null;
+	return pageFromNextDataRest(pathname.slice(buildIdEnd + 1, -5))?.pagePathname ?? null;
+}
+function pageFromNextDataRest(rest) {
 	if (rest.length === 0) return null;
 	if (rest === "index") return { pagePathname: "/" };
 	if (rest.endsWith("/index")) return { pagePathname: `/${rest.slice(0, -6)}` };
@@ -181,4 +198,4 @@ function normalizePagesDataRequest(request, buildId, basePath = "", trailingSlas
 	};
 }
 //#endregion
-export { buildMiddlewarePrefetchSkipResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, normalizePagesDataRequest, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath };
+export { buildMiddlewarePrefetchSkipResponse, buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, encodeUrlParserIgnoredCharacters, isNextDataPathname, nextDataMiddlewareMatchPathname, normalizeNextDataPagePathname, normalizePagesDataRequest, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath };

package/dist/server/pages-document-asset-props.d.ts

@@ -10,7 +10,11 @@ type ApplyDocumentAssetPropsOptions = {
   protectedAssetMarker?: string;
   scriptOwner?: "head" | "next-script";
 };
-export declare function extractDocumentAssetProps(html: string): {
+/**
+ * Read and strip the nonce and crossOrigin props that `<Head>` and
+ * `<NextScript />` recorded on their tags, found by this render's token.
+ */
+export declare function extractDocumentAssetProps(html: string, token: string): {
   html: string;
   props: DocumentAssetProps;
 };

package/dist/server/pages-document-asset-props.js

@@ -1,4 +1,6 @@
+import { escapeRegExp } from "../utils/regex.js";
 import { escapeHtmlAttr } from "./html.js";
+import { getDocumentHeadOpenMarker, getDocumentScriptsPlaceholder } from "../shims/document-placeholders.js";
 //#region src/server/pages-document-asset-props.ts
 const HEAD_NONCE_ATTR = "data-vinext-head-nonce";
 const HEAD_CROSS_ORIGIN_ATTR = "data-vinext-head-cross-origin";
@@ -11,9 +13,15 @@ function readAttribute(tag, name) {
 function removeAttributes(tag, names) {
 	return tag.replace(new RegExp(`\\s(?:${names.join("|")})="[^"]*"`, "g"), "");
 }
-function extractDocumentAssetProps(html) {
-	const headTag = html.match(/<head\b[^>]*>/i)?.[0];
-	const nextScriptTag = html.match(/<span\b[^>]*>(?=<!-- __NEXT_SCRIPTS__ -->)/i)?.[0];
+/**
+* Read and strip the nonce and crossOrigin props that `<Head>` and
+* `<NextScript />` recorded on their tags, found by this render's token.
+*/
+function extractDocumentAssetProps(html, token) {
+	const headTagPattern = new RegExp(`<head\\b[^>]*${escapeRegExp(getDocumentHeadOpenMarker(token))}[^>]*>`, "i");
+	const nextScriptTagPattern = new RegExp(`<span\\b[^>]*>(?=${escapeRegExp(getDocumentScriptsPlaceholder(token))})`, "i");
+	const headTag = html.match(headTagPattern)?.[0];
+	const nextScriptTag = html.match(nextScriptTagPattern)?.[0];
 	const props = {
 		headNonce: readAttribute(headTag, HEAD_NONCE_ATTR),
 		headCrossOrigin: readAttribute(headTag, HEAD_CROSS_ORIGIN_ATTR),
@@ -21,14 +29,14 @@ function extractDocumentAssetProps(html) {
 		scriptCrossOrigin: readAttribute(nextScriptTag, SCRIPT_CROSS_ORIGIN_ATTR)
 	};
 	return {
-		html: html.replace(/<head\b[^>]*>/i, (tag) => removeAttributes(tag, [HEAD_NONCE_ATTR, HEAD_CROSS_ORIGIN_ATTR])).replace(/<span\b[^>]*>(?=<!-- __NEXT_SCRIPTS__ -->)/i, (tag) => removeAttributes(tag, [SCRIPT_NONCE_ATTR, SCRIPT_CROSS_ORIGIN_ATTR])),
+		html: html.replace(headTagPattern, (tag) => removeAttributes(tag, [HEAD_NONCE_ATTR, HEAD_CROSS_ORIGIN_ATTR])).replace(nextScriptTagPattern, (tag) => removeAttributes(tag, [SCRIPT_NONCE_ATTR, SCRIPT_CROSS_ORIGIN_ATTR])),
 		props
 	};
 }
 function addAttribute(tag, name, value, replaceExisting = false) {
 	if (value === void 0) return tag;
 	const attributePattern = new RegExp(`\\s${name}(?:="[^"]*")?`, "i");
-	if (attributePattern.test(tag)) return replaceExisting ? tag.replace(attributePattern, ` ${name}="${escapeHtmlAttr(value)}"`) : tag;
+	if (attributePattern.test(tag)) return replaceExisting ? tag.replace(attributePattern, () => ` ${name}="${escapeHtmlAttr(value)}"`) : tag;
 	if (!tag.endsWith(">")) return tag;
 	const selfClosing = tag.endsWith("/>");
 	const closingStart = selfClosing ? tag.length - 2 : tag.length - 1;

package/dist/server/pages-document-splice.d.ts

@@ -0,0 +1,19 @@
+//#region src/server/pages-document-splice.d.ts
+/**
+ * Drop `<Head>`'s marker attribute and insert `insertion` right after its
+ * opening tag. Dev HTML transforms may add attributes after the marker.
+ */
+export declare function spliceDocumentHeadOpen(html: string, token: string, insertion: string): string;
+/** Insert `insertion` right before `<Head>`'s closing tag. */
+export declare function spliceDocumentHeadClose(html: string, token: string, insertion: string): string;
+/** Put the generated hydration scripts where `<NextScript />` rendered. */
+export declare function spliceDocumentScripts(html: string, token: string, scripts: string): string;
+/**
+ * Split the Document where `<Main />` rendered. Like Next.js, a Document
+ * without `<Main />` gets the page body after its own markup.
+ */
+export declare function splitDocumentAtMain(html: string, token: string): {
+  prefix: string;
+  suffix: string;
+};
+//#endregion

package/dist/server/pages-document-splice.js

@@ -0,0 +1,55 @@
+import { getDocumentHeadCloseMarker, getDocumentHeadOpenMarker, getDocumentMainPlaceholder, getDocumentScriptsPlaceholder } from "../shims/document-placeholders.js";
+//#region src/server/pages-document-splice.ts
+/**
+* Splices framework output into a serialized custom Pages Router Document.
+*
+* `<Head>`, `<Main />` and `<NextScript />` mark their splice points with the
+* per-render token from `vinext/shims/document-placeholders`, so nothing the
+* Document renders can be taken for one. Each edit slices at a located index
+* instead of calling `String#replace`, so inserted HTML is never parsed for
+* `$&`-style replacement patterns. Like Next.js, a Document that leaves out
+* one of those components gets nothing inserted for it.
+*/
+function spliceMarker(html, marker, insertion) {
+	const index = html.indexOf(marker);
+	if (index === -1) return html;
+	return html.slice(0, index) + insertion + html.slice(index + marker.length);
+}
+/**
+* Drop `<Head>`'s marker attribute and insert `insertion` right after its
+* opening tag. Dev HTML transforms may add attributes after the marker.
+*/
+function spliceDocumentHeadOpen(html, token, insertion) {
+	const marker = getDocumentHeadOpenMarker(token);
+	const index = html.indexOf(marker);
+	if (index === -1) return html;
+	const tagEnd = html.indexOf(">", index + marker.length) + 1;
+	if (tagEnd === 0) return html;
+	return html.slice(0, index) + html.slice(index + marker.length, tagEnd) + insertion + html.slice(tagEnd);
+}
+/** Insert `insertion` right before `<Head>`'s closing tag. */
+function spliceDocumentHeadClose(html, token, insertion) {
+	return spliceMarker(html, getDocumentHeadCloseMarker(token), insertion);
+}
+/** Put the generated hydration scripts where `<NextScript />` rendered. */
+function spliceDocumentScripts(html, token, scripts) {
+	return spliceMarker(html, getDocumentScriptsPlaceholder(token), scripts);
+}
+/**
+* Split the Document where `<Main />` rendered. Like Next.js, a Document
+* without `<Main />` gets the page body after its own markup.
+*/
+function splitDocumentAtMain(html, token) {
+	const placeholder = getDocumentMainPlaceholder(token);
+	const index = html.indexOf(placeholder);
+	if (index === -1) return {
+		prefix: html,
+		suffix: ""
+	};
+	return {
+		prefix: html.slice(0, index),
+		suffix: html.slice(index + placeholder.length)
+	};
+}
+//#endregion
+export { spliceDocumentHeadClose, spliceDocumentHeadOpen, spliceDocumentScripts, splitDocumentAtMain };

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

@@ -24,6 +24,15 @@ type PagesI18nRequestInfo = {
   domainLocale?: DomainLocale;
   redirectUrl?: string;
 };
+/**
+ * Return the configured locale that the first pathname segment names, compared
+ * case-insensitively (`/EN/about` -> `"en"`), or `undefined` when there is none.
+ * The configured casing is returned, not the request's.
+ *
+ * Ported from Next.js: packages/next/src/shared/lib/i18n/normalize-locale-path.ts
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/i18n/normalize-locale-path.ts
+ */
+export declare function detectPathnameLocale(pathname: string, locales: readonly string[]): string | undefined;
 /**
  * Prepend the default locale prefix to a pathname when i18n is configured and
  * the path does not already carry a locale prefix. Mirrors Next.js's
@@ -42,7 +51,9 @@ type PagesI18nRequestInfo = {
  *   - `/__vinext/*` (vinext-internal endpoints)
  *
  * Returns the input unchanged when i18n is not configured or when the path
- * already starts with one of the configured locales. The host-based default
+ * already starts with one of the configured locales (compared
+ * case-insensitively, like Next.js's `normalizeLocalePath`, so `/EN/about`
+ * is left alone rather than becoming `/en/EN/about`). The host-based default
  * locale (i18n.domains[].defaultLocale) is preferred over the global default
  * when supplied, matching Next.js's `domainLocale.defaultLocale` branch.
  *

package/dist/server/pages-i18n.js

@@ -9,6 +9,19 @@ function readHeader(headers, name) {
 }
 const normalizeHostname = normalizeDomainHostname;
 /**
+* Return the configured locale that the first pathname segment names, compared
+* case-insensitively (`/EN/about` -> `"en"`), or `undefined` when there is none.
+* The configured casing is returned, not the request's.
+*
+* Ported from Next.js: packages/next/src/shared/lib/i18n/normalize-locale-path.ts
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/i18n/normalize-locale-path.ts
+*/
+function detectPathnameLocale(pathname, locales) {
+	const segment = pathname.split("/", 2)[1]?.toLowerCase();
+	if (!segment) return void 0;
+	return locales.find((locale) => locale.toLowerCase() === segment);
+}
+/**
 * Prepend the default locale prefix to a pathname when i18n is configured and
 * the path does not already carry a locale prefix. Mirrors Next.js's
 * server-side path normalisation in `resolve-routes.ts` (lines ~250-263):
@@ -26,7 +39,9 @@ const normalizeHostname = normalizeDomainHostname;
 *   - `/__vinext/*` (vinext-internal endpoints)
 *
 * Returns the input unchanged when i18n is not configured or when the path
-* already starts with one of the configured locales. The host-based default
+* already starts with one of the configured locales (compared
+* case-insensitively, like Next.js's `normalizeLocalePath`, so `/EN/about`
+* is left alone rather than becoming `/en/EN/about`). The host-based default
 * locale (i18n.domains[].defaultLocale) is preferred over the global default
 * when supplied, matching Next.js's `domainLocale.defaultLocale` branch.
 *
@@ -42,8 +57,7 @@ const normalizeHostname = normalizeDomainHostname;
 function normalizeDefaultLocalePathname(pathname, i18n, options = {}) {
 	if (!i18n) return pathname;
 	if (pathname.startsWith("/_next/") || pathname.startsWith("/__vinext/")) return pathname;
-	const parts = pathname.split("/", 3);
-	if (parts[1] && i18n.locales.includes(parts[1])) return pathname;
+	if (detectPathnameLocale(pathname, i18n.locales)) return pathname;
 	const defaultLocale = detectDomainLocale(i18n.domains, options.hostname ?? void 0)?.defaultLocale ?? i18n.defaultLocale;
 	if (pathname === "/") return `/${defaultLocale}`;
 	return `/${defaultLocale}${pathname}`;
@@ -229,4 +243,4 @@ function resolvePagesI18nRequest(url, i18nConfig, headers, hostname, basePath =
 	};
 }
 //#endregion
-export { detectDomainLocale, detectLocaleFromAcceptLanguage, extractLocaleFromUrl, getLocaleRedirect, normalizeDefaultLocalePathname, parseCookieLocaleFromHeader, resolvePagesI18nRequest, stripI18nLocaleForApiRoute };
+export { detectDomainLocale, detectLocaleFromAcceptLanguage, detectPathnameLocale, extractLocaleFromUrl, getLocaleRedirect, normalizeDefaultLocalePathname, parseCookieLocaleFromHeader, resolvePagesI18nRequest, stripI18nLocaleForApiRoute };

package/dist/server/pages-node-compat.d.ts

@@ -29,7 +29,6 @@ export type PagesReqResResponse = Writable & {
   send: (data: unknown) => void;
   redirect: (statusOrUrl: number | string, url?: string) => PagesReqResResponse;
   getHeaders: () => PagesReqResHeaders;
-  revalidate: (urlPath: string, opts?: RevalidateOptions) => Promise<void>;
   setPreviewData: (data: object | string, options?: {
     maxAge?: number;
     path?: string;
@@ -41,6 +40,9 @@ export type PagesReqResResponse = Writable & {
     enable?: boolean;
   }) => PagesReqResResponse;
 };
+export type PagesApiReqResResponse = PagesReqResResponse & {
+  revalidate: (urlPath: string, opts?: RevalidateOptions) => Promise<void>;
+};
 type PagesRequestCookiesCarrier = {
   headers: {
     cookie?: string | string[] | null | undefined;
@@ -48,17 +50,19 @@ type PagesRequestCookiesCarrier = {
   cookies?: unknown;
 };
 type CreatePagesReqResOptions = {
-  allowedRevalidateHeaderKeys?: readonly string[];
   body: unknown;
   initialResponseHeaders?: Headers;
   query: PagesRequestQuery;
   request: Request;
-  trustedRevalidateOrigin?: string;
   url: string;
 };
-type CreatePagesReqResResult = {
+type CreatePagesApiReqResOptions = CreatePagesReqResOptions & {
+  allowedRevalidateHeaderKeys?: readonly string[];
+  trustedRevalidateOrigin?: string;
+};
+type CreatePagesReqResResult<Res extends PagesReqResResponse = PagesReqResResponse> = {
   req: PagesReqResRequest;
-  res: PagesReqResResponse;
+  res: Res;
   responsePromise: Promise<Response>;
 };
 /**
@@ -85,5 +89,12 @@ export declare function attachPagesPreviewApi(req: PagesReqResRequest, res: Page
 export declare function markVinextStreamedApiResponse(response: Response): void;
 export declare function isVinextStreamedApiResponse(response: Response): boolean;
 export declare function createPagesReqRes(options: CreatePagesReqResOptions): CreatePagesReqResResult;
+/**
+ * Create the req/res pair for a Pages API route. Only API responses get
+ * `res.revalidate()`: Next.js attaches it in apiResolver
+ * (`packages/next/src/server/api-utils/node/api-resolver.ts`), so a page's
+ * getServerSideProps `res` never carries the revalidation secret.
+ */
+export declare function createPagesApiReqRes(options: CreatePagesApiReqResOptions): CreatePagesReqResResult<PagesApiReqResResponse>;
 //#endregion
 export { PagesBodyParseError as PagesApiBodyParseError };

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

@@ -119,9 +119,6 @@ function attachPagesPreviewApi(req, res) {
 var PagesResponseStream = class extends Writable {
 	resolveResponse;
 	rejectResponse;
-	requestHeaders;
-	trustedRevalidateOrigin;
-	allowedRevalidateHeaderKeys;
 	resStatusCode = 200;
 	resHeaders = {};
 	setCookieHeaders = [];
@@ -131,13 +128,10 @@ var PagesResponseStream = class extends Writable {
 	streamEnded = false;
 	pendingWrite = null;
 	discardBody = false;
-	constructor(resolveResponse, rejectResponse, requestHeaders, trustedRevalidateOrigin, allowedRevalidateHeaderKeys = []) {
+	constructor(resolveResponse, rejectResponse) {
 		super();
 		this.resolveResponse = resolveResponse;
 		this.rejectResponse = rejectResponse;
-		this.requestHeaders = requestHeaders;
-		this.trustedRevalidateOrigin = trustedRevalidateOrigin;
-		this.allowedRevalidateHeaderKeys = allowedRevalidateHeaderKeys;
 		this.once("error", (err) => {
 			if (!this.resolved) {
 				this.resolved = true;
@@ -206,9 +200,6 @@ var PagesResponseStream = class extends Writable {
 		if (this.setCookieHeaders.length > 0) headers["set-cookie"] = this.setCookieHeaders;
 		return headers;
 	}
-	async revalidate(urlPath, opts) {
-		await performOnDemandRevalidate(this.requestHeaders, urlPath, opts, this.trustedRevalidateOrigin, this.allowedRevalidateHeaderKeys);
-	}
 	setPreviewData(data, options = {}) {
 		setPagesPreviewData(this, data, options);
 		return this;
@@ -346,7 +337,7 @@ function createPagesReqRes(options) {
 		resolveResponse = resolve;
 		rejectResponse = reject;
 	});
-	const res = new PagesResponseStream(resolveResponse, rejectResponse, options.request.headers, options.trustedRevalidateOrigin ?? new URL(options.request.url).origin, options.allowedRevalidateHeaderKeys);
+	const res = new PagesResponseStream(resolveResponse, rejectResponse);
 	for (const [name, value] of options.initialResponseHeaders ?? []) {
 		if (name.toLowerCase() === "set-cookie") continue;
 		res.setHeader(name, value);
@@ -360,5 +351,22 @@ function createPagesReqRes(options) {
 		responsePromise
 	};
 }
+/**
+* Create the req/res pair for a Pages API route. Only API responses get
+* `res.revalidate()`: Next.js attaches it in apiResolver
+* (`packages/next/src/server/api-utils/node/api-resolver.ts`), so a page's
+* getServerSideProps `res` never carries the revalidation secret.
+*/
+function createPagesApiReqRes(options) {
+	const { req, res, responsePromise } = createPagesReqRes(options);
+	const trustedRevalidateOrigin = options.trustedRevalidateOrigin ?? new URL(options.request.url).origin;
+	return {
+		req,
+		res: Object.assign(res, { async revalidate(urlPath, opts) {
+			await performOnDemandRevalidate(options.request.headers, urlPath, opts, trustedRevalidateOrigin, options.allowedRevalidateHeaderKeys);
+		} }),
+		responsePromise
+	};
+}
 //#endregion
-export { PagesBodyParseError as PagesApiBodyParseError, attachPagesPreviewApi, attachPagesRequestCookies, createPagesReqRes, isVinextStreamedApiResponse, markVinextStreamedApiResponse, parsePagesApiBody };
+export { PagesBodyParseError as PagesApiBodyParseError, attachPagesPreviewApi, attachPagesRequestCookies, createPagesApiReqRes, createPagesReqRes, isVinextStreamedApiResponse, markVinextStreamedApiResponse, parsePagesApiBody };

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

@@ -1,5 +1,4 @@
 import { Route } from "../routing/pages-router.js";
-import { VinextNextData } from "../client/vinext-next-data.js";
 import { CachedPagesValue, CachedRedirectValue } from "../shims/cache-handler.js";
 import { ISRCacheEntry, IsrWritePolicy } from "./isr-cache.js";
 import { PagesPreviewData } from "./pages-preview.js";
@@ -43,6 +42,14 @@ export declare function assertPages404DoesNotReturnNotFound(routePattern: string
  * - packages/next/src/server/render.tsx (`metadata.cacheControl`)
  * - packages/next/src/server/route-modules/pages/pages-handler.ts
  */
+/**
+ * Next.js renders a shared getStaticProps status page (/404, /500) for its own
+ * pathname, never for the request that reached it. Only the original
+ * request's trailing slash carries over under `trailingSlash`, read before
+ * rewrites and locale stripping.
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/server/route-modules/pages/pages-handler.ts
+ */
+export declare function resolvePagesStatusPageRenderPath(statusPathname: string, trailingSlash: boolean, requestPathname: string): string;
 export declare function resolvePagesRevalidateSeconds(result: PagesPagePropsResult, routeUrl?: string): number | false;
 type PagesMutableGsspResponse = {
   headersSent: boolean;
@@ -115,25 +122,9 @@ export type PagesPageModule = {
     revalidateReason?: "build" | "on-demand" | "stale";
   }) => Promise<PagesPagePropsResult> | PagesPagePropsResult;
 };
-type RenderPagesIsrHtmlOptions = {
-  buildId: string | null;
-  cachedHtml: string;
-  collectIsrHeadHTML?: (() => string) | undefined;
-  createPageElement: (props: Record<string, unknown>) => ReactNode;
-  i18n: PagesI18nRenderContext;
-  pageProps: Record<string, unknown>;
-  props?: Record<string, unknown>;
-  params: Record<string, unknown>;
-  renderIsrPassToStringAsync: (element: ReactNode, onHeadReady?: () => Promise<void>) => Promise<string>;
-  routePattern: string;
-  safeJsonStringify: (value: unknown) => string;
-  vinext?: VinextNextData["__vinext"];
-  nextData?: PagesNextDataExtras;
-};
 export type ResolvePagesPageDataOptions = {
   applyRequestContexts: () => void;
   basePath?: string;
-  buildId: string | null;
   /**
    * When true, this is a `/_next/data/<buildId>/<page>.json` request. Callers
    * that respond with a JSON envelope (`{ pageProps }`) instead of HTML must
@@ -145,6 +136,8 @@ export type ResolvePagesPageDataOptions = {
   isDataReq?: boolean;
   err?: unknown;
   createGsspReqRes: () => PagesGsspContextResponse;
+  /** The req/res for a stale regeneration's render; defaults to `createGsspReqRes`. */
+  createRegenerationReqRes?: () => PagesGsspContextResponse;
   createAppTree?: (props: Record<string, unknown>) => ReactNode;
   createPageElement: (props: Record<string, unknown>) => ReactNode;
   fontLinkHeader: string;
@@ -188,6 +181,12 @@ export type ResolvePagesPageDataOptions = {
    * fallback path. Mirrors Next.js `unstable_onlyGenerated`.
    */
   revalidateOnlyGenerated?: boolean;
+  /**
+   * Set when a cache adapter regenerates an entry it stores for this build.
+   * The stored entry proves the path was admitted, so `getStaticPaths()` is
+   * skipped as it is for an entry read through `isrGet`.
+   */
+  regeneratesStoredEntry?: boolean;
   previewData?: PagesPreviewData | false;
   /**
    * The deployment ID used for deployment-skew protection. When set, it is
@@ -226,14 +225,19 @@ export type ResolvePagesPageDataOptions = {
     routePath: string;
     routeType: "render";
   }) => void;
-  renderIsrPassToStringAsync: (element: ReactNode, onHeadReady?: () => Promise<void>) => Promise<string>;
   /**
-   * Serializes the `<head>` collected by an ISR regeneration render. Called
-   * inside that render's head scope so the regenerated shell can pick up
-   * `next/head` output derived from the refreshed `getStaticProps` data.
+   * Render the whole document for regenerated props and store it as the ISR
+   * entry, through the same pipeline (and with the same cache write) as a
+   * foreground MISS. Next.js re-runs its full render on regeneration too;
+   * resolves once the entry is written.
    */
-  collectIsrHeadHTML?: (() => string) | undefined;
-  vinext?: VinextNextData["__vinext"];
+  renderIsrDocument: (input: {
+    documentReqRes: PagesGsspContextResponse;
+    expireSeconds: number | undefined;
+    pageProps: Record<string, unknown>;
+    props: Record<string, unknown>;
+    revalidateSeconds: number | false;
+  }) => Promise<void>;
   nextData?: PagesNextDataExtras;
   /**
    * The request's User-Agent string. When this matches a known crawler/bot
@@ -250,6 +254,11 @@ export type ResolvePagesPageDataOptions = {
    * response is a `304 Not Modified` with no body.
    */
   ifNoneMatch?: string;
+  /**
+   * The incoming request's `If-Modified-Since` header value. As in Next.js,
+   * which gives a page no Last-Modified, a request with it gets the page.
+   */
+  ifModifiedSince?: string;
   /**
    * The incoming request's `Cache-Control` header value. When it contains
    * `no-cache`, the 304 short-circuit is skipped and a full response is
@@ -320,6 +329,5 @@ export type PagesRouteParam = {
 };
 export declare function getPagesRouteParams(routePattern: string): PagesRouteParam[];
 export declare function matchesPagesStaticPath(pathEntry: PagesStaticPathsEntry, params: Record<string, unknown>, routeParams: PagesRouteParam[], routeUrl: string, i18n?: Pick<PagesI18nRenderContext, "locale" | "locales" | "defaultLocale">): boolean;
-export declare function renderPagesIsrHtml(options: RenderPagesIsrHtmlOptions): Promise<string>;
 export declare function resolvePagesPageData(options: ResolvePagesPageDataOptions): Promise<ResolvePagesPageDataResult>;
 //#endregion