vinext 1.0.0-beta.9 → 1.0.1

package/dist/server/app-page-http-access-fallback-metadata.js

@@ -1,5 +1,6 @@
 import { mergeViewport, resolveModuleViewport } from "../shims/metadata.js";
 import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
+import { createAppMetadataModuleRoute } from "./app-metadata-tracing.js";
 import { resolveOrderedAppPageMetadata } from "./app-page-head.js";
 //#region src/server/app-page-http-access-fallback-metadata.ts
 function isPresent(value) {
@@ -24,6 +25,7 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 			source: {
 				includeWhenEmpty: true,
 				module: layoutModule,
+				moduleRoute: createAppMetadataModuleRoute(routeSegments.slice(0, treePosition), options.errorConvention),
 				params: resolveAppPageSegmentParams(routeSegments, treePosition, options.params),
 				routeSegments: routeSegments.slice(0, treePosition)
 			}
@@ -31,7 +33,7 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 	}
 	let activeBoundaryModule = options.boundaryModule;
 	let activeBoundaryParams = options.boundaryParams;
-	let activeBoundaryRouteSegments = routeSegments;
+	let activeBoundaryRouteSegments = options.boundaryRouteSegments ?? [];
 	const appendFallbackLeaf = () => {
 		if (fallbackLeafMode === "final") {
 			plan.push({ kind: "fallback-leaf" });
@@ -43,6 +45,7 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 			source: {
 				includeWhenEmpty: true,
 				module: activeBoundaryModule,
+				moduleRoute: createAppMetadataModuleRoute(activeBoundaryRouteSegments, options.errorConvention),
 				params: activeBoundaryParams,
 				routeSegments: activeBoundaryRouteSegments
 			}
@@ -54,6 +57,8 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 		const parallelRoute = branch.head;
 		const parallelParams = parallelRoute.params ?? options.params;
 		const parallelRouteSegments = parallelRoute.routeSegments ?? routeSegments;
+		const parallelModuleRoutePrefix = parallelRoute.moduleRoutePrefixSegments ?? [];
+		const parallelModuleRouteSegments = parallelRoute.moduleRouteSegments ?? parallelRouteSegments;
 		const layoutModules = [...parallelRoute.layoutModules ?? [], parallelRoute.layoutModule].filter(isPresent);
 		const layoutTreePositions = parallelRoute.layoutTreePositions ?? [];
 		const layoutParams = parallelRoute.layoutParams ?? [];
@@ -62,6 +67,7 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 			source: {
 				includeWhenEmpty: true,
 				module: layoutModule,
+				moduleRoute: createAppMetadataModuleRoute([...parallelModuleRoutePrefix, ...parallelModuleRouteSegments.slice(0, layoutTreePositions[index] ?? 0)], options.errorConvention),
 				params: layoutParams[index] ?? resolveAppPageBranchParams(parallelRouteSegments, layoutTreePositions[index] ?? 0, parallelParams),
 				routeSegments: parallelRouteSegments
 			}
@@ -69,7 +75,7 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 		if (options.branchNotFoundConventions !== false && branch.notFoundModule) {
 			activeBoundaryModule = branch.notFoundModule;
 			activeBoundaryParams = branch.notFoundParams ?? parallelParams;
-			activeBoundaryRouteSegments = parallelRouteSegments;
+			activeBoundaryRouteSegments = branch.notFoundModuleRouteSegments ?? [...parallelModuleRoutePrefix, ...parallelModuleRouteSegments];
 		}
 		appendFallbackLeaf();
 	}
@@ -79,6 +85,7 @@ function createHttpAccessFallbackPlan(options, fallbackLeafMode) {
 		return [{
 			includeWhenEmpty: true,
 			module: activeBoundaryModule,
+			moduleRoute: createAppMetadataModuleRoute(activeBoundaryRouteSegments, options.errorConvention),
 			params: activeBoundaryParams,
 			routeSegments: activeBoundaryRouteSegments
 		}];

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

@@ -1,15 +1,9 @@
 //#region src/server/app-page-method.d.ts
-type AppPageMethodPolicyOptions = {
-  dynamicConfig?: string;
-  hasGenerateStaticParams: boolean;
-  isDynamicRoute: boolean;
-  revalidateSeconds: number | null;
-};
 type ResolveAppPageMethodResponseOptions = {
+  /** `isAppPageStaticEligible` for the route. */
+  isStaticEligible: boolean;
   middlewareHeaders?: Headers | null;
   request: Pick<Request, "headers" | "method">;
-} & AppPageMethodPolicyOptions;
-declare function isStaticOrSsgAppPageCandidate(options: AppPageMethodPolicyOptions): boolean;
-declare function resolveAppPageMethodResponse(options: ResolveAppPageMethodResponseOptions): Response | null;
-//#endregion
-export { isStaticOrSsgAppPageCandidate, resolveAppPageMethodResponse };
+};
+export declare function resolveAppPageMethodResponse(options: ResolveAppPageMethodResponseOptions): Response | null;
+//#endregion

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

@@ -6,20 +6,13 @@ function isNonGetOrHead(method) {
 	const normalizedMethod = method.toUpperCase();
 	return normalizedMethod !== "GET" && normalizedMethod !== "HEAD";
 }
-function isStaticOrSsgAppPageCandidate(options) {
-	if (options.dynamicConfig === "force-dynamic" || options.revalidateSeconds === 0) return false;
-	if (options.dynamicConfig === "force-static" || options.dynamicConfig === "error") return true;
-	if (options.revalidateSeconds !== null && options.revalidateSeconds > 0) return true;
-	if (options.hasGenerateStaticParams) return true;
-	return !options.isDynamicRoute;
-}
 function resolveAppPageMethodResponse(options) {
 	if (!isNonGetOrHead(options.request.method)) return null;
 	if (isPossibleAppRouteActionRequest(options.request)) return null;
-	if (!isStaticOrSsgAppPageCandidate(options)) return null;
+	if (!options.isStaticEligible) return null;
 	const headers = new Headers();
 	mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);
 	return methodNotAllowedResponse("GET, HEAD", { headers });
 }
 //#endregion
