vinext 0.1.8 → 0.2.1

package/dist/server/app-segment-config.js

@@ -37,6 +37,65 @@ function resolveDynamicStaleTimeSeconds(current, value) {
 	if (typeof value !== "number" || !Number.isInteger(value) || value < 0) return current;
 	return current === void 0 ? value : Math.min(current, value);
 }
+function isDynamicSegment(segment) {
+	return segment.startsWith("[") && segment.endsWith("]");
+}
+function getParallelSegments(options) {
+	if (!options.parallelBranches) return options.parallelSegments ?? [];
+	return options.parallelBranches.flatMap((branch) => branch ? [
+		branch.layout,
+		...branch.configLayouts ?? [],
+		branch.page
+	] : []);
+}
+function resolveDynamicParamsConfig(options) {
+	const parallelSegments = getParallelSegments(options);
+	const segments = [
+		...options.layouts ?? [],
+		options.page,
+		...parallelSegments
+	];
+	let dynamicParamsConfig;
+	for (const segment of segments) if (segment?.dynamicParams === false) dynamicParamsConfig = false;
+	else if (segment?.dynamicParams === true && dynamicParamsConfig !== false) dynamicParamsConfig = true;
+	if (dynamicParamsConfig !== false || !options.routeSegments) return dynamicParamsConfig;
+	let lastDynamicPosition = -1;
+	for (let index = options.routeSegments.length - 1; index >= 0; index--) if (isDynamicSegment(options.routeSegments[index])) {
+		lastDynamicPosition = index;
+		break;
+	}
+	if (lastDynamicPosition < 0) return dynamicParamsConfig;
+	const layouts = options.layouts ?? [];
+	const layoutPositions = options.layoutTreePositions ?? [];
+	let lastDynamicSegmentIsStaticOnly = false;
+	let lastDynamicSegmentHasStaticParams = false;
+	layouts.forEach((layout, index) => {
+		if ((layoutPositions[index] ?? 0) - 1 !== lastDynamicPosition) return;
+		if (layout?.dynamicParams === false) lastDynamicSegmentIsStaticOnly = true;
+		if (typeof layout?.generateStaticParams === "function") lastDynamicSegmentHasStaticParams = true;
+	});
+	if (options.page?.dynamicParams === false) lastDynamicSegmentIsStaticOnly = true;
+	if (typeof options.page?.generateStaticParams === "function") lastDynamicSegmentHasStaticParams = true;
+	for (const branch of options.parallelBranches ?? []) {
+		if (!branch) continue;
+		const branchStartPosition = options.routeSegments.length - (branch.routeSegments?.length ?? 0);
+		const checkSegment = (segment, ownerPosition) => {
+			if (ownerPosition !== lastDynamicPosition) return;
+			if (segment?.dynamicParams === false) lastDynamicSegmentIsStaticOnly = true;
+			if (typeof segment?.generateStaticParams === "function") lastDynamicSegmentHasStaticParams = true;
+		};
+		checkSegment(branch.layout, branchStartPosition - 1);
+		branch.configLayouts?.forEach((layout, index) => {
+			checkSegment(layout, branchStartPosition + (branch.configLayoutTreePositions?.[index] ?? 0) - 1);
+		});
+		checkSegment(branch.page, branchStartPosition + (branch.routeSegments?.length ?? 0) - 1);
+	}
+	if (!options.parallelBranches) for (const segment of parallelSegments) {
+		if (segment?.dynamicParams === false) lastDynamicSegmentIsStaticOnly = true;
+		if (typeof segment?.generateStaticParams === "function") lastDynamicSegmentHasStaticParams = true;
+	}
+	return lastDynamicSegmentIsStaticOnly || lastDynamicSegmentHasStaticParams ? false : void 0;
+}
 function isCacheFetchCacheMode(value) {
 	return value === "default-cache" || value === "force-cache" || value === "only-cache";
 }
