vinext 0.0.55 → 0.1.1

package/dist/server/app-ppr-fallback-shell.js

@@ -0,0 +1,82 @@
+import { createInlineScriptTag } from "./html.js";
+import { createNavigationRuntimeRscMetadataScript } from "./app-ssr-stream.js";
+//#region src/server/app-ppr-fallback-shell.ts
+function routeRootParamNames(route) {
+	return new Set(route.rootParamNames ?? []);
+}
+function placeholderForParam(part, paramName) {
+	if (part.endsWith("+")) return [`[...${paramName}]`];
+	if (part.endsWith("*")) return [`[[...${paramName}]]`];
+	return `[${paramName}]`;
+}
+function pushParamValue(segments, value) {
+	if (Array.isArray(value)) {
+		if (value.length === 0) return false;
+		segments.push(...value.map((item) => encodeURIComponent(item)));
+		return true;
+	}
+	if (typeof value !== "string") return false;
+	segments.push(encodeURIComponent(value));
+	return true;
+}
+function createAppPprFallbackShell(route, matchedParams) {
+	return createAppPprFallbackShells(route, matchedParams).at(-1) ?? null;
+}
+function createAppPprFallbackShells(route, matchedParams) {
+	const rootParamNames = routeRootParamNames(route);
+	if (rootParamNames.size === 0) return [];
+	let minKeptParamCount = 0;
+	for (const rootParamName of rootParamNames) {
+		const rootParamIndex = route.params.indexOf(rootParamName);
+		if (rootParamIndex === -1 || matchedParams[rootParamName] === void 0) return [];
+		minKeptParamCount = Math.max(minKeptParamCount, rootParamIndex + 1);
+	}
+	if (minKeptParamCount >= route.params.length) return [];
+	const shells = [];
+	for (let keptParamCount = route.params.length - 1; keptParamCount >= minKeptParamCount; keptParamCount--) {
+		const keptParamNames = new Set(route.params.slice(0, keptParamCount));
+		const fallbackParamNames = route.params.filter((name) => !keptParamNames.has(name));
+		if (fallbackParamNames.length === 0) continue;
+		const fallbackParamNameSet = new Set(fallbackParamNames);
+		const segments = [];
+		const fallbackParams = {};
+		let isValidShell = true;
+		for (const part of route.pattern.split("/").filter(Boolean)) {
+			if (part.startsWith(":")) {
+				const paramName = part.endsWith("+") || part.endsWith("*") ? part.slice(1, -1) : part.slice(1);
+				if (fallbackParamNameSet.has(paramName)) {
+					const placeholder = placeholderForParam(part, paramName);
+					segments.push(...Array.isArray(placeholder) ? placeholder : [placeholder]);
+					fallbackParams[paramName] = placeholder;
+					continue;
+				}
+				const value = matchedParams[paramName];
+				if (!pushParamValue(segments, value)) {
+					isValidShell = false;
+					break;
+				}
+				fallbackParams[paramName] = value;
+				continue;
+			}
+			segments.push(part);
+		}
+		if (!isValidShell) continue;
+		shells.push({
+			fallbackParamNames,
+			pathname: "/" + segments.join("/"),
+			params: fallbackParams
+		});
+	}
+	return shells;
+}
+function rewriteAppPprFallbackShellHtmlNavigation(options) {
+	const metadataScript = createInlineScriptTag(createNavigationRuntimeRscMetadataScript(options.params, {
+		pathname: options.pathname,
+		searchParams: [...options.searchParams.entries()]
+	}));
+	const headCloseIndex = options.html.indexOf("</head>");
+	if (headCloseIndex !== -1) return options.html.slice(0, headCloseIndex) + metadataScript + options.html.slice(headCloseIndex);
+	return metadataScript + options.html;
+}
+//#endregion
+export { createAppPprFallbackShell, createAppPprFallbackShells, rewriteAppPprFallbackShellHtmlNavigation };

package/dist/server/app-prerender-endpoints.d.ts

@@ -15,5 +15,4 @@ type HandleAppPrerenderEndpointOptions = {
 };
 declare function handleAppPrerenderEndpoint(request: Request, options: HandleAppPrerenderEndpointOptions): Promise<Response | null>;
 //#endregion
-export { handleAppPrerenderEndpoint };
-//# sourceMappingURL=app-prerender-endpoints.d.ts.map
+export { handleAppPrerenderEndpoint };

package/dist/server/app-prerender-endpoints.js

@@ -93,5 +93,3 @@ function isStringArray(value) {
 }
 //#endregion
 export { handleAppPrerenderEndpoint };
-
-//# sourceMappingURL=app-prerender-endpoints.js.map