-export { isStaticOrSsgAppPageCandidate, resolveAppPageMethodResponse };
+export { resolveAppPageMethodResponse };

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

@@ -1,8 +1,7 @@
 import { AppPageParams } from "./app-page-boundary.js";
 //#region src/server/app-page-params.d.ts
-declare function getAppPageSegmentParamName(segment: string): string | null;
-declare function resolveAppPageSegmentParamScopeKeys(routeSegments: readonly string[] | null | undefined, treePosition: number): readonly string[];
-declare function resolveAppPageSegmentParams(routeSegments: readonly string[] | null | undefined, treePosition: number, matchedParams: AppPageParams): AppPageParams;
-declare function resolveAppPageBranchParams(branchSegments: readonly string[], treePosition: number, matchedParams: AppPageParams, scopedSegments?: readonly string[]): AppPageParams;
-//#endregion
-export { getAppPageSegmentParamName, resolveAppPageBranchParams, resolveAppPageSegmentParamScopeKeys, resolveAppPageSegmentParams };
+export declare function getAppPageSegmentParamName(segment: string): string | null;
+export declare function resolveAppPageSegmentParamScopeKeys(routeSegments: readonly string[] | null | undefined, treePosition: number): readonly string[];
+export declare function resolveAppPageSegmentParams(routeSegments: readonly string[] | null | undefined, treePosition: number, matchedParams: AppPageParams): AppPageParams;
+export declare function resolveAppPageBranchParams(branchSegments: readonly string[], treePosition: number, matchedParams: AppPageParams, scopedSegments?: readonly string[]): AppPageParams;
+//#endregion

package/dist/server/app-page-ppr-runtime.d.ts

@@ -1,6 +1,6 @@
 import { createAppPprFallbackShells } from "./app-ppr-fallback-shell.js";
 import { AppPageDispatchRoute, AppPagePprRuntime } from "./app-page-dispatch.js";
 //#region src/server/app-page-ppr-runtime.d.ts
-declare const appPagePprRuntime: AppPagePprRuntime<AppPageDispatchRoute>;
+export declare const appPagePprRuntime: AppPagePprRuntime<AppPageDispatchRoute>;
 //#endregion
