vinext 1.0.0-beta.2 → 1.0.0-beta.4

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

@@ -30,6 +30,10 @@ function readRequestCacheLifeForPrerender(options) {
 	if (options.isEdgeRuntime && options.revalidateSeconds === null) return (options.peekRequestCacheLife?.() ?? options.getRequestCacheLife())?.revalidate !== void 0 ? { revalidate: 0 } : null;
 	return options.peekRequestCacheLife?.() ?? options.getRequestCacheLife();
 }
+function resolveConfiguredDynamicStaleTimeSeconds() {
+	const seconds = Number(process.env.__NEXT_CLIENT_ROUTER_DYNAMIC_STALETIME);
+	return Number.isInteger(seconds) && seconds >= 0 ? seconds : 0;
+}
 function readRequestCacheLifeForCachePolicy(options) {
 	const requestCacheLife = options.getRequestCacheLife();
 	if (options.isEdgeRuntime && options.revalidateSeconds === null) return null;
@@ -322,10 +326,11 @@ async function renderAppPageLifecycle(options) {
 		layoutParamAccess: options.layoutParamAccess
 	});
 	const shouldBypassRscCacheForSkipTransport = options.isRscRequest && isSkipTransportEnabled(skipDisposition);
+	const dynamicStaleTimeSeconds = options.dynamicStaleTimeSeconds ?? (options.isForceDynamic ? resolveConfiguredDynamicStaleTimeSeconds() : void 0);
 	const outgoingElement = AppElementsWire.encodeOutgoingPayload({
 		element: options.element,
 		layoutFlags,
-		...options.dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !options.isForceStatic ? { dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds } : {},
+		...dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !options.isForceStatic ? { dynamicStaleTimeSeconds } : {},
 		...artifactCompatibility ? { artifactCompatibility } : {},
 		renderObservation: payloadRenderObservation,
 		skipDisposition: options.isRscRequest ? skipDisposition : void 0
@@ -385,8 +390,10 @@ async function renderAppPageLifecycle(options) {
 			revalidateSeconds
 		});
 		if (shouldBypassRscCacheForSkipTransport) options.isrDebug?.("RSC cache write skipped (skip transport payload)", options.cleanPathname);
+		const shouldEmitDynamicStaleTime = dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !options.isForceStatic && (dynamicUsedDuringBuild || options.isForceDynamic || !shouldCaptureRscForCacheMetadata);
 		const rscResponse = buildAppPageRscResponse(rscForResponse, {
-			dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !options.isForceStatic && (dynamicUsedDuringBuild || !shouldCaptureRscForCacheMetadata) ? options.dynamicStaleTimeSeconds : void 0,
+			cacheTags: options.isPrerender === true ? options.getPageTags() : void 0,
+			dynamicStaleTimeSeconds: shouldEmitDynamicStaleTime ? dynamicStaleTimeSeconds : void 0,
 			isEdgeRuntime: options.isEdgeRuntime,
 			middlewareContext: options.middlewareContext,
 			mountedSlotsHeader: options.mountedSlotsHeader,
@@ -474,7 +481,7 @@ async function renderAppPageLifecycle(options) {
 					}
 					return {
 						kind,
-						...kind === "dynamic" && options.dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !shouldCaptureRscForCacheMetadata ? { dynamicStaleTimeSeconds: options.dynamicStaleTimeSeconds } : {}
+						...kind === "dynamic" && dynamicStaleTimeSeconds !== void 0 && options.isPrerender !== true && !shouldCaptureRscForCacheMetadata ? { dynamicStaleTimeSeconds } : {}
 					};
 				},
 				fontData,
@@ -564,6 +571,7 @@ async function renderAppPageLifecycle(options) {
 	});
 	if (htmlRender.shellErrorRecovered) {
 		const response = buildAppPageHtmlResponse(safeHtmlStream, {
+			cacheTags: options.isPrerender === true ? options.getPageTags() : void 0,
 			draftCookie,
 			linkHeader,
 			isEdgeRuntime: options.isEdgeRuntime,
@@ -581,6 +589,7 @@ async function renderAppPageLifecycle(options) {
 	const shouldSpeculativelyWriteCache = options.isProduction && shouldCaptureRscForCacheMetadata && !options.isEdgeRuntime && revalidateSeconds === null && !options.isDynamicError && !options.isForceStatic && !options.scriptNonce && options.isProgressiveActionRender !== true && !dynamicUsedDuringRender;
 	if (htmlResponsePolicy.shouldWriteToCache || shouldSpeculativelyWriteCache) {
 		const isrResponse = buildAppPageHtmlResponse(safeHtmlStream, {
+			cacheTags: options.isPrerender === true ? options.getPageTags() : void 0,
 			draftCookie,
 			linkHeader,
 			isEdgeRuntime: options.isEdgeRuntime,
@@ -647,6 +656,7 @@ async function renderAppPageLifecycle(options) {
 		});
 	}
 	return buildAppPageHtmlResponse(safeHtmlStream, {
+		cacheTags: options.isPrerender === true ? options.getPageTags() : void 0,
 		draftCookie,
 		linkHeader,
 		isEdgeRuntime: options.isEdgeRuntime,

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

@@ -33,7 +33,6 @@ type ParallelGenerateStaticParamsBranch = {
   routeSegments?: readonly string[] | null;
 };
 type ValidateAppPageDynamicParamsOptions = {
-  clearRequestContext: () => void;
   enforceStaticParamsOnly: boolean;
   generateStaticParams?: GenerateStaticParams | GenerateStaticParamsSource | readonly (GenerateStaticParams | GenerateStaticParamsSource | null | undefined)[] | null;
   isDynamicRoute: boolean;
@@ -62,8 +61,11 @@ type AppPageInterceptMatch<TPage = unknown> = {
   interceptLayouts?: readonly unknown[] | null;
   interceptLayoutSegments?: readonly (readonly string[])[] | null;
   interceptBranchSegments?: readonly string[] | null;
+  interceptLoadings?: readonly unknown[] | null;
+  interceptLoadingTreePositions?: readonly number[] | null;
   interceptNotFoundBranchSegments?: readonly string[] | null;
   __loadInterceptLayouts?: readonly (() => Promise<unknown>)[] | null;
+  __loadInterceptLoadings?: readonly (() => Promise<unknown>)[] | null;
   matchedParams: AppPageParams;
   sourceMatchedParams?: AppPageParams;
   page: TPage;

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

@@ -212,10 +212,7 @@ function normalizeGenerateStaticParams(generateStaticParams) {
 async function validateAppPageDynamicParams(options) {
 	if (!options.enforceStaticParamsOnly || !options.isDynamicRoute) return null;
 	const generateStaticParamsSources = normalizeGenerateStaticParams(options.generateStaticParams);
-	if (generateStaticParamsSources.length === 0) {
-		options.clearRequestContext();
-		return notFoundResponse();
-	}
+	if (generateStaticParamsSources.length === 0) return notFoundResponse();
 	const chainedSources = generateStaticParamsSources.filter((source) => source.chained);
 	let chainedStaticParams = null;
 	if (chainedSources.length > 0) chainedStaticParams = await generateChainedStaticParams(chainedSources);
@@ -230,17 +227,11 @@ async function validateAppPageDynamicParams(options) {
 		const result = await generateIndependentStaticParams(sources, chainedStaticParams, options.params);
 		if (result.validated) {
 			validatedIndependentResults = true;
-			if (!areStaticParamsAllowed(options.params, result.staticParams, true)) {
-				options.clearRequestContext();
-				return notFoundResponse();
-			}
+			if (!areStaticParamsAllowed(options.params, result.staticParams, true)) return notFoundResponse();
 		}
 	}
 	if (chainedStaticParams && !validatedIndependentResults) {
-		if (!areStaticParamsAllowed(options.params, chainedStaticParams)) {
-			options.clearRequestContext();
-			return notFoundResponse();
-		}
+		if (!areStaticParamsAllowed(options.params, chainedStaticParams)) return notFoundResponse();
 	}
 	return null;
 }
@@ -307,7 +298,7 @@ async function resolveAppPageInterceptState(options) {
 		if (loadState) loadState.notFoundLoading = loading;
 		await loading;
 	}
-	if (intercept.__loadInterceptLayouts) await loadAppInterceptLayouts(intercept);
+	if (intercept.__loadInterceptLayouts || intercept.__loadInterceptLoadings) await loadAppInterceptLayouts(intercept);
 	const sourceRoute = await options.getSourceRoute(intercept.sourceRouteIndex);
 	if (!sourceRoute) return { kind: "none" };
 	if (sourceRoute === options.currentRoute) return {

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

@@ -40,6 +40,7 @@ type AppPageHtmlResponsePolicy = {
   shouldWriteToCache: boolean;
 } & AppPageResponsePolicy;
 type BuildAppPageRscResponseOptions = {
+  cacheTags?: readonly string[];
   dynamicStaleTimeSeconds?: number;
   isEdgeRuntime?: boolean;
   middlewareContext: AppPageMiddlewareContext;
@@ -51,6 +52,7 @@ type BuildAppPageRscResponseOptions = {
   timing?: AppPageResponseTiming;
 };
 type BuildAppPageHtmlResponseOptions = {
+  cacheTags?: readonly string[];
   draftCookie?: string | null; /** Combined preload `Link` header value (React hints + font preloads), already capped. */
   linkHeader?: string;
   isEdgeRuntime?: boolean;

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

@@ -1,6 +1,6 @@
-import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
-import { setCacheStateHeaders } from "./cache-headers.js";
+import { NEXT_CACHE_TAGS_HEADER, VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER, VINEXT_PRERENDER_CACHE_LIFE_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER, VINEXT_TIMING_HEADER } from "./headers.js";
 import { NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, buildRevalidateCacheControl } from "./cache-control.js";
+import { setCacheStateHeaders } from "./cache-headers.js";
 import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, applyRscDeploymentIdHeader } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 //#region src/server/app-page-response.ts
@@ -22,6 +22,9 @@ function applyPrerenderCacheLifeHeader(headers, requestCacheLife) {
 	if (payload.revalidate === void 0 && payload.expire === void 0) return;
 	headers.set(VINEXT_PRERENDER_CACHE_LIFE_HEADER, JSON.stringify(payload));
 }
+function applyPrerenderCacheTagsHeader(headers, cacheTags) {
+	if (cacheTags && cacheTags.length > 0) headers.set(NEXT_CACHE_TAGS_HEADER, cacheTags.join(","));
+}
 function resolveAppPageRscResponsePolicy(options) {
 	if (options.isDraftMode) return { cacheControl: NO_STORE_CACHE_CONTROL };
 	if (options.isForceDynamic || options.dynamicUsedDuringBuild) return { cacheControl: NO_STORE_CACHE_CONTROL };
@@ -104,6 +107,7 @@ function buildAppPageRscResponse(body, options) {
 	applyRscCompatibilityIdHeader(headers);
 	applyRscDeploymentIdHeader(headers);
 	applyPrerenderCacheLifeHeader(headers, options.requestCacheLife);
+	applyPrerenderCacheTagsHeader(headers, options.cacheTags);
 	applyTimingHeader(headers, options.timing);
 	return new Response(body, {
 		status: options.middlewareContext.status ?? 200,
@@ -122,6 +126,7 @@ function buildAppPageHtmlResponse(body, options) {
 	if (options.linkHeader) headers.set("Link", options.linkHeader);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareContext.headers);
 	applyPrerenderCacheLifeHeader(headers, options.requestCacheLife);
+	applyPrerenderCacheTagsHeader(headers, options.cacheTags);
 	applyTimingHeader(headers, options.timing);
 	return new Response(body, {
 		status: options.middlewareContext.status ?? 200,

package/dist/server/app-page-route-wiring.d.ts

@@ -1,10 +1,10 @@
 import { AppRouteSemanticIds } from "../routing/app-route-graph.js";
 import { AppElements, AppElementsInterception, AppElementsSlotBinding } from "./app-elements-wire.js";
+import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPageParams } from "./app-page-boundary.js";
 import { ThenableParamsObserver } from "../shims/thenable-params.js";
 import { Metadata, Viewport } from "../shims/metadata.js";
 import { AppLayoutParamAccessTracker } from "./app-layout-param-observation.js";
-import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPageRenderIdentity } from "./app-page-render-identity.js";
 import { resolveAppPageChildSegments } from "./app-page-segment-state.js";
 import { ComponentType, ReactNode } from "react";
@@ -37,6 +37,9 @@ type AppPageRouteWiringSlot<TModule extends AppPageModule = AppPageModule, TErro
   layout?: TModule | null;
   layoutIndex: number;
   loading?: TModule | null;
+  loadings?: readonly (TModule | null | undefined)[] | null;
+  loadingTreePositions?: readonly number[] | null;
+  ownerTreePosition?: number | null;
   notFound?: TModule | null;
   notFoundTreePosition?: number | null;
   page?: TModule | null;
@@ -59,6 +62,8 @@ type AppPageRouteWiringRoute<TModule extends AppPageModule = AppPageModule, TErr
   layoutTreePositions?: readonly number[] | null;
   layouts: readonly (TModule | null | undefined)[];
   loading?: TModule | null;
+  loadings?: readonly (TModule | null | undefined)[] | null;
+  loadingTreePositions?: readonly number[] | null;
   notFound?: TModule | null;
   notFounds?: readonly (TModule | null | undefined)[] | null;
   notFoundTreePosition?: number | null;
@@ -99,6 +104,8 @@ type AppPageSlotOverride<TModule extends AppPageModule = AppPageModule> = {
   branchSegments?: readonly string[] | null;
   layoutSegments?: readonly (readonly string[])[] | null;
   layoutModules?: readonly (TModule | null | undefined)[] | null;
+  loadingModules?: readonly (TModule | null | undefined)[] | null;
+  loadingTreePositions?: readonly number[] | null;
   /**
    * The page module to render for this slot. Optional — when omitted, the
    * slot's existing `page` is used (e.g. when the override only changes the
@@ -129,6 +136,7 @@ type BuildAppPageRouteElementOptions<TModule extends AppPageModule = AppPageModu
   resolvedMetadata: Metadata | null;
   resolvedMetadataPathname?: string;
   resolvedViewport: Viewport;
+  scriptNonce?: string;
   streamingMetadata?: Promise<Metadata | null> | null;
   streamingMetadataOutlet?: Promise<unknown> | null;
   streamingMetadataOutletSuspended?: boolean;
@@ -166,7 +174,7 @@ declare function createAppPageLayoutEntries<TModule extends AppPageModule, TErro
   unauthorizeds?: readonly (TModule | null | undefined)[] | null;
 }): AppPageLayoutEntry<TModule, TErrorModule>[];
 declare function createAppPageSourcePage(routeSegments: readonly string[] | null | undefined): string;
-declare function createAppPageRouteBodyMetadata(metadata: Metadata | null, pathname: string, metadataPlacement: "body" | "head", trailingSlash?: boolean): ReactNode;
+declare function createAppPageRouteBodyMetadata(metadata: Metadata | null, pathname: string, metadataPlacement: "body" | "head", trailingSlash?: boolean, scriptNonce?: string): ReactNode;
 declare function buildAppPageElements<TModule extends AppPageModule, TErrorModule extends AppPageErrorModule>(options: BuildAppPageElementsOptions<TModule, TErrorModule>): AppElements;
 //#endregion
 export { AppPageErrorModule, AppPageModule, AppPageRouteWiringRoute, AppPageSlotOverride, buildAppPageElements, createAppPageLayoutEntries, createAppPageRouteBodyMetadata, createAppPageSourcePage, createAppPageTreePath, probeAppPageLayoutWithTracking, resolveAppPageChildSegments };