vinext 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/server/app-rsc-response-finalizer.js

@@ -1,13 +1,11 @@
-import { normalizePathnameForRouteMatch } from "../routing/utils.js";
 import { hasBasePath, stripBasePath } from "../utils/base-path.js";
 import "./headers.js";
-import { normalizePath } from "./normalize-path.js";
-import { applyConfigHeadersToResponse } from "./request-pipeline.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { normalizeDefaultLocalePathname } from "./pages-i18n.js";
 import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
 import { mergeVaryHeader } from "./middleware-response-headers.js";
 //#region src/server/app-rsc-response-finalizer.ts
+const HAS_CONFIG_HEADERS = process.env.__VINEXT_HAS_CONFIG_HEADERS !== "false";
 /**
 * Apply App Router response finalization that must happen outside individual
 * route dispatchers.
@@ -20,7 +18,7 @@ import { mergeVaryHeader } from "./middleware-response-headers.js";
 * headers that throw on mutation, and Next.js does not apply config headers
 * to redirects regardless.
 */
-function finalizeAppRscResponse(response, request, options) {
+async function finalizeAppRscResponse(response, request, options) {
 	if (response.status >= 300 && response.status < 400) return response;
 	if (!response.headers.has("x-vinext-static-file")) {
 		const varyHeader = response.headers.get("Vary");
@@ -28,17 +26,13 @@ function finalizeAppRscResponse(response, request, options) {
 		else if (varyHeader !== VINEXT_RSC_VARY_HEADER) mergeVaryHeader(response.headers, VINEXT_RSC_VARY_HEADER);
 	}
 	if (!response.headers.has("Cache-Control")) applyCdnResponseHeaders(response.headers, { cacheControl: "" });
-	if (!options.configHeaders.length) return response;
+	if (!HAS_CONFIG_HEADERS || !options.configHeaders.length) return response;
 	const url = new URL(request.url);
-	let pathname;
-	try {
-		pathname = normalizePath(normalizePathnameForRouteMatch(url.pathname));
-	} catch {
-		pathname = url.pathname;
-	}
+	let pathname = url.pathname;
 	const hadBasePath = !options.basePath || hasBasePath(pathname, options.basePath);
 	pathname = stripBasePath(pathname, options.basePath);
 	const matchPathname = options.i18nConfig ? normalizeDefaultLocalePathname(pathname, options.i18nConfig, { hostname: url.hostname }) : pathname;
+	const { applyConfigHeadersToResponse } = await import("./config-headers.js");
 	applyConfigHeadersToResponse(response.headers, {
 		configHeaders: options.configHeaders,
 		pathname: matchPathname,

package/dist/server/app-rsc-route-matching.d.ts

@@ -33,9 +33,13 @@ type AppRscInterceptForMatching = {
   interceptLayouts: readonly unknown[];
   interceptLayoutSegments?: readonly (readonly string[])[];
   interceptBranchSegments?: readonly string[];
+  interceptNotFoundBranchSegments?: readonly string[];
   __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
   page: unknown;
   __pageLoader?: (() => Promise<unknown>) | null;
+  notFound?: unknown;
+  __loadNotFound?: (() => Promise<unknown>) | null;
+  notFoundTreePosition?: number | null;
   params: readonly string[];
 };
 type AppRscSlotForMatching = {
@@ -50,14 +54,20 @@ type AppRscSiblingInterceptForMatching = {
   interceptLayouts: readonly unknown[];
   interceptLayoutSegments?: readonly (readonly string[])[];
   interceptBranchSegments?: readonly string[];
+  interceptNotFoundBranchSegments?: readonly string[];
   __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
   page: unknown;
   __pageLoader?: (() => Promise<unknown>) | null;
+  notFound?: unknown;
+  __loadNotFound?: (() => Promise<unknown>) | null;
+  notFoundTreePosition?: number | null;
   params: readonly string[];
 };
 type AppRscRouteForMatching = {
+  __loadRouteHandler?: unknown;
   pattern: string;
   patternParts: string[];
+  routeHandler?: unknown;
   slots?: Record<string, AppRscSlotForMatching>;
   siblingIntercepts?: AppRscSiblingInterceptForMatching[];
 };
@@ -68,6 +78,8 @@ type AppRscInterceptMatch = AppRscInterceptLookupEntry & {
 type AppRscInterceptLoadState = {
   page: unknown;
   pageLoading: Promise<unknown> | null;
+  notFound: unknown;
+  notFoundLoading: Promise<unknown> | null;
   interceptLayoutsLoading: Promise<readonly unknown[]> | null;
 };
 type AppRscInterceptLookupEntry = {
@@ -81,9 +93,13 @@ type AppRscInterceptLookupEntry = {
   interceptLayouts: readonly unknown[];
   interceptLayoutSegments?: readonly (readonly string[])[];
   interceptBranchSegments?: readonly string[];
+  interceptNotFoundBranchSegments?: readonly string[];
   __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
   page: unknown;
   __pageLoader?: (() => Promise<unknown>) | null;
+  notFound: unknown;
+  __loadNotFound?: (() => Promise<unknown>) | null;
+  notFoundTreePosition?: number | null;
   __loadState: AppRscInterceptLoadState;
   params: readonly string[];
   slotId: string | null;
@@ -93,6 +109,10 @@ declare function createAppRscRouteMatcher<Route extends AppRscRouteForMatching>(
     route: Route;
     params: AppRscRouteParams;
   } | null;
+  matchRequestRoute(url: string): {
+    route: Route;
+    params: AppRscRouteParams;
+  } | null;
   findIntercept(pathname: string, sourcePathname?: string | null): AppRscInterceptMatch | null;
 };
 declare function matchAppRscRoutePattern(urlParts: string[], patternParts: string[]): AppRscRouteParams | null;

package/dist/server/app-rsc-route-matching.js

@@ -1,6 +1,6 @@
-import { splitPathnameForRouteMatch } from "../routing/utils.js";
-import { buildRouteTrie, trieMatch } from "../routing/route-trie.js";
-import { matchRoutePattern, matchRoutePatternPrefix } from "../routing/route-pattern.js";
+import { decodeMatchedParams, splitPathSegments, splitPathnameForRouteMatch } from "../routing/utils.js";
+import { buildRouteTrie, trieMatchRaw } from "../routing/route-trie.js";
+import { matchRoutePattern, matchRoutePatternPrefix, matchRoutePatternRaw } from "../routing/route-pattern.js";
 //#region src/server/app-rsc-route-matching.ts
 /**
 * Sentinel slot key used for sibling-style interception entries.
@@ -11,9 +11,61 @@ const SIBLING_PAGE_INTERCEPT_SLOT_KEY = "__vinext_page_intercept";
 function createRouteParams() {
 	return Object.create(null);
 }
-function appRscPathnameParts(pathname) {
+function appRscPathnameParts(pathname, isNormalized = false) {
 	const pathOnly = pathname.split("?")[0];
-	return splitPathnameForRouteMatch(pathOnly === "/" ? "/" : pathOnly.replace(/\/$/, ""));
+	const normalizedPathname = pathOnly === "/" ? "/" : pathOnly.replace(/\/$/, "");
+	return isNormalized ? splitPathSegments(normalizedPathname) : splitPathnameForRouteMatch(normalizedPathname);
+}
+function appRscInterceptionSourcePathnameParts(pathname) {
+	const pathOnly = pathname.split("?")[0];
+	return splitPathSegments(pathOnly === "/" ? "/" : pathOnly.replace(/\/$/, "")).map((segment) => {
+		try {
+			return decodeURIComponent(segment);
+		} catch {
+			return segment;
+		}
+	});
+}
+function canonicalizeAppPageParam(value) {
+	try {
+		return encodeURIComponent(decodeURIComponent(value));
+	} catch {
+		return value;
+	}
+}
+function canonicalizeAppPageParams(params) {
+	for (const key of Object.keys(params)) {
+		const value = params[key];
+		params[key] = Array.isArray(value) ? value.map(canonicalizeAppPageParam) : canonicalizeAppPageParam(value);
+	}
+}
+function isAppRouteHandlerRoute(route) {
+	return route.routeHandler != null || typeof route.__loadRouteHandler === "function";
+}
+function normalizeMatchedParamsForRoute(result) {
+	if (isAppRouteHandlerRoute(result.route)) decodeMatchedParams(result.params);
+	else canonicalizeAppPageParams(result.params);
+}
+function extractRawParamsForMatchedRoute(patternParts, pathnameParts) {
+	const params = createRouteParams();
+	let pathnameIndex = 0;
+	for (const part of patternParts) {
+		if (!part.startsWith(":")) {
+			pathnameIndex += 1;
+			continue;
+		}
+		const isCatchAll = part.endsWith("+") || part.endsWith("*");
+		const paramName = part.slice(1, isCatchAll ? -1 : void 0);
+		if (isCatchAll) {
+			const remaining = pathnameParts.slice(pathnameIndex);
+			if (remaining.length > 0) params[paramName] = [...remaining];
+			break;
+		}
+		const value = pathnameParts[pathnameIndex];
+		if (value !== void 0) params[paramName] = value;
+		pathnameIndex += 1;
+	}
+	return params;
 }
 function createAppRscRouteMatcher(routes) {
 	const routeTrie = buildRouteTrie(routes);
@@ -21,20 +73,32 @@ function createAppRscRouteMatcher(routes) {
 	const routeIndexes = new Map(routes.map((route, index) => [route, index]));
 	return {
 		matchRoute(url) {
-			return trieMatch(routeTrie, appRscPathnameParts(url));
+			const rawParts = appRscPathnameParts(url, true);
+			const result = trieMatchRaw(routeTrie, appRscPathnameParts(url, false));
+			if (!result) return null;
+			result.params = extractRawParamsForMatchedRoute(result.route.patternParts, rawParts);
+			normalizeMatchedParamsForRoute(result);
+			return result;
+		},
+		matchRequestRoute(url) {
+			const result = trieMatchRaw(routeTrie, appRscPathnameParts(url, true));
+			if (!result) return null;
+			normalizeMatchedParamsForRoute(result);
+			return result;
 		},
 		findIntercept(pathname, sourcePathname = null) {
 			if (sourcePathname === null) return null;
-			const urlParts = appRscPathnameParts(pathname);
-			const sourceParts = appRscPathnameParts(sourcePathname);
-			const matchedSourceRoute = trieMatch(routeTrie, sourceParts);
+			const urlParts = appRscPathnameParts(pathname, true);
+			const sourceParts = appRscInterceptionSourcePathnameParts(sourcePathname);
+			const matchedSourceRoute = trieMatchRaw(routeTrie, sourceParts);
 			for (const entry of interceptLookup) {
 				if (!matchInterceptSource(sourceParts, entry)) continue;
-				const params = matchAppRscRoutePattern(urlParts, entry.targetPatternParts);
+				const params = matchRoutePatternRaw(urlParts, entry.targetPatternParts);
 				if (params === null) continue;
+				canonicalizeAppPageParams(params);
 				const concreteSourceRouteIndex = matchedSourceRoute && entry.sourceMatchPatternParts !== null ? routeIndexes.get(matchedSourceRoute.route) ?? entry.sourceRouteIndex : entry.sourceRouteIndex;
 				const sourceRoute = routes[concreteSourceRouteIndex];
-				const matchedSourceParams = matchedSourceRoute && entry.sourceMatchPatternParts !== null ? matchedSourceRoute.params : sourceRoute ? matchAppRscRoutePattern(sourceParts, sourceRoute.patternParts) : null;
+				const matchedSourceParams = matchedSourceRoute && entry.sourceMatchPatternParts !== null ? matchedSourceRoute.params : sourceRoute ? matchRoutePatternRaw(sourceParts, sourceRoute.patternParts) : null;
 				if (matchedSourceParams === null && entry.sourceMatchPatternParts === null) continue;
 				const sourceParams = matchedSourceParams && entry.sourceMatchPatternParts !== null ? pickPatternParams(matchedSourceParams, entry.sourceMatchPatternParts) : matchedSourceParams ?? createRouteParams();
 				return {
@@ -106,12 +170,18 @@ function createInterceptLookup(routes) {
 					interceptLayouts: intercept.interceptLayouts,
 					interceptLayoutSegments: intercept.interceptLayoutSegments,
 					interceptBranchSegments: intercept.interceptBranchSegments,
+					interceptNotFoundBranchSegments: intercept.interceptNotFoundBranchSegments,
 					__loadInterceptLayouts: intercept.__loadInterceptLayouts,
 					page: intercept.page,
 					__pageLoader: intercept.__pageLoader,
+					notFound: intercept.notFound,
+					__loadNotFound: intercept.__loadNotFound,
+					notFoundTreePosition: intercept.notFoundTreePosition,
 					__loadState: {
 						page: intercept.page,
 						pageLoading: null,
+						notFound: intercept.notFound,
+						notFoundLoading: null,
 						interceptLayoutsLoading: null
 					},
 					params: intercept.params
@@ -133,12 +203,18 @@ function createInterceptLookup(routes) {
 				interceptLayouts: intercept.interceptLayouts,
 				interceptLayoutSegments: intercept.interceptLayoutSegments,
 				interceptBranchSegments: intercept.interceptBranchSegments,
+				interceptNotFoundBranchSegments: intercept.interceptNotFoundBranchSegments,
 				__loadInterceptLayouts: intercept.__loadInterceptLayouts,
 				page: intercept.page,
 				__pageLoader: intercept.__pageLoader,
+				notFound: intercept.notFound,
+				__loadNotFound: intercept.__loadNotFound,
+				notFoundTreePosition: intercept.notFoundTreePosition,
 				__loadState: {
 					page: intercept.page,
 					pageLoading: null,
+					notFound: intercept.notFound,
+					notFoundLoading: null,
 					interceptLayoutsLoading: null
 				},
 				params: intercept.params

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

@@ -1,12 +1,12 @@
 import { isEdgeApiRuntime } from "./edge-api-runtime.js";
 //#region src/server/app-segment-config.ts
-const DYNAMIC_VALUES = new Set([
+const DYNAMIC_VALUES = /* @__PURE__ */ new Set([
 	"auto",
 	"error",
 	"force-dynamic",
 	"force-static"
 ]);
-const FETCH_CACHE_VALUES = new Set([
+const FETCH_CACHE_VALUES = /* @__PURE__ */ new Set([
 	"auto",
 	"default-cache",
 	"default-no-store",
@@ -40,6 +40,15 @@ function resolveDynamicStaleTimeSeconds(current, value) {
 function isDynamicSegment(segment) {
 	return segment.startsWith("[") && segment.endsWith("]");
 }
+function resolveSegmentConfigOwnerPosition(routeSegments, treePosition) {
+	let ownerPosition = Math.min(treePosition - 1, routeSegments.length - 1);
+	while (ownerPosition >= 0) {
+		const segment = routeSegments[ownerPosition];
+		if (!segment.startsWith("@") && !(segment.startsWith("(") && segment.endsWith(")"))) break;
+		ownerPosition -= 1;
+	}
+	return ownerPosition;
+}
 function getParallelSegments(options) {
 	if (!options.parallelBranches) return options.parallelSegments ?? [];
 	return options.parallelBranches.flatMap((branch) => branch ? [
@@ -59,8 +68,9 @@ function resolveDynamicParamsConfig(options) {
 	for (const segment of segments) if (segment?.dynamicParams === false) dynamicParamsConfig = false;
 	else if (segment?.dynamicParams === true && dynamicParamsConfig !== false) dynamicParamsConfig = true;
 	if (dynamicParamsConfig !== false || !options.routeSegments) return dynamicParamsConfig;
+	const routeSegments = options.routeSegments;
 	let lastDynamicPosition = -1;
-	for (let index = options.routeSegments.length - 1; index >= 0; index--) if (isDynamicSegment(options.routeSegments[index])) {
+	for (let index = routeSegments.length - 1; index >= 0; index--) if (isDynamicSegment(routeSegments[index])) {
 		lastDynamicPosition = index;
 		break;
 	}
@@ -70,7 +80,7 @@ function resolveDynamicParamsConfig(options) {
 	let lastDynamicSegmentIsStaticOnly = false;
 	let lastDynamicSegmentHasStaticParams = false;
 	layouts.forEach((layout, index) => {
-		if ((layoutPositions[index] ?? 0) - 1 !== lastDynamicPosition) return;
+		if (resolveSegmentConfigOwnerPosition(routeSegments, layoutPositions[index] ?? 0) !== lastDynamicPosition) return;
 		if (layout?.dynamicParams === false) lastDynamicSegmentIsStaticOnly = true;
 		if (typeof layout?.generateStaticParams === "function") lastDynamicSegmentHasStaticParams = true;
 	});
@@ -78,7 +88,7 @@ function resolveDynamicParamsConfig(options) {
 	if (typeof options.page?.generateStaticParams === "function") lastDynamicSegmentHasStaticParams = true;
 	for (const branch of options.parallelBranches ?? []) {
 		if (!branch) continue;
-		const branchStartPosition = options.routeSegments.length - (branch.routeSegments?.length ?? 0);
+		const branchStartPosition = routeSegments.length - (branch.routeSegments?.length ?? 0);
 		const checkSegment = (segment, ownerPosition) => {
 			if (ownerPosition !== lastDynamicPosition) return;
 			if (segment?.dynamicParams === false) lastDynamicSegmentIsStaticOnly = true;

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

@@ -146,7 +146,9 @@ type HandleServerActionRscRequestOptions<TElement, TRoute extends AppServerActio
   buildPageElement: (options: BuildServerActionPageElementOptions<TRoute, TInterceptOpts>) => TElement;
   cleanPathname: string;
   clearRequestContext: () => void;
-  contentType: string;
+  contentType: string; /** Route selected at the request boundary before action execution. */
+  currentRouteMatch: AppServerActionMatch<TRoute> | null; /** Request-aware pathname identity used for current-route interception lookup. */
+  currentRoutePathname: string;
   createNotFoundElement: (routeId: string) => TElement;
   createPayloadRouteId: (pathname: string, interceptionContext: string | null) => string;
   createRscOnErrorHandler: (request: Request, pathname: string, pattern: string) => (error: unknown) => unknown;

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

@@ -1,12 +1,12 @@
 import { splitPathSegments } from "../routing/utils.js";
 import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { ACTION_FORWARDED_HEADER, ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, ACTION_REDIRECT_TYPE_HEADER, ACTION_REVALIDATED_HEADER } from "./headers.js";
-import { isExternalUrl } from "../config/config-matchers.js";
+import { isExternalUrl } from "../utils/external-url.js";
 import { internalServerErrorResponse, payloadTooLargeResponse } from "./http-error-responses.js";
 import { validateCsrfOrigin, validateServerActionPayload } from "./request-pipeline.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
 import { headersContextFromRequest, isDraftModeRequest, setHeadersContext } from "../shims/headers.js";
-import { getAndClearActionRevalidationKind } from "../shims/cache-request-state.js";
+import { _drainPendingRevalidations, getAndClearActionRevalidationKind } from "../shims/cache-request-state.js";
 import { setCurrentFetchCacheMode, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault } from "../shims/fetch-cache.js";
 import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
 import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
@@ -14,10 +14,10 @@ import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { getNextErrorDigest, parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.js";
+import { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import "./app-page-stream.js";
 import { buildAppPageTags } from "./implicit-tags.js";
-import { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
 import { resolveAppPageActionRerenderTarget } from "./app-page-request.js";
 import { createRootParamsUsageController, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage } from "../shims/root-params.js";
 import { getSetCookieName } from "./cookie-utils.js";
@@ -403,6 +403,7 @@ async function handleProgressiveServerActionRequest(options) {
 			options.setHeadersAccessPhase(previousHeadersPhase);
 			if (actionThrew) rootParamsUsage.transitionToRender();
 		}
+		await _drainPendingRevalidations();
 		if (!actionRedirect) {
 			if (!actionThrew) rootParamsUsage.transitionToRender();
 			const actionPendingCookies = dedupePendingCookies(options.getAndClearPendingCookies());
@@ -612,6 +613,7 @@ async function handleServerActionRscRequest(options) {
 			options.setHeadersAccessPhase(previousHeadersPhase);
 			if (actionThrew && !actionWasForwarded) rootParamsUsage.transitionToRender();
 		}
+		await _drainPendingRevalidations();
 		if (actionRedirect) {
 			const actionPendingCookies = dedupePendingCookies(options.getAndClearPendingCookies());
 			const actionDraftCookie = options.getDraftModeCookieHeader();
@@ -648,7 +650,7 @@ async function handleServerActionRscRequest(options) {
 					headers: withoutRscBodyHeaders(redirectHeaders)
 				});
 			}
-			const currentMatch = options.matchRoute(options.cleanPathname);
+			const currentMatch = options.currentRouteMatch;
 			if (currentMatch) await options.ensureRouteLoaded?.(currentMatch.route);
 			const redirectRenderRequest = createActionRedirectRenderRequest({
 				pendingCookies: [...actionPendingCookies, ...actionDraftCookie ? [actionDraftCookie] : []],
@@ -734,14 +736,14 @@ async function handleServerActionRscRequest(options) {
 			}, options.clearRequestContext);
 		}
 		if (!actionThrew) rootParamsUsage.transitionToRender();
-		const match = options.matchRoute(options.cleanPathname);
+		const match = options.currentRouteMatch;
 		let element;
 		let errorPattern = match ? match.route.pattern : options.cleanPathname;
 		const actionRerenderIsRscRequest = true;
 		if (match) {
 			const { route: actionRoute, params: actionParams } = match;
 			const actionRerenderTarget = await resolveAppPageActionRerenderTarget({
-				cleanPathname: options.cleanPathname,
+				cleanPathname: options.currentRoutePathname,
 				currentParams: actionParams,
 				currentRoute: actionRoute,
 				findIntercept: options.findIntercept,

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

@@ -16,7 +16,7 @@ import { setPagesClientAssets } from "./pages-client-assets.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { BfcacheStateKeyMapContext, ElementsContext, Slot } from "../shims/slot.js";
 import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
-import { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform } from "./app-ssr-stream.js";
+import { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, waitAtLeastOneReactRenderTask } from "./app-ssr-stream.js";
 import { createInitialBfcacheMaps } from "./app-bfcache-identity.js";
 import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
 import { createClientReferencePreloader } from "./app-client-reference-preloader.js";
@@ -238,6 +238,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				};
 				let htmlStream;
 				let shellErrorRecovered = false;
+				let shouldDelayInitialHtmlPull = false;
 				if (pprFallbackShellSignal) {
 					const prerender = await loadStaticPrerender();
 					const htmlAbortController = new AbortController();
@@ -252,6 +253,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 					try {
 						streamingHtmlStream = await renderToReadableStream(ssrRoot, { ...renderOptions });
 						if (options?.waitForAllReady === true) await streamingHtmlStream.allReady;
+						else shouldDelayInitialHtmlPull = true;
 						htmlStream = streamingHtmlStream;
 					} catch (error) {
 						streamingHtmlStream?.cancel().catch(() => {});
@@ -281,6 +283,7 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 					return buildHeadInjectionHtml(ssrNavigationContext, bootstrapModuleUrl, options?.formState ?? null, insertedHTML + errorMetaHTML + getTraceMetaHTML() + initialDevServerErrorHTML, fontHTML, options?.dynamicStaleTimeSeconds, options?.scriptNonce);
 				};
 				const getBeforeInteractiveHeadHTML = () => renderBeforeInteractiveInlineScripts(beforeInteractiveInlineScripts);
+				if (shouldDelayInitialHtmlPull) await waitAtLeastOneReactRenderTask();
 				return {
 					htmlStream: deferUntilStreamConsumed(htmlStream.pipeThrough(createTickBufferedTransform(rscEmbed, getInsertedHTML, getBeforeInteractiveHeadHTML, inlineCssManifest, inlineCssFontStyles, inlineCssFontStyleFallbackHTML, options?.scriptNonce)), cleanup),
 					metadataReady: Promise.resolve(),

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

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

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

@@ -2,6 +2,9 @@ import { createInlineScriptTag, escapeHtmlAttr, htmlTokenListContains, safeJsonS
 import { bytesToBase64, concatUint8Arrays } from "./app-rsc-embedded-chunks.js";
 import { NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION } from "../client/navigation-runtime.js";
 //#region src/server/app-ssr-stream.ts
+function waitAtLeastOneReactRenderTask() {
+	return new Promise((resolve) => setTimeout(resolve, 0));
+}
 const NAVIGATION_RUNTIME_REFERENCE = `self[Symbol.for(${safeJsonStringify(NAVIGATION_RUNTIME_SYMBOL_DESCRIPTION)})]`;
 function navigationRuntimeRscBootstrapExpression() {
 	return `((${NAVIGATION_RUNTIME_REFERENCE}??={bootstrap:{routeManifest:null},functions:{}}).bootstrap.rsc??={rsc:[]})`;
@@ -20,14 +23,6 @@ function createNavigationRuntimeRscDoneScript(metadata) {
 	}) + ");") + bootstrap + ".done=true";
 }
 /**
-* Fix invalid preload "as" values in RSC Flight hint lines before they reach
-* the client. React Flight emits HL hints with as="stylesheet" for CSS, but
-* the HTML spec requires as="style" for <link rel="preload">.
-*/
-function fixFlightHints(text) {
-	return text.replace(/(\d*:HL\[.*?),"stylesheet"(\]|,)/g, "$1,\"style\"$2");
-}
-/**
 * Create a helper that progressively embeds RSC chunks as inline <script> tags.
 * The browser entry turns the embedded chunks back into Uint8Array data.
 */
@@ -46,7 +41,7 @@ function createRscEmbedTransform(embedStream, scriptNonce, getInitialNavigationC
 				rawChunks.push(result.value);
 				try {
 					const text = new TextDecoder("utf-8", { fatal: true }).decode(result.value);
-					pendingChunks.push(fixFlightHints(text));
+					pendingChunks.push(text);
 				} catch {
 					pendingChunks.push([3, bytesToBase64(result.value)]);
 				}
@@ -409,4 +404,4 @@ function createTickBufferedTransform(rscEmbed, injectHTML = "", injectAfterHeadO
 	});
 }
 //#endregion
-export { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, fixFlightHints, fixPreloadAs, navigationRuntimeRscBootstrapExpression };
+export { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, fixPreloadAs, navigationRuntimeRscBootstrapExpression, waitAtLeastOneReactRenderTask };

package/dist/server/cache-proof.js

@@ -19,7 +19,7 @@ const ALL_RENDER_REQUEST_API_KINDS = [
 	"params",
 	"searchParams"
 ];
-const PUBLIC_UNSAFE_DIMENSION_SOURCES = new Set([
+const PUBLIC_UNSAFE_DIMENSION_SOURCES = /* @__PURE__ */ new Set([
 	"auth",
 	"cookie",
 	"draft-mode",

package/dist/server/config-headers.d.ts

@@ -0,0 +1,24 @@
+import { NextHeader } from "../config/next-config.js";
+import { RequestContext } from "../config/request-context.js";
+import { BasePathMatchState } from "../config/config-matchers.js";
+import { HeaderRecord } from "./request-pipeline.js";
+
+//#region src/server/config-headers.d.ts
+type ApplyConfigHeadersOptions = {
+  configHeaders: NextHeader[];
+  pathname: string;
+  requestContext: RequestContext;
+  /**
+   * basePath gating state. When omitted, every rule is treated as a default
+   * (basePath: true) rule for backward compatibility — callers that need to
+   * support `basePath: false` headers must pass this in.
+   */
+  basePathState?: BasePathMatchState; /** Existing framework-generated headers that matching config rules may replace. */
+  overwriteExisting?: ReadonlySet<string>;
+};
+/** Apply matched next.config.js headers to a Web Headers object. */
+declare function applyConfigHeadersToResponse(responseHeaders: Headers, options: ApplyConfigHeadersOptions): void;
+/** Apply matched next.config.js headers to an early response header record. */
+declare function applyConfigHeadersToHeaderRecord(headers: HeaderRecord, options: ApplyConfigHeadersOptions): void;
+//#endregion
+export { applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse };

package/dist/server/config-headers.js

@@ -0,0 +1,52 @@
+import { matchHeaders } from "../config/config-matchers.js";
+//#region src/server/config-headers.ts
+function findHeaderRecordKey(headers, lowerName) {
+	for (const key of Object.keys(headers)) if (key.toLowerCase() === lowerName) return key;
+}
+function appendHeaderRecord(headers, lowerName, value) {
+	const key = findHeaderRecordKey(headers, lowerName) ?? lowerName;
+	const existing = headers[key];
+	if (existing === void 0) {
+		headers[key] = value;
+		return;
+	}
+	if (Array.isArray(existing)) {
+		existing.push(value);
+		return;
+	}
+	headers[key] = [existing, value];
+}
+function appendVaryHeaderRecord(headers, value) {
+	const key = findHeaderRecordKey(headers, "vary") ?? "vary";
+	const existing = headers[key];
+	if (existing === void 0) {
+		headers[key] = value;
+		return;
+	}
+	if (Array.isArray(existing)) {
+		existing.push(value);
+		return;
+	}
+	headers[key] = existing + ", " + value;
+}
+/** Apply matched next.config.js headers to a Web Headers object. */
+function applyConfigHeadersToResponse(responseHeaders, options) {
+	const matched = matchHeaders(options.pathname, options.configHeaders, options.requestContext, options.basePathState);
+	for (const header of matched) {
+		const lowerName = header.key.toLowerCase();
+		if (lowerName === "vary" || lowerName === "set-cookie") responseHeaders.append(header.key, header.value);
+		else if (options.overwriteExisting?.has(lowerName) || !responseHeaders.has(lowerName)) responseHeaders.set(header.key, header.value);
+	}
+}
+/** Apply matched next.config.js headers to an early response header record. */
+function applyConfigHeadersToHeaderRecord(headers, options) {
+	const matched = matchHeaders(options.pathname, options.configHeaders, options.requestContext, options.basePathState);
+	for (const header of matched) {
+		const lowerName = header.key.toLowerCase();
+		if (lowerName === "set-cookie") appendHeaderRecord(headers, lowerName, header.value);
+		else if (lowerName === "vary") appendVaryHeaderRecord(headers, header.value);
+		else if (findHeaderRecordKey(headers, lowerName) === void 0) headers[lowerName] = header.value;
+	}
+}
+//#endregion
+export { applyConfigHeadersToHeaderRecord, applyConfigHeadersToResponse };

package/dist/server/default-global-error-module.d.ts

@@ -1,3 +1,5 @@
+import DefaultGlobalError from "../shims/default-global-error.js";
+
 //#region src/server/default-global-error-module.d.ts
 /**
  * Module-shaped wrapper around vinext's built-in default global error
@@ -13,7 +15,7 @@
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/webpack/loaders/next-app-loader/index.ts
  */
 declare const DEFAULT_GLOBAL_ERROR_MODULE: {
-  readonly default: any;
+  readonly default: typeof DefaultGlobalError;
 };
 //#endregion
 export { DEFAULT_GLOBAL_ERROR_MODULE };

package/dist/server/default-not-found-module.d.ts

@@ -1,3 +1,5 @@
+import DefaultNotFound from "../shims/default-not-found.js";
+
 //#region src/server/default-not-found-module.d.ts
 /**
  * Module-shaped wrapper around vinext's built-in default not-found component.
@@ -13,7 +15,7 @@
  * https://github.com/vercel/next.js/blob/canary/packages/next/src/build/webpack/loaders/next-app-loader/index.ts
  */
 declare const DEFAULT_NOT_FOUND_MODULE: {
-  readonly default: any;
+  readonly default: typeof DefaultNotFound;
 };
 //#endregion
 export { DEFAULT_NOT_FOUND_MODULE };

package/dist/server/dev-initial-server-error.d.ts

@@ -4,6 +4,6 @@ type InitialDevServerErrorPayload = {
   name?: string;
   stack?: string;
 };
-declare function createInitialDevServerErrorScript(error: unknown, scriptNonce?: string, nodeEnv?: string | undefined): string;
+declare function createInitialDevServerErrorScript(error: unknown, scriptNonce?: string, nodeEnv?: "development" | "production" | "test"): string;
 //#endregion
 export { InitialDevServerErrorPayload, createInitialDevServerErrorScript };

package/dist/server/dev-lockfile.js

@@ -1,6 +1,5 @@
-import { normalizePathSeparators } from "../utils/path.js";
+import path from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import fs from "node:fs";
-import path from "node:path";
 //#region src/server/dev-lockfile.ts
 /**
 * Dev server lock file.
@@ -99,7 +98,7 @@ function formatAlreadyRunningError(opts) {
 	if (!existing) return [
 		"Another vinext dev server appears to be running in this directory.",
 		"",
-		`Stale lock file: ${normalizePathSeparators(path.relative(cwd, lockfilePath))}`,
+		`Stale lock file: ${path.relative(cwd, lockfilePath)}`,
 		"Remove it manually if no server is running, then re-run `vinext dev`."
 	].join("\n");
 	const killCommand = process.platform === "win32" ? `taskkill /PID ${existing.pid} /F` : `kill ${existing.pid}`;