-export { appPagePprRuntime, createAppPprFallbackShells };
+export { createAppPprFallbackShells };

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

@@ -11,7 +11,7 @@ type ProbeReactServerSubtreeOptions = Readonly<{
  * immediate function body. The real RSC render remains authoritative; probe
  * failures only make static-layout skip fall back to render-and-send.
  */
-declare function probeReactServerSubtree(node: unknown, options?: ProbeReactServerSubtreeOptions): Promise<void>;
+export declare function probeReactServerSubtree(node: unknown, options?: ProbeReactServerSubtreeOptions): Promise<void>;
 /**
  * Build a probePage() invocation for the App Router request lifecycle.
  *
@@ -29,7 +29,7 @@ declare function probeReactServerSubtree(node: unknown, options?: ProbeReactServ
  * Returns `null` when the route has no page component (eg. interception-only
  * routes), matching the caller contract on `probePage`.
  */
-declare function probeAppPage(options: {
+export declare function probeAppPage(options: {
   pageComponent: unknown;
   asyncRouteParams: unknown;
   searchParams: URLSearchParams | null | undefined;
@@ -102,7 +102,7 @@ type AppPageProbeIntercept = Readonly<{
  * real render still observes that access and skips the query-invariant cache
  * write (the same loading.tsx backstop), so this cannot under-bail.
  */
-declare function buildAppPageProbes(options: {
+export declare function buildAppPageProbes(options: {
   route: AppPageProbeRoute;
   pageComponent: unknown;
   asyncRouteParams: unknown;
@@ -135,6 +135,5 @@ type ProbeAppPageBeforeRenderOptions = {
   /** When provided, enables per-layout static/dynamic classification. */
   classification?: LayoutClassificationOptions | null;
 };
-declare function probeAppPageBeforeRender(options: ProbeAppPageBeforeRenderOptions): Promise<ProbeAppPageBeforeRenderResult>;
-//#endregion
-export { buildAppPageProbes, probeAppPage, probeAppPageBeforeRender, probeReactServerSubtree };
+export declare function probeAppPageBeforeRender(options: ProbeAppPageBeforeRenderOptions): Promise<ProbeAppPageBeforeRenderResult>;
+//#endregion

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

@@ -1,7 +1,7 @@
 import { isPromiseLike } from "../utils/promise.js";
 import { isNextRouterError } from "../shims/navigation-errors.js";
 import "../shims/navigation-server.js";
-import { markAppPagePropsForUseCache } from "../shims/internal/app-page-props-cache-key.js";
+import { markAppPagePropsForUseCache, withUseCachePageMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { probeAppPageComponent, probeAppPageLayouts } from "./app-page-execution.js";
 import { collectAppPageSearchParams } from "./app-page-head.js";
 import { makeObservedAppPageSearchParamsThenable } from "./app-page-search-params-observation.js";
@@ -152,10 +152,11 @@ function probeAppPage(options) {
 	const { pageComponent, asyncRouteParams, searchParams } = options;
 	if (typeof pageComponent !== "function") return null;
 	const { pageSearchParams } = collectAppPageSearchParams(searchParams);
-	const result = pageComponent(markAppPagePropsForUseCache({
+	const asyncSearchParams = makeObservedAppPageSearchParamsThenable(pageSearchParams, { observeReactPromiseStatus: true });
+	const result = pageComponent(markAppPagePropsForUseCache(withUseCachePageMarker(pageComponent, {
 		params: asyncRouteParams,
-		searchParams: makeObservedAppPageSearchParamsThenable(pageSearchParams, { observeReactPromiseStatus: true })
-	}));
+		searchParams: asyncSearchParams
+	})));
 	if (isPromiseLike(result)) return result.then(async (resolved) => {
 		await probeReactServerSubtreeForDynamicUsage(resolved);
 		return resolved;

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

@@ -9,7 +9,7 @@ type AppPageRenderIdentityInput = {
   interceptSourceMatchedUrl?: string | null;
   interceptSlotId?: string | null;
 };
-type AppPageRenderIdentity = {
+export type AppPageRenderIdentity = {
   displayPathname: string;
   interception: AppElementsInterception | null;
   interceptionContext: string | null;
@@ -18,7 +18,6 @@ type AppPageRenderIdentity = {
   routeId: string;
   targetMatchedPathname: string;
 };
-declare function normalizeAppPageInterceptionProofPathname(pathname: string | null): string | null;
-declare function createAppPageRenderIdentity(input: AppPageRenderIdentityInput): AppPageRenderIdentity;
-//#endregion
-export { AppPageRenderIdentity, createAppPageRenderIdentity, normalizeAppPageInterceptionProofPathname };
+export declare function normalizeAppPageInterceptionProofPathname(pathname: string | null): string | null;
+export declare function createAppPageRenderIdentity(input: AppPageRenderIdentityInput): AppPageRenderIdentity;
+//#endregion

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

@@ -1,14 +1,14 @@
 import { BoundaryOutcome, CacheProofOutputScope, RenderCacheability, RenderObservation, RenderObservationCompleteness, RenderRequestApiKind } from "./cache-proof.js";
 import { ReactNode } from "react";
 //#region src/server/app-page-render-observation.d.ts
-type AppPageRenderObservationState = Readonly<{
+export type AppPageRenderObservationState = Readonly<{
   dynamicFetches: readonly string[];
   requestApis: readonly RenderRequestApiKind[];
 }>;
-declare function createEmptyAppPageRenderObservationState(): AppPageRenderObservationState;
-declare function consumeAppPageRenderObservationState(): AppPageRenderObservationState;
-declare function discardAppPageRenderState(): void;
-declare function createAppPageRenderObservation(options: {
+export declare function createEmptyAppPageRenderObservationState(): AppPageRenderObservationState;
+export declare function consumeAppPageRenderObservationState(): AppPageRenderObservationState;
+export declare function discardAppPageRenderState(): void;
+export declare function createAppPageRenderObservation(options: {
   boundaryOutcome: BoundaryOutcome;
   cacheTags: readonly string[];
   cacheability: RenderCacheability;
@@ -18,18 +18,17 @@ declare function createAppPageRenderObservation(options: {
   params: Record<string, unknown>;
   state: AppPageRenderObservationState;
 }): RenderObservation;
-declare function createAppPageRscOutputScope(options: {
+export declare function createAppPageRscOutputScope(options: {
   element: ReactNode | Readonly<Record<string, ReactNode>>;
   mountedSlotsHeader?: string | null;
   renderEpoch: string | null;
   rootBoundaryId: string | null;
   routePattern: string;
 }): CacheProofOutputScope;
-declare function createAppPageHtmlOutputScope(options: {
+export declare function createAppPageHtmlOutputScope(options: {
   element: ReactNode | Readonly<Record<string, ReactNode>>;
   renderEpoch: string | null;
   rootBoundaryId: string | null;
   routePattern: string;
 }): CacheProofOutputScope;
-//#endregion
-export { AppPageRenderObservationState, consumeAppPageRenderObservationState, createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope, createEmptyAppPageRenderObservationState, discardAppPageRenderState };
+//#endregion

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

@@ -1,6 +1,6 @@
 import { fnv1a64 } from "../utils/hash.js";
-import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
+import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage } from "../shims/headers.js";
 import { _consumeRequestScopedCacheLife } from "../shims/cache-request-state.js";

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

@@ -9,6 +9,7 @@ import { AppPageMiddlewareContext } from "./app-page-response.js";
 import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
 import { RootParams } from "../shims/root-params.js";
 import { AppPageSsrHandler } from "./app-page-stream.js";
+import { AppRenderErrorContextOverrides } from "./app-rsc-error-handler.js";
 import { AppPageRenderObservationState } from "./app-page-render-observation.js";
 import { AppPageCacheSetter } from "./isr-cache.js";
 import { ReactNode } from "react";
@@ -21,7 +22,15 @@ type AppPageRequestCacheLife = {
   expire?: number;
   stale?: number;
 };
-type RenderAppPageLifecycleOptions = {
+type AppPageRenderableElement = ReactNode | Readonly<Record<string, ReactNode>>;
+type PreparedAppPageElement = {
+  element: AppPageRenderableElement;
+  response?: never;
+} | {
+  element?: never;
+  response: Response;
+};
+type RenderAppPageLifecycleOptionsBase = {
   basePath?: string;
   bypassInterceptionContextCache?: boolean;
   /**
@@ -43,7 +52,7 @@ type RenderAppPageLifecycleOptions = {
   consumeRenderObservationState?: () => AppPageRenderObservationState;
   /** Read and clear any invalid dynamic usage error recorded during render (dev-only). */
   consumeInvalidDynamicUsageError?: () => unknown;
-  createRscOnErrorHandler: (pathname: string, routePath: string) => AppPageBoundaryOnError;
+  createRscOnErrorHandler: (pathname: string, routePath: string, overrides?: AppRenderErrorContextOverrides) => AppPageBoundaryOnError;
   getFontLinks: () => string[];
   getFontPreloads: () => AppPageFontPreload[];
   getFontStyles: () => string[];
@@ -61,6 +70,17 @@ type RenderAppPageLifecycleOptions = {
   isEdgeRuntime?: boolean;
   isForceDynamic: boolean;
   isForceStatic: boolean;
+  /**
+   * Whether Next.js would classify the route as static or SSG from its config
+   * (`isAppPageStaticEligible`). Other routes are never full-page cached.
+   */
+  isStaticEligible: boolean;
+  /**
+   * Production render that may be stored under a query-free key: SSR
+   * `useSearchParams()` waits until the render is known to be dynamic, and
+   * bails out to client rendering otherwise.
+   */
+  isCacheCandidate?: boolean;
   isProgressiveActionRender?: boolean;
   isPrerender?: boolean;
   isSpeculativePrerender?: boolean;
@@ -68,6 +88,8 @@ type RenderAppPageLifecycleOptions = {
   probePageBeforeRender?: boolean;
   omitPendingDynamicCacheState?: boolean;
   isRscRequest: boolean;
+  traceOperation?: "prerender" | "render";
+  onRenderComplete?: (completion: Promise<void>) => void;
   isrDebug?: AppPageDebugLogger;
   isrHtmlKey: (pathname: string) => string;
   isrRscKey: (pathname: string, mountedSlotsHeader?: string | null, renderMode?: AppRscRenderMode, interceptionContext?: string | null, interceptionId?: string | null) => string;
@@ -112,9 +134,22 @@ type RenderAppPageLifecycleOptions = {
   renderMode?: AppRscRenderMode;
   waitUntil?: (promise: Promise<void>) => void;
   layoutParamAccess?: AppLayoutParamAccessTracker;
-  element: ReactNode | Readonly<Record<string, ReactNode>>;
   classification?: LayoutClassificationOptions | null;
 };
-declare function renderAppPageLifecycle(options: RenderAppPageLifecycleOptions): Promise<Response>;
-//#endregion
-export { renderAppPageLifecycle };
+type RenderAppPageLifecycleOptions = RenderAppPageLifecycleOptionsBase & ({
+  element: AppPageRenderableElement;
+  prepareElement?: never;
+} | {
+  element?: never;
+  prepareElement: () => Promise<PreparedAppPageElement>;
+});
+/**
+ * A render that is known dynamic is never cacheable: a route Next.js can't make
+ * static, draft mode, `force-dynamic`, `revalidate = 0`, or a dynamic API read
+ * before the response left the render. Responses that leave the render before
+ * its response policy, such as error boundaries and special errors, get the
+ * same header as the normal render.
+ */
+export declare function applyIneligibleRouteCachePolicy(response: Response, options: Pick<RenderAppPageLifecycleOptions, "isDraftMode" | "isDynamicError" | "isForceDynamic" | "isForceStatic" | "isProduction" | "isProgressiveActionRender" | "isRscRequest" | "isStaticEligible" | "middlewareContext" | "peekDynamicUsage" | "revalidateSeconds" | "scriptNonce">): Response;
+export declare function renderAppPageLifecycle(options: RenderAppPageLifecycleOptions): Promise<Response>;
+//#endregion