vinext 1.4.4 → 1.4.5

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

@@ -1,18 +1,17 @@
-import { MetadataFileRoute } from "./metadata-routes.js";
-import { AppElements } from "./app-elements-wire.js";
-import "./app-elements.js";
-import { NavigationContext } from "../shims/navigation-context-state.js";
 import "../shims/navigation.js";
+import { NavigationContext } from "../shims/navigation-context-state.js";
 import { AppPageParams } from "./app-page-boundary.js";
+import { AppElements } from "./app-elements-wire.js";
+import { AppPageBoundaryRoute } from "./app-page-boundary-render.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
+import { AppPageSsrHandler } from "./app-page-stream.js";
+import { MetadataFileRoute } from "./metadata-routes.js";
+import "./app-elements.js";
 import { AppPageFallbackRouteHead, ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
 import { AppPageInterceptOptions } from "./app-page-element-builder.js";
-import { AppPageSsrHandler } from "./app-page-stream.js";
 import { AppRenderErrorContextOverrides } from "./app-rsc-error-handler.js";
-import { AppPageBoundaryRoute } from "./app-page-boundary-render.js";
 import { ReactNode } from "react";
-//#region src/server/app-fallback-renderer.d.ts
 type AppPageComponent = import("react").ComponentType<any>;
 type AppPageModule = Record<string, unknown> & {
   default?: AppPageComponent | null | undefined;
@@ -40,6 +39,10 @@ type AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> =
   globalErrorModule?: TModule | null;
   /** Whether experimental.globalNotFound is enabled for route-miss 404s. */
   globalNotFoundEnabled?: boolean;
+  /** Whether the app has a root `app/layout`, rather than only route-group root layouts. */
+  hasAppRootLayout?: boolean;
+  /** `app/not-found` in an app without `app/layout`, which renders in a default layout. */
+  appNotFoundModule?: TModule | null;
   /**
    * Loader for the user's `app/global-not-found.tsx` module. When provided,
    * route-miss 404s render this module as a standalone document (skipping the
@@ -110,5 +113,4 @@ type AppFallbackRenderer<TModule extends AppPageModule = AppPageModule> = {
   renderNotFound: (route: AppPageBoundaryRoute<TModule> | null, isRscRequest: boolean, request: Request, matchedParams: AppPageParams | undefined, scriptNonce: string | undefined, middlewareContext: AppPageMiddlewareContext, callContext?: AppFallbackRendererCallContext) => Promise<Response | null>;
 };
 export declare function createAppFallbackRenderer<TModule extends AppPageModule>(options: AppFallbackRendererOptions<TModule>): AppFallbackRenderer<TModule>;
-//#endregion
 export {};

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

@@ -1,18 +1,19 @@
-import { runOutsideRequestScopes } from "../shims/internal/als-registry.js";
-import { shareIsolatePromise } from "./isolate-shared-promise.js";
 import { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback } from "./app-page-boundary-render.js";
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
-import { DEFAULT_GLOBAL_NOT_FOUND_MODULE } from "./default-global-not-found-module.js";
+import { DEFAULT_GLOBAL_NOT_FOUND_MODULE, withDefaultLayout } from "./default-global-not-found-module.js";
 import { DEFAULT_NOT_FOUND_MODULE } from "./default-http-access-fallback-modules.js";
+import { shareIsolatePromise } from "./isolate-shared-promise.js";
 import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
-//#region src/server/app-fallback-renderer.ts
+import { runOutsideRequestScopes } from "../shims/internal/als-registry.js";
+// src/server/app-fallback-renderer.ts
 const EMPTY_MW_CTX = {
 	headers: null,
 	status: null
 };
 function createAppFallbackRenderer(options) {
-	const { applyFileBasedMetadata, basePath = "", htmlLimitedBots, clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getAndClearPendingCookies, getNavigationContext, globalErrorModule, globalNotFoundEnabled = false, loadGlobalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader, trailingSlash } = options;
+	const { applyFileBasedMetadata, basePath = "", htmlLimitedBots, clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getAndClearPendingCookies, getNavigationContext, globalErrorModule, globalNotFoundEnabled = false, appNotFoundModule = null, hasAppRootLayout = true, loadGlobalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader, trailingSlash } = options;
 	const { rootForbiddenModule, rootLayouts, rootNotFoundModule, rootUnauthorizedModule } = rootBoundaries;
+	const standaloneAppNotFoundModule = appNotFoundModule && withDefaultLayout(appNotFoundModule);
 	const effectiveGlobalErrorModule = globalErrorModule ?? DEFAULT_GLOBAL_ERROR_MODULE;
 	const effectiveRootNotFoundModule = rootNotFoundModule ?? DEFAULT_NOT_FOUND_MODULE;
 	let globalNotFoundModulePromise = null;
@@ -25,6 +26,7 @@ function createAppFallbackRenderer(options) {
 		async renderHttpAccessFallback(route, statusCode, isRscRequest, request, opts, scriptNonce, middlewareContext, callContext) {
 			const serveStreamingMetadata = shouldServeStreamingMetadata(request.headers.get("user-agent") ?? "", htmlLimitedBots);
 			const useGlobalNotFound = statusCode === 404 && globalNotFoundEnabled && !route && !opts?.boundaryComponent;
+			const useStandaloneNotFound = useGlobalNotFound || statusCode === 404 && !route && !hasAppRootLayout && !opts?.boundaryComponent;
 			if (useGlobalNotFound && loadGlobalNotFoundModule) {
 				const globalNotFoundModule = await resolveGlobalNotFoundModule();
 				const globalNotFoundComponent = globalNotFoundModule?.default ?? null;
@@ -68,7 +70,7 @@ function createAppFallbackRenderer(options) {
 					statusCode
 				});
 			}
-			const routeMissRootNotFoundModule = useGlobalNotFound ? DEFAULT_GLOBAL_NOT_FOUND_MODULE : effectiveRootNotFoundModule;
+			const routeMissRootNotFoundModule = useStandaloneNotFound ? (useGlobalNotFound ? null : standaloneAppNotFoundModule) ?? DEFAULT_GLOBAL_NOT_FOUND_MODULE : effectiveRootNotFoundModule;
 			return renderAppPageHttpAccessFallback({
 				applyFileBasedMetadata,
 				basePath,
@@ -87,12 +89,12 @@ function createAppFallbackRenderer(options) {
 				getNavigationContext,
 				globalErrorModule: effectiveGlobalErrorModule,
 				headBoundaryModule: opts?.headBoundaryModule ?? null,
-				headLayoutModules: useGlobalNotFound ? [] : opts?.headLayouts ?? null,
+				headLayoutModules: useStandaloneNotFound ? [] : opts?.headLayouts ?? null,
 				intercept: opts?.intercept ?? null,
 				isCacheCandidate: opts?.isCacheCandidate,
 				isEdgeRuntime: callContext?.isEdgeRuntime,
 				isRscRequest,
-				layoutModules: useGlobalNotFound ? [] : opts?.layouts ?? null,
+				layoutModules: useStandaloneNotFound ? [] : opts?.layouts ?? null,
 				loadSsrHandler: ssrLoader,
 				makeThenableParams,
 				matchedParams: opts?.matchedParams ?? route?.params ?? {},
@@ -102,10 +104,11 @@ function createAppFallbackRenderer(options) {
 				requestUrl: request.url,
 				resolveChildSegments,
 				rootForbiddenModule,
-				rootLayouts: useGlobalNotFound ? [] : rootLayouts,
+				rootLayouts: useStandaloneNotFound ? [] : rootLayouts,
+				rootLayoutTreePath: useStandaloneNotFound && !hasAppRootLayout ? "/" : null,
 				rootNotFoundModule: routeMissRootNotFoundModule,
 				rootUnauthorizedModule,
-				route: useGlobalNotFound ? null : route,
+				route: useStandaloneNotFound ? null : route,
 				routeHead: opts?.routeHead ?? null,
 				routePathname: callContext?.routePathname,
 				renderToReadableStream: rscRenderer,
@@ -157,5 +160,4 @@ function createAppFallbackRenderer(options) {
 		}
 	};
 }
-//#endregion
 export { createAppFallbackRenderer };

package/dist/server/app-fetch-tracing.d.ts

@@ -1,5 +1,4 @@
 import { FrameworkSpan } from "./framework-tracer.js";
-//#region src/server/app-fetch-tracing.d.ts
 export declare function createAppFetchSpanDescriptor(input: string | URL | Request, init?: RequestInit): {
   readonly attributes: {
     readonly "http.method": string;
@@ -11,5 +10,4 @@ export declare function createAppFetchSpanDescriptor(input: string | URL | Reque
   readonly name: string;
   readonly type: "AppRender.fetch";
 };
-export declare function traceAppFetch(input: string | URL | Request, init: RequestInit | undefined, callback: (span?: FrameworkSpan) => Promise<Response>): Promise<Response>;
-//#endregion
+export declare function traceAppFetch(input: string | URL | Request, init: RequestInit | undefined, callback: (span?: FrameworkSpan) => Promise<Response>): Promise<Response>;

package/dist/server/app-fetch-tracing.js

@@ -1,5 +1,5 @@
 import { frameworkTracer } from "./tracer.js";
-//#region src/server/app-fetch-tracing.ts
+// src/server/app-fetch-tracing.ts
 function createAppFetchSpanDescriptor(input, init) {
 	let url;
 	try {
@@ -34,5 +34,4 @@ function traceAppFetch(input, init, callback) {
 		return response;
 	});
 }
-//#endregion
 export { createAppFetchSpanDescriptor, traceAppFetch };

package/dist/server/app-history-state.d.ts

@@ -1,5 +1,4 @@
 import { TraverseDirection } from "./navigation-planner.js";
-//#region src/server/app-history-state.d.ts
 type HistoryStateRecord = {
   [key: string]: unknown;
 };
@@ -104,5 +103,4 @@ export declare function resolveHistoryTraversalIntent(options: {
   currentHistoryIndex: number | null;
   historyState: unknown;
 }): HistoryTraversalIntent;
-//#endregion
 export {};

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

@@ -1,8 +1,8 @@
-import { isNonNegativeSafeInteger } from "../utils/number.js";
-import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { isBfcacheSegmentId } from "./app-bfcache-id.js";
-//#region src/server/app-history-state.ts
+import { AppElementsWire } from "./app-elements-wire.js";
+import { isNonNegativeSafeInteger } from "../utils/number.js";
+import { isBfcacheSegmentId } from "./app-bfcache-identity.js";
+// src/server/app-history-state.ts
 const VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY = "__vinext_previousNextUrl";
 const VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY = "__vinext_historyIndex";
 const VINEXT_BFCACHE_IDS_HISTORY_STATE_KEY = "__vinext_bfcacheIds";
@@ -318,5 +318,4 @@ function resolveHistoryTraversalIntent(options) {
 		targetHistoryIndex
 	};
 }
-//#endregion
 export { HistoryStateSnapshotCache, RestorableClientStateController, clearHistoryStateTreeSnapshotId, createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotClaim, createHistoryStateWithTreeSnapshotId, isAppOwnedHistoryState, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, isHistoryStateTreeSnapshotClaimed, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, readHistoryStateTreeSnapshotId, resolveActiveRoutePaths, resolveHistoryTraversalIntent };

package/dist/server/app-hook-warning-suppression.d.ts

@@ -1,4 +1,2 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-//#region src/server/app-hook-warning-suppression.d.ts
-export declare const suppressHookWarningAls: AsyncLocalStorage<boolean>;
-//#endregion
+export declare const suppressHookWarningAls: AsyncLocalStorage<boolean>;

package/dist/server/app-hook-warning-suppression.js

@@ -1,10 +1,9 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-//#region src/server/app-hook-warning-suppression.ts
+// src/server/app-hook-warning-suppression.ts
 const suppressHookWarningAls = new AsyncLocalStorage();
 const _origConsoleError = console.error;
 console.error = (...args) => {
 	if (suppressHookWarningAls.getStore() === true && typeof args[0] === "string" && args[0].includes("Invalid hook call")) return;
 	_origConsoleError.apply(console, args);
 };
-//#endregion
 export { suppressHookWarningAls };

package/dist/server/app-hydration-cache-publication.d.ts

@@ -1,4 +1,3 @@
-//#region src/server/app-hydration-cache-publication.d.ts
 export type HydrationCachePublication = {
   commit(): void;
   complete(): void;
@@ -6,5 +5,4 @@ export type HydrationCachePublication = {
   invalidate(): void;
   publish(publishCandidate: () => () => void): void;
 };
-export declare function createHydrationCachePublication(): HydrationCachePublication;
-//#endregion
+export declare function createHydrationCachePublication(): HydrationCachePublication;

package/dist/server/app-hydration-cache-publication.js

@@ -1,4 +1,4 @@
-//#region src/server/app-hydration-cache-publication.ts
+// src/server/app-hydration-cache-publication.ts
 function createHydrationCachePublication() {
 	let state = "pending";
 	let pendingPublication = null;
@@ -39,5 +39,4 @@ function createHydrationCachePublication() {
 		}
 	};
 }
-//#endregion
 export { createHydrationCachePublication };

package/dist/server/app-inline-css-client.d.ts

@@ -1,6 +1,4 @@
-//#region src/server/app-inline-css-client.d.ts
 type InlineCssStylesheetLinkElement = Pick<HTMLLinkElement, "getAttribute" | "hasAttribute">;
 export declare function isInlineCssStylesheetLinkElement(link: InlineCssStylesheetLinkElement): boolean;
 export declare function removeStylesheetLinksCoveredByInlineCss(): void;
-//#endregion
 export {};

package/dist/server/app-inline-css-client.js

@@ -1,5 +1,5 @@
 import { htmlTokenListContains } from "./html.js";
-//#region src/server/app-inline-css-client.ts
+// src/server/app-inline-css-client.ts
 function inlineStyleCoversStylesheetHref(styleHref, linkHref) {
 	for (const candidate of styleHref.split(/\s+/)) {
 		if (candidate === linkHref) return true;
@@ -31,5 +31,4 @@ function removeStylesheetLinksCoveredByInlineCss() {
 		}
 	}
 }
-//#endregion
 export { isInlineCssStylesheetLinkElement, removeStylesheetLinksCoveredByInlineCss };

package/dist/server/app-interception-context-header.d.ts

@@ -1,4 +1,3 @@
-//#region src/server/app-interception-context-header.d.ts
 /**
  * Normalize the `x-vinext-interception-context` header from inbound requests.
  *
@@ -27,5 +26,4 @@
  * an absent header. This is intentionally more permissive than rejecting the
  * whole request — interception is a progressive enhancement.
  */
-export declare function normalizeInterceptionContextHeader(raw: string | null | undefined): string | null;
-//#endregion
+export declare function normalizeInterceptionContextHeader(raw: string | null | undefined): string | null;

package/dist/server/app-interception-context-header.js

@@ -1,4 +1,4 @@
-//#region src/server/app-interception-context-header.ts
+// src/server/app-interception-context-header.ts
 /**
 * Normalize the `x-vinext-interception-context` header from inbound requests.
 *
@@ -38,5 +38,4 @@ function normalizeInterceptionContextHeader(raw) {
 	if (/\s/.test(stripped)) return null;
 	return stripped;
 }
-//#endregion
 export { normalizeInterceptionContextHeader };

package/dist/server/app-metadata-tracing.d.ts

@@ -1,4 +1,3 @@
-//#region src/server/app-metadata-tracing.d.ts
 type AppMetadataModuleType = "forbidden" | "layout" | "not-found" | "page" | "unauthorized";
 export declare function createAppMetadataModuleRoute(routeSegments: readonly string[], moduleType: AppMetadataModuleType): string;
 export declare function traceGenerateMetadata<T>(moduleRoute: string, callback: () => T): T;
@@ -9,5 +8,4 @@ export declare function createGenerateMetadataSpanDescriptor(moduleRoute: string
   readonly name: `generateMetadata ${string}`;
   readonly type: "ResolveMetadata.generateMetadata";
 };
-//#endregion
 export {};

package/dist/server/app-metadata-tracing.js

@@ -1,5 +1,5 @@
 import { frameworkTracer } from "./tracer.js";
-//#region src/server/app-metadata-tracing.ts
+// src/server/app-metadata-tracing.ts
 function createAppMetadataModuleRoute(routeSegments, moduleType) {
 	return `/${[...routeSegments.filter((segment) => !segment.startsWith("@")), moduleType].join("/")}`;
 }
@@ -13,5 +13,4 @@ function createGenerateMetadataSpanDescriptor(moduleRoute) {
 		type: "ResolveMetadata.generateMetadata"
 	};
 }
-//#endregion
 export { createAppMetadataModuleRoute, createGenerateMetadataSpanDescriptor, traceGenerateMetadata };

package/dist/server/app-middleware.d.ts

@@ -1,7 +1,6 @@
 import { NextI18nConfig } from "../config/next-config.js";
 import { MiddlewareModule } from "./middleware-runtime.js";
 import { FLIGHT_HEADERS } from "./headers.js";
-//#region src/server/app-middleware.d.ts
 export type AppMiddlewareContext = {
   headers: Headers | null;
   requestHeaders: Headers | null;
@@ -74,5 +73,4 @@ export declare function isExternalMiddlewareRewrite(rewriteUrl: string, request:
 export declare function requestWithMiddlewareContextHeaders(request: Request, context: AppMiddlewareContext): Request;
 export declare function proxyExternalMiddlewareRewrite(request: Request, rewriteUrl: string, context: AppMiddlewareContext): Promise<Response>;
 export declare function applyAppMiddleware(options: ApplyAppMiddlewareOptions): Promise<ApplyAppMiddlewareResult>;
-//#endregion
 export { FLIGHT_HEADERS };

package/dist/server/app-middleware.js

@@ -1,14 +1,14 @@
 import { VINEXT_MW_CTX_HEADER } from "../utils/protocol-headers.js";
-import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { isExternalUrl } from "../utils/external-url.js";
-import { FLIGHT_HEADERS } from "./headers.js";
-import { internalServerErrorResponse } from "./http-error-responses.js";
-import { cloneRequestWithHeaders, processMiddlewareHeaders } from "./request-pipeline.js";
-import { executeMiddleware } from "./middleware-runtime.js";
 import { applyMiddlewareRequestHeaders, setHeadersContext } from "../shims/headers.js";
-import { mergeMiddlewareResponseHeaders, withExternalRewriteResponseHeaders } from "./middleware-response-headers.js";
 import { setNavigationContext } from "../shims/navigation-context-accessors.js";
-//#region src/server/app-middleware.ts
+import { FLIGHT_HEADERS } from "./headers.js";
+import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
+import { mergeMiddlewareResponseHeaders, withExternalRewriteResponseHeaders } from "./middleware-response-headers.js";
+import { executeMiddleware } from "./middleware-runtime.js";
+import { cloneRequestWithHeaders, processMiddlewareHeaders } from "./request-pipeline.js";
+import { internalServerErrorResponse } from "./http-error-responses.js";
+// src/server/app-middleware.ts
 const FLIGHT_HEADER_SET = new Set(FLIGHT_HEADERS);
 function isForwardedMiddlewareContext(value) {
 	return !!value && typeof value === "object";
@@ -275,5 +275,4 @@ async function applyAppMiddleware(options) {
 		search
 	};
 }
-//#endregion
 export { FLIGHT_HEADERS, applyAppMiddleware, isExternalMiddlewareRewrite, proxyExternalMiddlewareRewrite, requestWithMiddlewareContextHeaders };

package/dist/server/app-mounted-layouts.d.ts

@@ -1,6 +1,5 @@
 import { AppElements } from "./app-elements-wire.js";
 import "./app-elements.js";
-//#region src/server/app-mounted-layouts.d.ts
 export declare function hashMountedLayoutIdentity(identity: string): string;
 export declare function parseMountedLayoutsHeader(value: string | null): ReadonlySet<string> | null;
 /**
@@ -17,5 +16,4 @@ export declare function createMountedLayoutsHeader(elements: AppElements, layout
 export declare function holdsSkippedLayouts(current: {
   elements: AppElements;
   layoutIds: readonly string[];
-}, next: AppElements): boolean;
-//#endregion
+}, next: AppElements): boolean;

package/dist/server/app-mounted-layouts.js

@@ -1,7 +1,7 @@
 import { fnv1a64 } from "../utils/hash.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
-//#region src/server/app-mounted-layouts.ts
+// src/server/app-mounted-layouts.ts
 /**
 * A client navigation names the layouts it already holds, so a render that's
 * never stored can leave them out, as Next.js leaves out the segments above
@@ -63,5 +63,4 @@ function holdsSkippedLayouts(current, next) {
 	}
 	return true;
 }
-//#endregion
 export { createMountedLayoutsHeader, hashMountedLayoutIdentity, holdsSkippedLayouts, parseMountedLayoutsHeader };

package/dist/server/app-mounted-slots-header.d.ts

@@ -1,4 +1,3 @@
-//#region src/server/app-mounted-slots-header.d.ts
 /**
  * Normalize the `x-vinext-mounted-slots` header for request handling and cache keying.
  *
@@ -30,5 +29,4 @@
  *   - app-elements (outgoing x-vinext-mounted-slots construction)
  *   - isr-cache (RSC cache key generation)
  */
-export declare function normalizeMountedSlotsHeader(raw: string | null | undefined): string | null;
-//#endregion
+export declare function normalizeMountedSlotsHeader(raw: string | null | undefined): string | null;

package/dist/server/app-mounted-slots-header.js

@@ -1,5 +1,5 @@
 import { isAppElementsWireSlotId } from "./app-elements-wire-key.js";
-//#region src/server/app-mounted-slots-header.ts
+// src/server/app-mounted-slots-header.ts
 /**
 * Normalize the `x-vinext-mounted-slots` header for request handling and cache keying.
 *
@@ -54,5 +54,4 @@ function normalizeMountedSlotsHeader(raw) {
 	if (validTokens.length === 0) return null;
 	return Array.from(new Set(validTokens)).sort().slice(0, MAX_SLOT_TOKENS).join(" ") || null;
 }
-//#endregion
 export { normalizeMountedSlotsHeader };

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

@@ -1,8 +1,7 @@
-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 { BrowserRouteManifest, BrowserRouteManifestRoute } from "../routing/browser-route-manifest.js";
 import "./app-elements.js";
-import { OptimisticRouteTrieMatch } from "../routing/optimistic-route-trie.js";
-//#region src/server/app-optimistic-routing.d.ts
 type OptimisticRouteMatch = OptimisticRouteTrieMatch<BrowserRouteManifestRoute>;
 export type OptimisticRouteTemplate = {
   elements: AppElements;
@@ -119,5 +118,4 @@ export declare function createOptimisticRouteTemplateStore(): {
   learn(sourceKey: string, learnTemplate: () => Promise<LearnedOptimisticRouteTemplate | null>): Promise<void>;
   pendingLearning(): Promise<void>[];
 };
-//#endregion
 export {};

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

@@ -1,15 +1,15 @@
 import { isUnknownRecord } from "../utils/record.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 { stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
+import { extractRawRoutePatternParams, matchRoutePattern } from "../routing/route-pattern.js";
+import { createNestedBfcacheSlotSegmentId, deriveBfcacheSegmentIdentity, isNestedBfcacheSlotSegmentId } from "./bfcache-identity.js";
 import { APP_BFCACHE_SEGMENT_IDENTITIES_KEY, AppElementsWire } from "./app-elements-wire.js";
+import { stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { setOptimisticStateKeyRebinder } from "./app-elements.js";
-import { createNestedBfcacheSlotSegmentId, deriveBfcacheSegmentIdentity, isNestedBfcacheSlotSegmentId } from "./bfcache-identity.js";
 import { APP_PAGE_DEFAULT_SEGMENT_KEY, APP_PAGE_SEGMENT_KEY, canonicalizeAppPageParams, createAppPageSegmentStateKeyRebinder, resolveAppPagePatternStateKey, resolveAppPageSemanticSegmentStateKey } from "./app-page-segment-state.js";
 import { Suspense, createElement, isValidElement } from "react";
-//#region src/server/app-optimistic-routing.ts
+// src/server/app-optimistic-routing.ts
 const routeTrieCache = /* @__PURE__ */ new WeakMap();
 const OPTIMISTIC_ROUTE_SEGMENT_SUSPENSE_TRIGGER = new Promise(() => {});
 function getOptimisticRouteTemplateKey(options) {
@@ -371,5 +371,4 @@ function createOptimisticRouteTemplateStore() {
 		}
 	};
 }
-//#endregion
 export { canCommitOptimisticRouteTemplate, createOptimisticRouteElements, createOptimisticRouteTemplate, createOptimisticRouteTemplateStore, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, keepOptimisticStreamingMetadata, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationParamsForHref, resolveOptimisticNavigationPayload };

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

@@ -1,18 +1,17 @@
-import { MetadataFileRoute } from "./metadata-routes.js";
-import { AppElements } from "./app-elements-wire.js";
-import "./app-elements.js";
-import { NavigationContext } from "../shims/navigation-context-state.js";
 import "../shims/navigation.js";
-import { AppPageParams } from "./app-page-boundary.js";
+import { NavigationContext } from "../shims/navigation-context-state.js";
 import { AppPageFontPreload } from "./app-page-execution.js";
+import { AppElements } from "./app-elements-wire.js";
 import { AppPageMiddlewareContext } from "./app-page-response.js";
+import { MetadataFileRoute } from "./metadata-routes.js";
 import { AppPageFallbackRouteHead, ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
-import { AppPageRouteWiringRoute } from "./app-page-route-wiring.js";
 import { AppPageInterceptOptions } from "./app-page-element-builder.js";
+import { AppPageParams } from "./app-page-boundary.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
+import "./app-elements.js";
+import { AppPageRouteWiringRoute } from "./app-page-route-wiring.js";
 import { AppRenderErrorContextOverrides } from "./app-rsc-error-handler.js";
 import { ComponentType, ReactNode } from "react";
-//#region src/server/app-page-boundary-render.d.ts
 type AppPageComponent = ComponentType<any>;
 type AppPageModule = Record<string, unknown> & {
   default?: AppPageComponent | null | undefined;
@@ -90,6 +89,8 @@ type AppPageBoundaryRenderCommonOptions<TModule extends AppPageModule = AppPageM
   requestUrl: string;
   resolveChildSegments: (routeSegments: readonly string[], treePosition: number, params: AppPageParams) => string[];
   rootLayouts: readonly (TModule | null | undefined)[];
+  /** The tree path of a root layout the document renders outside `layoutModules`. */
+  rootLayoutTreePath?: string | null;
   scriptNonce?: string;
   sourcePageSegments?: readonly string[] | null;
 };
@@ -133,5 +134,4 @@ type RenderAppPageErrorBoundaryOptions<TModule extends AppPageModule = AppPageMo
 } & AppPageBoundaryRenderCommonOptions<TModule>;
 export declare function renderAppPageHttpAccessFallback<TModule extends AppPageModule>(options: RenderAppPageHttpAccessFallbackOptions<TModule>): Promise<Response | null>;
 export declare function renderAppPageErrorBoundary<TModule extends AppPageModule>(options: RenderAppPageErrorBoundaryOptions<TModule>): Promise<Response | null>;
-//#endregion
 export {};

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

@@ -1,30 +1,30 @@
-import { stripBasePath } from "../utils/base-path.js";
-import { isNavigationSignalError } from "../utils/navigation-signal.js";
-import { NEVER_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
-import { isRenderDynamicLatched, isStaticGenerationAccessError } from "../shims/internal/headers-state.js";
-import { copyLinkHeaderProvenance } from "./app-response-header-provenance.js";
-import { withUseCacheLayoutMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { rewriteClientHookError } from "../shims/client-hook-error.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";
 import { ErrorBoundary, GlobalErrorBoundary, SerializedErrorBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
+import { withUseCacheLayoutMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
-import { buildRscRedirectFlightStream } from "./app-rsc-redirect-flight.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import { isNavigationSignalError } from "../utils/navigation-signal.js";
+import { stripBasePath } from "../utils/base-path.js";
 import { bufferAppPageBinaryStream, buildAppPageSpecialErrorResponse, resolveAppPageSpecialError } from "./app-page-execution.js";
+import { buildRscRedirectFlightStream } from "./app-rsc-redirect-flight.js";
+import { createArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
+import { isRenderDynamicLatched, isStaticGenerationAccessError } from "../shims/internal/headers-state.js";
 import { createAppPageMetadataSearchParamsObserver } from "./app-page-search-params-observation.js";
-import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
 import { hasAppPageDynamicMetadata, prepareAppPageHead, resolveActiveParallelRouteHeadInputs, resolveAppPageHead, resolveInterceptLayoutsBesidePage, slotInterceptKeepsSourceHead } from "./app-page-head.js";
-import { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryModule, wrapAppPageBoundaryElement } from "./app-page-boundary.js";
 import { createRouteNotFoundHeadPlanOptions, recoverAppPageRouteHead, resolveHttpAccessFallbackMetadata, resolveHttpAccessFallbackViewport } from "./app-page-http-access-fallback-metadata.js";
-import "./app-rsc-route-matching.js";
 import { resolveSlotParamOverrides } from "./app-page-navigation-params.js";
+import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
+import "./app-rsc-route-matching.js";
+import { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryModule, wrapAppPageBoundaryElement } from "./app-page-boundary.js";
 import { createAppPageFontData, createAppPageRscErrorTracker, createAppPageSsrErrorHandler, renderAppPageHtmlResponse } from "./app-page-stream.js";
+import "./app-elements.js";
 import { createAppPageLayoutEntries, createAppPageRouteBodyMetadata, createAppPageSourcePage } from "./app-page-route-wiring.js";
+import { NEVER_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
+import { copyLinkHeaderProvenance } from "./app-response-header-provenance.js";
 import { Fragment, Suspense, createElement } from "react";
-//#region src/server/app-page-boundary-render.ts
+// src/server/app-page-boundary-render.ts
 async function AppPageBoundaryStreamedMetadata(props) {
 	return createAppPageRouteBodyMetadata(await props.metadata, props.pathname, "body", props.trailingSlash, props.scriptNonce);
 }
@@ -133,7 +133,7 @@ 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;
+	const rootLayoutTreePath = layoutEntries[0]?.treePath ?? options.rootLayoutTreePath ?? null;
 	return {
 		...AppElementsWire.createMetadataEntries({
 			interceptionContext: null,
@@ -173,6 +173,7 @@ async function renderAppPageBoundaryElementResponse(options) {
 		element: options.element,
 		layoutModules: options.layoutModules,
 		pathname,
+		rootLayoutTreePath: options.rootLayoutTreePath,
 		route: options.route,
 		sourcePageSegments: options.sourcePageSegments
 	});
@@ -638,5 +639,4 @@ async function renderAppPageErrorBoundary(options) {
 		throw renderError;
 	}
 }
-//#endregion
 export { renderAppPageErrorBoundary, renderAppPageHttpAccessFallback };

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

@@ -1,4 +1,3 @@
-//#region src/server/app-page-boundary.d.ts
 export type AppPageParams = Record<string, string | string[]>;
 type ResolveAppPageHttpAccessBoundaryComponentOptions<TModule, TComponent> = {
   getDefaultExport: (module: TModule | null | undefined) => TComponent | null | undefined;
@@ -126,5 +125,4 @@ export declare function resolveAppPageParentHttpAccessBoundary<TModule>(options:
 export declare function resolveAppPageErrorBoundary<TModule, TComponent>(options: ResolveAppPageErrorBoundaryOptions<TModule, TComponent>): ResolveAppPageErrorBoundaryResult<TComponent>;
 export declare function wrapAppPageBoundaryElement<TElement, TLayoutModule, TLayoutComponent, TChildSegments, TGlobalErrorComponent>(options: WrapAppPageBoundaryElementOptions<TElement, TLayoutModule, TLayoutComponent, TChildSegments, TGlobalErrorComponent>): TElement;
 export declare function renderAppPageBoundaryResponse<TElement>(options: RenderAppPageBoundaryResponseOptions<TElement>): Promise<Response>;
-//#endregion
 export {};

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

@@ -1,11 +1,11 @@
 import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
+import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
-import { isAppPageRouteGroupSegment } from "./app-page-segment-state.js";
-import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { resolveAppPageSegmentParams } from "./app-page-params.js";
-//#region src/server/app-page-boundary.ts
+import { isAppPageRouteGroupSegment } from "./app-page-segment-state.js";
+// src/server/app-page-boundary.ts
 function resolveAppPageHttpAccessBoundaryComponent(options) {
 	return options.getDefaultExport(resolveAppPageHttpAccessBoundaryModule({
 		rootForbiddenModule: options.rootForbiddenModule,
@@ -151,5 +151,4 @@ async function renderAppPageBoundaryResponse(options) {
 	}
 	return options.createHtmlResponse(rscStream, options.status);
 }
-//#endregion
 export { renderAppPageBoundaryResponse, resolveAppPageErrorBoundary, resolveAppPageHttpAccessBoundaryComponent, resolveAppPageHttpAccessBoundaryModule, resolveAppPageLayoutHttpAccessBoundary, resolveAppPageParentHttpAccessBoundary, resolveAppPageRootHttpAccessBoundaryTreePosition, wrapAppPageBoundaryElement };

package/dist/server/app-page-cache-finalizer.d.ts

@@ -1,10 +1,9 @@
-import { RenderObservation } from "./cache-proof.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPageRenderObservationState } from "./app-page-render-observation.js";
 import { AppPageCacheSetter } from "./isr-cache.js";
+import { RenderObservation } from "./cache-proof.js";
 import { CdnAppPageDocument } from "../shims/cdn-cache.js";
 import { AppPageRscRenderStatus } from "./app-page-rsc-render-status.js";
-//#region src/server/app-page-cache-finalizer.d.ts
 type AppPageDebugLogger = (event: string, detail: string) => void;
 type AppPageRscCacheKeyBuilder = (pathname: string, mountedSlotsHeader?: string | null, renderMode?: AppRscRenderMode, interceptionContext?: string | null, interceptionId?: string | null) => string;
 type AppPageRequestCacheLife = {
@@ -109,5 +108,4 @@ export declare function finalizeAppPageCacheabilityEvaluationResponse(response:
 export declare function finalizeAppPageHtmlCacheResponse(response: Response, options: FinalizeAppPageHtmlCacheResponseOptions): Response;
 export declare function finalizeAppPageRscCacheResponse(response: Response, options: ScheduleAppPageRscCacheWriteOptions): Response;
 export declare function scheduleAppPageRscCacheWrite(options: ScheduleAppPageRscCacheWriteOptions): boolean;
-//#endregion
 export {};