vinext 1.0.0-beta.0 → 1.0.0-beta.1

package/dist/server/app-browser-server-action-client.js

@@ -49,7 +49,7 @@ var ServerActionRedirectError = class extends Error {
 		const redirectUrl = new URL(target.href, window.location.href);
 		const redirectHref = redirectUrl.pathname + redirectUrl.search + redirectUrl.hash;
 		const redirectType = target.type === "push" ? "push" : "replace";
-		this.digest = `NEXT_REDIRECT;${redirectType};${encodeURIComponent(redirectHref)};${target.status};`;
+		this.digest = `NEXT_REDIRECT;${redirectType};${redirectHref};${target.status};`;
 	}
 };
 async function invokeClientServerAction(id, args, actionInitiation, deps) {

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

@@ -6,12 +6,12 @@ import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
 import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
 import { createCacheEntryReuseProof } from "./cache-proof.js";
-import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { NavigationTraceReasonCodes, createNavigationLifecycleTraceFields, createNavigationTrace } from "./navigation-trace.js";
 import { verifyOperationTokenForCommit } from "./operation-token.js";
 import { navigationPlanner, resolveDefaultOrUnmatchedSlotPersistenceForLayouts } from "./navigation-planner.js";
 import { createSnapshotPathAndSearch } from "../shims/navigation.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 //#region src/server/app-browser-state.ts
 const COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "committed-cache" };
 const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "fresh" };

package/dist/server/app-browser-visible-commit.js

