vinext 0.0.55 → 0.1.0

package/dist/server/app-rsc-handler.js

@@ -4,21 +4,21 @@ import { getRequestExecutionContext } from "../shims/request-context.js";
 import { ACTION_REVALIDATED_HEADER, VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER } from "./headers.js";
 import { isExternalUrl, matchRedirect, matchRewrite, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "../config/config-matchers.js";
 import { notFoundResponse } from "./http-error-responses.js";
-import { applyConfigHeadersToResponse, cloneRequestWithHeaders, filterInternalHeaders, normalizeTrailingSlash, resolvePublicFileRoute, validateImageUrl } from "./request-pipeline.js";
+import { applyConfigHeadersToResponse, cloneRequestWithHeaders, cloneRequestWithUrl, filterInternalHeaders, normalizeTrailingSlash, resolvePublicFileRoute, validateImageUrl } from "./request-pipeline.js";
 import { headersContextFromRequest } from "../shims/headers.js";
 import { ensureFetchPatch, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
-import { createRscRedirectLocation, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam, stripRscSuffix } from "./app-rsc-cache-busting.js";
+import { createRscRedirectLocation, hasRscCacheBustingSearchParam, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam, stripRscSuffix } from "./app-rsc-cache-busting.js";
 import { getScriptNonceFromHeaderSources } from "./csp.js";
 import { normalizeDefaultLocalePathname } from "./pages-i18n.js";
 import { isImageOptimizationPath } from "./image-optimization.js";
-import { prerenderRouteParamsPayloadMatchesRoute, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
-import { flattenErrorCauses } from "../utils/error-cause.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import "./app-page-response.js";
+import { prerenderRouteParamsPayloadMatchesRoute, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
+import { pickRootParams, setRootParams } from "../shims/root-params.js";
+import { flattenErrorCauses } from "../utils/error-cause.js";
 import { applyAppMiddleware } from "./app-middleware.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
 import { buildPostMwRequestContext } from "./app-post-middleware-context.js";
-import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import { handleAppPrerenderEndpoint } from "./app-prerender-endpoints.js";
 import { finalizeAppRscResponse } from "./app-rsc-response-finalizer.js";
 import { normalizeRscRequest } from "./app-rsc-request-normalization.js";
@@ -76,6 +76,12 @@ function applyConfigHeadersToMiddlewareRedirect(response, options) {
 	}
 	return response;
 }
+function requestWithoutRscCacheBustingSearchParam(request) {
+	const url = new URL(request.url);
+	if (!hasRscCacheBustingSearchParam(url)) return request;
+	stripRscCacheBustingSearchParam(url);
+	return cloneRequestWithUrl(request.body ? request.clone() : request, url.toString());
+}
 async function handleAppRscRequest(options, request, preMiddlewareRequestContext, isDataRequest) {
 	const handlerStart = process.env.NODE_ENV !== "production" ? performance.now() : 0;
 	if (process.env.NODE_ENV !== "production") {
@@ -84,7 +90,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	}
 	const normalized = normalizeRscRequest(request, options.basePath);
 	if (normalized instanceof Response) return normalized;
-	const { url, isRscRequest, interceptionContextHeader, mountedSlotsHeader, renderMode } = normalized;
+	const { url, isRscRequest, interceptionContextHeader, mountedSlotsHeader, renderMode, clientReuseManifest } = normalized;
 	let { pathname, cleanPathname } = normalized;
 	const canonicalPathname = cleanPathname;
 	const basePathState = {
@@ -118,6 +124,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		request
 	});
 	if (rscCacheBustingRedirect) return rscCacheBustingRedirect;
+	const userlandRequest = isRscRequest ? requestWithoutRscCacheBustingSearchParam(request) : request;
 	const middlewareContext = {
 		headers: null,
 		requestHeaders: null,
@@ -132,7 +139,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			isDataRequest,
 			isProxy: options.isMiddlewareProxy,
 			module: options.middlewareModule,
-			request,
+			request: userlandRequest,
 			trailingSlash: options.trailingSlash
 		});
 		if (middlewareResult.kind === "response") return applyConfigHeadersToMiddlewareRedirect(middlewareResult.response, {
@@ -145,11 +152,11 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (middlewareResult.search !== null) url.search = middlewareResult.search;
 	}
 	const scriptNonce = getScriptNonceFromHeaderSources(request.headers, middlewareContext.headers);
-	const postMiddlewareRequestContext = buildPostMwRequestContext(request);
+	const postMiddlewareRequestContext = buildPostMwRequestContext(userlandRequest);
 	const beforeFilesRewrite = await applyRewrite({
 		basePathState,
 		clearRequestContext: options.clearRequestContext,
-		request,
+		request: userlandRequest,
 		requestContext: postMiddlewareRequestContext,
 		rewrites: options.configRewrites.beforeFiles
 	}, matchPathname(cleanPathname));
@@ -217,7 +224,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		const afterFilesRewrite = await applyRewrite({
 			basePathState,
 			clearRequestContext: options.clearRequestContext,
-			request,
+			request: userlandRequest,
 			requestContext: postMiddlewareRequestContext,
 			rewrites: options.configRewrites.afterFiles
 		}, matchPathname(cleanPathname));
@@ -231,7 +238,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		const fallbackRewrite = await applyRewrite({
 			basePathState,
 			clearRequestContext: options.clearRequestContext,
-			request,
+			request: userlandRequest,
 			requestContext: postMiddlewareRequestContext,
 			rewrites: options.configRewrites.fallback
 		}, matchPathname(cleanPathname));
@@ -270,6 +277,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		return notFoundResponse({ headers });
 	}
 	const { route, params } = match;
+	if (options.ensureRouteLoaded) await options.ensureRouteLoaded(route);
 	const prerenderRouteParamsPayload = readTrustedPrerenderRouteParams(request);
 	const prerenderRouteParams = prerenderRouteParamsPayloadMatchesRoute(prerenderRouteParamsPayload, route.pattern, params) ? prerenderRouteParamsPayload.params : null;
 	const renderParams = prerenderRouteParams ?? params;
@@ -292,6 +300,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		});
 	}
 	const pageResponse = await options.dispatchMatchedPage({
+		clientReuseManifest,
 		cleanPathname,
 		formState,
 		actionError,
@@ -348,6 +357,7 @@ function applyProgressiveActionSideEffects(response, sideEffects) {
 }
 function createAppRscHandler(options) {
 	return async function appRscHandler(rawRequest, ctx) {
+		options.registerCacheAdapters();
 		await options.ensureInstrumentation?.();
 		const mwCtx = rawRequest.headers.get(VINEXT_MW_CTX_HEADER);
 		const isDataRequest = rawRequest.headers.get("x-nextjs-data") === "1";
@@ -383,5 +393,3 @@ function createAppRscHandler(options) {
 }
 //#endregion
 export { createAppRscHandler };
-
-//# sourceMappingURL=app-rsc-handler.js.map

package/dist/server/app-rsc-render-mode.d.ts

@@ -8,5 +8,4 @@ declare function shouldSuppressLoadingBoundaries(mode: AppRscRenderMode): boolea
 declare function getRscRenderModeCacheVariant(mode: AppRscRenderMode): string | null;
 declare function parseAppRscRenderMode(value: string | null): AppRscRenderMode;
 //#endregion
-export { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI, APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI, AppRscRenderMode, getRscRenderModeCacheVariant, parseAppRscRenderMode, shouldSuppressLoadingBoundaries };
-//# sourceMappingURL=app-rsc-render-mode.d.ts.map
+export { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI, APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI, AppRscRenderMode, getRscRenderModeCacheVariant, parseAppRscRenderMode, shouldSuppressLoadingBoundaries };

package/dist/server/app-rsc-render-mode.js

@@ -23,5 +23,3 @@ function parseAppRscRenderMode(value) {
 }
 //#endregion
 export { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI, APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI, getRscRenderModeCacheVariant, parseAppRscRenderMode, shouldSuppressLoadingBoundaries };
-
-//# sourceMappingURL=app-rsc-render-mode.js.map

package/dist/server/app-rsc-request-normalization.d.ts

@@ -1,6 +1,6 @@
+import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
-import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";
 
 //#region src/server/app-rsc-request-normalization.d.ts
 type NormalizedRscRequest = {
@@ -10,7 +10,7 @@ type NormalizedRscRequest = {
   isRscRequest: boolean; /** Sanitized X-Vinext-Interception-Context header (null bytes stripped). null when absent. */
   interceptionContextHeader: string | null; /** Normalized x-vinext-mounted-slots header (deduplicated, sorted). null when absent or blank. */
   mountedSlotsHeader: string | null; /** Semantic RSC payload mode. HTML requests always normalize to "navigation". */
-  renderMode: AppRscRenderMode; /** Disabled ClientReuseManifest hint. Never authorizes skip transport in this stage. */
+  renderMode: AppRscRenderMode; /** Parsed ClientReuseManifest hint. Verification and skip authorization happen later. */
   clientReuseManifest: ClientReuseManifestParseResult;
 };
 /**
@@ -38,12 +38,11 @@ type NormalizedRscRequest = {
  *   8. Sanitize X-Vinext-Interception-Context — strip null bytes (header injection)
  *   9. Normalize x-vinext-mounted-slots — dedup and sort for canonical cache keys
  *   10. Read semantic render mode for refresh/action payload rendering
- *   11. Parse disabled ClientReuseManifest hints on canonical RSC payload requests
+ *   11. Parse ClientReuseManifest hints on canonical RSC payload requests
  *
  * @returns A 400 or 404 Response for invalid or out-of-scope inputs,
  *          or a NormalizedRscRequest for valid requests.
  */
 declare function normalizeRscRequest(request: Request, basePath: string): Response | NormalizedRscRequest;
 //#endregion
-export { NormalizedRscRequest, normalizeMountedSlotsHeader, normalizeRscRequest };
-//# sourceMappingURL=app-rsc-request-normalization.d.ts.map
+export { NormalizedRscRequest, normalizeMountedSlotsHeader, normalizeRscRequest };

package/dist/server/app-rsc-request-normalization.js

@@ -7,8 +7,8 @@ import { guardProtocolRelativeUrl } from "./request-pipeline.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION, parseAppRscRenderMode } from "./app-rsc-render-mode.js";
 import { stripRscSuffix } from "./app-rsc-cache-busting.js";
-import { normalizeInterceptionContextHeader } from "./app-interception-context-header.js";
 import { parseClientReuseManifestHeader } from "./client-reuse-manifest.js";
+import { normalizeInterceptionContextHeader } from "./app-interception-context-header.js";
 //#region src/server/app-rsc-request-normalization.ts
 /**
 * Normalize an App Router RSC request.
@@ -35,7 +35,7 @@ import { parseClientReuseManifestHeader } from "./client-reuse-manifest.js";
 *   8. Sanitize X-Vinext-Interception-Context — strip null bytes (header injection)
 *   9. Normalize x-vinext-mounted-slots — dedup and sort for canonical cache keys
 *   10. Read semantic render mode for refresh/action payload rendering
-*   11. Parse disabled ClientReuseManifest hints on canonical RSC payload requests
+*   11. Parse ClientReuseManifest hints on canonical RSC payload requests
 *
 * @returns A 400 or 404 Response for invalid or out-of-scope inputs,
 *          or a NormalizedRscRequest for valid requests.
@@ -73,5 +73,3 @@ function normalizeRscRequest(request, basePath) {
 }
 //#endregion
 export { normalizeMountedSlotsHeader, normalizeRscRequest };
-
-//# sourceMappingURL=app-rsc-request-normalization.js.map

package/dist/server/app-rsc-response-finalizer.d.ts

@@ -34,5 +34,4 @@ type FinalizeAppRscResponseOptions = {
  */
 declare function finalizeAppRscResponse(response: Response, request: Request, options: FinalizeAppRscResponseOptions): Response;
 //#endregion
-export { finalizeAppRscResponse };
-//# sourceMappingURL=app-rsc-response-finalizer.d.ts.map
+export { finalizeAppRscResponse };

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

@@ -5,6 +5,7 @@ import { normalizePath } from "./normalize-path.js";
 import { applyConfigHeadersToResponse } from "./request-pipeline.js";
 import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
 import { normalizeDefaultLocalePathname } from "./pages-i18n.js";
+import { applyCdnResponseHeaders } from "./cache-control.js";
 import { mergeVaryHeader } from "./middleware-response-headers.js";
 //#region src/server/app-rsc-response-finalizer.ts
 /**
@@ -22,6 +23,7 @@ import { mergeVaryHeader } from "./middleware-response-headers.js";
 function finalizeAppRscResponse(response, request, options) {
 	if (response.status >= 300 && response.status < 400) return response;
 	if (!response.headers.has("x-vinext-static-file")) mergeVaryHeader(response.headers, VINEXT_RSC_VARY_HEADER);
+	if (!response.headers.has("Cache-Control")) applyCdnResponseHeaders(response.headers, { cacheControl: "" });
 	if (!options.configHeaders.length) return response;
 	const url = new URL(request.url);
 	let pathname;
@@ -46,5 +48,3 @@ function finalizeAppRscResponse(response, request, options) {
 }
 //#endregion
 export { finalizeAppRscResponse };
-
-//# sourceMappingURL=app-rsc-response-finalizer.js.map

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

@@ -59,5 +59,4 @@ declare function createAppRscRouteMatcher<Route extends AppRscRouteForMatching>(
 };
 declare function matchAppRscRoutePattern(urlParts: string[], patternParts: string[]): AppRscRouteParams | null;
 //#endregion
-export { createAppRscRouteMatcher, matchAppRscRoutePattern };
-//# sourceMappingURL=app-rsc-route-matching.d.ts.map
+export { createAppRscRouteMatcher, matchAppRscRoutePattern };

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

@@ -88,5 +88,3 @@ function mergeMatchedParams(sourceParams, targetParams) {
 }
 //#endregion
 export { createAppRscRouteMatcher, matchAppRscRoutePattern };
-
-//# sourceMappingURL=app-rsc-route-matching.js.map

package/dist/server/app-segment-config.d.ts

@@ -8,10 +8,12 @@ type AppRouteSegmentConfigModule = {
   fetchCache?: unknown;
   revalidate?: unknown;
   runtime?: unknown;
+  unstable_dynamicStaleTime?: unknown;
 };
 type EffectiveAppPageSegmentConfig = {
   dynamicConfig?: AppRouteSegmentDynamic;
   dynamicParamsConfig?: boolean;
+  dynamicStaleTimeSeconds?: number;
   fetchCache?: FetchCacheMode;
   revalidateSeconds: number | null;
   runtime?: "edge" | "experimental-edge" | "nodejs";
@@ -19,6 +21,7 @@ type EffectiveAppPageSegmentConfig = {
 type ResolveAppPageSegmentConfigOptions = {
   layouts?: readonly (AppRouteSegmentConfigModule | null | undefined)[];
   page?: AppRouteSegmentConfigModule | null;
+  parallelPages?: readonly (AppRouteSegmentConfigModule | null | undefined)[];
 };
 /**
  * Resolve the route segment config that applies to an App page route.
@@ -32,5 +35,4 @@ declare function resolveAppPageSegmentConfig(options: ResolveAppPageSegmentConfi
 declare function resolveAppPageFetchCacheMode(options: ResolveAppPageSegmentConfigOptions): FetchCacheMode | null;
 declare function isEdgeRuntime(runtime: string | undefined): boolean;
 //#endregion
-export { isEdgeRuntime, resolveAppPageFetchCacheMode, resolveAppPageSegmentConfig };
-//# sourceMappingURL=app-segment-config.d.ts.map
+export { isEdgeRuntime, resolveAppPageFetchCacheMode, resolveAppPageSegmentConfig };

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

@@ -33,6 +33,10 @@ function resolveRevalidateSeconds(current, value) {
 	if (current === null) return value;
 	return value < current ? value : current;
 }
+function resolveDynamicStaleTimeSeconds(current, value) {
+	if (typeof value !== "number" || !Number.isInteger(value) || value < 0) return current;
+	return current === void 0 ? value : Math.min(current, value);
+}
 function isCacheFetchCacheMode(value) {
 	return value === "default-cache" || value === "force-cache" || value === "only-cache";
 }
@@ -78,6 +82,10 @@ function resolveAppPageSegmentConfig(options) {
 		}
 		config.revalidateSeconds = resolveRevalidateSeconds(config.revalidateSeconds, segment.revalidate);
 	}
+	for (const segment of [options.page, ...options.parallelPages ?? []]) {
+		if (!segment) continue;
+		config.dynamicStaleTimeSeconds = resolveDynamicStaleTimeSeconds(config.dynamicStaleTimeSeconds, segment.unstable_dynamicStaleTime);
+	}
 	if (config.dynamicConfig === "force-dynamic") config.revalidateSeconds = 0;
 	if (config.fetchCache === void 0) {
 		if (config.dynamicConfig === "force-dynamic") config.fetchCache = "force-no-store";
@@ -94,5 +102,3 @@ function isEdgeRuntime(runtime) {
 }
 //#endregion
 export { isEdgeRuntime, resolveAppPageFetchCacheMode, resolveAppPageSegmentConfig };
-
-//# sourceMappingURL=app-segment-config.js.map

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

@@ -128,6 +128,12 @@ type HandleServerActionRscRequestOptions<TElement, TRoute extends AppServerActio
   createRscOnErrorHandler: (request: Request, pathname: string, pattern: string) => (error: unknown) => unknown;
   createTemporaryReferenceSet: () => TTemporaryReferences;
   decodeReply: (body: string | FormData, options: DecodeServerActionReplyOptions<TTemporaryReferences>) => Promise<unknown[]> | unknown[];
+  /**
+   * Hydrate a route's lazy page/route-handler modules before reading
+   * `route.page` / `route.routeHandler` on action redirect targets and
+   * re-render targets obtained via `matchRoute`/`getSourceRoute`. Idempotent.
+   */
+  ensureRouteLoaded?: (route: TRoute) => unknown;
   findIntercept: (pathname: string) => AppServerActionIntercept<TPage> | null;
   getAndClearPendingCookies: () => string[];
   getDraftModeCookieHeader: () => string | null | undefined;
@@ -188,5 +194,4 @@ declare function isProgressiveServerActionRequest(request: Pick<Request, "method
 declare function handleProgressiveServerActionRequest(options: HandleProgressiveServerActionRequestOptions): Promise<Response | ProgressiveServerActionResult | null>;
 declare function handleServerActionRscRequest<TElement, TRoute extends AppServerActionRoute, TInterceptOpts, TTemporaryReferences, TPage = unknown>(options: HandleServerActionRscRequestOptions<TElement, TRoute, TInterceptOpts, TTemporaryReferences, TPage>): Promise<Response | null>;
 //#endregion
-export { HandleProgressiveServerActionRequestOptions, HandleServerActionRscRequestOptions, applyActionRedirectBasePath, handleProgressiveServerActionRequest, handleServerActionRscRequest, isProgressiveServerActionRequest, readActionBodyWithLimit, readActionFormDataWithLimit };
-//# sourceMappingURL=app-server-action-execution.d.ts.map
+export { HandleProgressiveServerActionRequestOptions, HandleServerActionRscRequestOptions, applyActionRedirectBasePath, handleProgressiveServerActionRequest, handleServerActionRscRequest, isProgressiveServerActionRequest, readActionBodyWithLimit, readActionFormDataWithLimit };

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

@@ -1,3 +1,4 @@
+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";
@@ -9,10 +10,10 @@ import { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI } from "./app-rsc-rende
 import { setCurrentFetchCacheMode, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
 import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.js";
 import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
-import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.js";
 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 { deferUntilStreamConsumed } from "./app-page-stream.js";
 import { resolveAppPageActionRerenderTarget } from "./app-page-request.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
@@ -244,12 +245,9 @@ function resolveInternalActionRedirectTarget(redirectUrl, requestUrl, basePath)
 function isAncestorRouteRedirect(targetPathname, currentPathname) {
 	return targetPathname !== "/" && currentPathname.startsWith(`${targetPathname}/`);
 }
-function splitActionRedirectPathname(pathname) {
-	return pathname.split("/").filter(Boolean);
-}
 function isStaleChildSiblingRouteRedirect(targetPathname, currentPathname) {
-	const targetSegments = splitActionRedirectPathname(targetPathname);
-	const currentSegments = splitActionRedirectPathname(currentPathname);
+	const targetSegments = splitPathSegments(targetPathname);
+	const currentSegments = splitPathSegments(currentPathname);
 	if (targetSegments.length === 0 || currentSegments.length <= targetSegments.length) return false;
 	let commonPrefixLength = 0;
 	const maxPrefixLength = Math.min(targetSegments.length, currentSegments.length);
@@ -519,6 +517,7 @@ async function handleServerActionRscRequest(options) {
 			}
 			const targetPathname = stripBasePath(redirectTarget.pathname, options.basePath ?? "");
 			const targetMatch = options.matchRoute(targetPathname);
+			if (targetMatch) await options.ensureRouteLoaded?.(targetMatch.route);
 			if (!targetMatch || !canRenderActionRedirectTarget(targetMatch.route)) {
 				options.clearRequestContext();
 				return new Response(null, {
@@ -527,6 +526,7 @@ async function handleServerActionRscRequest(options) {
 				});
 			}
 			const currentMatch = options.matchRoute(options.cleanPathname);
+			if (currentMatch) await options.ensureRouteLoaded?.(currentMatch.route);
 			const redirectRenderRequest = createActionRedirectRenderRequest({
 				pendingCookies: [...actionPendingCookies, ...actionDraftCookie ? [actionDraftCookie] : []],
 				request: options.request,
@@ -614,6 +614,7 @@ async function handleServerActionRscRequest(options) {
 				searchParams: options.searchParams,
 				params: actionRerenderTarget.navigationParams
 			});
+			await options.ensureRouteLoaded?.(actionRerenderTarget.route);
 			setCurrentFetchCacheMode(options.resolveRouteFetchCacheMode?.(actionRerenderTarget.route) ?? null);
 			setCurrentFetchSoftTags(buildServerActionPageTags(actionRerenderTarget.route, options.cleanPathname));
 			element = options.buildPageElement({
@@ -670,5 +671,3 @@ async function handleServerActionRscRequest(options) {
 }
 //#endregion
 export { applyActionRedirectBasePath, handleProgressiveServerActionRequest, handleServerActionRscRequest, isProgressiveServerActionRequest, readActionBodyWithLimit, readActionFormDataWithLimit };
-
-//# sourceMappingURL=app-server-action-execution.js.map

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

@@ -1,5 +1,6 @@
 import { NavigationContext } from "../shims/navigation.js";
 import { RootParams } from "../shims/root-params.js";
+import { AppSsrRenderResult } from "./app-page-stream.js";
 import { ReactFormState } from "react-dom/client";
 
 //#region src/server/app-ssr-entry.d.ts
@@ -29,15 +30,15 @@ declare function handleSsr(rscStream: ReadableStream<Uint8Array>, navContext: Na
    * SSR head. Undefined or empty disables emission entirely.
    */
   clientTraceMetadata?: readonly string[];
-  rootParams?: RootParams;
+  rootParams?: RootParams; /** Dev-only: original server error to surface in the browser overlay. */
+  initialDevServerError?: unknown;
   /** When true, wait for the full React tree (including Suspense boundaries)
    *  to resolve before returning the HTML stream. Used for static prerender
    *  and ISR cache writes to avoid caching fallback content. */
   waitForAllReady?: boolean;
-}): Promise<ReadableStream<Uint8Array>>;
+}): Promise<AppSsrRenderResult>;
 declare const _default: {
   fetch(request: Request): Promise<Response>;
 };
 //#endregion
-export { FontData, FontPreload, _default as default, handleSsr };
-//# sourceMappingURL=app-ssr-entry.d.ts.map
+export { FontData, FontPreload, _default as default, handleSsr };

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

@@ -4,19 +4,21 @@ import { isOpenRedirectShaped } from "./request-pipeline.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { AppRouterContext } from "../shims/internal/app-router-context.js";
-import { ServerInsertedHTMLContext, appRouterInstance, clearServerInsertedHTML, renderServerInsertedHTML, setNavigationContext, useServerInsertedHTML } from "../shims/navigation.js";
+import { ServerInsertedHTMLContext, appRouterInstance, clearServerInsertedHTML, getBfcacheIdMapContext, renderServerInsertedHTML, setNavigationContext, useServerInsertedHTML } from "../shims/navigation.js";
 import { runWithNavigationContext } from "../shims/navigation-state.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr, safeJsonStringify } from "./html.js";
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
-import { ElementsContext, Slot } from "../shims/slot.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 { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
+import { runWithRootParamsScope } from "../shims/root-params.js";
+import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-browser-state.js";
 import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
 import { createClientReferencePreloader } from "./app-client-reference-preloader.js";
 import { deferUntilStreamConsumed } from "./app-page-stream.js";
-import { runWithRootParamsScope } from "../shims/root-params.js";
-import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
-import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
+import { createInitialDevServerErrorScript } from "./dev-initial-server-error.js";
 import { Fragment, createElement, use } from "react";
 import { renderToReadableStream, renderToStaticMarkup } from "react-dom/server.edge";
 import { createFromReadableStream } from "@vitejs/plugin-rsc/ssr";
@@ -33,6 +35,7 @@ const clientReferencePreloader = createClientReferencePreloader({
 		if (process.env.NODE_ENV !== "production") console.warn("[vinext] failed to preload client ref:", id, error);
 	}
 });
+const BfcacheIdMapContext = getBfcacheIdMapContext();
 function ssrErrorDigest(input) {
 	let hash = 5381;
 	for (let i = input.length - 1; i >= 0; i--) hash = hash * 33 ^ input.charCodeAt(i);
@@ -117,15 +120,20 @@ function buildModulePreloadHtml(bootstrapModuleUrl, nonce) {
 }
 function buildHeadInjectionHtml(navContext, bootstrapModuleUrl, formState, insertedHTML, fontHTML, scriptNonce) {
 	const navPayload = {
-		pathname: navContext?.pathname ?? "/",
-		searchParams: navContext?.searchParams ? [...navContext.searchParams.entries()] : []
+		pathname: navContext.pathname,
+		searchParams: [...navContext.searchParams.entries()]
 	};
-	return createInlineScriptTag(createNavigationRuntimeRscMetadataScript(navContext?.params ?? {}, navPayload), scriptNonce) + (formState === null ? "" : createInlineScriptTag("self[" + safeJsonStringify(RSC_FORM_STATE_GLOBAL) + "]=" + safeJsonStringify(formState), scriptNonce)) + buildModulePreloadHtml(bootstrapModuleUrl, scriptNonce) + insertedHTML + fontHTML;
+	return createInlineScriptTag(createNavigationRuntimeRscMetadataScript(navContext.params, navPayload), scriptNonce) + (formState === null ? "" : createInlineScriptTag("self[" + safeJsonStringify(RSC_FORM_STATE_GLOBAL) + "]=" + safeJsonStringify(formState), scriptNonce)) + buildModulePreloadHtml(bootstrapModuleUrl, scriptNonce) + insertedHTML + fontHTML;
+}
+function requireNavigationContext(navContext) {
+	if (!navContext) throw new Error("App SSR requires navigation context for BFCache state keys");
+	return navContext;
 }
 async function handleSsr(rscStream, navContext, fontData, options) {
 	return runWithNavigationContext(async () => {
+		const ssrNavigationContext = requireNavigationContext(navContext);
 		await clientReferencePreloader.preload();
-		if (navContext) setNavigationContext(navContext);
+		setNavigationContext(ssrNavigationContext);
 		clearServerInsertedHTML();
 		const cleanup = () => {
 			setNavigationContext(null);
@@ -150,7 +158,12 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 					const wireElements = use(flightRoot);
 					const elements = AppElementsWire.decode(wireElements);
 					const metadata = AppElementsWire.readMetadata(elements);
-					return createElement(ElementsContext.Provider, { value: elements }, createElement(Slot, { id: metadata.routeId }));
+					const routeTree = createElement(ElementsContext.Provider, { value: elements }, createElement(Slot, { id: metadata.routeId }));
+					const stateKeyTree = createElement(BfcacheStateKeyMapContext.Provider, { value: createBfcacheSegmentStateKeyMap({
+						elements,
+						pathname: ssrNavigationContext.pathname
+					}) }, routeTree);
+					return BfcacheIdMapContext ? createElement(BfcacheIdMapContext.Provider, { value: createInitialBfcacheIdMap(elements) }, stateKeyTree) : stateKeyTree;
 				}
 				const flightRootElement = createElement(VinextFlightRoot);
 				const root = AppRouterContext ? createElement(AppRouterContext.Provider, { value: appRouterInstance }, flightRootElement) : flightRootElement;
@@ -172,7 +185,6 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 						if (process.env.NODE_ENV === "production" && error) return ssrErrorDigest(getErrorMessage(error) + (error instanceof Error ? error.stack ?? "" : ""));
 					}
 				});
-				if (options?.waitForAllReady === true) await htmlStream.allReady;
 				const inlineCssManifest = globalThis.__VINEXT_INLINE_CSS__;
 				const fontStyles = fontData?.styles ?? [];
 				const mergeFontStylesIntoInlineCss = fontStyles.length > 0 && hasInlineCssManifest(inlineCssManifest);
@@ -188,12 +200,18 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 				const getInsertedHTML = () => {
 					const insertedHTML = renderInsertedHtml(renderServerInsertedHTML());
 					const errorMetaHTML = errorMetaRenderer.flush();
+					const initialDevServerErrorHTML = createInitialDevServerErrorScript(options?.initialDevServerError, options?.scriptNonce);
 					if (didInjectHeadHTML) return insertedHTML + errorMetaHTML;
 					didInjectHeadHTML = true;
-					return buildHeadInjectionHtml(navContext, bootstrapModuleUrl, options?.formState ?? null, insertedHTML + errorMetaHTML + getTraceMetaHTML(), fontHTML, options?.scriptNonce);
+					return buildHeadInjectionHtml(ssrNavigationContext, bootstrapModuleUrl, options?.formState ?? null, insertedHTML + errorMetaHTML + getTraceMetaHTML() + initialDevServerErrorHTML, fontHTML, options?.scriptNonce);
 				};
 				const getBeforeInteractiveHeadHTML = () => renderBeforeInteractiveInlineScripts(beforeInteractiveInlineScripts);
-				return deferUntilStreamConsumed(htmlStream.pipeThrough(createTickBufferedTransform(rscEmbed, getInsertedHTML, getBeforeInteractiveHeadHTML, inlineCssManifest, inlineCssFontStyles, inlineCssFontStyleFallbackHTML, options?.scriptNonce)), cleanup);
+				if (options?.waitForAllReady === true) await htmlStream.allReady;
+				return {
+					htmlStream: deferUntilStreamConsumed(htmlStream.pipeThrough(createTickBufferedTransform(rscEmbed, getInsertedHTML, getBeforeInteractiveHeadHTML, inlineCssManifest, inlineCssFontStyles, inlineCssFontStyleFallbackHTML, options?.scriptNonce)), cleanup),
+					metadataReady: Promise.resolve(),
+					capturedRscData: options?.capturedRscDataRef?.value ?? null
+				};
 			} catch (error) {
 				cleanup();
 				throw error;
@@ -210,5 +228,3 @@ var app_ssr_entry_default = { async fetch(request) {
 } };
 //#endregion
 export { app_ssr_entry_default as default, handleSsr };
-
-//# sourceMappingURL=app-ssr-entry.js.map

package/dist/server/app-ssr-error-meta.d.ts

@@ -10,5 +10,4 @@ type SsrErrorMetaRenderer = {
 declare function renderSsrErrorMetaTags(errors: readonly unknown[], options?: SsrErrorMetaRenderOptions): string;
 declare function createSsrErrorMetaRenderer(options?: SsrErrorMetaRenderOptions): SsrErrorMetaRenderer;
 //#endregion
-export { createSsrErrorMetaRenderer, renderSsrErrorMetaTags };
-//# sourceMappingURL=app-ssr-error-meta.d.ts.map
+export { createSsrErrorMetaRenderer, renderSsrErrorMetaTags };

package/dist/server/app-ssr-error-meta.js

@@ -46,5 +46,3 @@ function createSsrErrorMetaRenderer(options = {}) {
 }
 //#endregion
 export { createSsrErrorMetaRenderer, renderSsrErrorMetaTags };
-
-//# sourceMappingURL=app-ssr-error-meta.js.map

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

@@ -57,5 +57,4 @@ declare function fixPreloadAs(html: string): string;
  */
 declare function createTickBufferedTransform(rscEmbed: RscEmbedTransform, injectHTML?: HtmlInsertion, injectAfterHeadOpenHTML?: HtmlInsertion, inlineCssManifest?: InlineCssManifest, inlineCssPrependCss?: string, inlineCssPrependFallbackHTML?: string, inlineCssScriptNonce?: string): TransformStream<Uint8Array, Uint8Array>;
 //#endregion
-export { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, fixFlightHints, fixPreloadAs, navigationRuntimeRscBootstrapExpression };
-//# sourceMappingURL=app-ssr-stream.d.ts.map
+export { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, fixFlightHints, fixPreloadAs, navigationRuntimeRscBootstrapExpression };

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

@@ -218,6 +218,18 @@ function rewriteInlineCssStylesheetLinks(html, inlineCssManifest, prependCss, ss
 */
 const HEAD_OPEN_RE = /<head\b[^>]*>/;
 /**
+* Final closing tags of the streamed HTML document. We track this suffix
+* separately so we can move it to the very end of the stream — trailing flight
+* chunks and preinit scripts emitted by `rscEmbed.finalize()` are appended in
+* `flush()`, which would otherwise land them after `</body></html>` and break
+* any consumer that asserts the document terminates with a well-formed close.
+*
+* Ported from Next.js: packages/next/src/server/stream-utils/node-web-streams-helper.ts
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/server/stream-utils/node-web-streams-helper.ts
+* (see `createMoveSuffixStream` and `CLOSE_TAG`)
+*/
+const DOCUMENT_CLOSE_SUFFIX = "</body></html>";
+/**
 * Create the tick-buffered HTML transform that injects RSC scripts between
 * React Fizz flush cycles without corrupting split HTML chunks.
 *
@@ -250,10 +262,26 @@ function createTickBufferedTransform(rscEmbed, injectHTML = "", injectAfterHeadO
 	const insertsPerFlush = typeof injectHTML === "function";
 	let injected = false;
 	let preHeadInjected = false;
+	let suffixStripped = false;
 	let buffered = [];
 	let pendingHtml = "";
 	let timeoutId = null;
 	const hasInlineCssManifest = inlineCssManifest !== void 0 && Object.keys(inlineCssManifest).length > 0;
+	/**
+	* Strip the first occurrence of `</body></html>` from `chunk` so it can be
+	* re-emitted at the very end of the stream. Returns the rewritten chunk and
+	* a flag indicating whether a suffix was found. If `suffixStripped` is
+	* already true (i.e. an earlier chunk contained the suffix), this is a
+	* no-op — additional matches in later chunks shouldn't happen in practice,
+	* but we leave them alone to avoid corrupting unexpected output.
+	*/
+	const stripDocumentCloseSuffix = (chunk) => {
+		if (suffixStripped) return chunk;
+		const index = chunk.indexOf(DOCUMENT_CLOSE_SUFFIX);
+		if (index === -1) return chunk;
+		suffixStripped = true;
+		return chunk.slice(0, index) + chunk.slice(index + 14);
+	};
 	const readInsertion = () => typeof injectHTML === "function" ? injectHTML() : injectHTML;
 	const readPreHeadInsertion = () => typeof injectAfterHeadOpenHTML === "function" ? injectAfterHeadOpenHTML() : injectAfterHeadOpenHTML;
 	const readInlineCssPrependFallback = () => {
@@ -328,12 +356,13 @@ function createTickBufferedTransform(rscEmbed, injectHTML = "", injectAfterHeadO
 			const headEnd = working.indexOf("</head>");
 			if (headEnd !== -1) {
 				const before = working.slice(0, headEnd);
-				const after = working.slice(headEnd);
+				const after = stripDocumentCloseSuffix(working.slice(headEnd));
 				controller.enqueue(encoder.encode(before + readInlineCssPrependFallback() + readInsertion() + after));
 				injected = true;
 				return;
 			}
 		}
+		working = stripDocumentCloseSuffix(working);
 		controller.enqueue(encoder.encode(working));
 	};
 	return new TransformStream({
@@ -363,10 +392,9 @@ function createTickBufferedTransform(rscEmbed, injectHTML = "", injectAfterHeadO
 			} else if (insertsPerFlush) emitInsertion(controller);
 			const finalScripts = await rscEmbed.finalize();
 			if (finalScripts) controller.enqueue(encoder.encode(finalScripts));
+			controller.enqueue(encoder.encode(DOCUMENT_CLOSE_SUFFIX));
 		}
 	});
 }
 //#endregion
 export { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, fixFlightHints, fixPreloadAs, navigationRuntimeRscBootstrapExpression };
-
-//# sourceMappingURL=app-ssr-stream.js.map

package/dist/server/app-static-generation.d.ts

@@ -12,5 +12,4 @@ declare function getAppPageStaticGenerationErrorMessage(): string;
 declare function getAppRouteStaticGenerationErrorMessage(routePattern?: string, expression?: string): string;
 declare function createStaticGenerationHeadersContext(options: CreateStaticGenerationHeadersContextOptions): HeadersContext;
 //#endregion
-export { createStaticGenerationHeadersContext, getAppPageStaticGenerationErrorMessage, getAppRouteStaticGenerationErrorMessage };
-//# sourceMappingURL=app-static-generation.d.ts.map
+export { createStaticGenerationHeadersContext, getAppPageStaticGenerationErrorMessage, getAppRouteStaticGenerationErrorMessage };

package/dist/server/app-static-generation.js

@@ -17,5 +17,3 @@ function createStaticGenerationHeadersContext(options) {
 }
 //#endregion
 export { createStaticGenerationHeadersContext, getAppPageStaticGenerationErrorMessage, getAppRouteStaticGenerationErrorMessage };
-
-//# sourceMappingURL=app-static-generation.js.map