vinext 1.0.1 → 1.2.0

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

@@ -18,9 +18,10 @@ function applyDynamicStaleTimeHeader(headers, dynamicStaleTimeSeconds) {
 	if (dynamicStaleTimeSeconds !== void 0 && Number.isInteger(dynamicStaleTimeSeconds) && dynamicStaleTimeSeconds >= 0) headers.set(VINEXT_DYNAMIC_STALE_TIME_HEADER, String(dynamicStaleTimeSeconds));
 }
 /**
-* Only ever set from a *completed* render's cacheLife (cache replay or
-* prerender seed) — `use cache` scopes keep resolving after headers commit,
-* so a streaming response can never carry it.
+* Only ever set from a *completed* render's cacheLife (cache replay,
+* prerender seed, or a layout probe's early redirect) — `use cache` scopes
+* keep resolving after headers commit, so a streaming response can never
+* carry it.
 */
 function applyClientStaleTimeHeader(headers, staleTimeSeconds) {
 	if (staleTimeSeconds === void 0) return;

package/dist/server/app-page-route-wiring.d.ts

@@ -140,14 +140,15 @@ type BuildAppPageRouteElementOptions<TModule extends AppPageModule = AppPageModu
   makeThenableParams: MakeThenableParams;
   matchedParams: AppPageParams;
   metadataPlacement?: "body" | "head";
-  resolvedMetadata: Metadata | null;
+  /**
+   * Starts resolving the page's head. The head, its streamed body tags and its
+   * error outlet each call this while Flight renders them, so callers memoise
+   * it per render with React's `cache()`. Without it the head has no metadata.
+   */
+  resolveHead?: (() => AppPageRouteHead) | null;
   resolvedMetadataPathname?: string;
-  resolvedViewport: Viewport;
   scriptNonce?: string;
-  streamingMetadata?: Promise<Metadata | null> | null;
-  streamingMetadataOutlet?: Promise<unknown> | null;
   streamingMetadataOutletSuspended?: boolean;
-  streamingMetadataTags?: Promise<Metadata | null> | null;
   trailingSlash?: boolean;
   rootForbiddenModule?: TModule | null;
   rootNotFoundModule?: TModule | null;
@@ -158,6 +159,17 @@ type BuildAppPageRouteElementOptions<TModule extends AppPageModule = AppPageModu
   searchParams?: unknown;
   slotOverrides?: Readonly<Record<string, AppPageSlotOverride<TModule>>> | null;
 };
+/**
+ * A page's head as Flight renders it. `metadata` and `viewport` hold the tags
+ * to render, including the HTTP access fallback's when resolution failed, so
+ * they never reject. `outlet` rejects with the resolution error so the route's
+ * boundaries can handle it.
+ */
+export type AppPageRouteHead = {
+  metadata: Promise<Metadata | null>;
+  outlet: Promise<null>;
+  viewport: Promise<Viewport>;
+};
 type MakeThenableParams = (params: AppPageParams, observer?: ThenableParamsObserver) => unknown;
 type BuildAppPageElementsOptions<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = BuildAppPageRouteElementOptions<TModule, TErrorModule> & {
   interception?: AppElementsInterception | null;

package/dist/server/app-page-route-wiring.js

@@ -1,14 +1,15 @@
-import { fnv1a64 } from "../utils/hash.js";
 import { APP_RSC_RENDER_MODE_PREFETCH_EMPTY, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "./app-rsc-render-mode.js";
+import { fnv1a64 } from "../utils/hash.js";
+import { createInlineScriptTag, escapeHtmlAttr } from "./html.js";
 import { createAppRenderDependency, registerAppElementRenderDependencies, renderAfterAppDependencies, renderAppComponentWithDependencyBarrier } from "./app-render-dependency.js";
 import { APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_STATIC_SIBLINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import { APP_PREFETCH_LOADING_SHELL_MARKER_KEY } from "./app-elements.js";
-import { createInlineScriptTag, escapeHtmlAttr } from "./html.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { ErrorBoundary, ForbiddenBoundary, GlobalErrorBoundary, NotFoundBoundary, RedirectBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
 import { AppRouterScrollTarget } from "../shims/app-router-scroll.js";
 import DefaultNotFound from "../shims/default-not-found.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
+import { withUseCacheLayoutMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { MetadataHead, ViewportHead, renderMetadataToHtml } from "../shims/metadata.js";
 import { BfcacheSegmentBoundary, Children as Children$1, ParallelSlot, Slot } from "../shims/slot.js";
 import { StreamedIconsInsertion } from "../shims/streamed-icons.js";
@@ -64,7 +65,7 @@ function probeAppPageLayoutWithTracking(options) {
 		});
 		const layoutParams = resolveAppPageSegmentParams(options.route.routeSegments, treePosition, options.matchedParams);
 		return probeReactServerSubtree(/* @__PURE__ */ jsx(LayoutComponent, {
-			params: options.makeThenableParams(layoutParams, options.layoutParamAccess?.createThenableParamsObserver(layoutId)),
+			...withUseCacheLayoutMarker(LayoutComponent, { params: options.makeThenableParams(layoutParams, options.layoutParamAccess?.createThenableParamsObserver(layoutId)) }),
 			children: APP_PAGE_LAYOUT_PROBE_CHILD
 		}));
 	};
@@ -179,6 +180,14 @@ function createAppPageSlotLoadingEntries(slot, override) {
 	}
 	return entries;
 }
+/**
+* Only an override that replaces the slot's page or layouts changes its tree.
+* A params-only override, as built for an inherited slot with its own param
+* names, keeps the slot's nested loading boundaries.
+*/
+function getAppPageSlotTreeOverride(override) {
+	return override?.pageModule != null || override?.layoutModules !== void 0 ? override ?? null : null;
+}
 function getFirstLoadingEntry(entries) {
 	return entries.reduce((first, entry) => first === null || entry.treePosition < first.treePosition ? entry : first, null);
 }
@@ -242,17 +251,24 @@ function createAppPageSlotBindings(route, layoutEntries, resolveSlotOverride, op
 	}
 	return normalizeAppElementsSlotBindings(bindings, { layoutIds: layoutEntries.map((entry) => entry.id) });
 }
