vinext 1.2.0 → 1.3.0

package/dist/server/app-optimistic-routing.d.ts

@@ -1,11 +1,9 @@
-import { RouteManifest, RouteManifestRoute } from "../routing/app-route-graph.js";
+import { BrowserRouteManifest, BrowserRouteManifestRoute } from "../routing/browser-route-manifest.js";
+import { OptimisticRouteTrieMatch } from "../routing/optimistic-route-trie.js";
 import { AppElements } from "./app-elements-wire.js";
 import "./app-elements.js";
 //#region src/server/app-optimistic-routing.d.ts
-type OptimisticRouteMatch = {
-  params: Record<string, string | string[]>;
-  route: RouteManifestRoute;
-};
+type OptimisticRouteMatch = OptimisticRouteTrieMatch<BrowserRouteManifestRoute>;
 export type OptimisticRouteTemplate = {
   elements: AppElements;
   mountedSlotsHeader: string | null;
@@ -34,12 +32,12 @@ export declare function getOptimisticPrefetchSourceKey(options: {
 export declare function matchOptimisticRouteManifestRoute(options: {
   basePath: string;
   href: string;
-  routeManifest: RouteManifest;
+  routeManifest: BrowserRouteManifest;
 }): OptimisticRouteMatch | null;
 export declare function resolveOptimisticNavigationParamsForHref(options: {
   basePath: string;
   href: string;
-  routeManifest: RouteManifest;
+  routeManifest: BrowserRouteManifest;
 }): Record<string, string | string[]> | null;
 export declare function createOptimisticRouteTemplate(options: {
   allowLoadingShell?: boolean;
@@ -48,7 +46,7 @@ export declare function createOptimisticRouteTemplate(options: {
   href: string;
   interceptionContext: string | null;
   mountedSlotsHeader: string | null;
-  routeManifest: RouteManifest;
+  routeManifest: BrowserRouteManifest;
 }): OptimisticRouteTemplate | null;
 export declare function createOptimisticRouteElements(template: OptimisticRouteTemplate): AppElements;
 /**
@@ -63,7 +61,7 @@ export declare function canCommitOptimisticRouteTemplate(options: {
   currentElements: AppElements;
   currentLayoutIds: readonly string[];
   currentParams: Readonly<Record<string, string | string[]>>;
-  routeManifest: RouteManifest;
+  routeManifest: BrowserRouteManifest;
   targetRouteParams: Readonly<Record<string, string | string[]>>;
   targetUrlParts: readonly string[];
   template: OptimisticRouteTemplate;
@@ -73,7 +71,7 @@ export declare function resolveOptimisticNavigationPayload(options: {
   href: string;
   interceptionContext: string | null;
   mountedSlotsHeader: string | null;
-  routeManifest: RouteManifest;
+  routeManifest: BrowserRouteManifest;
   templates: ReadonlyMap<string, OptimisticRouteTemplate>;
 }): OptimisticNavigationPayload | null;
 //#endregion

package/dist/server/app-optimistic-routing.js

@@ -1,7 +1,8 @@
 import { isUnknownRecord } from "../utils/record.js";
-import { buildParams, decodeMatchedParams, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { stripBasePath } from "../utils/base-path.js";
+import { decodeMatchedParams, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { extractRawRoutePatternParams, matchRoutePattern } from "../routing/route-pattern.js";
+import { buildOptimisticRouteTrie, matchOptimisticRouteTrie } from "../routing/optimistic-route-trie.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { createNestedBfcacheSlotSegmentId, deriveBfcacheSegmentIdentity, isNestedBfcacheSlotSegmentId } from "./bfcache-identity.js";
@@ -17,61 +18,8 @@ function getOptimisticRouteTemplateKey(options) {
 function getOptimisticPrefetchSourceKey(options) {
 	return `${options.cacheKey}\0${options.interceptionContext ?? ""}\0${options.mountedSlotsHeader ?? ""}`;
 }
-function createNode() {
-	return {
-		catchAllChild: null,
-		dynamicChild: null,
-		optionalCatchAllChild: null,
-		route: null,
-		staticChildren: /* @__PURE__ */ new Map()
-	};
-}
 function buildRouteTrie(routeManifest) {
-	const root = createNode();
-	for (const route of routeManifest.segmentGraph.routes.values()) {
-		let node = root;
-		const parts = route.patternParts;
-		if (parts.length === 0) {
-			node.route ??= route;
-			continue;
-		}
-		for (const [index, part] of parts.entries()) {
-			const isTerminal = index === parts.length - 1;
-			if (part.startsWith(":") && part.endsWith("+")) {
-				if (isTerminal && node.catchAllChild === null) node.catchAllChild = {
-					paramName: part.slice(1, -1),
-					route
-				};
-				break;
-			}
-			if (part.startsWith(":") && part.endsWith("*")) {
-				if (isTerminal && node.optionalCatchAllChild === null) node.optionalCatchAllChild = {
-					paramName: part.slice(1, -1),
-					route
-				};
-				break;
-			}
-			if (part.startsWith(":")) {
-				const paramName = part.slice(1);
-				if (node.dynamicChild === null) node.dynamicChild = {
-					node: createNode(),
-					paramName
-				};
-				else if (node.dynamicChild.paramName !== paramName && import.meta.env.DEV) console.warn(`[vinext] Optimistic route trie found conflicting dynamic segments at the same level: :${node.dynamicChild.paramName} vs ${part}`);
-				node = node.dynamicChild.node;
-				if (isTerminal) node.route ??= route;
-				continue;
-			}
-			let staticChild = node.staticChildren.get(part);
-			if (staticChild === void 0) {
-				staticChild = createNode();
-				node.staticChildren.set(part, staticChild);
-			}
-			node = staticChild;
-			if (isTerminal) node.route ??= route;
-		}
-	}
-	return root;
+	return buildOptimisticRouteTrie(routeManifest.segmentGraph.routes.values(), import.meta.env.DEV ? (existingParamName, part) => console.warn(`[vinext] Optimistic route trie found conflicting dynamic segments at the same level: :${existingParamName} vs ${part}`) : void 0);
 }
 function getRouteTrie(routeManifest) {
 	const existing = routeTrieCache.get(routeManifest);
@@ -80,45 +28,6 @@ function getRouteTrie(routeManifest) {
 	routeTrieCache.set(routeManifest, trie);
 	return trie;
 }
-function matchNode(node, urlParts, index, entries) {
-	if (index === urlParts.length) {
-		if (node.route !== null) return {
-			route: node.route,
-			params: buildParams(entries)
-		};
-		if (node.optionalCatchAllChild !== null) return {
-			route: node.optionalCatchAllChild.route,
-			params: buildParams(entries)
-		};
-		return null;
-	}
-	const segment = urlParts[index];
-	const staticChild = node.staticChildren.get(segment);
-	if (staticChild !== void 0) return matchNode(staticChild, urlParts, index + 1, entries);
-	if (node.dynamicChild !== null) {
-		entries.push([node.dynamicChild.paramName, segment]);
-		const match = matchNode(node.dynamicChild.node, urlParts, index + 1, entries);
-		if (match !== null) return match;
-		entries.pop();
-	}
-	if (node.catchAllChild !== null) {
-		const params = buildParams(entries);
-		params[node.catchAllChild.paramName] = urlParts.slice(index);
-		return {
-			route: node.catchAllChild.route,
-			params
-		};
-	}
-	if (node.optionalCatchAllChild !== null) {
-		const params = buildParams(entries);
-		params[node.optionalCatchAllChild.paramName] = urlParts.slice(index);
-		return {
-			route: node.optionalCatchAllChild.route,
-			params
-		};
-	}
-	return null;
-}
 function hrefToRouteParts(href, basePath) {
 	let url;
 	try {
@@ -138,7 +47,7 @@ function hrefToRouteParts(href, basePath) {
 function matchOptimisticRouteManifestRoute(options) {
 	const urlParts = hrefToRouteParts(options.href, options.basePath);
 	if (urlParts === null) return null;
-	const match = matchNode(getRouteTrie(options.routeManifest), urlParts.normalized, 0, []);
+	const match = matchOptimisticRouteTrie(getRouteTrie(options.routeManifest), urlParts.normalized);
 	if (match === null) return null;
 	decodeMatchedParams(match.params);
 	return match;

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

@@ -1,6 +1,7 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { NEVER_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
+import { createArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
@@ -96,14 +97,19 @@ function createAppPageBoundaryRscPayload(options) {
 	const routeId = AppElementsWire.encodeRouteId(options.pathname, null);
 	const layoutEntries = createAppPageBoundaryLayoutEntries(options.route, options.layoutModules);
 	const sourcePageSegments = options.sourcePageSegments ?? options.route?.routeSegments;
+	const rootLayoutTreePath = layoutEntries[0]?.treePath ?? null;
 	return {
 		...AppElementsWire.createMetadataEntries({
 			interceptionContext: null,
 			layoutIds: layoutEntries.map((entry) => entry.id),
-			rootLayoutTreePath: layoutEntries[0]?.treePath ?? null,
+			rootLayoutTreePath,
 			routeId,
 			sourcePage: sourcePageSegments ? createAppPageSourcePage(sourcePageSegments) : null
 		}),
+		[AppElementsWire.keys.artifactCompatibility]: createArtifactCompatibilityEnvelope({
+			deploymentVersion: process.env.__VINEXT_BUILD_ID ?? null,
+			rootBoundaryId: rootLayoutTreePath
+		}),
 		[routeId]: options.element
 	};
 }
@@ -157,6 +163,7 @@ async function renderAppPageBoundaryElementResponse(options) {
 					isCacheCandidate: options.isCacheCandidate,
 					isEdgeRuntime: options.isEdgeRuntime,
 					middlewareHeaders: options.middlewareContext.headers,
+					preloadRoutePattern: options.route ? options.route.pattern : null,
 					navigationContext: options.getNavigationContext() ?? {
 						pathname,
 						searchParams: requestUrl.searchParams,

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

@@ -43,6 +43,7 @@ async function renderAppPageCacheArtifactsImpl(options, renderSpan) {
 			mirrorNextFlight: options.mirrorNextFlight,
 			isStaticGeneration: true,
 			isForceStatic: options.isForceStatic,
+			preloadRoutePattern: options.route.pattern,
 			onSsrError: options.onSsrError && options.isCapturedRscError ? createAppPageSsrErrorHandler((error) => {
 				recordAppPageRenderError(renderSpan, error);
 				return options.onSsrError?.(error);

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

@@ -1,8 +1,8 @@
 import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import "../utils/protocol-headers.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import { VINEXT_INTERCEPTION_ID_HEADER, VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
 import "./headers.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { runInWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityPatternDynamic, readRouteCacheabilityState } from "../shims/cacheability-classification.js";
 import { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL } from "./app-rsc-render-mode.js";
@@ -149,6 +149,7 @@ async function runAppPageRevalidationContext(options, renderFn) {
 		currentFetchRevalidate: options.currentFetchRevalidate ?? null,
 		currentForceDynamicFetchDefault: options.dynamicConfig === "force-dynamic",
 		executionContext: getRequestExecutionContext(),
+		rootParams: options.rootParams ?? null,
 		unstableCacheRevalidation: "foreground"
 	});
 	const revalidation = runWithRequestContext(requestContext, () => runInWorkStoreScope(async () => {
@@ -388,6 +389,7 @@ async function dispatchAppPageInner(options) {
 					draftModeSecret: options.draftModeSecret,
 					dynamicConfig: revalidationDynamicConfig,
 					params: revalidationTarget.navigationParams,
+					rootParams: options.rootParams,
 					routePattern: revalidationTarget.route.pattern,
 					routeSegments: revalidationTarget.route.routeSegments,
 					setNavigationContext: options.setNavigationContext

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

@@ -1,8 +1,8 @@
 import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import { bindRequestContext } from "../shims/unified-request-context.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_RSC_COMPLETION_METADATA_HEADER } from "./headers.js";
 import { internalServerErrorResponse } from "./http-error-responses.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { isRouteCacheabilityEvaluation, recordRouteCacheabilityClientTraceMetadataMarker } from "../shims/cacheability-classification.js";
 import { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, applyCdnResponseHeaders, isCdnResponsePolicyHeader } from "./cache-control.js";
 import { resolveClientStaleTimeSeconds } from "../utils/cache-control-metadata.js";
@@ -497,7 +497,8 @@ async function renderAppPageLifecycleImpl(options, renderSpan) {
 			isForceStatic: options.isForceStatic,
 			loadSsrHandler: options.loadSsrHandler,
 			navigationContext: options.getNavigationContext(),
-			rootParams: options.rootParams
+			rootParams: options.rootParams,
+			routePattern: options.routePattern
 		}) : void 0;
 		let requestCacheLifeForPrerender = null;
 		if (shouldWaitForAllReady) await settleCapturedRscRenderForCacheMetadata(capturedRscDataRef.value);
@@ -812,6 +813,7 @@ async function renderAppPageLifecycleImpl(options, renderSpan) {
 				reactMaxHeadersLength: options.reactMaxHeadersLength,
 				rootParams: options.rootParams,
 				pprFallbackShellSignal: options.pprFallbackShellSignal,
+				preloadRoutePattern: options.routePattern,
 				formState: options.formState ?? null,
 				rscStream: rscForResponse,
 				scriptNonce: options.scriptNonce,

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

@@ -31,6 +31,7 @@ type CreateAppPageRscRenderStatusResolverOptions = {
   loadSsrHandler: () => Promise<AppPageSsrHandler>;
   navigationContext: NavigationContext | null;
   rootParams?: RootParams;
+  routePattern: string;
 };
 /**
  * Resolve an RSC-only render's status once its Flight payload is complete.

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

@@ -28,6 +28,7 @@ async function resolveAppPageRscRenderStatus(options) {
 			isForceStatic: options.isForceStatic,
 			isStaticGeneration: true,
 			onSsrError: () => void 0,
+			preloadRoutePattern: options.routePattern,
 			rootParams: options.rootParams
 		});
 	} catch (error) {

package/dist/server/app-page-search-params-observation.d.ts

@@ -1,15 +1,12 @@
 import { ThenableParams, ThenableParamsObserver } from "../shims/thenable-params.js";
 import { AppPageSearchParams } from "./app-page-head.js";
 //#region src/server/app-page-search-params-observation.d.ts
-type AppPageSearchParamsObservationOptions = {
-  observeReactPromiseStatus?: boolean;
-};
 type ClientPageSsrSearchParamsOptions = {
   isForceStatic?: boolean;
   isPprFallbackShell?: boolean;
 };
 export declare function createAppPageSearchParamsObserver(): ThenableParamsObserver;
-export declare function makeObservedAppPageSearchParamsThenable(pageSearchParams: AppPageSearchParams, options?: AppPageSearchParamsObservationOptions): ThenableParams<AppPageSearchParams>;
+export declare function makeObservedAppPageSearchParamsThenable(pageSearchParams: AppPageSearchParams): ThenableParams<AppPageSearchParams>;
 /**
  * The `searchParams` a client page receives during SSR (see
  * `shims/client-page-root.tsx`). Its RSC payload carries no query, so this is

package/dist/server/app-page-search-params-observation.js

@@ -9,17 +9,15 @@ function markAppPageSearchParamsAccess() {
 	markRenderRequestApiUsage("searchParams");
 }
 function createAppPageSearchParamsObserver() {
-	return { observeParamAccess() {
-		markAppPageSearchParamsAccess();
-	} };
+	return {
+		observeParamAccess() {
+			markAppPageSearchParamsAccess();
+		},
+		observeThenRead: throwIfStaticGenerationAccessError
+	};
 }
-function makeObservedAppPageSearchParamsThenable(pageSearchParams, options = {}) {
-	const observer = createAppPageSearchParamsObserver();
-	if (options.observeReactPromiseStatus === true) return makeThenableParams(pageSearchParams, {
-		...observer,
-		observeReactPromiseStatus: true
-	});
-	return makeThenableParams(pageSearchParams, observer);
+function makeObservedAppPageSearchParamsThenable(pageSearchParams) {
+	return makeThenableParams(pageSearchParams, createAppPageSearchParamsObserver());
 }
 /**
 * The `searchParams` a client page receives during SSR (see

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

@@ -71,6 +71,8 @@ export type AppPageSsrHandler = {
     };
     /** Abort signal for a build-time PPR fallback-shell static render. */
     pprFallbackShellSignal?: AbortSignal;
+    /** Route whose client references load before the render; null for none. */
+    preloadRoutePattern?: string | null;
     /** When true, wait for the full React tree before emitting bytes. */
     waitForAllReady?: boolean;
     /** Render is producing a static/prerendered HTML artifact. */
@@ -128,6 +130,11 @@ type RenderAppPageHtmlStreamOptions = {
   };
   /** Abort signal for a build-time PPR fallback-shell static render. */
   pprFallbackShellSignal?: AbortSignal;
+  /**
+   * Route whose client references load before the render, or null for a
+   * render without a route. Undefined loads every client reference.
+   */
+  preloadRoutePattern?: string | null;
   /** When true, wait for the full React tree before emitting bytes. */
   waitForAllReady?: boolean;
   /** Render is producing a static/prerendered HTML artifact. */

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

@@ -78,6 +78,7 @@ async function renderAppPageHtmlStream(options) {
 		sideStream: options.sideStream,
 		capturedRscDataRef: options.capturedRscDataRef,
 		pprFallbackShellSignal: options.pprFallbackShellSignal,
+		preloadRoutePattern: options.preloadRoutePattern,
 		waitForAllReady: options.waitForAllReady,
 		isStaticGeneration: options.isStaticGeneration,
 		isForceStatic: options.isForceStatic,

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

@@ -1,4 +1,5 @@
 import { AppMiddlewareContext } from "./app-middleware.js";
+import { MiddlewareResponseMergeOptions } from "./middleware-response-headers.js";
 import { EdgeApiExecutionRuntime } from "./edge-api-runtime.js";
 //#region src/server/app-pages-bridge.d.ts
 export type PagesEntry = {
@@ -24,7 +25,7 @@ type AppRouteMatch = {
 type RenderPagesFallbackDependencies = {
   loadPagesEntry: () => Promise<PagesEntry> | PagesEntry;
   buildRequestHeaders: (requestHeaders: Headers, middlewareRequestHeaders: Headers) => Headers | null;
-  applyRouteHandlerMiddlewareContext: (response: Response, middlewareContext: AppMiddlewareContext) => Response;
+  applyRouteHandlerMiddlewareContext: (response: Response, middlewareContext: AppMiddlewareContext, options?: MiddlewareResponseMergeOptions) => Response;
   /**
    * Returns the `__prerender_bypass` Set-Cookie header emitted by a
    * `draftMode().enable()`/`disable()` call inside middleware, if any. Reading

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

@@ -1,5 +1,5 @@
-import { getRequestExecutionContext } from "../shims/request-context.js";
 import { cloneRequestWithHeaders, cloneRequestWithUrl } from "./request-pipeline.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
 import { beginRouteCacheability } from "../shims/cacheability-classification.js";
 import { mergeHeaders } from "./worker-utils.js";
 import { pagesRouteHasPriorityOverAppRoute } from "./hybrid-route-priority.js";
@@ -23,15 +23,18 @@ async function renderPagesFallback(options, dependencies) {
 	if (isRscRequest && !allowRscDocumentFallback) return null;
 	const pagesEntry = await loadPagesEntry();
 	const pagesRequestHeaders = middlewareContext.requestHeaders ? buildRequestHeaders(request.headers, middlewareContext.requestHeaders) : null;
-	let pagesRequest = request;
-	if (pagesRequestHeaders) pagesRequest = cloneRequestWithHeaders(request, pagesRequestHeaders);
+	const matchRequest = pagesRequestHeaders ? new Request(request.url, {
+		headers: pagesRequestHeaders,
+		method: request.method
+	}) : request;
+	const claimPagesRequest = () => pagesRequestHeaders ? cloneRequestWithHeaders(request, pagesRequestHeaders) : request;
 	const queryIndex = pathname.indexOf("?");
 	const pagesPathname = queryIndex === -1 ? pathname : pathname.slice(0, queryIndex);
 	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";
-		const apiMatch = hasApiMatcher ? pagesEntry.matchApiRoute?.(pagesUrl, pagesRequest) ?? null : null;
+		const apiMatch = hasApiMatcher ? pagesEntry.matchApiRoute?.(pagesUrl, matchRequest) ?? null : null;
 		if (hasApiMatcher && apiMatch === null) return null;
 		if (apiMatch !== null && matchKind === "static" && apiMatch.route.isDynamic) return null;
 		if (apiMatch !== null && matchKind === "dynamic" && !apiMatch.route.isDynamic) return null;
@@ -41,24 +44,25 @@ async function renderPagesFallback(options, dependencies) {
 		if (apiMatch !== null) beginRouteCacheability("pages-api", apiMatch.route.pattern);
 		const executionContext = getRequestExecutionContext();
 		const apiArgs = [
-			pagesRequest,
+			claimPagesRequest(),
 			pagesUrl,
 			executionContext ?? void 0,
-			executionContext?.trustedRevalidateOrigin ?? new URL(pagesRequest.url).origin,
+			executionContext?.trustedRevalidateOrigin,
 			executionContext?.hostRuntime ?? "node"
 		];
 		const pagesApiResponse = await (initialResponseHeaders ? pagesEntry.handleApiRoute(...apiArgs, initialResponseHeaders) : pagesEntry.handleApiRoute(...apiArgs));
 		const draftCookie = getDraftModeCookieHeader();
-		return applyDraftModeCookie(applyRouteHandlerMiddlewareContext(pagesApiResponse, middlewareContext), draftCookie);
+		return applyDraftModeCookie(applyRouteHandlerMiddlewareContext(pagesApiResponse, middlewareContext, { appendResponseChallenges: false }), draftCookie);
 	}
 	if (typeof pagesEntry.renderPage !== "function") return null;
 	const hasPageMatcher = typeof pagesEntry.matchPageRoute === "function";
-	const pageMatch = hasPageMatcher ? pagesEntry.matchPageRoute?.(pagesUrl, pagesRequest) ?? null : null;
+	const pageMatch = hasPageMatcher ? pagesEntry.matchPageRoute?.(pagesUrl, matchRequest) ?? null : null;
 	if (hasPageMatcher && pageMatch === null) return null;
 	if (pageMatch !== null && matchKind === "static" && pageMatch.route.isDynamic) return null;
 	if (pageMatch !== null && matchKind === "dynamic" && !pageMatch.route.isDynamic) return null;
 	if (appRouteMatch !== null && (pageMatch === null || !pagesRouteHasPriorityOverAppRoute(pageMatch.route, appRouteMatch.route))) return null;
 	if (pageMatch !== null) beginRouteCacheability("pages-page", pageMatch.route.pattern);
+	const pagesRequest = claimPagesRequest();
 	const renderArgs = [
 		pagesDataRequest ? cloneRequestWithUrl(pagesRequest, pagesDataRequest.url) : pagesRequest,
 		pagesUrl,

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

@@ -1,6 +1,6 @@
 import "./headers.js";
-import { runInWorkStoreScope, runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { notFoundResponse } from "./http-error-responses.js";
+import { runInWorkStoreScope, runOutsideWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import { callAppPrerenderStaticParams } from "./app-prerender-static-params.js";
 //#region src/server/app-prerender-endpoints.ts
 const JSON_HEADERS = {

package/dist/server/app-prerender-static-params.js

@@ -1,4 +1,5 @@
 import { isUnknownRecord } from "../utils/record.js";
+import { shareIsolatePromise } from "./isolate-shared-promise.js";
 import { pickRootParams, runWithRootParamsScope } from "../shims/root-params.js";
 //#region src/server/app-prerender-static-params.ts
 /**
@@ -42,7 +43,7 @@ function createAppPrerenderStaticParamsResolver(sources, rootParamNames) {
 	let resolvePromise = null;
 	const resolveFns = () => {
 		if (resolvedFns) return Promise.resolve(resolvedFns);
-		if (!resolvePromise) resolvePromise = (async () => {
+		if (!resolvePromise) resolvePromise = shareIsolatePromise((async () => {
 			resolvedFns = (await Promise.all(usableSources.map(async (source) => {
 				if (isGenerateStaticParamsFunction(source)) return source;
 				const mod = await source.load();
@@ -50,7 +51,7 @@ function createAppPrerenderStaticParamsResolver(sources, rootParamNames) {
 				return isGenerateStaticParamsFunction(fn) ? fn : null;
 			}))).filter((fn) => fn !== null);
 			return resolvedFns;
-		})();
+		})());
 		return resolvePromise;
 	};
 	return async (input) => {

package/dist/server/app-render-abort-error.d.ts

@@ -1,3 +1,22 @@
 //#region src/server/app-render-abort-error.d.ts
 export declare function isAppRenderAbortError(error: unknown): boolean;
+export type RenderStreamCancellation = {
+  /** Records the reason the render's output stream ended early with. */
+  record: (reason: unknown) => void;
+  /** Whether React is reporting that recorded cancellation as an error. */
+  isReason: (error: unknown) => boolean;
+};
+/**
+ * Tracks the cancellation of a React render's output stream.
+ *
+ * React aborts the render with the cancel reason and passes it to `onError`
+ * as though the render had failed. Next.js cancels with its own
+ * `ResponseAborted`, which `isAppRenderAbortError` skips, but the reason is
+ * whatever the consumer chose: Workers runtimes cancel a disconnected
+ * response's body with their own (workerd's is `Error("Network connection
+ * lost.")`) and a tee picks its own reason for its source (Node passes both
+ * branches' reasons). So recognize the cancellation itself rather than the
+ * reason's shape.
+ */
+export declare function createRenderStreamCancellation(): RenderStreamCancellation;
 //#endregion

package/dist/server/app-render-abort-error.js

@@ -4,5 +4,35 @@ function isAppRenderAbortError(error) {
 	const name = Reflect.get(error, "name");
 	return name === "AbortError" || name === "ResponseAborted";
 }
+/**
+* Tracks the cancellation of a React render's output stream.
+*
+* React aborts the render with the cancel reason and passes it to `onError`
+* as though the render had failed. Next.js cancels with its own
+* `ResponseAborted`, which `isAppRenderAbortError` skips, but the reason is
+* whatever the consumer chose: Workers runtimes cancel a disconnected
+* response's body with their own (workerd's is `Error("Network connection
+* lost.")`) and a tee picks its own reason for its source (Node passes both
+* branches' reasons). So recognize the cancellation itself rather than the
+* reason's shape.
+*/
+function createRenderStreamCancellation() {
+	let cancelled = false;
+	let cancelReason;
+	return {
+		record: (reason) => {
+			if (cancelled) return;
+			cancelled = true;
+			cancelReason = reason;
+		},
+		isReason: (error) => {
+			if (!cancelled) return false;
+			if (Object.is(error, cancelReason)) return true;
+			if (!(error instanceof Error)) return false;
+			if (cancelReason === void 0) return error.message === "The render was aborted by the server without a reason.";
+			return typeof cancelReason === "object" && cancelReason !== null && error.message === "The render was aborted by the server with a promise.";
+		}
+	};
+}
 //#endregion
-export { isAppRenderAbortError };
+export { createRenderStreamCancellation, isAppRenderAbortError };

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

@@ -1,5 +1,5 @@
 import { isPromiseLike } from "../utils/promise.js";
-import { createElement, use } from "react";
+import { Fragment, createElement, isValidElement, use } from "react";
 import { jsx } from "react/jsx-runtime";
 //#region src/server/app-render-dependency.tsx
 const REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference");
@@ -21,7 +21,47 @@ function invokeAppComponent(component, props) {
 	if (candidate.$$typeof === REACT_LAZY && candidate._init) return invokeAppComponent(candidate._init(candidate._payload), props);
 	if (candidate.$$typeof === REACT_FORWARD_REF && candidate.render) return candidate.render(props, void 0);
 	if (isReactOwnedAppComponent(candidate)) return createElement(candidate, props);
-	return candidate(props);
+	const result = candidate(props);
+	return isPromiseLike(result) ? result : invokeCssWrappedComponent(result, props);
+}
+/**
+* Whether `elementProps` are what `createElement(type, props)` produces: the
+* same values, plus any `type.defaultProps` for keys that are `undefined`.
+* Defaulted values aren't read again, since a default can be a getter.
+*/
+function isElementOfProps(elementProps, props, defaultProps) {
+	const keys = new Set(Object.keys(props));
+	const defaulted = /* @__PURE__ */ new Set();
+	for (const key in defaultProps) if (props[key] === void 0) {
+		keys.add(key);
+		defaulted.add(key);
+	}
+	return Object.keys(elementProps).length === keys.size && [...keys].every((key) => Object.hasOwn(elementProps, key) && (defaulted.has(key) || Object.is(elementProps[key], props[key])));
+}
+/**
+* `@vitejs/plugin-rsc` wraps a server component export whose module imports
+* CSS (`__vite_rsc_wrap_css__`). The wrapper returns
+* `<><Css /><Component {...props} /></>`, so a component vinext invokes
+* directly renders as an element with its props after all. React's dev build
+* serializes an element's props as debug info and calls `then` on `params`
+* and `searchParams`, which counts as reading them. Invoke the inner
+* component from an element without props instead, as for an export without
+* CSS.
+*/
+function invokeCssWrappedComponent(result, props) {
+	if (!isValidElement(result) || result.type !== Fragment || result.key !== null) return result;
+	const children = result.props.children;
+	if (!Array.isArray(children) || children.length !== 2) return result;
+	const [css, inner] = children;
+	if (!isValidElement(inner) || typeof inner.type !== "function" || inner.key !== null) return result;
+	const component = inner.type;
+	if (!isElementOfProps(inner.props, props, component.defaultProps)) return result;
+	const componentProps = inner.props;
+	function CssWrappedComponent() {
+		return invokeAppComponent(component, componentProps);
+	}
+	CssWrappedComponent.displayName = component.displayName ?? component.name;
+	return createElement(Fragment, null, css, createElement(CssWrappedComponent));
 }
 const appElementRenderDependencies = /* @__PURE__ */ new WeakMap();
 function registerAppElementRenderDependencies(elements, dependenciesByElementId) {

package/dist/server/app-request-stage-independent-entry.js

@@ -1,11 +1,11 @@
 import { VINEXT_PRERENDER_SECRET_HEADER, VINEXT_REVALIDATE_HOST_HEADER } from "../utils/protocol-headers.js";
-import { assetPrefixPathname } from "../utils/asset-prefix.js";
-import { runWithExecutionContext } from "../shims/request-context.js";
-import "./server-globals.js";
 import "./app-rsc-vary.js";
 import { VINEXT_CACHEABILITY_PROBE_QUERY_PARAM, VINEXT_EXPECTED_WORKER_VERSION_HEADER } from "./headers.js";
 import { badRequestResponse } from "./http-error-responses.js";
-import { cloneRequestWithHeaders, filterInternalHeaders, guardProtocolRelativeUrl } from "./request-pipeline.js";
+import { cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, guardProtocolRelativeUrl } from "./request-pipeline.js";
+import { assetPrefixPathname } from "../utils/asset-prefix.js";
+import { runWithExecutionContext } from "../shims/request-context.js";
+import "./server-globals.js";
 import { getExplicitCdnCacheAdapter } from "../shims/cdn-cache-state.js";
 import { applyCdnResponseIdentityHeaders, validateCdnRequest } from "./cache-control.js";
 import { registerLazyDataCacheHandler } from "../shims/cache-handler.js";
@@ -26,7 +26,7 @@ const rejectResponseStage = () => Promise.resolve(new Response(null, { status: 4
 function handleRequestStage(request, env, ctx, dispatchResponseStage) {
 	const originalRequest = request;
 	const handleStage = async () => {
-		await __ensureInstrumentation();
+		await __ensureInstrumentation(ctx);
 		const url = new URL(request.url);
 		return traceFrameworkRequest({
 			callback: () => handleRequest(request, env, ctx, dispatchResponseStage, ctx?.assets).then((response) => applyCdnResponseIdentityHeaders(response, originalRequest)),
@@ -56,7 +56,7 @@ async function handleRequest(request, env, platformCtx, dispatchResponseStage, a
 		if (validationResponse) return validationResponse;
 		didValidateCdnRequest = true;
 		if (readinessResponse.status !== 204) return readinessResponse;
-		await __ensureHybridPagesApplication();
+		await __ensureHybridPagesApplication(ctx);
 	}
 	let probeMode = null;
 	let probeRoute = null;
@@ -67,7 +67,7 @@ async function handleRequest(request, env, platformCtx, dispatchResponseStage, a
 			probeRoute = readWorkerCacheabilityProbeRoute(request);
 			const probeUrl = new URL(request.url);
 			probeUrl.searchParams.delete(VINEXT_CACHEABILITY_PROBE_QUERY_PARAM);
-			request = new Request(probeUrl, request);
+			request = cloneRequestWithUrl(request, probeUrl.href);
 		}
 	}
 	if (!didValidateCdnRequest) {