vinext 1.4.3 → 1.4.5

package/dist/server/pages-execution-tracing.js

@@ -1,7 +1,7 @@
-import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
+import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { frameworkTracer } from "./tracer.js";
-//#region src/server/pages-execution-tracing.ts
+// src/server/pages-execution-tracing.ts
 function createPagesDataSpanDescriptor(method, routePattern) {
 	const route = patternToNextFormat(routePattern);
 	return {
@@ -76,5 +76,4 @@ function createFindPageComponentsSpanDescriptor(routePattern) {
 function traceFindPageComponents(routePattern, callback) {
 	return frameworkTracer.trace(createFindPageComponentsSpanDescriptor(routePattern), callback);
 }
-//#endregion
 export { createFindPageComponentsSpanDescriptor, createPagesApiHandlerSpanDescriptor, createPagesDataSpanDescriptor, createPagesDocumentSpanDescriptor, traceFindPageComponents, tracePagesApiHandler, tracePagesData, tracePagesDocument, tracePagesDocumentStream };

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

@@ -1,5 +1,4 @@
 import { NextRouter } from "../shims/router.js";
-//#region src/server/pages-get-initial-props.d.ts
 type PagesGetInitialPropsContext = {
   req?: unknown;
   res?: unknown;
@@ -76,5 +75,4 @@ export type DevAppInitialPropsContext = {
  * data code does not run on the cache hot path.
  */
 export declare function loadDevAppInitialProps(ctx: DevAppInitialPropsContext): Promise<DevAppInitialPropsResult>;
-//#endregion
 export {};

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

@@ -1,4 +1,4 @@
-//#region src/server/pages-get-initial-props.ts
+// src/server/pages-get-initial-props.ts
 /**
 * Build the URL-state subset of Next.js's ServerRouter used by isolated
 * initial-props helpers. Real request handlers pass their full `next/router`
@@ -95,5 +95,4 @@ async function loadDevAppInitialProps(ctx) {
 		renderProps: isPropsObject(initialProps) ? initialProps : {}
 	};
 }
-//#endregion
 export { createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadDevAppInitialProps, loadPagesGetInitialProps };

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

@@ -1,6 +1,5 @@
 import { NextI18nConfig } from "../config/next-config.js";
 import { DomainLocale, detectDomainLocale } from "../utils/domain-locale.js";
-//#region src/server/pages-i18n.d.ts
 type HeaderValue = string | string[] | undefined;
 type HeaderBag = Headers | Record<string, HeaderValue> | undefined;
 type LocaleRedirectOptions = {
@@ -132,5 +131,4 @@ export declare function detectLocaleFromAcceptLanguage(acceptLang: string | null
 export declare function parseCookieLocaleFromHeader(cookieHeader: string | null | undefined, i18nConfig: NextI18nConfig): string | null;
 export declare function getLocaleRedirect({ headers, nextConfig, pathLocale, urlParsed }: LocaleRedirectOptions): string | undefined;
 export declare function resolvePagesI18nRequest(url: string, i18nConfig: NextI18nConfig, headers?: HeaderBag, hostname?: string | null, basePath?: string, trailingSlash?: boolean): PagesI18nRequestInfo;
-//#endregion
 export { detectDomainLocale };

package/dist/server/pages-i18n.js

@@ -1,5 +1,5 @@
 import { detectDomainLocale, normalizeDomainHostname } from "../utils/domain-locale.js";
-//#region src/server/pages-i18n.ts
+// src/server/pages-i18n.ts
 function readHeader(headers, name) {
 	if (!headers) return void 0;
 	if (headers instanceof Headers) return headers.get(name) ?? void 0;
@@ -271,5 +271,4 @@ function resolvePagesI18nRequest(url, i18nConfig, headers, hostname, basePath =
 		redirectUrl
 	};
 }
-//#endregion
 export { detectDomainLocale, detectLocaleFromAcceptLanguage, detectPathnameLocale, extractLocaleFromUrl, getLocaleRedirect, isLocaleRedirect, markLocaleRedirect, normalizeDefaultLocalePathname, parseCookieLocaleFromHeader, resolvePagesI18nRequest, shouldRestoreLocaleRootTrailingSlash, stripI18nLocaleForApiRoute };

package/dist/server/pages-media-type.d.ts

@@ -1,4 +1,3 @@
-//#region src/server/pages-media-type.d.ts
 /**
  * Shared media-type helpers and body-parse error for Pages API routes.
  *
@@ -30,5 +29,4 @@ export type PagesBodyDecoder = {
 export declare function createPagesBodyDecoder(contentType: string | null | undefined): Promise<{
   mediaType: string;
   decoder: PagesBodyDecoder;
-}>;
-//#endregion
+}>;

package/dist/server/pages-media-type.js

@@ -1,6 +1,6 @@
 import { __toESM } from "../_virtual/_rolldown/runtime.js";
 import { Buffer } from "node:buffer";
-//#region src/server/pages-media-type.ts
+// src/server/pages-media-type.ts
 /**
 * Shared media-type helpers and body-parse error for Pages API routes.
 *
@@ -84,5 +84,4 @@ async function createPagesBodyDecoder(contentType) {
 		decoder: iconvBodyDecoder(decoder)
 	};
 }
-//#endregion
 export { PagesBodyParseError, createPagesBodyDecoder, isJsonMediaType };

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

@@ -2,7 +2,6 @@ import { PagesBodyParseError } from "./pages-media-type.js";
 import { RevalidateOptions } from "./pages-revalidate.js";
 import { PagesPreviewData } from "./pages-preview.js";
 import { Readable, Writable } from "node:stream";
-//#region src/server/pages-node-compat.d.ts
 export type PagesRequestQuery = Record<string, string | string[]>;
 export type PagesReqResRequest = Readable & {
   method: string;
@@ -98,5 +97,4 @@ export declare function createPagesReqRes(options: CreatePagesReqResOptions): Cr
  * 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

@@ -1,13 +1,13 @@
 import { parseCookieHeader } from "../utils/parse-cookie.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
 import { DEFAULT_PAGES_API_BODY_SIZE_LIMIT } from "./pages-body-parser-config.js";
 import { PagesBodyParseError, createPagesBodyDecoder, isJsonMediaType } from "./pages-media-type.js";
 import { performOnDemandRevalidate } from "./pages-revalidate.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { clearPagesPreviewData, getPagesPreviewState, setPagesDraftMode, setPagesPreviewData } from "./pages-preview.js";
 import { decode } from "node:querystring";
 import { Readable, Stream, Writable } from "node:stream";
-//#region src/server/pages-node-compat.ts
+// src/server/pages-node-compat.ts
 const MAX_PAGES_API_BODY_SIZE = DEFAULT_PAGES_API_BODY_SIZE_LIMIT;
 const NO_BODY_RESPONSE_STATUSES = /* @__PURE__ */ new Set([
 	204,
@@ -418,5 +418,4 @@ function createPagesApiReqRes(options) {
 		responsePromise
 	};
 }
-//#endregion
 export { PagesBodyParseError as PagesApiBodyParseError, attachPagesPreviewApi, attachPagesRequestCookies, createPagesApiReqRes, createPagesReqRes, isVinextStreamedApiResponse, markVinextStreamedApiResponse, parsePagesApiBody };

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

@@ -2,10 +2,9 @@ import { Route } from "../routing/pages-router.js";
 import { CachedPagesValue, CachedRedirectValue } from "../shims/cache-handler.js";
 import { ISRCacheEntry, IsrWritePolicy } from "./isr-cache.js";
 import { PagesPreviewData } from "./pages-preview.js";
-import { PagesGetInitialPropsRouter } from "./pages-get-initial-props.js";
 import { PagesGsspResponse, PagesI18nRenderContext, PagesNextDataExtras } from "./pages-page-response.js";
+import { PagesGetInitialPropsRouter } from "./pages-get-initial-props.js";
 import { ReactNode } from "react";
-//#region src/server/pages-page-data.d.ts
 export type PagesRedirectResult = {
   destination: string;
   permanent?: boolean;
@@ -312,6 +311,11 @@ export declare function resolvePagesRedirect(redirect: PagesRedirectResult, opti
 }): ResolvedPagesRedirect;
 export declare function resolvePagesRedirectLocation(redirect: ResolvedPagesRedirect, configuredBasePath?: string): string;
 export declare function buildPagesRedirectProps(redirect: ResolvedPagesRedirect, props: PagesRenderProps): PagesRenderProps;
+/**
+ * Marks a plain 500 for a page that could not render, so the prerenderer can
+ * tell it apart from the custom `/500` page answering with its own status.
+ */
+export declare function markPagesPrerenderRenderError(headers: Headers): void;
 /**
  * Compare a `getStaticPaths` entry against the actual request params.
  *
@@ -335,5 +339,4 @@ 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 resolvePagesPageData(options: ResolvePagesPageDataOptions): Promise<ResolvePagesPageDataResult>;
-//#endregion
 export {};

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

@@ -1,23 +1,23 @@
-import { isUnknownRecord } from "../utils/record.js";
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
-import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER } from "./headers.js";
+import { recordRouteCacheability } from "../shims/cacheability-classification.js";
+import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { normalizePathnameForRouteMatch } from "../routing/utils.js";
-import { isDangerousScheme } from "../shims/url-safety.js";
 import { extractLocaleFromUrl } from "./pages-i18n.js";
-import { buildNextDataPropsJsonResponse } from "./pages-data-route.js";
-import { recordRouteCacheability } from "../shims/cacheability-classification.js";
 import { NEVER_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
 import { buildMissIsrCacheControl, decideIsr } from "./isr-decision.js";
-import { isrCacheControl } from "./isr-cache.js";
-import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import { buildCacheStateHeaders } from "./cache-headers.js";
-import { pagesPathCacheTag } from "./pages-cache-tag.js";
-import { isPageNotModified } from "./http-conditional.js";
+import { isrCacheControl } from "./isr-cache.js";
 import { applyPagesPrerenderRevalidateHeader, generatePagesETag, isPagesStreamingBot, rendersPagesNotModified } from "./pages-page-response.js";
+import { isPageNotModified } from "./http-conditional.js";
 import { createPagesGetInitialPropsRouter, hasPagesGetInitialProps, isResponseSent, loadPagesGetInitialProps } from "./pages-get-initial-props.js";
+import { buildNextDataPropsJsonResponse } from "./pages-data-route.js";
+import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_PRERENDER_RENDER_ERROR_HEADER } from "./headers.js";
 import { isSerializableProps } from "./pages-serializable-props.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
+import { isUnknownRecord } from "../utils/record.js";
+import { isDangerousScheme } from "../shims/url-safety.js";
+import { pagesPathCacheTag } from "./pages-cache-tag.js";
 import { tracePagesData, tracePagesDocument } from "./pages-execution-tracing.js";
-//#region src/server/pages-page-data.ts
+// src/server/pages-page-data.ts
 const ALLOWED_PAGES_REDIRECT_STATUS_CODES = /* @__PURE__ */ new Set([
 	301,
 	302,
@@ -249,6 +249,13 @@ async function loadPagesAppInitialRenderProps(options, getSharedReqRes) {
 	};
 }
 /**
+* Marks a plain 500 for a page that could not render, so the prerenderer can
+* tell it apart from the custom `/500` page answering with its own status.
+*/
+function markPagesPrerenderRenderError(headers) {
+	if (typeof process !== "undefined" && process.env && process.env.VINEXT_PRERENDER === "1") headers.set(VINEXT_PRERENDER_RENDER_ERROR_HEADER, "1");
+}
+/**
 * Build the response for a `getServerSideProps` / `getStaticProps`
 * `{ redirect }` result.
 *
@@ -281,6 +288,7 @@ function buildPagesRedirectResponse(redirect, options, props = { pageProps: {} }
 		headers.set("Cache-Control", "private, no-cache, no-store, max-age=0, must-revalidate");
 		headers.set("Content-Type", "text/plain; charset=utf-8");
 		if (options.deploymentId) headers.set(NEXTJS_DEPLOYMENT_ID_HEADER, options.deploymentId);
+		markPagesPrerenderRenderError(headers);
 		return new Response("Invalid redirect destination", {
 			status: 500,
 			headers
@@ -451,6 +459,7 @@ function finalizeCachedPagesResponse(response, options, html) {
 }
 async function resolvePagesPageData(options) {
 	const userFacingParams = options.route.isDynamic ? options.params : null;
+	const sendsPagePropsJson = options.isDataReq === true && options.routePattern !== "/500";
 	let isFallback = false;
 	let shouldPersistFallbackData = false;
 	let previousCacheEntry;
@@ -458,7 +467,7 @@ async function resolvePagesPageData(options) {
 	if (options.hasPrerenderedPages && options.nextData?.autoExport && !options.scriptNonce && !options.isOnDemandRevalidate && previewData === false) {
 		const cached = await options.isrGet(options.isrCacheKey("pages", options.isrCachePathname ?? options.routeUrl.split("?")[0]));
 		const value = cached?.value.value;
-		if (cached && !cached.isStale && !cached.isExpired && value?.kind === "PAGES") return finalizeCachedPagesResponse(options.isDataReq ? applyCachedPagesRepresentationHeaders(buildNextDataPropsJsonResponse(normalizePagesRenderProps(value.pageData), options.safeJsonStringify, options.deploymentId ? { headers: { [NEXTJS_DEPLOYMENT_ID_HEADER]: options.deploymentId } } : void 0), "HIT", cached.value, options) : buildPagesCacheResponse(value.html, "HIT", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, options.statusCode ?? value.status, value.headers), options, options.isDataReq ? void 0 : value.html);
+		if (cached && !cached.isStale && !cached.isExpired && value?.kind === "PAGES") return finalizeCachedPagesResponse(sendsPagePropsJson ? applyCachedPagesRepresentationHeaders(buildNextDataPropsJsonResponse(normalizePagesRenderProps(value.pageData), options.safeJsonStringify, options.deploymentId ? { headers: { [NEXTJS_DEPLOYMENT_ID_HEADER]: options.deploymentId } } : void 0), "HIT", cached.value, options) : buildPagesCacheResponse(value.html, "HIT", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, options.statusCode ?? value.status, value.headers), options, sendsPagePropsJson ? void 0 : value.html);
 	}
 	let hasStoredEntry = options.regeneratesStoredEntry === true;
 	if (options.route.isDynamic && typeof options.pageModule.getStaticProps === "function" && typeof options.pageModule.getServerSideProps !== "function" && !hasStoredEntry && !options.isOnDemandRevalidate && previewData === false) {
@@ -683,19 +692,19 @@ async function resolvePagesPageData(options) {
 			if (cachedValue === null) return buildCachedPagesNotFoundResult(options, cached.value, "HIT");
 			if (isLegacyCachedNotFound) return buildCachedPagesNotFoundResult(options, cached.value, "HIT");
 			if (cachedRedirect) return finalizeCachedPagesResponse(applyCachedPagesRepresentationHeaders(buildCachedPagesRedirectResponse(cachedRedirect, options), "HIT", cached.value, options), options);
-			if (options.isDataReq && cachedValue?.kind === "PAGES") return finalizeCachedPagesResponse(applyCachedPagesRepresentationHeaders(buildNextDataPropsJsonResponse(normalizePagesRenderProps(cachedValue.pageData), options.safeJsonStringify, options.deploymentId ? { headers: { [NEXTJS_DEPLOYMENT_ID_HEADER]: options.deploymentId } } : void 0), "HIT", cached.value, options), options);
+			if (sendsPagePropsJson && cachedValue?.kind === "PAGES") return finalizeCachedPagesResponse(applyCachedPagesRepresentationHeaders(buildNextDataPropsJsonResponse(normalizePagesRenderProps(cachedValue.pageData), options.safeJsonStringify, options.deploymentId ? { headers: { [NEXTJS_DEPLOYMENT_ID_HEADER]: options.deploymentId } } : void 0), "HIT", cached.value, options), options);
 		}
-		if (!options.isOnDemandRevalidate && cached?.isStale === false && !cached.isExpired && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && !cached.isStale && !options.scriptNonce && !options.isDataReq && previewData === false) return finalizeCachedPagesResponse(buildPagesCacheResponse(cachedValue.html, "HIT", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, cachedValue.status, cachedValue.headers), options, cachedValue.html);
-		if (!options.isOnDemandRevalidate && cached && cached.isStale && !cached.isExpired && !options.scriptNonce && previewData === false && (cachedValue === null || cachedRedirect !== null || isLegacyCachedNotFound || options.isDataReq)) {
+		if (!options.isOnDemandRevalidate && cached?.isStale === false && !cached.isExpired && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && !cached.isStale && !options.scriptNonce && !sendsPagePropsJson && previewData === false) return finalizeCachedPagesResponse(buildPagesCacheResponse(cachedValue.html, "HIT", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, options.statusCode ?? cachedValue.status, cachedValue.headers), options, cachedValue.html);
+		if (!options.isOnDemandRevalidate && cached && cached.isStale && !cached.isExpired && !options.scriptNonce && previewData === false && (cachedValue === null || cachedRedirect !== null || isLegacyCachedNotFound || sendsPagePropsJson)) {
 			scheduleStaleRegeneration();
 			if (cachedValue === null) return buildCachedPagesNotFoundResult(options, cached.value, "STALE");
 			if (isLegacyCachedNotFound) return buildCachedPagesNotFoundResult(options, cached.value, "STALE");
 			if (cachedRedirect) return finalizeCachedPagesResponse(applyCachedPagesRepresentationHeaders(buildCachedPagesRedirectResponse(cachedRedirect, options), "STALE", cached.value, options), options);
 			if (cachedValue?.kind === "PAGES") return finalizeCachedPagesResponse(applyCachedPagesRepresentationHeaders(buildNextDataPropsJsonResponse(normalizePagesRenderProps(cachedValue.pageData), options.safeJsonStringify, options.deploymentId ? { headers: { [NEXTJS_DEPLOYMENT_ID_HEADER]: options.deploymentId } } : void 0), "STALE", cached.value, options), options);
 		}
-		if (!options.isOnDemandRevalidate && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && cached.isStale && !cached.isExpired && !options.scriptNonce && !options.isDataReq && previewData === false) {
+		if (!options.isOnDemandRevalidate && cachedValue?.kind === "PAGES" && !cachedValue.generatedFromDataRequest && cached && cached.isStale && !cached.isExpired && !options.scriptNonce && !sendsPagePropsJson && previewData === false) {
 			scheduleStaleRegeneration();
-			return finalizeCachedPagesResponse(buildPagesCacheResponse(cachedValue.html, "STALE", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, cachedValue.status, cachedValue.headers), options, cachedValue.html);
+			return finalizeCachedPagesResponse(buildPagesCacheResponse(cachedValue.html, "STALE", options.fontLinkHeader, void 0, options.expireSeconds, cached.value.cacheControl, options.statusCode ?? cachedValue.status, cachedValue.headers), options, cachedValue.html);
 		}
 		const generatedPageData = !options.isOnDemandRevalidate && previewData === false && cached?.isStale === false && !cached.isExpired && cachedValue?.kind === "PAGES" && cachedValue.generatedFromDataRequest && isUnknownRecord(cachedValue.pageData) ? cachedValue.pageData : null;
 		if (!generatedPageData) {
@@ -804,7 +813,7 @@ async function resolvePagesPageData(options) {
 			};
 		}
 	}
-	if (options.isDataReq) {
+	if (sendsPagePropsJson) {
 		const sentResponse = await takeSentResponse();
 		if (sentResponse) return sentResponse;
 	}
@@ -819,5 +828,4 @@ async function resolvePagesPageData(options) {
 		isFallback: false
 	};
 }
-//#endregion
-export { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds, resolvePagesStatusPageRenderPath, setPagesResponseHeader };
+export { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, markPagesPrerenderRenderError, matchesPagesStaticPath, mergePagesDataProps, mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds, resolvePagesStatusPageRenderPath, setPagesResponseHeader };

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

@@ -1,10 +1,9 @@
 import { PagesPreviewState } from "./pages-preview.js";
+import { PagesPageModule } from "./pages-page-data.js";
+import { renderPagesPageResponse } from "./pages-page-response.js";
 import { RenderPageEnhancers } from "./pages-document-initial-props.js";
 import { PagesGetInitialPropsRouter } from "./pages-get-initial-props.js";
-import { renderPagesPageResponse } from "./pages-page-response.js";
-import { PagesPageModule } from "./pages-page-data.js";
 import { ComponentType, ReactNode } from "react";
-//#region src/server/pages-page-handler.d.ts
 export declare function renderTracedPagesPageResponse(options: Parameters<typeof renderPagesPageResponse>[0]): Promise<Response>;
 export declare function finalizePagesPreviewResponse(response: Response, preview: PagesPreviewState): Response;
 type PageRoute = {
@@ -139,5 +138,4 @@ type RenderPageOptions = {
  * accepts the same options shape the generated entry always passed inline.
  */
 export declare function createPagesPageHandler(opts: CreatePagesPageHandlerOptions): (request: Request, url: string, manifest: Record<string, string[]> | null | undefined, middlewareHeaders: Headers | null | undefined, options: RenderPageOptions | null | undefined, initialResponseHeaders?: Headers) => Promise<Response>;
-//#endregion
 export {};

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

@@ -1,37 +1,37 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
-import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { PRERENDER_REVALIDATE_HEADER } from "../utils/protocol-headers.js";
-import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_CACHE_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
-import { normalizePathnameForRouteMatch } from "../routing/utils.js";
+import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
+import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { extractLocaleFromUrl, markLocaleRedirect, resolvePagesI18nRequest } from "./pages-i18n.js";
-import { buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, normalizePagesDataRequest, parseNextDataPathname } from "./pages-data-route.js";
-import { reportRequestError } from "./instrumentation.js";
-import { logRequestError } from "./request-error-log.js";
-import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
-import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityExplicitResponsePolicy, markRouteCacheabilityFinalResponseUncacheable, recordRouteCacheability } from "../shims/cacheability-classification.js";
+import { createPagesReqRes } from "./pages-node-compat.js";
+import { PAGES_PREVIEW_CACHE_CONTROL, appendPagesPreviewClearCookies, getPagesPreviewState } from "./pages-preview.js";
+import { markPagesPrerenderRenderError, mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesStatusPageRenderPath, setPagesResponseHeader } from "./pages-page-data.js";
+import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
+import { applyPagesPrerenderRevalidateHeader, renderPagesPageResponse } from "./pages-page-response.js";
+import { traceFindPageComponents, tracePagesDocumentStream } from "./pages-execution-tracing.js";
+import { buildPagesReadinessNextData } from "./pages-readiness.js";
 import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, hasCdnResponsePolicy, hasExplicitNonCacheableResponsePolicy, isCdnResponsePolicyHeader, shouldUseNextDeployCacheControl } from "./cache-control.js";
-import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { isOnDemandRevalidateRequest } from "./revalidation-request.js";
+import { buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, normalizePagesDataRequest, parseNextDataPathname } from "./pages-data-route.js";
+import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
 import { coalesceOnDemandResponse, isrGet, isrSet, pagesIsrCacheKey, triggerBackgroundRegeneration } from "./isr-cache.js";
-import { ensureFetchPatch, setCurrentFetchDraftMode } from "../shims/fetch-cache.js";
-import { mergeRouteParamsIntoQuery, parseQueryString } from "../utils/query.js";
 import { getScriptNonceFromHeaderSources } from "./csp.js";
-import { buildDefaultPagesNotFoundResponse } from "./pages-default-404.js";
-import { buildPagesReadinessNextData } from "./pages-readiness.js";
-import { resolvePagesPageMethodResponse } from "./pages-page-method.js";
-import { setCacheStateHeaders } from "./cache-headers.js";
+import { reportRequestError } from "./instrumentation.js";
+import { setFrameworkRequestRoute } from "./request-tracing.js";
+import { closeAfterResponse, closeAfterResponseWithBody, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
+import { ensureFetchPatch, setCurrentFetchDraftMode } from "../shims/fetch-cache.js";
+import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityExplicitResponsePolicy, markRouteCacheabilityFinalResponseUncacheable, recordRouteCacheability } from "../shims/cacheability-classification.js";
+import { collectAssetTags, resolveClientModuleUrl } from "./pages-asset-tags.js";
+import { NEXTJS_CACHE_HEADER, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_CACHE_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
+import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { pagesPathCacheTag } from "./pages-cache-tag.js";
-import { applyPagesPrerenderRevalidateHeader, renderPagesPageResponse } from "./pages-page-response.js";
+import { setCacheStateHeaders } from "./cache-headers.js";
 import { hasPagesGetInitialProps } from "./pages-get-initial-props.js";
-import { traceFindPageComponents, tracePagesDocumentStream } from "./pages-execution-tracing.js";
-import { mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesStatusPageRenderPath, setPagesResponseHeader } from "./pages-page-data.js";
-import { collectAssetTags, resolveClientModuleUrl } from "./pages-asset-tags.js";
-import { PAGES_PREVIEW_CACHE_CONTROL, appendPagesPreviewClearCookies, getPagesPreviewState } from "./pages-preview.js";
-import { createPagesReqRes } from "./pages-node-compat.js";
-import { setFrameworkRequestRoute } from "./request-tracing.js";
-//#region src/server/pages-page-handler.ts
+import { logRequestError } from "./request-error-log.js";
+// src/server/pages-page-handler.ts
 async function renderTracedPagesPageResponse(options) {
 	let bodyStream;
 	try {
@@ -115,6 +115,14 @@ function applyPagesErrorCachePolicy(response, revalidateSeconds, expireSeconds,
 		statusText: response.statusText
 	});
 }
+function renderErrorResponse(body) {
+	const headers = new Headers();
+	markPagesPrerenderRenderError(headers);
+	return new Response(body, {
+		headers,
+		status: 500
+	});
+}
 function shouldEmitPagesClientTraceMetadata(pageModule, appComponent) {
 	if (typeof pageModule.getServerSideProps === "function") return true;
 	if (typeof pageModule.getStaticProps === "function") return false;
@@ -267,7 +275,7 @@ function createPagesPageHandler(opts) {
 			}, initialResponseHeaders));
 		}
 		const routePattern = patternToNextFormat(route.pattern);
-		const renderStatusCode = renderStatusCodeOverride ?? (routePattern === "/404" ? 404 : void 0);
+		const renderStatusCode = renderStatusCodeOverride ?? (routePattern === "/404" ? 404 : routePattern === "/500" ? 500 : void 0);
 		const isStatusPageIdentity = (isStaticPropsRender || pagesReadiness.autoExport) && (routePattern === "/404" || routePattern === "/500" || routePattern === "/_error");
 		const statusPagePathname = routePattern === "/_error" && renderStatusCode === 404 ? "/404" : routePattern;
 		const renderRouteUrl = isStaticPropsRender && isStatusPageIdentity ? resolvePagesStatusPageRenderPath(statusPagePathname, vinextConfig.trailingSlash, originalRequestUrl.pathname) : isStaticPropsRender ? routeUrl.split("?")[0] : routeUrl;
@@ -346,7 +354,7 @@ function createPagesPageHandler(opts) {
 					nextData: pagesNextData
 				});
 				const PageComponent = pageModule.default;
-				if (!PageComponent) return new Response("Page has no default export", { status: 500 });
+				if (!PageComponent) return renderErrorResponse("Page has no default export");
 				if (!isDataReq && routePattern !== "/_error" && routePattern !== "/404" && routePattern !== "/500" && renderStatusCodeOverride === void 0) {
 					const methodResponse = resolvePagesPageMethodResponse({
 						hasGetServerSideProps: typeof pageModule.getServerSideProps === "function",
@@ -464,7 +472,7 @@ function createPagesPageHandler(opts) {
 						initialStylesheetHrefs,
 						crossOrigin: vinextConfig.crossOrigin,
 						disableOptimizedLoading: vinextConfig.disableOptimizedLoading,
-						statusCode: renderStatusCode,
+						statusCode: renderStatusCodeOverride ?? (isStaticPropsRoute || !render.documentReqRes ? renderStatusCode : void 0),
 						nextData: serializedPagesNextData
 					};
 				};
@@ -617,7 +625,7 @@ function createPagesPageHandler(opts) {
 					navigationIsReady: false,
 					isFallback: true
 				});
-				if (isDataReq) {
+				if (isDataReq && routePattern !== "/500") {
 					const headers = new Headers();
 					let resHasCacheControl = false;
 					if (gsspRes && typeof gsspRes.getHeaders === "function") {
@@ -644,7 +652,7 @@ function createPagesPageHandler(opts) {
 						});
 						else if (shouldUseNextDeployCacheControl()) headers.set("Cache-Control", BROWSER_REVALIDATE_CACHE_CONTROL);
 					}
-					if (routePattern !== "/_error" && routePattern !== "/500") {
+					if (routePattern !== "/_error") {
 						const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
 						if (deploymentId) headers.set(NEXTJS_DEPLOYMENT_ID_HEADER, deploymentId);
 					}
@@ -672,7 +680,7 @@ function createPagesPageHandler(opts) {
 			} catch (e) {
 				await reportSsrError(e);
 				if (sendsEarly && pageResponseSent()) return sentResponse;
-				if (!isInternalErrorRender && !isDataReq) {
+				if (!isInternalErrorRender && (!isDataReq || routePattern === "/500")) {
 					let errorRoute = null;
 					for (let i = 0; i < pageRoutes.length; i++) if (pageRoutes[i].pattern === "/500") {
 						errorRoute = pageRoutes[i];
@@ -695,7 +703,7 @@ function createPagesPageHandler(opts) {
 						console.error("[vinext] Error page render failed:", errorPageErr);
 					}
 				}
-				return new Response("Internal Server Error", { status: 500 });
+				return renderErrorResponse("Internal Server Error");
 			}
 		});
 		if (!sendsEarly) return closeAfterResponseWithBody(await rendering, uCtx);
@@ -712,5 +720,4 @@ function createPagesPageHandler(opts) {
 	}
 	return renderPage;
 }
-//#endregion
 export { createPagesPageHandler, finalizePagesPreviewResponse, renderTracedPagesPageResponse, shouldEmitPagesClientTraceMetadata };

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

@@ -1,4 +1,3 @@
-//#region src/server/pages-page-method.d.ts
 /**
  * Pages Router method-allow policy.
  *
@@ -43,5 +42,4 @@ type PagesPageMethodOptions = {
  * static (no `getServerSideProps`) Pages Router page, otherwise `null`.
  */
 export declare function resolvePagesPageMethodResponse(options: PagesPageMethodOptions): Response | null;
-//#endregion
 export {};

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

@@ -1,5 +1,5 @@
 import { methodNotAllowedResponse } from "./http-error-responses.js";
-//#region src/server/pages-page-method.ts
+// src/server/pages-page-method.ts
 function isNonGetOrHead(method) {
 	const normalizedMethod = method.toUpperCase();
 	return normalizedMethod !== "GET" && normalizedMethod !== "HEAD";
@@ -13,5 +13,4 @@ function resolvePagesPageMethodResponse(options) {
 	if (options.hasGetServerSideProps) return null;
 	return methodNotAllowedResponse("GET, HEAD");
 }
-//#endregion
 export { resolvePagesPageMethodResponse };

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

@@ -3,7 +3,6 @@ import { CachedPagesValue } from "../shims/cache-handler.js";
 import { IsrWritePolicy } from "./isr-cache.js";
 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.
@@ -160,5 +159,4 @@ export declare function buildPagesNextDataScript(options: Pick<RenderPagesPageRe
   vinext?: VinextNextData["__vinext"];
 }): string;
 export declare function renderPagesPageResponse(options: RenderPagesPageResponseOptions): Promise<Response>;
-//#endregion
 export {};

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

@@ -1,30 +1,30 @@
-import { isBotUserAgent } from "../utils/html-limited-bots.js";
-import { NEXTJS_CACHE_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
-import { reportRequestError } from "./instrumentation.js";
-import { logRequestError } from "./request-error-log.js";
+import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { markRouteCacheabilityExplicitResponsePolicy } from "../shims/cacheability-classification.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
+import { createDocumentPlaceholderToken, withDocumentPlaceholders } from "../shims/document-placeholders.js";
 import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders, hasCdnResponsePolicy, shouldUseNextDeployCacheControl } from "./cache-control.js";
 import { buildMissIsrCacheControl } from "./isr-decision.js";
 import { isrCacheControl } from "./isr-cache.js";
-import { fnv1a52 } from "../utils/hash.js";
-import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
-import { withScriptNonce } from "../shims/script-nonce-context.js";
-import { createNonceAttribute, escapeHtmlAttr } from "./html.js";
-import { createDocumentPlaceholderToken, withDocumentPlaceholders } from "../shims/document-placeholders.js";
-import { applyDocumentAssetProps, extractDocumentAssetProps } from "./pages-document-asset-props.js";
-import { spliceDocumentHeadClose, spliceDocumentHeadOpen, spliceDocumentScripts, splitDocumentAtMain } from "./pages-document-splice.js";
-import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
-import { setCacheStateHeaders } from "./cache-headers.js";
 import { pagesPathCacheTag } from "./pages-cache-tag.js";
 import { applyPrerenderCacheLifeHeader } from "./prerender-cache-life-header.js";
-import { readStreamAsText } from "../utils/text-stream.js";
+import { setCacheStateHeaders } from "./cache-headers.js";
+import { createNonceAttribute, escapeHtmlAttr } from "./html.js";
+import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
+import { reportRequestError } from "./instrumentation.js";
 import { loadUserDocumentInitialProps, runDocumentRenderPage } from "./pages-document-initial-props.js";
+import { fnv1a52 } from "../utils/hash.js";
+import { readStreamAsText } from "../utils/text-stream.js";
 import { callDocumentGetInitialProps } from "./document-initial-head.js";
+import { appendAssetDeploymentIdQuery } from "../utils/deployment-id.js";
+import { applyDocumentAssetProps, extractDocumentAssetProps } from "./pages-document-asset-props.js";
+import { spliceDocumentHeadClose, spliceDocumentHeadOpen, spliceDocumentScripts, splitDocumentAtMain } from "./pages-document-splice.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
+import { NEXTJS_CACHE_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_REVALIDATED_CACHE_TAG_HEADER } from "./headers.js";
 import { isPageNotModified } from "./http-conditional.js";
+import { logRequestError } from "./request-error-log.js";
 import React from "react";
-//#region src/server/pages-page-response.ts
+// src/server/pages-page-response.ts
 /**
 * Returns true when the User-Agent belongs to a bot or crawler that cannot
 * reliably consume a streamed HTML response.
@@ -327,5 +327,4 @@ async function renderPagesPageResponse(options) {
 		headers: responseHeaders
 	}), { __vinextStreamedHtmlResponse: true });
 }
-//#endregion
 export { applyPagesPrerenderRevalidateHeader, buildPagesNextDataScript, generatePagesETag, isPagesStreamingBot, renderPagesPageResponse, rendersPagesNotModified };

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

@@ -1,4 +1,3 @@
-//#region src/server/pages-preview.d.ts
 export declare const PAGES_PREVIEW_CACHE_CONTROL = "private, no-cache, no-store, max-age=0, must-revalidate";
 export type PagesPreviewData = object | string;
 export type PagesPreviewState = {
@@ -22,5 +21,4 @@ export declare function clearPagesPreviewData(response: PreviewResponse, options
   path?: string;
 }): void;
 export declare function appendPagesPreviewClearCookies(headers: Headers): void;
-//#endregion
 export {};

package/dist/server/pages-preview.js

@@ -1,6 +1,6 @@
 import { parseCookieHeader } from "../utils/parse-cookie.js";
 import { createCipheriv, createDecipheriv, createHmac, randomBytes, timingSafeEqual } from "node:crypto";
-//#region src/server/pages-preview.ts
+// src/server/pages-preview.ts
 const PAGES_PREVIEW_CACHE_CONTROL = "private, no-cache, no-store, max-age=0, must-revalidate";
 const pagesPreviewCookiesCleared = Symbol("__prerender_bypass");
 let devCredentials;
@@ -161,5 +161,4 @@ function appendPagesPreviewClearCookies(headers) {
 	if (!hasExpiredCookie("__prerender_bypass")) headers.append("Set-Cookie", serializeClearedCookie("__prerender_bypass"));
 	if (!hasExpiredCookie("__next_preview_data")) headers.append("Set-Cookie", serializeClearedCookie("__next_preview_data"));
 }
-//#endregion
 export { PAGES_PREVIEW_CACHE_CONTROL, appendPagesPreviewClearCookies, clearPagesPreviewData, getPagesPreviewModeId, getPagesPreviewState, setPagesDraftMode, setPagesPreviewData };

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

@@ -1,6 +1,5 @@
 import { VinextNextData } from "../client/vinext-next-data.js";
 import { PagesPageModule } from "./pages-page-data.js";
-//#region src/server/pages-readiness.d.ts
 /**
  * Shared Pages Router readiness modeling.
  *
@@ -32,5 +31,4 @@ export declare function buildPagesReadinessNextData(options: {
   } | null | undefined;
   hasRewrites: boolean;
 }): PagesReadinessNextData;
-//#endregion
 export {};

package/dist/server/pages-readiness.js

@@ -1,4 +1,4 @@
-//#region src/server/pages-readiness.ts
+// src/server/pages-readiness.ts
 /**
 * Build the readiness flags for a Pages Router render. Shared by the dev and
 * production Pages render paths.
@@ -19,5 +19,4 @@ function buildPagesReadinessNextData(options) {
 		__vinext: { hasRewrites: options.hasRewrites }
 	};
 }
-//#endregion
 export { buildPagesReadinessNextData };

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

@@ -1,7 +1,6 @@
 import { NextHeader, NextI18nConfig, NextRedirect, NextRewrite } from "../config/next-config.js";
-import { PagesRouteDataKind } from "./pages-route-data-kind.js";
 import { HeaderRecord } from "./request-pipeline.js";
-//#region src/server/pages-request-pipeline.d.ts
+import { PagesRouteDataKind } from "./pages-route-data-kind.js";
 export type PagesRenderOptions = {
   isDataReq?: boolean;
   renderErrorPageOnMiss?: boolean;
@@ -174,5 +173,4 @@ export type PagesPipelineResult = {
  * runPagesRequest receives a "clean" request with basePath-stripped URL.
  */
 export declare function runPagesRequest(request: Request, deps: PagesPipelineDeps): Promise<PagesPipelineResult>;
-//#endregion
 export {};