vinext 0.2.0 → 0.2.1

package/dist/server/app-rsc-handler.js

@@ -1,7 +1,7 @@
 import { createRequestContext, runWithRequestContext } from "../shims/unified-request-context.js";
 import { addBasePathToPathname, hasBasePath, stripBasePath } from "../utils/base-path.js";
 import { getRequestExecutionContext } from "../shims/request-context.js";
-import { VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER } from "../utils/protocol-headers.js";
+import { VINEXT_MW_CTX_HEADER, VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, VINEXT_PRERENDER_SPECULATIVE_HEADER } from "../utils/protocol-headers.js";
 import { ACTION_REVALIDATED_HEADER } from "./headers.js";
 import { isExternalUrl, matchRedirect, matchRewrite, preserveRedirectDestinationQuery, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "../config/config-matchers.js";
 import { notFoundResponse } from "./http-error-responses.js";
@@ -19,10 +19,11 @@ import "./app-page-response.js";
 import { parseNextHttpErrorDigest } from "./next-error-digest.js";
 import { matchPrerenderRouteParamsPayload, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
 import { getRenderedConcreteUrlPathsForRoute } from "./pregenerated-concrete-paths.js";
+import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage } from "./server-action-not-found.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
 import { buildPostMwRequestContext } from "./app-post-middleware-context.js";
-import { pickRootParams, setRootParams } from "../shims/root-params.js";
+import { createRouteTreePrefetchResponse, isRouteTreePrefetchRequest } from "./app-route-tree-prefetch.js";
 import { flattenErrorCauses } from "../utils/error-cause.js";
 import { finalizeAppRscResponse } from "./app-rsc-response-finalizer.js";
 import { normalizeRscRequest } from "./app-rsc-request-normalization.js";
@@ -163,10 +164,10 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			headers: { Location: location }
 		});
 	}
-	const rscCacheBustingRedirect = await resolveInvalidRscCacheBustingRequest({
+	const rscCacheBustingRedirect = hadBasePath ? await resolveInvalidRscCacheBustingRequest({
 		isRscRequest,
 		request
-	});
+	}) : null;
 	if (rscCacheBustingRedirect) return rscCacheBustingRedirect;
 	const normalizedUserlandRequest = requestWithoutRscSuffix(request);
 	const userlandRequest = requestWithoutRscCacheBustingSearchParam(normalizedUserlandRequest);
@@ -200,6 +201,13 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const scriptNonce = getScriptNonceFromHeaderSources(request.headers, middlewareContext.headers);
 	const postMiddlewareRequestContext = buildPostMwRequestContext(userlandRequest);
 	let filesystemRouteEligible = hadBasePath || didMiddlewareRewrite;
