vinext 1.3.0 → 1.3.1

package/dist/server/dev-lockfile.js

@@ -1,5 +1,6 @@
 import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import fs from "node:fs";
+import os from "node:os";
 //#region src/server/dev-lockfile.ts
 /**
 * Dev server lock file.
@@ -21,6 +22,9 @@ import fs from "node:fs";
 *   (`process.kill(pid, 0)`), which is good enough for the dev-server
 *   "another server is running" use case. Race conditions on lock acquisition
 *   are tolerated: at worst, two dev servers race and one fails to bind a port.
+*   Unlike a `flock()`, the lock file survives a hard restart, so a lock
+*   written before the current boot is treated as stale whatever its PID: the
+*   PID may now belong to an unrelated process. See `predatesCurrentBoot()`.
 * - Lock file lives in `<root>/.vinext/dev/lock.json` (mirroring Next.js'
 *   `.next/dev/lock` layout). `.vinext/` is already used by the fonts plugin
 *   to cache self-hosted Google Fonts, so this re-uses the same project-local
@@ -71,6 +75,46 @@ function isPidAlive(pid) {
 	}
 }
 /**
+* Slack for the boot-time comparison in `predatesCurrentBoot`. `os.uptime()`
+* has whole-second resolution on some platforms (macOS derives it from
+* `kern.boottime`), so the derived boot time is only accurate to about a
+* second.
+*/
+const BOOT_TIME_TOLERANCE_MS = 5e3;
+/**
+* Returns true if a lock with the given `startedAt` was written before the
+* machine last booted.
+*
+* Such a lock was left behind by a session whose exit handler never ran (a
+* crash, a forced restart, power loss). PIDs are handed out again after a
+* boot, so the lock's PID may be held by an unrelated process, and
+* `isPidAlive()` alone would report the dead server as running.
+*
+* The boot time is derived from `Date.now() - os.uptime()`. Stepping the wall
+* clock forward moves it too (`os.uptime()` doesn't change), so a forward
+* step larger than the uptime at which a server started makes its lock look
+* stale, e.g. a VM resuming after the host slept. The second `vinext dev`
+* then takes over, as in the acquisition race tolerated below: Vite moves it
+* to another port, or it fails to bind with `strictPort`.
+*
+* Known limitations, where a lock is still checked by PID alone:
+* - A wall clock that comes back from a reboot behind the previous session
+*   (an RTC running slow, or NTP stepping it back) can leave the lock's
+*   `startedAt` after the derived boot time.
+* - Windows Fast Startup shuts down by hibernating the kernel, so
+*   `os.uptime()` keeps counting across that shutdown.
+* - A container restart doesn't reset the host's uptime.
+*/
+function predatesCurrentBoot(startedAt) {
+	let uptime;
+	try {
+		uptime = os.uptime();
+	} catch {
+		return false;
+	}
+	return startedAt < Date.now() - uptime * 1e3 - BOOT_TIME_TOLERANCE_MS;
+}
+/**
 * Writes the lock file with the given content. Creates the parent directory
 * if it doesn't exist.
 *
@@ -128,7 +172,7 @@ function tryAcquireLockfile(opts) {
 	const lockfilePath = getLockfilePath(root);
 	const existing = readLockfile(lockfilePath);
 	if (existing) {
-		if (isPidAlive(existing.pid)) return {
+		if (!predatesCurrentBoot(existing.startedAt) && isPidAlive(existing.pid)) return {
 			ok: false,
 			existing,
 			lockfilePath
@@ -178,4 +222,4 @@ function tryAcquireLockfile(opts) {
 	};
 }
 //#endregion
-export { formatAlreadyRunningError, getLockfilePath, isPidAlive, readLockfile, tryAcquireLockfile };
+export { formatAlreadyRunningError, getLockfilePath, isPidAlive, predatesCurrentBoot, readLockfile, tryAcquireLockfile };

package/dist/server/dev-module-runner.d.ts

@@ -25,4 +25,5 @@ type DevEnvironmentLike = {
  *   Typically `server.environments["ssr"]`.
  */
 export declare function createDirectRunner(environment: DevEnvironmentLike | DevEnvironment): ModuleRunner;
-//#endregion
+//#endregion
+export {};

package/dist/server/dev-server.js