-function createAppPageRouteHead(metadata, viewport, pathname, metadataPlacement, trailingSlash) {
-	return /* @__PURE__ */ jsxs(Fragment$1, { children: [
-		/* @__PURE__ */ jsx("meta", { charSet: "utf-8" }),
-		metadata && metadataPlacement === "head" ? /* @__PURE__ */ jsx(MetadataHead, {
-			metadata,
-			pathname,
-			trailingSlash
-		}) : null,
-		/* @__PURE__ */ jsx(ViewportHead, { viewport })
-	] });
+function createAppPageRouteHead(resolveHead, pathname, metadataPlacement, trailingSlash) {
+	return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx("meta", { charSet: "utf-8" }), resolveHead ? /* @__PURE__ */ jsx(AppPageHead, {
+		metadataPlacement,
+		pathname,
+		resolveHead,
+		trailingSlash
+	}) : /* @__PURE__ */ jsx(ViewportHead, { viewport: {} })] });
+}
+async function AppPageHead(props) {
+	const head = props.resolveHead();
+	const [metadata, viewport] = await Promise.all([props.metadataPlacement === "head" ? head.metadata : null, head.viewport]);
+	return /* @__PURE__ */ jsxs(Fragment$1, { children: [metadata ? /* @__PURE__ */ jsx(MetadataHead, {
+		metadata,
+		pathname: props.pathname,
+		trailingSlash: props.trailingSlash
+	}) : null, /* @__PURE__ */ jsx(ViewportHead, { viewport })] });
 }
+AppPageHead.displayName = "Vinext.Head";
 function hasStreamedIcons(metadata) {
 	const icons = metadata.icons;
 	if (!icons) return false;
@@ -273,7 +289,7 @@ function createAppPageRouteBodyMetadata(metadata, pathname, metadataPlacement, t
 		streamedIconKey
 	});
 	const metadataKey = streamedIconKey ? createStreamedIconKey(pathname, renderedMetadataHtml) : "";