@@ -1,8 +1,8 @@
 import { normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { mergeElements } from "../shims/slot.js";
-import { preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
+import { preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { createPendingNavigationCommit, resolvePendingNavigationCommitDispositionDecision } from "./app-browser-state.js";
 //#region src/server/app-browser-visible-commit.ts
 const approvedVisibleCommitBrand = Symbol("ApprovedVisibleCommit");

package/dist/server/app-elements-wire.d.ts

@@ -1,6 +1,7 @@
 import { ArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { CacheEntryReuseProof, RenderObservation } from "./cache-proof.js";
 import { ClientReuseManifestSkipDisposition } from "./client-reuse-manifest.js";
+import { compareStrings } from "../utils/compare.js";
 import { ReactNode } from "react";
 
 //#region src/server/app-elements-wire.d.ts
@@ -42,7 +43,7 @@ type AppElementsInterception = Readonly<{
   targetMatchedUrl: string;
   targetRouteId: string;
 }>;
-declare const compareAppElementsSlotIds: (left: string, right: string) => number;
+declare const compareAppElementsSlotIds: typeof compareStrings;
 declare function normalizeAppElementsSlotBindings(slotBindings: readonly AppElementsSlotBinding[], options?: {
   layoutIds?: readonly string[];
 }): readonly AppElementsSlotBinding[];

package/dist/server/app-fallback-renderer.d.ts

@@ -32,6 +32,7 @@ type AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> =
   clearRequestContext: () => void;
   createRscOnErrorHandler: (request: Request, pathname: string, routePath: string) => AppPageBoundaryOnError;
   fontProviders: AppFallbackRendererFontProviders;
+  getAndClearPendingCookies?: () => string[];
   getNavigationContext: () => NavigationContext | null;
   globalErrorModule?: TModule | null; /** Whether experimental.globalNotFound is enabled for route-miss 404s. */
   globalNotFoundEnabled?: boolean;
@@ -57,6 +58,13 @@ type AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> =
   metadataRoutes: MetadataFileRoute[]; /** Configured next.config `basePath`, threaded into file-based metadata href emission. */
   basePath?: string; /** Configured next.config `trailingSlash`, threaded into canonical URL rendering. */
   trailingSlash?: boolean;
+  /**
+   * Serialized next.config `htmlLimitedBots` regexp source. Used to decide, per
+   * request user-agent, whether a `generateMetadata()` redirect thrown from a
+   * fallback boundary should stream (200) or block (307) — matching the
+   * matched-page dispatch path via `shouldServeStreamingMetadata`.
+   */
+  htmlLimitedBots?: string;
   resolveChildSegments: (routeSegments: readonly string[], treePosition: number, params: AppPageParams) => string[];
   rootBoundaries: AppFallbackRendererRootBoundaries<TModule>;
   rscRenderer: (element: ReactNode | AppElements, options: {

package/dist/server/app-fallback-renderer.js

@@ -2,13 +2,14 @@ import { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback } from "./a
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
 import { DEFAULT_GLOBAL_NOT_FOUND_MODULE } from "./default-global-not-found-module.js";
 import { DEFAULT_NOT_FOUND_MODULE } from "./default-not-found-module.js";
+import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
 //#region src/server/app-fallback-renderer.ts
 const EMPTY_MW_CTX = {
 	headers: null,
 	status: null
 };
 function createAppFallbackRenderer(options) {
-	const { applyFileBasedMetadata, basePath = "", clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getNavigationContext, globalErrorModule, globalNotFoundEnabled = false, loadGlobalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader, trailingSlash } = options;
+	const { applyFileBasedMetadata, basePath = "", htmlLimitedBots, clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getAndClearPendingCookies, getNavigationContext, globalErrorModule, globalNotFoundEnabled = false, loadGlobalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader, trailingSlash } = options;
 	const { rootForbiddenModule, rootLayouts, rootNotFoundModule, rootUnauthorizedModule } = rootBoundaries;
 	const effectiveGlobalErrorModule = globalErrorModule ?? DEFAULT_GLOBAL_ERROR_MODULE;
 	const effectiveRootNotFoundModule = rootNotFoundModule ?? DEFAULT_NOT_FOUND_MODULE;
@@ -20,12 +21,15 @@ function createAppFallbackRenderer(options) {
 	}
 	return {
 		async renderHttpAccessFallback(route, statusCode, isRscRequest, request, opts, scriptNonce, middlewareContext, callContext) {
+			const serveStreamingMetadata = shouldServeStreamingMetadata(request.headers.get("user-agent") ?? "", htmlLimitedBots);
 			const useGlobalNotFound = statusCode === 404 && globalNotFoundEnabled && !route && !opts?.boundaryComponent;
 			if (useGlobalNotFound && loadGlobalNotFoundModule) {
 				const globalNotFoundModule = await resolveGlobalNotFoundModule();
 				const globalNotFoundComponent = globalNotFoundModule?.default ?? null;
 				if (globalNotFoundComponent) return renderAppPageHttpAccessFallback({
 					applyFileBasedMetadata,
+					basePath,
+					trailingSlash,
 					boundaryComponent: globalNotFoundComponent,
 					boundaryModule: globalNotFoundModule ?? null,
 					buildFontLinkHeader: fontProviders.buildFontLinkHeader,
@@ -36,6 +40,7 @@ function createAppFallbackRenderer(options) {
 					getFontLinks: fontProviders.getFontLinks,
 					getFontPreloads: fontProviders.getFontPreloads,
 					getFontStyles: fontProviders.getFontStyles,
+					getAndClearPendingCookies,
 					getNavigationContext,
 					globalErrorModule: effectiveGlobalErrorModule,
 					isEdgeRuntime: callContext?.isEdgeRuntime,
@@ -46,6 +51,7 @@ function createAppFallbackRenderer(options) {
 					matchedParams: opts?.matchedParams ?? {},
 					middlewareContext: middlewareContext ?? EMPTY_MW_CTX,
 					metadataRoutes,
+					request,
 					requestUrl: request.url,
 					resolveChildSegments,
 					rootForbiddenModule: null,
@@ -55,6 +61,7 @@ function createAppFallbackRenderer(options) {
 					route: null,
 					renderToReadableStream: rscRenderer,
 					scriptNonce,
+					serveStreamingMetadata,
 					skipLayoutWrapping: true,
 					statusCode
 				});
@@ -74,6 +81,7 @@ function createAppFallbackRenderer(options) {
 				getFontLinks: fontProviders.getFontLinks,
 				getFontPreloads: fontProviders.getFontPreloads,
 				getFontStyles: fontProviders.getFontStyles,
+				getAndClearPendingCookies,
 				getNavigationContext,
 				globalErrorModule: effectiveGlobalErrorModule,
 				isEdgeRuntime: callContext?.isEdgeRuntime,
@@ -84,6 +92,7 @@ function createAppFallbackRenderer(options) {
 				matchedParams: opts?.matchedParams ?? route?.params ?? {},
 				middlewareContext: middlewareContext ?? EMPTY_MW_CTX,
 				metadataRoutes,
+				request,
 				requestUrl: request.url,
 				resolveChildSegments,
 				rootForbiddenModule,
@@ -93,6 +102,7 @@ function createAppFallbackRenderer(options) {
 				route: useGlobalNotFound ? null : route,
 				renderToReadableStream: rscRenderer,
 				scriptNonce,
+				serveStreamingMetadata,
 				skipLayoutWrapping: useGlobalNotFound,
 				sourcePageSegments: callContext?.sourcePageSegments,
 				statusCode
@@ -116,6 +126,7 @@ function createAppFallbackRenderer(options) {
 				getFontLinks: fontProviders.getFontLinks,
 				getFontPreloads: fontProviders.getFontPreloads,
 				getFontStyles: fontProviders.getFontStyles,
+				getAndClearPendingCookies,
 				getNavigationContext,
 				globalErrorModule: effectiveGlobalErrorModule,
 				isEdgeRuntime: callContext?.isEdgeRuntime,
@@ -125,6 +136,7 @@ function createAppFallbackRenderer(options) {
 				matchedParams: matchedParams ?? route?.params ?? {},
 				middlewareContext: middlewareContext ?? EMPTY_MW_CTX,
 				metadataRoutes,
+				request,
 				requestUrl: request.url,
 				resolveChildSegments,
 				rootLayouts,

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

@@ -32,6 +32,7 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
   buildFontLinkHeader: (preloads: readonly AppPageFontPreload[] | null | undefined) => string;
   clearRequestContext: () => void;
   createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;
+  getAndClearPendingCookies?: () => string[];
   getFontLinks: () => string[];
   getFontPreloads: () => AppPageFontPreload[];
   getFontStyles: () => string[];
@@ -42,12 +43,24 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
   loadSsrHandler: () => Promise<AppPageSsrHandler>;
   makeThenableParams: (params: AppPageParams) => unknown;
   middlewareContext: AppPageMiddlewareContext;
-  metadataRoutes: MetadataFileRoute[]; /** Configured next.config `basePath`, threaded into file-based metadata href emission. */
+  metadataRoutes: MetadataFileRoute[];
+  /**
+   * Whether metadata-origin redirects should ride as a 200 streaming response
+   * (HTML meta-refresh / RSC flight) rather than a blocking 307. Mirrors the
+   * matched-page dispatch decision `shouldServeStreamingMetadata(userAgent,
+   * htmlLimitedBots)`: html-limited bots get the blocking 307, so a
+   * `generateMetadata()` redirect thrown from a fallback boundary matches the
+   * matched-page path instead of always defaulting to streaming. Undefined
+   * means "not computed" and is treated as streaming, preserving prior behavior
+   * for callers that never hit metadata redirects.
+   */
+  serveStreamingMetadata?: boolean; /** Configured next.config `basePath`, threaded into file-based metadata href emission. */
   basePath?: string; /** Configured next.config `trailingSlash`, threaded into canonical URL rendering. */
   trailingSlash?: boolean;
   renderToReadableStream: (element: ReactNode | AppElements, options: {
     onError: AppPageBoundaryOnError;
   }) => ReadableStream<Uint8Array>;
+  request: Request;
   requestUrl: string;
   resolveChildSegments: (routeSegments: readonly string[], treePosition: number, params: AppPageParams) => string[];
   rootLayouts: readonly (TModule | null | undefined)[];

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

@@ -6,12 +6,13 @@ import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { ErrorBoundary, GlobalErrorBoundary, SerializedErrorBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
-import { resolveAppPageSpecialError } from "./app-page-execution.js";
+import { buildRscRedirectFlightStream } from "./app-rsc-redirect-flight.js";
+import { bufferAppPageBinaryStream, buildAppPageSpecialErrorResponse, resolveAppPageSpecialError } from "./app-page-execution.js";
 import { resolveAppPageHead } from "./app-page-head.js";
 import { createAppPageLayoutEntries, createAppPageSourcePage } from "./app-page-route-wiring.js";
 import { buildClientHookErrorMessage } from "../shims/client-hook-error.js";
 import { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryModule, wrapAppPageBoundaryElement } from "./app-page-boundary.js";
-import { createAppPageFontData, renderAppPageHtmlResponse } from "./app-page-stream.js";
+import { createAppPageFontData, createAppPageRscErrorTracker, renderAppPageHtmlResponse } from "./app-page-stream.js";
 import { Fragment, createElement } from "react";
 //#region src/server/app-page-boundary-render.ts
 const DEFAULT_GLOBAL_ERROR_COMPONENT = DefaultGlobalError;
@@ -89,52 +90,95 @@ function createAppPageBoundaryRscPayload(options) {
 		[routeId]: options.element
 	};
 }
-async function renderAppPageBoundaryElementResponse(options) {
-	const requestUrl = new URL(options.requestUrl);
-	const pathname = requestUrl.pathname;
-	return renderAppPageBoundaryResponse({
-		async createHtmlResponse(rscStream, responseStatus) {
-			const fontData = createAppPageFontData({
-				getLinks: options.getFontLinks,
-				getPreloads: options.getFontPreloads,
-				getStyles: options.getFontStyles
-			});
-			const ssrHandler = await options.loadSsrHandler();
-			return renderAppPageHtmlResponse({
-				clearRequestContext: options.clearRequestContext,
-				fontData,
-				fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),
-				isEdgeRuntime: options.isEdgeRuntime,
-				middlewareHeaders: options.middlewareContext.headers,
-				navigationContext: options.getNavigationContext() ?? {
-					pathname,
-					searchParams: requestUrl.searchParams,
-					params: options.navigationParams ?? options.route?.params ?? {}
-				},
-				rscStream,
-				scriptNonce: options.scriptNonce,
-				ssrHandler,
-				status: responseStatus,
-				initialDevServerError: options.initialDevServerError
-			});
-		},
-		createRscOnErrorHandler() {
-			return options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname);
-		},
-		element: createAppPageBoundaryRscPayload({
-			element: options.element,
-			layoutModules: options.layoutModules,
-			pathname,
-			route: options.route,
-			sourcePageSegments: options.sourcePageSegments
+function renderBoundarySpecialErrorResponse(options, specialError) {
+	return buildAppPageSpecialErrorResponse({
+		basePath: options.basePath,
+		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream({
+			renderToReadableStream: options.renderToReadableStream,
+			digest: rscOptions.digest
 		}),
+		clearRequestContext: options.clearRequestContext,
+		getAndClearPendingCookies: options.getAndClearPendingCookies,
 		isEdgeRuntime: options.isEdgeRuntime,
 		isRscRequest: options.isRscRequest,
-		middlewareHeaders: options.middlewareContext.headers,
-		renderToReadableStream: options.renderToReadableStream,
-		status: options.status
+		middlewareContext: options.middlewareContext,
+		serveStreamingMetadata: options.serveStreamingMetadata,
+		request: options.request,
+		specialError
 	});
 }
+async function renderAppPageBoundaryElementResponse(options) {
+	const requestUrl = new URL(options.requestUrl);
+	const pathname = requestUrl.pathname;
+	const payload = createAppPageBoundaryRscPayload({
+		element: options.element,
+		layoutModules: options.layoutModules,
+		pathname,
+		route: options.route,
+		sourcePageSegments: options.sourcePageSegments
+	});
+	const rscErrorTracker = createAppPageRscErrorTracker(options.createRscOnErrorHandler(pathname, options.routePattern ?? pathname));
+	const resolveCapturedSpecialError = (error) => resolveAppPageSpecialError(error) ?? resolveAppPageSpecialError(rscErrorTracker.getCapturedSpecialError());
+	const renderSpecialErrorResponse = (specialError) => renderBoundarySpecialErrorResponse(options, specialError);
+	const handleSpecialErrors = options.handleSpecialErrors === true;
+	let response;
+	try {
+		response = await renderAppPageBoundaryResponse({
+			async createHtmlResponse(rscStream, responseStatus) {
+				const fontData = createAppPageFontData({
+					getLinks: options.getFontLinks,
+					getPreloads: options.getFontPreloads,
+					getStyles: options.getFontStyles
+				});
+				const ssrHandler = await options.loadSsrHandler();
+				return renderAppPageHtmlResponse({
+					clearRequestContext: options.clearRequestContext,
+					fontData,
+					fontLinkHeader: options.buildFontLinkHeader(fontData.preloads),
+					isEdgeRuntime: options.isEdgeRuntime,
+					middlewareHeaders: options.middlewareContext.headers,
+					navigationContext: options.getNavigationContext() ?? {
+						pathname,
+						searchParams: requestUrl.searchParams,
+						params: options.navigationParams ?? options.route?.params ?? {}
+					},
+					rscStream,
+					scriptNonce: options.scriptNonce,
+					ssrHandler,
+					status: responseStatus,
+					initialDevServerError: options.initialDevServerError
+				});
+			},
+			createRscOnErrorHandler() {
+				return rscErrorTracker.onRenderError;
+			},
+			element: payload,
+			isEdgeRuntime: options.isEdgeRuntime,
+			isRscRequest: options.isRscRequest,
+			middlewareHeaders: options.middlewareContext.headers,
+			renderToReadableStream: options.renderToReadableStream,
+			status: options.status
+		});
+	} catch (error) {
+		const specialError = handleSpecialErrors ? resolveCapturedSpecialError(error) : null;
+		if (specialError !== null) return renderSpecialErrorResponse(specialError);
+		throw error;
+	}
+	if (!handleSpecialErrors) return response;
+	if (options.isRscRequest && response.body) {
+		const bufferedStream = await bufferAppPageBinaryStream(response.body);
+		response = new Response(bufferedStream, {
+			status: response.status,
+			headers: response.headers
+		});
+	}
+	const specialError = resolveCapturedSpecialError();
+	if (!specialError) return response;
+	if (response.body) try {
+		await response.body.cancel();
+	} catch {}
+	return renderSpecialErrorResponse(specialError);
+}
 async function renderAppPageHttpAccessFallback(options) {
 	const resolvedBoundaryModule = resolveAppPageHttpAccessBoundaryModule({
 		rootForbiddenModule: options.rootForbiddenModule,
@@ -151,17 +195,25 @@ async function renderAppPageHttpAccessFallback(options) {
 	const layoutModules = options.layoutModules ?? options.route?.layouts ?? options.rootLayouts;
 	const pathname = new URL(options.requestUrl).pathname;
 	const routeSegments = resolveHttpAccessFallbackHeadRouteSegments(options.route, layoutModules);
-	const { metadata, viewport } = await resolveAppPageHead({
-		applyFileBasedMetadata: options.applyFileBasedMetadata,
-		basePath: options.basePath ?? "",
-		layoutModules,
-		layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(options.route, layoutModules),
-		metadataRoutes: options.metadataRoutes,
-		pageModule: boundaryModule,
-		params: options.matchedParams,
-		routePath: options.route?.pattern ?? pathname,
-		routeSegments
-	});
+	let head;
+	try {
+		head = await resolveAppPageHead({
+			applyFileBasedMetadata: options.applyFileBasedMetadata,
+			basePath: options.basePath ?? "",
+			layoutModules,
+			layoutTreePositions: resolveHttpAccessFallbackHeadLayoutTreePositions(options.route, layoutModules),
+			metadataRoutes: options.metadataRoutes,
+			pageModule: boundaryModule,
+			params: options.matchedParams,
+			routePath: options.route?.pattern ?? pathname,
+			routeSegments
+		});
+	} catch (error) {
+		const specialError = resolveAppPageSpecialError(error);
+		if (specialError) return renderBoundarySpecialErrorResponse(options, specialError);
+		throw error;
+	}
+	const { metadata, viewport } = head;
 	const headElements = [createElement("meta", {
 		charSet: "utf-8",
 		key: "charset"
@@ -197,6 +249,7 @@ async function renderAppPageHttpAccessFallback(options) {
 	return renderAppPageBoundaryElementResponse({
 		...options,
 		element,
+		handleSpecialErrors: true,
 		layoutModules: skipLayoutWrapping ? [] : layoutModules,
 		navigationParams: options.matchedParams,
 		route: skipLayoutWrapping ? null : options.route,

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

@@ -112,6 +112,7 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
   buildPageElement: (route: TRoute, params: AppPageParams, opts: AppPageDispatchInterceptOptions | undefined, searchParams: URLSearchParams, layoutParamAccess?: AppLayoutParamAccessTracker, options?: {
     observeMetadataSearchParamsAccess?: boolean;
     observePageSearchParamsAccess?: boolean;
+    serveStreamingMetadata?: boolean;
   }) => Promise<AppPageElement>;
   clientReuseManifest?: ClientReuseManifestParseResult;
   cleanPathname: string;

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

@@ -10,18 +10,18 @@ import { ensureFetchPatch, getCollectedFetchTags, peekDynamicFetchObservations,
 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 { buildRscRedirectFlightStream } from "./app-rsc-redirect-flight.js";
 import { buildAppPageSpecialErrorResponse, probeAppPageThrownError, resolveAppPageSpecialError } from "./app-page-execution.js";
 import { createAppPageTreePath } from "./app-page-route-wiring.js";
 import { consumeAppPageRenderObservationState, discardAppPageRenderState } from "./app-page-render-observation.js";
 import { resolveAppPageParentHttpAccessBoundary, resolveAppPageParentHttpAccessBoundaryModule } from "./app-page-boundary.js";
+import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
 import { createAppLayoutParamAccessTracker, isAppLayoutObservationUnsafeForStaticReuse } from "./app-layout-param-observation.js";
 import { buildAppPageTags } from "./implicit-tags.js";
 import { resolveAppPageMethodResponse } from "./app-page-method.js";
-import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
 import { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
 import { buildAppPageElement, resolveAppPageIntercept, resolveAppPageInterceptionRerenderTarget, validateAppPageDynamicParams } from "./app-page-request.js";
 import { renderAppPageLifecycle } from "./app-page-render.js";
-import React from "react";
 //#region src/server/app-page-dispatch.ts
 function resolveAppPageRouteBoundaryModule(route, statusCode) {
 	if (statusCode === 403) return route.forbidden ?? null;
@@ -160,6 +160,9 @@ async function dispatchAppPageInner(options) {
 	const isForceStatic = dynamicConfig === "force-static";
 	const isDynamicError = dynamicConfig === "error";
 	const isForceDynamic = dynamicConfig === "force-dynamic";
+	const isPrerender = process.env.VINEXT_PRERENDER === "1";
+	const serveStreamingMetadata = shouldServeStreamingMetadata(options.request.headers.get("user-agent") ?? "", options.htmlLimitedBots);
+	const placeGeneratedMetadataInBody = (!isPrerender || options.pprFallbackShell !== void 0) && serveStreamingMetadata;
 	const isPrefetchDynamicShell = options.renderMode === APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL;
 	const isDraftMode = isDraftModeRequest(options.request, options.draftModeSecret);
 	const requestHeadersContext = getHeadersContext();
@@ -269,7 +272,8 @@ async function dispatchAppPageInner(options) {
 					const { renderAppPageCacheArtifacts } = await import("./app-page-cache-render.js");
 					const revalidatedElement = await options.buildPageElement(revalidationTarget.route, revalidationTarget.params, revalidationTarget.interceptOpts, new URLSearchParams(), void 0, {
 						observeMetadataSearchParamsAccess: revalidationDynamicConfig !== "force-static",
-						observePageSearchParamsAccess: revalidationDynamicConfig !== "force-static"
+						observePageSearchParamsAccess: revalidationDynamicConfig !== "force-static",
+						serveStreamingMetadata: false
 					});
 					const revalidatedOnError = options.createRscOnErrorHandler(options.cleanPathname, revalidationTarget.route.pattern);
 					const rendered = await renderAppPageCacheArtifacts({
@@ -345,7 +349,8 @@ async function dispatchAppPageInner(options) {
 			setCurrentForceDynamicFetchDefault(sourceDynamicConfig === "force-dynamic");
 			return options.buildPageElement(interceptRoute, interceptParams, interceptOpts, interceptSearchParams, interceptLayoutParamAccess, {
 				observeMetadataSearchParamsAccess: sourceDynamicConfig !== "force-static",
-				observePageSearchParamsAccess: sourceDynamicConfig !== "force-static"
+				observePageSearchParamsAccess: sourceDynamicConfig !== "force-static",
+				serveStreamingMetadata: placeGeneratedMetadataInBody
 			});
 		},
 		cleanPathname: options.cleanPathname,
@@ -397,7 +402,8 @@ async function dispatchAppPageInner(options) {
 			if (options.actionFailed) throw options.actionError;
 			return options.buildPageElement(route, options.params, interceptResult.interceptOpts, pageSearchParams, layoutParamAccess, {
 				observeMetadataSearchParamsAccess: !isForceStatic,
-				observePageSearchParamsAccess: !isForceStatic
+				observePageSearchParamsAccess: !isForceStatic,
+				serveStreamingMetadata: placeGeneratedMetadataInBody
 			});
 		},
 		async probePageSpecialError() {
@@ -413,7 +419,7 @@ async function dispatchAppPageInner(options) {
 			return options.renderErrorBoundaryPage(buildError);
 		},
 		renderSpecialError(specialError) {
-			return renderPageSpecialError(options, specialError);
+			return renderPageSpecialError(options, specialError, serveStreamingMetadata);
 		},
 		resolveSpecialError: resolveAppPageSpecialError
 	});
@@ -441,7 +447,6 @@ 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,
@@ -550,10 +555,10 @@ async function dispatchAppPageInner(options) {
 			return options.renderErrorBoundaryPage(renderError, errorOrigin);
 		},
 		renderLayoutSpecialError(specialError, layoutIndex) {
-			return renderLayoutSpecialError(options, specialError, layoutIndex);
+			return renderLayoutSpecialError(options, specialError, layoutIndex, serveStreamingMetadata);
 		},
 		renderPageSpecialError(specialError) {
-			return renderPageSpecialError(options, specialError);
+			return renderPageSpecialError(options, specialError, serveStreamingMetadata);
 		},
 		renderToReadableStream: options.renderToReadableStream,
 		hasCustomGlobalError: options.hasCustomGlobalError,
@@ -568,35 +573,16 @@ async function dispatchAppPageInner(options) {
 		}
 	});
 }
-/**
-* Builds an RSC flight payload that encodes a redirect as a React error chunk.
-* We render a tiny element that immediately throws an `Error` whose `digest`
-* is the canonical `NEXT_REDIRECT;...` string. `renderToReadableStream`'s
-* `onError` returns that digest, react-server-dom-webpack serializes the
-* error into the stream, and the client's `RedirectErrorBoundary` decodes it
-* via `getURLFromRedirectError` / `getRedirectTypeFromError`.
-*
-* The thrown error's digest matches Next.js's well-known router error format,
-* so neither vinext's RSC error handler nor Next.js's reporter logs it as a
-* "real" server error. Mirrors `app-render.tsx generateDynamicFlightRenderResult`
-* where a redirect thrown during RSC rendering propagates through
-* `renderToFlightStream`'s `onError` callback into the flight payload.
-*/
-function buildRscRedirectFlightStream(options, digest) {
-	const throwingElement = React.createElement(function NextRedirectFlightThrower() {
-		const err = /* @__PURE__ */ new Error("NEXT_REDIRECT");
-		err.digest = digest;
-		throw err;
-	});
-	return options.renderToReadableStream(throwingElement, { onError: () => digest });
-}
-async function renderLayoutSpecialError(options, specialError, layoutIndex) {
+async function renderLayoutSpecialError(options, specialError, layoutIndex, serveStreamingMetadata) {
 	return buildAppPageSpecialErrorResponse({
 		basePath: options.basePath,
-		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream(options, rscOptions.digest),
+		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream({
+			renderToReadableStream: options.renderToReadableStream,
+			digest: rscOptions.digest
+		}),
 		clearRequestContext: options.clearRequestContext,
 		getAndClearPendingCookies,
-		serveStreamingMetadata: shouldServeStreamingMetadata(options.request.headers.get("user-agent") ?? "", options.htmlLimitedBots),
+		serveStreamingMetadata,
 		isEdgeRuntime: options.isEdgeRuntime,
 		isRscRequest: options.isRscRequest,
 		middlewareContext: options.middlewareContext,
@@ -625,13 +611,16 @@ async function renderLayoutSpecialError(options, specialError, layoutIndex) {
 		specialError
 	});
 }
-async function renderPageSpecialError(options, specialError) {
+async function renderPageSpecialError(options, specialError, serveStreamingMetadata) {
 	return buildAppPageSpecialErrorResponse({
 		basePath: options.basePath,
-		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream(options, rscOptions.digest),
+		buildRscRedirectFlightStream: (rscOptions) => buildRscRedirectFlightStream({
+			renderToReadableStream: options.renderToReadableStream,
+			digest: rscOptions.digest
+		}),
 		clearRequestContext: options.clearRequestContext,
 		getAndClearPendingCookies,
-		serveStreamingMetadata: shouldServeStreamingMetadata(options.request.headers.get("user-agent") ?? "", options.htmlLimitedBots),
+		serveStreamingMetadata,
 		isEdgeRuntime: options.isEdgeRuntime,
 		isRscRequest: options.isRscRequest,
 		middlewareContext: options.middlewareContext,

package/dist/server/app-page-element-builder.d.ts

@@ -37,7 +37,8 @@ type AppPagePageRequest<TModule extends AppPageModule = AppPageModule> = {
   mountedSlotsHeader: string | null; /** Semantic RSC payload mode for this page render. */
   renderMode?: AppRscRenderMode; /** Observe page `searchParams` access for cache-safety classification. */
   observePageSearchParamsAccess?: boolean; /** Observe page metadata `searchParams` access for cache-safety classification. */
-  observeMetadataSearchParamsAccess?: boolean;
+  observeMetadataSearchParamsAccess?: boolean; /** Whether generated metadata may stream into the response body. */
+  serveStreamingMetadata?: boolean;
 };
 type BuildPageElementsOptions<TModule extends AppPageModule = AppPageModule, TErrorModule extends AppPageErrorModule = AppPageErrorModule> = {
   applyFileBasedMetadata?: ApplyAppPageFileBasedMetadata;

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

@@ -9,8 +9,8 @@ import { resolveActiveParallelRouteHeadInputs, resolveAppPageHead } from "./app-
 import { createAppPageSearchParamsObserver, makeObservedAppPageSearchParamsThenable } from "./app-page-search-params-observation.js";
 import { buildAppPageElements, createAppPageSourcePage, createAppPageTreePath } from "./app-page-route-wiring.js";
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
-import "./app-rsc-route-matching.js";
 import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
+import "./app-rsc-route-matching.js";
 import { createElement } from "react";
 //#region src/server/app-page-element-builder.ts
 function resolveInterceptLayoutParams(branchSegments, layoutSegments, params) {
@@ -41,7 +41,7 @@ function isReactOwnedPageComponent(component) {
 async function buildPageElements(options) {
 	const { route, params, routePath, displayPathname = routePath, pageRequest, globalErrorModule, rootNotFoundModule, rootForbiddenModule, rootUnauthorizedModule, metadataRoutes } = options;
 	const slotParamOverrides = resolveSlotParamOverrides(route, routePath);
-	const { opts, searchParams, isRscRequest, mountedSlotsHeader, renderMode = APP_RSC_RENDER_MODE_NAVIGATION, observeMetadataSearchParamsAccess = false, observePageSearchParamsAccess = false } = pageRequest;
+	const { opts, searchParams, isRscRequest, mountedSlotsHeader, renderMode = APP_RSC_RENDER_MODE_NAVIGATION, observeMetadataSearchParamsAccess = false, observePageSearchParamsAccess = false, serveStreamingMetadata } = pageRequest;
 	const pageModule = route.page;
 	const isSiblingIntercept = opts?.interceptSlotKey === "__vinext_page_intercept" && !!opts?.interceptPage;
 	const effectivePageModule = isSiblingIntercept ? opts.interceptPage : pageModule;
@@ -127,7 +127,7 @@ async function buildPageElements(options) {
 	const pageSearchParamsThenable = searchParams ? makeThenableParams(pageSearchParams) : void 0;
 	const mountedSlotIds = mountedSlotsHeader ? new Set(mountedSlotsHeader.split(" ")) : null;
 	const slotOverrides = buildSlotOverrides(route, params, routePath, opts);
-	const metadataPlacement = hasDynamicMetadata && shouldServeStreamingMetadata(pageRequest.request.headers.get("user-agent") ?? "", options.htmlLimitedBots) ? "body" : "head";
+	const metadataPlacement = hasDynamicMetadata && (serveStreamingMetadata ?? shouldServeStreamingMetadata(pageRequest.request.headers.get("user-agent") ?? "", options.htmlLimitedBots)) ? "body" : "head";
 	let siblingInterceptElement = isSiblingIntercept && EffectivePageComponent ? createPageElement(EffectivePageComponent, pageProps) : null;
 	if (isSiblingIntercept && siblingInterceptElement !== null && opts?.interceptLayouts?.length) for (let i = opts.interceptLayouts.length - 1; i >= 0; i--) {
 		const LayoutComponent = opts.interceptLayouts[i]?.default;

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

@@ -6,6 +6,7 @@ type AppPageSpecialError = {
   kind: "redirect";
   location: string;
   statusCode: number;
+  type?: "push" | "replace";
   fromMetadata?: boolean;
 } | {
   kind: "http-access-fallback";
@@ -132,7 +133,8 @@ declare function probeAppPageLayouts(options: ProbeAppPageLayoutsOptions): Promi
 declare function probeAppPageComponent(options: ProbeAppPageComponentOptions): Promise<Response | null>;
 declare function probeAppPageThrownError(options: ProbeAppPageThrownErrorOptions): Promise<unknown>;
 declare function readAppPageBinaryStream(stream: ReadableStream<Uint8Array>): Promise<ArrayBuffer>;
+declare function bufferAppPageBinaryStream(stream: ReadableStream<Uint8Array>): Promise<ReadableStream<Uint8Array>>;
 declare function teeAppPageRscStreamForCapture(stream: ReadableStream<Uint8Array>, shouldCapture: boolean): AppPageRscStreamCapture;
 declare function buildAppPageFontLinkHeader(preloads: readonly AppPageFontPreload[] | null | undefined): string;
 //#endregion
-export { AppPageFontPreload, AppPageSpecialError, LayoutClassificationOptions, type LayoutFlags, buildAppPageFontLinkHeader, buildAppPageSpecialErrorResponse, probeAppPageComponent, probeAppPageLayouts, probeAppPageThrownError, readAppPageBinaryStream, resolveAppPageSpecialError, tagAppPageMetadataError, teeAppPageRscStreamForCapture };
+export { AppPageFontPreload, AppPageSpecialError, LayoutClassificationOptions, type LayoutFlags, bufferAppPageBinaryStream, buildAppPageFontLinkHeader, buildAppPageSpecialErrorResponse, probeAppPageComponent, probeAppPageLayouts, probeAppPageThrownError, readAppPageBinaryStream, resolveAppPageSpecialError, tagAppPageMetadataError, teeAppPageRscStreamForCapture };