vinext 1.2.0 → 1.3.0

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

@@ -51,6 +51,7 @@ const isrCachePath = resolveEntryPath("../server/isr-cache.js", import.meta.url)
 const thenableParamsShimPath = resolveEntryPath("../shims/thenable-params.js", import.meta.url);
 const appPageElementBuilderPath = resolveEntryPath("../server/app-page-element-builder.js", import.meta.url);
 const instrumentationRuntimePath = resolveEntryPath("../server/instrumentation-runtime.js", import.meta.url);
+const isolateSharedPromisePath = resolveEntryPath("../server/isolate-shared-promise.js", import.meta.url);
 const appRscErrorHandlerPath = resolveEntryPath("../server/app-rsc-error-handler.js", import.meta.url);
 const appRequestContextPath = resolveEntryPath("../server/app-request-context.js", import.meta.url);
 const appRequestStageContextPath = resolveEntryPath("../server/app-request-stage-context.js", import.meta.url);
@@ -116,19 +117,22 @@ function buildAppDecodedPathnamePatterns(routes, config) {
 	};
 	return routes.filter((route) => !route.isDynamic && !route.routePath && getAppRouteRenderEntryPath(route) !== null && isPrerenderedPage(route)).map((route) => route.pattern);
 }
-function buildAppRequestRouteMetadata(routes) {
+function createForcesDynamicReader() {
 	const readSource = createSegmentSourceReader();
-	const forcesDynamic = (filePath) => {
+	return (filePath) => {
 		const source = readSource(filePath);
 		return source !== null && extractExportConstString(source, "dynamic") === "force-dynamic";
 	};
+}
+/** Whether a direct request to the route renders a `dynamic = "force-dynamic"` tree. */
+function directRequestForcesDynamic(route, forcesDynamic) {
+	return route.routePath ? forcesDynamic(route.routePath) : appPageSegmentConfigPaths(route).some(forcesDynamic);
+}
+function buildAppRequestRouteMetadata(routes) {
+	const forcesDynamic = createForcesDynamicReader();
 	return routes.map((route) => ({
 		canUseCanonicalLoadingShell: appRouteHasMainTreeLoadingBoundary(route),
-		forceDynamic: route.routePath ? forcesDynamic(route.routePath) : [
-			...appPageSegmentConfigPaths(route),
-			...route.parallelSlots.flatMap((slot) => slot.interceptingRoutes.flatMap((intercept) => [...intercept.layoutPaths, intercept.pagePath])),
-			...route.siblingIntercepts.flatMap((intercept) => [...intercept.layoutPaths, intercept.pagePath])
-		].some(forcesDynamic),
+		forceDynamic: directRequestForcesDynamic(route, forcesDynamic) || [...route.parallelSlots.flatMap((slot) => slot.interceptingRoutes.flatMap((intercept) => [...intercept.layoutPaths, intercept.pagePath])), ...route.siblingIntercepts.flatMap((intercept) => [...intercept.layoutPaths, intercept.pagePath])].some(forcesDynamic),
 		ids: route.ids ?? null,
 		pattern: route.pattern,
 		patternParts: route.patternParts,
@@ -179,6 +183,29 @@ function buildAppRequestRouteMetadata(routes) {
 		}))
 	}));
 }
+/**
+* Register the build-time route facts `revalidatePath()` uses to skip CDN
+* purges for force-dynamic routes. A Pages Router can serve the same paths
+* without those facts, so mixed apps always purge.
+*/
+function generateCdnPurgeRoutesRegistration(routes, metadataRoutes, config) {
+	if (config?.hasPagesDir) return "";
+	const forcesDynamic = createForcesDynamicReader();
+	const purgeRoutes = {
+		metadataRoutes: (metadataRoutes ?? []).map((route) => ({
+			patternParts: route.patternParts ?? null,
+			routeSegments: route.routeSegments ?? [],
+			servedUrl: route.servedUrl
+		})),
+		routes: routes.map((route) => ({
+			forceDynamic: directRequestForcesDynamic(route, forcesDynamic),
+			patternParts: route.patternParts,
+			routeSegments: route.routeSegments
+		}))
+	};
+	return `import { registerCdnPurgeRoutes as __registerCdnPurgeRoutes } from "vinext/shims/cdn-purge-routes";
+__registerCdnPurgeRoutes(${JSON.stringify(purgeRoutes)});`;
+}
 /** Generate the module-free App request stage used by multi-stage Worker outputs. */
 function generateAppRequestRscEntry(appDir, routes, middlewarePath, metadataRoutes, _globalErrorPath, basePath, trailingSlash, config, instrumentationPath) {
 	const bp = basePath ?? "";
@@ -204,13 +231,14 @@ import __pagesClientAssets from "virtual:vinext-pages-client-assets";
 ${middlewarePath ? `import { applyAppMiddleware as __applyAppMiddleware } from ${JSON.stringify(appMiddlewarePath)};` : ""}
 ${instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(toSlash(instrumentationPath))};
 import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(instrumentationRuntimePath)};