+	const validateClaimedOutsideBasePathRsc = async () => {
+		if (hadBasePath || !filesystemRouteEligible) return null;
+		return resolveInvalidRscCacheBustingRequest({
+			isRscRequest,
+			request
+		});
+	};
 	for (const rewrite of options.configRewrites.beforeFiles) {
 		const beforeFilesRewrite = await applyRewrite({
 			basePathState,
@@ -215,6 +223,51 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			filesystemRouteEligible = true;
 		}
 	}
+	const claimedRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
+	if (claimedRscCacheBustingRedirect) return claimedRscCacheBustingRedirect;
+	const actionId = request.headers.get("x-rsc-action") ?? request.headers.get("next-action");
+	const isPostRequest = request.method.toUpperCase() === "POST";
+	const contentType = request.headers.get("content-type") || "";
+	const isProgressiveActionRequest = isPostRequest && !actionId && contentType.startsWith("multipart/form-data");
+	let resolvedLateRewritesForAction = false;
+	if (!filesystemRouteEligible && (actionId || isProgressiveActionRequest)) {
+		let actionMatch = null;
+		for (const rewrite of options.configRewrites.afterFiles) {
+			const rewritten = await applyRewrite({
+				basePathState,
+				clearRequestContext: options.clearRequestContext,
+				request: normalizedUserlandRequest,
+				requestContext: requestContextForResolvedUrl(postMiddlewareRequestContext, resolvedUrl, url),
+				rewrites: [rewrite]
+			}, matchPathname(cleanPathname));
+			if (rewritten instanceof Response) return rewritten;
+			if (!rewritten) continue;
+			resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
+			cleanPathname = pathnameForResolvedUrl(resolvedUrl);
+			filesystemRouteEligible = true;
+			actionMatch = options.matchRoute(cleanPathname);
+			if (actionMatch) break;
+		}
+		if (!actionMatch) for (const rewrite of options.configRewrites.fallback) {
+			const rewritten = await applyRewrite({
+				basePathState,
+				clearRequestContext: options.clearRequestContext,
+				request: normalizedUserlandRequest,
+				requestContext: requestContextForResolvedUrl(postMiddlewareRequestContext, resolvedUrl, url),
+				rewrites: [rewrite]
+			}, matchPathname(cleanPathname));
+			if (rewritten instanceof Response) return rewritten;
+			if (!rewritten) continue;
+			resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
+			cleanPathname = pathnameForResolvedUrl(resolvedUrl);
+			filesystemRouteEligible = true;
+			actionMatch = options.matchRoute(cleanPathname);
+			if (actionMatch) break;
+		}
+		resolvedLateRewritesForAction = filesystemRouteEligible;
+	}
+	const lateActionRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
+	if (lateActionRscCacheBustingRedirect) return lateActionRscCacheBustingRedirect;
 	if (filesystemRouteEligible && isImageOptimizationPath(cleanPathname)) {
 		const imageRedirect = resolveDevImageRedirect(url, [...options.imageConfig?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...options.imageConfig?.imageSizes ?? DEFAULT_IMAGE_SIZES], options.imageConfig?.qualities, { isDev: options.isDev });
 		if (!imageRedirect) return new Response("Invalid image optimization parameters", { status: 400 });
@@ -255,9 +308,18 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	});
 	const preActionMatch = filesystemRouteEligible ? options.matchRoute(cleanPathname) : null;
 	if (preActionMatch) setRootParams(pickRootParams(preActionMatch.params, preActionMatch.route.rootParamNames));
