vinext 1.4.3 → 1.4.5

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 { createArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
-import { AppElementsWire } from "./app-elements-wire.js";
-import "./app-elements.js";
+import { rewriteClientHookError } from "../shims/client-hook-error.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { ErrorBoundary, GlobalErrorBoundary, SerializedErrorBoundary } from "../shims/error-boundary.js";
-import { rewriteClientHookError } from "../shims/client-hook-error.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 {};

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

@@ -1,17 +1,17 @@
-import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
-import { NEXTJS_CACHE_HEADER, VINEXT_CACHE_HEADER } from "./headers.js";
-import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
-import { captureRouteCacheabilityResponsePolicy, deferRouteCacheability, isRouteCacheabilityEvaluation } from "../shims/cacheability-classification.js";
 import { NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, buildRevalidateCacheControl, captureCdnResponsePolicyHeaders, hasExplicitNonCacheableResponsePolicy } from "./cache-control.js";
+import { setCacheStateHeaders } from "./cache-headers.js";
+import { NEXTJS_CACHE_HEADER, VINEXT_CACHE_HEADER } from "./headers.js";
+import { createEmptyAppPageRenderObservationState } from "./app-page-render-observation.js";
 import { buildAppPageCacheValue, isrCacheControl, resolveRouteExpireSeconds } from "./isr-cache.js";
+import { hasQueryInvariantRenderProof } from "./cache-proof.js";
 import { resolveClientStaleTimeSeconds } from "../utils/cache-control-metadata.js";
-import { setCacheStateHeaders } from "./cache-headers.js";
 import { readStreamAsText } from "../utils/text-stream.js";
 import { markFrameworkLinkHeaders } from "./app-response-header-provenance.js";
-import { hasQueryInvariantRenderProof } from "./cache-proof.js";
-import { createEmptyAppPageRenderObservationState } from "./app-page-render-observation.js";
+import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
+import { captureRouteCacheabilityResponsePolicy, deferRouteCacheability, isRouteCacheabilityEvaluation } from "../shims/cacheability-classification.js";
+import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 import { resolveAppPageRscResponseStatus } from "./app-page-rsc-render-status.js";
-//#region src/server/app-page-cache-finalizer.ts
+// src/server/app-page-cache-finalizer.ts
 function applyPendingDynamicCdnHeaders(headers, tags, options = {}) {
 	const cacheable = headers.get("Cache-Control") ?? "";
 	applyCdnResponseHeaders(headers, {
@@ -330,5 +330,4 @@ function scheduleAppPageRscCacheWrite(options) {
 	options.waitUntil?.(cachePromise);
 	return true;
 }
-//#endregion
 export { finalizeAppPageCacheabilityEvaluationResponse, finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse, scheduleAppPageRscCacheWrite };

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

@@ -1,12 +1,11 @@
 import { NavigationContext } from "../shims/navigation-context-state.js";
 import "../shims/navigation.js";
-import { AppPageFontPreload } from "./app-page-execution.js";
 import { RootParams } from "../shims/root-params.js";
-import { AppPageSsrHandler } from "./app-page-stream.js";
-import { createAppPageRenderObservation } from "./app-page-render-observation.js";
 import { CacheControlMetadata } from "../shims/cache-handler.js";
+import { createAppPageRenderObservation } from "./app-page-render-observation.js";
+import { AppPageFontPreload } from "./app-page-execution.js";
+import { AppPageSsrHandler } from "./app-page-stream.js";
 import { ReactNode } from "react";
-//#region src/server/app-page-cache-render.d.ts
 type AppPageRenderableElement = ReactNode | Record<string, ReactNode>;
 type AppPageCacheRoute = {
   pattern: string;
@@ -80,5 +79,4 @@ export type RenderAppPageCacheArtifactsResult = {
  * shell regeneration.
  */
 export declare function renderAppPageCacheArtifacts(options: RenderAppPageCacheArtifactsOptions): Promise<RenderAppPageCacheArtifactsResult>;
-//#endregion
 export {};

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

@@ -1,14 +1,14 @@
 import { isRenderDynamicLatched } from "../shims/internal/headers-state.js";
-import { consumeDynamicUsage, consumeInvalidDynamicUsageError } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife } from "../shims/cache-request-state.js";
+import { consumeDynamicUsage, consumeInvalidDynamicUsageError } from "../shims/headers.js";
 import { getCollectedFetchTags } from "../shims/fetch-cache.js";
-import { readStreamAsText } from "../utils/text-stream.js";
+import { consumeAppPageRenderObservationState, createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope } from "./app-page-render-observation.js";
 import { buildAppPageFontLinkHeader, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
 import { buildAppPageLinkHeader, createAppPageSsrErrorHandler, isAppSsrRenderResult } from "./app-page-stream.js";
-import { recordAppPageRenderError, traceAppPageRender } from "./app-page-tracing.js";
-import { consumeAppPageRenderObservationState, createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope } from "./app-page-render-observation.js";
+import { readStreamAsText } from "../utils/text-stream.js";
 import { buildAppPageTags } from "./implicit-tags.js";
-//#region src/server/app-page-cache-render.ts
+import { recordAppPageRenderError, traceAppPageRender } from "./app-page-tracing.js";
+// src/server/app-page-cache-render.ts
 /**
 * Render an App page element to HTML (and optionally its RSC payload) for cache
 * storage. Combines the RSC stream, SSR handler, observation consumption, and
@@ -145,5 +145,4 @@ async function renderAppPageCacheArtifactsImpl(options, renderSpan) {
 	}
 	return result;
 }
-//#endregion
 export { renderAppPageCacheArtifacts };

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

@@ -1,9 +1,8 @@
-import { RenderObservation } from "./cache-proof.js";
-import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { CacheControlMetadata, CachedAppPageValue } from "../shims/cache-handler.js";
 import { AppPageCacheSetter, ISRCacheEntry } from "./isr-cache.js";
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
+import { RenderObservation } from "./cache-proof.js";
 import { finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse, scheduleAppPageRscCacheWrite } from "./app-page-cache-finalizer.js";
-//#region src/server/app-page-cache.d.ts
 type AppPageDebugLogger = (event: string, detail: string) => void;
 type AppPageCacheGetter = (key: string) => Promise<ISRCacheEntry | null>;
 type AppPageBackgroundRegenerator = (key: string, renderFn: () => Promise<void>) => void;
@@ -116,5 +115,4 @@ export declare function buildAppRouteCacheTags(pathname: string, extraTags: read
 export declare function buildAppPageCachedResponse(cachedValue: CachedAppPageValue, options: BuildAppPageCachedResponseOptions): Response | null;
 export declare function readAppPageCacheResponse(options: ReadAppPageCacheResponseOptions): Promise<Response | null>;
 export declare function readAppPageFallbackShellCacheResponse(options: ReadAppPageFallbackShellCacheResponseOptions): Promise<Response | null>;
-//#endregion
 export { finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse, scheduleAppPageRscCacheWrite };

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

@@ -1,20 +1,20 @@
 import { VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
-import { VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_SPECIAL_ERROR_STATUS_HEADER } from "./headers.js";
+import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
 import { applyCdnResponseHeaders } from "./cache-control.js";
 import { decideIsr } from "./isr-decision.js";
-import { buildAppPageCacheValue, isrCacheControl, resolveRouteExpireSeconds } from "./isr-cache.js";
+import { VINEXT_PARAMS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_SPECIAL_ERROR_STATUS_HEADER } from "./headers.js";
+import { applyClientStaleTimeHeader, applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { resolveClientStaleTimeSeconds } from "../utils/cache-control-metadata.js";
-import { encodeCacheTag } from "../utils/encode-cache-tag.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
-import { markFrameworkLinkHeaders } from "./app-response-header-provenance.js";
+import { buildAppPageCacheValue, isrCacheControl, resolveRouteExpireSeconds } from "./isr-cache.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
-import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
-import { isAppPprDynamicFallbackShellHtml } from "./app-ppr-fallback-shell.js";
+import { encodeCacheTag } from "../utils/encode-cache-tag.js";
 import { hasQueryInvariantRenderProof } from "./cache-proof.js";
-import { applyClientStaleTimeHeader, applyEdgeRuntimeHeader } from "./app-page-response.js";
-import { finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse, scheduleAppPageRscCacheWrite } from "./app-page-cache-finalizer.js";
+import { isAppPprDynamicFallbackShellHtml } from "./app-ppr-fallback-shell.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
-//#region src/server/app-page-cache.ts
+import { markFrameworkLinkHeaders } from "./app-response-header-provenance.js";
+import { finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse, scheduleAppPageRscCacheWrite } from "./app-page-cache-finalizer.js";
+// src/server/app-page-cache.ts
 function recordAppPageCacheOutcome(recordCacheOutcome, input) {
 	try {
 		recordCacheOutcome?.(input);
@@ -433,5 +433,4 @@ async function readAppPageFallbackShellCacheResponse(options) {
 		return null;
 	}
 }
-//#endregion
 export { buildAppPageCacheTags, buildAppPageCachedResponse, buildAppRouteCacheTags, finalizeAppPageHtmlCacheResponse, finalizeAppPageRscCacheResponse, readAppPageCacheResponse, readAppPageFallbackShellCacheResponse, scheduleAppPageRscCacheWrite };

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

@@ -1,24 +1,23 @@
-import { AppOutgoingElements } from "./app-elements-wire.js";
-import "./app-elements.js";
-import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { NavigationContext } from "../shims/navigation-context-state.js";
 import "../shims/navigation.js";
-import { AppPageFontPreload } from "./app-page-execution.js";
-import { AppPageMiddlewareContext } from "./app-page-response.js";
-import { AppPageFallbackRouteHead, AppPagePreparedRouteHead } from "./app-page-head.js";
+import { AppOutgoingElements } from "./app-elements-wire.js";
 import { RootParams } from "../shims/root-params.js";
-import { AppPageSsrHandler } from "./app-page-stream.js";
-import { AppRenderErrorContextOverrides } from "./app-rsc-error-handler.js";
-import { AppPageCacheSetter, ISRCacheEntry } from "./isr-cache.js";
 import { PprFallbackShellState } from "../shims/ppr-fallback-shell.js";
-import { FetchCacheMode } from "../shims/fetch-cache-state.js";
 import "../shims/fetch-cache.js";
+import "./app-elements.js";
 import { AppPagePprFallbackCacheShell } from "./app-ppr-fallback-shell.js";
 import { WarmPprFallbackShellCachesOptions } from "./app-ppr-fallback-shell-render.js";
+import { AppPageFontPreload } from "./app-page-execution.js";
+import { AppPageFallbackRouteHead, AppPagePreparedRouteHead } from "./app-page-head.js";
 import { AppPageInterceptState, ValidateAppPageDynamicParamsOptions } from "./app-page-request.js";
+import { AppPageMiddlewareContext } from "./app-page-response.js";
+import { FetchCacheMode } from "../shims/fetch-cache-state.js";
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
+import { AppPageSsrHandler } from "./app-page-stream.js";
+import { AppPageCacheSetter, ISRCacheEntry } from "./isr-cache.js";
+import { AppRenderErrorContextOverrides } from "./app-rsc-error-handler.js";
 import { ReactNode } from "react";
 import { ReactFormState } from "react-dom/client";
-//#region src/server/app-page-dispatch.d.ts
 type AppPageParams = Record<string, string | string[]>;
 type AppPageElement = ReactNode | Readonly<Record<string, ReactNode>>;
 export type AppPageRenderableElement = ReactNode | AppOutgoingElements;
@@ -250,6 +249,11 @@ export type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
    * has a transient gap. Falls through to a fresh render instead.
    */
   renderedConcreteUrlPaths?: ReadonlySet<string>;
+  /**
+   * Called on a dynamicParams = false miss. When it returns true, routing
+   * resumes with the fallback rewrites, so the miss renders no 404.
+   */
+  resumeRoutingAfterMiss?: () => boolean;
   skipStaticParamsValidation?: boolean;
   staticParamsValidationParams?: AppPageParams;
   rootParams?: RootParams;
@@ -270,6 +274,8 @@ export type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
     matchedParams: AppPageParams;
     /** The route's render threw the signal, so the document keeps the route's head. */
     routeHead?: AppPageFallbackRouteHead;
+    /** Render the root not-found as if no route matched, as Next.js routing does. */
+    routeMiss?: boolean;
   }, middlewareContext: AppPageMiddlewareContext | null) => Promise<Response | null>;
   renderToReadableStream: (element: AppPageRenderableElement, options: {
     onError: AppPageBoundaryOnError;
@@ -326,5 +332,4 @@ export declare function shouldReadAppPageCache(options: {
 }): boolean;
 export declare function hasSearchParams(searchParams: URLSearchParams | null | undefined): boolean;
 export declare function dispatchAppPage<TRoute extends AppPageDispatchRoute>(options: DispatchAppPageOptions<TRoute>): Promise<Response>;
-//#endregion
 export {};

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

@@ -1,39 +1,41 @@
-import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
+import { runInWorkStoreScope } from "../shims/internal/work-store-scope.js";
 import "../utils/protocol-headers.js";
 import { VINEXT_INTERCEPTION_ID_HEADER, VINEXT_RSC_VARY_HEADER } from "./app-rsc-vary.js";
-import { VINEXT_MOUNTED_LAYOUTS_HEADER, VINEXT_PARAMS_HEADER } from "./headers.js";
-import { getRequestExecutionContext } from "../shims/request-context.js";
-import { runInWorkStoreScope } from "../shims/internal/work-store-scope.js";
-import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityPatternDynamic, readRouteCacheabilityState } from "../shims/cacheability-classification.js";
-import { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL } from "./app-rsc-render-mode.js";
-import { coalesceOnDemandResponse } from "./isr-cache.js";
-import { consumeDynamicUsage, consumeInvalidDynamicUsageError, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersContext, isDraftModeRequest, peekDynamicUsage, peekRenderRequestApiUsage, runWithConnectionProbe, runWithDetachedDynamicUsage, setHeadersContext } from "../shims/headers.js";
 import { _captureRequestScopedCacheLifeAccessors, _isOnDemandRevalidate } from "../shims/cache-request-state.js";
+import { setRootParams } from "../shims/root-params.js";
+import { consumeDynamicUsage, consumeInvalidDynamicUsageError, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, getHeadersContext, isDraftModeRequest, peekDynamicUsage, peekRenderRequestApiUsage, runStaticParamsCheckDetached, runWithConnectionProbe, runWithDetachedDynamicUsage, setHeadersContext } from "../shims/headers.js";
+import { getRequestExecutionContext } from "../shims/request-context.js";
+import { closeAfterResponse, createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { ensureFetchPatch, getCollectedFetchTags, peekDynamicFetchObservations, runWithFetchDedupe, setCurrentFetchCacheMode, setCurrentFetchRevalidate, setCurrentFetchSoftTags, setCurrentForceDynamicFetchDefault, setRefreshStaleFetchesInForeground } from "../shims/fetch-cache.js";
-import { cacheabilityManifestPageState } from "./cacheability-manifest.js";
-import { isAppPageStaticEligible } from "./app-segment-config.js";
-import { getFrameworkLinkHeader } from "./app-response-header-provenance.js";
-import { traceResponseStart } from "./response-start-tracing.js";
-import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
-import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
-import { parseMountedLayoutsHeader } from "./app-mounted-layouts.js";
-import { resolveUncacheableCacheControl } from "./app-page-response.js";
-import { buildRscRedirectFlightStream } from "./app-rsc-redirect-flight.js";
-import { buildAppPageSpecialErrorResponse, resolveAppPageCaughtNotFoundBoundaries, resolveAppPageShellSpecialError, resolveAppPageSpecialError, resolveAppPageSpecialErrorStoredHeaders } from "./app-page-execution.js";
 import { resolveAppPageLayoutHttpAccessBoundary, resolveAppPageParentHttpAccessBoundary, resolveAppPageRootHttpAccessBoundaryTreePosition } from "./app-page-boundary.js";
-import { resolveAppPageNavigationParams } from "./app-page-navigation-params.js";
-import { createAppPageRscErrorTracker } from "./app-page-stream.js";
-import { isAppClientReference } from "./app-render-dependency.js";
-import { resolveAppPageTraceOperation } from "./app-page-tracing.js";
 import { getDefaultHttpAccessFallbackModule } from "./default-http-access-fallback-modules.js";
-import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
-import { consumeAppPageRenderObservationState, discardAppPageRenderState } from "./app-page-render-observation.js";
-import { buildAppPageTags } from "./implicit-tags.js";
+import { isAppClientReference } from "./app-render-dependency.js";
+import { buildAppPageSpecialErrorResponse, resolveAppPageCaughtNotFoundBoundaries, resolveAppPageShellSpecialError, resolveAppPageSpecialError, resolveAppPageSpecialErrorStoredHeaders } from "./app-page-execution.js";
+import { buildRscRedirectFlightStream } from "./app-rsc-redirect-flight.js";
 import { resolveAppPageMethodResponse } from "./app-page-method.js";
+import { isAppPageStaticEligible } from "./app-segment-config.js";
+import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { resolveAppPageInterceptSegmentConfig } from "./app-page-intercept-segment-config.js";
-import { buildAppPageElement, resolveAppPageIntercept, resolveAppPageInterceptState, resolveAppPageInterceptionRerenderTarget, validateAppPageDynamicParams } from "./app-page-request.js";
+import { resolveAppPageNavigationParams } from "./app-page-navigation-params.js";
+import { buildAppPageElement, resolveAppPageIntercept, resolveAppPageInterceptState, resolveAppPageInterceptionRerenderTarget, validateAppPageRouteDynamicParams } from "./app-page-request.js";
 import { applyIneligibleRouteCachePolicy, renderAppPageLifecycle } from "./app-page-render.js";
-//#region src/server/app-page-dispatch.ts
+import { consumeAppPageRenderObservationState, discardAppPageRenderState } from "./app-page-render-observation.js";
+import { resolveUncacheableCacheControl } from "./app-page-response.js";
+import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
+import { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL } from "./app-rsc-render-mode.js";
+import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
+import { createAppPageRscErrorTracker } from "./app-page-stream.js";
+import { VINEXT_MOUNTED_LAYOUTS_HEADER, VINEXT_PARAMS_HEADER } from "./headers.js";
+import { parseMountedLayoutsHeader } from "./app-mounted-layouts.js";
+import { markRouteMissResponse } from "./route-miss-response.js";
+import { buildAppPageTags } from "./implicit-tags.js";
+import { resolveAppPageTraceOperation } from "./app-page-tracing.js";
+import { coalesceOnDemandResponse } from "./isr-cache.js";
+import { beginRouteCacheability, isRouteCacheabilityIdentityProbe, isRouteCacheabilityProbe, markRouteCacheabilityPatternDynamic, readRouteCacheabilityState } from "../shims/cacheability-classification.js";
+import { cacheabilityManifestPageState } from "./cacheability-manifest.js";
+import { traceResponseStart } from "./response-start-tracing.js";
+import { getFrameworkLinkHeader } from "./app-response-header-provenance.js";
+// src/server/app-page-dispatch.ts
 function getActiveLoadingTreePositions(route) {
 	const positions = [];
 	for (const [index, loadingModule] of (route.loadings ?? []).entries()) {
@@ -227,7 +229,7 @@ async function dispatchAppPageInner(options) {
 	const serveStreamingMetadata = shouldServeStreamingMetadata(options.request.headers.get("user-agent") ?? "", options.htmlLimitedBots);
 	const placeGeneratedMetadataInBody = (!isPrerender || options.pprFallbackShell !== void 0) && serveStreamingMetadata;
 	const isPrefetchDynamicShell = options.renderMode === APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL;
-	const isDraftMode = isDraftModeRequest(options.request, options.draftModeSecret);
+	const isDraftMode = getActiveDraftModeState() ?? isDraftModeRequest(options.request, options.draftModeSecret);
 	const requestHeadersContext = getHeadersContext();
 	const shouldUseEmptySearchParams = isForceStatic || isPrefetchDynamicShell;
 	const hasRequestSearchParams = !shouldUseEmptySearchParams && hasSearchParams(options.searchParams);
@@ -482,18 +484,34 @@ async function dispatchAppPageInner(options) {
 		});
 		if (cachedPageResponse) return cachedPageResponse;
 	}
-	if (options.skipStaticParamsValidation !== true && !(options.isProduction && isForceDynamic)) {
-		const dynamicParamsResponse = await validateAppPageDynamicParams({
-			enforceStaticParamsOnly: options.dynamicParamsConfig === false,
+	if (options.skipStaticParamsValidation !== true && !isDraftMode) {
+		const dynamicParamsResponse = await runStaticParamsCheckDetached(() => validateAppPageRouteDynamicParams({
+			dynamicConfig,
+			dynamicParamsConfig: options.dynamicParamsConfig,
+			fetchCache: options.fetchCache,
+			routeSegments: route.routeSegments,
 			generateStaticParams: options.generateStaticParams,
 			isDynamicRoute: route.isDynamic,
+			isProduction: options.isProduction,
 			params: options.staticParamsValidationParams ?? options.params
-		});
+		}));
 		if (dynamicParamsResponse) {
-			const boundaryModule = route.notFound ?? getDefaultHttpAccessFallbackModule(404);
+			const navigationContext = options.getNavigationContext();
+			if (navigationContext) options.setNavigationContext({
+				...navigationContext,
+				params: {},
+				searchParams: options.searchParams
+			});
+			setRootParams(null);
+			setHeadersContext(requestHeadersContext);
+			setCurrentFetchSoftTags([]);
+			setCurrentFetchCacheMode(null);
+			setCurrentFetchRevalidate(null);
+			setCurrentForceDynamicFetchDefault(false);
+			if (options.resumeRoutingAfterMiss?.()) return new Response(null, { status: 404 });
 			const renderedNotFound = await options.renderHttpAccessFallbackPage(404, {
-				boundaryModule,
-				matchedParams: options.params
+				matchedParams: {},
+				routeMiss: true
 			}, options.middlewareContext);
 			const cachePolicy = {
 				dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds,
@@ -511,9 +529,9 @@ async function dispatchAppPageInner(options) {
 				revalidateSeconds: currentRevalidateSeconds,
 				scriptNonce: options.scriptNonce
 			};
-			if (renderedNotFound) return applyIneligibleRouteCachePolicy(renderedNotFound, cachePolicy);
+			if (renderedNotFound) return markRouteMissResponse(applyIneligibleRouteCachePolicy(renderedNotFound, cachePolicy));
 			options.clearRequestContext();
-			return applyIneligibleRouteCachePolicy(dynamicParamsResponse, cachePolicy);
+			return markRouteMissResponse(applyIneligibleRouteCachePolicy(dynamicParamsResponse, cachePolicy));
 		}
 	}
 	const fallbackShellResponse = options.pprRuntime ? await options.pprRuntime.tryServe(options, currentRevalidateSeconds, isDraftMode, isForceStatic, isForceDynamic) : null;
@@ -942,5 +960,4 @@ async function renderPageSpecialError(options, specialError, serveStreamingMetad
 		specialError
 	});
 }
-//#endregion
 export { dispatchAppPage, hasSearchParams, shouldReadAppPageCache };

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

@@ -1,12 +1,11 @@
-import { MetadataFileRoute } from "./metadata-routes.js";
+import { AppPagePreparedRouteHead, ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
 import { AppElements } from "./app-elements-wire.js";
+import { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute } from "./app-page-route-wiring.js";
+import { AppPageSemanticSegment } from "./app-page-segment-state.js";
 import "./app-elements.js";
-import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPageParams } from "./app-page-boundary.js";
-import { AppPagePreparedRouteHead, ApplyAppPageFileBasedMetadata } from "./app-page-head.js";
-import { AppPageSemanticSegment } from "./app-page-segment-state.js";
-import { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute } from "./app-page-route-wiring.js";
-//#region src/server/app-page-element-builder.d.ts
+import { MetadataFileRoute } from "./metadata-routes.js";
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 /**
  * Route shape passed from the generated entry. Extends the wiring route with
  * the page module reference (used to extract the default export for the page
@@ -165,5 +164,4 @@ export declare const APP_PAGE_INTERCEPTION_MARKER_TRAVERSALS: readonly [{
  */
 export declare function resolveInterceptedSlotIdentitySegments(sourcePageSegments: readonly string[] | null | undefined, slotKey: string): readonly AppPageSemanticSegment[] | null;
 export declare function resolveInterceptedSlotSegments(sourcePageSegments: readonly string[] | null | undefined, slotKey: string): readonly string[] | null;
-//#endregion
 export type { AppPageErrorModule, AppPageRouteWiringRoute };

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

@@ -1,28 +1,28 @@
-import { isPromiseLike } from "../utils/promise.js";
-import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
+import { makeThenableParams } from "../shims/thenable-params.js";
+import { withUseCacheLayoutMarker, withUseCachePageMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { AppElementsWire } from "./app-elements-wire.js";
-import "./app-elements.js";
-import { APP_PAGE_SEGMENT_KEY, isAppPageRouteGroupSegment, resolveAppPagePatternStateKey, resolveAppPageRouteStateKey, resolveAppPageSemanticSegmentStateKey } from "./app-page-segment-state.js";
+import { ClientPageRoot } from "../shims/client-page-root.js";
 import { ErrorBoundary, ForbiddenBoundary, NotFoundBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
-import { withUseCacheLayoutMarker, withUseCachePageMarker } from "../shims/internal/app-page-props-cache-key.js";
-import { makeThenableParams } from "../shims/thenable-params.js";
-import { tagAppPagePageError, tagAppPageSlotError } from "./app-page-execution.js";
-import { createAppPageMetadataSearchParamsObserver, makeObservedAppPageSearchParamsThenable } from "./app-page-search-params-observation.js";
-import { resolveAppPageBranchParams } from "./app-page-params.js";
 import { collectAppPageSearchParams, hasAppPageDynamicMetadata, prepareAppPageHead, resolveActiveParallelRouteHeadInputs, resolveInterceptLayoutsBesidePage, slotInterceptKeepsSourceHead } from "./app-page-head.js";
 import { createRouteNotFoundHeadPlanOptions, recoverAppPageRouteHead } from "./app-page-http-access-fallback-metadata.js";
 import "./app-rsc-route-matching.js";
-import { resolveSlotParamOverrides } from "./app-page-navigation-params.js";
-import { createAppPageRenderDependency, invokeAppComponent, isAppClientReference, isAppRenderSuspension, isReactOwnedAppComponent, renderAfterAppDependencies } from "./app-render-dependency.js";
-import { sanitizeErrorForClient } from "./app-rsc-errors.js";
-import { resolveAppPageModuleTraceSegment, traceCreateComponentTree, traceGetLayoutOrPageModule } from "./app-page-tracing.js";
 import { buildAppPageElements, createAppPageSourcePage, createAppPageTreePath, resolveAppPageLoadingModuleAtOrAbove } from "./app-page-route-wiring.js";
+import { APP_PAGE_SEGMENT_KEY, isAppPageRouteGroupSegment, resolveAppPagePatternStateKey, resolveAppPageRouteStateKey, resolveAppPageSemanticSegmentStateKey } from "./app-page-segment-state.js";
+import { resolveAppPageModuleTraceSegment, traceCreateComponentTree, traceGetLayoutOrPageModule } from "./app-page-tracing.js";
+import "./app-elements.js";
+import { tagAppPagePageError, tagAppPageSlotError } from "./app-page-execution.js";
+import { sanitizeErrorForClient } from "./app-rsc-errors.js";
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
-import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
-import { ClientPageRoot } from "../shims/client-page-root.js";
+import { resolveSlotParamOverrides } from "./app-page-navigation-params.js";
+import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
 import { createAppPageRenderIdentity } from "./app-page-render-identity.js";
+import { createAppPageMetadataSearchParamsObserver, makeObservedAppPageSearchParamsThenable } from "./app-page-search-params-observation.js";
+import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
+import { resolveAppPageBranchParams } from "./app-page-params.js";
+import { createAppPageRenderDependency, invokeAppComponent, isAppClientReference, isAppRenderSuspension, isReactOwnedAppComponent, renderAfterAppDependencies } from "./app-render-dependency.js";
+import { isPromiseLike } from "../utils/promise.js";
 import { Fragment, Suspense, cache, createElement } from "react";
-//#region src/server/app-page-element-builder.ts
+// src/server/app-page-element-builder.ts
 /**
 * A sibling intercepting page that renders beside its intercepting layouts,
 * as Next.js renders each segment. The source route's layouts wait for the
@@ -614,5 +614,4 @@ function resolveInterceptedSlotSegments(sourcePageSegments, slotKey) {
 	routeSegments.push(...sourcePageSegments.slice(markerIndex + 1).filter(isVisibleInterceptedSlotSegment));
 	return routeSegments;
 }
-//#endregion
 export { APP_PAGE_INTERCEPTION_MARKER_TRAVERSALS, buildPageElements, resolveInterceptedSlotIdentitySegments, resolveInterceptedSlotSegments, resolveSiblingInterceptSegmentKeys };

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

@@ -1,4 +1,3 @@
-//#region src/server/app-page-execution.d.ts
 export declare function tagAppPageMetadataError<T>(error: T): T;
 export declare function tagAppPageSlotError<T>(error: T, layoutIndex: number, notFoundBoundary?: string): T;
 export declare function tagAppPagePageError<T>(error: T): T;
@@ -138,5 +137,4 @@ export declare function readAppPageBinaryStream(stream: ReadableStream<Uint8Arra
 export declare function bufferAppPageBinaryStream(stream: ReadableStream<Uint8Array>): Promise<ReadableStream<Uint8Array>>;
 export declare function teeAppPageRscStreamForCapture(stream: ReadableStream<Uint8Array>, shouldCapture: boolean): AppPageRscStreamCapture;
 export declare function buildAppPageFontLinkHeader(preloads: readonly AppPageFontPreload[] | null | undefined): string;
-//#endregion
 export {};

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

@@ -1,13 +1,13 @@
-import { VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_REDIRECT_TYPE_HEADER } from "./headers.js";
-import { copyLinkHeaderProvenance, getFrameworkLinkHeader, markFrameworkLinkHeaders } from "./app-response-header-provenance.js";
-import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader, createRscRedirectLocation, toPathAbsolutePathname } from "./app-rsc-cache-busting.js";
-import { isHTTPAccessFallbackError, isThrownNavigationError } from "../shims/navigation-errors.js";
+import { VINEXT_RSC_REDIRECT_HEADER, VINEXT_RSC_REDIRECT_TYPE_HEADER } from "./headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
+import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
+import { copyLinkHeaderProvenance, getFrameworkLinkHeader, markFrameworkLinkHeaders } from "./app-response-header-provenance.js";
 import { parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
 import { renderSsrErrorMetaTags } from "./app-ssr-error-meta.js";
 import { formatNextRedirectDigest } from "./app-rsc-redirect-flight.js";
-//#region src/server/app-page-execution.ts
+import { isHTTPAccessFallbackError, isThrownNavigationError } from "../shims/navigation-errors.js";
+// src/server/app-page-execution.ts
 /**
 * Marker we tag onto a thrown redirect/notFound error when it originates from
 * `generateMetadata()` (vs. a server component itself). Metadata resolution is
@@ -440,5 +440,4 @@ function buildAppPageFontLinkHeader(preloads) {
 	if (!preloads || preloads.length === 0) return "";
 	return preloads.map((preload) => `<${preload.href}>; rel=preload; as=font; type=${preload.type}; crossorigin`).join(", ");
 }
-//#endregion
 export { APP_PAGE_NOT_FOUND_BOUNDARY_ID, bufferAppPageBinaryStream, buildAppPageFontLinkHeader, buildAppPageSpecialErrorResponse, readAppPageBinaryStream, resolveAppPageCaughtNotFoundBoundaries, resolveAppPageShellSpecialError, resolveAppPageSpecialError, resolveAppPageSpecialErrorStoredHeaders, tagAppPageLayoutError, tagAppPageMetadataError, tagAppPagePageError, tagAppPageSlotError, teeAppPageRscStreamForCapture };

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

@@ -1,9 +1,8 @@
-import { MetadataFileRoute } from "./metadata-routes.js";
-import { AppPageParams } from "./app-page-boundary.js";
-import { ThenableParamsObserver } from "../shims/thenable-params.js";
-import { Metadata, ResolvedViewport, Viewport } from "../shims/metadata.js";
 import { applyFileBasedMetadata } from "./file-based-metadata.js";
-//#region src/server/app-page-head.d.ts
+import { Metadata, ResolvedViewport, Viewport } from "../shims/metadata.js";
+import { ThenableParamsObserver } from "../shims/thenable-params.js";
+import { AppPageParams } from "./app-page-boundary.js";
+import { MetadataFileRoute } from "./metadata-routes.js";
 export type AppPageSearchParams = Record<string, string | string[]>;
 export type AppPageHeadModule = Record<string, unknown>;
 export type ApplyAppPageFileBasedMetadata = typeof applyFileBasedMetadata;
@@ -238,5 +237,4 @@ export declare function hasAppPageDynamicMetadata<TModule extends AppPageHeadMod
  * callers use {@link resolveAppPageHead} and observe the same result as before.
  */
 export declare function prepareAppPageHead<TModule extends AppPageHeadModule>(options: ResolveAppPageHeadOptions<TModule>): PreparedAppPageHead;
-//#endregion
 export {};