@@ -53,7 +112,9 @@ function describeFetchCacheConflict(value) {
 */
 function resolveAppPageSegmentConfig(options) {
 	const segments = [...options.layouts ?? [], options.page];
+	const parallelSegments = getParallelSegments(options);
 	const config = { revalidateSeconds: null };
+	config.dynamicParamsConfig = resolveDynamicParamsConfig(options);
 	let hasForceCache = false;
 	let hasForceNoStore = false;
 	let hasOnlyCache = false;
@@ -67,8 +128,6 @@ function resolveAppPageSegmentConfig(options) {
 			config.dynamicConfig = hasForceDynamic ? "force-dynamic" : segment.dynamic;
 		}
 		if (isRouteSegmentRuntime(segment.runtime)) config.runtime = segment.runtime;
-		if (segment.dynamicParams === false) config.dynamicParamsConfig = false;
-		else if (segment.dynamicParams === true && config.dynamicParamsConfig !== false) config.dynamicParamsConfig = true;
 		if (isRouteSegmentFetchCache(segment.fetchCache)) {
 			const fetchCache = segment.fetchCache;
 			if (hasParentDefaultNoStore && (fetchCache === "auto" || isCacheFetchCacheMode(fetchCache))) throw new Error(describeFetchCacheConflict(fetchCache));
@@ -86,14 +145,12 @@ function resolveAppPageSegmentConfig(options) {
 		}
 		config.revalidateSeconds = resolveRevalidateSeconds(config.revalidateSeconds, segment.revalidate);
 	}
-	for (const segment of options.parallelSegments ?? []) {
+	for (const segment of parallelSegments) {
 		if (!segment) continue;
 		if (segment.dynamic === "force-dynamic") {
 			hasForceDynamic = true;
 			config.dynamicConfig = "force-dynamic";
 		} else if (config.dynamicConfig === void 0 && isRouteSegmentDynamic(segment.dynamic)) config.dynamicConfig = segment.dynamic;
-		if (segment.dynamicParams === false) config.dynamicParamsConfig = false;
-		else if (segment.dynamicParams === true && config.dynamicParamsConfig === void 0) config.dynamicParamsConfig = true;
 		if (config.runtime === void 0 && isRouteSegmentRuntime(segment.runtime)) config.runtime = segment.runtime;
 		if (isRouteSegmentFetchCache(segment.fetchCache)) {
 			const fetchCache = segment.fetchCache;
@@ -120,7 +177,6 @@ function resolveAppPageSegmentConfig(options) {
 	if (config.fetchCache === void 0) {
 		if (config.dynamicConfig === "error") config.fetchCache = "only-cache";
 	}
-	if (config.dynamicParamsConfig === void 0 && (config.dynamicConfig === "error" || config.dynamicConfig === "force-static")) config.dynamicParamsConfig = false;
 	return config;
 }
 function resolveAppPageFetchCacheMode(options) {

package/dist/server/app-server-action-execution.d.ts

@@ -29,6 +29,7 @@ type AppServerActionReturnValue = {
 type AppServerActionRoute = {
   page?: unknown;
   pattern: string;
+  rootParamNames?: readonly string[];
   routeHandler?: unknown;
   routeSegments?: readonly string[];
   params?: readonly string[] | null;

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

@@ -13,6 +13,7 @@ import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityI
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { getNextErrorDigest, parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
+import { createRootParamsUsageController, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage } from "../shims/root-params.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import "./app-page-stream.js";
@@ -24,7 +25,10 @@ import { createStaticGenerationHeadersContext } from "./app-static-generation.js
 //#region src/server/app-server-action-execution.ts
 function prepareActionPageRerenderContext(options) {
 	if (options.dynamicConfig === "force-static" || options.dynamicConfig === "error") setHeadersContext(createStaticGenerationHeadersContext({
-		draftModeEnabled: isDraftModeRequest(options.request, options.draftModeSecret),
+		draftModeEnabled: isDraftModeRequest(createActionRerenderRequest({
+			draftModeCookie: options.draftModeCookie,
+			request: options.request
+		}), options.draftModeSecret),
 		draftModeSecret: options.draftModeSecret,
 		dynamicConfig: options.dynamicConfig,
 		routeKind: "page",
@@ -32,6 +36,14 @@ function prepareActionPageRerenderContext(options) {
 	}));
 	return options.dynamicConfig === "force-static" ? new URLSearchParams() : options.searchParams;
 }
+function createActionRerenderRequest(options) {
+	if (!options.draftModeCookie) return options.request;
+	const headers = new Headers(options.request.headers);
+	const cookieHeader = applySetCookieMutationsToRequestCookieHeader(headers.get("cookie"), [options.draftModeCookie]);
+	if (cookieHeader === null) headers.delete("cookie");
+	else headers.set("cookie", cookieHeader);
+	return new Request(options.request.url, { headers });
+}
 /**
 * Matches Next.js' server action argument cap to prevent stack overflow in
 * Function.prototype.apply when decoding hostile action payloads.
@@ -362,11 +374,14 @@ async function handleProgressiveServerActionRequest(options) {
 		let actionRedirect = null;
 		let actionError = void 0;
 		let actionFailed = false;
+		let actionThrew = false;
 		let actionResult;
+		const rootParamsUsage = createRootParamsUsageController();
 		const previousHeadersPhase = options.setHeadersAccessPhase("action");
 		try {
-			actionResult = await action();
+			actionResult = await runWithRootParamsUsage({ kind: "server-action" }, action, rootParamsUsage);
 		} catch (error) {
+			actionThrew = true;
 			actionRedirect = getActionRedirect(error);
 			if (!actionRedirect) {
 				actionError = error;
@@ -386,8 +401,10 @@ async function handleProgressiveServerActionRequest(options) {
 			}
 		} finally {
 			options.setHeadersAccessPhase(previousHeadersPhase);
+			if (actionThrew) rootParamsUsage.transitionToRender();
 		}
 		if (!actionRedirect) {
+			if (!actionThrew) rootParamsUsage.transitionToRender();
 			const actionPendingCookies = dedupePendingCookies(options.getAndClearPendingCookies());
 			const actionDraftCookie = options.getDraftModeCookieHeader();
 			const revalidationKind = resolveActionRevalidationKind(actionPendingCookies.length > 0 || Boolean(actionDraftCookie));
@@ -555,16 +572,19 @@ async function handleServerActionRscRequest(options) {
 		let returnValue;
 		let actionRedirect = null;
 		let actionStatus = 200;
+		let actionThrew = false;
 		const actionWasForwarded = Boolean(options.request.headers.get(ACTION_FORWARDED_HEADER));
+		const rootParamsUsage = createRootParamsUsageController();
 		const previousHeadersPhase = options.setHeadersAccessPhase("action");
 		try {
 			try {
 				validateServerActionArgs(args);
 				returnValue = {
 					ok: true,
-					data: await action.apply(null, args)
+					data: await runWithRootParamsUsage({ kind: "server-action" }, () => action.apply(null, args), rootParamsUsage)
 				};
 			} catch (error) {
+				actionThrew = true;
 				actionRedirect = getActionRedirect(error);
 				if (actionRedirect) returnValue = {
 					ok: true,
@@ -579,6 +599,7 @@ async function handleServerActionRscRequest(options) {
 							data: error
 						};
 					} else {
+						actionStatus = 500;
 						console.error("[vinext] Server action error:", error);
 						returnValue = {
 							ok: false,
@@ -589,6 +610,7 @@ async function handleServerActionRscRequest(options) {
 			}
 		} finally {
 			options.setHeadersAccessPhase(previousHeadersPhase);
+			if (actionThrew && !actionWasForwarded) rootParamsUsage.transitionToRender();
 		}
 		if (actionRedirect) {
 			const actionPendingCookies = dedupePendingCookies(options.getAndClearPendingCookies());
@@ -633,9 +655,10 @@ async function handleServerActionRscRequest(options) {
 				request: options.request,
 				url: redirectTarget
 			});
-			setHeadersContext(headersContextFromRequest(redirectRenderRequest));
+			setHeadersContext(headersContextFromRequest(redirectRenderRequest, { draftModeSecret: options.draftModeSecret }));
 			const redirectDynamicConfig = options.resolveRouteDynamicConfig?.(targetMatch.route);
 			const redirectSearchParams = prepareActionPageRerenderContext({
+				draftModeCookie: actionDraftCookie,
 				draftModeSecret: options.draftModeSecret,
 				dynamicConfig: redirectDynamicConfig,
 				request: redirectRenderRequest,
@@ -651,27 +674,29 @@ async function handleServerActionRscRequest(options) {
 			setCurrentFetchCacheMode(options.resolveRouteFetchCacheMode?.(targetMatch.route) ?? null);
 			setCurrentForceDynamicFetchDefault(redirectDynamicConfig === "force-dynamic");
 			setCurrentFetchSoftTags(buildServerActionPageTags(targetMatch.route, targetPathname));
-			const element = options.buildPageElement({
-				cleanPathname: targetPathname,
-				interceptOpts: void 0,
-				isRscRequest: true,
-				mountedSlotsHeader: null,
-				params: targetMatch.params,
-				request: redirectRenderRequest,
-				route: targetMatch.route,
-				searchParams: redirectSearchParams,
-				renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI,
-				observeMetadataSearchParamsAccess: redirectDynamicConfig !== "force-static",
-				observePageSearchParamsAccess: redirectDynamicConfig !== "force-static"
-			});
-			const onRenderError = options.createRscOnErrorHandler(redirectRenderRequest, targetPathname, targetMatch.route.pattern);
-			return createServerActionRscResponse(await options.renderToReadableStream({
-				root: element,
-				returnValue
-			}, {
-				temporaryReferences,
-				onError: onRenderError
-			}), {
+			return createServerActionRscResponse(await runWithRootParamsScope(pickRootParams(targetMatch.params, targetMatch.route.rootParamNames), () => runWithRootParamsUsage({ kind: "route" }, async () => {
+				const element = options.buildPageElement({
+					cleanPathname: targetPathname,
+					interceptOpts: void 0,
+					isRscRequest: true,
+					mountedSlotsHeader: null,
+					params: targetMatch.params,
+					request: redirectRenderRequest,
+					route: targetMatch.route,
+					searchParams: redirectSearchParams,
+					renderMode: APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI,
+					observeMetadataSearchParamsAccess: redirectDynamicConfig !== "force-static",
+					observePageSearchParamsAccess: redirectDynamicConfig !== "force-static"
+				});
+				const onRenderError = options.createRscOnErrorHandler(redirectRenderRequest, targetPathname, targetMatch.route.pattern);
+				return options.renderToReadableStream({
+					root: element,
+					returnValue
+				}, {
+					temporaryReferences,
+					onError: onRenderError
+				});
+			})), {
 				status: shouldUseForwardedActionRedirectStatus({
 					actionWasForwarded,
 					currentPathname: options.cleanPathname,
@@ -686,7 +711,8 @@ async function handleServerActionRscRequest(options) {
 		const actionPendingCookies = dedupePendingCookies(options.getAndClearPendingCookies());
 		const actionDraftCookie = options.getDraftModeCookieHeader();
 		const actionRevalidationKind = resolveActionRevalidationKind(actionPendingCookies.length > 0 || Boolean(actionDraftCookie));
-		if (actionWasForwarded || actionStatus === 200 && actionRevalidationKind === ACTION_DID_NOT_REVALIDATE) {
+		const isHttpFallback = actionStatus === 401 || actionStatus === 403 || actionStatus === 404;
+		if (!isHttpFallback && (actionWasForwarded || actionRevalidationKind === ACTION_DID_NOT_REVALIDATE)) {
 			const onRenderError = options.createRscOnErrorHandler(options.request, options.cleanPathname, options.cleanPathname);
 			const rscStream = await options.renderToReadableStream({ returnValue }, {
 				temporaryReferences,
@@ -707,9 +733,11 @@ async function handleServerActionRscRequest(options) {
 				headers: actionHeaders
 			}, options.clearRequestContext);
 		}
+		if (!actionThrew) rootParamsUsage.transitionToRender();
 		const match = options.matchRoute(options.cleanPathname);
 		let element;
 		let errorPattern = match ? match.route.pattern : options.cleanPathname;
+		const actionRerenderIsRscRequest = true;
 		if (match) {
 			const { route: actionRoute, params: actionParams } = match;
 			const actionRerenderTarget = await resolveAppPageActionRerenderTarget({
@@ -719,13 +747,14 @@ async function handleServerActionRscRequest(options) {
 				findIntercept: options.findIntercept,
 				getRouteParamNames: options.getRouteParamNames,
 				getSourceRoute: options.getSourceRoute,
-				isRscRequest: options.isRscRequest,
+				isRscRequest: actionRerenderIsRscRequest,
 				toInterceptOpts: options.toInterceptOpts
 			});
 			const resolvedActionNavigationParams = resolveAppPageNavigationParams(actionRerenderTarget.route, actionRerenderTarget.navigationParams, options.cleanPathname, actionRerenderTarget.interceptOpts);
 			await options.ensureRouteLoaded?.(actionRerenderTarget.route);
 			const actionRerenderDynamicConfig = options.resolveRouteDynamicConfig?.(actionRerenderTarget.route);
 			const actionRerenderSearchParams = prepareActionPageRerenderContext({
+				draftModeCookie: actionDraftCookie,
 				draftModeSecret: options.draftModeSecret,
 				dynamicConfig: actionRerenderDynamicConfig,
 				request: options.request,
@@ -740,10 +769,10 @@ async function handleServerActionRscRequest(options) {
 			setCurrentFetchCacheMode(options.resolveRouteFetchCacheMode?.(actionRerenderTarget.route) ?? null);
 			setCurrentForceDynamicFetchDefault(actionRerenderDynamicConfig === "force-dynamic");
 			setCurrentFetchSoftTags(buildServerActionPageTags(actionRerenderTarget.route, options.cleanPathname));
-			element = options.buildPageElement({
+			const buildActionRerenderElement = () => options.buildPageElement({
 				cleanPathname: options.cleanPathname,
 				interceptOpts: actionRerenderTarget.interceptOpts,
-				isRscRequest: options.isRscRequest,
+				isRscRequest: actionRerenderIsRscRequest,
 				mountedSlotsHeader: options.mountedSlotsHeader,
 				params: actionRerenderTarget.params,
 				request: options.request,
@@ -753,19 +782,21 @@ async function handleServerActionRscRequest(options) {
 				observeMetadataSearchParamsAccess: actionRerenderDynamicConfig !== "force-static",
 				observePageSearchParamsAccess: actionRerenderDynamicConfig !== "force-static"
 			});
+			element = actionWasForwarded && isHttpFallback ? await runWithRootParamsUsage({ kind: "route" }, async () => buildActionRerenderElement()) : buildActionRerenderElement();
 			errorPattern = actionRerenderTarget.route.pattern;
 		} else {
 			const actionRouteId = options.createPayloadRouteId(options.cleanPathname, null);
 			element = options.createNotFoundElement(actionRouteId);
 		}
 		const onRenderError = options.createRscOnErrorHandler(options.request, options.cleanPathname, errorPattern);
-		const rscStream = await options.renderToReadableStream({
+		const renderActionRerender = () => options.renderToReadableStream({
 			root: element,
 			returnValue
 		}, {
 			temporaryReferences,
 			onError: onRenderError
 		});
+		const rscStream = await (actionWasForwarded && isHttpFallback ? runWithRootParamsUsage({ kind: "route" }, renderActionRerender) : renderActionRerender());
 		const actionHeaders = new Headers({
 			"Content-Type": VINEXT_RSC_CONTENT_TYPE,
 			Vary: VINEXT_RSC_VARY_HEADER

package/dist/server/app-ssr-entry.d.ts

@@ -1,5 +1,6 @@
 import { NavigationContext } from "../shims/navigation-context-state.js";
 import { RootParams } from "../shims/root-params.js";
+import { InitialNavigationCacheMetadata } from "./app-ssr-stream.js";
 import { AppSsrRenderResult } from "./app-page-stream.js";
 import { ReactFormState } from "react-dom/client";
 
@@ -44,6 +45,8 @@ declare function handleSsr(rscStream: ReadableStream<Uint8Array>, navContext: Na
    *  and ISR cache writes to avoid caching fallback content. */
   waitForAllReady?: boolean;
   fallbackToErrorDocumentOnShellError?: boolean;
+  dynamicStaleTimeSeconds?: number;
+  getInitialNavigationCacheMetadata?: () => InitialNavigationCacheMetadata;
 }): Promise<AppSsrRenderResult>;
 declare const _default: {
   fetch(request: Request): Promise<Response>;

package/dist/server/app-ssr-entry.js

@@ -12,6 +12,7 @@ import { runWithNavigationContext } from "../shims/navigation-state.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr, safeJsonStringify } from "./html.js";
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
+import { setPagesClientAssets } from "./pages-client-assets.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { BfcacheStateKeyMapContext, ElementsContext, Slot } from "../shims/slot.js";
 import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
@@ -27,9 +28,12 @@ import { createInitialDevServerErrorScript } from "./dev-initial-server-error.js
 import { ssrAppRouterInstance } from "./app-ssr-router-instance.js";
 import { Fragment, createElement, use } from "react";
 import { renderToReadableStream, renderToStaticMarkup } from "react-dom/server.edge";
+import { preinitModule } from "react-dom";
 import { createFromReadableStream } from "@vitejs/plugin-rsc/ssr";
 import clientReferences from "virtual:vite-rsc/client-references";
+import pagesClientAssets from "virtual:vinext-pages-client-assets";
 //#region src/server/app-ssr-entry.ts
+setPagesClientAssets(pagesClientAssets);
 /**
 * Default cap for the preload `Link` header, matching Next.js's
 * `defaultConfig.reactMaxHeadersLength`. Used when no config value threads
@@ -149,12 +153,12 @@ function buildModulePreloadHtml(bootstrapModuleUrl, nonce) {
 	if (!bootstrapModuleUrl) return "";
 	return `<link rel="modulepreload"${createNonceAttribute(nonce)} href="${escapeHtmlAttr(bootstrapModuleUrl)}" />\n`;
 }
-function buildHeadInjectionHtml(navContext, bootstrapModuleUrl, formState, insertedHTML, fontHTML, scriptNonce) {
+function buildHeadInjectionHtml(navContext, bootstrapModuleUrl, formState, insertedHTML, fontHTML, dynamicStaleTimeSeconds, scriptNonce) {
 	const navPayload = {
 		pathname: navContext.pathname,
 		searchParams: [...navContext.searchParams.entries()]
 	};
-	return createInlineScriptTag(createNavigationRuntimeRscMetadataScript(navContext.params, navPayload), scriptNonce) + (formState === null ? "" : createInlineScriptTag("self[" + safeJsonStringify(RSC_FORM_STATE_GLOBAL) + "]=" + safeJsonStringify(formState), scriptNonce)) + buildModulePreloadHtml(bootstrapModuleUrl, scriptNonce) + insertedHTML + fontHTML;
+	return createInlineScriptTag(createNavigationRuntimeRscMetadataScript(navContext.params, navPayload, dynamicStaleTimeSeconds), scriptNonce) + (formState === null ? "" : createInlineScriptTag("self[" + safeJsonStringify(RSC_FORM_STATE_GLOBAL) + "]=" + safeJsonStringify(formState), scriptNonce)) + buildModulePreloadHtml(bootstrapModuleUrl, scriptNonce) + insertedHTML + fontHTML;
 }
 function requireNavigationContext(navContext) {
 	if (!navContext) throw new Error("App SSR requires navigation context for BFCache state keys");
@@ -176,15 +180,19 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				let rscEmbed;
 				if (options?.sideStream) {
 					ssrStream = rscStream;
-					rscEmbed = createRscEmbedTransform(options.sideStream, options?.scriptNonce);
+					rscEmbed = createRscEmbedTransform(options.sideStream, options?.scriptNonce, options?.getInitialNavigationCacheMetadata);
 					if (options.capturedRscDataRef) options.capturedRscDataRef.value = rscEmbed.getRawBuffer();
 				} else {
 					const [s1, s2] = rscStream.tee();
 					ssrStream = s1;
-					rscEmbed = createRscEmbedTransform(s2, options?.scriptNonce);
+					rscEmbed = createRscEmbedTransform(s2, options?.scriptNonce, options?.getInitialNavigationCacheMetadata);
 				}
 				let flightRoot = null;
 				function VinextFlightRoot() {
+					for (const moduleUrl of pagesClientAssets.appBootstrapPreinitModules ?? []) preinitModule(moduleUrl, {
+						as: "script",
+						nonce: options?.scriptNonce
+					});
 					if (!flightRoot) flightRoot = createFromReadableStream(ssrStream);
 					const wireElements = use(flightRoot);
 					const elements = AppElementsWire.decode(wireElements);
@@ -270,7 +278,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 					const initialDevServerErrorHTML = createInitialDevServerErrorScript(options?.initialDevServerError, options?.scriptNonce);
 					if (didInjectHeadHTML) return insertedHTML + errorMetaHTML;
 					didInjectHeadHTML = true;
-					return buildHeadInjectionHtml(ssrNavigationContext, bootstrapModuleUrl, options?.formState ?? null, insertedHTML + errorMetaHTML + getTraceMetaHTML() + initialDevServerErrorHTML, fontHTML, options?.scriptNonce);
+					return buildHeadInjectionHtml(ssrNavigationContext, bootstrapModuleUrl, options?.formState ?? null, insertedHTML + errorMetaHTML + getTraceMetaHTML() + initialDevServerErrorHTML, fontHTML, options?.dynamicStaleTimeSeconds, options?.scriptNonce);
 				};
 				const getBeforeInteractiveHeadHTML = () => renderBeforeInteractiveInlineScripts(beforeInteractiveInlineScripts);
 				return {

package/dist/server/app-ssr-stream.d.ts

@@ -6,11 +6,15 @@ type RscEmbedTransform = {
 };
 type HtmlInsertion = string | (() => string);
 type InlineCssManifest = Record<string, string>;
+type InitialNavigationCacheMetadata = {
+  kind: "dynamic" | "static";
+  dynamicStaleTimeSeconds?: number;
+};
 declare function navigationRuntimeRscBootstrapExpression(): string;
 declare function createNavigationRuntimeRscMetadataScript(params: Record<string, string | string[]>, nav: {
   pathname: string;
   searchParams: [string, string][];
-}): string;
+}, dynamicStaleTimeSeconds?: number): string;
 /**
  * Fix invalid preload "as" values in RSC Flight hint lines before they reach
  * the client. React Flight emits HL hints with as="stylesheet" for CSS, but
@@ -21,7 +25,7 @@ declare function fixFlightHints(text: string): string;
  * Create a helper that progressively embeds RSC chunks as inline <script> tags.
  * The browser entry turns the embedded chunks back into Uint8Array data.
  */
-declare function createRscEmbedTransform(embedStream: ReadableStream<Uint8Array>, scriptNonce?: string): RscEmbedTransform;
+declare function createRscEmbedTransform(embedStream: ReadableStream<Uint8Array>, scriptNonce?: string, getInitialNavigationCacheMetadata?: () => InitialNavigationCacheMetadata): RscEmbedTransform;
 /**
  * Fix invalid preload "as" values in server-rendered HTML.
  * React Fizz emits <link rel="preload" as="stylesheet"> for CSS, but the
@@ -57,4 +61,4 @@ declare function fixPreloadAs(html: string): string;
  */
 declare function createTickBufferedTransform(rscEmbed: RscEmbedTransform, injectHTML?: HtmlInsertion, injectAfterHeadOpenHTML?: HtmlInsertion, inlineCssManifest?: InlineCssManifest, inlineCssPrependCss?: string, inlineCssPrependFallbackHTML?: string, inlineCssScriptNonce?: string): TransformStream<Uint8Array, Uint8Array>;
 //#endregion
-export { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, fixFlightHints, fixPreloadAs, navigationRuntimeRscBootstrapExpression };
+export { InitialNavigationCacheMetadata, createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, fixFlightHints, fixPreloadAs, navigationRuntimeRscBootstrapExpression };

package/dist/server/app-ssr-stream.js

@@ -6,14 +6,18 @@ const NAVIGATION_RUNTIME_REFERENCE = `self[Symbol.for(${safeJsonStringify(NAVIGA
 function navigationRuntimeRscBootstrapExpression() {
 	return `((${NAVIGATION_RUNTIME_REFERENCE}??={bootstrap:{routeManifest:null},functions:{}}).bootstrap.rsc??={rsc:[]})`;
 }
-function createNavigationRuntimeRscMetadataScript(params, nav) {
-	return "Object.assign(" + navigationRuntimeRscBootstrapExpression() + ",{params:" + safeJsonStringify(params) + ",nav:" + safeJsonStringify(nav) + "})";
+function createNavigationRuntimeRscMetadataScript(params, nav, dynamicStaleTimeSeconds) {
+	return "Object.assign(" + navigationRuntimeRscBootstrapExpression() + ",{params:" + safeJsonStringify(params) + ",nav:" + safeJsonStringify(nav) + (dynamicStaleTimeSeconds === void 0 ? "" : ",dynamicStaleTimeSeconds:" + safeJsonStringify(dynamicStaleTimeSeconds)) + "})";
 }
 function createNavigationRuntimeRscChunkScript(chunk) {
 	return navigationRuntimeRscBootstrapExpression() + ".rsc.push(" + safeJsonStringify(chunk) + ")";
 }
-function createNavigationRuntimeRscDoneScript() {
-	return navigationRuntimeRscBootstrapExpression() + ".done=true";
+function createNavigationRuntimeRscDoneScript(metadata) {
+	const bootstrap = navigationRuntimeRscBootstrapExpression();
+	return (metadata === void 0 ? "" : "Object.assign(" + bootstrap + "," + safeJsonStringify({
+		initialCacheKind: metadata.kind,
+		...metadata.dynamicStaleTimeSeconds === void 0 ? {} : { dynamicStaleTimeSeconds: metadata.dynamicStaleTimeSeconds }
+	}) + ");") + bootstrap + ".done=true";
 }
 /**
 * Fix invalid preload "as" values in RSC Flight hint lines before they reach
@@ -27,7 +31,7 @@ function fixFlightHints(text) {
 * Create a helper that progressively embeds RSC chunks as inline <script> tags.
 * The browser entry turns the embedded chunks back into Uint8Array data.
 */
-function createRscEmbedTransform(embedStream, scriptNonce) {
+function createRscEmbedTransform(embedStream, scriptNonce, getInitialNavigationCacheMetadata) {
 	const reader = embedStream.getReader();
 	let pendingChunks = [];
 	const rawChunks = [];
@@ -67,7 +71,7 @@ function createRscEmbedTransform(embedStream, scriptNonce) {
 		async finalize() {
 			await pumpPromise;
 			let scripts = this.flush();
-			scripts += createInlineScriptTag(createNavigationRuntimeRscDoneScript(), scriptNonce);
+			scripts += createInlineScriptTag(createNavigationRuntimeRscDoneScript(getInitialNavigationCacheMetadata?.()), scriptNonce);
 			return scripts;
 		},
 		async getRawBuffer() {

package/dist/server/app-visited-response-cache.d.ts

@@ -1,17 +1,23 @@
+import { AppElements } from "./app-elements-wire.js";
 import { CachedRscResponse } from "../shims/navigation.js";
 
 //#region src/server/app-visited-response-cache.d.ts
 type VisitedResponseCacheNavigationKind = "navigate" | "refresh" | "traverse";
 type VisitedResponseCacheEntry = {
   createdAt: number;
+  elements?: AppElements;
   expiresAt: number;
+  mountedSlotsHeader: string | null;
   params: Record<string, string | string[]>;
   response: CachedRscResponse;
 };
 declare const VISITED_RESPONSE_CACHE_TTL: number;
 declare const MAX_TRAVERSAL_CACHE_TTL: number;
 declare function createVisitedResponseCacheEntry(options: {
+  elements?: AppElements;
+  fallbackTtlMs?: number;
   now: number;
+  mountedSlotsHeader?: string | null;
   params: Record<string, string | string[]>;
   response: CachedRscResponse;
 }): VisitedResponseCacheEntry;

package/dist/server/app-visited-response-cache.js

@@ -5,7 +5,9 @@ const MAX_TRAVERSAL_CACHE_TTL = 30 * 6e4;
 function createVisitedResponseCacheEntry(options) {
 	return {
 		createdAt: options.now,
-		expiresAt: resolveCachedRscResponseExpiresAt(options.now, options.response, VISITED_RESPONSE_CACHE_TTL),
+		...options.elements ? { elements: options.elements } : {},
+		expiresAt: resolveCachedRscResponseExpiresAt(options.now, options.response, options.fallbackTtlMs ?? 3e5),
+		mountedSlotsHeader: options.mountedSlotsHeader ?? null,
 		params: options.params,
 		response: options.response
 	};

package/dist/server/cache-control.d.ts

@@ -2,8 +2,10 @@ import { CdnCacheableHeaderInput } from "../shims/cdn-cache.js";
 
 //#region src/server/cache-control.d.ts
 declare const NEVER_CACHE_CONTROL = "private, no-cache, no-store, max-age=0, must-revalidate";
+declare const BROWSER_REVALIDATE_CACHE_CONTROL = "public, max-age=0, must-revalidate";
 declare const STATIC_CACHE_CONTROL = "s-maxage=31536000, stale-while-revalidate";
 declare const NO_STORE_CACHE_CONTROL = "no-store, must-revalidate";
+declare function shouldUseNextDeployCacheControl(): boolean;
 /**
  * Route a cacheable response's headers through the active CDN cache adapter and
  * apply the result to `headers`. The default adapter yields a single
@@ -34,4 +36,4 @@ declare function buildRevalidateCacheControl(revalidateSeconds: number, expireSe
  */
 declare function buildCachedRevalidateCacheControl(cacheState: "HIT" | "STALE", revalidateSeconds: number, expireSeconds?: number): string;
 //#endregion
-export { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, buildCachedRevalidateCacheControl, buildRevalidateCacheControl };
+export { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, buildCachedRevalidateCacheControl, buildRevalidateCacheControl, shouldUseNextDeployCacheControl };

package/dist/server/cache-control.js

@@ -1,9 +1,17 @@
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 //#region src/server/cache-control.ts
 const NEVER_CACHE_CONTROL = "private, no-cache, no-store, max-age=0, must-revalidate";
+const BROWSER_REVALIDATE_CACHE_CONTROL = "public, max-age=0, must-revalidate";
 const STATIC_CACHE_CONTROL = "s-maxage=31536000, stale-while-revalidate";
 const STALE_REVALIDATE_CACHE_CONTROL = "s-maxage=0, stale-while-revalidate";
 const NO_STORE_CACHE_CONTROL = "no-store, must-revalidate";
+const SHARED_CACHE_DIRECTIVE_RE = /(?:^|,)\s*s-maxage\s*=/i;
+function shouldUseNextDeployCacheControl() {
+	return process.env.VINEXT_NEXT_DEPLOY_CACHE_CONTROL === "1";
+}
+function isSharedCacheControl(cacheControl) {
+	return SHARED_CACHE_DIRECTIVE_RE.test(cacheControl);
+}
 /**
 * Route a cacheable response's headers through the active CDN cache adapter and
 * apply the result to `headers`. The default adapter yields a single
@@ -17,6 +25,10 @@ const NO_STORE_CACHE_CONTROL = "no-store, must-revalidate";
 */
 function applyCdnResponseHeaders(headers, input) {
 	headers.delete("Cache-Control");
+	if (shouldUseNextDeployCacheControl() && isSharedCacheControl(input.cacheControl)) {
+		headers.set("Cache-Control", BROWSER_REVALIDATE_CACHE_CONTROL);
+		return;
+	}
 	const map = getCdnCacheAdapter().buildResponseHeaders(input);
 	for (const [name, value] of Object.entries(map)) {
 		if (value === null) {
@@ -53,4 +65,4 @@ function buildCachedRevalidateCacheControl(cacheState, revalidateSeconds, expire
 	return buildRevalidateCacheControl(revalidateSeconds, expireSeconds);
 }
 //#endregion
-export { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, buildCachedRevalidateCacheControl, buildRevalidateCacheControl };
+export { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, buildCachedRevalidateCacheControl, buildRevalidateCacheControl, shouldUseNextDeployCacheControl };

package/dist/server/client-trace-metadata.js

@@ -24,7 +24,32 @@ const carrierSetter = { set(carrier, key, value) {
 		value
 	});
 } };
+const OPEN_TELEMETRY_API_SYMBOL = Symbol.for("opentelemetry.js.api.1");
+const OPEN_TELEMETRY_SPAN_SYMBOL = Symbol.for("OpenTelemetry Context Key SPAN");
+function getRegisteredOpenTelemetryTraceData() {
+	let metadataSpan = null;
+	try {
+		const registry = globalThis[OPEN_TELEMETRY_API_SYMBOL];
+		if (!registry?.context || !registry.propagation) return null;
+		const contextApi = registry.context;
+		const propagation = registry.propagation;
+		const activeContext = contextApi.active();
+		metadataSpan = activeContext.getValue(OPEN_TELEMETRY_SPAN_SYMBOL) !== void 0 ? null : registry.trace?.getTracer("vinext").startSpan("vinext.clientTraceMetadata", void 0, activeContext) ?? null;
+		const context = metadataSpan ? activeContext.setValue(OPEN_TELEMETRY_SPAN_SYMBOL, metadataSpan) : activeContext;
+		const entries = [];
+		contextApi.with(context, () => {
+			propagation.inject(context, entries, carrierSetter);
+		});
+		return entries;
+	} catch {
+		return [];
+	} finally {
+		metadataSpan?.end();
+	}
+}
 function getOpenTelemetryTraceData() {
+	const registeredEntries = getRegisteredOpenTelemetryTraceData();
+	if (registeredEntries) return registeredEntries;
 	let api;
 	try {
 		const req = globalThis.require;
@@ -75,6 +100,7 @@ function renderClientTraceMetadataTags(entries) {
 */
 function getClientTraceMetadataHTML(allowList) {
 	if (!allowList || allowList.length === 0) return "";
+	if (typeof process !== "undefined" && process.env.VINEXT_PRERENDER === "1") return "";
 	return renderClientTraceMetadataTags(filterClientTraceMetadata(getOpenTelemetryTraceData(), allowList));
 }
 //#endregion