vinext 0.2.0 → 1.0.0-beta.0

package/dist/server/app-browser-state.js

@@ -68,7 +68,7 @@ function resolveServerActionRequestState(options) {
 	const headers = createRscRequestHeaders();
 	headers.set(RSC_ACTION_HEADER, options.actionId);
 	headers.set(NEXT_ACTION_HEADER, options.actionId);
-	const interceptionContext = resolveInterceptionContextFromPreviousNextUrl(options.previousNextUrl, options.basePath);
+	const interceptionContext = resolveInterceptionContextFromPreviousNextUrl(options.previousNextUrl, options.basePath) ?? options.interceptionContext ?? null;
 	if (interceptionContext !== null) headers.set(VINEXT_INTERCEPTION_CONTEXT_HEADER, interceptionContext);
 	const mountedSlotsHeader = getMountedSlotIdsHeader(options.elements);
 	if (mountedSlotsHeader !== null) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);

package/dist/server/app-layout-param-observation.d.ts

@@ -1,7 +1,7 @@
-import { UnstableCacheObservation } from "../shims/cache-request-state.js";
 import { RenderRequestApiKind } from "./cache-proof.js";
 import { ClientReuseManifestRejectionCode, ClientReuseManifestTraceFields } from "./client-reuse-manifest.js";
 import { ThenableParamsObserver } from "../shims/thenable-params.js";
