vinext 0.1.8 → 0.2.1

package/dist/server/app-elements-wire.js

@@ -8,6 +8,7 @@ import { isValidElement } from "react";
 const APP_INTERCEPTION_SEPARATOR = "\0";
 const APP_ARTIFACT_COMPATIBILITY_KEY = "__artifactCompatibility";
 const APP_CACHE_ENTRY_REUSE_PROOF_KEY = "__cacheEntryReuseProof";
+const APP_DYNAMIC_STALE_TIME_KEY = "__dynamicStaleTime";
 const APP_INTERCEPTION_KEY = "__interception";
 const APP_INTERCEPTION_CONTEXT_KEY = "__interceptionContext";
 const APP_LAYOUT_IDS_KEY = "__layoutIds";
@@ -177,6 +178,7 @@ function createAppElementsWireMetadataEntries(input) {
 		[APP_INTERCEPTION_CONTEXT_KEY]: input.interceptionContext,
 		[APP_LAYOUT_IDS_KEY]: layoutIds,
 		[APP_ROOT_LAYOUT_KEY]: input.rootLayoutTreePath,
+		...input.dynamicStaleTimeSeconds === void 0 ? {} : { [APP_DYNAMIC_STALE_TIME_KEY]: input.dynamicStaleTimeSeconds },
 		...input.sourcePage === null || input.sourcePage === void 0 ? {} : { [APP_SOURCE_PAGE_KEY]: input.sourcePage }
 	};
 	const entriesWithInterception = input.interception ? {
@@ -319,6 +321,7 @@ function buildOutgoingAppPayload(input) {
 	if (skippedLayoutIds.size > 0) payload[APP_SKIPPED_LAYOUT_IDS_KEY] = [...skippedLayoutIds];
 	payload[APP_ARTIFACT_COMPATIBILITY_KEY] = input.artifactCompatibility ?? createArtifactCompatibilityEnvelope();
 	if (input.cacheEntryReuseProof) payload[APP_CACHE_ENTRY_REUSE_PROOF_KEY] = input.cacheEntryReuseProof;
+	if (input.dynamicStaleTimeSeconds !== void 0) payload[APP_DYNAMIC_STALE_TIME_KEY] = input.dynamicStaleTimeSeconds;
 	if (input.renderObservation) payload[APP_RENDER_OBSERVATION_KEY] = input.renderObservation;
 	return payload;
 }
@@ -394,10 +397,13 @@ function readAppElementsMetadata(elements) {
 	const interception = parseInterceptionMetadata(elements[APP_INTERCEPTION_KEY]);
 	const artifactCompatibility = readArtifactCompatibilityMetadata(elements[APP_ARTIFACT_COMPATIBILITY_KEY]);
 	const cacheEntryReuseProof = parseCacheEntryReuseProofMetadata(elements[APP_CACHE_ENTRY_REUSE_PROOF_KEY]);
+	const dynamicStaleTime = elements[APP_DYNAMIC_STALE_TIME_KEY];
+	const dynamicStaleTimeSeconds = typeof dynamicStaleTime === "number" && Number.isFinite(dynamicStaleTime) && dynamicStaleTime >= 0 ? dynamicStaleTime : void 0;
 	const sourcePage = readSourcePageMetadata(elements[APP_SOURCE_PAGE_KEY]);
 	return {
 		artifactCompatibility,
 		...cacheEntryReuseProof ? { cacheEntryReuseProof } : {},
+		...dynamicStaleTimeSeconds === void 0 ? {} : { dynamicStaleTimeSeconds },
 		interception,
 		interceptionContext: interceptionContext ?? null,
 		layoutIds,
@@ -413,6 +419,7 @@ const AppElementsWire = {
 	keys: {
 		artifactCompatibility: APP_ARTIFACT_COMPATIBILITY_KEY,
 		cacheEntryReuseProof: APP_CACHE_ENTRY_REUSE_PROOF_KEY,
+		dynamicStaleTime: APP_DYNAMIC_STALE_TIME_KEY,
 		interception: APP_INTERCEPTION_KEY,
 		interceptionContext: APP_INTERCEPTION_CONTEXT_KEY,
 		layoutIds: APP_LAYOUT_IDS_KEY,
@@ -440,4 +447,4 @@ const AppElementsWire = {
 	withLayoutFlags
 };
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags };

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

@@ -1,4 +1,4 @@
-import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
+import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementValue, AppElements, AppElementsInterception, AppElementsSlotBinding, AppElementsWire, AppOutgoingElements, AppWireElements, LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
 
 //#region src/server/app-elements.d.ts
 declare const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
@@ -6,4 +6,4 @@ declare function getMountedSlotIds(elements: AppElements): string[];
 declare function getMountedSlotIdsHeader(elements: AppElements): string | null;
 declare function resolveVisitedResponseInterceptionContext(requestInterceptionContext: string | null, payloadInterceptionContext: string | null): string | null;
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, type AppElementsInterception, type AppElementsSlotBinding, AppElementsWire, type AppOutgoingElements, type AppWireElements, type LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, type AppElementValue, type AppElements, type AppElementsInterception, type AppElementsSlotBinding, AppElementsWire, type AppOutgoingElements, type AppWireElements, type LayoutFlags, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };

package/dist/server/app-elements.js

@@ -1,11 +1,12 @@
-import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
+import { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, withLayoutFlags } from "./app-elements-wire.js";
 import { normalizeMountedSlotsHeader } from "./app-mounted-slots-header.js";
 //#region src/server/app-elements.ts
 const APP_PREFETCH_LOADING_SHELL_MARKER_KEY = "__prefetchLoadingShell";
 function getMountedSlotIds(elements) {
 	return Object.keys(elements).filter((key) => {
 		const value = elements[key];
-		return AppElementsWire.isSlotId(key) && value !== null && value !== void 0 && value !== UNMATCHED_SLOT;
+		const parsed = AppElementsWire.parseElementKey(key);
+		return parsed?.kind === "slot" && parsed.name !== "children" && value !== null && value !== void 0 && value !== UNMATCHED_SLOT;
 	}).sort();
 }
 function getMountedSlotIdsHeader(elements) {
@@ -15,4 +16,4 @@ function resolveVisitedResponseInterceptionContext(requestInterceptionContext, p
 	return payloadInterceptionContext ?? requestInterceptionContext;
 }
 //#endregion
-export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };
+export { APP_ARTIFACT_COMPATIBILITY_KEY, APP_CACHE_ENTRY_REUSE_PROOF_KEY, APP_DYNAMIC_STALE_TIME_KEY, APP_INTERCEPTION_CONTEXT_KEY, APP_INTERCEPTION_KEY, APP_LAYOUT_FLAGS_KEY, APP_LAYOUT_IDS_KEY, APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_RENDER_OBSERVATION_KEY, APP_ROOT_LAYOUT_KEY, APP_ROUTE_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_SLOT_BINDINGS_KEY, APP_SOURCE_PAGE_KEY, APP_STATIC_SIBLINGS_KEY, APP_UNMATCHED_SLOT_WIRE_VALUE, AppElementsWire, UNMATCHED_SLOT, buildOutgoingAppPayload, compareAppElementsSlotIds, getMountedSlotIds, getMountedSlotIdsHeader, isAppElementsRecord, normalizeAppElements, normalizeAppElementsSlotBindings, readAppElementsMetadata, resolveVisitedResponseInterceptionContext, withLayoutFlags };

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

@@ -33,7 +33,8 @@ type AppFallbackRendererOptions<TModule extends AppPageModule = AppPageModule> =
   createRscOnErrorHandler: (request: Request, pathname: string, routePath: string) => AppPageBoundaryOnError;
   fontProviders: AppFallbackRendererFontProviders;
   getNavigationContext: () => NavigationContext | null;
-  globalErrorModule?: TModule | null;
+  globalErrorModule?: TModule | null; /** Whether experimental.globalNotFound is enabled for route-miss 404s. */
+  globalNotFoundEnabled?: boolean;
   /**
    * 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

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

@@ -1,5 +1,6 @@
 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_NOT_FOUND_MODULE } from "./default-not-found-module.js";
 //#region src/server/app-fallback-renderer.ts
 const EMPTY_MW_CTX = {
@@ -7,7 +8,7 @@ const EMPTY_MW_CTX = {
 	status: null
 };
 function createAppFallbackRenderer(options) {
-	const { applyFileBasedMetadata, basePath = "", clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getNavigationContext, globalErrorModule, loadGlobalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader, trailingSlash } = options;
+	const { applyFileBasedMetadata, basePath = "", clearRequestContext, createRscOnErrorHandler: buildRscOnErrorHandler, fontProviders, getNavigationContext, globalErrorModule, globalNotFoundEnabled = false, loadGlobalNotFoundModule, makeThenableParams, metadataRoutes, resolveChildSegments, rootBoundaries, rscRenderer, sanitizer, ssrLoader, trailingSlash } = options;
 	const { rootForbiddenModule, rootLayouts, rootNotFoundModule, rootUnauthorizedModule } = rootBoundaries;
 	const effectiveGlobalErrorModule = globalErrorModule ?? DEFAULT_GLOBAL_ERROR_MODULE;
 	const effectiveRootNotFoundModule = rootNotFoundModule ?? DEFAULT_NOT_FOUND_MODULE;
@@ -19,7 +20,8 @@ function createAppFallbackRenderer(options) {
 	}
 	return {
 		async renderHttpAccessFallback(route, statusCode, isRscRequest, request, opts, scriptNonce, middlewareContext, callContext) {
-			if (statusCode === 404 && !!loadGlobalNotFoundModule && !route && !opts?.boundaryComponent) {
+			const useGlobalNotFound = statusCode === 404 && globalNotFoundEnabled && !route && !opts?.boundaryComponent;
+			if (useGlobalNotFound && loadGlobalNotFoundModule) {
 				const globalNotFoundModule = await resolveGlobalNotFoundModule();
 				const globalNotFoundComponent = globalNotFoundModule?.default ?? null;
 				if (globalNotFoundComponent) return renderAppPageHttpAccessFallback({
@@ -57,6 +59,7 @@ function createAppFallbackRenderer(options) {
 					statusCode
 				});
 			}
+			const routeMissRootNotFoundModule = useGlobalNotFound ? DEFAULT_GLOBAL_NOT_FOUND_MODULE : effectiveRootNotFoundModule;
 			return renderAppPageHttpAccessFallback({
 				applyFileBasedMetadata,
 				basePath,
@@ -75,7 +78,7 @@ function createAppFallbackRenderer(options) {
 				globalErrorModule: effectiveGlobalErrorModule,
 				isEdgeRuntime: callContext?.isEdgeRuntime,
 				isRscRequest,
-				layoutModules: opts?.layouts ?? null,
+				layoutModules: useGlobalNotFound ? [] : opts?.layouts ?? null,
 				loadSsrHandler: ssrLoader,
 				makeThenableParams,
 				matchedParams: opts?.matchedParams ?? route?.params ?? {},
@@ -84,12 +87,13 @@ function createAppFallbackRenderer(options) {
 				requestUrl: request.url,
 				resolveChildSegments,
 				rootForbiddenModule,
-				rootLayouts,
-				rootNotFoundModule: effectiveRootNotFoundModule,
+				rootLayouts: useGlobalNotFound ? [] : rootLayouts,
+				rootNotFoundModule: routeMissRootNotFoundModule,
 				rootUnauthorizedModule,
-				route,
+				route: useGlobalNotFound ? null : route,
 				renderToReadableStream: rscRenderer,
 				scriptNonce,
+				skipLayoutWrapping: useGlobalNotFound,
 				sourcePageSegments: callContext?.sourcePageSegments,
 				statusCode
 			});

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

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

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

@@ -0,0 +1,43 @@
+//#region src/server/app-hydration-cache-publication.ts
+function createHydrationCachePublication() {
+	let state = "pending";
+	let pendingPublication = null;
+	let invalidatePublishedCandidate = null;
+	const publishPendingCandidate = () => {
+		if (state !== "committed" && state !== "complete" || pendingPublication === null) return;
+		const publishCandidate = pendingPublication;
+		pendingPublication = null;
+		invalidatePublishedCandidate = publishCandidate();
+	};
+	return {
+		commit() {
+			if (state !== "pending") return;
+			state = "committed";
+			publishPendingCandidate();
+		},
+		complete() {
+			if (state === "committed") state = "complete";
+		},
+		fail() {
+			if (state === "complete" || state === "invalidated") return;
+			state = "invalidated";
+			pendingPublication = null;
+			invalidatePublishedCandidate?.();
+			invalidatePublishedCandidate = null;
+		},
+		invalidate() {
+			if (state === "invalidated") return;
+			state = "invalidated";
+			pendingPublication = null;
+			invalidatePublishedCandidate?.();
+			invalidatePublishedCandidate = null;
+		},
+		publish(publishCandidate) {
+			if (state === "invalidated") return;
+			pendingPublication = publishCandidate;
+			publishPendingCandidate();
+		}
+	};
+}
+//#endregion
+export { createHydrationCachePublication };

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

@@ -12,11 +12,11 @@ type ApplyAppMiddlewareOptions = {
   basePath?: string;
   cleanPathname: string;
   context: AppMiddlewareContext;
+  hadBasePath?: boolean;
   i18nConfig?: NextI18nConfig | null;
   /**
-   * Whether the inbound request was a `_next/data` fetch. Captured from the
-   * raw incoming headers by the caller, because `x-nextjs-data` is in
-   * INTERNAL_HEADERS and is stripped before this function runs.
+   * Whether the inbound request was recognized as a `_next/data` fetch from
+   * trusted URL normalization before internal headers were stripped.
    */
   isDataRequest?: boolean;
   filePath?: string;
@@ -34,6 +34,7 @@ type ApplyAppMiddlewareOptions = {
 type ApplyAppMiddlewareResult = {
   kind: "continue";
   cleanPathname: string;
+  rewritten: boolean;
   search: string | null;
 } | {
   kind: "response";

package/dist/server/app-middleware.js

@@ -1,5 +1,6 @@
-import { FLIGHT_HEADERS, VINEXT_MW_CTX_HEADER } from "./headers.js";
-import { buildRequestHeadersFromMiddlewareResponse } from "./middleware-request-headers.js";
+import { VINEXT_MW_CTX_HEADER } from "../utils/protocol-headers.js";
+import { FLIGHT_HEADERS } from "./headers.js";
+import { buildRequestHeadersFromMiddlewareResponse } from "../utils/middleware-request-headers.js";
 import { isExternalUrl, proxyExternalRequest } from "../config/config-matchers.js";
 import { internalServerErrorResponse } from "./http-error-responses.js";
 import { cloneRequestWithHeaders, processMiddlewareHeaders } from "./request-pipeline.js";
@@ -100,6 +101,7 @@ async function applyAppMiddleware(options) {
 	const forwarded = applyForwardedMiddlewareContext(options.request, options.context);
 	const middlewareRequest = requestWithoutFlightHeaders(options.request);
 	let cleanPathname = options.cleanPathname;
+	let rewritten = false;
 	let search = null;
 	if (forwarded.rewriteUrl) try {
 		if (isExternalMiddlewareRewrite(forwarded.rewriteUrl, middlewareRequest)) return {
@@ -108,6 +110,7 @@ async function applyAppMiddleware(options) {
 		};
 		const rewriteParsed = new URL(forwarded.rewriteUrl, middlewareRequest.url);
 		cleanPathname = rewriteParsed.pathname;
+		rewritten = true;
 		search = rewriteParsed.search;
 	} catch (e) {
 		console.error("[vinext] Failed to apply forwarded middleware rewrite:", e);
@@ -116,7 +119,7 @@ async function applyAppMiddleware(options) {
 	if (!forwarded.applied) {
 		const result = await executeMiddleware({
 			basePath: options.basePath,
-			hadBasePath: true,
+			hadBasePath: options.hadBasePath ?? true,
 			filePath: options.filePath,
 			i18nConfig: options.i18nConfig,
 			isDataRequest: options.isDataRequest,
@@ -150,6 +153,7 @@ async function applyAppMiddleware(options) {
 			};
 			const rewriteParsed = new URL(result.rewriteUrl, middlewareRequest.url);
 			cleanPathname = rewriteParsed.pathname;
+			rewritten = true;
 			search = rewriteParsed.search;
 		}
 	}
@@ -161,6 +165,7 @@ async function applyAppMiddleware(options) {
 	return {
 		kind: "continue",
 		cleanPathname,
+		rewritten,
 		search
 	};
 }

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

@@ -1,9 +1,9 @@
 import { buildParams, decodeMatchedParams, splitPathnameForRouteMatch } from "../routing/utils.js";
 import { stripBasePath } from "../utils/base-path.js";
-import { matchRoutePattern } from "../routing/route-pattern.js";
 import { isUnknownRecord } from "../utils/record.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
+import { matchRoutePattern } from "../routing/route-pattern.js";
 import { stripRscCacheBustingSearchParam, stripRscSuffix } from "./app-rsc-cache-busting.js";
 import { Suspense, createElement, isValidElement } from "react";
 //#region src/server/app-optimistic-routing.ts
@@ -162,8 +162,15 @@ function elementHasSuspenseFallback(value, depth = 0) {
 	if (!isUnknownRecord(props)) return false;
 	return elementHasSuspenseFallback(Reflect.get(props, "children"), depth + 1);
 }
-function getPageElementIds(elements) {
-	return Object.keys(elements).filter((key) => AppElementsWire.parseElementKey(key)?.kind === "page").sort();
+function getPageElementIds(elements, route) {
+	const pageElementIds = /* @__PURE__ */ new Set();
+	if (route.pageId && Object.hasOwn(elements, route.pageId)) pageElementIds.add(route.pageId);
+	for (const slotId of route.slotIds) {
+		const parsed = AppElementsWire.parseElementKey(slotId);
+		if (parsed?.kind === "slot" && parsed.name === "children" && Object.hasOwn(elements, slotId)) pageElementIds.add(slotId);
+	}
+	for (const key of Object.keys(elements)) if (AppElementsWire.parseElementKey(key)?.kind === "page") pageElementIds.add(key);
+	return Array.from(pageElementIds).sort();
 }
 function OptimisticRouteSegment() {
 	throw OPTIMISTIC_ROUTE_SEGMENT_SUSPENSE_TRIGGER;
@@ -182,7 +189,7 @@ function createOptimisticRouteTemplate(options) {
 	if (!options.allowLoadingShell && !elementHasSuspenseFallback(routeElement)) return null;
 	if (options.allowLoadingShell && options.elements["__prefetchLoadingShell"] !== "LoadingBoundary") return null;
 	if (options.allowLoadingShell && (routeElement === void 0 || routeElement === null)) return null;
-	const pageElementIds = getPageElementIds(options.elements);
+	const pageElementIds = getPageElementIds(options.elements, match.route);
 	if (pageElementIds.length === 0) return null;
 	return {
 		elements: options.elements,

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

@@ -1,6 +1,6 @@
 import { runWithFetchDedupe } from "../shims/fetch-cache.js";
 import { resolveAppPageSegmentParams } from "./app-page-params.js";
-import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.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";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 //#region src/server/app-page-boundary.ts
@@ -109,6 +109,7 @@ async function renderAppPageBoundaryResponse(options) {
 		applyEdgeRuntimeHeader(headers, options.isEdgeRuntime);
 		mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);
 		applyRscCompatibilityIdHeader(headers);
+		applyRscDeploymentIdHeader(headers);
 		return new Response(rscStream, {
 			status: options.status,
 			headers

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

@@ -50,6 +50,7 @@ type ScheduleAppPageRscCacheWriteOptions = {
   isrSet: AppPageCacheSetter;
   interceptionContext?: string | null;
   mountedSlotsHeader?: string | null;
+  omitPendingDynamicCacheState?: boolean;
   renderMode?: AppRscRenderMode;
   preserveClientResponseHeaders?: boolean;
   expireSeconds?: number;

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

@@ -63,7 +63,8 @@ function finalizeAppPageHtmlCacheResponse(response, options) {
 				cacheTags: pageTags,
 				state: observationState
 			});
-			const writes = [options.isrSet(htmlKey, buildAppPageCacheValue(cachedHtml, void 0, 200, htmlRenderObservation), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)];
+			const linkHeader = response.headers.get("link");
+			const writes = [options.isrSet(htmlKey, buildAppPageCacheValue(cachedHtml, void 0, 200, htmlRenderObservation, linkHeader ? { link: linkHeader } : void 0), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)];
 			if (options.capturedRscDataPromise) writes.push(options.capturedRscDataPromise.then((rscData) => options.isrSet(rscKey, buildAppPageCacheValue("", rscData, 200, rscRenderObservation), cachePolicy.revalidateSeconds, pageTags, cachePolicy.expireSeconds)));
 			await Promise.all(writes);
 			options.isrDebug?.("HTML cache written", htmlKey);
@@ -82,7 +83,7 @@ function finalizeAppPageRscCacheResponse(response, options) {
 	if (!scheduleAppPageRscCacheWrite(options)) return response;
 	if (options.preserveClientResponseHeaders === true) return response;
 	const clientHeaders = new Headers(response.headers);
-	applyPendingDynamicCdnHeaders(clientHeaders, options.getPageTags());
+	applyPendingDynamicCdnHeaders(clientHeaders, options.getPageTags(), { omitCacheState: options.omitPendingDynamicCacheState === true });
 	return new Response(response.body, {
 		status: response.status,
 		statusText: response.statusText,
@@ -91,8 +92,8 @@ function finalizeAppPageRscCacheResponse(response, options) {
 }
 function scheduleAppPageRscCacheWrite(options) {
 	const capturedRscDataPromise = options.capturedRscDataPromise;
-	if (!capturedRscDataPromise || options.dynamicUsedDuringBuild) return false;
-	const rscKey = options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode, options.interceptionContext);
+	if (!capturedRscDataPromise || options.dynamicUsedDuringBuild || options.mountedSlotsHeader) return false;
+	const rscKey = options.isrRscKey(options.cleanPathname, null, options.renderMode, options.interceptionContext);
 	const cachePromise = (async () => {
 		try {
 			const rscData = await capturedRscDataPromise;

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

@@ -38,6 +38,7 @@ type RenderAppPageCacheArtifactsResult = {
   cacheControl?: CacheControlMetadata;
   html: string;
   htmlRenderObservation: ReturnType<typeof createAppPageRenderObservation>;
+  linkHeader?: string;
   rscData?: ArrayBuffer;
   rscRenderObservation?: ReturnType<typeof createAppPageRenderObservation>;
   tags: string[];

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

@@ -2,9 +2,9 @@ import { consumeDynamicUsage, consumeInvalidDynamicUsageError } from "../shims/h
 import { _consumeRequestScopedCacheLife } from "../shims/cache-request-state.js";
 import { getCollectedFetchTags } from "../shims/fetch-cache.js";
 import { readStreamAsText } from "../utils/text-stream.js";
-import { teeAppPageRscStreamForCapture } from "./app-page-execution.js";
+import { buildAppPageFontLinkHeader, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
 import { consumeAppPageRenderObservationState, createAppPageHtmlOutputScope, createAppPageRenderObservation, createAppPageRscOutputScope } from "./app-page-render-observation.js";
-import { isAppSsrRenderResult } from "./app-page-stream.js";
+import { buildAppPageLinkHeader, isAppSsrRenderResult } from "./app-page-stream.js";
 import { buildAppPageTags } from "./implicit-tags.js";
 //#region src/server/app-page-cache-render.ts
 /**
@@ -16,10 +16,11 @@ import { buildAppPageTags } from "./implicit-tags.js";
 async function renderAppPageCacheArtifacts(options) {
 	const rscCapture = teeAppPageRscStreamForCapture(options.renderToReadableStream(options.element, { onError: options.onError }), options.captureRscData);
 	const capturedRscDataRef = { value: null };
+	const fontPreloads = options.getFontPreloads();
 	const htmlResult = await (await options.loadSsrHandler()).handleSsr(rscCapture.ssrStream, options.getNavigationContext(), {
 		links: options.getFontLinks(),
 		styles: options.getFontStyles(),
-		preloads: options.getFontPreloads()
+		preloads: fontPreloads
 	}, {
 		basePath: options.basePath,
 		clientTraceMetadata: options.clientTraceMetadata,
@@ -31,7 +32,9 @@ async function renderAppPageCacheArtifacts(options) {
 			capturedRscDataRef
 		} : {}
 	});
-	const html = await readStreamAsText(isAppSsrRenderResult(htmlResult) ? htmlResult.htmlStream : htmlResult);
+	const htmlStream = isAppSsrRenderResult(htmlResult) ? htmlResult.htmlStream : htmlResult;
+	const linkHeader = buildAppPageLinkHeader(isAppSsrRenderResult(htmlResult) ? htmlResult.linkHeader : void 0, buildAppPageFontLinkHeader(fontPreloads), options.reactMaxHeadersLength);
+	const html = await readStreamAsText(htmlStream);
 	let rscData;
 	if (options.captureRscData) {
 		const capturedPromise = capturedRscDataRef.value;
@@ -60,6 +63,7 @@ async function renderAppPageCacheArtifacts(options) {
 			params: options.navigationParams,
 			state: observationState
 		}),
+		...linkHeader ? { linkHeader } : {},
 		tags,
 		cacheControl: typeof cacheLife?.revalidate === "number" ? {
 			revalidate: cacheLife.revalidate,

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

@@ -25,6 +25,7 @@ type AppPageCacheRenderResult = {
   cacheControl?: CacheControlMetadata;
   html: string;
   htmlRenderObservation?: RenderObservation;
+  linkHeader?: string;
   rscData: ArrayBuffer;
   rscRenderObservation?: RenderObservation;
   tags: string[];

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

@@ -4,7 +4,7 @@ import { applyCdnResponseHeaders } from "./cache-control.js";
 import { decideIsr } from "./isr-decision.js";
 import { buildAppPageCacheValue } from "./isr-cache.js";
 import { encodeCacheTag } from "../utils/encode-cache-tag.js";
-import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader } from "./app-rsc-cache-busting.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";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { hasCompleteNegativeRequestApiProof } from "./cache-proof.js";
@@ -19,7 +19,7 @@ function recordAppPageCacheOutcome(recordCacheOutcome, input) {
 function buildAppPageCacheTags(pathname, extraTags) {
 	const tags = [
 		pathname,
-		`_N_T_${pathname}`,
+		`_N_T_${pathname.length > 1 && pathname.endsWith("/") ? pathname.slice(0, -1) : pathname}`,
 		"_N_T_/layout"
 	];
 	const segments = pathname.split("/");
@@ -43,6 +43,8 @@ function buildAppPageCachedHeaders(options) {
 	applyCdnResponseHeaders(headers, { cacheControl: options.cacheControl });
 	setCacheStateHeaders(headers, options.cacheState);
 	applyEdgeRuntimeHeader(headers, options.isEdgeRuntime);
+	if (options.linkHeader) if (Array.isArray(options.linkHeader)) for (const value of options.linkHeader) headers.append("Link", value);
+	else headers.set("Link", options.linkHeader);
 	if (options.mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, options.mountedSlotsHeader);
 	mergeMiddlewareResponseHeaders(headers, options.middlewareHeaders ?? null);
 	return headers;
@@ -53,6 +55,15 @@ function getCachedAppPageValue(entry) {
 function hasQueryInvariantAppPageProof(cachedValue) {
 	return cachedValue.renderObservation !== void 0 && hasCompleteNegativeRequestApiProof(cachedValue.renderObservation, ["searchParams"]);
 }
+function resolveRegeneratedAppPageCachePolicy(options) {
+	let revalidateSeconds = options.routeRevalidateSeconds;
+	const renderRevalidateSeconds = options.renderCacheControl?.revalidate;
+	if (renderRevalidateSeconds !== void 0) revalidateSeconds = revalidateSeconds > 0 ? Math.min(revalidateSeconds, renderRevalidateSeconds) : renderRevalidateSeconds;
+	return {
+		expireSeconds: options.renderCacheControl?.expire ?? options.expireSeconds,
+		revalidateSeconds
+	};
+}
 function buildAppPageCachedResponse(cachedValue, options) {
 	const status = options.middlewareStatus ?? (cachedValue.status || 200);
 	const { cacheControl } = decideIsr({
@@ -73,6 +84,7 @@ function buildAppPageCachedResponse(cachedValue, options) {
 			mountedSlotsHeader: options.mountedSlotsHeader
 		});
 		applyRscCompatibilityIdHeader(rscHeaders);
+		applyRscDeploymentIdHeader(rscHeaders);
 		return new Response(cachedValue.rscData, {
 			status,
 			headers: rscHeaders
@@ -84,6 +96,7 @@ function buildAppPageCachedResponse(cachedValue, options) {
 		cacheState: options.cacheState,
 		contentType: "text/html; charset=utf-8",
 		isEdgeRuntime: options.isEdgeRuntime,
+		linkHeader: cachedValue.headers?.link,
 		middlewareHeaders: options.middlewareHeaders
 	});
 	return new Response(cachedValue.html, {
@@ -115,7 +128,11 @@ async function serveAppPageCachedHtml(options, transformValue) {
 	return response;
 }
 async function readAppPageCacheResponse(options) {
-	const isrKey = options.isRscRequest ? options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode, options.interceptionContext) : options.isrHtmlKey(options.cleanPathname);
+	if (options.isRscRequest && options.mountedSlotsHeader) {
+		options.isrDebug?.("MISS (mounted slots RSC variant)", options.cleanPathname);
+		return null;
+	}
+	const isrKey = options.isRscRequest ? options.isrRscKey(options.cleanPathname, null, options.renderMode, options.interceptionContext) : options.isrHtmlKey(options.cleanPathname);
 	const artifact = options.isRscRequest ? "rsc" : "html";
 	try {
 		const cached = await options.isrGet(isrKey);
@@ -174,10 +191,13 @@ async function readAppPageCacheResponse(options) {
 		if (cached?.isStale && cachedValue) {
 			options.scheduleBackgroundRegeneration(isrKey, async () => {
 				const revalidatedPage = await options.renderFreshPageForCache();
-				const revalidateSeconds = revalidatedPage.cacheControl?.revalidate ?? options.revalidateSeconds;
-				const expireSeconds = revalidatedPage.cacheControl?.expire ?? options.expireSeconds;
-				const writes = [options.isrSet(options.isRscRequest ? isrKey : options.isrRscKey(options.cleanPathname, options.mountedSlotsHeader, options.renderMode, options.interceptionContext), buildAppPageCacheValue("", revalidatedPage.rscData, 200, revalidatedPage.rscRenderObservation), revalidateSeconds, revalidatedPage.tags, expireSeconds)];
-				if (!options.isRscRequest) writes.push(options.isrSet(isrKey, buildAppPageCacheValue(revalidatedPage.html, void 0, 200, revalidatedPage.htmlRenderObservation), revalidateSeconds, revalidatedPage.tags, expireSeconds));
+				const cachePolicy = resolveRegeneratedAppPageCachePolicy({
+					expireSeconds: options.expireSeconds,
+					renderCacheControl: revalidatedPage.cacheControl,
+					routeRevalidateSeconds: options.revalidateSeconds
+				});
+				const writes = [options.isrSet(options.isRscRequest ? isrKey : options.isrRscKey(options.cleanPathname, null, options.renderMode, options.interceptionContext), buildAppPageCacheValue("", revalidatedPage.rscData, 200, revalidatedPage.rscRenderObservation), cachePolicy.revalidateSeconds, revalidatedPage.tags, cachePolicy.expireSeconds)];
+				if (!options.isRscRequest) writes.push(options.isrSet(isrKey, buildAppPageCacheValue(revalidatedPage.html, void 0, 200, revalidatedPage.htmlRenderObservation, revalidatedPage.linkHeader ? { link: revalidatedPage.linkHeader } : void 0), cachePolicy.revalidateSeconds, revalidatedPage.tags, cachePolicy.expireSeconds));
 				await Promise.all(writes);
 				options.isrDebug?.("regen complete", options.cleanPathname);
 			});

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

@@ -199,6 +199,7 @@ type DispatchAppPageOptions<TRoute extends AppPageDispatchRoute> = {
   }>;
   request: Request;
   revalidateSeconds: number | null;
+  renderedPathAndSearch?: string | null;
   resolveRouteFetchCacheMode?: (route: TRoute) => FetchCacheMode | null;
   resolveRouteDynamicConfig?: (route: TRoute) => string | null | undefined;
   rootForbiddenModule?: AppPageModule | null;