+import { shareIsolatePromise as __shareIsolatePromise } from ${JSON.stringify(isolateSharedPromisePath)};
 let __applicationInitialization;
 async function __initializeApplication() {
   await __ensureInstrumentationRegistered(_instrumentation, ${JSON.stringify(toSlash(instrumentationPath))});
   ${middlewarePath ? `middlewareModule = await import(${JSON.stringify(toSlash(middlewarePath))});` : ""}
 }
-export function __ensureInstrumentation() {
-  return __applicationInitialization ??= __initializeApplication();
+export function __ensureInstrumentation(ctx) {
+  return __applicationInitialization ??= __shareIsolatePromise(__initializeApplication(), ctx);
 }` : "export function __ensureInstrumentation() {}"}
 ${middlewarePath ? instrumentationPath ? "let middlewareModule;" : `import * as middlewareModule from ${JSON.stringify(toSlash(middlewarePath))};` : ""}
 ${hasPagesDir ? `import { getDraftModeCookieHeader } from "next/headers";
@@ -219,8 +247,8 @@ import { renderPagesFallback as __renderPagesFallback } from ${JSON.stringify(ap
 import { buildRequestHeadersFromMiddlewareResponse as __buildRequestHeadersFromMiddlewareResponse } from ${JSON.stringify(middlewareRequestHeadersPath)};
 import { applyRouteHandlerMiddlewareContext as __applyRouteHandlerMiddlewareContext } from ${JSON.stringify(appRouteHandlerMiddlewareContextPath)};` : ""}
 
-${hasPagesDir ? `export function __ensureHybridPagesApplication() {
-  return __pagesRequestEntry.__ensureInstrumentation?.();
+${hasPagesDir ? `export function __ensureHybridPagesApplication(ctx) {
+  return __pagesRequestEntry.__ensureInstrumentation?.(ctx);
 }` : "export function __ensureHybridPagesApplication() {}"}
 
 const __basePath = ${JSON.stringify(bp)};
@@ -242,6 +270,7 @@ export const __clientBuildFiles = __pagesClientAssets.clientBuildFiles ?? [];
 const __routes = ${JSON.stringify(requestRoutes)};
 const __routeMatcher = __createAppRscRouteMatcher(__routes, ${JSON.stringify(buildAppDecodedPathnamePatterns(routes, config))});
 const __metadataRouteMatchers = ${JSON.stringify(metadataRouteMatchers)};
+${generateCdnPurgeRoutesRegistration(routes, metadataRoutes, config)}
 
 function matchRoute(pathname) { return __routeMatcher.matchRoute(pathname); }
 function matchRequestRoute(pathname) { return __routeMatcher.matchRequestRoute(pathname); }
@@ -295,7 +324,7 @@ const __requestHandler = createAppRscRequestHandler({
   devForwardedMiddlewareContextKey: ${JSON.stringify(config?.devForwardedMiddlewareContextKey ?? null)},
   dispatchMatchedPage() { throw new Error("App request stage attempted to render a page inline"); },
   dispatchMatchedRouteHandler() { throw new Error("App request stage attempted to render a route handler inline"); },
-  ${instrumentationPath ? "ensureInstrumentation() { return __ensureInstrumentation(); }," : ""}
+  ${instrumentationPath ? "ensureInstrumentation(ctx) { return __ensureInstrumentation(ctx); }," : ""}
   i18nConfig: ${JSON.stringify(config?.i18n ?? null)},
   imageConfig: ${JSON.stringify(config?.imageConfig)},
   isMetadataRoute: __isMetadataPath,
@@ -368,6 +397,7 @@ const __requestHandler = createAppRscRequestHandler({
   },` : ""}
   rootParamNamesByPattern: {},
   setNavigationContext,
+  skipProxyUrlNormalize: ${JSON.stringify(config?.skipProxyUrlNormalize ?? false)},
   skipTrailingSlashRedirect: ${JSON.stringify(config?.skipTrailingSlashRedirect ?? false)},
   staticParamsMap: {},
   trailingSlash: __trailingSlash,
@@ -449,12 +479,12 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	});
 	const loadPrerenderPagesRoutesCode = hasPagesDir ? `
 let __hybridPagesApplication;
-export function __ensureHybridPagesApplication() {
-  return __hybridPagesApplication ??= (async () => {
+export function __ensureHybridPagesApplication(ctx) {
+  return __hybridPagesApplication ??= __shareIsolatePromise((async () => {
     const __pagesEntry = await import.meta.viteRsc.loadModule("ssr", "index");
-    await __pagesEntry.__ensureInstrumentation?.();
+    await __pagesEntry.__ensureInstrumentation?.(ctx);
     return __pagesEntry;
-  })();
+  })(), ctx);
 }
 async function __loadPrerenderPagesRoutes() {
   const __gspSsrEntry = await __ensureHybridPagesApplication();
@@ -475,8 +505,8 @@ ${metaRouteEntries.join(",\n")}
   rootLayouts = [${rootLayoutVars.join(", ")}];
   __fallbackRenderer = __createFallbackRenderer();
 }
-export function __ensureInstrumentation() {
-  return __applicationInitialization ??= __initializeApplication();
+export function __ensureInstrumentation(ctx) {
+  return __applicationInitialization ??= __shareIsolatePromise(__initializeApplication(), ctx);
 }` : "export function __ensureInstrumentation() {}";
 	return `
 ${hasAppRouteHandlers ? `// Capture the canonical Request surface before any user module can extend it.
@@ -487,15 +517,22 @@ import __cacheabilityManifest from "virtual:vinext-cacheability-manifest";
 export { __cacheabilityManifest };
 import {
   renderToReadableStream as _renderToReadableStream,
-  ${hasServerActions ? `decodeAction,
-  decodeFormState,
-  decodeReply,
-  loadServerAction,
+  ${hasServerActions ? `loadServerAction,
   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 {
+  createClientManifest as _createClientManifest,${hasServerActions ? `
+  createServerManifest as _createServerManifest,` : ""}
+} 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)};
+${hasServerActions ? `// plugin-rsc's decoders fix an unscoped server manifest; React's own take the
+// manifest, so actions can scope the server references they decode per route.
+import {
+  decodeAction as _decodeAction,
+  decodeFormState as _decodeFormState,
+  decodeReply as _decodeReply,
+} from "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge";
+` : ""}import { createRscPrerenderer, createRscRenderer } from ${JSON.stringify(rscStreamHintsPath)};
 
 const renderToReadableStream = createRscRenderer(_renderToReadableStream);
 const prerenderToReadableStream = createRscPrerenderer(async (model, options) =>
@@ -505,6 +542,7 @@ import { createElement } from "react";
 import { getNavigationContext as _getNavigationContext } from "next/navigation";
 import { configureMemoryCacheHandler as __configureMemoryCacheHandler } from "vinext/shims/cache-handler";
 import { getRequestExecutionContext as __getRequestExecutionContext } from "vinext/shims/request-context";
+import { shareIsolatePromise as __shareIsolatePromise } from ${JSON.stringify(isolateSharedPromisePath)};
 import { headersContextFromRequest, getDraftModeCookieHeader, getAndClearPendingCookies, consumeDynamicUsage, consumeInvalidDynamicUsageError, setHeadersAccessPhase } from "next/headers";
 import { mergeMetadata, resolveModuleMetadata, mergeViewport, resolveModuleViewport } from "vinext/metadata";
 ${config?.nodeOpenTelemetryLoader ? `import { register as __registerOpenTelemetryLoader } from "node:module";
@@ -878,6 +916,8 @@ function __createFallbackRenderer() {
 }
 ${instrumentationPath ? "let __fallbackRenderer;" : "const __fallbackRenderer = __createFallbackRenderer();"}
 
+${generateCdnPurgeRoutesRegistration(routes, metadataRoutes, config)}
+
 function matchRoute(url) {
   return __routeMatcher.matchRoute(url);
 }
@@ -1286,8 +1326,8 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       searchParams,
     });
   },
-  ${instrumentationPath ? `ensureInstrumentation() {
-    return __ensureInstrumentation();
+  ${instrumentationPath ? `ensureInstrumentation(ctx) {
+    return __ensureInstrumentation(ctx);
   },` : ""}
   ${hasServerActions ? `
   async handleProgressiveActionRequest({
@@ -1305,13 +1345,15 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
     } = await __loadAppServerActionExecution();
     const {
       areServerActionsOwnedByRoute: __areServerActionsOwnedByRoute,
+      createForwardedActionContext: __createForwardedActionContext,
       forwardServerActionIfNeeded: __forwardServerActionIfNeeded,
     } = await __loadAppActionForwarding();
     // A multipart form POST to a page is always a server-action attempt, so a
     // body that decodes to no action must surface as 404 action-not-found
-    // (#1340). Route handlers run after this dispatch and accept raw multipart
-    // POSTs, so only flag actual page routes. The __loadPage / __loadRouteHandler
-    // markers are static and available before lazy module hydration.
+    // (#1340). Route handlers and Pages routes never reach this dispatch
+    // (#3886) and unmatched routes fall through, so only flag page routes.
+    // The __loadPage marker is static and available before lazy module
+    // hydration.
     //
     // Only the progressive (multipart, no actionId) POST path consults
     // hasPageRoute, so skip the route match entirely for every other request
@@ -1321,11 +1363,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       contentType,
       actionId,
     );
-    const __hasPageRoute = Boolean(
-      __isProgressiveAction &&
-        routeMatch?.route.__loadPage &&
-        !routeMatch.route.__loadRouteHandler,
-    );
+    const __hasPageRoute = Boolean(__isProgressiveAction && routeMatch?.route.__loadPage);
     return __handleProgressiveServerActionRequest({
       actionId,
       allowedOrigins: __allowedOrigins,
@@ -1335,8 +1373,9 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
         __clearRequestContext();
       },
       contentType,
-      decodeAction,
-      decodeFormState,
+      createServerManifest: _createServerManifest,
+      decodeAction: _decodeAction,
+      decodeFormState: _decodeFormState,
       getAndClearPendingCookies,
       getDraftModeCookieHeader,
       forwardAction(__progressiveActionId) {
@@ -1348,17 +1387,9 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
           clearRequestContext: __clearRequestContext,
           currentRoutePattern: routeMatch?.route.pattern ?? null,
           dispatch(__forwardRequest) {
-            const __executionContext = __getRequestExecutionContext();
             return __appRscHandler(
               __forwardRequest,
-              __executionContext
-                ? {
-                    actionForwarded: true,
-                    cache: __executionContext.cache,
-                    passThroughOnException: __executionContext.passThroughOnException?.bind(__executionContext),
-                    waitUntil: __executionContext.waitUntil.bind(__executionContext),
-                  }
-                : { actionForwarded: true },
+              __createForwardedActionContext(__getRequestExecutionContext()),
             );
           },
           middlewareContext,
@@ -1398,8 +1429,11 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
     sourceConfigHeaders,
     searchParams,
   }) {
-    const { forwardServerActionIfNeeded: __forwardServerActionIfNeeded } =
-      await __loadAppActionForwarding();
+    const {
+      areServerActionsOwnedByRoute: __areServerActionsOwnedByRoute,
+      createForwardedActionContext: __createForwardedActionContext,
+      forwardServerActionIfNeeded: __forwardServerActionIfNeeded,
+    } = await __loadAppActionForwarding();
     const __currentActionMatch = routeMatch;
     const __forwardResponse = await __forwardServerActionIfNeeded({
       actionId,
@@ -1409,17 +1443,9 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       clearRequestContext: __clearRequestContext,
       currentRoutePattern: __currentActionMatch?.route.pattern ?? null,
       dispatch(__forwardRequest) {
-        const __executionContext = __getRequestExecutionContext();
         return __appRscHandler(
           __forwardRequest,
-          __executionContext
-            ? {
-                actionForwarded: true,
-                cache: __executionContext.cache,
-                passThroughOnException: __executionContext.passThroughOnException?.bind(__executionContext),
-                waitUntil: __executionContext.waitUntil.bind(__executionContext),
-              }
-            : { actionForwarded: true },
+          __createForwardedActionContext(__getRequestExecutionContext()),
         );
       },
       middlewareContext,
@@ -1492,8 +1518,9 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       createRscOnErrorHandler(actionRequest, actionPathname, routePattern, overrides) {
         return createRscOnErrorHandler(actionRequest, actionPathname, routePattern, overrides);
       },
+      createServerManifest: _createServerManifest,
       createTemporaryReferenceSet,
-      decodeReply,
+      decodeReply: _decodeReply,
       dispatchRedirectRequest(redirectRequest) {
         return __appRscHandler(redirectRequest, undefined);
       },
@@ -1511,6 +1538,13 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
       },
       isRscRequest,
       loadServerAction,
+      validateActionReferences(__argumentActionIds) {
+        return __areServerActionsOwnedByRoute(
+          __VINEXT_ACTION_OWNERS(),
+          __argumentActionIds,
+          __actionMatch?.route.pattern ?? null,
+        );
+      },
       // Redirect targets are rendered as if the client had navigated to them,
       // so they must route on the raw pathname a real request would use.
       matchRoute(pathnameToMatch) {
@@ -1676,6 +1710,7 @@ ${responseStageOnly ? "const __responseStageOptions = {" : "const __appRscHandle
   },` : ""}
   rootParamNamesByPattern: rootParamNamesMap,
   setNavigationContext,
+  skipProxyUrlNormalize: ${JSON.stringify(config?.skipProxyUrlNormalize ?? false)},
   skipTrailingSlashRedirect: ${JSON.stringify(config?.skipTrailingSlashRedirect ?? false)},
   staticParamsMap: generateStaticParamsMap,
   trailingSlash: __trailingSlash,

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

@@ -49,5 +49,15 @@ type BuildAppRscManifestCodeOptions = {
    */
   globalNotFoundPath?: string | null;
 };
+/**
+ * The root not-found, forbidden and unauthorized boundaries, which a route
+ * without its own boundary falls back to.
+ */
+export declare function rootBoundaryFiles(routes: readonly AppRoute[]): string[];
+/**
+ * The files a render without a matched route shows (a route-miss 404, or a
+ * forbidden or unauthorized boundary): the root layouts and root boundaries.
+ */
+export declare function rootBoundaryRouteFiles(routes: readonly AppRoute[]): string[];
 export declare function buildAppRscManifestCode(options: BuildAppRscManifestCodeOptions): AppRscManifestCode;
 //#endregion

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

@@ -17,6 +17,25 @@ function rootRouteBoundaryPath(route, boundaryPaths, fallbackPath) {
 	if (route.pattern === "/") return fallbackPath ?? null;
 	return boundaryPaths?.[0] ?? fallbackPath ?? null;
 }
+/**
+* The root not-found, forbidden and unauthorized boundaries, which a route
+* without its own boundary falls back to.
+*/
+function rootBoundaryFiles(routes) {
+	const rootRoute = findRootBoundaryRoute(routes);
+	return [
+		rootRouteBoundaryPath(rootRoute, rootRoute?.notFoundPaths, rootRoute?.notFoundPath),
+		rootRouteBoundaryPath(rootRoute, rootRoute?.forbiddenPaths, rootRoute?.forbiddenPath),
+		rootRouteBoundaryPath(rootRoute, rootRoute?.unauthorizedPaths, rootRoute?.unauthorizedPath)
+	].filter((file) => file !== null);
+}
+/**
+* The files a render without a matched route shows (a route-miss 404, or a
+* forbidden or unauthorized boundary): the root layouts and root boundaries.
+*/
+function rootBoundaryRouteFiles(routes) {
+	return [...rootRouteLayoutPaths(findRootBoundaryRoute(routes)), ...rootBoundaryFiles(routes)];
+}
 function createImportAllocator(deferEagerImports) {
 	const imports = [];
 	const importInitializers = [];
@@ -357,4 +376,4 @@ function buildAppRscManifestCode(options) {
 	};
 }
 //#endregion
-export { buildAppRscManifestCode };
+export { buildAppRscManifestCode, rootBoundaryFiles, rootBoundaryRouteFiles };

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

@@ -9,6 +9,9 @@
  * entry also re-exports selected Pages server entry hooks from
  * `virtual:vinext-server-entry` so the RSC bundle can access Pages Router
  * route metadata and fallback dispatchers via `import("./ssr/index.js")`.
+ *
+ * `nitroPublicFilesEntry` wraps the default export for Nitro, so a public file
+ * the router resolves is served by Nitro's static handler.
  */
-export declare function generateSsrEntry(hasPagesDir?: boolean): string;
+export declare function generateSsrEntry(hasPagesDir?: boolean, nitroPublicFilesEntry?: string | null): string;
 //#endregion

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

@@ -10,12 +10,19 @@ import { resolveRuntimeEntryModule } from "./runtime-entry-module.js";
 * entry also re-exports selected Pages server entry hooks from
 * `virtual:vinext-server-entry` so the RSC bundle can access Pages Router
 * route metadata and fallback dispatchers via `import("./ssr/index.js")`.
+*
+* `nitroPublicFilesEntry` wraps the default export for Nitro, so a public file
+* the router resolves is served by Nitro's static handler.
 */
-function generateSsrEntry(hasPagesDir = false) {
+function generateSsrEntry(hasPagesDir = false, nitroPublicFilesEntry = null) {
 	const entryPath = resolveRuntimeEntryModule("app-ssr-entry");
 	return `
 export * from ${JSON.stringify(entryPath)};
-export { default } from ${JSON.stringify(entryPath)};
+${nitroPublicFilesEntry ? `
+import ssrEntry from ${JSON.stringify(entryPath)};
+import { withNitroPublicFiles } from ${JSON.stringify(nitroPublicFilesEntry)};
+export default withNitroPublicFiles(ssrEntry);
+` : `export { default } from ${JSON.stringify(entryPath)};`}
 ${hasPagesDir ? `
 export {
   __ensureInstrumentation,

package/dist/entries/pages-client-entry.d.ts

@@ -6,6 +6,7 @@ import { VinextLinkPrefetchRoute } from "../client/vinext-next-data.js";
 export declare function compileClientMiddlewareMatchers(matcher: StaticMiddlewareMatcher | undefined): unknown[] | undefined;
 export declare function generateClientEntry(pagesDir: string, nextConfig: ResolvedNextConfig, fileMatcher: ReturnType<typeof createValidFileMatcher>, options?: {
   appPrefetchRoutes?: readonly VinextLinkPrefetchRoute[];
+  appRouteHandlers?: readonly VinextLinkPrefetchRoute[];
   instrumentationClientPath?: string | null;
   middlewareMatcher?: StaticMiddlewareMatcher | undefined;
   reactPreamble?: boolean;

package/dist/entries/pages-client-entry.js

@@ -1,7 +1,7 @@
 import { toSlash } from "../deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { findFileWithExts } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
-import { apiRouter, pagesRouter } from "../routing/pages-router.js";
+import { pagesRouter } from "../routing/pages-router.js";
 import { resolveClientRuntimeModule } from "./runtime-entry-module.js";
 import { compileMiddlewareMatcherPattern } from "../server/middleware-matcher-pattern.js";
 import { hasExportedName } from "../build/report.js";
@@ -56,15 +56,12 @@ async function hasGetServerSidePropsExport(filePath) {
 }
 async function generateClientEntry(pagesDir, nextConfig, fileMatcher, options = {}) {
 	const pageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
-	const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 	const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
 	const errorFilePath = findFileWithExts(pagesDir, "_error", fileMatcher);
 	const hasApp = appFilePath !== null;
 	const appPrefetchRoutes = options.appPrefetchRoutes ?? [];
-	const pagesPrefetchRoutes = [...pageRoutes.map(toPagesLinkPrefetchRoute), ...apiRoutes.map((route) => ({
-		...toPagesLinkPrefetchRoute(route),
-		documentOnly: true
-	}))];
+	const appRouteHandlers = options.appRouteHandlers ?? [];
+	const pagesPrefetchRoutes = pageRoutes.map(toPagesLinkPrefetchRoute);
 	const pagesSsgPatterns = (await Promise.all(pageRoutes.map(async (route) => await hasGetStaticPropsExport(route.filePath) ? patternToNextFormat(route.pattern) : null))).filter((pattern) => pattern !== null);
 	const pagesSspPatterns = (await Promise.all(pageRoutes.map(async (route) => await hasGetServerSidePropsExport(route.filePath) ? patternToNextFormat(route.pattern) : null))).filter((pattern) => pattern !== null);
 	const instrumentationClientPath = options.instrumentationClientPath ?? null;
@@ -137,6 +134,9 @@ window.__VINEXT_APP_LOADER__ = appLoader;
 // when the user lands on an App Router page (see app-browser-entry.ts) — the
 // two writes do not race because only one entry executes per page load.
 window.__VINEXT_LINK_PREFETCH_ROUTES__ = ${JSON.stringify(appPrefetchRoutes)};
+// App route handlers with hashed static segments, for the same ownership
+// decisions (see hashed-route-patterns.ts).
+window.__VINEXT_APP_ROUTE_HANDLERS__ = ${JSON.stringify(appRouteHandlers)};
 // Pages route manifest, exposed so the App Router runtime can decide when
 // a soft-navigated URL is actually owned by Pages (and must hard-navigate
 // instead of issuing an RSC request). Set here AND in app-browser-entry.ts

package/dist/entries/pages-server-entry.js

@@ -28,6 +28,7 @@ const _pagesRouteDataKindPath = resolveEntryPath("../server/pages-route-data-kin
 const _isrCachePath = resolveEntryPath("../server/isr-cache.js", import.meta.url);
 const _revalidationRequestPath = resolveEntryPath("../server/revalidation-request.js", import.meta.url);
 const _instrumentationRuntimePath = resolveEntryPath("../server/instrumentation-runtime.js", import.meta.url);
+const _isolateSharedPromisePath = resolveEntryPath("../server/isolate-shared-promise.js", import.meta.url);
 async function getPagesDataKind(filePath) {
 	const source = await readFile(filePath, "utf8");
 	if (hasExportedName(source, "getStaticProps")) return "static";
@@ -85,18 +86,19 @@ async function generatePagesRequestEntry(pagesDir, nextConfig, fileMatcher, midd
 		}
 	});
 	const instrumentationImportCode = instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(instrumentationPath)};
-import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(_instrumentationRuntimePath)};` : "";
+import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(_instrumentationRuntimePath)};
+import { shareIsolatePromise as __shareIsolatePromise } from ${JSON.stringify(_isolateSharedPromisePath)};` : "";
 	const instrumentationInitCode = instrumentationPath ? `let __applicationInitialization;
 async function __initializeApplication() {
   await __ensureInstrumentationRegistered(_instrumentation, ${JSON.stringify(instrumentationPath)});
   ${middlewarePath ? `middlewareModule = await import(${JSON.stringify(middlewarePath)});` : ""}
 }
-export function __ensureInstrumentation() {
-  return __applicationInitialization ??= __initializeApplication();
+export function __ensureInstrumentation(ctx) {
+  return __applicationInitialization ??= __shareIsolatePromise(__initializeApplication(), ctx);
 }` : "export function __ensureInstrumentation() {}";
 	const middlewareImportCode = middlewarePath ? instrumentationPath ? "let middlewareModule;" : `import * as middlewareModule from ${JSON.stringify(middlewarePath)};` : "";
 	const middlewareExportCode = middlewarePath ? `export async function runMiddleware(request, ctx, options) {
-  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+  ${instrumentationPath ? "await __ensureInstrumentation(ctx);" : ""}
   return __runGeneratedMiddleware({
     basePath: vinextConfig.basePath,
     ctx,
@@ -110,8 +112,8 @@ export function __ensureInstrumentation() {
     skipTrailingSlashRedirect: vinextConfig.skipTrailingSlashRedirect,
     trailingSlash: vinextConfig.trailingSlash,
   });
-}` : `export async function runMiddleware() {
-  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+}` : `export async function runMiddleware(request, ctx) {
+  ${instrumentationPath ? "await __ensureInstrumentation(ctx);" : ""}
   return { continue: true };
 }`;
 	return `
@@ -260,7 +262,8 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 		}
 	});
 	const instrumentationImportCode = instrumentationPath ? `import * as _instrumentation from ${JSON.stringify(instrumentationPath)};
-import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(_instrumentationRuntimePath)};` : "";
+import { ensureInstrumentationRegistered as __ensureInstrumentationRegistered } from ${JSON.stringify(_instrumentationRuntimePath)};
+import { shareIsolatePromise as __shareIsolatePromise } from ${JSON.stringify(_isolateSharedPromisePath)};` : "";
 	const specialModuleInitializers = instrumentationPath ? [
 		appFilePath ? `({ default: AppComponent } = await import(${JSON.stringify(appFilePath)}));` : "",
 		docFilePath ? `({ default: DocumentComponent } = await import(${JSON.stringify(docFilePath)}));` : "",
@@ -278,8 +281,8 @@ async function __initializeApplication() {
   _errorPageRoute.module = ErrorPageModule;
   _renderPage = __createRenderPage();
 }
-export function __ensureInstrumentation() {
-  return __applicationInitialization ??= __initializeApplication();
+export function __ensureInstrumentation(ctx) {
+  return __applicationInitialization ??= __shareIsolatePromise(__initializeApplication(), ctx);
 }` : "export function __ensureInstrumentation() {}";
 	const openTelemetryLoaderCode = options.nodeOpenTelemetryLoader ? `import { register as __registerOpenTelemetryLoader } from "node:module";
 const __openTelemetryLoaderKey = Symbol.for("vinext.openTelemetryLoader");
@@ -291,7 +294,7 @@ if (process.env.VINEXT_PRERENDER !== "1" && !globalThis[__openTelemetryLoaderKey
 	const middlewareRuntimeImportCode = includeMiddlewareRuntime ? `import { runGeneratedMiddleware as __runGeneratedMiddleware } from ${JSON.stringify(_middlewareRuntimePath)};` : "";
 	const middlewareExportCode = includeMiddlewareRuntime ? middlewarePath ? `
 export async function runMiddleware(request, ctx, options) {
-  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+  ${instrumentationPath ? "await __ensureInstrumentation(ctx);" : ""}
   return __runGeneratedMiddleware({
     basePath: vinextConfig.basePath,
     ctx,
@@ -307,8 +310,8 @@ export async function runMiddleware(request, ctx, options) {
   });
 }
 ` : `
-export async function runMiddleware(request) {
-  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+export async function runMiddleware(request, ctx) {
+  ${instrumentationPath ? "await __ensureInstrumentation(ctx);" : ""}
   return { continue: true };
 }
 ` : "";
@@ -568,7 +571,7 @@ function __createRenderPage() {
 ${instrumentationPath ? "let _renderPage;" : "const _renderPage = __createRenderPage();"}
 
 export async function renderPage(request, url, manifest, ctx, middlewareHeaders, options, initialResponseHeaders) {
-  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+  ${instrumentationPath ? "await __ensureInstrumentation(ctx);" : ""}
   __registerConfiguredCacheAdapters();
   if (ctx) return _runWithExecutionContext(ctx, () => _renderPage(request, url, manifest, middlewareHeaders, options, initialResponseHeaders));
   return _renderPage(request, url, manifest, middlewareHeaders, options, initialResponseHeaders);
@@ -577,7 +580,7 @@ export async function renderPage(request, url, manifest, ctx, middlewareHeaders,
 
 
 export async function handleApiRoute(request, url, ctx, trustedRevalidateOrigin, edgeRuntime = "worker", initialResponseHeaders) {
-  ${instrumentationPath ? "await __ensureInstrumentation();" : ""}
+  ${instrumentationPath ? "await __ensureInstrumentation(ctx);" : ""}
   __registerConfiguredCacheAdapters();
   const match = matchRoute(url, apiRoutes);
   return __handlePagesApiRoute({

package/dist/index.d.ts

@@ -24,6 +24,17 @@ export type VinextOptions = {
    * @default false
    */
   disableAppRouter?: boolean;
+  /**
+   * Turn off Next.js-like client chunking in App Router production builds.
+   * By default, client components that the same routes use load through one
+   * shared chunk, as they do from Next.js' per-route client entries. Set this
+   * to load each client component from its own chunk instead, for example to
+   * control chunking entirely through your own chunk groups. vinext already
+   * turns this chunking off when the client build has chunk groups other than
+   * its own (`codeSplitting.groups`, `advancedChunks` or `manualChunks`).
+   * @default false
+   */
+  disableNextLikeChunking?: boolean;
   /**
    * Override the output directory for the RSC server bundle.
    * Absolute paths are used as-is; relative paths are resolved from the