package/dist/server/app-prerender-static-params.d.ts

@@ -4,6 +4,20 @@ import { RootParams } from "../shims/root-params.js";
 type GenerateStaticParamsFunction = (input: {
   params: RootParams;
 }) => unknown;
+/**
+ * Build a prerender `generateStaticParams` resolver for one route pattern.
+ *
+ * `sources` may mix eager functions (layout `generateStaticParams`, which stay
+ * eagerly imported) and lazy `{ load }` page sources (code-split page modules).
+ * Lazy sources are imported once on first invocation. The returned resolver:
+ *
+ *  - returns `null` when, after resolving every source, no `generateStaticParams`
+ *    export exists for the pattern — the sentinel the prerender driver uses to
+ *    skip the route (or error under `output: export`);
+ *  - otherwise composes all sources into the cartesian set of param objects.
+ *
+ * Returns `null` (no resolver) only when the pattern has zero sources at all.
+ */
 declare function createAppPrerenderStaticParamsResolver(sources: readonly unknown[], rootParamNames?: readonly string[]): GenerateStaticParamsFunction | null;
 type CallAppPrerenderStaticParamsOptions = {
   fn: GenerateStaticParamsFunction;
@@ -13,5 +27,4 @@ type CallAppPrerenderStaticParamsOptions = {
 };
 declare function callAppPrerenderStaticParams(options: CallAppPrerenderStaticParamsOptions): Promise<unknown>;
 //#endregion
-export { callAppPrerenderStaticParams, createAppPrerenderStaticParamsResolver };
-//# sourceMappingURL=app-prerender-static-params.d.ts.map
+export { callAppPrerenderStaticParams, createAppPrerenderStaticParamsResolver };

package/dist/server/app-prerender-static-params.js

@@ -1,29 +1,62 @@
+import { isUnknownRecord } from "../utils/record.js";
 import { pickRootParams, runWithRootParamsScope } from "../shims/root-params.js";
 //#region src/server/app-prerender-static-params.ts
 function isGenerateStaticParamsFunction(value) {
 	return typeof value === "function";
 }
+function isLazyStaticParamsSource(value) {
+	return typeof value === "object" && value !== null && "load" in value && typeof value.load === "function";
+}
 function isRootParams(value) {
-	return value !== null && typeof value === "object" && !Array.isArray(value);
+	return isUnknownRecord(value);
 }
+/**
+* Build a prerender `generateStaticParams` resolver for one route pattern.
+*
+* `sources` may mix eager functions (layout `generateStaticParams`, which stay
+* eagerly imported) and lazy `{ load }` page sources (code-split page modules).
+* Lazy sources are imported once on first invocation. The returned resolver:
+*
+*  - returns `null` when, after resolving every source, no `generateStaticParams`
+*    export exists for the pattern — the sentinel the prerender driver uses to
+*    skip the route (or error under `output: export`);
+*  - otherwise composes all sources into the cartesian set of param objects.
+*
+* Returns `null` (no resolver) only when the pattern has zero sources at all.
+*/
 function createAppPrerenderStaticParamsResolver(sources, rootParamNames) {
-	const generateStaticParamsFns = sources.filter(isGenerateStaticParamsFunction);
-	if (generateStaticParamsFns.length === 0) return null;
+	const usableSources = sources.filter((source) => isGenerateStaticParamsFunction(source) || isLazyStaticParamsSource(source));
+	if (usableSources.length === 0) return null;
 	const filterRootParams = (params) => pickRootParams(params, rootParamNames ?? []);
-	if (generateStaticParamsFns.length === 1) {
-		const single = generateStaticParamsFns[0];
-		return async (input) => {
+	let resolvedFns = null;
+	let resolvePromise = null;
+	const resolveFns = () => {
+		if (resolvedFns) return Promise.resolve(resolvedFns);
+		if (!resolvePromise) resolvePromise = (async () => {
+			resolvedFns = (await Promise.all(usableSources.map(async (source) => {
+				if (isGenerateStaticParamsFunction(source)) return source;
+				const mod = await source.load();
+				const fn = mod && typeof mod === "object" ? mod.generateStaticParams : void 0;
+				return isGenerateStaticParamsFunction(fn) ? fn : null;
+			}))).filter((fn) => fn !== null);
+			return resolvedFns;
+		})();
+		return resolvePromise;
+	};
+	return async (input) => {
+		const fns = await resolveFns();
+		if (fns.length === 0) return null;
+		if (fns.length === 1) {
+			const single = fns[0];
 			return runWithRootParamsScope(filterRootParams(input.params), async () => {
 				const result = await single(input);
 				if (!Array.isArray(result)) return [];
 				for (const item of result) if (!isRootParams(item)) return [];
 				return result;
 			});
-		};
-	}
-	return async ({ params }) => {
-		let paramSets = [params];
-		for (const generateStaticParams of generateStaticParamsFns) {
+		}
+		let paramSets = [input.params];
+		for (const generateStaticParams of fns) {
 			const nextParamSets = [];
 			for (const parentParams of paramSets) {
 				const result = await runWithRootParamsScope(filterRootParams(parentParams), async () => generateStaticParams({ params: parentParams }));
@@ -46,5 +79,3 @@ async function callAppPrerenderStaticParams(options) {
 }
 //#endregion
 export { callAppPrerenderStaticParams, createAppPrerenderStaticParamsResolver };
-
-//# sourceMappingURL=app-prerender-static-params.js.map

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

@@ -5,9 +5,10 @@ type AppRenderDependency = {
   promise: Promise<void>;
   release: () => void;
 };
+declare function registerAppElementRenderDependencies(elements: Readonly<Record<string, unknown>>, dependenciesByElementId: ReadonlyMap<string, AppRenderDependency>): void;
+declare function releaseAppElementRenderDependency(elements: Readonly<Record<string, unknown>>, elementId: string): void;
 declare function createAppRenderDependency(): AppRenderDependency;
 declare function renderAfterAppDependencies(children: ReactNode, dependencies: readonly AppRenderDependency[]): ReactNode;
 declare function renderWithAppDependencyBarrier(children: ReactNode, dependency: AppRenderDependency): ReactNode;
 //#endregion
-export { AppRenderDependency, createAppRenderDependency, renderAfterAppDependencies, renderWithAppDependencyBarrier };
-//# sourceMappingURL=app-render-dependency.d.ts.map
+export { AppRenderDependency, createAppRenderDependency, registerAppElementRenderDependencies, releaseAppElementRenderDependency, renderAfterAppDependencies, renderWithAppDependencyBarrier };

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

@@ -1,5 +1,13 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 //#region src/server/app-render-dependency.tsx
+const appElementRenderDependencies = /* @__PURE__ */ new WeakMap();
+function registerAppElementRenderDependencies(elements, dependenciesByElementId) {
+	if (dependenciesByElementId.size === 0) return;
+	appElementRenderDependencies.set(elements, dependenciesByElementId);
+}
+function releaseAppElementRenderDependency(elements, elementId) {
+	appElementRenderDependencies.get(elements)?.get(elementId)?.release();
+}
 function createAppRenderDependency() {
 	let released = false;
 	let resolve;
@@ -30,6 +38,4 @@ function renderWithAppDependencyBarrier(children, dependency) {
 	return /* @__PURE__ */ jsxs(Fragment, { children: [children, /* @__PURE__ */ jsx(ReleaseAppRenderDependency, {})] });
 }
 //#endregion
-export { createAppRenderDependency, renderAfterAppDependencies, renderWithAppDependencyBarrier };
-
-//# sourceMappingURL=app-render-dependency.js.map
+export { createAppRenderDependency, registerAppElementRenderDependencies, releaseAppElementRenderDependency, renderAfterAppDependencies, renderWithAppDependencyBarrier };

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

@@ -18,5 +18,4 @@ declare function setAppNavigationContext(ctx: NavigationContext | null): void;
  */
 declare function clearAppRequestContext(): void;
 //#endregion
-export { clearAppRequestContext, setAppNavigationContext };
-//# sourceMappingURL=app-request-context.d.ts.map
+export { clearAppRequestContext, setAppNavigationContext };

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

@@ -26,5 +26,3 @@ function clearAppRequestContext() {
 }
 //#endregion
 export { clearAppRequestContext, setAppNavigationContext };
-
-//# sourceMappingURL=app-request-context.js.map

package/dist/server/app-route-handler-cache.d.ts

@@ -18,6 +18,7 @@ type ReadAppRouteHandlerCacheOptions = {
   getCollectedFetchTags: () => string[];
   handlerFn: AppRouteHandlerFunction;
   i18n?: NextI18nConfig | null;
+  trailingSlash?: boolean;
   isAutoHead: boolean;
   isrDebug?: AppRouteDebugLogger;
   isrGet: RouteHandlerCacheGetter;
@@ -42,5 +43,4 @@ type ReadAppRouteHandlerCacheOptions = {
 };
 declare function readAppRouteHandlerCacheResponse(options: ReadAppRouteHandlerCacheOptions): Promise<Response | null>;
 //#endregion
-export { readAppRouteHandlerCacheResponse };
-//# sourceMappingURL=app-route-handler-cache.d.ts.map
+export { readAppRouteHandlerCacheResponse };

package/dist/server/app-route-handler-cache.js

@@ -39,6 +39,7 @@ async function readAppRouteHandlerCacheResponse(options) {
 						dynamicConfig: options.dynamicConfig,
 						handlerFn: options.handlerFn,
 						i18n: options.i18n,
+						trailingSlash: options.trailingSlash,
 						markDynamicUsage: options.markDynamicUsage,
 						params: options.params === null ? null : makeThenableParams(options.params),
 						request: new Request(options.requestUrl, { method: "GET" }),
@@ -75,5 +76,3 @@ async function readAppRouteHandlerCacheResponse(options) {
 }
 //#endregion
 export { readAppRouteHandlerCacheResponse };
-
-//# sourceMappingURL=app-route-handler-cache.js.map

package/dist/server/app-route-handler-dispatch.d.ts

@@ -30,6 +30,7 @@ type DispatchAppRouteHandlerOptions = {
   isrGet: RouteHandlerCacheGetter;
   isrRouteKey: (pathname: string) => string;
   isrSet: RouteHandlerCacheSetter;
+  trailingSlash?: boolean;
   middlewareContext: RouteHandlerMiddlewareContext;
   middlewareRequestHeaders?: Headers | null;
   /**
@@ -45,5 +46,4 @@ type DispatchAppRouteHandlerOptions = {
 };
 declare function dispatchAppRouteHandler(options: DispatchAppRouteHandlerOptions): Promise<Response>;
 //#endregion
-export { dispatchAppRouteHandler };
-//# sourceMappingURL=app-route-handler-dispatch.d.ts.map
+export { dispatchAppRouteHandler };

package/dist/server/app-route-handler-dispatch.js

@@ -77,6 +77,7 @@ async function dispatchAppRouteHandler(options) {
 			getCollectedFetchTags,
 			handlerFn: resolvedHandlerFn,
 			i18n: options.i18n,
+			trailingSlash: options.trailingSlash,
 			isAutoHead,
 			isrDebug: options.isrDebug,
 			isrGet: options.isrGet,
@@ -127,6 +128,7 @@ async function dispatchAppRouteHandler(options) {
 		handler,
 		handlerFn: resolvedHandlerFn,
 		i18n: options.i18n,
+		trailingSlash: options.trailingSlash,
 		isAutoHead,
 		isProduction,
 		isrDebug: options.isrDebug,
@@ -151,5 +153,3 @@ async function dispatchAppRouteHandler(options) {
 }
 //#endregion
 export { dispatchAppRouteHandler };
-
-//# sourceMappingURL=app-route-handler-dispatch.js.map

package/dist/server/app-route-handler-execution.d.ts

@@ -42,6 +42,7 @@ type RunAppRouteHandlerOptions = {
   dynamicConfig?: string;
   handlerFn: AppRouteHandlerFunction;
   i18n?: NextI18nConfig | null;
+  trailingSlash?: boolean;
   markDynamicUsage: MarkAppRouteDynamicUsageFn;
   middlewareRequestHeaders?: Headers | null;
   /**
@@ -82,5 +83,4 @@ type ExecuteAppRouteHandlerOptions = {
 declare function runAppRouteHandler(options: RunAppRouteHandlerOptions): Promise<RunAppRouteHandlerResult>;
 declare function executeAppRouteHandler(options: ExecuteAppRouteHandlerOptions): Promise<Response>;
 //#endregion
-export { AppRouteDebugLogger, AppRouteDynamicUsageFn, AppRouteHandlerFunction, AppRouteParams, MarkAppRouteDynamicUsageFn, RouteHandlerCacheSetter, executeAppRouteHandler, runAppRouteHandler };
-//# sourceMappingURL=app-route-handler-execution.d.ts.map
+export { AppRouteDebugLogger, AppRouteDynamicUsageFn, AppRouteHandlerFunction, AppRouteParams, MarkAppRouteDynamicUsageFn, RouteHandlerCacheSetter, executeAppRouteHandler, runAppRouteHandler };

package/dist/server/app-route-handler-execution.js

@@ -21,6 +21,7 @@ async function runAppRouteHandler(options) {
 	const trackedRequest = createTrackedAppRouteRequest(options.request, {
 		basePath: options.basePath,
 		i18n: options.i18n,
+		trailingSlash: options.trailingSlash,
 		middlewareHeaders: options.middlewareRequestHeaders,
 		onDynamicAccess() {
 			options.markDynamicUsage();
@@ -46,6 +47,7 @@ async function executeAppRouteHandler(options) {
 		assertSupportedAppRouteHandlerResponse(response);
 		const handlerSetCacheControl = response.headers.has("cache-control");
 		if (dynamicUsedInHandler) markKnownDynamicAppRoute(options.routePattern);
+		const routeTags = options.buildPageCacheTags(options.cleanPathname, options.getCollectedFetchTags());
 		if (shouldApplyAppRouteHandlerRevalidateHeader({
 			dynamicUsedInHandler,
 			handlerSetCacheControl,
@@ -55,7 +57,7 @@ async function executeAppRouteHandler(options) {
 		})) {
 			const revalidateSeconds = options.revalidateSeconds;
 			if (revalidateSeconds == null) throw new Error("Expected route handler revalidate seconds");
-			applyRouteHandlerRevalidateHeader(response, revalidateSeconds, options.expireSeconds);
+			applyRouteHandlerRevalidateHeader(response, revalidateSeconds, options.expireSeconds, routeTags);
 		}
 		if (shouldWriteAppRouteHandlerCache({
 			dynamicConfig: options.handler.dynamic,
@@ -71,7 +73,6 @@ async function executeAppRouteHandler(options) {
 			const routeKey = options.isrRouteKey(options.cleanPathname);
 			const revalidateSeconds = options.revalidateSeconds;
 			if (revalidateSeconds == null) throw new Error("Expected route handler cache revalidate seconds");
-			const routeTags = options.buildPageCacheTags(options.cleanPathname, options.getCollectedFetchTags());
 			const routeWritePromise = (async () => {
 				try {
 					const routeCacheValue = await buildAppRouteCacheValue(routeClone);
@@ -124,5 +125,3 @@ async function executeAppRouteHandler(options) {
 }
 //#endregion
 export { executeAppRouteHandler, runAppRouteHandler };
-
-//# sourceMappingURL=app-route-handler-execution.js.map

package/dist/server/app-route-handler-policy.d.ts

@@ -51,5 +51,4 @@ declare function shouldApplyAppRouteHandlerRevalidateHeader(options: Omit<AppRou
 declare function shouldWriteAppRouteHandlerCache(options: AppRouteHandlerResponseCacheOptions): boolean;
 declare function resolveAppRouteHandlerSpecialError(error: unknown, requestUrl: string, options?: AppRouteHandlerSpecialErrorOptions): AppRouteHandlerSpecialError | null;
 //#endregion
-export { AppRouteHandlerModule, getAppRouteHandlerRevalidateSeconds, hasAppRouteHandlerDefaultExport, isPossibleAppRouteActionRequest, resolveAppRouteHandlerMethod, resolveAppRouteHandlerSpecialError, shouldApplyAppRouteHandlerRevalidateHeader, shouldReadAppRouteHandlerCache, shouldWriteAppRouteHandlerCache };
-//# sourceMappingURL=app-route-handler-policy.d.ts.map
+export { AppRouteHandlerModule, getAppRouteHandlerRevalidateSeconds, hasAppRouteHandlerDefaultExport, isPossibleAppRouteActionRequest, resolveAppRouteHandlerMethod, resolveAppRouteHandlerSpecialError, shouldApplyAppRouteHandlerRevalidateHeader, shouldReadAppRouteHandlerCache, shouldWriteAppRouteHandlerCache };

package/dist/server/app-route-handler-policy.js

@@ -61,5 +61,3 @@ function resolveAppRouteHandlerSpecialError(error, requestUrl, options) {
 }
 //#endregion
 export { getAppRouteHandlerRevalidateSeconds, hasAppRouteHandlerDefaultExport, isPossibleAppRouteActionRequest, resolveAppRouteHandlerMethod, resolveAppRouteHandlerSpecialError, shouldApplyAppRouteHandlerRevalidateHeader, shouldReadAppRouteHandlerCache, shouldWriteAppRouteHandlerCache };
-
-//# sourceMappingURL=app-route-handler-policy.js.map

package/dist/server/app-route-handler-response.d.ts

@@ -20,10 +20,9 @@ type FinalizeRouteHandlerResponseOptions = {
 declare function applyRouteHandlerMiddlewareContext(response: Response, middlewareContext: RouteHandlerMiddlewareContext): Response;
 declare function assertSupportedAppRouteHandlerResponse(response: Response): void;
 declare function buildRouteHandlerCachedResponse(cachedValue: CachedRouteValue, options: BuildRouteHandlerCachedResponseOptions): Response;
-declare function applyRouteHandlerRevalidateHeader(response: Response, revalidateSeconds: number, expireSeconds?: number): void;
+declare function applyRouteHandlerRevalidateHeader(response: Response, revalidateSeconds: number, expireSeconds?: number, tags?: readonly string[]): void;
 declare function markRouteHandlerCacheMiss(response: Response): void;
 declare function buildAppRouteCacheValue(response: Response): Promise<CachedRouteValue>;
 declare function finalizeRouteHandlerResponse(response: Response, options: FinalizeRouteHandlerResponseOptions): Response;
 //#endregion
-export { RouteHandlerMiddlewareContext, applyRouteHandlerMiddlewareContext, applyRouteHandlerRevalidateHeader, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, buildRouteHandlerCachedResponse, finalizeRouteHandlerResponse, markRouteHandlerCacheMiss };
-//# sourceMappingURL=app-route-handler-response.d.ts.map
+export { RouteHandlerMiddlewareContext, applyRouteHandlerMiddlewareContext, applyRouteHandlerRevalidateHeader, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, buildRouteHandlerCachedResponse, finalizeRouteHandlerResponse, markRouteHandlerCacheMiss };

package/dist/server/app-route-handler-response.js

@@ -1,7 +1,7 @@
 import "./headers.js";
 import { processMiddlewareHeaders } from "./request-pipeline.js";
 import { setCacheStateHeaders } from "./cache-headers.js";
-import { NEVER_CACHE_CONTROL, STATIC_CACHE_CONTROL, buildCachedRevalidateCacheControl } from "./cache-control.js";
+import { NEVER_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, buildCachedRevalidateCacheControl } from "./cache-control.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { getSetCookieName } from "./cookie-utils.js";
 //#region src/server/app-route-handler-response.ts
@@ -37,14 +37,17 @@ function buildRouteHandlerCachedResponse(cachedValue, options) {
 	setCacheStateHeaders(headers, options.cacheState);
 	const revalidateSeconds = options.cacheControl?.revalidate ?? options.revalidateSeconds;
 	const expireSeconds = options.cacheControl === void 0 ? void 0 : options.cacheControl.expire ?? options.expireSeconds;
-	headers.set("Cache-Control", buildRouteHandlerCacheControl(options.cacheState, revalidateSeconds, expireSeconds));
+	applyCdnResponseHeaders(headers, { cacheControl: buildRouteHandlerCacheControl(options.cacheState, revalidateSeconds, expireSeconds) });
 	return new Response(options.isHead ? null : cachedValue.body, {
 		status: cachedValue.status,
 		headers
 	});
 }
-function applyRouteHandlerRevalidateHeader(response, revalidateSeconds, expireSeconds) {
-	response.headers.set("cache-control", buildRouteHandlerCacheControl("HIT", revalidateSeconds, expireSeconds));
+function applyRouteHandlerRevalidateHeader(response, revalidateSeconds, expireSeconds, tags) {
+	applyCdnResponseHeaders(response.headers, {
+		cacheControl: buildRouteHandlerCacheControl("HIT", revalidateSeconds, expireSeconds),
+		tags
+	});
 }
 function markRouteHandlerCacheMiss(response) {
 	setCacheStateHeaders(response.headers, "MISS");
@@ -139,5 +142,3 @@ function finalizeRouteHandlerResponse(response, options) {
 }
 //#endregion
 export { applyRouteHandlerMiddlewareContext, applyRouteHandlerRevalidateHeader, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, buildRouteHandlerCachedResponse, finalizeRouteHandlerResponse, markRouteHandlerCacheMiss };
-
-//# sourceMappingURL=app-route-handler-response.js.map

package/dist/server/app-route-handler-runtime.d.ts

@@ -24,6 +24,7 @@ type AppRouteRequestMode = "auto" | "force-static" | "error";
 type TrackedAppRouteRequestOptions = {
   basePath?: string;
   i18n?: NextI18nConfig | null;
+  trailingSlash?: boolean;
   middlewareHeaders?: Headers | null;
   onDynamicAccess?: (access: AppRouteDynamicRequestAccess) => void;
   requestMode?: AppRouteRequestMode;
@@ -35,5 +36,4 @@ type TrackedAppRouteRequest = {
 };
 declare function createTrackedAppRouteRequest(request: Request, options?: TrackedAppRouteRequestOptions): TrackedAppRouteRequest;
 //#endregion
-export { RouteHandlerHttpMethod, RouteHandlerModule, buildRouteHandlerAllowHeader, collectRouteHandlerMethods, createTrackedAppRouteRequest, isKnownDynamicAppRoute, isValidHTTPMethod, markKnownDynamicAppRoute };
-//# sourceMappingURL=app-route-handler-runtime.d.ts.map
+export { RouteHandlerHttpMethod, RouteHandlerModule, buildRouteHandlerAllowHeader, collectRouteHandlerMethods, createTrackedAppRouteRequest, isKnownDynamicAppRoute, isValidHTTPMethod, markKnownDynamicAppRoute };

package/dist/server/app-route-handler-runtime.js

@@ -43,10 +43,11 @@ function bindMethodIfNeeded(value, target) {
 	return typeof value === "function" ? value.bind(target) : value;
 }
 function buildNextConfig(options) {
-	if (!options.basePath && !options.i18n) return null;
+	if (!options.basePath && !options.i18n && !options.trailingSlash) return null;
 	return {
 		basePath: options.basePath,
-		i18n: options.i18n ?? void 0
+		i18n: options.i18n ?? void 0,
+		trailingSlash: options.trailingSlash
 	};
 }
 function rebuildRequestWithHeaders(input, headers) {
@@ -236,5 +237,3 @@ function createTrackedAppRouteRequest(request, options = {}) {
 }
 //#endregion
 export { buildRouteHandlerAllowHeader, collectRouteHandlerMethods, createTrackedAppRouteRequest, isKnownDynamicAppRoute, isValidHTTPMethod, markKnownDynamicAppRoute };
-
-//# sourceMappingURL=app-route-handler-runtime.js.map

package/dist/server/app-route-module-loader.d.ts

@@ -0,0 +1,43 @@
+//#region src/server/app-route-module-loader.d.ts
+/**
+ * Lazy route-module hydration for the App Router RSC entry.
+ *
+ * The generated route table (see `entries/app-rsc-manifest.ts`) emits page and
+ * route-handler modules as lazy `() => import()` thunks instead of eager
+ * `import * as mod_N` namespaces. This keeps those modules out of the RSC
+ * entry's top-level evaluation, so an app with many routes — or routes with
+ * expensive module-level initialization — does not pay to evaluate every route
+ * module at Worker startup. Only the module(s) for the matched route are
+ * evaluated, on demand.
+ *
+ * `ensureAppRouteModulesLoaded` resolves a route's lazy thunks and populates the
+ * synchronous `page` / `routeHandler` fields that the rest of the request
+ * pipeline reads directly. It is:
+ *
+ *  - idempotent: once a route is loaded it returns immediately;
+ *  - dedup'd: concurrent calls for the same route share one in-flight promise,
+ *    so a burst of requests to the same route triggers a single import.
+ *
+ * Callers must `await` it before any synchronous read of `route.page` or
+ * `route.routeHandler` (segment config, fetch-cache mode, runtime resolution,
+ * dispatch branch, element building, etc.).
+ */
+type LazyModuleThunk = () => Promise<unknown>;
+type LazyLoadableRoute = {
+  page?: unknown;
+  routeHandler?: unknown; /** Lazy loader for the page module; `null`/absent when the page is eager. */
+  __loadPage?: LazyModuleThunk | null; /** Lazy loader for the route-handler module; `null`/absent when none. */
+  __loadRouteHandler?: LazyModuleThunk | null; /** Set once the lazy modules have been resolved onto `page`/`routeHandler`. */
+  __loaded?: boolean; /** In-flight hydration promise, used to dedup concurrent loads. */
+  __loading?: Promise<unknown> | null;
+};
+/**
+ * Resolve a route's lazy page/route-handler modules and assign them onto the
+ * route's synchronous `page` / `routeHandler` fields. Returns the same route
+ * reference (synchronously when already loaded, otherwise after the in-flight
+ * import resolves). Safe to call on `null`/`undefined` routes and on eager
+ * routes that have no lazy thunks.
+ */
+declare function ensureAppRouteModulesLoaded<TRoute extends LazyLoadableRoute>(route: TRoute | null | undefined): TRoute | Promise<TRoute>;
+//#endregion
+export { LazyLoadableRoute, ensureAppRouteModulesLoaded };

package/dist/server/app-route-module-loader.js

@@ -0,0 +1,32 @@
+//#region src/server/app-route-module-loader.ts
+/**
+* Resolve a route's lazy page/route-handler modules and assign them onto the
+* route's synchronous `page` / `routeHandler` fields. Returns the same route
+* reference (synchronously when already loaded, otherwise after the in-flight
+* import resolves). Safe to call on `null`/`undefined` routes and on eager
+* routes that have no lazy thunks.
+*/
+function ensureAppRouteModulesLoaded(route) {
+	if (!route || route.__loaded) return route;
+	if (route.__loading) return route.__loading;
+	const loadPage = route.__loadPage;
+	const loadRouteHandler = route.__loadRouteHandler;
+	if (!loadPage && !loadRouteHandler) {
+		route.__loaded = true;
+		return route;
+	}
+	const loading = Promise.all([loadPage ? loadPage() : void 0, loadRouteHandler ? loadRouteHandler() : void 0]).then(([pageModule, routeHandlerModule]) => {
+		if (loadPage) route.page = pageModule;
+		if (loadRouteHandler) route.routeHandler = routeHandlerModule;
+		route.__loaded = true;
+		route.__loading = null;
+		return route;
+	}).catch((error) => {
+		route.__loading = null;
+		throw error;
+	});
+	route.__loading = loading;
+	return loading;
+}
+//#endregion
+export { ensureAppRouteModulesLoaded };

package/dist/server/app-router-entry.d.ts

@@ -10,5 +10,4 @@ declare const _default: {
   fetch(request: Request, env?: WorkerAssetEnv, ctx?: ExecutionContextLike): Promise<Response>;
 };
 //#endregion
-export { _default as default };
-//# sourceMappingURL=app-router-entry.d.ts.map
+export { _default as default };

package/dist/server/app-router-entry.js

@@ -5,6 +5,7 @@ import { cloneRequestWithHeaders, filterInternalHeaders, isOpenRedirectShaped }
 import { assetPrefixPathname, isNextStaticPath } from "../utils/asset-prefix.js";
 import { resolveStaticAssetSignal } from "./worker-utils.js";
 import rscHandler, { __assetPrefix, __basePath } from "virtual:vinext-rsc-entry";
+import { registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";
 //#region src/server/app-router-entry.ts
 const __workerBasePath = typeof __basePath === "string" ? __basePath : "";
 const __workerAssetPathPrefix = assetPrefixPathname(typeof __assetPrefix === "string" ? __assetPrefix : "");
@@ -12,6 +13,7 @@ var app_router_entry_default = { async fetch(request, env, ctx) {
 	return handleRequest(request, env, ctx);
 } };
 async function handleRequest(request, env, ctx) {
+	registerConfiguredCacheAdapters(env);
 	const url = new URL(request.url);
 	if (isOpenRedirectShaped(url.pathname)) return notFoundResponse();
 	try {
@@ -39,5 +41,3 @@ async function handleRequest(request, env, ctx) {
 }
 //#endregion
 export { app_router_entry_default as default };
-
-//# sourceMappingURL=app-router-entry.js.map

package/dist/server/app-rsc-cache-busting.d.ts

@@ -13,6 +13,7 @@ declare const VINEXT_RSC_COMPATIBILITY_ID_HEADER = "X-Vinext-RSC-Compatibility-I
 declare const VINEXT_RSC_CONTENT_TYPE = "text/x-component";
 declare const VINEXT_RSC_VARY_HEADER: string;
 type CreateRscRequestHeadersOptions = {
+  clientReuseManifestHeader?: string | null;
   interceptionContext?: string | null;
   mountedSlotsHeader?: string | null;
   renderMode?: AppRscRenderMode;
@@ -38,6 +39,14 @@ declare function resolveRscCompatibilityNavigationDecision(options: {
   responseCompatibilityId: string | null | undefined;
   responseUrl?: string | null;
 }): RscCompatibilityNavigationDecision;
+/**
+ * Detect the internal RSC cache-busting search param using the same
+ * encoding-aware matching as `stripRscCacheBustingSearchParam`
+ * (`isRscCacheBustingSearchPair`). The two share a single matcher so a guard
+ * built on this helper and the stripper can never disagree on which pairs
+ * count as `_rsc`, including encoded-key edge cases like `%5Frsc`.
+ */
+declare function hasRscCacheBustingSearchParam(url: URL): boolean;
 declare function computeRscCacheBustingSearchParam(headers: Headers): Promise<string>;
 declare function setRscCacheBustingSearchParam(url: URL, hash: string): void;
 declare function stripRscCacheBustingSearchParam(url: URL): void;
@@ -52,5 +61,4 @@ declare function createServerActionRequestUrl(href: string): string;
 declare function createRscRedirectLocation(location: string, request: Request): Promise<string>;
 declare function resolveInvalidRscCacheBustingRequest(options: ResolveInvalidRscCacheBustingRequestOptions): Promise<Response | null>;
 //#endregion
-export { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, computeRscCacheBustingSearchParam, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId, isRscCompatibilityIdCompatible, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, stripRscSuffix };
-//# sourceMappingURL=app-rsc-cache-busting.d.ts.map
+export { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_RENDER_MODE_HEADER, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityIdHeader, computeRscCacheBustingSearchParam, createRscRedirectLocation, createRscRequestHeaders, createRscRequestUrl, createServerActionRequestUrl, getVinextRscCompatibilityId, hasRscCacheBustingSearchParam, isRscCompatibilityIdCompatible, resolveHardNavigationTargetFromRscResponse, resolveInvalidRscCacheBustingRequest, resolveRscCompatibilityNavigationDecision, setRscCacheBustingSearchParam, stripRscCacheBustingSearchParam, stripRscSuffix };