+import { UnstableCacheObservation } from "../shims/cache-request-state.js";
 
 //#region src/server/app-layout-param-observation.d.ts
 type AppLayoutParamAccessObservation = Readonly<{

package/dist/server/app-page-boundary.js

@@ -1,6 +1,6 @@
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
 import { resolveAppPageSegmentParams } from "./app-page-params.js";
-import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 //#region src/server/app-page-boundary.ts
@@ -109,6 +109,7 @@ async function renderAppPageBoundaryResponse(options) {
 		applyEdgeRuntimeHeader(headers, options.isEdgeRuntime);
 		mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);
 		applyRscCompatibilityIdHeader(headers);
+		applyRscDeploymentIdHeader(headers);
 		return new Response(rscStream, {
 			status: options.status,
 			headers

package/dist/server/app-page-cache-finalizer.d.ts

@@ -50,6 +50,7 @@ type ScheduleAppPageRscCacheWriteOptions = {
   isrSet: AppPageCacheSetter;
   interceptionContext?: string | null;
   mountedSlotsHeader?: string | null;
+  omitPendingDynamicCacheState?: boolean;
   renderMode?: AppRscRenderMode;
   preserveClientResponseHeaders?: boolean;
   expireSeconds?: number;

package/dist/server/app-page-cache-finalizer.js

@@ -83,7 +83,7 @@ function finalizeAppPageRscCacheResponse(response, options) {
 	if (!scheduleAppPageRscCacheWrite(options)) return response;
 	if (options.preserveClientResponseHeaders === true) return response;
 	const clientHeaders = new Headers(response.headers);
-	applyPendingDynamicCdnHeaders(clientHeaders, options.getPageTags());
+	applyPendingDynamicCdnHeaders(clientHeaders, options.getPageTags(), { omitCacheState: options.omitPendingDynamicCacheState === true });
 	return new Response(response.body, {
 		status: response.status,
 		statusText: response.statusText,
@@ -92,8 +92,8 @@ function finalizeAppPageRscCacheResponse(response, options) {
 }
 function scheduleAppPageRscCacheWrite(options) {
 	const capturedRscDataPromise = options.capturedRscDataPromise;
-	if (!capturedRscDataPromise || options.dynamicUsedDuringBuild) return false;
-	const rscKey = options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode, options.interceptionContext);
+	if (!capturedRscDataPromise || options.dynamicUsedDuringBuild || options.mountedSlotsHeader) return false;
+	const rscKey = options.isrRscKey(options.cleanPathname, null, options.renderMode, options.interceptionContext);
 	const cachePromise = (async () => {
 		try {
 			const rscData = await capturedRscDataPromise;

package/dist/server/app-page-cache-render.d.ts

@@ -1,8 +1,8 @@
-import { CacheControlMetadata } from "../shims/cache-handler.js";
 import { NavigationContext } from "../shims/navigation-context-state.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
+import { CacheControlMetadata } from "../shims/cache-handler.js";
 import { createAppPageRenderObservation } from "./app-page-render-observation.js";
 import { ReactNode } from "react";
 

package/dist/server/app-page-cache.js

@@ -4,7 +4,7 @@ import { applyCdnResponseHeaders } from "./cache-control.js";
 import { decideIsr } from "./isr-decision.js";
 import { buildAppPageCacheValue } from "./isr-cache.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
-import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { hasCompleteNegativeRequestApiProof } from "./cache-proof.js";
@@ -55,6 +55,15 @@ function getCachedAppPageValue(entry) {
 function hasQueryInvariantAppPageProof(cachedValue) {
 	return cachedValue.renderObservation !== void 0 && hasCompleteNegativeRequestApiProof(cachedValue.renderObservation, ["searchParams"]);
 }
+function resolveRegeneratedAppPageCachePolicy(options) {
+	let revalidateSeconds = options.routeRevalidateSeconds;
+	const renderRevalidateSeconds = options.renderCacheControl?.revalidate;
+	if (renderRevalidateSeconds !== void 0) revalidateSeconds = revalidateSeconds > 0 ? Math.min(revalidateSeconds, renderRevalidateSeconds) : renderRevalidateSeconds;
+	return {
+		expireSeconds: options.renderCacheControl?.expire ?? options.expireSeconds,
+		revalidateSeconds
+	};
+}
 function buildAppPageCachedResponse(cachedValue, options) {
 	const status = options.middlewareStatus ?? (cachedValue.status || 200);
 	const { cacheControl } = decideIsr({
@@ -75,6 +84,7 @@ function buildAppPageCachedResponse(cachedValue, options) {
 			mountedSlotsHeader: options.mountedSlotsHeader
 		});
 		applyRscCompatibilityIdHeader(rscHeaders);
+		applyRscDeploymentIdHeader(rscHeaders);
 		return new Response(cachedValue.rscData, {
 			status,
 			headers: rscHeaders
@@ -118,7 +128,11 @@ async function serveAppPageCachedHtml(options, transformValue) {
 	return response;
 }
 async function readAppPageCacheResponse(options) {
-	const isrKey = options.isRscRequest ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode, options.interceptionContext) : options.isrHtmlKey(options.cleanPathname);
+	if (options.isRscRequest && options.mountedSlotsHeader) {
+		options.isrDebug?.("MISS (mounted slots RSC variant)", options.cleanPathname);
+		return null;
+	}
+	const isrKey = options.isRscRequest ? options.isrRscKey(options.cleanPathname, null, options.renderMode, options.interceptionContext) : options.isrHtmlKey(options.cleanPathname);
 	const artifact = options.isRscRequest ? "rsc" : "html";
 	try {
 		const cached = await options.isrGet(isrKey);
@@ -177,10 +191,13 @@ async function readAppPageCacheResponse(options) {
 		if (cached?.isStale && cachedValue) {
 			options.scheduleBackgroundRegeneration(isrKey, async () => {
 				const revalidatedPage = await options.renderFreshPageForCache();
-				const revalidateSeconds = revalidatedPage.cacheControl?.revalidate ?? options.revalidateSeconds;
-				const expireSeconds = revalidatedPage.cacheControl?.expire ?? options.expireSeconds;
-				const writes = [options.isrSet(options.isRscRequest ? isrKey : options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode, options.interceptionContext), buildAppPageCacheValue("", revalidatedPage.rscData, 200, revalidatedPage.rscRenderObservation), revalidateSeconds, revalidatedPage.tags, expireSeconds)];
-				if (!options.isRscRequest) writes.push(options.isrSet(isrKey, buildAppPageCacheValue(revalidatedPage.html, void 0, 200, revalidatedPage.htmlRenderObservation, revalidatedPage.linkHeader ? { link: revalidatedPage.linkHeader } : void 0), revalidateSeconds, revalidatedPage.tags, expireSeconds));
+				const cachePolicy = resolveRegeneratedAppPageCachePolicy({
+					expireSeconds: options.expireSeconds,
+					renderCacheControl: revalidatedPage.cacheControl,
+					routeRevalidateSeconds: options.revalidateSeconds
+				});
+				const writes = [options.isrSet(options.isRscRequest ? isrKey : options.isrRscKey(options.cleanPathname, null, options.renderMode, options.interceptionContext), buildAppPageCacheValue("", revalidatedPage.rscData, 200, revalidatedPage.rscRenderObservation), cachePolicy.revalidateSeconds, revalidatedPage.tags, cachePolicy.expireSeconds)];
+				if (!options.isRscRequest) writes.push(options.isrSet(isrKey, buildAppPageCacheValue(revalidatedPage.html, void 0, 200, revalidatedPage.htmlRenderObservation, revalidatedPage.linkHeader ? { link: revalidatedPage.linkHeader } : void 0), cachePolicy.revalidateSeconds, revalidatedPage.tags, cachePolicy.expireSeconds));
 				await Promise.all(writes);
 				options.isrDebug?.("regen complete", options.cleanPathname);
 			});

package/dist/server/app-page-dispatch.d.ts

@@ -1,5 +1,4 @@
 import { ClassificationReason } from "../build/layout-classification-types.js";
-import { CachedAppPageValue } from "../shims/cache-handler.js";
 import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";
 import { AppOutgoingElements } from "./app-elements-wire.js";
 import { NavigationContext } from "../shims/navigation-context-state.js";
@@ -8,6 +7,7 @@ import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
+import { CachedAppPageValue } from "../shims/cache-handler.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { ISRCacheEntry } from "./isr-cache.js";
 import { PprFallbackShellState } from "../shims/ppr-fallback-shell.js";
@@ -199,6 +199,7 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
   }>;
   request: Request;
   revalidateSeconds: number | null;
+  renderedPathAndSearch?: string | null;
   resolveRouteFetchCacheMode?: (route: TRoute) => FetchCacheMode | null;
   resolveRouteDynamicConfig?: (route: TRoute) => string | null | undefined;
   rootForbiddenModule?: AppPageModule | null;

package/dist/server/app-page-dispatch.js

@@ -1,12 +1,13 @@
 import { createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
+import "../utils/protocol-headers.js";
 import { AppElementsWire } from "./app-elements-wire.js";
-import { shouldSuppressLoadingBoundaries } from "./app-rsc-render-mode.js";
+import { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL } from "./app-rsc-render-mode.js";
 import "./app-elements.js";
 import { consumeDynamicUsage, consumeInvalidDynamicUsageError, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersContext, isDraftModeRequest, markDynamicUsage, peekDynamicUsage, peekRenderRequestApiUsage, setHeadersContext } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife, _peekRequestScopedCacheLife } from "../shims/cache-request-state.js";
-import { ensureFetchPatch, getCollectedFetchTags, peekDynamicFetchObservations, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault } from "../shims/fetch-cache.js";
-import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
+import { ensureFetchPatch, getCollectedFetchTags, peekDynamicFetchObservations, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault, setRefreshStaleFetchesInForeground } from "../shims/fetch-cache.js";
+import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import "./app-page-response.js";
 import { buildAppPageSpecialErrorResponse, probeAppPageThrownError, resolveAppPageSpecialError } from "./app-page-execution.js";
@@ -100,6 +101,10 @@ function getEffectiveLayoutClassifications(route, debugClassification) {
 function shouldReadAppPageCache(options) {
 	return options.isProduction && !options.isProgressiveActionRender && !options.isDraftMode && !options.isForceDynamic && (options.isRscRequest || !options.scriptNonce) && (options.revalidateSeconds === null || options.revalidateSeconds > 0);
 }
+function resolveAppPageCacheReadRevalidateSeconds(options) {
+	if (options.revalidateSeconds === null && (options.isForceStatic || options.isDynamicError)) return Infinity;
+	return options.revalidateSeconds ?? 0;
+}
 function hasSearchParams(searchParams) {
 	return searchParams !== null && searchParams !== void 0 && searchParams.size > 0;
 }
@@ -119,6 +124,7 @@ async function runAppPageRevalidationContext(options, renderFn) {
 		unstableCacheRevalidation: "foreground"
 	}), async () => {
 		ensureFetchPatch();
+		setRefreshStaleFetchesInForeground(process.env.VINEXT_PRERENDER === "1");
 		setCurrentFetchSoftTags(buildAppPageTags(options.cleanPathname, [], options.routeSegments));
 		options.setNavigationContext({
 			pathname: options.displayPathname ?? options.cleanPathname,
@@ -154,12 +160,14 @@ async function dispatchAppPageInner(options) {
 	const isForceStatic = dynamicConfig === "force-static";
 	const isDynamicError = dynamicConfig === "error";
 	const isForceDynamic = dynamicConfig === "force-dynamic";
+	const isPrefetchDynamicShell = options.renderMode === APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL;
 	const isDraftMode = isDraftModeRequest(options.request, options.draftModeSecret);
 	const requestHeadersContext = getHeadersContext();
-	const hasRequestSearchParams = !isForceStatic && hasSearchParams(options.searchParams);
-	const pageSearchParams = isForceStatic ? new URLSearchParams() : options.searchParams;
+	const shouldUseEmptySearchParams = isForceStatic || isPrefetchDynamicShell;
+	const hasRequestSearchParams = !shouldUseEmptySearchParams && hasSearchParams(options.searchParams);
+	const pageSearchParams = shouldUseEmptySearchParams ? new URLSearchParams() : options.searchParams;
 	const layoutParamAccess = createAppLayoutParamAccessTracker();
-	const hasActiveLoadingBoundary = shouldSuppressLoadingBoundaries(options.renderMode ?? "navigation") ? false : Boolean(route.loading?.default);
+	const hasActiveLoadingBoundary = Boolean(route.loading?.default);
 	setCurrentFetchSoftTags(buildAppPageTags(options.cleanPathname, [], route.routeSegments));
 	setCurrentFetchCacheMode(options.fetchCache ?? null);
 	setCurrentForceDynamicFetchDefault(isForceDynamic);
@@ -222,7 +230,11 @@ async function dispatchAppPageInner(options) {
 			mountedSlotsHeader: options.mountedSlotsHeader,
 			renderMode: options.renderMode,
 			expireSeconds: options.expireSeconds,
-			revalidateSeconds: currentRevalidateSeconds ?? 0,
+			revalidateSeconds: resolveAppPageCacheReadRevalidateSeconds({
+				isDynamicError,
+				isForceStatic,
+				revalidateSeconds: currentRevalidateSeconds
+			}),
 			renderFreshPageForCache: async () => {
 				const revalidationTarget = await resolveAppPageInterceptionRerenderTarget({
 					cleanPathname: options.cleanPathname,
@@ -361,6 +373,7 @@ async function dispatchAppPageInner(options) {
 			});
 			mergeMiddlewareResponseHeaders(interceptHeaders, options.middlewareContext.headers);
 			applyRscCompatibilityIdHeader(interceptHeaders);
+			applyRscDeploymentIdHeader(interceptHeaders);
 			return new Response(interceptStream, {
 				status: options.middlewareContext.status ?? 200,
 				headers: interceptHeaders
@@ -388,7 +401,7 @@ async function dispatchAppPageInner(options) {
 			});
 		},
 		async probePageSpecialError() {
-			if (!shouldSuppressLoadingBoundaries(options.renderMode ?? "navigation") && route.loading?.default) return null;
+			if (route.loading?.default) return null;
 			return resolveAppPageSpecialError(await probeAppPageThrownError({
 				probePage: () => options.probePage(pageSearchParams),
 				runWithSuppressedHookWarning(probe) {
@@ -428,6 +441,8 @@ async function dispatchAppPageInner(options) {
 	const activeFallbackShellState = options.pprRuntime?.getState() ?? null;
 	const pprFallbackShellSignal = activeFallbackShellState?.abortController.signal;
 	const pprFallbackShellReactSignal = activeFallbackShellState?.reactAbortController.signal;
+	const isPrerender = process.env.VINEXT_PRERENDER === "1";
+	const isSpeculativePrerender = isPrerender && options.request.headers.get("x-vinext-prerender-speculative") === "1";
 	return renderAppPageLifecycle({
 		basePath: options.basePath,
 		clientTraceMetadata: options.clientTraceMetadata,
@@ -459,7 +474,7 @@ async function dispatchAppPageInner(options) {
 		},
 		handlerStart: options.handlerStart,
 		hasLoadingBoundary: hasActiveLoadingBoundary,
-		omitPendingDynamicCacheState: !options.isRscRequest && hasRequestSearchParams,
+		omitPendingDynamicCacheState: hasRequestSearchParams,
 		formState: options.formState ?? null,
 		isProgressiveActionRender: options.isProgressiveActionRender === true,
 		isDynamicError,
@@ -467,7 +482,8 @@ async function dispatchAppPageInner(options) {
 		isForceDynamic,
 		isForceStatic,
 		isEdgeRuntime: options.isEdgeRuntime === true,
-		isPrerender: process.env.VINEXT_PRERENDER === "1",
+		isPrerender,
+		isSpeculativePrerender,
 		isProduction: options.isProduction,
 		isRscRequest: options.isRscRequest,
 		isrDebug: options.isrDebug,
@@ -483,6 +499,7 @@ async function dispatchAppPageInner(options) {
 		params: options.params,
 		pprFallbackShellSignal,
 		pprFallbackShellReactSignal,
+		renderedPathAndSearch: options.renderedPathAndSearch,
 		abortPprFallbackShell: activeFallbackShellState ? () => {
 			options.pprRuntime.beginFinalRender(activeFallbackShellState);
 		} : void 0,

package/dist/server/app-page-element-builder.js

@@ -51,6 +51,7 @@ async function buildPageElements(options) {
 	const hasPageModule = !!pageModule;
 	const renderIdentity = createAppPageRenderIdentity({
 		displayPathname,
+		matchedRoutePathname: routePath,
 		targetMatchedPathname: routePath,
 		interceptionContext: opts?.interceptionContext ?? null,
 		interceptSourceMatchedUrl: opts?.interceptSourceMatchedUrl ?? null,

package/dist/server/app-page-execution.js

@@ -1,7 +1,7 @@
 import { addBasePathToPathname } from "../utils/base-path.js";
 import { VINEXT_RSC_REDIRECT_HEADER } from "./headers.js";
 import { runWithConnectionProbe } from "../shims/headers.js";
-import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, createRscRedirectLocation } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, createRscRedirectLocation } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
@@ -161,6 +161,7 @@ async function buildAppPageSpecialErrorResponse(options) {
 			});
 			applyEdgeRuntimeHeader(headers, options.isEdgeRuntime);
 			applyRscCompatibilityIdHeader(headers);
+			applyRscDeploymentIdHeader(headers);
 			mergeMiddlewareResponseHeaders(headers, options.middlewareContext?.headers ?? null);
 			const pendingCookies = options.getAndClearPendingCookies?.() ?? [];
 			for (const cookie of pendingCookies) headers.append("Set-Cookie", cookie);

package/dist/server/app-page-render-identity.d.ts

@@ -2,6 +2,7 @@ import { AppElementsInterception } from "./app-elements-wire.js";
 //#region src/server/app-page-render-identity.d.ts
 type AppPageRenderIdentityInput = {
   displayPathname: string;
+  matchedRoutePathname?: string;
   targetMatchedPathname?: string;
   interceptionContext?: string | null;
   interceptSourceMatchedUrl?: string | null;

package/dist/server/app-page-render-identity.js

@@ -14,9 +14,10 @@ function normalizeAppPageInterceptionProofPathname(pathname) {
 function createAppPageRenderIdentity(input) {
 	const interceptionContext = input.interceptionContext ?? null;
 	const targetMatchedPathname = normalizeAppPageRenderMatchedPathname(input.targetMatchedPathname ?? input.displayPathname);
+	const requestedMatchedRoutePathname = normalizeAppPageRenderMatchedPathname(input.matchedRoutePathname ?? input.targetMatchedPathname ?? input.displayPathname);
 	const sourceMatchedPathname = normalizeAppPageInterceptionProofPathname(input.interceptSourceMatchedUrl ?? null);
 	const slotId = input.interceptSlotId ?? null;
-	const matchedRoutePathname = sourceMatchedPathname ?? targetMatchedPathname;
+	const matchedRoutePathname = sourceMatchedPathname ?? requestedMatchedRoutePathname;
 	const routeId = AppElementsWire.encodeRouteId(matchedRoutePathname, null);
 	const pageId = AppElementsWire.encodePageId(matchedRoutePathname, null);
 	const interception = sourceMatchedPathname === null || slotId === null ? null : {

package/dist/server/app-page-render.d.ts

@@ -1,4 +1,3 @@
-import { CachedAppPageValue } from "../shims/cache-handler.js";
 import { ClientReuseManifestParseResult, ClientReuseManifestSkipDisposition } from "./client-reuse-manifest.js";
 import { AppOutgoingElements } from "./app-elements-wire.js";
 import { NavigationContext } from "../shims/navigation-context-state.js";
@@ -7,6 +6,7 @@ import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
+import { CachedAppPageValue } from "../shims/cache-handler.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPageRenderObservationState } from "./app-page-render-observation.js";
 import { ReactNode } from "react";
@@ -60,6 +60,7 @@ type RenderAppPageLifecycleOptions = {
   isForceStatic: boolean;
   isProgressiveActionRender?: boolean;
   isPrerender?: boolean;
+  isSpeculativePrerender?: boolean;
   isProduction: boolean;
   probePageBeforeRender?: boolean;
   omitPendingDynamicCacheState?: boolean;
@@ -103,6 +104,7 @@ type RenderAppPageLifecycleOptions = {
   clientReuseManifest?: ClientReuseManifestParseResult;
   skipDisposition?: ClientReuseManifestSkipDisposition;
   mountedSlotsHeader?: string | null;
+  renderedPathAndSearch?: string | null;
   renderMode?: AppRscRenderMode;
   waitUntil?: (promise: Promise<void>) => void;
   layoutParamAccess?: AppLayoutParamAccessTracker;

package/dist/server/app-page-render.js

@@ -27,8 +27,14 @@ function buildResponseTiming(options) {
 	};
 }
 function readRequestCacheLifeForPrerender(options) {
+	if (options.isEdgeRuntime && options.revalidateSeconds === null) return (options.peekRequestCacheLife?.() ?? options.getRequestCacheLife())?.revalidate !== void 0 ? { revalidate: 0 } : null;
 	return options.peekRequestCacheLife?.() ?? options.getRequestCacheLife();
 }
+function readRequestCacheLifeForCachePolicy(options) {
+	const requestCacheLife = options.getRequestCacheLife();
+	if (options.isEdgeRuntime && options.revalidateSeconds === null) return null;
+	return requestCacheLife;
+}
 function applyRequestCacheLife(options) {
 	let revalidateSeconds = options.revalidateSeconds;
 	let expireSeconds = options.expireSeconds;
@@ -40,6 +46,10 @@ function applyRequestCacheLife(options) {
 		revalidateSeconds
 	};
 }
+function resolveAppPageCacheWriteRevalidateSeconds(options) {
+	if (options.revalidateSeconds === null && (options.isForceStatic || options.isDynamicError)) return Infinity;
+	return options.revalidateSeconds;
+}
 function readRootBoundaryId(element) {
 	const rootLayoutTreePath = element[AppElementsWire.keys.rootLayout];
 	return typeof rootLayoutTreePath === "string" ? rootLayoutTreePath : null;
@@ -338,6 +348,8 @@ async function renderAppPageLifecycle(options) {
 	if (options.pprFallbackShellSignal) pprFallbackShellRsc = new Uint8Array(await readAppPageBinaryStream(rscStream));
 	let revalidateSeconds = options.revalidateSeconds;
 	let expireSeconds = options.expireSeconds;
+	const shouldWaitForAllReady = options.isPrerender === true && options.isSpeculativePrerender !== true;
+	const shouldReadRequestCacheLifeForPrerender = options.isPrerender === true;
 	const shouldCaptureRscForCacheMetadata = options.isProgressiveActionRender !== true && (options.isProduction || options.isPrerender === true) && (revalidateSeconds === null || revalidateSeconds > 0 && revalidateSeconds !== Infinity) && !options.isDraftMode && !options.isForceDynamic && !shouldBypassRscCacheForSkipTransport;
 	const createBufferedRscStream = (close) => new ReadableStream({ start(controller) {
 		if (pprFallbackShellRsc) controller.enqueue(pprFallbackShellRsc);
@@ -351,11 +363,13 @@ async function renderAppPageLifecycle(options) {
 	const capturedRscDataRef = { value: null };
 	if (rscCapture.sideStream && options.isRscRequest) capturedRscDataRef.value = readAppPageBinaryStream(rscCapture.sideStream);
 	if (options.isRscRequest) {
-		if (options.isPrerender === true) {
-			await settleCapturedRscRenderForCacheMetadata(capturedRscDataRef.value);
+		let requestCacheLifeForPrerender = null;
+		if (shouldWaitForAllReady) await settleCapturedRscRenderForCacheMetadata(capturedRscDataRef.value);
+		if (shouldReadRequestCacheLifeForPrerender) {
+			requestCacheLifeForPrerender = readRequestCacheLifeForPrerender(options);
 			({expireSeconds, revalidateSeconds} = applyRequestCacheLife({
 				expireSeconds,
-				requestCacheLife: readRequestCacheLifeForPrerender(options),
+				requestCacheLife: requestCacheLifeForPrerender,
 				revalidateSeconds
 			}));
 		}
@@ -378,6 +392,8 @@ async function renderAppPageLifecycle(options) {
 			mountedSlotsHeader: options.mountedSlotsHeader,
 			params: options.navigationParams,
 			policy: rscResponsePolicy,
+			renderedPathAndSearch: options.renderedPathAndSearch,
+			requestCacheLife: requestCacheLifeForPrerender,
 			timing: buildResponseTiming({
 				compileEnd,
 				handlerStart: options.handlerStart,
@@ -407,17 +423,22 @@ async function renderAppPageLifecycle(options) {
 				return options.getPageTags();
 			},
 			getRequestCacheLife() {
-				return options.getRequestCacheLife();
+				return readRequestCacheLifeForCachePolicy(options);
 			},
 			isrDebug: options.isrDebug,
 			isrRscKey: options.isrRscKey,
 			isrSet: options.isrSet,
 			interceptionContext: options.interceptionContext,
 			mountedSlotsHeader: options.mountedSlotsHeader,
+			omitPendingDynamicCacheState: options.omitPendingDynamicCacheState,
 			renderMode: options.renderMode,
 			preserveClientResponseHeaders: rscResponsePolicy.cacheState !== "MISS",
 			expireSeconds,
-			revalidateSeconds,
+			revalidateSeconds: resolveAppPageCacheWriteRevalidateSeconds({
+				isDynamicError: options.isDynamicError,
+				isForceStatic: options.isForceStatic,
+				revalidateSeconds
+			}),
 			waitUntil(promise) {
 				options.waitUntil?.(promise);
 			}
@@ -469,7 +490,8 @@ async function renderAppPageLifecycle(options) {
 				scriptNonce: options.scriptNonce,
 				sideStream: rscCapture.sideStream,
 				ssrHandler,
-				waitForAllReady: options.isPrerender === true
+				fallbackToErrorDocumentOnShellError: options.isPrerender === true && options.isSpeculativePrerender === true ? false : void 0,
+				waitForAllReady: shouldWaitForAllReady
 			});
 		},
 		renderSpecialErrorResponse(specialError) {
@@ -492,15 +514,27 @@ async function renderAppPageLifecycle(options) {
 			}
 		}
 	}
-	if (options.isPrerender === true) {
-		await settleCapturedRscRenderForCacheMetadata(htmlRender.capturedRscData);
+	let requestCacheLifeForPrerender = null;
+	let dynamicUsedDuringRender = options.consumeDynamicUsage();
+	dynamicUsedDuringHtmlRender = dynamicUsedDuringRender;
+	const stopSpeculativeMetadataWaitOnDynamicUsage = options.isSpeculativePrerender === true && shouldReadRequestCacheLifeForPrerender ? () => {
+		if (dynamicUsedDuringRender || (options.peekDynamicUsage?.() ?? peekDynamicUsage())) {
+			dynamicUsedDuringRender = true;
+			dynamicUsedDuringHtmlRender = true;
+			return true;
+		}
+		return false;
+	} : void 0;
+	if (shouldWaitForAllReady || shouldReadRequestCacheLifeForPrerender) await settleCapturedRscRenderForCacheMetadata(htmlRender.capturedRscData, stopSpeculativeMetadataWaitOnDynamicUsage);
+	if (shouldReadRequestCacheLifeForPrerender) {
+		requestCacheLifeForPrerender = readRequestCacheLifeForPrerender(options);
 		({expireSeconds, revalidateSeconds} = applyRequestCacheLife({
 			expireSeconds,
-			requestCacheLife: readRequestCacheLifeForPrerender(options),
+			requestCacheLife: requestCacheLifeForPrerender,
 			revalidateSeconds
 		}));
 	}
-	let dynamicUsedDuringRender = options.consumeDynamicUsage();
+	dynamicUsedDuringRender = dynamicUsedDuringRender || options.consumeDynamicUsage();
 	dynamicUsedDuringHtmlRender = dynamicUsedDuringRender;
 	const draftCookie = options.getDraftModeCookieHeader();
 	let dynamicUsedBeforeContextCleanup = dynamicUsedDuringRender;
@@ -538,12 +572,13 @@ async function renderAppPageLifecycle(options) {
 				status: 500
 			},
 			policy: { cacheControl: NEVER_CACHE_CONTROL },
+			requestCacheLife: requestCacheLifeForPrerender,
 			timing: htmlResponseTiming
 		});
 		applyCdnResponseHeaders(response.headers, { cacheControl: NEVER_CACHE_CONTROL });
 		return response;
 	}
-	const shouldSpeculativelyWriteCache = options.isProduction && shouldCaptureRscForCacheMetadata && revalidateSeconds === null && !options.isDynamicError && !options.isForceStatic && !options.scriptNonce && options.isProgressiveActionRender !== true && !dynamicUsedDuringRender;
+	const shouldSpeculativelyWriteCache = options.isProduction && shouldCaptureRscForCacheMetadata && !options.isEdgeRuntime && revalidateSeconds === null && !options.isDynamicError && !options.isForceStatic && !options.scriptNonce && options.isProgressiveActionRender !== true && !dynamicUsedDuringRender;
 	if (htmlResponsePolicy.shouldWriteToCache || shouldSpeculativelyWriteCache) {
 		const isrResponse = buildAppPageHtmlResponse(safeHtmlStream, {
 			draftCookie,
@@ -551,6 +586,7 @@ async function renderAppPageLifecycle(options) {
 			isEdgeRuntime: options.isEdgeRuntime,
 			middlewareContext: options.middlewareContext,
 			policy: htmlResponsePolicy,
+			requestCacheLife: requestCacheLifeForPrerender,
 			timing: htmlResponseTiming
 		});
 		if (options.isPrerender === true) return isrResponse;
@@ -590,7 +626,7 @@ async function renderAppPageLifecycle(options) {
 				return options.getPageTags();
 			},
 			getRequestCacheLife() {
-				return options.getRequestCacheLife();
+				return readRequestCacheLifeForCachePolicy(options);
 			},
 			isrDebug: options.isrDebug,
 			isrHtmlKey: options.isrHtmlKey,
@@ -600,7 +636,11 @@ async function renderAppPageLifecycle(options) {
 			omitPendingDynamicCacheState: options.omitPendingDynamicCacheState,
 			preserveClientResponseHeaders: !htmlResponsePolicy.shouldWriteToCache,
 			expireSeconds,
-			revalidateSeconds,
+			revalidateSeconds: resolveAppPageCacheWriteRevalidateSeconds({
+				isDynamicError: options.isDynamicError,
+				isForceStatic: options.isForceStatic,
+				revalidateSeconds
+			}),
 			waitUntil(cachePromise) {
 				options.waitUntil?.(cachePromise);
 			}
@@ -612,14 +652,25 @@ async function renderAppPageLifecycle(options) {
 		isEdgeRuntime: options.isEdgeRuntime,
 		middlewareContext: options.middlewareContext,
 		policy: htmlResponsePolicy,
+		requestCacheLife: requestCacheLifeForPrerender,
 		timing: htmlResponseTiming
 	});
 }
-async function settleCapturedRscRenderForCacheMetadata(capturedRscDataPromise) {
+async function settleCapturedRscRenderForCacheMetadata(capturedRscDataPromise, shouldStopWaiting) {
 	if (!capturedRscDataPromise) return;
+	if (!shouldStopWaiting) {
+		try {
+			await capturedRscDataPromise;
+		} catch {}
+		return;
+	}
+	let settled = false;
+	const settledPromise = capturedRscDataPromise.catch(() => {}).then(() => {
+		settled = true;
+	});
 	try {
-		await capturedRscDataPromise;
-	} catch {}
+		while (!settled && !shouldStopWaiting()) await Promise.race([settledPromise, new Promise((resolve) => setTimeout(resolve, 0))]);
+	} finally {}
 }
 //#endregion
 export { renderAppPageLifecycle };

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

@@ -15,6 +15,10 @@ type AppPageResponsePolicy = {
   cacheControl?: string;
   cacheState?: "MISS" | "STATIC";
 };
+type AppPagePrerenderCacheLife = {
+  expire?: number;
+  revalidate?: number;
+};
 type ResolveAppPageResponsePolicyBaseOptions = {
   isDraftMode: boolean;
   isDynamicError: boolean;
@@ -42,6 +46,8 @@ type BuildAppPageRscResponseOptions = {
   mountedSlotsHeader?: string | null;
   params?: Record<string, unknown>;
   policy: AppPageResponsePolicy;
+  renderedPathAndSearch?: string | null;
+  requestCacheLife?: AppPagePrerenderCacheLife | null;
   timing?: AppPageResponseTiming;
 };
 type BuildAppPageHtmlResponseOptions = {
@@ -50,6 +56,7 @@ type BuildAppPageHtmlResponseOptions = {
   isEdgeRuntime?: boolean;
   middlewareContext: AppPageMiddlewareContext;
   policy: AppPageResponsePolicy;
+  requestCacheLife?: AppPagePrerenderCacheLife | null;
   timing?: AppPageResponseTiming;
 };
 declare function resolveAppPageRscResponsePolicy(options: ResolveAppPageRscResponsePolicyOptions): AppPageResponsePolicy;

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

@@ -1,7 +1,7 @@
-import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
+import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
 import { NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, buildRevalidateCacheControl } from "./cache-control.js";
-import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
+import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 //#region src/server/app-page-response.ts
 function applyTimingHeader(headers, timing) {
@@ -14,6 +14,14 @@ function applyTimingHeader(headers, timing) {
 function applyDynamicStaleTimeHeader(headers, dynamicStaleTimeSeconds) {
 	if (dynamicStaleTimeSeconds !== void 0 && Number.isInteger(dynamicStaleTimeSeconds) && dynamicStaleTimeSeconds >= 0) headers.set(VINEXT_DYNAMIC_STALE_TIME_HEADER, String(dynamicStaleTimeSeconds));
 }
+function applyPrerenderCacheLifeHeader(headers, requestCacheLife) {
+	if (!requestCacheLife) return;
+	const payload = {};
+	if (typeof requestCacheLife.revalidate === "number" && Number.isFinite(requestCacheLife.revalidate)) payload.revalidate = requestCacheLife.revalidate;
+	if (typeof requestCacheLife.expire === "number" && Number.isFinite(requestCacheLife.expire)) payload.expire = requestCacheLife.expire;
+	if (payload.revalidate === void 0 && payload.expire === void 0) return;
+	headers.set(VINEXT_PRERENDER_CACHE_LIFE_HEADER, JSON.stringify(payload));
+}
 function resolveAppPageRscResponsePolicy(options) {
 	if (options.isDraftMode) return { cacheControl: NO_STORE_CACHE_CONTROL };
 	if (options.isForceDynamic || options.dynamicUsedDuringBuild) return { cacheControl: NO_STORE_CACHE_CONTROL };
@@ -51,8 +59,8 @@ function resolveAppPageHtmlResponsePolicy(options) {
 	};
 	if ((options.isForceStatic || options.isDynamicError) && options.revalidateSeconds === null) return {
 		cacheControl: STATIC_CACHE_CONTROL,
-		cacheState: "STATIC",
-		shouldWriteToCache: false
+		cacheState: options.isProduction ? "MISS" : "STATIC",
+		shouldWriteToCache: options.isProduction
 	};
 	if (options.dynamicUsedDuringRender) return {
 		cacheControl: NO_STORE_CACHE_CONTROL,
@@ -92,7 +100,10 @@ function buildAppPageRscResponse(body, options) {
 	if (options.policy.cacheControl) headers.set("Cache-Control", options.policy.cacheControl);
 	if (options.policy.cacheState) setCacheStateHeaders(headers, options.policy.cacheState);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);
+	if (options.renderedPathAndSearch) headers.set(VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, encodeURIComponent(options.renderedPathAndSearch));
 	applyRscCompatibilityIdHeader(headers);
+	applyRscDeploymentIdHeader(headers);
+	applyPrerenderCacheLifeHeader(headers, options.requestCacheLife);
 	applyTimingHeader(headers, options.timing);
 	return new Response(body, {
 		status: options.middlewareContext.status ?? 200,
@@ -110,6 +121,7 @@ function buildAppPageHtmlResponse(body, options) {
 	if (options.draftCookie) headers.append("Set-Cookie", options.draftCookie);
 	if (options.linkHeader) headers.set("Link", options.linkHeader);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);
+	applyPrerenderCacheLifeHeader(headers, options.requestCacheLife);
 	applyTimingHeader(headers, options.timing);
 	return new Response(body, {
 		status: options.middlewareContext.status ?? 200,