-	const parserInsertedMetadataHtml = (streamedIconKey ? renderedMetadataHtml.replaceAll(`<link data-vinext-streamed-icon="${STREAMED_ICON_KEY_PLACEHOLDER}:`, `<link data-vinext-streamed-icon="${escapeHtmlAttr(metadataKey)}:`) : renderedMetadataHtml) + createInlineScriptTag(REINSERT_STREAMED_ICONS_SCRIPT, scriptNonce);
+	const parserInsertedMetadataHtml = (streamedIconKey ? renderedMetadataHtml.replaceAll(`<link data-vinext-streamed-icon="${STREAMED_ICON_KEY_PLACEHOLDER}:`, () => `<link data-vinext-streamed-icon="${escapeHtmlAttr(metadataKey)}:`) : renderedMetadataHtml) + createInlineScriptTag(REINSERT_STREAMED_ICONS_SCRIPT, scriptNonce);
 	return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx("div", {
 		hidden: true,
 		suppressHydrationWarning: true,
@@ -282,15 +298,14 @@ function createAppPageRouteBodyMetadata(metadata, pathname, metadataPlacement, t
 }
 async function AppPageStreamingMetadata(props) {
 	try {
-		return createAppPageRouteBodyMetadata(await props.metadata, props.pathname, "body", props.trailingSlash, props.scriptNonce);
+		return createAppPageRouteBodyMetadata(await props.resolveHead().metadata, props.pathname, "body", props.trailingSlash, props.scriptNonce);
 	} catch {
 		return null;
 	}
 }
 AppPageStreamingMetadata.displayName = "Vinext.StreamingMetadata";
 async function AppPageMetadataOutlet(props) {
-	await props.metadata;
-	return null;
+	return props.resolveHead().outlet;
 }
 AppPageMetadataOutlet.displayName = "Vinext.MetadataOutlet";
 function createAppPageStreamingMetadataOutlet(elementId, suspended = true) {
@@ -319,8 +334,8 @@ function buildAppPageElements(options) {
 	const routeId = renderIdentity?.routeId ?? AppElementsWire.encodeRouteId(options.routePath, interceptionContext);
 	const pageId = renderIdentity?.pageId ?? AppElementsWire.encodePageId(options.routePath, interceptionContext);
 	const pageElementId = options.route.childrenSlot ? resolveAppPageChildrenSlotId(options.route.childrenSlot) : pageId;
-	const streamingMetadataBodyId = options.streamingMetadata ? `__vinext_streaming_metadata_body:${routeId}` : null;
-	const streamingMetadataOutletId = options.streamingMetadataOutlet ? `__vinext_streaming_metadata_outlet:${routeId}` : null;
+	const metadataPlacement = options.metadataPlacement ?? "head";
+	const streamingMetadataOutletId = options.resolveHead ? `__vinext_streaming_metadata_outlet:${routeId}` : null;
 	const layoutEntries = createAppPageLayoutEntries(options.route);
 	const templateEntries = createAppPageTemplateEntries(options.route);
 	const loadingEntries = createAppPageLoadingEntries(options.route);
@@ -337,7 +352,6 @@ function buildAppPageElements(options) {
 	const isPrefetchLoadingShell = renderMode === APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL;
 	const pageRenderDependency = isPrefetchLoadingShell ? null : options.pageRenderDependency;
 	const prefetchLoadingEntry = isPrefetchLoadingShell ? getPrefetchLoadingEntry(options.route) : null;
-	const metadataPlacement = options.metadataPlacement ?? "head";
 	const layoutEntriesByTreePosition = /* @__PURE__ */ new Map();
 	const templateEntriesByTreePosition = /* @__PURE__ */ new Map();
 	const loadingEntriesByTreePosition = /* @__PURE__ */ new Map();
@@ -380,8 +394,11 @@ function buildAppPageElements(options) {
 		routePath: options.routePath
 	});
 	const prefetchSlotLoadingEntries = isPrefetchLoadingShell ? Object.entries(options.route.slots ?? {}).flatMap(([slotKey, slot]) => {
-		return getFirstLoadingEntry(createAppPageSlotLoadingEntries(slot, resolveSlotOverride(slotKey, slot.name) ?? null)) ? [{ ownerTreePosition: slot.ownerTreePosition ?? 0 }] : [];
+		return getFirstLoadingEntry(createAppPageSlotLoadingEntries(slot, getAppPageSlotTreeOverride(resolveSlotOverride(slotKey, slot.name)))) ? [{ ownerTreePosition: slot.ownerTreePosition ?? 0 }] : [];
 	}) : [];
+	const prefetchLoadingComponent = getDefaultExport(prefetchLoadingEntry?.loadingModule);
+	const shouldRenderPrefetchLoadingShell = isPrefetchLoadingShell && (prefetchLoadingComponent !== null || prefetchSlotLoadingEntries.length > 0);
+	const streamingMetadataBodyId = options.resolveHead && metadataPlacement === "body" && (!isPrefetchLoadingShell || shouldRenderPrefetchLoadingShell) ? `__vinext_streaming_metadata_body:${routeId}` : null;
 	const prefetchCutoffTreePosition = isPrefetchLoadingShell ? prefetchLoadingEntry?.treePosition ?? prefetchSlotLoadingEntries.reduce((deepest, entry) => Math.max(deepest, entry.ownerTreePosition), 0) : null;
 	const includesPrefetchTreePosition = (treePosition) => prefetchCutoffTreePosition === null || treePosition <= prefetchCutoffTreePosition;
 	const segmentPlan = createAppPageSegmentPlan({
@@ -426,13 +443,13 @@ function buildAppPageElements(options) {
 	const elements = {};
 	for (const slotPlan of segmentPlan.slots) for (const segment of slotPlan.nestedBfcacheSegments) elements[segment.id] = null;
 	if (options.route.staticSiblings && options.route.staticSiblings.length > 0) elements[APP_STATIC_SIBLINGS_KEY] = options.route.staticSiblings;
-	if (options.streamingMetadata && streamingMetadataBodyId) elements[streamingMetadataBodyId] = /* @__PURE__ */ jsx(AppPageStreamingMetadata, {
-		metadata: options.streamingMetadataTags ?? options.streamingMetadata,
+	if (options.resolveHead && streamingMetadataBodyId) elements[streamingMetadataBodyId] = /* @__PURE__ */ jsx(AppPageStreamingMetadata, {
 		pathname: options.resolvedMetadataPathname ?? options.routePath,
+		resolveHead: options.resolveHead,
 		scriptNonce: options.scriptNonce,
 		trailingSlash: options.trailingSlash
 	});
-	if (options.streamingMetadataOutlet && streamingMetadataOutletId) elements[streamingMetadataOutletId] = /* @__PURE__ */ jsx(AppPageMetadataOutlet, { metadata: options.streamingMetadataOutlet });
+	if (options.resolveHead && streamingMetadataOutletId) elements[streamingMetadataOutletId] = /* @__PURE__ */ jsx(AppPageMetadataOutlet, { resolveHead: options.resolveHead });
 	const getEffectiveSlotParams = (slotKey, _slotName) => slotPlansByKey.get(slotKey)?.params ?? options.matchedParams;
 	for (const treePosition of orderedTreePositions) {
 		if (isPrefetchLoadingShell && !includesPrefetchTreePosition(treePosition)) continue;
@@ -457,8 +474,6 @@ function buildAppPageElements(options) {
 	}
 	pageRenderDependency?.setResultDependencies(pageDependencies);
 	const routeLoadingComponent = getDefaultExport(options.route.loading);
-	const prefetchLoadingComponent = getDefaultExport(prefetchLoadingEntry?.loadingModule);
-	const shouldRenderPrefetchLoadingShell = isPrefetchLoadingShell && (prefetchLoadingComponent !== null || prefetchSlotLoadingEntries.length > 0);
 	if (shouldRenderPrefetchLoadingShell) elements[APP_PREFETCH_LOADING_SHELL_MARKER_KEY] = "LoadingBoundary";
 	const pageLoadingModule = resolveAppPageLoadingModuleAtOrAbove(options.route, routeSegments.length);
 	const PageLoadingComponent = pageRenderDependency ? getDefaultExport(pageLoadingModule) : null;
@@ -508,11 +523,11 @@ function buildAppPageElements(options) {
 		}
 		const LayoutComponent = layoutComponent;
 		const layoutDependency = layoutDependenciesByIndex.get(index);
-		let layoutElement = layoutDependency ? renderAppComponentWithDependencyBarrier(LayoutComponent, {
+		let layoutElement = layoutDependency ? renderAppComponentWithDependencyBarrier(LayoutComponent, withUseCacheLayoutMarker(LayoutComponent, {
 			...layoutProps,
 			children: /* @__PURE__ */ jsx(Children$1, {})
-		}, layoutDependency) : /* @__PURE__ */ jsx(LayoutComponent, {
-			...layoutProps,
+		}), layoutDependency) : /* @__PURE__ */ jsx(LayoutComponent, {
+			...withUseCacheLayoutMarker(LayoutComponent, layoutProps),
 			children: /* @__PURE__ */ jsx(Children$1, {})
 		});
 		const ancestorLoadingEntry = findNearestAncestorLoadingEntry(layoutEntry.treePosition);
@@ -532,8 +547,9 @@ function buildAppPageElements(options) {
 		const isOwnedAtRoutePrefetchCutoff = isPrefetchLoadingShell && prefetchLoadingEntry !== null && ownerTreePosition === prefetchLoadingEntry.treePosition;
 		if (!includedInPayload) continue;
 		const slotOwnerParams = resolveAppPageSegmentParams(options.route.routeSegments, layoutEntries[targetIndex]?.treePosition ?? 0, options.matchedParams);
-		const hasSlotTreeOverride = slotOverride?.pageModule != null || slotOverride?.layoutModules !== void 0;
-		const slotLoadingEntries = createAppPageSlotLoadingEntries(slot, hasSlotTreeOverride ? slotOverride ?? null : null);
+		const slotTreeOverride = getAppPageSlotTreeOverride(slotOverride);
+		const hasSlotTreeOverride = slotTreeOverride !== null;
+		const slotLoadingEntries = createAppPageSlotLoadingEntries(slot, slotTreeOverride);
 		const prefetchSlotLoadingEntry = isOwnedAtRoutePrefetchCutoff ? prefetchLoadingEntry : isPrefetchLoadingShell ? getFirstLoadingEntry(slotLoadingEntries) : null;
 		if (isPrefetchLoadingShell && prefetchSlotLoadingEntry === null) continue;
 		const resolvedOverrideOrPageComponent = slotOverride?.pageModule || slot.page ? traceGetLayoutOrPageModule(APP_PAGE_SEGMENT_KEY, () => getDefaultExport(slotOverride?.pageModule) ?? getDefaultExport(slot.page)) : null;
@@ -557,6 +573,10 @@ function buildAppPageElements(options) {
 				return /* @__PURE__ */ jsx(slotComponent, { ...slotProps });
 			})();
 			if (overrideOrPageComponent) slotElement = /* @__PURE__ */ jsx(Fragment, { children: slotElement }, slotResetKey);
+			slotElement = /* @__PURE__ */ jsx(RedirectBoundary, {
+				resetKey: slotResetKey,
+				children: slotElement
+			});
 		}
 		const branchLayouts = /* @__PURE__ */ new Map();
 		const addBranchLayout = (treePosition, entry) => {
@@ -637,7 +657,7 @@ function buildAppPageElements(options) {
 				const layoutEntry = layoutEntriesAtPosition[layoutIndex];
 				const LayoutComponent = layoutEntry.component;
 				slotElement = /* @__PURE__ */ jsx(LayoutComponent, {
-					params: options.makeThenableParams(layoutEntry.params),
+					...withUseCacheLayoutMarker(LayoutComponent, { params: options.makeThenableParams(layoutEntry.params) }),
 					children: slotElement
 				});
 			}
@@ -669,7 +689,10 @@ function buildAppPageElements(options) {
 		if (prefetchLoadingComponent === null) routeChildren = null;
 		else routeChildren = /* @__PURE__ */ jsx(prefetchLoadingComponent, {});
 	} else {
-		routeChildren = /* @__PURE__ */ jsx(RedirectBoundary, { children: routeChildren });
+		routeChildren = /* @__PURE__ */ jsx(RedirectBoundary, {
+			resetKey: routeResetKey,
+			children: routeChildren
+		});
 		if (routeLoadingComponent) routeChildren = /* @__PURE__ */ jsx(Suspense, {
 			fallback: /* @__PURE__ */ jsx(routeLoadingComponent, {}),
 			children: routeChildren
@@ -787,9 +810,8 @@ function buildAppPageElements(options) {
 		}) : routeChildren
 	});
 	const routeElement = /* @__PURE__ */ jsxs(Fragment$1, { children: [
-		createAppPageRouteHead(options.resolvedMetadata, options.resolvedViewport, options.resolvedMetadataPathname ?? options.routePath, metadataPlacement, options.trailingSlash),
+		createAppPageRouteHead(options.resolveHead, options.resolvedMetadataPathname ?? options.routePath, metadataPlacement, options.trailingSlash),
 		routeChildren,
-		createAppPageRouteBodyMetadata(options.resolvedMetadata, options.resolvedMetadataPathname ?? options.routePath, metadataPlacement, options.trailingSlash, options.scriptNonce),
 		createAppPageStreamingMetadataBody(streamingMetadataBodyId)
 	] });
 	elements[routeId] = pageRenderDependency ? renderAfterAppDependencies(routeElement, [pageRenderDependency]) : routeElement;

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

@@ -0,0 +1,48 @@
+import { NavigationContext } from "../shims/navigation-context-state.js";
+import "../shims/navigation.js";
+import { RootParams } from "../shims/root-params.js";
+import { AppPageSsrHandler } from "./app-page-stream.js";
+//#region src/server/app-page-rsc-render-status.d.ts
+/**
+ * The status of a finished RSC render, as Next.js's static generation decides
+ * it from the document's shell. A special error that rejects the shell sets
+ * it. One inside a Suspense boundary leaves the render a 200.
+ */
+export type AppPageRscRenderStatus = {
+  kind: "page";
+} | {
+  kind: "special-error";
+  status: number;
+  headers?: Record<string, string>;
+} |
+/**
+ * A render not stored: another error rejected the shell, or
+ * generateMetadata()'s special error, whose document an RSC miss can't write.
+ */
+{
+  kind: "unstorable";
+};
+type CreateAppPageRscRenderStatusResolverOptions = {
+  basePath?: string;
+  capturedRscData: Promise<ArrayBuffer>;
+  getCapturedSpecialError: () => unknown;
+  getCapturedSpecialErrors: (error: unknown) => readonly unknown[];
+  isForceStatic: boolean;
+  loadSsrHandler: () => Promise<AppPageSsrHandler>;
+  navigationContext: NavigationContext | null;
+  rootParams?: RootParams;
+};
+/**
+ * Resolve an RSC-only render's status once its Flight payload is complete.
+ * Flight can't tell whether a special error sits inside a Suspense boundary, so
+ * a render that threw one renders the document's shell from the same payload,
+ * as Next.js's static generation renders HTML beside RSC. Its server
+ * components don't run again. A render without a special error is a 200.
+ */
+export declare function createAppPageRscRenderStatusResolver(options: CreateAppPageRscRenderStatusResolverOptions): () => Promise<AppPageRscRenderStatus>;
+/**
+ * The status Next.js sends an RSC request for a render with this status. Its
+ * payload carries a redirect, so a redirect is a 200 with its `location`.
+ */
+export declare function resolveAppPageRscResponseStatus(status: number): number;
+//#endregion

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

@@ -0,0 +1,54 @@
+import { resolveAppPageShellSpecialError, resolveAppPageSpecialErrorStoredHeaders } from "./app-page-execution.js";
+import { isAppSsrRenderResult } from "./app-page-stream.js";
+//#region src/server/app-page-rsc-render-status.ts
+const PAGE_STATUS = { kind: "page" };
+/**
+* Resolve an RSC-only render's status once its Flight payload is complete.
+* Flight can't tell whether a special error sits inside a Suspense boundary, so
+* a render that threw one renders the document's shell from the same payload,
+* as Next.js's static generation renders HTML beside RSC. Its server
+* components don't run again. A render without a special error is a 200.
+*/
+function createAppPageRscRenderStatusResolver(options) {
+	let status;
+	return () => status ??= resolveAppPageRscRenderStatus(options);
+}
+async function resolveAppPageRscRenderStatus(options) {
+	const rscData = await options.capturedRscData;
+	if (options.getCapturedSpecialError() === null) return PAGE_STATUS;
+	const ssrHandler = await options.loadSsrHandler();
+	let rendered;
+	try {
+		rendered = await ssrHandler.handleSsr(new Response(rscData).body, options.navigationContext, {
+			links: [],
+			preloads: [],
+			styles: []
+		}, {
+			basePath: options.basePath,
+			isForceStatic: options.isForceStatic,
+			isStaticGeneration: true,
+			onSsrError: () => void 0,
+			rootParams: options.rootParams
+		});
+	} catch (error) {
+		const specialError = resolveAppPageShellSpecialError(error, options.getCapturedSpecialErrors(error));
+		if (!specialError || specialError.fromMetadata === true) return { kind: "unstorable" };
+		const headers = resolveAppPageSpecialErrorStoredHeaders(specialError, options.basePath);
+		return {
+			kind: "special-error",
+			status: specialError.statusCode,
+			...headers ? { headers } : {}
+		};
+	}
+	(isAppSsrRenderResult(rendered) ? rendered.htmlStream : rendered).cancel().catch(() => {});
+	return PAGE_STATUS;
+}
+/**
+* The status Next.js sends an RSC request for a render with this status. Its
+* payload carries a redirect, so a redirect is a 200 with its `location`.
+*/
+function resolveAppPageRscResponseStatus(status) {
+	return status >= 300 && status < 400 ? 200 : status;
+}
+//#endregion
+export { createAppPageRscRenderStatusResolver, resolveAppPageRscResponseStatus };

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

@@ -83,8 +83,9 @@ export type AppPageSsrHandler = {
     initialDevServerError?: unknown;
     /** Report an SSR/Fizz render failure through instrumentation. */
     onSsrError?: (error: unknown) => unknown;
-    /** Mirror inline Flight chunks into Next.js's `self.__next_f` transport. */
-    mirrorNextFlight?: boolean;
+    /** Mirror inline Flight chunks into Next.js's `self.__next_f` transport, or start
+     *  mirroring once a function returns true. */
+    mirrorNextFlight?: boolean | (() => boolean);
     /** When true, an SSR-phase-only shell render error resolves to the
      *  default `__next_error__` error-document shell (with the original
      *  flight payload and bootstrap) instead of rejecting. See handleSsr. */
@@ -141,8 +142,9 @@ type RenderAppPageHtmlStreamOptions = {
   initialDevServerError?: unknown;
   /** Report an SSR/Fizz render failure through instrumentation. */
   onSsrError?: (error: unknown) => unknown;
-  /** Mirror inline Flight chunks into Next.js's `self.__next_f` transport. */
-  mirrorNextFlight?: boolean;
+  /** Mirror inline Flight chunks into Next.js's `self.__next_f` transport, or start
+   *  mirroring once a function returns true. */
+  mirrorNextFlight?: boolean | (() => boolean);
   /** True when the app supplies a custom global-error.tsx. Disables the
    *  default error-document shell fallback so SSR shell errors keep driving
    *  the server-rendered global-error boundary re-render. */
@@ -175,12 +177,17 @@ type RenderAppPageHtmlStreamWithRecoveryOptions<TSpecialError> = {
 type AppPageRscErrorTracker = {
   getCapturedError: () => unknown;
   /**
-   * Returns a NEXT_REDIRECT or NEXT_HTTP_ERROR_FALLBACK error captured during
-   * the RSC render. Read after the SSR shell promise resolves to swap a
-   * 307/404 in place of the streamed body when redirect()/notFound() throws
-   * synchronously inside a route-level Suspense boundary (loading.tsx).
+   * Returns the first NEXT_REDIRECT or NEXT_HTTP_ERROR_FALLBACK error captured
+   * during the RSC render, if any. Whether it set the render's status depends
+   * on whether it rejected the document's shell.
    */
   getCapturedSpecialError: () => unknown;
+  /**
+   * The special errors the RSC render threw with the digest of `error`. The
+   * SSR shell rejects with its own copy, decoded from the Flight digest, which
+   * loses server-side markers such as generateMetadata()'s.
+   */
+  getCapturedSpecialErrors: (error: unknown) => readonly unknown[];
   isCapturedError: (error: unknown) => boolean;
   onRenderError: (error: unknown, requestInfo: unknown, errorContext: unknown) => unknown;
 };

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

@@ -151,6 +151,7 @@ function createAppPageRscErrorTracker(baseOnError) {
 	let capturedSpecialError = null;
 	const capturedErrors = /* @__PURE__ */ new Set();
 	const capturedDigests = /* @__PURE__ */ new Set();
+	const specialErrorsByDigest = /* @__PURE__ */ new Map();
 	return {
 		getCapturedError() {
 			return capturedError;
@@ -158,6 +159,10 @@ function createAppPageRscErrorTracker(baseOnError) {
 		getCapturedSpecialError() {
 			return capturedSpecialError;
 		},
+		getCapturedSpecialErrors(error) {
+			const digest = getNextErrorDigest(error);
+			return digest !== null && specialErrorsByDigest.get(digest) || [];
+		},
 		isCapturedError(error) {
 			if (capturedErrors.has(error)) return true;
 			const digest = getNextErrorDigest(error);
@@ -173,6 +178,7 @@ function createAppPageRscErrorTracker(baseOnError) {
 			const result = baseOnError(error, requestInfo, errorContext);
 			const digest = typeof result === "string" ? result : getNextErrorDigest(error);
 			if (digest !== null && !isNavigationSignalError(error)) capturedDigests.add(digest);
+			else if (digest !== null) specialErrorsByDigest.set(digest, [...specialErrorsByDigest.get(digest) ?? [], error]);
 			return result;
 		}
 	};

package/dist/server/app-pages-bridge.d.ts

@@ -24,7 +24,6 @@ type AppRouteMatch = {
 type RenderPagesFallbackDependencies = {
   loadPagesEntry: () => Promise<PagesEntry> | PagesEntry;
   buildRequestHeaders: (requestHeaders: Headers, middlewareRequestHeaders: Headers) => Headers | null;
-  decodePathParams: (pathname: string) => string;
   applyRouteHandlerMiddlewareContext: (response: Response, middlewareContext: AppMiddlewareContext) => Response;
   /**
    * Returns the `__prerender_bypass` Set-Cookie header emitted by a
@@ -51,6 +50,7 @@ type RenderPagesFallbackOptions = {
   initialResponseHeaders?: Headers;
   matchKind?: "dynamic" | "static";
   middlewareContext: AppMiddlewareContext;
+  /** Raw (still percent-encoded) Pages route URL; defaults to `url.pathname`. */
   pathname?: string;
   pagesDataRequest?: Request | null;
   request: Request;

package/dist/server/app-pages-bridge.js

@@ -19,7 +19,7 @@ function applyPagesMiddlewareContext(response, middlewareContext) {
 */
 async function renderPagesFallback(options, dependencies) {
 	const { allowRscDocumentFallback = false, appRouteMatch = null, isDataRequest = false, isRscRequest, initialResponseHeaders, matchKind, middlewareContext, pathname = options.url.pathname, pagesDataRequest = null, request, url } = options;
-	const { loadPagesEntry, buildRequestHeaders, decodePathParams, applyRouteHandlerMiddlewareContext, getDraftModeCookieHeader } = dependencies;
+	const { loadPagesEntry, buildRequestHeaders, applyRouteHandlerMiddlewareContext, getDraftModeCookieHeader } = dependencies;
 	if (isRscRequest && !allowRscDocumentFallback) return null;
 	const pagesEntry = await loadPagesEntry();
 	const pagesRequestHeaders = middlewareContext.requestHeaders ? buildRequestHeaders(request.headers, middlewareContext.requestHeaders) : null;
@@ -27,8 +27,7 @@ async function renderPagesFallback(options, dependencies) {
 	if (pagesRequestHeaders) pagesRequest = cloneRequestWithHeaders(request, pagesRequestHeaders);
 	const queryIndex = pathname.indexOf("?");
 	const pagesPathname = queryIndex === -1 ? pathname : pathname.slice(0, queryIndex);
-	const pagesSearch = queryIndex === -1 ? url.search || "" : pathname.slice(queryIndex);
-	const pagesUrl = decodePathParams(pagesPathname) + pagesSearch;
+	const pagesUrl = pagesPathname + (queryIndex === -1 ? url.search || "" : pathname.slice(queryIndex));
 	if (pagesPathname.startsWith("/api/") || pagesPathname === "/api") {
 		if (typeof pagesEntry.handleApiRoute !== "function") return null;
 		const hasApiMatcher = typeof pagesEntry.matchApiRoute === "function";

package/dist/server/app-prerender-endpoints.js

@@ -1,4 +1,5 @@
 import "./headers.js";
+import { runInWorkStoreScope, runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { notFoundResponse } from "./http-error-responses.js";
 import { callAppPrerenderStaticParams } from "./app-prerender-static-params.js";
 //#region src/server/app-prerender-endpoints.ts
@@ -39,13 +40,13 @@ async function handleStaticParamsEndpoint(request, options) {
 	if (typeof generateStaticParams !== "function") return jsonNullResponse();
 	try {
 		const params = parseParentParams(url.searchParams.get("parentParams"));
-		const result = await callAppPrerenderStaticParams({
+		const result = await runInWorkStoreScope(() => callAppPrerenderStaticParams({
 			fn: generateStaticParams,
 			params,
 			pattern,
 			rejectEmptyResults: url.searchParams.get("rejectEmptyResults") === "1",
 			rootParamNamesByPattern: options.rootParamNamesByPattern ?? {}
-		});
+		}));
 		if (result === null) return jsonNullResponse();
 		return jsonResponse(result);
 	} catch (error) {
@@ -63,10 +64,12 @@ async function handlePagesStaticPathsEndpoint(request, options) {
 	try {
 		const getStaticPaths = findPageRoute(await options.loadPagesRoutes?.(), pattern)?.module?.getStaticPaths;
 		if (typeof getStaticPaths !== "function") return jsonNullResponse();
-		return jsonResponse(await getStaticPaths({
-			locales: parseLocales(url.searchParams.get("locales")),
-			defaultLocale: url.searchParams.get("defaultLocale") ?? ""
-		}));
+		const locales = parseLocales(url.searchParams.get("locales"));
+		const defaultLocale = url.searchParams.get("defaultLocale") ?? "";
+		return jsonResponse(await runOutsideWorkStoreScope(() => getStaticPaths({
+			locales,
+			defaultLocale
+		})));
 	} catch (error) {
 		return jsonResponse({ error: String(error) }, 500);
 	}

package/dist/server/app-request-stage-dispatch.js

@@ -1,8 +1,10 @@
 import "../utils/protocol-headers.js";
 import "./headers.js";
 import { restoreStaticFileSignalFromTransport } from "./static-file-signal.js";
+import { attachRequestCfMetadata } from "./request-pipeline.js";
 import { isDraftModeRequest } from "../shims/headers.js";
 import { getScriptNonceFromHeaderSources } from "./csp.js";
+import { restoreImageOptimizationSignalFromTransport } from "./image-optimization.js";
 import { isRouteTreePrefetchRequest } from "./app-route-tree-prefetch.js";
 import "./app-worker-stages.js";
 //#region src/server/app-request-stage-dispatch.ts
@@ -29,7 +31,8 @@ async function dispatchAppRequestStage(request, ctx, dispatchResponseStage, opti
 	if (!dispatchResponseStage) throw new Error("App request stage requires a response-stage dispatcher");
 	if (appRequestUsesFullResponseGraph(request, options)) {
 		const staticFileSignalToken = crypto.randomUUID();
-		const response = await dispatchResponseStage(request, {
+		const headRequest = request.method === "HEAD";
+		const response = await dispatchResponseStage(headRequest ? attachRequestCfMetadata(new Request(request, { method: "GET" }), request) : request, {
 			kind: "app-full-request",
 			buildId: options.buildId,
 			cacheability: {
@@ -38,15 +41,16 @@ async function dispatchAppRequestStage(request, ctx, dispatchResponseStage, opti
 				resolvedRoutePathname: new URL(request.url).pathname
 			},
 			draftModeCookie: null,
+			headRequest,
 			middlewareCookieOverlay: null,
 			prerenderDiscovery: options.prerenderDiscovery,
-			protocolVersion: 10,
+			protocolVersion: 11,
 			requestOrigin: new URL(request.url).origin,
 			scriptNonce: null,
 			staticFileSignalToken,
 			trustedPrerenderState: options.trustedPrerenderState ?? null
 		}, { cache: "bypass" });
-		return restoreStaticFileSignalFromTransport(response, staticFileSignalToken);
+		return await restoreImageOptimizationSignalFromTransport(await restoreStaticFileSignalFromTransport(response, staticFileSignalToken), staticFileSignalToken);
 	}
 	return options.handleRequest(request, ctx, false, dispatchResponseStage, options.probeMode);
 }