@@ -41,7 +41,7 @@ import { PAGES_PREVIEW_CACHE_CONTROL, appendPagesPreviewClearCookies, getPagesPr
 import { attachPagesRequestCookies } from "./pages-node-compat.js";
 import { randomUUID } from "node:crypto";
 import React from "react";
-import { renderToReadableStream } from "react-dom/server.edge";
+import { renderToReadableStream } from "react-dom/server";
 //#region src/server/dev-server.ts
 /**
 * Render a React element to a string using renderToReadableStream.
@@ -112,6 +112,7 @@ function writeGsspRedirect(res, redirect, isDataReq, props, options) {
 		...props,
 		pageProps: props.pageProps
 	});
+	if (options.method === "getServerSideProps" && !res.getHeader("Cache-Control")) res.setHeader("Cache-Control", NEVER_CACHE_CONTROL);
 	const gsspHeaders = Object.fromEntries(Object.entries(res.getHeaders()).filter((entry) => entry[1] !== void 0));
 	if (isDangerousScheme(resolved.destination)) {
 		const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
@@ -643,14 +644,17 @@ function createSSRHandler(server, runner, routes, pagesDir, i18nConfig, fileMatc
 							const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
 							stripDevPagesNotFoundFramingHeaders(res);
 							if (!res.hasHeader("Content-Type")) res.setHeader("Content-Type", "application/json");
+							if (!res.getHeader("Cache-Control")) res.setHeader("Cache-Control", NEVER_CACHE_CONTROL);
 							if (deploymentId && !res.hasHeader("x-nextjs-deployment-id")) res.setHeader(NEXTJS_DEPLOYMENT_ID_HEADER, deploymentId);
 							res.writeHead(404);
 							res.end("{\"notFound\":true}");
 							return;
 						}
+						if (!res.getHeader("Cache-Control")) res.setHeader("Cache-Control", NEVER_CACHE_CONTROL);
 						await renderErrorPage(server, runner, req, res, url, pagesDir, 404, routerShim.wrapWithRouterContext, void 0, void 0, reactStrictMode, {
 							...errorPageContext,
-							notFoundSrcPage: patternToNextFormat(route.pattern)
+							notFoundSrcPage: patternToNextFormat(route.pattern),
+							cacheControl: requestPreview.data === false && !requestPreview.shouldClear ? DEV_PAGES_CACHE_CONTROL : PAGES_PREVIEW_CACHE_CONTROL
 						});
 						return;
 					}
@@ -1130,7 +1134,8 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 				getTailHeadHTML: () => getClientTraceMetadataHTML(context.clientTraceMetadata),
 				setDocumentInitialHead: typeof headShim.setDocumentInitialHead === "function" ? headShim.setDocumentInitialHead : void 0,
 				crossOrigin: context.crossOrigin,
-				preserveExistingContentType: statusCode === 404
+				preserveExistingContentType: statusCode === 404,
+				extraHeaders: context.cacheControl ? { "Cache-Control": context.cacheControl } : void 0
 			});
 			else {
 				const bodyHtml = await tracePagesDocument(errorPage, () => renderToStringAsync(element));
@@ -1155,6 +1160,7 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 					configuredCrossOrigin: context.crossOrigin,
 					protectedAssetMarker
 				}), protectedAssetMarker);
+				if (context.cacheControl) res.setHeader("Cache-Control", context.cacheControl);
 				res.writeHead(statusCode, statusCode === 404 && res.hasHeader("Content-Type") ? void 0 : { "Content-Type": "text/html; charset=utf-8" });
 				res.end(transformedHtml);
 			}
@@ -1173,6 +1179,7 @@ async function renderErrorPage(server, runner, req, res, url, pagesDir, statusCo
 		defaultResponse.headers.forEach((value, key) => {
 			headers[key] = value;
 		});
+		if (context.cacheControl) headers["cache-control"] = context.cacheControl;
 		res.writeHead(defaultResponse.status, headers);
 		res.end(await defaultResponse.text());
 		return;

package/dist/server/fetch-handler.js

@@ -1,3 +1,2 @@
-import virtual_vinext_worker_entry_default from "virtual:vinext-worker-entry";
+export { default } from "virtual:vinext-worker-entry";
 export * from "virtual:vinext-worker-entry";
-export { virtual_vinext_worker_entry_default as default };

package/dist/server/file-based-metadata.d.ts

@@ -24,4 +24,5 @@ type FileBasedMetadataOptions = {
   basePath?: string;
 };
 export declare function applyFileBasedMetadata(metadata: Metadata | null, routePath: string, params: AppPageParams, metadataRoutes: readonly MetadataFileRoute[] | null | undefined, options?: FileBasedMetadataOptions): Promise<Metadata | null>;
-//#endregion
+//#endregion
+export {};

package/dist/server/framework-tracer.d.ts

@@ -43,4 +43,5 @@ export type FrameworkTracer = {
 };
 export declare function recordFrameworkSpanError(span: FrameworkSpan, error: unknown): void;
 export declare function createFrameworkTracer(integrations: readonly FrameworkTracingIntegration[]): FrameworkTracer;
-//#endregion
+//#endregion
+export {};

package/dist/server/html.d.ts

@@ -1,5 +1,6 @@
 //#region src/server/html.d.ts
 export declare function safeJsonStringify(data: unknown): string;
+export declare function scriptSafeJsonStringify(data: unknown): string;
 export declare function escapeHtmlAttr(value: string): string;
 export declare function htmlTokenListContains(value: string | null, token: string): boolean;
 export declare function createNonceAttribute(nonce?: string): string;

package/dist/server/html.js

@@ -37,6 +37,24 @@ function safeJsonStringify(data) {
 	if (!HTML_UNSAFE_JSON_CHAR_RE.test(json)) return json;
 	return json.replace(HTML_UNSAFE_JSON_CHARS_RE, escapeHtmlUnsafeJsonChar);
 }
+/**
+* Minimal escaping for JSON that is only ever embedded as the content of a
+* classic inline <script> element. The HTML spec only forbids "<!--",
+* "<script" and "<\/script" (ASCII case-insensitive) in script content, so
+* only a '<' that begins one of those is escaped; '>' and '&' have no
+* meaning there.
+* https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
+*
+* Used for the large RSC payload chunks: leaving markup such as "<p>" intact
+* lets compression match it against the identical SSR markup. Do not use
+* this for values that can land outside a script element.
+*/
+const SCRIPT_UNSAFE_JSON_CHARS_RE = /<(?=!--|\/?script)|[\u2028\u2029]/gi;
+function scriptSafeJsonStringify(data) {
+	const json = JSON.stringify(data);
+	if (json === void 0) throw new TypeError("Cannot serialize value as JSON");
+	return json.replace(SCRIPT_UNSAFE_JSON_CHARS_RE, escapeHtmlUnsafeJsonChar);
+}
 function escapeHtmlAttr(value) {
 	return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
@@ -53,4 +71,4 @@ function createInlineScriptTag(content, nonce) {
 	return `<script${createNonceAttribute(nonce)}>${content}<\/script>`;
 }
 //#endregion
-export { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr, htmlTokenListContains, safeJsonStringify };
+export { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr, htmlTokenListContains, safeJsonStringify, scriptSafeJsonStringify };

package/dist/server/http-conditional.d.ts

@@ -29,4 +29,5 @@ type StaticConditionalHeaders = {
 export type StaticPreconditionResult = "proceed" | "not-modified" | "precondition-failed";
 /** Evaluate static representation preconditions in RFC 9110 section 13.2.2 order. */
 export declare function evaluateStaticPreconditions(headers: StaticConditionalHeaders, method: string | undefined, etag: string | undefined, mtimeMs: number): StaticPreconditionResult;
-//#endregion
+//#endregion
+export {};

package/dist/server/http-error-responses.d.ts

@@ -88,4 +88,5 @@ export declare function payloadTooLargeResponse(): Response;
  * to use the canonical "Internal Server Error" body.
  */
 export declare function internalServerErrorResponse(message?: string, init?: ErrorResponseInit): Response;
-//#endregion
+//#endregion
+export {};

package/dist/server/implicit-tags.d.ts

@@ -2,4 +2,5 @@
 type AppCacheLeafKind = "page" | "route";
 export declare function buildAppPageTags(cleanPathname: string, extraTags: string[], routeSegments: readonly string[]): string[];
 export declare function buildPageCacheTags(pathname: string, extraTags: string[], routeSegments: string[], leafKind: AppCacheLeafKind): string[];
-//#endregion
+//#endregion
+export {};

package/dist/server/metadata-route-build-data.d.ts

@@ -19,4 +19,5 @@ type MetadataRouteEntryData = {
 export declare function createMetadataRouteEntryData(route: MetadataFileRoute): MetadataRouteEntryData;
 export declare function createMetadataRouteEntrySource(input: MetadataRouteEntrySourceInput): string;
 export declare function createMetadataRouteEntriesSource(routes: readonly MetadataFileRoute[], moduleNames: ReadonlyMap<string, string>): string[];
-//#endregion
+//#endregion
+export {};

package/dist/server/metadata-route-build-data.js

@@ -1,6 +1,6 @@
 import { routePatternParts } from "../routing/route-pattern.js";
 import { getMetadataRouteKind } from "./metadata-routes.js";
-import imageSize from "../deps/.pnpm/image-size@2.0.2/deps/image-size/dist/index.js";
+import { imageSize } from "../deps/.pnpm/image-size@2.0.4/deps/image-size/dist/esm/lookup.js";
 import fs from "node:fs";
 import { createHash } from "node:crypto";
 //#region src/server/metadata-route-build-data.ts

package/dist/server/metadata-route-response.d.ts

@@ -37,4 +37,5 @@ export type PrerenderableMetadataRoute = {
 export declare function getPrerenderableMetadataRoutePaths(metadataRoutes: readonly MetadataRuntimeRoute[]): Promise<PrerenderableMetadataRoute[]>;
 export declare function isMetadataRouteRequestPath(metadataRoutes: readonly MetadataRuntimeRoute[], cleanPathname: string): boolean;
 export declare function handleMetadataRouteRequest(options: MetadataRouteRequestOptions): Promise<Response | null>;
-//#endregion
+//#endregion
+export {};

package/dist/server/metadata-route-response.js

@@ -17,8 +17,8 @@ import { ensureFetchPatch, getCollectedFetchTags, setCurrentFetchSoftTags } from
 import { isValidMetadataImageId, manifestToJson, matchMetadataRoutePattern, robotsToText, sitemapToXml } from "./metadata-routes.js";
 import { applyPrerenderCacheLifeHeader, applyPrerenderCacheTagsHeader } from "./prerender-cache-life-header.js";
 import { canonicalizeAppPageParams } from "./app-page-segment-state.js";
-import { buildPageCacheTags } from "./implicit-tags.js";
 import { buildAppRouteCacheValue, buildRouteHandlerCachedResponse } from "./app-route-handler-response.js";
+import { buildPageCacheTags } from "./implicit-tags.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
 import { completeAppRouteHandlerResponse } from "./app-route-handler-execution.js";
 //#region src/server/metadata-route-response.ts

package/dist/server/metadata-routes.d.ts

@@ -155,4 +155,5 @@ export declare function invalidateMetadataFileCache(): void;
  * Scan an app directory for metadata files.
  */
 export declare function scanMetadataFiles(appDir: string): MetadataFileRoute[];
-//#endregion
+//#endregion
+export {};

package/dist/server/middleware-runtime.d.ts

@@ -87,4 +87,5 @@ export declare function resolveMiddlewareModuleHandler(mod: MiddlewareModule, op
 }): MiddlewareHandler;
 export declare function executeMiddleware(options: ExecuteMiddlewareOptions): Promise<MiddlewareResult>;
 export declare function runGeneratedMiddleware(options: RunGeneratedMiddlewareOptions): Promise<MiddlewareResult>;
-//#endregion
+//#endregion
+export {};

package/dist/server/navigation-trace.d.ts

@@ -65,4 +65,5 @@ export declare function createNavigationLifecycleTraceFields(options: {
 }): NavigationTraceFields;
 export declare function createNavigationTrace(code: NavigationTraceCode, fields?: NavigationTraceFields): NavigationTrace;
 export declare function prependNavigationTraceEntry(trace: NavigationTrace, code: NavigationTraceCode, fields?: NavigationTraceFields): NavigationTrace;
-//#endregion
+//#endregion
+export {};

package/dist/server/next-error-digest.d.ts

@@ -24,4 +24,5 @@ export declare function parseNextRedirectDigest(digest: string): NextRedirectDig
  * for the fallback form. Returns null otherwise.
  */
 export declare function parseNextHttpErrorDigest(digest: string): NextHttpErrorDigest | null;
-//#endregion
+//#endregion
+export {};

package/dist/server/nitro-public-files-plugin.d.ts

@@ -35,4 +35,5 @@ type NitroPublicFilesPluginOptions = {
   fetchApp(request: Request): Promise<Response>;
 };
 export declare function createNitroPublicFilesPlugin(options: NitroPublicFilesPluginOptions): (nitroApp: NitroApp) => void;
-//#endregion
+//#endregion
+export {};

package/dist/server/nitro-public-files.d.ts

@@ -18,4 +18,5 @@ type PagesWorkerEntry<Env, Context extends object> = {
  * fetcher that reads files through Nitro's static handler.
  */
 export declare function withNitroPagesPublicFiles<Env, Context extends object>(worker: PagesWorkerEntry<Env, Context>): PagesWorkerEntry<Env, Context>;
-//#endregion
+//#endregion
+export {};

package/dist/server/opentelemetry-api.d.ts

@@ -56,4 +56,5 @@ export type OpenTelemetryApi = {
 export declare function getOpenTelemetryRootContext(): OpenTelemetryContext;
 /** Resolve the API registered by the application, if any. */
 export declare function getOpenTelemetryApi(): OpenTelemetryApi | undefined;
-//#endregion
+//#endregion
+export {};

package/dist/server/operation-token.d.ts

@@ -36,4 +36,5 @@ export type OperationTokenVerificationPolicy = {
 export declare function verifyOperationToken(token: OperationToken, authority: OperationTokenAuthority, policy: OperationTokenVerificationPolicy): OperationTokenVerdict;
 export declare function verifyOperationTokenForCommit(token: OperationToken, authority: Pick<OperationTokenAuthority, "activeNavigationId" | "visibleCommitVersion">): OperationTokenVerdict;
 export declare function verifyOperationTokenForCacheReuse(token: OperationToken, authority: Pick<OperationTokenAuthority, "graphVersion" | "installedCacheVariantFingerprint">): OperationTokenVerdict;
-//#endregion
+//#endregion
+export {};

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

@@ -85,4 +85,5 @@ type HandlePagesApiRouteOptions = {
   trustedRevalidateOrigin?: string;
 };
 export declare function handlePagesApiRoute(options: HandlePagesApiRouteOptions): Promise<Response>;
-//#endregion
+//#endregion
+export {};

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

@@ -81,4 +81,5 @@ type CollectAssetTagsOptions = {
  * Extracted from `entries/pages-server-entry.ts`.
  */
 export declare function collectAssetTags(options: CollectAssetTagsOptions): string;
-//#endregion
+//#endregion
+export {};

package/dist/server/pages-body-parser-config.d.ts

@@ -55,4 +55,5 @@ export declare function resolveBodyParserConfig(moduleConfig: {
     };
   };
 } | undefined, defaultSizeLimit?: number): ResolvedBodyParserConfig;
-//#endregion
+//#endregion
+export {};

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

@@ -1,8 +1,12 @@
+import { ClientReferenceChunks } from "../utils/client-reference-chunks.js";
 //#region src/server/pages-client-assets.d.ts
 export type AssetCrossOrigin = "" | "anonymous" | "use-credentials";
 export type PagesClientAssets = {
   clientEntry?: string;
   appBootstrapPreinitModules?: string[];
+  appRouteManifestModule?: string;
+  /** What each App Router client reference loads in the browser, by URL. */
+  appClientReferenceChunks?: ClientReferenceChunks;
   ssrManifest?: Record<string, string[]>;
   /**
    * Shared Pages chunk files (framework, vinext runtime, client entry) keyed on

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

@@ -138,4 +138,5 @@ type NormalizePagesDataRequestResult = {
  * `runMiddleware` share a single implementation.
  */
 export declare function normalizePagesDataRequest(request: Request, buildId: string | null, basePath?: string, trailingSlash?: boolean): NormalizePagesDataRequestResult;
-//#endregion
+//#endregion
+export {};

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

@@ -26,4 +26,5 @@ export declare function extractDocumentAssetProps(html: string, token: string):
 export declare function markDocumentAssetPropsProtectedTags(html: string, markerAttribute: string): string;
 export declare function stripDocumentAssetPropsProtectionMarkers(html: string, markerAttribute: string): string;
 export declare function applyDocumentAssetProps(html: string, props: DocumentAssetProps, options?: ApplyDocumentAssetPropsOptions): string;
-//#endregion
+//#endregion
+export {};

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

@@ -78,4 +78,5 @@ type RunDocumentRenderPageResult = {
  * @see .nextjs-ref/packages/next/src/server/render.tsx (search `renderPage`)
  */
 export declare function runDocumentRenderPage(input: DocumentRenderPageInput): Promise<RunDocumentRenderPageResult>;
-//#endregion
+//#endregion
+export {};

package/dist/server/pages-execution-tracing.d.ts

@@ -37,4 +37,5 @@ export declare function createFindPageComponentsSpanDescriptor(routePattern: str
   readonly type: "NextNodeServer.findPageComponents";
 };
 export declare function traceFindPageComponents<T>(routePattern: string, callback: () => T): T;
-//#endregion
+//#endregion
+export {};

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

@@ -1,6 +1,6 @@
+import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { frameworkTracer } from "./tracer.js";
-import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 //#region src/server/pages-execution-tracing.ts
 function createPagesDataSpanDescriptor(method, routePattern) {
 	const route = patternToNextFormat(routePattern);

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

@@ -76,4 +76,5 @@ export type DevAppInitialPropsContext = {
  * data code does not run on the cache hot path.
  */
 export declare function loadDevAppInitialProps(ctx: DevAppInitialPropsContext): Promise<DevAppInitialPropsResult>;
-//#endregion
+//#endregion
+export {};

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

@@ -298,6 +298,11 @@ type ResolvePagesPageDataNotFoundResult = {
   cacheState?: "MISS" | "HIT" | "STALE";
 };
 type ResolvePagesPageDataResult = ResolvePagesPageDataRenderResult | ResolvePagesPageDataResponseResult | ResolvePagesPageDataNotFoundResult;
+/**
+ * Write a Pages res header the way Node sends it: an array sends one header
+ * line per item, so `[]` sends none.
+ */
+export declare function setPagesResponseHeader(headers: Headers, name: string, value: string | number | boolean | string[]): void;
 export declare function mergePagesNotFoundSourceHeaders(response: Response, sourceHeaders: Record<string, string | number | boolean | string[]> | undefined): Response;
 /** Validate and normalize the redirect metadata returned by gSP/gSSP. */
 export declare function resolvePagesRedirect(redirect: PagesRedirectResult, options: {
@@ -330,4 +335,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 resolvePagesPageData(options: ResolvePagesPageDataOptions): Promise<ResolvePagesPageDataResult>;
-//#endregion
+//#endregion
+export {};

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

@@ -6,7 +6,7 @@ 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 { applyCdnResponseHeaders } from "./cache-control.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";
@@ -98,14 +98,22 @@ function buildPagesNotFoundResult(options, revalidateSeconds, cacheState, expire
 		responseHeaders
 	};
 }
+/**
+* Write a Pages res header the way Node sends it: an array sends one header
+* line per item, so `[]` sends none.
+*/
+function setPagesResponseHeader(headers, name, value) {
+	headers.delete(name);
+	if (!Array.isArray(value)) {
+		headers.set(name, String(value));
+		return;
+	}
+	for (const item of value) headers.append(name, String(item));
+}
 function mergePagesNotFoundSourceHeaders(response, sourceHeaders) {
 	if (!sourceHeaders) return response;
 	const headers = new Headers(response.headers);
-	for (const [name, value] of Object.entries(sourceHeaders)) if (name.toLowerCase() === "set-cookie") {
-		headers.delete("set-cookie");
-		const cookies = Array.isArray(value) ? value : [value];
-		for (const cookie of cookies) headers.append("set-cookie", String(cookie));
-	} else headers.set(name, Array.isArray(value) ? value.join(", ") : String(value));
+	for (const [name, value] of Object.entries(sourceHeaders)) setPagesResponseHeader(headers, name, value);
 	return new Response(response.body, {
 		headers,
 		status: response.status,
@@ -292,6 +300,15 @@ function buildPagesRedirectResponse(redirect, options, props = { pageProps: {} }
 		headers
 	});
 }
+/**
+* Next.js pages-handler.ts gives a getServerSideProps result `revalidate: 0`,
+* so its redirect and notFound exits are answered private/no-store unless the
+* handler set its own Cache-Control. Like Next's `!res.getHeader(...)`, this
+* reads the raw value, so `""` and `0` count as unset.
+*/
+function applyPagesGsspCacheControlDefault(headers, res) {
+	if (!res.getHeaders()["cache-control"]) headers.set("Cache-Control", NEVER_CACHE_CONTROL);
+}
 function getPagesGsspResponseHeaders(res) {
 	const headers = new Headers();
 	for (const [name, value] of Object.entries(res.getHeaders())) if (Array.isArray(value)) for (const item of value) headers.append(name, item);
@@ -566,13 +583,19 @@ async function resolvePagesPageData(options) {
 				pageProps
 			};
 		}
-		if (result?.redirect) return {
-			kind: "response",
-			response: buildPagesRedirectResponse(result.redirect, options, renderProps, "getServerSideProps", getPagesGsspResponseHeaders(res))
-		};
+		if (result?.redirect) {
+			const responseHeaders = getPagesGsspResponseHeaders(res);
+			applyPagesGsspCacheControlDefault(responseHeaders, res);
+			return {
+				kind: "response",
+				response: buildPagesRedirectResponse(result.redirect, options, renderProps, "getServerSideProps", responseHeaders)
+			};
+		}
 		if (result?.notFound) {
 			const responseHeaders = res.getHeaders();
-			return buildPagesNotFoundResult(options, void 0, void 0, void 0, Object.keys(responseHeaders).length > 0 ? responseHeaders : void 0);
+			const notFoundResult = buildPagesNotFoundResult(options, void 0, void 0, void 0, Object.keys(responseHeaders).length > 0 ? responseHeaders : void 0);
+			if (notFoundResult.kind === "response") applyPagesGsspCacheControlDefault(notFoundResult.response.headers, res);
+			return notFoundResult;
 		}
 		if (result?.props !== void 0 && options.validatePropsSerialization !== false) isSerializableProps(options.routePattern, "getServerSideProps", pageProps);
 		gsspRes = res;
@@ -796,4 +819,4 @@ async function resolvePagesPageData(options) {
 	};
 }
 //#endregion
-export { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds, resolvePagesStatusPageRenderPath };
+export { assertPages404DoesNotReturnNotFound, buildPagesRedirectProps, getPagesRouteParams, matchesPagesStaticPath, mergePagesDataProps, mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesRedirect, resolvePagesRedirectLocation, resolvePagesRevalidateSeconds, resolvePagesStatusPageRenderPath, setPagesResponseHeader };

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

@@ -97,7 +97,7 @@ export type CreatePagesPageHandlerOptions = {
     href: string;
     type: string;
   }>;
-  /** `renderToReadableStream` from `react-dom/server.edge`. */
+  /** `renderToReadableStream` from `react-dom/server`. */
   renderToReadableStream: (element: ReactNode) => Promise<ReadableStream<Uint8Array>>;
   /** `safeJsonStringify` from `vinext/html`. */
   safeJsonStringify: (value: unknown) => string;
@@ -139,4 +139,5 @@ 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
+//#endregion
+export {};

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

@@ -10,7 +10,7 @@ import { buildNextDataNotFoundResponse, buildNextDataPropsJsonResponse, normaliz
 import { reportRequestError } from "./instrumentation.js";
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityExplicitResponsePolicy, markRouteCacheabilityFinalResponseUncacheable, recordRouteCacheability } from "../shims/cacheability-classification.js";
-import { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, hasCdnResponsePolicy, hasExplicitNonCacheableResponsePolicy, shouldUseNextDeployCacheControl } from "./cache-control.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 { coalesceOnDemandRevalidation, isrGet, isrSet, pagesIsrCacheKey, triggerBackgroundRegeneration } from "./isr-cache.js";
@@ -25,7 +25,7 @@ import { pagesPathCacheTag } from "./pages-cache-tag.js";
 import { renderPagesPageResponse } from "./pages-page-response.js";
 import { hasPagesGetInitialProps } from "./pages-get-initial-props.js";
 import { traceFindPageComponents, tracePagesDocumentStream } from "./pages-execution-tracing.js";
-import { mergePagesNotFoundSourceHeaders, resolvePagesPageData, resolvePagesStatusPageRenderPath } from "./pages-page-data.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";
@@ -87,14 +87,23 @@ function stripPagesNotFoundFramingHeaders(response) {
 		statusText: response.statusText
 	});
 }
-function applyPagesErrorCachePolicy(response, revalidateSeconds, expireSeconds, cacheTagPathname) {
+/**
+* `notFoundResHeaders` is the getServerSideProps res as it stands after the
+* 404 render: the middleware and next.config headers, the handler's writes,
+* then any write from the 404 render's own user code.
+*/
+function applyPagesErrorCachePolicy(response, revalidateSeconds, expireSeconds, cacheTagPathname, notFoundResHeaders) {
 	const headers = new Headers(response.headers);
 	recordRouteCacheability(revalidateSeconds === void 0 ? { cacheable: false } : {
 		cacheable: revalidateSeconds !== 0,
 		cacheControl: buildMissIsrCacheControl(revalidateSeconds, expireSeconds)
 	});
 	if (hasExplicitNonCacheableResponsePolicy(headers)) return response;
-	if (revalidateSeconds === void 0) applyCdnResponseHeaders(headers, { cacheControl: NEVER_CACHE_CONTROL });
+	if (revalidateSeconds === void 0 && notFoundResHeaders?.["cache-control"]) {
+		const policyHeaderNames = Array.from(headers.keys()).filter(isCdnResponsePolicyHeader);
+		for (const name of policyHeaderNames) headers.delete(name);
+		for (const [name, value] of Object.entries(notFoundResHeaders)) if (isCdnResponsePolicyHeader(name)) setPagesResponseHeader(headers, name, value);
+	} else if (revalidateSeconds === void 0) applyCdnResponseHeaders(headers, { cacheControl: NEVER_CACHE_CONTROL });
 	else applyCdnResponseHeaders(headers, {
 		cacheControl: buildMissIsrCacheControl(revalidateSeconds, expireSeconds),
 		tags: [pagesPathCacheTag(cacheTagPathname)]
@@ -364,7 +373,7 @@ function createPagesPageHandler(opts) {
 					}
 				};
 				const scriptNonce = getScriptNonceFromHeaderSources(request.headers, middlewareHeaders);
-				const browserCacheControl = isStaticPropsRoute && !scriptNonce ? (initialResponseHeaders ?? middlewareHeaders)?.get("Cache-Control") : null;
+				const browserCacheControl = isStaticPropsRoute && !scriptNonce && !options?.__notFoundSourceHeaders ? (initialResponseHeaders ?? middlewareHeaders)?.get("Cache-Control") : null;
 				const withBrowserPolicy = (response) => {
 					if (browserCacheControl) response.headers.set("Cache-Control", browserCacheControl);
 					return response;
@@ -590,7 +599,7 @@ function createPagesPageHandler(opts) {
 				if (pageDataResult.kind === "response") {
 					if (sendsEarly && pageResponseSent()) return pageDataResult.response;
 					let response = isOnDemandRevalidate && pageDataResult.onDemandRevalidateSuccess !== false ? withPagesCacheState(pageDataResult.response, "REVALIDATED", isrCachePathname) : pageDataResult.response;
-					if (shouldApplyErrorResponsePolicy) response = applyPagesErrorCachePolicy(response, errorPageRevalidateSeconds, errorPageExpireSeconds, errorResponseCachePathname);
+					if (shouldApplyErrorResponsePolicy) response = applyPagesErrorCachePolicy(response, errorPageRevalidateSeconds, errorPageExpireSeconds, errorResponseCachePathname, options?.__notFoundSourceHeaders);
 					return finalizePagesPreviewResponse(withBrowserPolicy(response), preview);
 				}
 				const { pageProps, renderProps } = withErrorStatusCode(pageDataResult.pageProps, previewData !== false ? {
@@ -656,7 +665,7 @@ function createPagesPageHandler(opts) {
 					requestCacheControl: request.headers.get("cache-control") ?? void 0
 				});
 				if (sendsEarly && pageResponseSent()) return pageResponse;
-				if (shouldApplyErrorResponsePolicy) pageResponse = applyPagesErrorCachePolicy(pageResponse, errorPageRevalidateSeconds, errorPageExpireSeconds, errorResponseCachePathname);
+				if (shouldApplyErrorResponsePolicy) pageResponse = applyPagesErrorCachePolicy(pageResponse, errorPageRevalidateSeconds, errorPageExpireSeconds, errorResponseCachePathname, options?.__notFoundSourceHeaders ? documentReqRes?.res.getHeaders() ?? options.__notFoundSourceHeaders : void 0);
 				return finalizePagesPreviewResponse(withBrowserPolicy(pageResponse), preview);
 			} catch (e) {
 				await reportSsrError(e);

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

@@ -43,4 +43,5 @@ type PagesPageMethodOptions = {
  * static (no `getServerSideProps`) Pages Router page, otherwise `null`.
  */
 export declare function resolvePagesPageMethodResponse(options: PagesPageMethodOptions): Response | null;
-//#endregion
+//#endregion
+export {};