-	const actionId = request.headers.get("x-rsc-action") ?? request.headers.get("next-action");
-	const contentType = request.headers.get("content-type") || "";
-	const isPostRequest = request.method.toUpperCase() === "POST";
+	if (pagesDataRequest && didMiddlewareRewritePathname && preActionMatch) {
+		const headers = new Headers();
+		mergeMiddlewareResponseHeaders(headers, middlewareContext.headers);
+		headers.set("content-type", "application/json");
+		headers.set("x-nextjs-rewrite", resolvedUrl);
+		options.clearRequestContext();
+		return new Response("{}", { headers });
+	}
+	if (!filesystemRouteEligible && isPostRequest && actionId) {
+		options.clearRequestContext();
+		return notFoundResponse();
+	}
 	let progressiveActionResult = null;
 	if (filesystemRouteEligible && isPostRequest && contentType.startsWith("multipart/form-data") && !actionId) {
 		if (options.handleProgressiveActionRequest) progressiveActionResult = await options.handleProgressiveActionRequest({
@@ -322,7 +384,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		options.clearRequestContext();
 		return staticPagesFallbackResponse;
 	}
-	if (!match || match.route.isDynamic) for (const rewrite of options.configRewrites.afterFiles) {
+	if (!resolvedLateRewritesForAction && (!match || match.route.isDynamic)) for (const rewrite of options.configRewrites.afterFiles) {
 		const afterFilesRewrite = await applyRewrite({
 			basePathState,
 			clearRequestContext: options.clearRequestContext,
@@ -335,6 +397,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		resolvedUrl = mergeRewriteQuery(resolvedUrl, afterFilesRewrite);
 		cleanPathname = pathnameForResolvedUrl(resolvedUrl);
 		filesystemRouteEligible = true;
+		const claimedRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
+		if (claimedRscCacheBustingRedirect) return claimedRscCacheBustingRedirect;
 		match = options.matchRoute(cleanPathname);
 		const rewrittenStaticPagesResponse = await renderPagesForMatchKind("static");
 		if (rewrittenStaticPagesResponse) {
@@ -353,7 +417,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		options.clearRequestContext();
 		return dynamicPagesFallbackResponse;
 	}
-	if (!match) for (const rewrite of options.configRewrites.fallback) {
+	if (!resolvedLateRewritesForAction && !match) for (const rewrite of options.configRewrites.fallback) {
 		const fallbackRewrite = await applyRewrite({
 			basePathState,
 			clearRequestContext: options.clearRequestContext,
@@ -366,6 +430,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		resolvedUrl = mergeRewriteQuery(resolvedUrl, fallbackRewrite);
 		cleanPathname = pathnameForResolvedUrl(resolvedUrl);
 		filesystemRouteEligible = true;
+		const claimedRscCacheBustingRedirect = await validateClaimedOutsideBasePathRsc();
+		if (claimedRscCacheBustingRedirect) return claimedRscCacheBustingRedirect;
 		match = options.matchRoute(cleanPathname);
 		const rewrittenStaticPagesResponse = await renderPagesForMatchKind("static");
 		if (rewrittenStaticPagesResponse) {
@@ -391,6 +457,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 			const response = buildNextDataNotFoundResponse();
 			const headers = new Headers(response.headers);
 			headers.set("x-nextjs-matched-path", matchPathname(canonicalPathname));
+			if (resolvedUrl !== originalResolvedUrl) headers.set("x-nextjs-rewrite", resolvedUrl);
 			return new Response("{}", {
 				status: 200,
 				headers
@@ -418,11 +485,19 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	}
 	const { route, params } = match;
 	if (options.ensureRouteLoaded) await options.ensureRouteLoaded(route);
+	const resolvedSearchParams = getResolvedSearchParams();
+	if (isRouteTreePrefetchRequest(request) && !route.routeHandler) {
+		const response = await createRouteTreePrefetchResponse(route, {
+			buildId: options.buildId,
+			prefetchInlining: options.prefetchInlining
+		});
+		options.clearRequestContext();
+		return applyMiddlewareContextToResponse(response, middlewareContext);
+	}
 	const prerenderRouteParamsMatch = matchPrerenderRouteParamsPayload(readTrustedPrerenderRouteParams(request), route.pattern, params);
 	const prerenderRouteParams = prerenderRouteParamsMatch?.params ?? null;
 	const isPrerenderFallbackShell = prerenderRouteParamsMatch?.kind === "fallback-shell";
 	const renderParams = prerenderRouteParams ?? params;
-	const resolvedSearchParams = getResolvedSearchParams();
 	let runtimeFallbackShells = [];
 	if (options.createPprFallbackShells && request.method === "GET" && !isRscRequest && !isPrerenderFallbackShell && route.params) runtimeFallbackShells = options.createPprFallbackShells({
 		params: route.params,
@@ -476,6 +551,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		staticParamsValidationParams: prerenderRouteParams === null || isPrerenderFallbackShell ? void 0 : params,
 		rootParams,
 		request,
+		renderedPathAndSearch: resolvedUrl,
 		route,
 		scriptNonce,
 		searchParams: resolvedSearchParams,
@@ -525,14 +601,16 @@ function createAppRscHandler(options) {
 		const pagesDataInScope = !options.basePath || hasBasePath(pagesDataUrl.pathname, options.basePath);
 		if (pagesDataInScope) pagesDataUrl.pathname = stripBasePath(pagesDataUrl.pathname, options.basePath);
 		const pagesDataCandidate = pagesDataInScope ? cloneRequestWithUrl(rawRequest, pagesDataUrl.toString()) : null;
-		const pagesDataNormalization = options.renderPagesFallback && pagesDataCandidate ? normalizePagesDataRequest(pagesDataCandidate, options.buildId) : null;
+		const pagesDataNormalization = options.renderPagesFallback && pagesDataCandidate ? normalizePagesDataRequest(pagesDataCandidate, options.buildId, "", typeof options.runMiddleware === "function" && options.trailingSlash) : null;
 		if (pagesDataNormalization?.notFoundResponse) return pagesDataNormalization.notFoundResponse;
 		const isPagesDataRequest = pagesDataNormalization?.isDataReq === true;
 		const prerenderRouteParamsPayload = readTrustedPrerenderRouteParams(rawRequest);
+		const isTrustedSpeculativePrerender = process.env.VINEXT_PRERENDER === "1" && rawRequest.headers.get("x-vinext-prerender-secret") !== null && rawRequest.headers.get("x-vinext-prerender-speculative") === "1";
 		const filteredHeaders = filterInternalHeaders(rawRequest.headers);
 		if (mwCtx !== null) filteredHeaders.set(VINEXT_MW_CTX_HEADER, mwCtx);
 		const prerenderRouteParamsHeader = serializePrerenderRouteParamsHeader(prerenderRouteParamsPayload);
 		if (prerenderRouteParamsHeader !== null) filteredHeaders.set(VINEXT_PRERENDER_ROUTE_PARAMS_HEADER, prerenderRouteParamsHeader);
+		if (isTrustedSpeculativePrerender) filteredHeaders.set(VINEXT_PRERENDER_SPECULATIVE_HEADER, "1");
 		let appRequest = rawRequest;
 		if (pagesDataNormalization?.isDataReq) {
 			const appRequestUrl = new URL(pagesDataNormalization.request.url);

package/dist/server/app-rsc-render-mode.d.ts

@@ -1,6 +1,7 @@
 //#region src/server/app-rsc-render-mode.d.ts
-type AppRscRenderMode = "navigation" | "prefetch-loading-shell" | "refresh-preserve-ui" | "action-rerender-preserve-ui";
+type AppRscRenderMode = "navigation" | "prefetch-dynamic-shell" | "prefetch-loading-shell" | "refresh-preserve-ui" | "action-rerender-preserve-ui";
 declare const APP_RSC_RENDER_MODE_NAVIGATION = "navigation";
+declare const APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL = "prefetch-dynamic-shell";
 declare const APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL = "prefetch-loading-shell";
 declare const APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI = "refresh-preserve-ui";
 declare const APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI = "action-rerender-preserve-ui";
@@ -8,4 +9,4 @@ declare function shouldSuppressLoadingBoundaries(mode: AppRscRenderMode): boolea
 declare function getRscRenderModeCacheVariant(mode: AppRscRenderMode): string | null;
 declare function parseAppRscRenderMode(value: string | null): AppRscRenderMode;
 //#endregion
-export { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI, APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI, AppRscRenderMode, getRscRenderModeCacheVariant, parseAppRscRenderMode, shouldSuppressLoadingBoundaries };
+export { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI, APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI, AppRscRenderMode, getRscRenderModeCacheVariant, parseAppRscRenderMode, shouldSuppressLoadingBoundaries };

package/dist/server/app-rsc-render-mode.js

@@ -1,5 +1,6 @@
 //#region src/server/app-rsc-render-mode.ts
 const APP_RSC_RENDER_MODE_NAVIGATION = "navigation";
+const APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL = "prefetch-dynamic-shell";
 const APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL = "prefetch-loading-shell";
 const APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI = "refresh-preserve-ui";
 const APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI = "action-rerender-preserve-ui";
@@ -10,11 +11,13 @@ function shouldUsePreserveUiCacheVariant(mode) {
 	return shouldSuppressLoadingBoundaries(mode);
 }
 function getRscRenderModeCacheVariant(mode) {
+	if (mode === "prefetch-dynamic-shell") return "prefetch-dynamic-shell";
 	if (mode === "prefetch-loading-shell") return "prefetch-loading-shell";
 	return shouldUsePreserveUiCacheVariant(mode) ? "preserve-ui" : null;
 }
 function parseAppRscRenderMode(value) {
 	switch (value) {
+		case APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL: return APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL;
 		case APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL: return APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL;
 		case APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI: return APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI;
 		case APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI: return APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI;
@@ -22,4 +25,4 @@ function parseAppRscRenderMode(value) {
 	}
 }
 //#endregion
-export { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI, APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI, getRscRenderModeCacheVariant, parseAppRscRenderMode, shouldSuppressLoadingBoundaries };
+export { APP_RSC_RENDER_MODE_ACTION_RERENDER_PRESERVE_UI, APP_RSC_RENDER_MODE_NAVIGATION, APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL, APP_RSC_RENDER_MODE_REFRESH_PRESERVE_UI, getRscRenderModeCacheVariant, parseAppRscRenderMode, shouldSuppressLoadingBoundaries };

package/dist/server/app-rsc-request-normalization.d.ts

@@ -31,10 +31,9 @@ type NormalizedRscRequest = {
  *   4. Collapse double-slashes, resolve `.` and `..` segments (normalizePath)
  *   5. basePath check + strip — 404 when pathname lacks the basePath prefix.
  *      `/__vinext/` bypasses this for internal prerender endpoints.
- *   6. RSC detection: `.rsc` suffix, or Next-style `RSC: 1` plus the internal
- *      `_rsc` cache-busting query. The header alone does not select payload
- *      rendering at the canonical HTML URL, so caches that ignore Vary cannot
- *      store Flight responses under HTML URLs.
+ *   6. RSC detection: `.rsc` suffix or Next-style `RSC: 1`. The internal
+ *      `_rsc` cache-busting query is validated separately so full-route Flight
+ *      responses do not share the canonical HTML URL in caches that ignore Vary.
  *   7. cleanPathname — pathname with `.rsc` suffix stripped
  *   8. Sanitize X-Vinext-Interception-Context — strip null bytes (header injection)
  *   9. Normalize x-vinext-mounted-slots — dedup and sort for canonical cache keys

package/dist/server/app-rsc-request-normalization.js

@@ -27,10 +27,9 @@ import { normalizeInterceptionContextHeader } from "./app-interception-context-h
 *   4. Collapse double-slashes, resolve `.` and `..` segments (normalizePath)
 *   5. basePath check + strip — 404 when pathname lacks the basePath prefix.
 *      `/__vinext/` bypasses this for internal prerender endpoints.
-*   6. RSC detection: `.rsc` suffix, or Next-style `RSC: 1` plus the internal
-*      `_rsc` cache-busting query. The header alone does not select payload
-*      rendering at the canonical HTML URL, so caches that ignore Vary cannot
-*      store Flight responses under HTML URLs.
+*   6. RSC detection: `.rsc` suffix or Next-style `RSC: 1`. The internal
+*      `_rsc` cache-busting query is validated separately so full-route Flight
+*      responses do not share the canonical HTML URL in caches that ignore Vary.
 *   7. cleanPathname — pathname with `.rsc` suffix stripped
 *   8. Sanitize X-Vinext-Interception-Context — strip null bytes (header injection)
 *   9. Normalize x-vinext-mounted-slots — dedup and sort for canonical cache keys
@@ -57,7 +56,7 @@ function normalizeRscRequest(request, basePath, allowOutsideBasePath = false) {
 		if (!hadBasePath && !pathname.startsWith("/__vinext/") && !allowOutsideBasePath) return notFoundResponse();
 		if (hadBasePath) pathname = stripBasePath(pathname, basePath);
 	}
-	const isRscRequest = pathname.endsWith(".rsc") || request.headers.get("RSC") === "1" && url.searchParams.has("_rsc");
+	const isRscRequest = pathname.endsWith(".rsc") || request.headers.get("RSC") === "1";
 	const cleanPathname = stripRscSuffix(pathname);
 	const interceptionContextHeader = normalizeInterceptionContextHeader(request.headers.get(VINEXT_INTERCEPTION_CONTEXT_HEADER));
 	const mountedSlotsHeader = normalizeMountedSlotsHeader(request.headers.get(VINEXT_MOUNTED_SLOTS_HEADER));

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

@@ -13,13 +13,13 @@ import { VINEXT_RSC_CONTENT_TYPE, VINEXT_RSC_VARY_HEADER, applyRscCompatibilityI
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
 import { getNextErrorDigest, parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
+import { createRootParamsUsageController, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage } from "../shims/root-params.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
 import "./app-page-stream.js";
 import { buildAppPageTags } from "./implicit-tags.js";
 import { resolveAppPageNavigationParams } from "./app-page-element-builder.js";
 import { resolveAppPageActionRerenderTarget } from "./app-page-request.js";
-import { createRootParamsUsageController, pickRootParams, runWithRootParamsScope, runWithRootParamsUsage } from "../shims/root-params.js";
 import { getSetCookieName } from "./cookie-utils.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
 //#region src/server/app-server-action-execution.ts
@@ -737,6 +737,7 @@ async function handleServerActionRscRequest(options) {
 		const match = options.matchRoute(options.cleanPathname);
 		let element;
 		let errorPattern = match ? match.route.pattern : options.cleanPathname;
+		const actionRerenderIsRscRequest = true;
 		if (match) {
 			const { route: actionRoute, params: actionParams } = match;
 			const actionRerenderTarget = await resolveAppPageActionRerenderTarget({
@@ -746,7 +747,7 @@ async function handleServerActionRscRequest(options) {
 				findIntercept: options.findIntercept,
 				getRouteParamNames: options.getRouteParamNames,
 				getSourceRoute: options.getSourceRoute,
-				isRscRequest: options.isRscRequest,
+				isRscRequest: actionRerenderIsRscRequest,
 				toInterceptOpts: options.toInterceptOpts
 			});
 			const resolvedActionNavigationParams = resolveAppPageNavigationParams(actionRerenderTarget.route, actionRerenderTarget.navigationParams, options.cleanPathname, actionRerenderTarget.interceptOpts);
@@ -771,7 +772,7 @@ async function handleServerActionRscRequest(options) {
 			const buildActionRerenderElement = () => options.buildPageElement({
 				cleanPathname: options.cleanPathname,
 				interceptOpts: actionRerenderTarget.interceptOpts,
-				isRscRequest: options.isRscRequest,
+				isRscRequest: actionRerenderIsRscRequest,
 				mountedSlotsHeader: options.mountedSlotsHeader,
 				params: actionRerenderTarget.params,
 				request: options.request,

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

@@ -12,17 +12,17 @@ import { runWithNavigationContext } from "../shims/navigation-state.js";
 import { withScriptNonce } from "../shims/script-nonce-context.js";
 import { createInlineScriptTag, createNonceAttribute, escapeHtmlAttr, safeJsonStringify } from "./html.js";
 import { getClientTraceMetadataHTML } from "./client-trace-metadata.js";
+import { setPagesClientAssets } from "./pages-client-assets.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { BfcacheStateKeyMapContext, ElementsContext, Slot } from "../shims/slot.js";
 import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
 import { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform } from "./app-ssr-stream.js";
-import { setPagesClientAssets } from "./pages-client-assets.js";
+import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
+import { runWithRootParamsScope } from "../shims/root-params.js";
 import { createInitialBfcacheMaps } from "./app-bfcache-identity.js";
 import { RSC_FORM_STATE_GLOBAL } from "./app-browser-hydration.js";
 import { createClientReferencePreloader } from "./app-client-reference-preloader.js";
 import { deferUntilStreamConsumed } from "./defer-until-stream-consumed.js";
-import { runWithRootParamsScope } from "../shims/root-params.js";
-import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
 import { renderBeforeInteractiveInlineScripts } from "./before-interactive-head.js";
 import { createInitialDevServerErrorScript } from "./dev-initial-server-error.js";
 import { ssrAppRouterInstance } from "./app-ssr-router-instance.js";

package/dist/server/cache-control.d.ts

@@ -2,8 +2,10 @@ import { CdnCacheableHeaderInput } from "../shims/cdn-cache.js";
 
 //#region src/server/cache-control.d.ts
 declare const NEVER_CACHE_CONTROL = "private, no-cache, no-store, max-age=0, must-revalidate";
+declare const BROWSER_REVALIDATE_CACHE_CONTROL = "public, max-age=0, must-revalidate";
 declare const STATIC_CACHE_CONTROL = "s-maxage=31536000, stale-while-revalidate";
 declare const NO_STORE_CACHE_CONTROL = "no-store, must-revalidate";
+declare function shouldUseNextDeployCacheControl(): boolean;
 /**
  * Route a cacheable response's headers through the active CDN cache adapter and
  * apply the result to `headers`. The default adapter yields a single
@@ -34,4 +36,4 @@ declare function buildRevalidateCacheControl(revalidateSeconds: number, expireSe
  */
 declare function buildCachedRevalidateCacheControl(cacheState: "HIT" | "STALE", revalidateSeconds: number, expireSeconds?: number): string;
 //#endregion
-export { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, buildCachedRevalidateCacheControl, buildRevalidateCacheControl };
+export { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, buildCachedRevalidateCacheControl, buildRevalidateCacheControl, shouldUseNextDeployCacheControl };

package/dist/server/cache-control.js

@@ -1,9 +1,17 @@
 import { getCdnCacheAdapter } from "../shims/cdn-cache.js";
 //#region src/server/cache-control.ts
 const NEVER_CACHE_CONTROL = "private, no-cache, no-store, max-age=0, must-revalidate";
+const BROWSER_REVALIDATE_CACHE_CONTROL = "public, max-age=0, must-revalidate";
 const STATIC_CACHE_CONTROL = "s-maxage=31536000, stale-while-revalidate";
 const STALE_REVALIDATE_CACHE_CONTROL = "s-maxage=0, stale-while-revalidate";
 const NO_STORE_CACHE_CONTROL = "no-store, must-revalidate";
+const SHARED_CACHE_DIRECTIVE_RE = /(?:^|,)\s*s-maxage\s*=/i;
+function shouldUseNextDeployCacheControl() {
+	return process.env.VINEXT_NEXT_DEPLOY_CACHE_CONTROL === "1";
+}
+function isSharedCacheControl(cacheControl) {
+	return SHARED_CACHE_DIRECTIVE_RE.test(cacheControl);
+}
 /**
 * Route a cacheable response's headers through the active CDN cache adapter and
 * apply the result to `headers`. The default adapter yields a single
@@ -17,6 +25,10 @@ const NO_STORE_CACHE_CONTROL = "no-store, must-revalidate";
 */
 function applyCdnResponseHeaders(headers, input) {
 	headers.delete("Cache-Control");
+	if (shouldUseNextDeployCacheControl() && isSharedCacheControl(input.cacheControl)) {
+		headers.set("Cache-Control", BROWSER_REVALIDATE_CACHE_CONTROL);
+		return;
+	}
 	const map = getCdnCacheAdapter().buildResponseHeaders(input);
 	for (const [name, value] of Object.entries(map)) {
 		if (value === null) {
@@ -53,4 +65,4 @@ function buildCachedRevalidateCacheControl(cacheState, revalidateSeconds, expire
 	return buildRevalidateCacheControl(revalidateSeconds, expireSeconds);
 }
 //#endregion
-export { NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, buildCachedRevalidateCacheControl, buildRevalidateCacheControl };
+export { BROWSER_REVALIDATE_CACHE_CONTROL, NEVER_CACHE_CONTROL, NO_STORE_CACHE_CONTROL, STATIC_CACHE_CONTROL, applyCdnResponseHeaders, buildCachedRevalidateCacheControl, buildRevalidateCacheControl, shouldUseNextDeployCacheControl };

package/dist/server/dev-server.d.ts

@@ -43,7 +43,17 @@ declare function createSSRHandler(server: ViteDevServer, runner: ModuleImporter,
  * `next.config`. When undefined or empty, no meta tags are emitted.
  */
 
-clientTraceMetadata?: readonly string[], htmlLimitedBots?: string): (req: IncomingMessage, res: ServerResponse, url: string, /** Status code override — propagated from middleware rewrite status. */
+clientTraceMetadata?: readonly string[], htmlLimitedBots?: string,
+/**
+ * Whether `reactStrictMode: true` is set in next.config. When true, the dev
+ * hydration script sets `window.__VINEXT_REACT_STRICT_MODE__` so
+ * `wrapWithRouterContext` wraps the tree in `<React.StrictMode>` on the
+ * initial hydration and every navigation. Pages Router default is OFF
+ * (Next.js: `reactStrictMode === null ? false`), so callers pass
+ * `nextConfig?.reactStrictMode === true`.
+ */
+
+reactStrictMode?: boolean): (req: IncomingMessage, res: ServerResponse, url: string, /** Status code override — propagated from middleware rewrite status. */
 
 statusCode?: number,
 /**