vinext 0.1.6 → 0.1.7

package/dist/build/client-build-config.d.ts

@@ -26,12 +26,10 @@ declare function createClientAssetFileNames(assetsDir: string): (assetInfo: Clie
  *
  * Splits the client bundle into:
  * - "framework" — React, ReactDOM, and scheduler (loaded on every page)
- * - "vinext"    — vinext shims (router, head, link, etc.)
+ * - "vinext"    — shared vinext runtime shims
  *
- * All other vendor code is left to Rollup's default chunk-splitting
- * algorithm. Rollup automatically deduplicates shared modules into
- * common chunks based on the import graph — no manual intervention
- * needed.
+ * Route-owned client shims and all other vendor code are left to the bundler's
+ * graph-based chunking so they stay behind their client-reference boundaries.
  *
  * Why not split every npm package into its own chunk?
  * - Per-package splitting (`vendor-X`) creates 50-200+ chunks for a
@@ -48,7 +46,7 @@ declare function createClientAssetFileNames(assetsDir: string): (assetInfo: Clie
  *   well: shared dependencies between routes get their own chunks,
  *   and route-specific code stays in route chunks.
  */
-declare function createClientManualChunks(shimsDir: string): (id: string) => string | undefined;
+declare function createClientManualChunks(shimsDir: string, preserveRouteBoundaries?: boolean): (id: string) => string | undefined;
 /**
  * Rollup output config with manualChunks for client code-splitting.
  * Used by both CLI builds and multi-environment builds.

package/dist/build/client-build-config.js

@@ -1,4 +1,18 @@
 //#region src/build/client-build-config.ts
+const ROUTE_OWNED_CLIENT_SHIMS = new Set([
+	"compat-router",
+	"dynamic",
+	"dynamic-preload-chunks",
+	"form",
+	"image",
+	"layout-segment-context",
+	"legacy-image",
+	"link",
+	"offline",
+	"router",
+	"script",
+	"web-vitals"
+]);
 const NEXT_CLIENT_CSS_ASSET_FILE_NAMES = "css/[name].[hash:8][extname]";
 const NEXT_CLIENT_STATIC_MEDIA_FILE_NAMES = "media/[name].[hash:8][extname]";
 function joinAssetFileNamePattern(assetsDir, pattern) {
@@ -48,12 +62,10 @@ function getPackageName(id) {
 *
 * Splits the client bundle into:
 * - "framework" — React, ReactDOM, and scheduler (loaded on every page)
-* - "vinext"    — vinext shims (router, head, link, etc.)
+* - "vinext"    — shared vinext runtime shims
 *
-* All other vendor code is left to Rollup's default chunk-splitting
-* algorithm. Rollup automatically deduplicates shared modules into
-* common chunks based on the import graph — no manual intervention
-* needed.
+* Route-owned client shims and all other vendor code are left to the bundler's
+* graph-based chunking so they stay behind their client-reference boundaries.
 *
 * Why not split every npm package into its own chunk?
 * - Per-package splitting (`vendor-X`) creates 50-200+ chunks for a
@@ -70,7 +82,7 @@ function getPackageName(id) {
 *   well: shared dependencies between routes get their own chunks,
 *   and route-specific code stays in route chunks.
 */
-function createClientManualChunks(shimsDir) {
+function createClientManualChunks(shimsDir, preserveRouteBoundaries = false) {
 	return function clientManualChunks(id) {
 		if (id.includes("node_modules")) {
 			const pkg = getPackageName(id);
@@ -78,7 +90,15 @@ function createClientManualChunks(shimsDir) {
 			if (pkg === "react" || pkg === "react-dom" || pkg === "scheduler") return "framework";
 			return;
 		}
-		if (id.startsWith(shimsDir)) return "vinext";
+		if (id.startsWith(shimsDir)) {
+			if (preserveRouteBoundaries) {
+				const relativeId = id.slice(shimsDir.length).split("?", 1)[0] ?? "";
+				const extensionIndex = relativeId.lastIndexOf(".");
+				const shimName = extensionIndex === -1 ? relativeId : relativeId.slice(0, extensionIndex);
+				if (ROUTE_OWNED_CLIENT_SHIMS.has(shimName)) return void 0;
+			}
+			return "vinext";
+		}
 	};
 }
 /**

package/dist/build/prerender.js

@@ -306,7 +306,6 @@ async function prerenderPages({ routes, apiRoutes, pagesDir, outDir, config, mod
 		for (const route of bundlePageRoutes) {
 			if (BLOCKED_PAGES.includes(route.pattern)) continue;
 			if (route.pattern === "/404") continue;
-			if (!routes.find((r) => r.filePath === route.filePath || r.pattern === route.pattern)) continue;
 			const { type, revalidate: classifiedRevalidate } = classifyPagesRoute(route.filePath);
 			if (type === "ssr") {
 				if (mode === "export") results.push({
@@ -648,7 +647,7 @@ async function prerenderApp({ routes, metadataRoutes = [], outDir, config, mode,
 					});
 					continue;
 				}
-				if (!Array.isArray(paramSets) || paramSets.length === 0) {
+				if (paramSets.length === 0) {
 					results.push({
 						route: route.pattern,
 						status: "skipped",

package/dist/entries/app-rsc-entry.d.ts

@@ -44,7 +44,8 @@ type AppRouterConfig = {
   reactMaxHeadersLength?: number; /** Maximum in-memory cache size in bytes. 0 disables the default memory cache. */
   cacheMaxMemorySize?: number; /** Inline app CSS into production HTML (from experimental.inlineCss). */
   inlineCss?: boolean; /** Enables Next.js Cache Components semantics for App Router document HTML. */
-  cacheComponents?: boolean; /** Internationalization routing config for middleware matcher locale handling. */
+  cacheComponents?: boolean; /** Whether the RSC build discovered any server references. Defaults to true. */
+  hasServerActions?: boolean; /** Internationalization routing config for middleware matcher locale handling. */
   i18n?: NextI18nConfig | null;
   imageConfig?: ImageConfig;
   /**

package/dist/entries/app-rsc-entry.js

@@ -20,6 +20,8 @@ const middlewareRequestHeadersPath = resolveEntryPath("../server/middleware-requ
 const normalizePathModulePath = resolveEntryPath("../server/normalize-path.js", import.meta.url);
 const appRouteHandlerDispatchPath = resolveEntryPath("../server/app-route-handler-dispatch.js", import.meta.url);
 const appRouteHandlerResponsePath = resolveEntryPath("../server/app-route-handler-response.js", import.meta.url);
+const appMiddlewarePath = resolveEntryPath("../server/app-middleware.js", import.meta.url);
+const metadataRouteResponsePath = resolveEntryPath("../server/metadata-route-response.js", import.meta.url);
 const appServerActionExecutionPath = resolveEntryPath("../server/app-server-action-execution.js", import.meta.url);
 const appRscErrorsPath = resolveEntryPath("../server/app-rsc-errors.js", import.meta.url);
 const appPageExecutionPath = resolveEntryPath("../server/app-page-execution.js", import.meta.url);
@@ -73,6 +75,7 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	const cacheMaxMemorySize = config?.cacheMaxMemorySize;
 	const inlineCss = config?.inlineCss === true;
 	const cacheComponents = config?.cacheComponents === true;
+	const hasServerActions = config?.hasServerActions !== false;
 	const i18nConfig = config?.i18n ?? null;
 	const hasPagesDir = config?.hasPagesDir ?? false;
 	const publicFiles = config?.publicFiles ?? [];
@@ -93,12 +96,12 @@ async function __loadPrerenderPagesRoutes() {
 import ${JSON.stringify(serverGlobalsPath)};
 import {
   renderToReadableStream as _renderToReadableStream,
-  decodeAction,
+  ${hasServerActions ? `decodeAction,
   decodeFormState,
   decodeReply,
   loadServerAction,
-  createTemporaryReferenceSet,
-} from "@vitejs/plugin-rsc/rsc";
+  createTemporaryReferenceSet,` : ""}
+} from ${JSON.stringify(hasServerActions ? "@vitejs/plugin-rsc/rsc" : "@vitejs/plugin-rsc/react/rsc")};
 import { createClientManifest as _createClientManifest } from "@vitejs/plugin-rsc/core/rsc";
 import { prerender as _prerender } from "@vitejs/plugin-rsc/vendor/react-server-dom/static.edge";
 import { createRscPrerenderer, createRscRenderer } from ${JSON.stringify(rscStreamHintsPath)};
@@ -112,7 +115,8 @@ import { getNavigationContext as _getNavigationContext } from "next/navigation";
 import { configureMemoryCacheHandler as __configureMemoryCacheHandler } from "vinext/shims/cache-handler";
 import { headersContextFromRequest, getDraftModeCookieHeader, getAndClearPendingCookies, consumeDynamicUsage, consumeInvalidDynamicUsageError, setHeadersAccessPhase } from "next/headers";
 import { mergeMetadata, resolveModuleMetadata, mergeViewport, resolveModuleViewport } from "vinext/metadata";
-${middlewarePath ? `import * as middlewareModule from ${JSON.stringify(normalizePathSeparators(middlewarePath))};` : ""}
+${middlewarePath ? `import * as middlewareModule from ${JSON.stringify(normalizePathSeparators(middlewarePath))};
+import { applyAppMiddleware as __applyAppMiddleware } from ${JSON.stringify(appMiddlewarePath)};` : ""}
 ${instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(normalizePathSeparators(instrumentationPath))};
 import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(instrumentationRuntimePath)};` : ""}
 import { createAppRscHandler } from "vinext/server/app-rsc-handler";
@@ -123,7 +127,8 @@ ${hasPagesDir ? `import {
   applyRouteHandlerMiddlewareContext as __applyRouteHandlerMiddlewareContext,
 } from ${JSON.stringify(appRouteHandlerResponsePath)};` : ""}
 const __loadAppRouteHandlerDispatch = () => import(${JSON.stringify(appRouteHandlerDispatchPath)});
-const __loadAppServerActionExecution = () => import(${JSON.stringify(appServerActionExecutionPath)});
+${hasServerActions ? `const __loadAppServerActionExecution = () => import(${JSON.stringify(appServerActionExecutionPath)});` : ""}
+${(metadataRoutes?.length ?? 0) > 0 ? `const __loadMetadataRouteResponse = () => import(${JSON.stringify(metadataRouteResponsePath)});` : ""}
 import {
   sanitizeErrorForClient as __sanitizeErrorForClient,
 } from ${JSON.stringify(appRscErrorsPath)};
@@ -683,6 +688,7 @@ export default createAppRscHandler({
   ${instrumentationPath ? `ensureInstrumentation() {
     return __ensureInstrumentationRegistered(_instrumentation);
   },` : ""}
+  ${hasServerActions ? `
   async handleProgressiveActionRequest({
     actionId,
     cleanPathname,
@@ -860,14 +866,33 @@ export default createAppRscHandler({
       },
     });
   },
+  ` : ""}
   i18nConfig: __i18nConfig,
-  isMiddlewareProxy: ${JSON.stringify(middlewarePath ? isProxyFile(middlewarePath) : false)},
   ${hasPagesDir ? `loadPrerenderPagesRoutes: __loadPrerenderPagesRoutes,` : ""}
-  makeThenableParams,
+  ${(metadataRoutes?.length ?? 0) > 0 ? `async handleMetadataRouteRequest(cleanPathname) {
+    const { handleMetadataRouteRequest: __handleMetadataRouteRequest } =
+      await __loadMetadataRouteResponse();
+    return __handleMetadataRouteRequest({
+      metadataRoutes,
+      cleanPathname,
+      makeThenableParams,
+    });
+  },` : ""}
   matchRoute,
-  metadataRoutes,
-  middlewareFilePath: ${middlewarePath ? JSON.stringify(normalizePathSeparators(middlewarePath)) : "null"},
-  middlewareModule: ${middlewarePath ? "middlewareModule" : "null"},
+  ${middlewarePath ? `runMiddleware({ cleanPathname, context, isDataRequest, request }) {
+    return __applyAppMiddleware({
+      basePath: __basePath,
+      cleanPathname,
+      context,
+      filePath: ${JSON.stringify(middlewarePath ? normalizePathSeparators(middlewarePath) : "")},
+      i18nConfig: __i18nConfig,
+      isDataRequest,
+      isProxy: ${JSON.stringify(isProxyFile(middlewarePath))},
+      module: middlewareModule,
+      request,
+      trailingSlash: __trailingSlash,
+    });
+  },` : ""}
   publicFiles: __publicFiles,
   renderNotFound({ isRscRequest, matchedParams, middlewareContext, request, route, scriptNonce }) {
     const __isEdge = route ? __isEdgeRuntime(__resolveAppPageSegmentConfig({ layouts: route.layouts, page: route.page }).runtime) : false;

package/dist/index.js

@@ -420,12 +420,16 @@ const _reactServerShims = new Map([
 ]);
 const clientManualChunks = createClientManualChunks(_shimsDir);
 const clientCodeSplittingConfig = createClientCodeSplittingConfig(clientManualChunks);
-function getClientOutputConfigForVite(viteMajorVersion, assetsDir) {
+const appClientManualChunks = createClientManualChunks(_shimsDir, true);
+const appClientCodeSplittingConfig = createClientCodeSplittingConfig(appClientManualChunks);
+function getClientOutputConfigForVite(viteMajorVersion, assetsDir, preserveAppRouteBoundaries = false) {
+	const manualChunks = preserveAppRouteBoundaries ? appClientManualChunks : clientManualChunks;
+	const codeSplitting = preserveAppRouteBoundaries ? appClientCodeSplittingConfig : clientCodeSplittingConfig;
 	return viteMajorVersion >= 8 ? {
 		...createClientFileNameConfig(assetsDir),
 		assetFileNames: createClientAssetFileNames(assetsDir),
-		codeSplitting: clientCodeSplittingConfig
-	} : createClientOutputConfig(clientManualChunks, assetsDir);
+		codeSplitting
+	} : createClientOutputConfig(manualChunks, assetsDir);
 }
 function vinext(options = {}) {
 	const viteMajorVersion = getViteMajorVersion();
@@ -507,13 +511,16 @@ function vinext(options = {}) {
 	let resolvedReactPath = null;
 	let resolvedRscPath = null;
 	let resolvedRscTransformsPath = null;
+	let rscPluginModulePromise = null;
 	resolvedReactPath = resolveOptionalDependency(earlyBaseDir, "@vitejs/plugin-react");
 	resolvedRscPath = resolveOptionalDependency(earlyBaseDir, "@vitejs/plugin-rsc");
 	resolvedRscTransformsPath = resolveOptionalDependency(earlyBaseDir, "@vitejs/plugin-rsc/transforms");
 	let rscPluginPromise = null;
 	if (earlyAppDirExists && autoRsc) {
 		if (!resolvedRscPath) throw new Error("vinext: App Router detected but @vitejs/plugin-rsc is not installed.\nRun: " + detectPackageManager(process.cwd()) + " @vitejs/plugin-rsc");
-		rscPluginPromise = import(pathToFileURL(resolvedRscPath).href).then((mod) => {
+		const rscImport = import(pathToFileURL(resolvedRscPath).href);
+		rscPluginModulePromise = rscImport;
+		rscPluginPromise = rscImport.then((mod) => {
 			const rsc = mod.default;
 			return rsc({ entries: {
 				rsc: VIRTUAL_RSC_ENTRY,
@@ -890,6 +897,7 @@ function vinext(options = {}) {
 				};
 				const nextServerExternal = nextConfig?.serverExternalPackages ?? [];
 				const userSsrExternal = Array.isArray(config.ssr?.external) ? [...config.ssr.external, ...nextServerExternal] : config.ssr?.external === true ? true : nextServerExternal;
+				const externalizeSsrReactInDev = env.command === "serve" && !hasCloudflarePlugin && !hasNitroPlugin;
 				const incomingExclude = config.optimizeDeps?.exclude ?? [];
 				const incomingInclude = config.optimizeDeps?.include ?? [];
 				const depOptimizeAliasPlugin = {
@@ -944,11 +952,15 @@ function vinext(options = {}) {
 						},
 						ssr: {
 							...hasCloudflarePlugin || hasNitroPlugin ? {} : { resolve: {
-								external: userSsrExternal === true ? true : [...userSsrExternal, "ipaddr.js"],
+								external: userSsrExternal === true ? true : [
+									...userSsrExternal,
+									"ipaddr.js",
+									...externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []
+								],
 								...userSsrExternal === true ? {} : { noExternal: true }
 							} },
 							optimizeDeps: {
-								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], userSsrExternal === true ? SSR_EXTERNAL_REACT_ENTRIES : []),
+								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], userSsrExternal === true || externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []),
 								entries: optimizeEntries,
 								...depOptimizeNodeEnvOptions
 							},
@@ -977,7 +989,7 @@ function vinext(options = {}) {
 								assetsInlineLimit: clientAssetsInlineLimit,
 								...withBuildBundlerOptions(viteMajorVersion, {
 									input: appClientInput,
-									output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
+									output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir, true),
 									treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
 								})
 							}
@@ -1127,6 +1139,12 @@ function vinext(options = {}) {
 				if (id === RESOLVED_RSC_ENTRY && hasAppDir) {
 					const routes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
 					const metaRoutes = scanMetadataFiles(appDir);
+					let hasServerActions = true;
+					if (this.environment?.config.command === "build" && rscPluginModulePromise) {
+						const { getPluginApi } = await rscPluginModulePromise;
+						const pluginApi = getPluginApi(this.environment.config);
+						if (pluginApi && !pluginApi.manager.isScanBuild) hasServerActions = Object.keys(pluginApi.manager.serverReferenceMetaMap).length > 0;
+					}
 					const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
 					const globalNotFoundPath = findFileWithExts(appDir, "global-not-found", fileMatcher);
 					rscClassificationManifest = collectRouteClassificationManifest(routes);
@@ -1146,6 +1164,7 @@ function vinext(options = {}) {
 						cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
 						inlineCss: nextConfig?.inlineCss,
 						cacheComponents: nextConfig?.cacheComponents,
+						hasServerActions,
 						i18n: nextConfig?.i18n,
 						imageConfig: {
 							deviceSizes: nextConfig?.images?.deviceSizes,
@@ -1304,15 +1323,19 @@ function vinext(options = {}) {
 				const hook = mdxDelegate.config;
 				return (typeof hook === "function" ? hook : hook.handler).call(this, config, env);
 			},
-			async transform(code, id, options) {
-				if (id.includes("?")) return;
-				if (!id.toLowerCase().endsWith(".mdx")) return;
-				const delegate = mdxDelegate ?? await ensureMdxDelegate("on-demand");
-				if (delegate?.transform) {
-					const hook = delegate.transform;
-					return (typeof hook === "function" ? hook : hook.handler).call(this, code, id, options);
+			transform: {
+				filter: { id: {
+					include: /\.mdx$/i,
+					exclude: /\?/
+				} },
+				async handler(code, id, options) {
+					const delegate = mdxDelegate ?? await ensureMdxDelegate("on-demand");
+					if (delegate?.transform) {
+						const hook = delegate.transform;
+						return (typeof hook === "function" ? hook : hook.handler).call(this, code, id, options);
+					}
+					if (!hasUserMdxPlugin) throw new Error(`[vinext] Encountered MDX module ${id} but no MDX plugin is configured. Install @mdx-js/rollup or register an MDX plugin manually.`);
 				}
-				if (!hasUserMdxPlugin) throw new Error(`[vinext] Encountered MDX module ${id} but no MDX plugin is configured. Install @mdx-js/rollup or register an MDX plugin manually.`);
 			}
 		},
 		{
@@ -1358,6 +1381,7 @@ function vinext(options = {}) {
 			configureServer(server) {
 				const pageExtensions = fileMatcher.extensionRegex;
 				let pagesRunner = null;
+				let cachedSSRHandler = null;
 				function getPagesRunner() {
 					if (!pagesRunner) pagesRunner = createDirectRunner(server.environments["ssr"] ?? Object.values(server.environments).find((e) => e !== server.environments["rsc"]) ?? Object.values(server.environments)[0]);
 					return pagesRunner;
@@ -1843,12 +1867,15 @@ function vinext(options = {}) {
 									const appMatch = matchAppRoute(resolvedPathname, await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher));
 									if (appMatch && !pagesRouteHasPriorityOverAppRoute(renderMatch.route, appMatch.route)) return next();
 								}
-								const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots);
+								if (!cachedSSRHandler || cachedSSRHandler.routes !== routes) cachedSSRHandler = {
+									routes,
+									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots)
+								};
 								flushStagedHeaders();
 								flushRequestHeaders();
 								if (pipelineResult.middlewareStatus !== void 0) req.__vinextMiddlewareStatus = pipelineResult.middlewareStatus;
 								req.url = pipelineResult.resolvedUrl;
-								await handler(req, res, pipelineResult.resolvedUrl, req.__vinextMiddlewareStatus, pipelineResult.isDataReq, originalRequestUrl);
+								await cachedSSRHandler.handler(req, res, pipelineResult.resolvedUrl, req.__vinextMiddlewareStatus, pipelineResult.isDataReq, originalRequestUrl);
 							}
 						} catch (e) {
 							next(e);
@@ -2068,7 +2095,7 @@ function vinext(options = {}) {
 						imageImports.add(absImagePath);
 						const urlVar = `__vinext_img_url_${varName}`;
 						const metaVar = `__vinext_img_meta_${varName}`;
-						const replacement = `import ${urlVar} from ${JSON.stringify(absImagePath + "?vinext-image-url")};\nimport ${metaVar} from ${JSON.stringify(absImagePath + "?vinext-meta")};\nconst ${varName} = { src: ${urlVar}, width: ${metaVar}.width, height: ${metaVar}.height };`;
+						const replacement = `import ${urlVar} from ${JSON.stringify(absImagePath + "?vinext-image-url")};\nimport ${metaVar} from ${JSON.stringify(absImagePath + "?vinext-meta")};\nvar ${varName} = { src: ${urlVar}, width: ${metaVar}.width, height: ${metaVar}.height };`;
 						s.overwrite(importNode.start, importNode.end, replacement);
 						hasChanges = true;
 					}
@@ -2154,7 +2181,7 @@ function vinext(options = {}) {
 					const { transformWrapExport, transformHoistInlineDirective } = await import(pathToFileURL(resolvedRscTransformsPath).href);
 					if (cacheDirective) {
 						const directiveValue = cacheDirective.expression.value;
-						const variant = directiveValue === "use cache" ? "" : directiveValue.replace("use cache:", "").replace("use cache: ", "").trim();
+						const variant = directiveValue === "use cache" ? "" : directiveValue.replace("use cache:", "").trim();
 						const isLayoutOrTemplate = /\/(layout|template)\.(tsx?|jsx?|mjs)$/.test(id);
 						const modulePath = stripViteModuleQuery(id);
 						const moduleFileName = path.basename(modulePath);
@@ -2194,7 +2221,7 @@ function vinext(options = {}) {
 								directive: /^use cache(:\s*\w+)?$/,
 								runtime: (value, name, meta) => {
 									const directiveMatch = meta.directiveMatch[0];
-									const variant = directiveMatch === "use cache" ? "" : directiveMatch.replace("use cache:", "").replace("use cache: ", "").trim();
+									const variant = directiveMatch === "use cache" ? "" : directiveMatch.replace("use cache:", "").trim();
 									return `(await import(${JSON.stringify(runtimeModuleUrl2)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)})`;
 								},
 								rejectNonAsyncFunction: false

package/dist/plugins/og-assets.js

@@ -46,7 +46,7 @@ function createOgInlineFetchAssetsPlugin() {
 				const boundary = await ownership.resolveModuleBoundary(id);
 				if (boundary === null) return null;
 				const { assetRoot, moduleDir } = boundary;
-				let newCode = code;
+				const s = new MagicString(code);
 				let didReplace = false;
 				const readAsBase64 = async (absPath) => {
 					const realPath = await ownership.resolveContainedAsset(assetRoot, absPath);
@@ -75,22 +75,22 @@ function createOgInlineFetchAssetsPlugin() {
 						`return Promise.resolve(a.buffer);`,
 						`})()`
 					].join("");
-					newCode = newCode.replaceAll(fullMatch, inlined);
+					s.overwrite(match.index, match.index + fullMatch.length, inlined);
 					didReplace = true;
 				}
-				if (code.includes("readFileSync(")) for (const match of newCode.matchAll(/[a-zA-Z_$][a-zA-Z0-9_$]*\.readFileSync\(\s*(?:[a-zA-Z_$][a-zA-Z0-9_$]*\.)?fileURLToPath\(\s*new URL\(\s*(["'])(\.[^"']+)\1\s*,\s*import\.meta\.url\s*\)\s*\)\s*\)/g)) {
+				if (code.includes("readFileSync(")) for (const match of code.matchAll(/[a-zA-Z_$][a-zA-Z0-9_$]*\.readFileSync\(\s*(?:[a-zA-Z_$][a-zA-Z0-9_$]*\.)?fileURLToPath\(\s*new URL\(\s*(["'])(\.[^"']+)\1\s*,\s*import\.meta\.url\s*\)\s*\)\s*\)/g)) {
 					const fullMatch = match[0];
 					const relPath = match[2];
 					const fileBase64 = await readAsBase64(path.resolve(moduleDir, relPath));
 					if (fileBase64 === null) continue;
 					const inlined = `Buffer.from(${JSON.stringify(fileBase64)},"base64")`;
-					newCode = newCode.replaceAll(fullMatch, inlined);
+					s.overwrite(match.index, match.index + fullMatch.length, inlined);
 					didReplace = true;
 				}
 				if (!didReplace) return null;
 				return {
-					code: newCode,
-					map: null
+					code: s.toString(),
+					map: s.generateMap({ hires: "boundary" })
 				};
 			}
 		}

package/dist/plugins/remove-console.js

@@ -32,7 +32,6 @@ const SCOPE_ENTERING_TYPES = new Set([
 */
 function removeConsoleCalls(code, config) {
 	if (config === false) return null;
-	const excluded = typeof config === "object" ? new Set(config.exclude.map((s) => s.toLowerCase())) : /* @__PURE__ */ new Set();
 	if (!code.match(/\bconsole\b/)) return null;
 	let ast;
 	try {
@@ -40,6 +39,7 @@ function removeConsoleCalls(code, config) {
 	} catch {
 		return null;
 	}
+	const excluded = typeof config === "object" ? new Set(config.exclude.map((s) => s.toLowerCase())) : /* @__PURE__ */ new Set();
 	const scopeStack = [{ shadowed: false }];
 	function currentScope() {
 		return scopeStack[scopeStack.length - 1];

package/dist/plugins/strip-server-exports.js

@@ -13,7 +13,8 @@ const SERVER_EXPORTS = new Set([
 const SERVER_PROPS_SSG_CONFLICT = "You can not use getStaticProps or getStaticPaths with getServerSideProps. To use SSG, please remove getServerSideProps";
 const EXPORT_ALL_IN_PAGE_ERROR = "Using `export * from '...'` in a page is disallowed. Please use `export { default } from '...'` instead.\nRead more: https://nextjs.org/docs/messages/export-all-in-page";
 function hasServerExportCandidate(code) {
-	return [...SERVER_EXPORTS].some((name) => code.includes(name));
+	for (const name of SERVER_EXPORTS) if (code.includes(name)) return true;
+	return false;
 }
 function hasExportAllCandidate(code) {
 	let searchFrom = 0;

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

@@ -0,0 +1,4 @@
+//#region src/server/app-action-request.d.ts
+declare function isPossibleAppRouteActionRequest(request: Pick<Request, "headers" | "method">): boolean;
+//#endregion
+export { isPossibleAppRouteActionRequest };

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

@@ -0,0 +1,9 @@
+import "./headers.js";
+//#region src/server/app-action-request.ts
+function isPossibleAppRouteActionRequest(request) {
+	if (request.method.toUpperCase() !== "POST") return false;
+	const contentType = request.headers.get("content-type");
+	return request.headers.has("x-rsc-action") || request.headers.has("next-action") || contentType === "application/x-www-form-urlencoded" || contentType?.startsWith("multipart/form-data") === true;
+}
+//#endregion
+export { isPossibleAppRouteActionRequest };

package/dist/server/app-bfcache-identity.d.ts

@@ -1,13 +1,23 @@
-import { AppElements } from "./app-elements-wire.js";
+import { AppElements, AppElementsWire } from "./app-elements-wire.js";
 import { BfcacheIdMap } from "./app-history-state.js";
 
 //#region src/server/app-bfcache-identity.d.ts
 type BfcacheStateKeyMap = Readonly<Record<string, string>>;
+type InitialBfcacheMaps = Readonly<{
+  bfcacheIds: BfcacheIdMap;
+  stateKeys: BfcacheStateKeyMap;
+}>;
+type AppElementsMetadata = ReturnType<typeof AppElementsWire.readMetadata>;
 declare function createInitialBfcacheIdMap(elements: AppElements): BfcacheIdMap;
 declare function createBfcacheSegmentStateKeyMap(options: {
   elements: AppElements;
   pathname: string;
 }): BfcacheStateKeyMap;
+declare function createInitialBfcacheMaps(options: {
+  elements: AppElements;
+  metadata: AppElementsMetadata;
+  pathname: string;
+}): InitialBfcacheMaps;
 declare function createNextBfcacheIdMap(options: {
   current: BfcacheIdMap;
   currentElements: AppElements;
@@ -23,4 +33,4 @@ declare function preserveBfcacheIdsForMergedElements(options: {
   previous: BfcacheIdMap;
 }): BfcacheIdMap;
 //#endregion
-export { BfcacheStateKeyMap, createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements };
+export { BfcacheStateKeyMap, InitialBfcacheMaps, createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createInitialBfcacheMaps, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements };

package/dist/server/app-bfcache-identity.js

@@ -3,7 +3,6 @@ import { normalizePath } from "./normalize-path.js";
 import { AppElementsWire } from "./app-elements-wire.js";
 import "./app-elements.js";
 import "./app-bfcache-id.js";
-import { isBfcacheSegmentId } from "./app-history-state.js";
 //#region src/server/app-bfcache-identity.ts
 let nextBfcacheId = 0;
 function rememberBfcacheId(value) {
@@ -24,6 +23,14 @@ function getTreePathIdentityPrefix(pathname, treePath) {
 	if (consumedPathnameSegments === 0) return "/";
 	return `/${pathnameSegments.slice(0, consumedPathnameSegments).join("/")}`;
 }
+function indexAppElementsMetadata(metadata) {
+	const slotBindingsBySlotId = /* @__PURE__ */ new Map();
+	for (const binding of metadata.slotBindings) slotBindingsBySlotId.set(binding.slotId, binding);
+	return {
+		metadata,
+		slotBindingsBySlotId
+	};
+}
 function readAppElementsMetadata(elements) {
 	let metadata;
 	try {
@@ -31,12 +38,11 @@ function readAppElementsMetadata(elements) {
 	} catch {
 		return null;
 	}
-	const slotBindingsBySlotId = /* @__PURE__ */ new Map();
-	for (const binding of metadata.slotBindings) slotBindingsBySlotId.set(binding.slotId, binding);
-	return {
-		metadata,
-		slotBindingsBySlotId
-	};
+	return indexAppElementsMetadata(metadata);
+}
+function parseBfcacheSegmentKey(id) {
+	const parsed = AppElementsWire.parseElementKey(id);
+	return parsed !== null && parsed.kind !== "route" ? parsed : null;
 }
 function createActiveSlotIdentity(id, parsed) {
 	const activeSlotBinding = parsed?.slotBindingsBySlotId.get(id);
@@ -50,9 +56,7 @@ function createActiveSlotIdentity(id, parsed) {
 * contained here until vinext has a route-manifest authority equivalent to
 * Next.js CacheNode or segment-cache state.
 */
-function createBfcacheSegmentIdentity(id, options) {
-	const parsed = AppElementsWire.parseElementKey(id);
-	if (!parsed) return null;
+function createBfcacheSegmentIdentity(id, parsed, options) {
 	if (parsed.kind === "page") return `${id}@${options.pathname}`;
 	if (parsed.kind === "slot") {
 		const activeSlotIdentity = createActiveSlotIdentity(id, options.metadata);
@@ -62,16 +66,15 @@ function createBfcacheSegmentIdentity(id, options) {
 	if (parsed.kind === "layout" || parsed.kind === "template") return `${id}@${getTreePathIdentityPrefix(options.pathname, parsed.treePath)}`;
 	return null;
 }
-function collectBfcacheSegmentIds(elements, parsed) {
+function collectBfcacheSegmentIdCandidates(elements, metadata = readAppElementsMetadata(elements)) {
 	const ids = new Set(Object.keys(elements));
-	const metadata = parsed === void 0 ? readAppElementsMetadata(elements) : parsed;
 	for (const layoutId of metadata?.metadata.layoutIds ?? []) ids.add(layoutId);
-	return Array.from(ids).filter(isBfcacheSegmentId);
+	return ids;
 }
 function createInitialBfcacheIdMap(elements) {
-	const ids = {};
-	for (const id of collectBfcacheSegmentIds(elements)) ids[id] = "0";
-	return ids;
+	const bfcacheIds = {};
+	for (const id of collectBfcacheSegmentIdCandidates(elements)) if (parseBfcacheSegmentKey(id) !== null) bfcacheIds[id] = "0";
+	return bfcacheIds;
 }
 function normalizeBfcachePathname(pathname) {
 	const normalized = normalizePath(normalizePathnameForRouteMatch(pathname));
@@ -81,8 +84,10 @@ function createBfcacheSegmentStateKeyMap(options) {
 	const metadata = readAppElementsMetadata(options.elements);
 	const normalizedPathname = normalizeBfcachePathname(options.pathname);
 	const stateKeys = {};
-	for (const id of collectBfcacheSegmentIds(options.elements, metadata)) {
-		const stateKey = createBfcacheSegmentIdentity(id, {
+	for (const id of collectBfcacheSegmentIdCandidates(options.elements, metadata)) {
+		const parsed = parseBfcacheSegmentKey(id);
+		if (parsed === null) continue;
+		const stateKey = createBfcacheSegmentIdentity(id, parsed, {
 			metadata,
 			pathname: normalizedPathname
 		});
@@ -90,6 +95,27 @@ function createBfcacheSegmentStateKeyMap(options) {
 	}
 	return stateKeys;
 }
+function createInitialBfcacheMaps(options) {
+	const metadata = indexAppElementsMetadata(options.metadata);
+	const ids = collectBfcacheSegmentIdCandidates(options.elements, metadata);
+	const normalizedPathname = normalizeBfcachePathname(options.pathname);
+	const bfcacheIds = {};
+	const stateKeys = {};
+	for (const id of ids) {
+		const parsed = parseBfcacheSegmentKey(id);
+		if (parsed === null) continue;
+		bfcacheIds[id] = "0";
+		const stateKey = createBfcacheSegmentIdentity(id, parsed, {
+			metadata,
+			pathname: normalizedPathname
+		});
+		if (stateKey !== null) stateKeys[id] = stateKey;
+	}
+	return {
+		bfcacheIds,
+		stateKeys
+	};
+}
 function createNextBfcacheIdMap(options) {
 	const current = options.reuseCurrent === false ? {} : options.current;
 	for (const value of Object.values(current)) rememberBfcacheId(value);
@@ -99,11 +125,13 @@ function createNextBfcacheIdMap(options) {
 	const currentPathname = normalizeBfcachePathname(options.currentPathname);
 	const nextPathname = normalizeBfcachePathname(options.nextPathname);
 	const ids = {};
-	for (const id of collectBfcacheSegmentIds(options.elements, nextMetadata)) {
-		const currentValue = createBfcacheSegmentIdentity(id, {
+	for (const id of collectBfcacheSegmentIdCandidates(options.elements, nextMetadata)) {
+		const parsed = parseBfcacheSegmentKey(id);
+		if (parsed === null) continue;
+		const currentValue = createBfcacheSegmentIdentity(id, parsed, {
 			metadata: currentMetadata,
 			pathname: currentPathname
-		}) === createBfcacheSegmentIdentity(id, {
+		}) === createBfcacheSegmentIdentity(id, parsed, {
 			metadata: nextMetadata,
 			pathname: nextPathname
 		}) ? current[id] : void 0;
@@ -115,7 +143,8 @@ function createNextBfcacheIdMap(options) {
 }
 function preserveBfcacheIdsForMergedElements(options) {
 	const ids = {};
-	for (const id of collectBfcacheSegmentIds(options.elements)) {
+	for (const id of collectBfcacheSegmentIdCandidates(options.elements)) {
+		if (parseBfcacheSegmentKey(id) === null) continue;
 		const value = options.next[id] ?? options.previous[id];
 		if (value === void 0) continue;
 		ids[id] = value;
@@ -124,4 +153,4 @@ function preserveBfcacheIdsForMergedElements(options) {
 	return ids;
 }
 //#endregion
-export { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements };
+export { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap, createInitialBfcacheMaps, createNextBfcacheIdMap, preserveBfcacheIdsForMergedElements };

package/dist/server/app-history-state.d.ts

@@ -63,7 +63,6 @@ declare function createHistoryStateWithNavigationMetadata(state: unknown, metada
 }): HistoryStateRecord | null;
 declare function createExternalHistoryStatePreservingMetadata(callerState: unknown, currentHistoryState: unknown): unknown;
 declare function readHistoryStatePreviousNextUrl(state: unknown): string | null;
-declare function isBfcacheSegmentId(id: string): boolean;
 declare function readHistoryStateBfcacheIds(state: unknown): BfcacheIdMap | null;
 declare function readHistoryStateBfcacheVersion(state: unknown): number | null;
 /**
@@ -83,4 +82,4 @@ declare function resolveHistoryTraversalIntent(options: {
   historyState: unknown;
 }): HistoryTraversalIntent;
 //#endregion
-export { BfcacheIdMap, HistoryStateSnapshotCache, HistoryTraversalIntent, RestorableClientStateController, createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isBfcacheSegmentId, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent };
+export { BfcacheIdMap, HistoryStateSnapshotCache, HistoryTraversalIntent, RestorableClientStateController, createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent };

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

@@ -220,4 +220,4 @@ function resolveHistoryTraversalIntent(options) {
 	};
 }
 //#endregion
-export { HistoryStateSnapshotCache, RestorableClientStateController, createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isBfcacheSegmentId, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent };
+export { HistoryStateSnapshotCache, RestorableClientStateController, createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata, createHistoryStateWithNavigationMetadata, createHistoryStateWithPreviousNextUrl, isHistoryStateBfcacheVersionCurrent, readHistoryStateBfcacheIds, readHistoryStateBfcacheVersion, readHistoryStatePreviousNextUrl, readHistoryStateTraversalIndex, resolveHistoryTraversalIntent };

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

@@ -1,6 +1,6 @@
 import { methodNotAllowedResponse } from "./http-error-responses.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
-import { isPossibleAppRouteActionRequest } from "./app-route-handler-policy.js";
+import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
 //#region src/server/app-page-method.ts
 function isNonGetOrHead(method) {
 	const normalizedMethod = method.toUpperCase();

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

@@ -1,3 +1,4 @@
+import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { VINEXT_RSC_VARY_HEADER } from "./app-rsc-cache-busting.js";
 import { mergeMiddlewareResponseHeaders } from "./middleware-response-headers.js";
 import { applyEdgeRuntimeHeader } from "./app-page-response.js";
@@ -131,7 +132,7 @@ function createAppPageRscErrorTracker(baseOnError) {
 			return capturedSpecialError;
 		},
 		onRenderError(error, requestInfo, errorContext) {
-			if (error && typeof error === "object" && "digest" in error) {
+			if (isNavigationSignalError(error)) {
 				if (capturedSpecialError === null) capturedSpecialError = error;
 			} else capturedError = error;
 			return baseOnError(error, requestInfo, errorContext);

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

@@ -1,6 +1,6 @@
 import { makeThenableParams } from "../shims/thenable-params.js";
-import { markKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
 import { applyRouteHandlerMiddlewareContext, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, buildRouteHandlerCachedResponse } from "./app-route-handler-response.js";
+import { markKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
 import { runAppRouteHandler } from "./app-route-handler-execution.js";
 //#region src/server/app-route-handler-cache.ts
 const EMPTY_PARAMS = Object.freeze({});

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

@@ -7,10 +7,10 @@ import { setNavigationContext } from "../shims/navigation-context-state.js";
 import { makeThenableParams } from "../shims/thenable-params.js";
 import "../shims/navigation.js";
 import { buildPageCacheTags } from "./implicit-tags.js";
-import { isKnownDynamicAppRoute, isValidHTTPMethod } from "./app-route-handler-runtime.js";
-import { getAppRouteHandlerRevalidateSeconds, hasAppRouteHandlerDefaultExport, resolveAppRouteHandlerMethod, shouldReadAppRouteHandlerCache } from "./app-route-handler-policy.js";
 import { applyRouteHandlerMiddlewareContext } from "./app-route-handler-response.js";
+import { isKnownDynamicAppRoute, isValidHTTPMethod } from "./app-route-handler-runtime.js";
 import { createStaticGenerationHeadersContext } from "./app-static-generation.js";
+import { getAppRouteHandlerRevalidateSeconds, hasAppRouteHandlerDefaultExport, resolveAppRouteHandlerMethod, shouldReadAppRouteHandlerCache } from "./app-route-handler-policy.js";
 import { executeAppRouteHandler } from "./app-route-handler-execution.js";
 import { readAppRouteHandlerCacheResponse } from "./app-route-handler-cache.js";
 import { resolveAppRouteHandlerFetchCacheMode } from "./app-segment-config.js";

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

@@ -1,8 +1,9 @@
 import { setHeadersContext } from "../shims/headers.js";
-import { createTrackedAppRouteRequest, markKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
-import { isPossibleAppRouteActionRequest, resolveAppRouteHandlerSpecialError, shouldApplyAppRouteHandlerRevalidateHeader, shouldWriteAppRouteHandlerCache } from "./app-route-handler-policy.js";
+import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
 import { applyRouteHandlerMiddlewareContext, applyRouteHandlerRevalidateHeader, assertSupportedAppRouteHandlerResponse, buildAppRouteCacheValue, finalizeRouteHandlerResponse, markRouteHandlerCacheMiss } from "./app-route-handler-response.js";
+import { createTrackedAppRouteRequest, markKnownDynamicAppRoute } from "./app-route-handler-runtime.js";
 import { createStaticGenerationHeadersContext, getAppRouteStaticGenerationErrorMessage } from "./app-static-generation.js";
+import { resolveAppRouteHandlerSpecialError, shouldApplyAppRouteHandlerRevalidateHeader, shouldWriteAppRouteHandlerCache } from "./app-route-handler-policy.js";
 //#region src/server/app-route-handler-execution.ts
 function configureAppRouteStaticGenerationContext(options) {
 	if (options.dynamicConfig === "force-static" || options.dynamicConfig === "error") {

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

@@ -1,3 +1,4 @@
+import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
 import { RouteHandlerHttpMethod, RouteHandlerModule } from "./app-route-handler-runtime.js";
 
 //#region src/server/app-route-handler-policy.d.ts
@@ -43,7 +44,6 @@ type AppRouteHandlerSpecialError = {
 type AppRouteHandlerSpecialErrorOptions = {
   isAction: boolean;
 };
-declare function isPossibleAppRouteActionRequest(request: Pick<Request, "headers" | "method">): boolean;
 declare function getAppRouteHandlerRevalidateSeconds(handler: Pick<AppRouteHandlerModule, "revalidate">): number | null;
 declare function hasAppRouteHandlerDefaultExport(handler: RouteHandlerModule): boolean;
 declare function resolveAppRouteHandlerMethod(handler: AppRouteHandlerModule, method: string): ResolvedAppRouteHandlerMethod;

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

@@ -1,12 +1,7 @@
-import "./headers.js";
 import { parseNextHttpErrorDigest, parseNextRedirectDigest } from "./next-error-digest.js";
+import { isPossibleAppRouteActionRequest } from "./app-action-request.js";
 import { buildRouteHandlerAllowHeader, collectRouteHandlerMethods } from "./app-route-handler-runtime.js";
 //#region src/server/app-route-handler-policy.ts
-function isPossibleAppRouteActionRequest(request) {
-	if (request.method.toUpperCase() !== "POST") return false;
-	const contentType = request.headers.get("content-type");
-	return request.headers.has("x-rsc-action") || request.headers.has("next-action") || contentType === "application/x-www-form-urlencoded" || contentType?.startsWith("multipart/form-data") === true;
-}
 function getAppRouteHandlerRevalidateSeconds(handler) {
 	const { revalidate } = handler;
 	if (revalidate === false) return Infinity;

package/dist/server/app-rsc-errors.d.ts

@@ -19,6 +19,17 @@ type CreateRscOnErrorHandlerOptions = {
 declare function hasDigest(error: unknown): error is {
   digest: unknown;
 };
+/**
+ * vinext's mirror of Next.js's `getDigestForWellKnownError`: returns the digest
+ * string only when the error is a genuine control-flow signal — a redirect,
+ * notFound/HTTP-access fallback, bail-out-to-client-side-rendering, or
+ * dynamic-server-usage throw. Any other digest (e.g. a hashed digest stamped on
+ * a real error, or an obfuscated digest transported from a nested boundary)
+ * returns undefined so the caller still reports it as a real error. Mere
+ * presence of a `digest` field is NOT enough — that conflation swallowed a class
+ * of server render errors with no instrumentation/telemetry.
+ */
+declare function getDigestForWellKnownError(error: unknown): string | undefined;
 /**
  * djb2 hash matching Next.js's string-hash package for RSC error digests.
  */
@@ -26,4 +37,4 @@ declare function errorDigest(input: string): string;
 declare function sanitizeErrorForClient(error: unknown, nodeEnv?: string | undefined): unknown;
 declare function createRscOnErrorHandler(options: CreateRscOnErrorHandlerOptions): (error: unknown) => string | undefined;
 //#endregion
-export { createRscOnErrorHandler, errorDigest, hasDigest, sanitizeErrorForClient };
+export { createRscOnErrorHandler, errorDigest, getDigestForWellKnownError, hasDigest, sanitizeErrorForClient };

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

@@ -1,8 +1,26 @@
+import { isNavigationSignalError } from "../utils/navigation-signal.js";
 import { resolveAppPageSpecialError } from "./app-page-execution.js";
 //#region src/server/app-rsc-errors.ts
 function hasDigest(error) {
 	return Boolean(error && typeof error === "object" && "digest" in error);
 }
+const BAILOUT_TO_CSR_DIGEST = "BAILOUT_TO_CLIENT_SIDE_RENDERING";
+const DYNAMIC_SERVER_USAGE_DIGEST = "DYNAMIC_SERVER_USAGE";
+/**
+* vinext's mirror of Next.js's `getDigestForWellKnownError`: returns the digest
+* string only when the error is a genuine control-flow signal — a redirect,
+* notFound/HTTP-access fallback, bail-out-to-client-side-rendering, or
+* dynamic-server-usage throw. Any other digest (e.g. a hashed digest stamped on
+* a real error, or an obfuscated digest transported from a nested boundary)
+* returns undefined so the caller still reports it as a real error. Mere
+* presence of a `digest` field is NOT enough — that conflation swallowed a class
+* of server render errors with no instrumentation/telemetry.
+*/
+function getDigestForWellKnownError(error) {
+	if (!hasDigest(error)) return;
+	const digest = String(error.digest);
+	if (isNavigationSignalError(error) || digest === BAILOUT_TO_CSR_DIGEST || digest === DYNAMIC_SERVER_USAGE_DIGEST) return digest;
+}
 function getThrownValueMessage(error) {
 	return error instanceof Error ? error.message : String(error);
 }
@@ -27,14 +45,16 @@ function sanitizeErrorForClient(error, nodeEnv = process.env.NODE_ENV) {
 function createRscOnErrorHandler(options) {
 	return (error) => {
 		const nodeEnv = options.nodeEnv ?? process.env.NODE_ENV;
-		if (hasDigest(error)) return String(error.digest);
+		const wellKnownDigest = getDigestForWellKnownError(error);
+		if (wellKnownDigest !== void 0) return wellKnownDigest;
 		if (nodeEnv !== "production" && error instanceof Error && error.message.includes("Only plain objects, and a few built-ins, can be passed to Client Components")) {
 			console.error("[vinext] RSC serialization error: a non-plain object was passed from a Server Component to a Client Component.\n\nCommon causes:\n  * Passing a module namespace (import * as X) directly as a prop.\n    Unlike Next.js (webpack), Vite produces real ESM module namespace objects\n    which are not serializable. Fix: pass individual values instead,\n    e.g. <Comp value={module.value} />\n  * Passing a class instance (new Foo()) as a prop.\n    Fix: convert to a plain object, e.g. { id: foo.id, name: foo.name }\n  * Passing a Date, Map, or Set. Use .toISOString(), [...map.entries()], etc.\n  * Passing Object.create(null). Use { ...obj } to restore a prototype.\n\nOriginal error:", error.message);
 			return;
 		}
 		if (options.requestInfo && options.errorContext && error) options.reportRequestError(error instanceof Error ? error : new Error(getThrownValueMessage(error)), options.requestInfo, options.errorContext);
+		if (hasDigest(error)) return String(error.digest);
 		if (nodeEnv === "production" && error) return errorDigest(getThrownValueMessage(error) + getThrownValueStack(error));
 	};
 }
 //#endregion
-export { createRscOnErrorHandler, errorDigest, hasDigest, sanitizeErrorForClient };
+export { createRscOnErrorHandler, errorDigest, getDigestForWellKnownError, hasDigest, sanitizeErrorForClient };

package/dist/server/app-rsc-handler.d.ts

@@ -2,21 +2,25 @@ import { NextHeader, NextI18nConfig, NextRedirect, NextRewrite } from "../config
 import { ImageConfig } from "./image-optimization.js";
 import { ClientReuseManifestParseResult } from "./client-reuse-manifest.js";
 import { RootParams } from "../shims/root-params.js";
-import { MiddlewareModule } from "./middleware-runtime.js";
-import { AppMiddlewareContext } from "./app-middleware.js";
+import { AppMiddlewareContext, ApplyAppMiddlewareResult } from "./app-middleware.js";
 import { AppRscRenderMode } from "./app-rsc-render-mode.js";
 import { AppPrerenderRootParamNamesMap, AppPrerenderStaticParamsMap } from "./app-prerender-endpoints.js";
-import { MetadataRouteMakeThenableParams, MetadataRuntimeRoute } from "./metadata-route-response.js";
 import { ReactFormState } from "react-dom/client";
 
 //#region src/server/app-rsc-handler.d.ts
 type AppPageParams = Record<string, string | string[]>;
-type MetadataRoutes = readonly MetadataRuntimeRoute[];
-type MakeThenableParams = MetadataRouteMakeThenableParams;
 type StaticParamsMap = AppPrerenderStaticParamsMap;
 type RootParamNamesMap = AppPrerenderRootParamNamesMap;
 type AppRscMiddlewareContext = AppMiddlewareContext;
+type RunAppMiddlewareOptions = {
+  cleanPathname: string;
+  context: AppRscMiddlewareContext;
+  isDataRequest: boolean;
+  request: Request;
+};
 type AppRscHandlerRoute = {
+  __loadPage?: unknown;
+  __loadRouteHandler?: unknown;
   isDynamic: boolean;
   params?: readonly string[];
   page?: unknown;
@@ -173,18 +177,15 @@ type CreateAppRscHandlerOptions<TRoute extends AppRscHandlerRoute> = {
    * Node server and dev included, not just the Cloudflare worker entry.
    */
   registerCacheAdapters: (env?: Record<string, unknown>) => void;
-  handleProgressiveActionRequest: (options: HandleProgressiveActionRequestOptions) => Promise<Response | ProgressiveActionFormStateResult | null>;
-  handleServerActionRequest: (options: HandleServerActionRequestOptions) => Promise<Response | null>;
+  handleProgressiveActionRequest?: (options: HandleProgressiveActionRequestOptions) => Promise<Response | ProgressiveActionFormStateResult | null>;
+  handleMetadataRouteRequest?: (cleanPathname: string) => Promise<Response | null>;
+  handleServerActionRequest?: (options: HandleServerActionRequestOptions) => Promise<Response | null>;
   i18nConfig: NextI18nConfig | null;
   imageConfig?: ImageConfig;
   isDev: boolean;
-  isMiddlewareProxy: boolean;
   loadPrerenderPagesRoutes?: () => Promise<unknown>;
-  makeThenableParams: MakeThenableParams;
   matchRoute: (pathname: string) => AppRscRouteMatch<TRoute> | null;
-  metadataRoutes: MetadataRoutes;
-  middlewareFilePath: string | null;
-  middlewareModule: MiddlewareModule | null;
+  runMiddleware?: (options: RunAppMiddlewareOptions) => Promise<ApplyAppMiddlewareResult>;
   publicFiles: ReadonlySet<string>;
   renderNotFound: (options: RenderNotFoundOptions<TRoute>) => Promise<Response | null>;
   renderPagesFallback?: (options: RenderPagesFallbackOptions) => Promise<Response | null>;

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

@@ -17,8 +17,9 @@ import "./app-page-response.js";
 import { buildNextDataNotFoundResponse, normalizePagesDataRequest } from "./pages-data-route.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 { flattenErrorCauses } from "../utils/error-cause.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 { finalizeAppRscResponse } from "./app-rsc-response-finalizer.js";
@@ -47,6 +48,11 @@ function isExecutionContextLike(value) {
 	if (!value || typeof value !== "object") return false;
 	return hasProperty(value, "waitUntil") && typeof value.waitUntil === "function";
 }
+function createMissingServerActionResponse(options, actionId) {
+	console.warn(getServerActionNotFoundMessage(actionId));
+	options.clearRequestContext();
+	return createServerActionNotFoundResponse();
+}
 function redirectDestinationWithBasePath(destination, basePath) {
 	if (!basePath || isExternalUrl(destination) || hasBasePath(destination, basePath)) return destination;
 	return basePath + destination;
@@ -165,19 +171,12 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		status: null
 	};
 	let didMiddlewareRewrite = false;
-	if (options.middlewareModule) {
-		const { applyAppMiddleware } = await import("./app-middleware.js");
-		const middlewareResult = await applyAppMiddleware({
-			basePath: options.basePath,
+	if (options.runMiddleware) {
+		const middlewareResult = await options.runMiddleware({
 			cleanPathname,
 			context: middlewareContext,
-			filePath: options.middlewareFilePath ?? void 0,
-			i18nConfig: options.i18nConfig,
 			isDataRequest,
-			isProxy: options.isMiddlewareProxy,
-			module: options.middlewareModule,
-			request: userlandRequest,
-			trailingSlash: options.trailingSlash
+			request: userlandRequest
 		});
 		if (middlewareResult.kind === "response") return applyConfigHeadersToMiddlewareRedirect(middlewareResult.response, {
 			basePathState,
@@ -211,13 +210,8 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		if (!imageRedirect) return new Response("Invalid image optimization parameters", { status: 400 });
 		return Response.redirect(new URL(imageRedirect, url.origin).href, 302);
 	}
-	if (options.metadataRoutes.length > 0) {
-		const { handleMetadataRouteRequest } = await import("./metadata-route-response.js");
-		const metadataRouteResponse = await handleMetadataRouteRequest({
-			metadataRoutes: options.metadataRoutes,
-			cleanPathname,
-			makeThenableParams: options.makeThenableParams
-		});
+	if (options.handleMetadataRouteRequest) {
+		const metadataRouteResponse = await options.handleMetadataRouteRequest(cleanPathname);
 		if (metadataRouteResponse) {
 			applyConfigHeadersToResponse(metadataRouteResponse.headers, {
 				basePathState,
@@ -255,13 +249,16 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const contentType = request.headers.get("content-type") || "";
 	const isPostRequest = request.method.toUpperCase() === "POST";
 	let progressiveActionResult = null;
-	if (isPostRequest && contentType.startsWith("multipart/form-data") && !actionId) progressiveActionResult = await options.handleProgressiveActionRequest({
-		actionId,
-		cleanPathname,
-		contentType,
-		middlewareContext,
-		request
-	});
+	if (isPostRequest && contentType.startsWith("multipart/form-data") && !actionId) {
+		if (options.handleProgressiveActionRequest) progressiveActionResult = await options.handleProgressiveActionRequest({
+			actionId,
+			cleanPathname,
+			contentType,
+			middlewareContext,
+			request
+		});
+		else if (preActionMatch?.route.__loadPage && !preActionMatch.route.__loadRouteHandler) return createMissingServerActionResponse(options, null);
+	}
 	if (progressiveActionResult instanceof Response) return progressiveActionResult;
 	const progressiveActionFormState = progressiveActionResult?.kind === "form-state" ? progressiveActionResult : null;
 	const isProgressiveActionRender = progressiveActionFormState !== null;
@@ -269,7 +266,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 	const failedProgressiveActionResult = progressiveActionFormState && "actionError" in progressiveActionFormState ? progressiveActionFormState : null;
 	const actionFailed = failedProgressiveActionResult !== null;
 	const actionError = failedProgressiveActionResult?.actionError;
-	const serverActionResponse = isPostRequest && actionId ? await options.handleServerActionRequest({
+	const serverActionResponse = isPostRequest && actionId && options.handleServerActionRequest ? await options.handleServerActionRequest({
 		actionId,
 		cleanPathname,
 		contentType,
@@ -281,6 +278,7 @@ async function handleAppRscRequest(options, request, preMiddlewareRequestContext
 		searchParams: getResolvedSearchParams()
 	}) : null;
 	if (serverActionResponse) return serverActionResponse;
+	if (isPostRequest && actionId && !options.handleServerActionRequest) return createMissingServerActionResponse(options, actionId);
 	let match = preActionMatch;
 	const renderPagesForMatchKind = async (matchKind) => {
 		const response = match === null || match.route.isDynamic ? await options.renderPagesFallback?.({

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

@@ -22,7 +22,11 @@ import { mergeVaryHeader } from "./middleware-response-headers.js";
 */
 function finalizeAppRscResponse(response, request, options) {
 	if (response.status >= 300 && response.status < 400) return response;
-	if (!response.headers.has("x-vinext-static-file")) mergeVaryHeader(response.headers, VINEXT_RSC_VARY_HEADER);
+	if (!response.headers.has("x-vinext-static-file")) {
+		const varyHeader = response.headers.get("Vary");
+		if (varyHeader === null) response.headers.set("Vary", VINEXT_RSC_VARY_HEADER);
+		else if (varyHeader !== VINEXT_RSC_VARY_HEADER) mergeVaryHeader(response.headers, VINEXT_RSC_VARY_HEADER);
+	}
 	if (!response.headers.has("Cache-Control")) applyCdnResponseHeaders(response.headers, { cacheControl: "" });
 	if (!options.configHeaders.length) return response;
 	const url = new URL(request.url);

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

@@ -377,7 +377,7 @@ async function handleProgressiveServerActionRequest(options) {
 			options.setHeadersAccessPhase(previousHeadersPhase);
 		}
 		if (!actionRedirect) {
-			const actionPendingCookies = options.getAndClearPendingCookies();
+			const actionPendingCookies = dedupePendingCookies(options.getAndClearPendingCookies());
 			const actionDraftCookie = options.getDraftModeCookieHeader();
 			const revalidationKind = resolveActionRevalidationKind(actionPendingCookies.length > 0 || Boolean(actionDraftCookie));
 			if (actionFailed) return {

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

@@ -18,7 +18,7 @@ import { createSsrErrorMetaRenderer } from "./app-ssr-error-meta.js";
 import { createNavigationRuntimeRscMetadataScript, createRscEmbedTransform, createTickBufferedTransform } from "./app-ssr-stream.js";
 import { BeforeInteractiveContext } from "../shims/before-interactive-context.js";
 import { runWithRootParamsScope } from "../shims/root-params.js";
-import { createBfcacheSegmentStateKeyMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.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";
@@ -186,12 +186,14 @@ async function handleSsr(rscStream, navContext, fontData, options) {
 					const wireElements = use(flightRoot);
 					const elements = AppElementsWire.decode(wireElements);
 					const metadata = AppElementsWire.readMetadata(elements);
-					const routeTree = createElement(ElementsContext.Provider, { value: elements }, createElement(Slot, { id: metadata.routeId }));
-					const stateKeyTree = createElement(BfcacheStateKeyMapContext.Provider, { value: createBfcacheSegmentStateKeyMap({
+					const bfcacheMaps = createInitialBfcacheMaps({
 						elements,
+						metadata,
 						pathname: ssrNavigationContext.pathname
-					}) }, routeTree);
-					return BfcacheIdMapContext ? createElement(BfcacheIdMapContext.Provider, { value: createInitialBfcacheIdMap(elements) }, stateKeyTree) : stateKeyTree;
+					});
+					const routeTree = createElement(ElementsContext.Provider, { value: elements }, createElement(Slot, { id: metadata.routeId }));
+					const stateKeyTree = createElement(BfcacheStateKeyMapContext.Provider, { value: bfcacheMaps.stateKeys }, routeTree);
+					return BfcacheIdMapContext ? createElement(BfcacheIdMapContext.Provider, { value: bfcacheMaps.bfcacheIds }, stateKeyTree) : stateKeyTree;
 				}
 				const flightRootElement = createElement(VinextFlightRoot);
 				const root = AppRouterContext ? createElement(AppRouterContext.Provider, { value: ssrAppRouterInstance }, flightRootElement) : flightRootElement;

package/dist/server/metadata-route-response.d.ts

@@ -13,4 +13,4 @@ type MetadataRouteRequestOptions = {
 };
 declare function handleMetadataRouteRequest(options: MetadataRouteRequestOptions): Promise<Response | null>;
 //#endregion
-export { MetadataRouteMakeThenableParams, MetadataRuntimeRoute, handleMetadataRouteRequest };
+export { MetadataRuntimeRoute, handleMetadataRouteRequest };

package/dist/shims/dynamic.js

@@ -127,7 +127,7 @@ function dynamic(dynamicInput, options) {
 	const preloadModuleIds = loadableGenerated?.modules ?? modules;
 	if (!ssr) {
 		if (isServer) {
-			const SSRFalse = (_props) => LoadingComponent ? React.createElement(LoadingComponent, createDynamicLoadingProps({ pastDelay: false })) : null;
+			const SSRFalse = (_props) => LoadingComponent ? React.createElement(LoadingComponent, createDynamicLoadingProps()) : null;
 			SSRFalse.displayName = "DynamicSSRFalse";
 			return SSRFalse;
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "license": "MIT",
   "repository": {