vinext 1.4.3 → 1.4.4

package/dist/build/prerender-paths.js

@@ -18,6 +18,7 @@ import { normalizePathTrailingSlash } from "../shims/url-utils.js";
 import { resolveAppPageDynamicConfig } from "../server/app-segment-config.js";
 import { classifyAppPageRouteStaticEligibility } from "./app-page-static-eligibility.js";
 import { pagesRouteHasPriorityOverAppRoute } from "../server/hybrid-route-priority.js";
+import { tryRealpathSync } from "./ssr-manifest.js";
 import { readPrerenderSecret } from "./server-manifest.js";
 import { loadMdxEsmReader } from "../utils/mdx-scan.js";
 import { startProdServer } from "../server/prod-server.js";
@@ -674,10 +675,13 @@ function configuredRulesAffectWarmPath(pathname, rules, config) {
 function configuredRewritesCanReplaceWarmPath(pathname, rewrites, hasNonDynamicRoute, config, include) {
 	return configuredRulesAffectWarmPath(pathname, [...rewrites.beforeFiles.filter(include), ...hasNonDynamicRoute ? [] : rewrites.afterFiles.filter(include)], config);
 }
+function canonicalDir(dir) {
+	return toSlash(tryRealpathSync(dir) ?? dir);
+}
 function findMiddlewareConventionFile(root, appDir, pagesDir, pageExtensions) {
 	const routeDir = appDir ?? pagesDir;
 	const routeRoot = routeDir ? path.dirname(routeDir) : root;
-	const conventionDir = routeRoot === path.join(root, "src") ? routeRoot : root;
+	const conventionDir = canonicalDir(routeRoot) === canonicalDir(path.join(root, "src")) ? routeRoot : root;
 	for (const name of ["proxy", "middleware"]) for (const extension of pageExtensions) {
 		const filePath = path.join(conventionDir, `${name}.${extension}`);
 		if (fs.existsSync(filePath)) return filePath;

package/dist/index.js

@@ -18,7 +18,7 @@ import { hasBasePath, restoreBasePath, stripBasePath } from "./utils/base-path.j
 import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { methodNotAllowedResponse, notFoundStaticAssetResponse } from "./server/http-error-responses.js";
 import { isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./server/open-redirect.js";
-import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
+import { canonicalizeRequestUrlPathname, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { proxyExternalRequest } from "./config/config-matchers.js";
 import { omitUnusedBuildSourcemap } from "./plugins/transform-result.js";
 import { assetPrefixPathname, isNextStaticPath, resolveAssetsDir } from "./utils/asset-prefix.js";
@@ -64,6 +64,7 @@ import { generateBrowserEntry, generateBrowserRouteManifestModule, toHashedRoute
 import { createRscScanGlobImportsPlugin, isRscScanGlobImportsAffected } from "./plugins/rsc-scan-glob-imports.js";
 import { loadOrGenerateServerActionsEncryptionKey } from "./build/server-actions-encryption-key.js";
 import { findOpenTelemetryPackages, mergeServerExternalPackages } from "./config/server-external-packages.js";
+import { removeRequestHeaders } from "./server/remove-request-headers.js";
 import { precompressAssets } from "./build/precompress.js";
 import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VINEXT_ROUTE_ROOT_CONFIG_PLUGIN_PROPERTY, normalizeVinextPrerenderConfig } from "./config/prerender.js";
 import { VINEXT_CLIENT_ENTRY_MANIFEST, VINEXT_CLIENT_REFERENCE_SOURCES } from "./utils/client-entry-manifest.js";
@@ -182,10 +183,10 @@ const RSC_ENVIRONMENTS = /* @__PURE__ */ new Set([
 	"client"
 ]);
 const VINEXT_GENERATED_DIR_RE = /(?:^|[/\\])\.vinext(?:[/\\]|$)/;
+const FORWARDED_MIDDLEWARE_CONTEXT_HEADERS = /* @__PURE__ */ new Set([VINEXT_MW_CTX_HEADER]);
+const STRIPPED_INTERNAL_REQUEST_HEADERS = /* @__PURE__ */ new Set([...INTERNAL_HEADERS, ...VINEXT_INTERNAL_HEADERS]);
 function removeForwardedMiddlewareContext(req) {
-	delete req.headers[VINEXT_MW_CTX_HEADER];
-	const rawHeaders = req.rawHeaders;
-	for (let i = rawHeaders.length - 2; i >= 0; i -= 2) if (rawHeaders[i].toLowerCase() === "x-vinext-mw-ctx") rawHeaders.splice(i, 2);
+	removeRequestHeaders(req, FORWARDED_MIDDLEWARE_CONTEXT_HEADERS);
 }
 function setForwardedMiddlewareContext(req, key, context) {
 	removeForwardedMiddlewareContext(req);
@@ -940,6 +941,20 @@ function getLeadingReactDirective(code) {
 function hasReactDirective(code) {
 	return getLeadingReactDirective(code) !== null;
 }
+/**
+* Resolve a project directory through symlinks the way Vite resolves
+* `config.root` (and Next.js its project dir), so route files, `server.config.root`
+* and module ids all share one path. Windows uses the JS realpath, as Vite
+* does, to keep mapped network drives.
+*/
+function resolveProjectDir(dir, preserveSymlinks) {
+	if (preserveSymlinks) return toSlash(dir);
+	try {
+		return toSlash(process.platform === "win32" ? fs.realpathSync(dir) : fs.realpathSync.native(dir));
+	} catch {
+		return toSlash(dir);
+	}
+}
 function generateRootParamsModule(rootParamNames) {
 	const names = Array.from(new Set(rootParamNames)).filter(isValidExportIdentifier).sort();
 	if (names.length === 0) return "export {};\n";
@@ -1489,7 +1504,7 @@ function vinext(options = {}) {
 				buildEmptyOutDir = typeof config.build?.emptyOutDir === "boolean" ? config.build.emptyOutDir : void 0;
 				isServeCommand = env.command === "serve";
 				const ipaddrSsrExternal = env.command === "serve" ? ["ipaddr.js"] : [];
-				root = path.resolve(toSlash(process.cwd()), config.root ?? ".");
+				root = resolveProjectDir(path.resolve(toSlash(process.cwd()), config.root ?? "."), config.resolve?.preserveSymlinks);
 				if (env.command === "build") assertClientOutDirIsSeparate(root, options);
 				const devCliLifecycleEnabled = env.command === "serve" && env.isPreview !== true && claimViteCliDevInvocation(root, config["__vinextDevRestart"] === true, reservedDevCliInvocation && config.configFile === false);
 				buildLifecycleInvocation = config[VINEXT_BUILD_LIFECYCLE_CONFIG];
@@ -1501,7 +1516,7 @@ function vinext(options = {}) {
 				const swcHelpersAlias = resolveSwcHelpersAlias(root);
 				const mode = env?.mode ?? "development";
 				const envDir = config.envDir === false ? void 0 : config.envDir ? path.resolve(root, config.envDir) : root;
-				if (earlyDotenv && envDir !== earlyDotenv.dir) {
+				if (earlyDotenv && (envDir === void 0 || resolveProjectDir(envDir, config.resolve?.preserveSymlinks) !== resolveProjectDir(earlyDotenv.dir, config.resolve?.preserveSymlinks))) {
 					for (const [key, value] of Object.entries(earlyDotenv.env)) if (process.env[key] === value) Reflect.deleteProperty(process.env, key);
 					earlyDotenv = void 0;
 				}
@@ -1520,10 +1535,8 @@ function vinext(options = {}) {
 				}
 				draftModeSecret = previewBuildCredentials?.id ?? getPagesPreviewModeId();
 				let baseDir;
-				if (options.appDir) {
-					const dir = path.isAbsolute(options.appDir) ? options.appDir : path.resolve(root, options.appDir);
-					baseDir = toSlash(dir);
-				} else {
+				if (options.appDir) baseDir = resolveProjectDir(path.isAbsolute(options.appDir) ? options.appDir : path.resolve(root, options.appDir), config.resolve?.preserveSymlinks);
+				else {
 					const hasRootApp = fs.existsSync(path.join(root, "app"));
 					const hasRootPages = fs.existsSync(path.join(root, "pages"));
 					const hasSrcApp = fs.existsSync(path.join(root, "src", "app"));
@@ -1758,6 +1771,7 @@ function vinext(options = {}) {
 					delete config.resolve.alias;
 				}
 				const viteConfig = {
+					root,
 					appType: "custom",
 					...devCliLifecycleEnabled ? { [VINEXT_DEV_CLI_LIFECYCLE]: true } : {},
 					...hasAppDir && hasNitroPlugin ? { rsc: { serverHandler: false } } : {},
@@ -3342,6 +3356,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								}
 								revalidationHostname = readTrustedRevalidationHostname(revalidationHeaders, nextConfig?.i18n);
 							}
+							removeRequestHeaders(req, STRIPPED_INTERNAL_REQUEST_HEADERS);
 							const requestHost = revalidationHostname ?? ((Array.isArray(req.headers.host) ? req.headers.host[0] : req.headers.host) || "localhost");
 							const requestOrigin = `http://${requestHost}`;
 							const getUrlHostname = (requestUrl) => new URL(requestUrl).hostname;
@@ -3451,12 +3466,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									});
 								}
 							}
-							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
+							const nodeRequestHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
 							const isDataRequest = isDataReq;
-							const nodeRequestHeaders = filterInternalHeaders(rawHeaders);
 							if (revalidationHostname) nodeRequestHeaders.set("host", revalidationHostname);
-							for (const header of INTERNAL_HEADERS) delete req.headers[header];
-							for (const header of VINEXT_INTERNAL_HEADERS) delete req.headers[header];
 							const method = req.method ?? "GET";
 							const webRequest = new Request(new URL(routeUrl, requestOrigin), {
 								method,

package/dist/server/api-handler.js

@@ -263,11 +263,10 @@ async function handleApiRoute(runner, req, res, url, apiRoutes, nextConfig) {
 			const response = finalizeEdgeApiResponse(handlerResponse, "node");
 			res.statusCode = response.status;
 			res.statusMessage = response.statusText;
-			const setCookieHeaders = response.headers.getSetCookie();
 			response.headers.forEach((value, name) => {
 				if (name !== "set-cookie") res.setHeader(name, value);
 			});
-			if (setCookieHeaders.length) res.setHeader("set-cookie", setCookieHeaders);
+			for (const cookie of response.headers.getSetCookie()) res.appendHeader("set-cookie", cookie);
 			await writeEdgeApiResponseBody(res, response.body, nextRequest.signal);
 			return true;
 		}

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

@@ -7,24 +7,26 @@ import { clearAppNavigationFailureTarget, installAppNavigationFailureListeners }
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import "../client/instrumentation-client.js";
 import { createNavigationRuntimeRouteManifestLoader, getNavigationRuntime, loadNavigationRuntimeRouteManifest, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
+import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
+import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
+import { getBfcacheIdMapContext, getNavigationContext, setNavigationContext } from "../shims/navigation-context-state.js";
+import { decodeRedirectError, isRedirectError } from "../shims/navigation-errors.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIdsHeader, resolveVisitedResponseInterceptionContext } from "./app-elements.js";
-import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
-import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
 import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
 import { isExternalHistoryState, readHistoryStateActiveRoutePaths, readHistoryStatePreviousNextUrl, resolveActiveRoutePaths } from "./app-history-state.js";
 import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
 import { stripRscCompletionMetadataResponse } from "./rsc-completion-metadata.js";
 import { blockDangerousStreamedRscRedirect } from "./app-browser-rsc-redirect.js";
 import { navigationPlanner } from "./navigation-planner.js";
-import { decodeRedirectError, isRedirectError } from "../shims/navigation-errors.js";
-import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
-import { getBfcacheIdMapContext, getNavigationContext, setNavigationContext } from "../shims/navigation-context-state.js";
 import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, activateNavigationSnapshot, appRouterInstance, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, disableNavigationResponsePrefetchCacheReuse, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidateDynamicPrefetchCache, invalidatePrefetchCache, invalidateVisitedResponsePrefetches, parseRenderedPathAndSearchHeader, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, trackAppRouterNavigationInFlight, useRouter } from "../shims/navigation.js";
-import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
+import { BfcacheIdentityMapContext, bindAppElementsRenderedSearch, isBfcacheIdentityRetained, setAppElementsRenderedSearch } from "../shims/slot.js";
+import DefaultGlobalError from "../shims/default-global-error.js";
+import { DevRecoveryBoundary, GlobalErrorBoundary, RedirectBoundary } from "../shims/error-boundary.js";
+import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
+import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
 import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
 import { createMountedLayoutsHeader, holdsSkippedLayouts } from "./app-mounted-layouts.js";
-import { BfcacheIdentityMapContext, bindAppElementsRenderedSearch, isBfcacheIdentityRetained, setAppElementsRenderedSearch } from "../shims/slot.js";
 import { COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, isCacheRestorableAppPayloadMetadata, isCompleteAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl } from "./app-browser-state.js";
 import { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch, navigateDocumentDirectly } from "./app-browser-navigation-controller.js";
 import { createAppRouteTree } from "./app-route-tree.js";
@@ -35,8 +37,6 @@ import { consumeInitialFormState, createVinextHydrateRootOptions, hydrateRootInT
 import { AppBrowserHistoryController } from "./app-browser-history-controller.js";
 import { createVisitedResponseCacheEntry, deleteAllVisitedResponseCacheEntries, deleteVisitedResponseCacheEntry, findVisitedResponseCacheEntry, findVisitedResponseForFullPrefetch, hasNavigationResponseHistoryLifetime, isVisitedResponseCacheEntryFresh, revokeHistoryRestoreNavigationReuse } from "./app-visited-response-cache.js";
 import { createPopstateRestoreHandler, restoreSynchronousPopstateScrollPosition, shouldCommitPopstateUrlWithoutNavigation } from "./app-browser-popstate.js";
-import DefaultGlobalError from "../shims/default-global-error.js";
-import { DevRecoveryBoundary, GlobalErrorBoundary, RedirectBoundary } from "../shims/error-boundary.js";
 import { createDevOnCaughtError, createOnUncaughtError, createProdOnCaughtError, createProdOnRecoverableError } from "./app-browser-error.js";
 import { createHydrationCachePublication } from "./app-hydration-cache-publication.js";
 import { peekSettledPrefetchResponseForNavigation, prepareConsumedPrefetchResponseForPublication, preserveCommittedPrefetchExpiry, resolvePrefetchNavigationResponseUrl } from "./app-browser-prefetch-response.js";
@@ -44,8 +44,8 @@ import { canCommitOptimisticRouteTemplate, createOptimisticRouteTemplate, create
 import { removeStylesheetLinksCoveredByInlineCss } from "./app-inline-css-client.js";
 import { Fragment, createElement, startTransition, use, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { createRoot, hydrateRoot } from "react-dom/client";
-import { createFromFetch, createFromReadableStream, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { flushSync } from "react-dom";
+import { createFromFetch, createFromReadableStream, setServerCallback } from "@vitejs/plugin-rsc/browser";
 import { hasServerActions, loadServerActionClient } from "virtual:vinext-app-capabilities";
 //#region src/server/app-browser-entry.ts
 const HAS_CLIENT_REWRITES = process.env.__VINEXT_HAS_CLIENT_REWRITES !== "false";

package/dist/server/app-browser-navigation-controller.js

@@ -1,10 +1,10 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { withBasePath } from "../shims/url-utils.js";
 import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
-import { resolveServerActionOperationLane, shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
-import { resolveActiveRoutePaths } from "./app-history-state.js";
 import { claimAppRouterScrollIntentForCommit, clearAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
+import { resolveActiveRoutePaths } from "./app-history-state.js";
 import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
+import { resolveServerActionOperationLane, shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
 import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit, createPendingNavigationCommitFromElements } from "./app-browser-state.js";
 import { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit } from "./app-browser-visible-commit.js";
 import { startTransition, useInsertionEffect, useLayoutEffect } from "react";

package/dist/server/app-browser-server-action-client.js

@@ -2,11 +2,11 @@ import { hasBasePath } from "../utils/base-path.js";
 import { ACTION_REDIRECT_HEADER, ACTION_REDIRECT_STATUS_HEADER, VINEXT_RENDERED_PATH_AND_SEARCH_HEADER } from "./headers.js";
 import { DANGEROUS_URL_BLOCK_MESSAGE, isDangerousScheme } from "../shims/url-safety.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createServerActionRequestUrl, toPathAbsolutePathname } from "./app-rsc-cache-busting.js";
-import { throwOnServerActionNotFound } from "./server-action-not-found.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { createServerActionResultFacts, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, shouldClearClientNavigationCachesForServerActionResult, shouldSyncServerActionHttpFallbackHead } from "./app-browser-action-result.js";
 import { parseRenderedPathAndSearchHeader } from "../shims/navigation.js";
+import { throwOnServerActionNotFound } from "./server-action-not-found.js";
+import { createServerActionResultFacts, isServerActionResult, normalizeServerActionThrownValue, parseServerActionRevalidationHeader, readInvalidServerActionResponseError, shouldClearClientNavigationCachesForServerActionResult, shouldSyncServerActionHttpFallbackHead } from "./app-browser-action-result.js";
 import { resolveServerActionRequestState } from "./app-browser-state.js";
 import { applyServerActionResultDecision } from "./app-browser-server-action-navigation.js";
 import { createFromFetch, createTemporaryReferenceSet, encodeReply } from "@vitejs/plugin-rsc/browser";

package/dist/server/app-browser-state.js

@@ -6,15 +6,15 @@ import { normalizePath } from "./normalize-path.js";
 import { createRscRequestHeaders } from "./app-rsc-cache-busting.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import { getMountedSlotIds, getMountedSlotIdsHeader } from "./app-elements.js";
-import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { createAppOwnedHistoryState, createExternalHistoryStatePreservingMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, createHistoryStateWithTreeSnapshotId, isExternalHistoryState, isHistoryStateBfcacheVersionCurrent, readHistoryStateActiveRoutePaths, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveActiveRoutePaths, resolveHistoryTraversalIntent } from "./app-history-state.js";
 import { NavigationTraceReasonCodes, createNavigationLifecycleTraceFields, createNavigationTrace } from "./navigation-trace.js";
 import { verifyOperationTokenForCommit } from "./operation-token.js";
 import { navigationPlanner, resolveDefaultOrUnmatchedSlotPersistenceForLayouts } from "./navigation-planner.js";
 import { createSnapshotPathAndSearch } from "../shims/navigation.js";
+import { bindAppElementsRenderedSearch } from "../shims/slot.js";
+import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { holdsSkippedLayouts } from "./app-mounted-layouts.js";
 import { createCacheEntryReuseProof } from "./cache-proof.js";
-import { bindAppElementsRenderedSearch } from "../shims/slot.js";
 //#region src/server/app-browser-state.ts
 const COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "committed-cache" };
 const FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN = { origin: "fresh" };

package/dist/server/app-browser-visible-commit.js

@@ -1,8 +1,8 @@
 import { AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { createBfcacheSegmentIdentityMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { NavigationTraceReasonCodes, NavigationTraceTransactionCodes, createNavigationTrace, prependNavigationTraceEntry } from "./navigation-trace.js";
 import { mergeElements } from "../shims/slot.js";
+import { createBfcacheSegmentIdentityMap, preserveBfcacheIdsForMergedElements } from "./app-bfcache-identity.js";
 import { createPendingNavigationCommit, resolvePendingNavigationCommitDispositionDecision } from "./app-browser-state.js";
 import { resolveAppPageRouteStateKey } from "./app-page-segment-state.js";
 //#region src/server/app-browser-visible-commit.ts

package/dist/server/app-history-state.js

@@ -1,7 +1,7 @@
+import { isNonNegativeSafeInteger } from "../utils/number.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { isBfcacheSegmentId } from "./app-bfcache-id.js";
-import { isNonNegativeSafeInteger } from "../utils/number.js";
 //#region src/server/app-history-state.ts
 const VINEXT_PREVIOUS_NEXT_URL_HISTORY_STATE_KEY = "__vinext_previousNextUrl";
 const VINEXT_HISTORY_INDEX_HISTORY_STATE_KEY = "__vinext_historyIndex";

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

@@ -3,14 +3,14 @@ import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { NEVER_CACHE_CONTROL, applyCdnResponseHeaders } from "./cache-control.js";
 import { isRenderDynamicLatched, isStaticGenerationAccessError } from "../shims/internal/headers-state.js";
 import { copyLinkHeaderProvenance } from "./app-response-header-provenance.js";
+import { withUseCacheLayoutMarker } from "../shims/internal/app-page-props-cache-key.js";
+import { rewriteClientHookError } from "../shims/client-hook-error.js";
 import { createArtifactCompatibilityEnvelope } from "./artifact-compatibility.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
 import { ErrorBoundary, GlobalErrorBoundary, SerializedErrorBoundary } from "../shims/error-boundary.js";
-import { rewriteClientHookError } from "../shims/client-hook-error.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
-import { withUseCacheLayoutMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { MetadataHead, ViewportHead } from "../shims/metadata.js";
 import { buildRscRedirectFlightStream } from "./app-rsc-redirect-flight.js";
 import { bufferAppPageBinaryStream, buildAppPageSpecialErrorResponse, resolveAppPageSpecialError } from "./app-page-execution.js";

package/dist/server/app-page-element-builder.js

@@ -1,11 +1,12 @@
 import { isPromiseLike } from "../utils/promise.js";
 import { APP_RSC_RENDER_MODE_NAVIGATION } from "./app-rsc-render-mode.js";
+import { makeThenableParams } from "../shims/thenable-params.js";
+import { withUseCacheLayoutMarker, withUseCachePageMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
-import { APP_PAGE_SEGMENT_KEY, isAppPageRouteGroupSegment, resolveAppPagePatternStateKey, resolveAppPageRouteStateKey, resolveAppPageSemanticSegmentStateKey } from "./app-page-segment-state.js";
+import { ClientPageRoot } from "../shims/client-page-root.js";
 import { ErrorBoundary, ForbiddenBoundary, NotFoundBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
-import { withUseCacheLayoutMarker, withUseCachePageMarker } from "../shims/internal/app-page-props-cache-key.js";
-import { makeThenableParams } from "../shims/thenable-params.js";
+import { APP_PAGE_SEGMENT_KEY, isAppPageRouteGroupSegment, resolveAppPagePatternStateKey, resolveAppPageRouteStateKey, resolveAppPageSemanticSegmentStateKey } from "./app-page-segment-state.js";
 import { tagAppPagePageError, tagAppPageSlotError } from "./app-page-execution.js";
 import { createAppPageMetadataSearchParamsObserver, makeObservedAppPageSearchParamsThenable } from "./app-page-search-params-observation.js";
 import { resolveAppPageBranchParams } from "./app-page-params.js";
@@ -19,7 +20,6 @@ import { resolveAppPageModuleTraceSegment, traceCreateComponentTree, traceGetLay
 import { buildAppPageElements, createAppPageSourcePage, createAppPageTreePath, resolveAppPageLoadingModuleAtOrAbove } from "./app-page-route-wiring.js";
 import { DEFAULT_GLOBAL_ERROR_MODULE } from "./default-global-error-module.js";
 import { shouldServeStreamingMetadata } from "./streaming-metadata.js";
-import { ClientPageRoot } from "../shims/client-page-root.js";
 import { createAppPageRenderIdentity } from "./app-page-render-identity.js";
 import { Fragment, Suspense, cache, createElement } from "react";
 //#region src/server/app-page-element-builder.ts

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

@@ -17,11 +17,11 @@ import { applyPrerenderCacheLifeHeader, applyPrerenderCacheTagsHeader } from "./
 import { copyLinkHeaderProvenance, getFrameworkLinkHeader } from "./app-response-header-provenance.js";
 import { traceResponseStartWithCompletion } from "./response-start-tracing.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
+import { isBailoutToCSRError } from "../shims/navigation-errors.js";
 import { createArtifactCompatibilityEnvelope, createArtifactCompatibilityGraphVersion } from "./artifact-compatibility.js";
 import { AppElementsWire, isAppElementsRecord } from "./app-elements-wire.js";
 import "./app-elements.js";
 import { appendRscCompletionMetadata } from "./rsc-completion-metadata.js";
-import { isBailoutToCSRError } from "../shims/navigation-errors.js";
 import { applyClientStaleTimeHeader, applyEdgeRuntimeHeader, buildAppPageHtmlResponse, buildAppPageRscResponse, resolveAppPageHtmlResponsePolicy, resolveAppPageRscResponsePolicy, resolveUncacheableCacheControl } from "./app-page-response.js";
 import { buildAppPageFontLinkHeader, readAppPageBinaryStream, resolveAppPageCaughtNotFoundBoundaries, resolveAppPageShellSpecialError, resolveAppPageSpecialError, resolveAppPageSpecialErrorStoredHeaders, teeAppPageRscStreamForCapture } from "./app-page-execution.js";
 import { buildAppPageHtmlDocumentResponse, buildAppPageLinkHeader, createAppPageFontData, createAppPageRscErrorTracker, createAppPageSsrErrorHandler, renderAppPageHtmlStream, renderAppPageHtmlStreamWithRecovery } from "./app-page-stream.js";

package/dist/server/app-page-route-wiring.js

@@ -1,24 +1,24 @@
 import { APP_RSC_RENDER_MODE_PREFETCH_EMPTY, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "./app-rsc-render-mode.js";
 import { fnv1a64 } from "../utils/hash.js";
 import { createInlineScriptTag, escapeHtmlAttr } from "./html.js";
+import { AppRouterScrollTarget } from "../shims/app-router-scroll.js";
+import { withUseCacheLayoutMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { APP_LAYOUT_IDS_KEY, APP_ROOT_LAYOUT_KEY, APP_SKIPPED_LAYOUT_IDS_KEY, APP_STATIC_SIBLINGS_KEY, AppElementsWire, normalizeAppElementsSlotBindings } from "./app-elements-wire.js";
 import { APP_PREFETCH_LOADING_SHELL_MARKER_KEY, APP_STREAMING_METADATA_BODY_ID_PREFIX } from "./app-elements.js";
 import { createBfcacheChildSegmentStateKey } from "./bfcache-identity.js";
-import { AppRouterScrollTarget } from "../shims/app-router-scroll.js";
-import { hashMountedLayoutIdentity } from "./app-mounted-layouts.js";
 import { BfcacheChildrenBoundary, BfcacheSegmentBoundary, Children as Children$1, ParallelSlot, Slot } from "../shims/slot.js";
-import { APP_PAGE_SEGMENT_KEY, isAppPageRouteGroupSegment, resolveAppPageChildSegments, resolveAppPageSegmentStateKey, resolveAppPageTemplateStateKey } from "./app-page-segment-state.js";
+import DefaultForbidden from "../shims/default-forbidden.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
+import DefaultNotFound from "../shims/default-not-found.js";
+import DefaultUnauthorized from "../shims/default-unauthorized.js";
 import { ErrorBoundary, ForbiddenBoundary, GlobalErrorBoundary, HttpAccessFallbackPassthrough, NotFoundBoundary, RedirectBoundary, UnauthorizedBoundary } from "../shims/error-boundary.js";
 import { LayoutSegmentProvider } from "../shims/layout-segment-context.js";
-import { withUseCacheLayoutMarker } from "../shims/internal/app-page-props-cache-key.js";
 import { MetadataHead, ViewportHead, renderMetadataToHtml } from "../shims/metadata.js";
+import { StreamedIconsInsertion } from "../shims/streamed-icons.js";
+import { hashMountedLayoutIdentity } from "./app-mounted-layouts.js";
+import { APP_PAGE_SEGMENT_KEY, isAppPageRouteGroupSegment, resolveAppPageChildSegments, resolveAppPageSegmentStateKey, resolveAppPageTemplateStateKey } from "./app-page-segment-state.js";
 import { APP_PAGE_NOT_FOUND_BOUNDARY_ID, tagAppPageLayoutError, tagAppPageSlotError } from "./app-page-execution.js";
 import { resolveAppPageBranchParams, resolveAppPageSegmentParams } from "./app-page-params.js";
-import DefaultForbidden from "../shims/default-forbidden.js";
-import DefaultNotFound from "../shims/default-not-found.js";
-import DefaultUnauthorized from "../shims/default-unauthorized.js";
-import { StreamedIconsInsertion } from "../shims/streamed-icons.js";
 import { createAppRenderDependency, invokeAppComponentMappingErrors, isReactOwnedAppComponent, renderAfterAppDependencies, renderAppComponentWithDependencyBarrier } from "./app-render-dependency.js";
 import { createAppPageLayoutGate, registerAppPageLayoutGate } from "./app-page-layout-gate.js";
 import { probeReactServerSubtree } from "./app-page-probe.js";

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

@@ -1,7 +1,7 @@
 import { setHeadersContext } from "../shims/headers.js";
+import { setRootParams } from "../shims/root-params.js";
 import { setNavigationContext } from "../shims/navigation-context-state.js";
 import "../shims/navigation-server.js";
-import { setRootParams } from "../shims/root-params.js";
 //#region src/server/app-request-context.ts
 /**
 * Set navigation context in the ALS-backed store. "use client" components

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

@@ -14,9 +14,9 @@ import { ensureFetchPatch, getCollectedFetchTags, setCurrentFetchCacheMode, setC
 import { resolveAppRouteHandlerFetchCacheMode } from "./app-segment-config.js";
 import { traceResponseStart } from "./response-start-tracing.js";
 import { applyRouteHandlerMiddlewareContext, finalizeRouteHandlerResponse } from "./app-route-handler-response.js";
+import { makeThenableParams } from "../shims/thenable-params.js";
 import { setNavigationContext } from "../shims/navigation-context-state.js";
 import "../shims/navigation.js";
-import { makeThenableParams } from "../shims/thenable-params.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
 import { isKnownDynamicAppRoute, isValidHTTPMethod } from "./app-route-handler-runtime.js";
 import { getAppRouteHandlerRevalidateSeconds, hasAppRouteHandlerDefaultExport, hasNonStaticAppRouteHandlerMethods, resolveAppRouteHandlerMethod, shouldReadAppRouteHandlerCache } from "./app-route-handler-policy.js";

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

@@ -10,8 +10,8 @@ import { isDraftModeRequest, setHeadersContext } from "../shims/headers.js";
 import { _drainPendingRevalidations } from "../shims/cache-request-state.js";
 import { copyLinkHeaderProvenance } from "./app-response-header-provenance.js";
 import { applyRouteHandlerMiddlewareContext, applyRouteHandlerRevalidateHeader, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, finalizeRouteHandlerResponse, markRouteHandlerCacheMiss } from "./app-route-handler-response.js";
-import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
 import { runWithRootParamsUsage } from "../shims/root-params.js";
+import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
 import { createTrackedAppRouteRequest, markKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
 import { resolveAppRouteHandlerSpecialError, shouldApplyAppRouteHandlerRevalidateHeader, shouldCompleteAppRouteHandlerResponse, shouldWriteAppRouteHandlerCache } from "./app-route-handler-policy.js";
 import { createStaticGenerationHeadersContext, getAppRouteStaticGenerationErrorMessage } from "./app-static-generation.js";

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

@@ -17,6 +17,7 @@ type FinalizeRouteHandlerResponseOptions = {
   draftCookie?: string | null;
   isHead: boolean;
 };
+export declare function stripRouteHandlerFramingHeaders(response: Response): Response;
 export declare function applyRouteHandlerMiddlewareContext(response: Response, middlewareContext: RouteHandlerMiddlewareContext, options?: MiddlewareResponseMergeOptions & {
   appendResponseLink?: boolean;
 }): Response;

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

@@ -1,3 +1,4 @@
+import { preserveFullyBufferedBodyMetadata } from "./fully-buffered-response.js";
 import "../utils/protocol-headers.js";
 import { NEXT_CACHE_TAGS_HEADER, VINEXT_METADATA_ROUTE_CACHE_HEADER } from "./headers.js";
 import { processMiddlewareHeaders } from "./request-pipeline.js";
@@ -11,6 +12,28 @@ import { getSetCookieName } from "./cookie-utils.js";
 //#region src/server/app-route-handler-response.ts
 const APP_ROUTE_REWRITE_ERROR = "NextResponse.rewrite() was used in a app route handler, this is not currently supported. Please remove the invocation to continue.";
 const APP_ROUTE_NEXT_ERROR = "NextResponse.next() was used in a app route handler, this is not supported. See here for more info: https://nextjs.org/docs/messages/next-response-next-in-app-route-handler";
+const ROUTE_HANDLER_FRAMING_HEADERS = [
+	"content-length",
+	"content-encoding",
+	"transfer-encoding"
+];
+function shouldDropRouteHandlerFramingHeaders(headers) {
+	if ("WebSocketPair" in globalThis) return false;
+	return ROUTE_HANDLER_FRAMING_HEADERS.some((name) => headers.has(name));
+}
+function deleteRouteHandlerFramingHeaders(headers) {
+	for (const name of ROUTE_HANDLER_FRAMING_HEADERS) headers.delete(name);
+}
+function stripRouteHandlerFramingHeaders(response) {
+	if (!shouldDropRouteHandlerFramingHeaders(response.headers)) return response;
+	const headers = new Headers(response.headers);
+	deleteRouteHandlerFramingHeaders(headers);
+	return preserveFullyBufferedBodyMetadata(response, new Response(response.body, {
+		status: response.status,
+		statusText: response.statusText,
+		headers
+	}));
+}
 function hasMiddlewareHeader(headers) {
 	for (const key of headers.keys()) if (key.startsWith("x-middleware-")) return true;
 	return false;
@@ -42,6 +65,7 @@ function buildRouteHandlerCachedResponse(cachedValue, options) {
 	else headers.set(key, value);
 	headers.delete(NEXT_CACHE_TAGS_HEADER);
 	headers.delete(VINEXT_METADATA_ROUTE_CACHE_HEADER);
+	if (shouldDropRouteHandlerFramingHeaders(headers)) deleteRouteHandlerFramingHeaders(headers);
 	setCacheStateHeaders(headers, options.cacheState);
 	const { cacheControl } = decideIsr({
 		cacheState: options.cacheState,
@@ -152,8 +176,9 @@ async function buildAppRouteCacheValue(response, browserCacheControl) {
 }
 function finalizeRouteHandlerResponse(response, options) {
 	const { pendingCookies, draftCookie, isHead } = options;
-	if (pendingCookies.length === 0 && !draftCookie && !isHead && !hasMiddlewareHeader(response.headers)) return response;
+	if (pendingCookies.length === 0 && !draftCookie && !isHead && !hasMiddlewareHeader(response.headers) && !shouldDropRouteHandlerFramingHeaders(response.headers)) return response;
 	const headers = new Headers(response.headers);
+	if (shouldDropRouteHandlerFramingHeaders(headers)) deleteRouteHandlerFramingHeaders(headers);
 	processMiddlewareHeaders(headers);
 	applyMutableCookieFallbacks(headers, pendingCookies);
 	if (draftCookie) headers.append("Set-Cookie", draftCookie);
@@ -164,4 +189,4 @@ function finalizeRouteHandlerResponse(response, options) {
 	});
 }
 //#endregion
-export { applyRouteHandlerMiddlewareContext, applyRouteHandlerRevalidateHeader, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, buildRouteHandlerCachedResponse, finalizeRouteHandlerResponse, markRouteHandlerCacheMiss };
+export { applyRouteHandlerMiddlewareContext, applyRouteHandlerRevalidateHeader, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, buildRouteHandlerCachedResponse, finalizeRouteHandlerResponse, markRouteHandlerCacheMiss, stripRouteHandlerFramingHeaders };

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

@@ -34,6 +34,8 @@ import { setFrameworkRequestRoute, traceFrameworkRequest } from "./request-traci
 import { mergeMiddlewareResponseHeaders, mergeMiddlewareResponseHeadersOntoResponse, withExternalRewriteResponseHeaders } from "./middleware-response-headers.js";
 import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, canonicalizeDynamicShellRscRequestHeaders, canonicalizeLoadingShellRscRequestHeaders, canonicalizePrewarmableRscRequestHeaders, createCanonicalRscRequestUrl, createRscRedirectLocation, createRscRequestUrl, hasRscCacheBustingSearchParam, resolveInvalidRscCacheBustingRequest, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { matchPrerenderRouteParamsPayload, readTrustedPrerenderRouteParams, serializePrerenderRouteParamsHeader } from "./prerender-route-params.js";
+import { flattenErrorCauses } from "../utils/error-cause.js";
+import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import { applyAppRscConfigHeaders, finalizeAppRscResponse, isStreamedActionRedirectResponse, markAppRscApplicationResponse, markAppRscResponseConfigHeadersApplied, markAppRscRouteHandlerResponse, markStreamedActionRedirectResponse } from "./app-rsc-response-finalizer.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage } from "./server-action-not-found.js";
 import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
@@ -45,10 +47,8 @@ import { traceAppPageRender } from "./app-page-tracing.js";
 import { normalizeInterceptionContextHeader } from "./app-interception-context-header.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 { createSharedAppCacheIdentity, createSharedAppPageCacheIdentity, createSharedAppRouteCacheIdentity, createSharedHybridPagesCacheIdentity, isStaticCandidateAppPageDispatch, prepareSharedAppPageDispatch, withoutAppPageDispatchQuery } from "./app-worker-stages.js";
-import { flattenErrorCauses } from "../utils/error-cause.js";
 import { normalizeRscRequest } from "./app-rsc-request-normalization.js";
 import { hasPagesPreviewCookie } from "./pages-response-stage.js";
 import { runWithPrerenderWorkUnit } from "./prerender-work-unit-setup.js";

package/dist/server/app-rsc-response-stage.js

@@ -11,9 +11,9 @@ import { ensureFetchPatch, setCurrentFetchSoftTags } from "../shims/fetch-cache.
 import { traceFindPageComponents } from "./pages-execution-tracing.js";
 import { getRenderedConcreteUrlPathsForRoute } from "./pregenerated-concrete-paths.js";
 import { VINEXT_RSC_CACHE_BUSTING_SEARCH_PARAM, hasRscCacheBustingSearchParam, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
+import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import { traceAppPageRender } from "./app-page-tracing.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
-import { pickRootParams, setRootParams } from "../shims/root-params.js";
 import "./app-worker-stages.js";
 import { normalizeRscRequest } from "./app-rsc-request-normalization.js";
 import { runWithPrerenderWorkUnit } from "./prerender-work-unit-setup.js";

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

@@ -22,6 +22,7 @@ import { readStreamAsTextWithLimit } from "../utils/text-stream.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { VINEXT_RSC_CONTENT_TYPE, applyRscCompatibilityIdHeader, createRscRequestUrl, stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
 import { getSetCookieName } from "./cookie-utils.js";
+import { createRootParamsUsageController, runWithRootParamsUsage } from "../shims/root-params.js";
 import { markAppRscResponseConfigHeadersApplied, markStreamedActionRedirectResponse } from "./app-rsc-response-finalizer.js";
 import { createServerActionNotFoundResponse, getServerActionNotFoundMessage, isServerActionNotFoundError } from "./server-action-not-found.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
@@ -32,7 +33,6 @@ import { hasDigest } from "./app-rsc-errors.js";
 import { buildAppPageTags } from "./implicit-tags.js";
 import { resolveAppPageInterceptSegmentConfig } from "./app-page-intercept-segment-config.js";
 import { resolveAppPageActionRerenderTarget } from "./app-page-request.js";
-import { createRootParamsUsageController, runWithRootParamsUsage } from "../shims/root-params.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
 //#region src/server/app-server-action-execution.ts
 /**

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

@@ -13,28 +13,28 @@ import { getClientTraceMetadataHTML, markClientTraceMetadataBlock } from "./clie
 import { setPagesClientAssets } from "./pages-client-assets.js";
 import { RSC_FORM_STATE_GLOBAL } from "../client/browser-globals.js";
 import { createNavigationRuntimeRenderedSearchScript, createNavigationRuntimeRscCompatibilityScript, createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform, rewriteInlineCssStylesheetLinks, waitAtLeastOneReactRenderTask } from "./app-ssr-stream.js";
-import { AppElementsWire } from "./app-elements-wire.js";
-import "./app-elements.js";
-import { createInitialBfcacheMaps } from "./app-bfcache-identity.js";
-import { isBailoutToCSRError, isDynamicServerError } from "../shims/navigation-errors.js";
+import { withAppRouterTree } from "../shims/app-router-tree-context.js";
+import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
+import { runWithRootParamsScope } from "../shims/root-params.js";
+import { CAUGHT_NOT_FOUND_BOUNDARIES_GLOBAL, withCaughtNotFoundBoundaries } from "../shims/caught-not-found-boundaries.js";
 import { ServerInsertedHTMLContext, clearServerInsertedHTML, getBfcacheIdMapContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "../shims/navigation-context-state.js";
+import { isBailoutToCSRError, isDynamicServerError } from "../shims/navigation-errors.js";
 import "../shims/navigation-server.js";
+import { AppElementsWire } from "./app-elements-wire.js";
+import "./app-elements.js";
 import { BfcacheIdentityMapContext } from "../shims/slot.js";
-import { createAppRouteTree } from "./app-route-tree.js";
 import DefaultGlobalError from "../shims/default-global-error.js";
-import { CAUGHT_NOT_FOUND_BOUNDARIES_GLOBAL, withCaughtNotFoundBoundaries } from "../shims/caught-not-found-boundaries.js";
+import { runWithNavigationContext } from "../shims/navigation-state.js";
+import { createInitialBfcacheMaps } from "./app-bfcache-identity.js";
+import { createAppRouteTree } from "./app-route-tree.js";
 import { ssrServerConsumerManifest } from "./app-client-reference-manifest.js";
 import { createClientReferencePreloader, resolveRouteClientReferences } from "./app-client-reference-preloader.js";
 import { getNextErrorDigest } from "./next-error-digest.js";
 import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
 import { createClientPageSsrSearchParamsSource } from "./app-page-search-params-observation.js";
 import { createRenderStreamCancellation, isAppRenderAbortError } from "./app-render-abort-error.js";
-import { runWithRootParamsScope } from "../shims/root-params.js";
-import { runWithNavigationContext } from "../shims/navigation-state.js";
 import { startCandidateSearchParamsGate } from "./app-ssr-search-params-gate.js";
 import { isSrvxAbsoluteFormTarget } from "./srvx-request-target.js";
-import { withAppRouterTree } from "../shims/app-router-tree-context.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 { createStreamedClientReferences, renderStreamedStylesheets, resetStreamedClientReferences, runWithStreamedClientReferences, wrapClientReferenceRequire } from "./app-streamed-client-references.js";

package/dist/server/edge-api-runtime.d.ts

@@ -5,8 +5,12 @@ export type EdgeApiExecutionRuntime = "node" | "worker";
  * Remove wire-level body headers after Node's fetch implementation has decoded
  * an Edge API response. Next.js applies the same boundary in its edge sandbox.
  *
- * Workers keep the original response untouched: workerd preserves the encoded
- * body/header pair and can stream it directly to the client.
+ * Workers otherwise keep the original response untouched: workerd preserves
+ * the encoded body/header pair and can stream it directly to the client.
+ *
+ * Both runtimes drop `x-middleware-set-cookie`, the internal copy of the
+ * cookies that `NextResponse.cookies` keeps for middleware. Next.js's
+ * send-response never writes it to the client.
  */
 export declare function finalizeEdgeApiResponse(response: Response, runtime: EdgeApiExecutionRuntime): Response;
 //#endregion

package/dist/server/edge-api-runtime.js

@@ -1,3 +1,5 @@
+import { MIDDLEWARE_SET_COOKIE_HEADER } from "../utils/protocol-headers.js";
+import "./headers.js";
 //#region src/server/edge-api-runtime.ts
 function isEdgeApiRuntime(runtime) {
 	return runtime === "edge" || runtime === "experimental-edge";
@@ -11,13 +13,28 @@ const NODE_EDGE_RESPONSE_FORBIDDEN_HEADERS = [
 * Remove wire-level body headers after Node's fetch implementation has decoded
 * an Edge API response. Next.js applies the same boundary in its edge sandbox.
 *
-* Workers keep the original response untouched: workerd preserves the encoded
-* body/header pair and can stream it directly to the client.
+* Workers otherwise keep the original response untouched: workerd preserves
+* the encoded body/header pair and can stream it directly to the client.
+*
+* Both runtimes drop `x-middleware-set-cookie`, the internal copy of the
+* cookies that `NextResponse.cookies` keeps for middleware. Next.js's
+* send-response never writes it to the client.
 */
 function finalizeEdgeApiResponse(response, runtime) {
-	if (runtime === "worker") return response;
+	if (runtime === "worker") {
+		if (!response.headers.has("x-middleware-set-cookie")) return response;
+		try {
+			response.headers.delete(MIDDLEWARE_SET_COOKIE_HEADER);
+			return response;
+		} catch {
+			const copy = new Response(response.body, response);
+			copy.headers.delete(MIDDLEWARE_SET_COOKIE_HEADER);
+			return copy;
+		}
+	}
 	const headers = new Headers(response.headers);
-	let changed = false;
+	let changed = headers.has(MIDDLEWARE_SET_COOKIE_HEADER);
+	headers.delete(MIDDLEWARE_SET_COOKIE_HEADER);
 	for (const name of NODE_EDGE_RESPONSE_FORBIDDEN_HEADERS) {
 		if (!headers.has(name)) continue;
 		headers.delete(name);

package/dist/server/metadata-route-response.js

@@ -16,7 +16,7 @@ import { _consumeRequestScopedCacheLife, _isOnDemandRevalidate } from "../shims/
 import { ensureFetchPatch, getCollectedFetchTags, setCurrentFetchSoftTags } from "../shims/fetch-cache.js";
 import { applyPrerenderCacheLifeHeader, applyPrerenderCacheTagsHeader } from "./prerender-cache-life-header.js";
 import { isValidMetadataImageId, manifestToJson, matchMetadataRoutePattern, robotsToText, sitemapToXml } from "./metadata-routes.js";
-import { buildAppRouteCacheValue, buildRouteHandlerCachedResponse } from "./app-route-handler-response.js";
+import { buildAppRouteCacheValue, buildRouteHandlerCachedResponse, stripRouteHandlerFramingHeaders } from "./app-route-handler-response.js";
 import { canonicalizeAppPageParams } from "./app-page-segment-state.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
@@ -261,7 +261,7 @@ async function renderMetadataRouteMiss(options, route, render, cachedEntry) {
 		const rendered = await render();
 		if (!rendered) return null;
 		await writeMetadataRouteMiss(options, route, rendered, cachedEntry);
-		return rendered.response;
+		return stripRouteHandlerFramingHeaders(rendered.response);
 	};
 	const routeKey = _isOnDemandRevalidate() ? getOuterMetadataCacheKey(options, route) : null;
 	if (routeKey === null || !options.isrSet) return renderAndStore();

package/dist/server/navigation-planner.js

@@ -262,11 +262,12 @@ function createFreshFetchDecision(facts, reason) {
 }
 function classifyNavigationReuse(facts) {
 	if (facts.navigationKind === "refresh") return createFreshFetchDecision(facts, "refresh");
-	if (!facts.bypassNavigationCache && facts.visitedResponse.status === "available") return {
+	if (facts.bypassNavigationCache) return createFreshFetchDecision(facts, "cacheBypassed");
+	if (facts.visitedResponse.status === "available") return {
 		kind: "reuseVisitedResponse",
 		trace: createNavigationReuseTrace(NavigationTraceReasonCodes.visitedResponseReuse, facts)
 	};
-	if (!facts.bypassNavigationCache && facts.prefetch.status === "available") return {
+	if (facts.prefetch.status === "available") return {
 		kind: "consumePrefetch",
 		trace: createNavigationReuseTrace(NavigationTraceReasonCodes.prefetchResponseReuse, facts)
 	};
@@ -275,9 +276,8 @@ function classifyNavigationReuse(facts) {
 			kind: "attemptOptimisticRouteShell",
 			trace: createNavigationReuseTrace(NavigationTraceReasonCodes.optimisticRouteShell, facts)
 		};
-		return createFreshFetchDecision(facts, facts.bypassNavigationCache ? "cacheBypassed" : facts.optimisticRouteShell.reason);
+		return createFreshFetchDecision(facts, facts.optimisticRouteShell.reason);
 	}
-	if (facts.bypassNavigationCache) return createFreshFetchDecision(facts, "cacheBypassed");
 	return createFreshFetchDecision(facts, "cacheMiss");
 }
 function classifyNavigationPrefetchProbe(facts) {
@@ -676,10 +676,11 @@ function planFlightResponseArrived(options) {
 		slotBindingSource: "manifestTarget",
 		snapshot: targetSnapshot
 	});
+	const renderedRootLayoutChanged = classifyRootBoundaryTransition(options.state.visibleSnapshot.rootBoundaryId, targetSnapshot.rootBoundaryId) === "rootBoundaryChanged";
 	const traceFields = createRootBoundaryTraceFields({
-		currentRootLayoutTreePath: currentTopology.kind === "known" ? currentTopology.topology.rootLayoutTreePath : null,
+		currentRootLayoutTreePath: renderedRootLayoutChanged ? options.state.visibleSnapshot.rootBoundaryId : currentTopology.kind === "known" ? currentTopology.topology.rootLayoutTreePath : null,
 		event: options.event,
-		nextRootLayoutTreePath: targetTopology.kind === "known" ? targetTopology.topology.rootLayoutTreePath : null,
+		nextRootLayoutTreePath: renderedRootLayoutChanged ? targetSnapshot.rootBoundaryId : targetTopology.kind === "known" ? targetTopology.topology.rootLayoutTreePath : null,
 		state: options.state
 	});
 	if (options.event.token.lane === "prefetch") return {
@@ -708,6 +709,13 @@ function planFlightResponseArrived(options) {
 	}
 	const commitTraceFields = createAcceptedCacheProofTraceFields(traceFields, acceptedCacheEntryDecision);
 	const cacheEntryProposalFields = createCacheEntryProposalFields(acceptedCacheEntryDecision);
+	if (renderedRootLayoutChanged) return {
+		kind: "hardNavigate",
+		reason: "rootBoundaryChanged",
+		token: options.event.token,
+		trace: createNavigationTrace(NavigationTraceReasonCodes.rootBoundaryChanged, commitTraceFields),
+		url: options.event.result.href
+	};
 	if (targetSnapshot.interception !== null) {
 		if (currentTopology.kind === "unknown" || targetTopology.kind === "unknown") return createInterceptionProofRejectedDecision({
 			event: options.event,

package/dist/server/remove-request-headers.d.ts

@@ -0,0 +1,16 @@
+import { IncomingMessage } from "node:http";
+import { Http2ServerRequest } from "node:http2";
+//#region src/server/remove-request-headers.d.ts
+/**
+ * Remove headers from every view of a Node request.
+ *
+ * Node keeps each client header in req.rawHeaders as well as req.headers, and
+ * srvx (plugin-rsc's dev request adapter) answers Headers reads from rawHeaders
+ * once anything iterates them, so later handlers must not find a removed
+ * header in either. On HTTP/1, Node builds req.headers and req.headersDistinct
+ * lazily from rawHeaders and the header count it parsed, so both must exist
+ * before rawHeaders gets shorter. HTTP/2 compatibility requests (Vite with
+ * `server.https`) have no headersDistinct.
+ */
+export declare function removeRequestHeaders(req: IncomingMessage | Http2ServerRequest, names: ReadonlySet<string>): void;
+//#endregion

package/dist/server/remove-request-headers.js

@@ -0,0 +1,23 @@
+//#region src/server/remove-request-headers.ts
+/**
+* Remove headers from every view of a Node request.
+*
+* Node keeps each client header in req.rawHeaders as well as req.headers, and
+* srvx (plugin-rsc's dev request adapter) answers Headers reads from rawHeaders
+* once anything iterates them, so later handlers must not find a removed
+* header in either. On HTTP/1, Node builds req.headers and req.headersDistinct
+* lazily from rawHeaders and the header count it parsed, so both must exist
+* before rawHeaders gets shorter. HTTP/2 compatibility requests (Vite with
+* `server.https`) have no headersDistinct.
+*/
+function removeRequestHeaders(req, names) {
+	const headersDistinct = "headersDistinct" in req ? req.headersDistinct : void 0;
+	for (const name of names) {
+		delete req.headers[name];
+		if (headersDistinct) delete headersDistinct[name];
+	}
+	const rawHeaders = req.rawHeaders;
+	for (let i = rawHeaders.length - 2; i >= 0; i -= 2) if (names.has(rawHeaders[i].toLowerCase())) rawHeaders.splice(i, 2);
+}
+//#endregion
+export { removeRequestHeaders };

package/dist/shims/cache-runtime.js

@@ -14,9 +14,9 @@ import { isDraftModeEnabled } from "./headers.js";
 import { _registerCacheContextAccessor } from "./internal/cache-context-accessor.js";
 import { _hasPendingRevalidatedTag, _isOnDemandRevalidate, _setRequestScopedCacheLife, cacheLifeProfiles, runWithDetachedCacheObservations, shouldServeStaleUnstableCacheEntry } from "./cache-request-state.js";
 import "./fetch-cache.js";
-import { hasUseCacheLayoutMarker, hasUseCachePageMarker, isUseCacheFunctionReference, withoutUseCacheSegmentMarker } from "./internal/app-page-props-cache-key.js";
 import { isWellKnownProperty } from "./internal/thenable-well-known-properties.js";
 import { getFallbackParamsSnapshot, restoreThenableParams } from "./thenable-params.js";
+import { hasUseCacheLayoutMarker, hasUseCachePageMarker, isUseCacheFunctionReference, withoutUseCacheSegmentMarker } from "./internal/app-page-props-cache-key.js";
 import { getCurrentRootParams } from "./root-params.js";
 import { flightArgumentsKey, restoreFlightReply, snapshotFlightReply } from "./cache-flight-arguments.js";
 import { cache } from "react";

package/dist/shims/cache.js

@@ -334,7 +334,7 @@ function unstable_cacheTag(...tags) {
 	}
 	return cacheTag(...tags);
 }
-const UNSTABLE_CACHE_KEY_PREFIX = "unstable_cache:v3";
+const UNSTABLE_CACHE_KEY_PREFIX = "unstable_cache:v4";
 /**
 * AsyncLocalStorage to track whether we're inside an unstable_cache() callback.
 * Stored on globalThis via Symbol so headers.ts can detect the scope without
@@ -403,9 +403,12 @@ function scheduleUnstableCacheBackgroundRevalidation(cacheKey, refresh) {
 	pending.set(cacheKey, trackedRevalidation);
 	waitUntilUnstableCacheRevalidation(trackedRevalidation);
 }
+function runUnstableCacheCallback(fn, args) {
+	return _unstableCacheAls.run(true, () => _unstableCacheCallbackAls.run({ useCacheContext: _useCacheContextAls.getStore() }, () => fn(...args)));
+}
 async function refreshUnstableCacheResult(fn, args, keyedArgs, cacheKey, tags, revalidateSeconds, staleEntry, deferWrite) {
 	const argsUnchanged = serializeArgsOrNull(args) === keyedArgs;
-	const result = await _unstableCacheAls.run(true, () => _unstableCacheCallbackAls.run({ useCacheContext: _useCacheContextAls.getStore() }, () => fn(...args)));
+	const result = await runUnstableCacheCallback(fn, args);
 	if (!argsUnchanged) return result;
 	const cacheValue = {
 		kind: "FETCH",
@@ -478,7 +481,7 @@ function unstable_cache(fn, keyParts, options) {
 				}
 			}
 		}
-		if (isDraftMode) return await _unstableCacheAls.run(true, () => fn(...args));
+		if (isDraftMode) return await runUnstableCacheCallback(fn, args);
 		return await refreshUnstableCacheResult(fn, args, keyedArgs, cacheKey, tags, revalidateSeconds, staleEntry, !staleEntry && isInsideWorkStoreScope());
 	};
 	return cachedFn;

package/dist/shims/client-page-root.js

@@ -1,10 +1,10 @@
 "use client";
 import { searchParamsToRecord } from "../utils/query.js";
+import { isOwnPropertyCheck, isWellKnownProperty } from "./internal/thenable-well-known-properties.js";
 import { getNavigationContext } from "./navigation-context-state.js";
-import { getClientNavigationRenderContext, useSearchParams } from "./navigation.js";
 import "./navigation-server.js";
+import { getClientNavigationRenderContext, useSearchParams } from "./navigation.js";
 import { RenderedSearchContext } from "./slot.js";
-import { isOwnPropertyCheck, isWellKnownProperty } from "./internal/thenable-well-known-properties.js";
 import { createElement, use, useMemo } from "react";
 //#region src/shims/client-page-root.tsx
 /**

package/dist/shims/error-boundary.js

@@ -2,11 +2,11 @@
 import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { handleAppNavigationFailure } from "../client/app-nav-failure-handler.js";
 import { VINEXT_DEV_ERROR_RECOVERY_EVENT } from "../utils/dev-error-recovery-event.js";
+import { consumeCaughtNotFoundBoundary, useCaughtNotFoundBoundary } from "./caught-not-found-boundaries.js";
 import { decodeRedirectError, forbidden, isRedirectError, notFound, unauthorized } from "./navigation-errors.js";
 import "./navigation-server.js";
-import { isRedirectToCurrentUrl, useErrorBoundaryPathname, useErrorBoundaryRouter } from "./error-boundary-navigation.js";
 import DefaultGlobalError from "./default-global-error.js";
-import { consumeCaughtNotFoundBoundary, useCaughtNotFoundBoundary } from "./caught-not-found-boundaries.js";
+import { isRedirectToCurrentUrl, useErrorBoundaryPathname, useErrorBoundaryRouter } from "./error-boundary-navigation.js";
 import React from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 //#region src/shims/error-boundary.tsx

package/dist/shims/internal/navigation-untracked.js

@@ -1,5 +1,5 @@
-import { getPagesNavigationContext } from "./pages-router-accessor.js";
 import { getNavigationContext } from "../navigation-context-state.js";
+import { getPagesNavigationContext } from "./pages-router-accessor.js";
 import { getClientNavigationState, useClientNavigationRenderSnapshot } from "../navigation.js";
 //#region src/shims/internal/navigation-untracked.ts
 /**

package/dist/shims/metadata.js

@@ -1,6 +1,6 @@
 import { isAbsoluteOrProtocolRelativeUrl } from "./url-utils.js";
-import { withUseCacheLayoutMarker, withUseCachePageMarker } from "./internal/app-page-props-cache-key.js";
 import { makeThenableParams } from "./thenable-params.js";
+import { withUseCacheLayoutMarker, withUseCachePageMarker } from "./internal/app-page-props-cache-key.js";
 import React from "react";
 import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
 //#region src/shims/metadata.tsx

package/dist/shims/navigation-server.js

@@ -1,3 +1,3 @@
-import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
+import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 export { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, decodeRedirectError, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext, unauthorized, unstable_rethrow };

package/dist/shims/navigation.js

@@ -15,7 +15,9 @@ import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscR
 import { clearAppNavigationFailureTarget, stageAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
 import { getNavigationRuntime, hasAppNavigationRuntime, loadNavigationRuntimeRouteManifest } from "../client/navigation-runtime.js";
-import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
+import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, isLatestAppRouterScrollIntent } from "./app-router-scroll-state.js";
+import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
+import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
 import { PUBLIC_INITIAL_BFCACHE_ID } from "../server/app-bfcache-id.js";
@@ -25,11 +27,9 @@ import { hasPendingAppRouterPageRedirect } from "../server/app-browser-mpa-navig
 import { extractRscCompletionMetadata } from "../server/rsc-completion-metadata.js";
 import { navigationPlanner } from "../server/navigation-planner.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
-import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { getPagesNavigationContext } from "./internal/pages-router-accessor.js";
-import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent, isLatestAppRouterScrollIntent } from "./app-router-scroll-state.js";
-import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 import { cancelAppPrefetchFetch, promoteAppPrefetchFetch, releaseAppPrefetchFetchSlot, scheduleAppPrefetchFetch } from "./internal/app-prefetch-fetch-queue.js";
+import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
 //#region src/shims/navigation.ts
 /**

package/dist/shims/navigation.react-server.js

@@ -1,8 +1,8 @@
-import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
-import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
+import { throwClientHookError } from "./client-hook-error.js";
 import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, getLayoutSegmentContext, getNavigationContext, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
+import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import "./navigation-server.js";
-import { throwClientHookError } from "./client-hook-error.js";
+import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
 //#region src/shims/navigation.react-server.ts
 function usePathname() {
 	throwClientHookError("usePathname()");

package/dist/shims/root-params.js

@@ -1,6 +1,6 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
-import { _recordUseCacheRootParamRead } from "./internal/cache-context-accessor.js";
+import { _recordUseCacheRootParamRead, getRegisteredCacheContext } from "./internal/cache-context-accessor.js";
 //#region src/shims/root-params.ts
 function createRootParamsUsageError(message) {
 	return new Error(message);
@@ -9,6 +9,7 @@ const _FALLBACK_KEY = Symbol.for("vinext.rootParams.fallback");
 const _g = globalThis;
 const _als = getOrCreateAls("vinext.rootParams.als");
 const _usageAls = getOrCreateAls("vinext.rootParams.usage.als");
+const _unstableCacheCallbackAls = getOrCreateAls("vinext.unstableCache.callbackAls");
 const _fallbackState = _g[_FALLBACK_KEY] ??= { rootParams: null };
 function getState() {
 	if (isInsideUnifiedScope()) return getRequestContext();
@@ -19,6 +20,16 @@ function pickRootParams(params, rootParamNames) {
 	for (const name of rootParamNames ?? []) picked[name] = params[name];
 	return picked;
 }
+/**
+* Like Next.js's `unstable-cache` work unit, an unstable_cache() callback has
+* no root params, and neither does a "use cache" scope entered from it: the
+* callback's entry is keyed by its source and arguments alone.
+*/
+function getUnstableCacheScope() {
+	const callback = _unstableCacheCallbackAls.getStore();
+	if (!callback) return null;
+	return (callback.useCacheContext ?? null) === getRegisteredCacheContext() ? "callback" : "use-cache";
+}
 function setRootParams(params) {
 	getState().rootParams = params;
 }
@@ -26,12 +37,15 @@ function getRootParam(name) {
 	const usage = _usageAls.getStore();
 	if (usage?.kind === "server-action" && usage.phase === "active") throw createRootParamsUsageError(`\`import('next/root-params').${name}()\` was used inside a Server Action. This is not supported. Functions from 'next/root-params' can only be called in the context of a route.`);
 	if (usage?.kind === "route-handler" && usage.phase === "active") throw createRootParamsUsageError(`Route ${usage.routePattern} used \`import('next/root-params').${name}()\` inside a Route Handler. Support for this API in Route Handlers is planned for a future version of Next.js.`);
+	const unstableCacheScope = getUnstableCacheScope();
+	if (unstableCacheScope === "callback") throw createRootParamsUsageError(`\`import('next/root-params').${name}()\` was used inside \`unstable_cache\`. This is not supported. Use \`"use cache"\` instead.`);
+	if (unstableCacheScope === "use-cache") throw createRootParamsUsageError(`\`import('next/root-params').${name}()\` was used inside \`"use cache"\` nested within \`unstable_cache\`. Root params are not available in this context.`);
 	_recordUseCacheRootParamRead(name);
 	return Promise.resolve(getState().rootParams?.[name]);
 }
 /** @internal Current route root params for `"use cache"` key derivation. */
 function getCurrentRootParams() {
-	return getState().rootParams;
+	return getUnstableCacheScope() ? null : getState().rootParams;
 }
 function runWithRootParamsUsage(usage, fn, controller) {
 	const state = {

package/dist/shims/slot.js

@@ -1,10 +1,10 @@
 "use client";
+import { getBfcacheIdMapContext, getBfcacheSegmentIdContext } from "./navigation-context-state.js";
+import { notFound } from "./navigation-errors.js";
+import "./navigation-server.js";
 import { APP_BFCACHE_SEGMENT_IDENTITIES_KEY, AppElementsWire, UNMATCHED_SLOT } from "../server/app-elements-wire.js";
 import { readOptimisticStateKeyRebinder } from "../server/app-elements.js";
 import { isNestedBfcacheSlotSegmentId, isNestedBfcacheSlotSegmentIdFor } from "../server/bfcache-identity.js";
-import { notFound } from "./navigation-errors.js";
-import { getBfcacheIdMapContext, getBfcacheSegmentIdContext } from "./navigation-context-state.js";
-import "./navigation-server.js";
 import * as React$1 from "react";
 import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
 //#region src/shims/slot.tsx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "homepage": "https://vinext.dev/",
   "license": "MIT",