vinext 0.1.7 → 0.1.8

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

@@ -30,6 +30,8 @@ const appElementsPath = resolveEntryPath("../server/app-elements.js", import.met
 const appPageRouteWiringPath = resolveEntryPath("../server/app-page-route-wiring.js", import.meta.url);
 const appPageProbePath = resolveEntryPath("../server/app-page-probe.js", import.meta.url);
 const appPageDispatchPath = resolveEntryPath("../server/app-page-dispatch.js", import.meta.url);
+const appPagePprRuntimePath = resolveEntryPath("../server/app-page-ppr-runtime.js", import.meta.url);
+const fileBasedMetadataPath = resolveEntryPath("../server/file-based-metadata.js", import.meta.url);
 const appPageRequestPath = resolveEntryPath("../server/app-page-request.js", import.meta.url);
 const appSegmentConfigPath = resolveEntryPath("../server/app-segment-config.js", import.meta.url);
 const appRscRouteMatchingPath = resolveEntryPath("../server/app-rsc-route-matching.js", import.meta.url);
@@ -129,6 +131,11 @@ ${hasPagesDir ? `import {
 const __loadAppRouteHandlerDispatch = () => import(${JSON.stringify(appRouteHandlerDispatchPath)});
 ${hasServerActions ? `const __loadAppServerActionExecution = () => import(${JSON.stringify(appServerActionExecutionPath)});` : ""}
 ${(metadataRoutes?.length ?? 0) > 0 ? `const __loadMetadataRouteResponse = () => import(${JSON.stringify(metadataRouteResponsePath)});` : ""}
+${(metadataRoutes?.length ?? 0) > 0 ? `const __loadFileBasedMetadata = () => import(${JSON.stringify(fileBasedMetadataPath)});
+async function __applyFileBasedMetadata(...args) {
+  const { applyFileBasedMetadata } = await __loadFileBasedMetadata();
+  return applyFileBasedMetadata(...args);
+}` : ""}
 import {
   sanitizeErrorForClient as __sanitizeErrorForClient,
 } from ${JSON.stringify(appRscErrorsPath)};
@@ -152,6 +159,10 @@ import { buildAppPageProbes as __buildAppPageProbes } from ${JSON.stringify(appP
 import {
   dispatchAppPage as __dispatchAppPage,
 } from ${JSON.stringify(appPageDispatchPath)};
+${cacheComponents ? `import {
+  appPagePprRuntime as __appPagePprRuntime,
+  createAppPprFallbackShells as __createAppPprFallbackShells,
+} from ${JSON.stringify(appPagePprRuntimePath)};` : ""}
 import {
   resolveAppPageGenerateStaticParamsSources as __resolveAppPageGenerateStaticParamsSources,
 } from ${JSON.stringify(appPageRequestPath)};
@@ -234,6 +245,11 @@ function __resolveRouteFetchCacheMode(route) {
   return __resolveAppPageFetchCacheMode({
     layouts: route.layouts,
     page: route.page,
+    parallelSegments: Object.values(route.slots ?? {}).flatMap((slot) => [
+      slot.layout,
+      ...(slot.configLayouts ?? []),
+      slot.page ?? slot.default,
+    ]),
   });
 }
 
@@ -241,6 +257,11 @@ function __resolveRouteDynamicConfig(route) {
   return __resolveAppPageSegmentConfig({
     layouts: route.layouts,
     page: route.page,
+    parallelSegments: Object.values(route.slots ?? {}).flatMap((slot) => [
+      slot.layout,
+      ...(slot.configLayouts ?? []),
+      slot.page ?? slot.default,
+    ]),
   }).dynamicConfig ?? null;
 }
 
@@ -248,6 +269,11 @@ function __resolveRouteRuntime(route) {
   return __resolveAppPageSegmentConfig({
     layouts: route.layouts,
     page: route.page,
+    parallelSegments: Object.values(route.slots ?? {}).flatMap((slot) => [
+      slot.layout,
+      ...(slot.configLayouts ?? []),
+      slot.page ?? slot.default,
+    ]),
   }).runtime ?? null;
 }
 
@@ -317,6 +343,7 @@ const createRscOnErrorHandler = (request, pathname, routePath) =>
   createAppRscOnErrorHandler(_reportRequestError, request, pathname, routePath);
 
 const __fallbackRenderer = __createAppFallbackRenderer({
+  ${(metadataRoutes?.length ?? 0) > 0 ? "applyFileBasedMetadata: __applyFileBasedMetadata," : ""}
   basePath: __basePath,
   trailingSlash: __trailingSlash,
   rootBoundaries: {
@@ -366,6 +393,7 @@ async function buildPageElements(route, params, routePath, pageRequest, layoutPa
   // Hydrate lazy page/route-handler modules before any synchronous read.
   await __ensureRouteLoaded(route);
   return __buildPageElements({
+    ${(metadataRoutes?.length ?? 0) > 0 ? "applyFileBasedMetadata: __applyFileBasedMetadata," : ""}
     route,
     params,
     routePath,
@@ -401,7 +429,6 @@ export const __assetPrefix = ${JSON.stringify(assetPrefix)};
 export const __inlineCss = ${JSON.stringify(inlineCss)};
 export const __hasPagesDir = ${JSON.stringify(hasPagesDir)};
 export const getRenderedConcreteUrlPathsForRoute = __getRenderedConcreteUrlPathsForRoute;
-const __cacheComponents = ${JSON.stringify(cacheComponents)};
 
 export async function seedMemoryCacheFromPrerender(serverDir) {
   const { seedMemoryCacheFromPrerender: __seedMemoryCacheFromPrerender } =
@@ -456,7 +483,9 @@ export default createAppRscHandler({
   },
   registerCacheAdapters: __registerConfiguredCacheAdapters,
   configHeaders: __configHeaders,
-  cacheComponents: __cacheComponents,
+  ${cacheComponents ? `createPprFallbackShells(route, params) {
+    return __createAppPprFallbackShells(route, params);
+  },` : ""}
   configRedirects: __configRedirects,
   configRewrites: __configRewrites,
   imageConfig: __imageConfig,
@@ -492,7 +521,12 @@ export default createAppRscHandler({
     const __segmentConfig = __resolveAppPageSegmentConfig({
       layouts: route.layouts,
       page: route.page,
-      parallelPages: Object.values(route.slots ?? {}).map((slot) => slot.page),
+      parallelPages: Object.values(route.slots ?? {}).map((slot) => slot.page ?? slot.default),
+      parallelSegments: Object.values(route.slots ?? {}).flatMap((slot) => [
+        slot.layout,
+        ...(slot.configLayouts ?? []),
+        slot.page ?? slot.default,
+      ]),
     });
     const __generateStaticParams = __resolveAppPageGenerateStaticParamsSources({
       layouts: route.layouts,
@@ -506,7 +540,7 @@ export default createAppRscHandler({
       ensureRouteLoaded: __ensureRouteLoaded,
       clientTraceMetadata: __clientTraceMetadata,
       reactMaxHeadersLength: __reactMaxHeadersLength,
-      buildPageElement(targetRoute, targetParams, targetOpts, targetSearchParams, layoutParamAccess) {
+      buildPageElement(targetRoute, targetParams, targetOpts, targetSearchParams, layoutParamAccess, buildOptions) {
         return buildPageElements(targetRoute, targetParams, cleanPathname, {
           opts: targetOpts,
           searchParams: targetSearchParams,
@@ -514,6 +548,8 @@ export default createAppRscHandler({
           request,
           mountedSlotsHeader,
           renderMode,
+          observeMetadataSearchParamsAccess: buildOptions?.observeMetadataSearchParamsAccess === true,
+          observePageSearchParamsAccess: buildOptions?.observePageSearchParamsAccess === true,
         }, layoutParamAccess, displayPathname);
       },
       clientReuseManifest,
@@ -570,6 +606,7 @@ export default createAppRscHandler({
       params,
       pprFallbackCacheShells,
       pprFallbackShell,
+      pprRuntime: ${cacheComponents ? "__appPagePprRuntime" : "undefined"},
       renderedConcreteUrlPaths,
       skipStaticParamsValidation,
       staticParamsValidationParams,
@@ -583,7 +620,7 @@ export default createAppRscHandler({
           route,
         });
       },
-      async probePage() {
+      async probePage(probeSearchParams = searchParams) {
         const __probeIntercept = findIntercept(cleanPathname, interceptionContext);
         // The intercepting-route page module is lazy (page: null + __pageLoader).
         // Resolve it before probing so buildAppPageProbes inspects the real page
@@ -598,21 +635,21 @@ export default createAppRscHandler({
           route,
           pageComponent: PageComponent,
           asyncRouteParams: _asyncRouteParams,
-          searchParams,
+          searchParams: probeSearchParams,
           intercept: __probeIntercept,
           isRscRequest,
           matchedParams: params,
           makeThenableParams,
         }));
       },
-      renderErrorBoundaryPage(renderErr) {
+      renderErrorBoundaryPage(renderErr, errorOrigin) {
         const __activeIntercept = findIntercept(cleanPathname, interceptionContext);
         return __fallbackRenderer.renderErrorBoundary(route, renderErr, isRscRequest, request, params, scriptNonce, middlewareContext, {
           isEdgeRuntime: __isEdgeRuntime(__segmentConfig.runtime),
           sourcePageSegments: __activeIntercept?.slotKey === __SIBLING_PAGE_INTERCEPT_SLOT_KEY
             ? __activeIntercept.sourcePageSegments
             : null,
-        });
+        }, errorOrigin);
       },
       renderHttpAccessFallbackPage(statusCode, opts, currentMiddlewareContext) {
         const __activeIntercept = findIntercept(cleanPathname, interceptionContext);
@@ -762,7 +799,7 @@ export default createAppRscHandler({
     const __actionMatch = matchRoute(cleanPathname);
     if (__actionMatch) await __ensureRouteLoaded(__actionMatch.route);
     const __actionIsEdgeRuntime = __actionMatch
-      ? __isEdgeRuntime(__resolveAppPageSegmentConfig({ layouts: __actionMatch.route.layouts, page: __actionMatch.route.page }).runtime)
+      ? __isEdgeRuntime(__resolveRouteRuntime(__actionMatch.route))
       : false;
     return __handleServerActionRscRequest({
       actionId,
@@ -780,6 +817,8 @@ export default createAppRscHandler({
         request: actionRequest,
         mountedSlotsHeader: actionMountedSlotsHeader,
         renderMode: actionRenderMode,
+        observeMetadataSearchParamsAccess,
+        observePageSearchParamsAccess,
       }) {
         return buildPageElements(actionRoute, actionParams, actionCleanPathname, {
           opts: interceptOpts,
@@ -788,6 +827,8 @@ export default createAppRscHandler({
           request: actionRequest,
           mountedSlotsHeader: actionMountedSlotsHeader,
           renderMode: actionRenderMode,
+          observeMetadataSearchParamsAccess: observeMetadataSearchParamsAccess === true,
+          observePageSearchParamsAccess: observePageSearchParamsAccess === true,
         });
       },
       cleanPathname,
@@ -813,6 +854,7 @@ export default createAppRscHandler({
       },
       createTemporaryReferenceSet,
       decodeReply,
+      draftModeSecret: __draftModeSecret,
       findIntercept(pathnameToMatch) {
         return findIntercept(pathnameToMatch, interceptionContext);
       },
@@ -856,6 +898,8 @@ export default createAppRscHandler({
         return {
           interceptionContext,
           interceptLayouts: intercept.interceptLayouts,
+          interceptLayoutSegments: intercept.interceptLayoutSegments,
+          interceptBranchSegments: intercept.interceptBranchSegments,
           interceptSlotId: intercept.slotId,
           interceptSlotKey: intercept.slotKey,
           interceptSourceMatchedUrl: interceptionContext,
@@ -895,7 +939,7 @@ export default createAppRscHandler({
   },` : ""}
   publicFiles: __publicFiles,
   renderNotFound({ isRscRequest, matchedParams, middlewareContext, request, route, scriptNonce }) {
-    const __isEdge = route ? __isEdgeRuntime(__resolveAppPageSegmentConfig({ layouts: route.layouts, page: route.page }).runtime) : false;
+    const __isEdge = route ? __isEdgeRuntime(__resolveRouteRuntime(route)) : false;
     return __fallbackRenderer.renderNotFound(route, isRscRequest, request, matchedParams, scriptNonce, middlewareContext, { isEdgeRuntime: __isEdge });
   },
   ${hasPagesDir ? `async renderPagesFallback({ allowRscDocumentFallback, appRouteMatch, isDataRequest, isRscRequest, matchKind, middlewareContext, pathname, pagesDataRequest, request, url }) {

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

@@ -74,6 +74,7 @@ function registerRouteModules(routes, imports) {
 			if (slot.pagePath) imports.getLazyLoaderVar(slot.pagePath);
 			if (slot.defaultPath) imports.getLazyLoaderVar(slot.defaultPath);
 			if (slot.layoutPath) imports.getLazyLoaderVar(slot.layoutPath);
+			for (const layoutPath of slot.configLayoutPaths ?? []) imports.getLazyLoaderVar(layoutPath);
 			if (slot.loadingPath) imports.getLazyLoaderVar(slot.loadingPath);
 			if (slot.errorPath) imports.getLazyLoaderVar(slot.errorPath);
 			for (const ir of slot.interceptingRoutes) {
@@ -112,6 +113,8 @@ function buildRouteEntries(routes, imports) {
       slotId: ${JSON.stringify(ir.slotId ?? null)},
       interceptLayouts: ${moduleArray(ir.layoutPaths.length)},
       __loadInterceptLayouts: ${lazyLoaderArray(ir.layoutPaths, imports)},
+      interceptLayoutSegments: ${JSON.stringify(ir.layoutSegments ?? [])},
+      interceptBranchSegments: ${JSON.stringify(ir.branchSegments ?? [])},
       page: null,
       __pageLoader: ${imports.getLazyLoaderVar(ir.pagePath)},
       params: ${JSON.stringify(ir.params)},
@@ -124,6 +127,8 @@ function buildRouteEntries(routes, imports) {
           sourcePageSegments: ${JSON.stringify(ir.sourcePageSegments)},
           interceptLayouts: ${moduleArray(ir.layoutPaths.length)},
           __loadInterceptLayouts: ${lazyLoaderArray(ir.layoutPaths, imports)},
+          interceptLayoutSegments: ${JSON.stringify(ir.layoutSegments ?? [])},
+          interceptBranchSegments: ${JSON.stringify(ir.branchSegments ?? [])},
           page: null,
           __pageLoader: ${imports.getLazyLoaderVar(ir.pagePath)},
           params: ${JSON.stringify(ir.params)},
@@ -137,6 +142,9 @@ function buildRouteEntries(routes, imports) {
         __loadDefault: ${slot.defaultPath ? imports.getLazyLoaderVar(slot.defaultPath) : "null"},
         layout: null,
         __loadLayout: ${slot.layoutPath ? imports.getLazyLoaderVar(slot.layoutPath) : "null"},
+        configLayouts: ${moduleArray(slot.configLayoutPaths?.length ?? 0)},
+        __loadConfigLayouts: ${lazyLoaderArray(slot.configLayoutPaths ?? [], imports)},
+        configLayoutTreePositions: ${JSON.stringify(slot.configLayoutTreePositions ?? [])},
         loading: null,
         __loadLoading: ${slot.loadingPath ? imports.getLazyLoaderVar(slot.loadingPath) : "null"},
         error: null,

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

@@ -2,6 +2,7 @@ import { normalizePathSeparators } from "../utils/path.js";
 import { findFileWithExts } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { apiRouter, pagesRouter } from "../routing/pages-router.js";
+import "./pages-entry-helpers.js";
 //#region src/entries/pages-client-entry.ts
 /**
 * Pages Router client hydration entry generator.

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

@@ -3,6 +3,7 @@ import { findFileWithExts } from "../routing/file-matcher.js";
 import { apiRouter, pagesRouter } from "../routing/pages-router.js";
 import { resolveEntryPath } from "./runtime-entry-module.js";
 import { isProxyFile } from "../server/middleware.js";
+import "./pages-entry-helpers.js";
 //#region src/entries/pages-server-entry.ts
 /**
 * Pages Router server entry generator.

package/dist/index.js

@@ -1,7 +1,7 @@
 import { detectPackageManager } from "./utils/project.js";
-import { normalizePathSeparators, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { escapeRegExp } from "./utils/regex.js";
+import { normalizePathSeparators, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, normalizeViteResolveExtensions } from "./routing/file-matcher.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
@@ -35,6 +35,7 @@ import { resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
 import { getDepOptimizeNodeEnvOptions, getViteMajorVersion, serializeViteDefine } from "./utils/vite-version.js";
 import { createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
+import { mergeServerExternalPackages } from "./config/server-external-packages.js";
 import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.js";
 import { precompressAssets } from "./build/precompress.js";
 import { ensureAssetsIgnore } from "./build/assets-ignore.js";
@@ -85,7 +86,6 @@ import { pathToFileURL } from "node:url";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import commonjs from "vite-plugin-commonjs";
 import MagicString from "magic-string";
-import tsconfigPaths from "vite-tsconfig-paths";
 //#region src/index.ts
 installSocketErrorBackstop();
 function getCacheDirPrefix(cacheDir) {
@@ -138,6 +138,11 @@ function resolveOptionalDependency(projectRoot, specifier) {
 	} catch {}
 	return null;
 }
+async function loadVite7TsconfigPathsPlugin(projectRoot) {
+	const resolvedPath = resolveOptionalDependency(projectRoot, "vite-tsconfig-paths");
+	if (!resolvedPath) throw new Error("[vinext] Vite 7 requires the optional peer dependency vite-tsconfig-paths for tsconfig path alias support. Install vite-tsconfig-paths or upgrade to Vite 8.");
+	return (await import(pathToFileURL(resolvedPath).href)).default();
+}
 function resolveShimModulePath(shimsDir, moduleName) {
 	for (const ext of [
 		".ts",
@@ -303,6 +308,8 @@ const VIRTUAL_APP_SSR_ENTRY = "virtual:vinext-app-ssr-entry";
 const RESOLVED_APP_SSR_ENTRY = "\0virtual:vinext-app-ssr-entry";
 const VIRTUAL_APP_BROWSER_ENTRY = "virtual:vinext-app-browser-entry";
 const RESOLVED_APP_BROWSER_ENTRY = "\0virtual:vinext-app-browser-entry";
+const VIRTUAL_APP_CAPABILITIES = "virtual:vinext-app-capabilities";
+const RESOLVED_APP_CAPABILITIES = "\0virtual:vinext-app-capabilities";
 const RESOLVED_ROOT_PARAMS = "\0virtual:vinext-root-params";
 /** Virtual module that registers config-driven cache adapters (see VinextOptions.cache). */
 const RESOLVED_CACHE_ADAPTERS = "\0" + VIRTUAL_CACHE_ADAPTERS;
@@ -332,6 +339,7 @@ function createStaticImageAsset(imagePath) {
 */
 const _shimsDir = normalizePathSeparators(path.resolve(__dirname, "shims")) + "/";
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
+const _appBrowserServerActionClientPath = resolveShimModulePath(normalizePathSeparators(path.resolve(__dirname, "server")), "app-browser-server-action-client");
 const _appRscHandlerPath = resolveShimModulePath(normalizePathSeparators(path.resolve(__dirname, "server")), "app-rsc-handler");
 const _canExternalizeAppRscHandler = _appRscHandlerPath.endsWith(".js");
 function isValidExportIdentifier(name) {
@@ -531,6 +539,13 @@ function vinext(options = {}) {
 			throw new Error("vinext: Failed to load @vitejs/plugin-rsc.", { cause });
 		});
 	}
+	async function resolveHasServerActions(config) {
+		if (config.command !== "build" || !rscPluginModulePromise) return true;
+		const { getPluginApi } = await rscPluginModulePromise;
+		const pluginApi = getPluginApi(config);
+		if (!pluginApi || pluginApi.manager.isScanBuild) return true;
+		return Object.keys(pluginApi.manager.serverReferenceMetaMap).length > 0;
+	}
 	const reactOptions = options.react && options.react !== true ? options.react : void 0;
 	let reactPluginPromise = null;
 	if (options.react !== false) {
@@ -576,7 +591,7 @@ function vinext(options = {}) {
 		return mdxDelegatePromise;
 	}
 	const plugins = [
-		...viteMajorVersion >= 8 ? [] : [tsconfigPaths()],
+		...viteMajorVersion >= 8 ? [] : [loadVite7TsconfigPathsPlugin(earlyBaseDir)],
 		reactPluginPromise,
 		commonjs(),
 		...viteMajorVersion >= 8 ? [{
@@ -606,6 +621,10 @@ function vinext(options = {}) {
 		createMiddlewareServerOnlyPlugin({
 			getMiddlewarePath: () => middlewarePath,
 			getCanonicalMiddlewarePath: () => middlewarePath ? tryRealpathSync(middlewarePath) ?? middlewarePath : null,
+			isNeutralServerModule: (id) => {
+				const canonicalId = canonicalizePageTransformPath(id);
+				return isWithinPagesDirectory(canonicalId) && isApiPage(canonicalId);
+			},
 			serverOnlyShimPath: resolveShimModulePath(shimsDir, "server-only")
 		}),
 		dataUrlCssPlugin(),
@@ -681,6 +700,7 @@ function vinext(options = {}) {
 					defines[`process.env.${key}`] = JSON.stringify(value);
 				}
 				defines["process.env.__NEXT_ROUTER_BASEPATH"] = JSON.stringify(nextConfig.basePath);
+				defines["process.env.__VINEXT_HAS_PAGES_ROUTER"] = JSON.stringify(String(hasPagesDir));
 				defines["process.env.__NEXT_CLIENT_ROUTER_STATIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.static));
 				defines["process.env.__VINEXT_PREFETCH_INLINING"] = JSON.stringify(nextConfig.prefetchInlining ? "true" : "false");
 				defines["process.env.__NEXT_GESTURE_TRANSITION"] = JSON.stringify(nextConfig.gestureTransition);
@@ -800,6 +820,7 @@ function vinext(options = {}) {
 				hasUserMdxPlugin = pluginsFlat.some((p) => p && typeof p === "object" && "name" in p && typeof p.name === "string" && (p.name === "@mdx-js/rollup" || p.name === "mdx"));
 				if (!hasUserMdxPlugin && hasMdxFiles(root, hasAppDir ? appDir : null, hasPagesDir ? pagesDir : null)) await ensureMdxDelegate("detected");
 				const isSSR = !!config.build?.ssr;
+				const nextServerExternal = mergeServerExternalPackages(nextConfig?.serverExternalPackages, nextConfig?.transpilePackages);
 				const isMultiEnv = hasAppDir || hasCloudflarePlugin || hasNitroPlugin;
 				const hasBuildInput = getBuildBundlerOptions(config.build)?.input !== void 0;
 				const shouldInjectPlainPagesEnvironments = !hasAppDir && !hasCloudflarePlugin && !isSSR && !hasBuildInput;
@@ -850,7 +871,9 @@ function vinext(options = {}) {
 							"react",
 							"react-dom",
 							"react-dom/server",
-							"ipaddr.js"
+							"ipaddr.js",
+							...Array.isArray(config.ssr?.external) ? config.ssr.external : [],
+							...nextServerExternal
 						],
 						noExternal: true
 					} },
@@ -895,7 +918,6 @@ function vinext(options = {}) {
 						...cssModulesOverride
 					}
 				};
-				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 ?? [];
@@ -1031,7 +1053,8 @@ function vinext(options = {}) {
 								"react",
 								"react-dom",
 								"react-dom/server",
-								"ipaddr.js"
+								"ipaddr.js",
+								...nextServerExternal
 							],
 							noExternal: true
 						},
@@ -1102,7 +1125,7 @@ function vinext(options = {}) {
 			resolveId: {
 				filter: { id: /(?:next\/|vinext\/(?:shims\/|server\/app-rsc-handler)|virtual:vinext-|@vercel\/og(?:\.js)?$)/ },
 				handler(id, importer) {
-					const cleanId = id.startsWith("\0") ? id.slice(1) : id;
+					const cleanId = normalizePathSeparators(id.startsWith("\0") ? id.slice(1) : id);
 					if (cleanId === "vinext/server/app-rsc-handler") {
 						if (_canExternalizeAppRscHandler && this.environment?.name === "rsc" && this.environment.config?.command === "serve") return {
 							id: _appRscHandlerPath,
@@ -1114,18 +1137,19 @@ function vinext(options = {}) {
 					if (cleanId.startsWith("vinext/shims/")) return resolveShimModulePath(_shimsDir, stripJsExtension(stripViteModuleQuery(cleanId.slice(13))));
 					if (cleanId === VIRTUAL_SERVER_ENTRY) return RESOLVED_SERVER_ENTRY;
 					if (cleanId === VIRTUAL_CLIENT_ENTRY) return RESOLVED_CLIENT_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-server-entry") || cleanId.endsWith("\\virtual:vinext-server-entry")) return RESOLVED_SERVER_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-client-entry") || cleanId.endsWith("\\virtual:vinext-client-entry")) return RESOLVED_CLIENT_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-server-entry")) return RESOLVED_SERVER_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-client-entry")) return RESOLVED_CLIENT_ENTRY;
 					if (cleanId === VIRTUAL_RSC_ENTRY) return RESOLVED_RSC_ENTRY;
 					if (cleanId === VIRTUAL_APP_SSR_ENTRY) return RESOLVED_APP_SSR_ENTRY;
 					if (cleanId === VIRTUAL_APP_BROWSER_ENTRY) return RESOLVED_APP_BROWSER_ENTRY;
+					if (cleanId === VIRTUAL_APP_CAPABILITIES) return RESOLVED_APP_CAPABILITIES;
 					if (cleanId === "next/root-params" || cleanId === "next/root-params.js") return RESOLVED_ROOT_PARAMS;
-					if (cleanId === "virtual:vinext-cache-adapters" || cleanId.endsWith("/virtual:vinext-cache-adapters") || cleanId.endsWith("\\virtual:vinext-cache-adapters")) return RESOLVED_CACHE_ADAPTERS;
+					if (cleanId === "virtual:vinext-cache-adapters" || cleanId.endsWith("/virtual:vinext-cache-adapters")) return RESOLVED_CACHE_ADAPTERS;
 					if (cleanId.startsWith("virtual:vinext-google-fonts?")) return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(VIRTUAL_GOOGLE_FONTS.length);
-					if (cleanId.endsWith("/virtual:vinext-rsc-entry") || cleanId.endsWith("\\virtual:vinext-rsc-entry")) return RESOLVED_RSC_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-app-ssr-entry") || cleanId.endsWith("\\virtual:vinext-app-ssr-entry")) return RESOLVED_APP_SSR_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-app-browser-entry") || cleanId.endsWith("\\virtual:vinext-app-browser-entry")) return RESOLVED_APP_BROWSER_ENTRY;
-					if (cleanId.includes("/virtual:vinext-google-fonts?") || cleanId.includes("\\virtual:vinext-google-fonts?")) {
+					if (cleanId.endsWith("/virtual:vinext-rsc-entry")) return RESOLVED_RSC_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-app-ssr-entry")) return RESOLVED_APP_SSR_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-app-browser-entry")) return RESOLVED_APP_BROWSER_ENTRY;
+					if (cleanId.includes("/virtual:vinext-google-fonts?")) {
 						const queryIndex = cleanId.indexOf(VIRTUAL_GOOGLE_FONTS + "?");
 						return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(queryIndex + VIRTUAL_GOOGLE_FONTS.length);
 					}
@@ -1139,12 +1163,7 @@ 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 hasServerActions = await resolveHasServerActions(this.environment.config);
 					const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
 					const globalNotFoundPath = findFileWithExts(appDir, "global-not-found", fileMatcher);
 					rscClassificationManifest = collectRouteClassificationManifest(routes);
@@ -1194,6 +1213,13 @@ function vinext(options = {}) {
 					}))] : [];
 					return generateBrowserEntry(graph.routes, graph.routeManifest, pagesPrefetchRoutes, nextConfig.rewrites);
 				}
+				if (id === RESOLVED_APP_CAPABILITIES && hasAppDir) {
+					const hasServerActions = await resolveHasServerActions(this.environment.config);
+					return `
+export const hasServerActions = ${JSON.stringify(hasServerActions)};
+export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.stringify(_appBrowserServerActionClientPath)})` : "null"};
+`;
+				}
 				if (id.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
 			},
 			// @vitejs/plugin-rsc runs the RSC environment build in two phases:

package/dist/init.js

@@ -1,5 +1,6 @@
 import { detectPackageManager, detectPackageManagerName, ensureESModule, hasAppDir, hasViteConfig, renameCJSConfigs } from "./utils/project.js";
 import { formatReport, runCheck } from "./check.js";
+import { normalizePathSeparators } from "./utils/path.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
@@ -176,7 +177,7 @@ function updateGitignore(root) {
 	return true;
 }
 async function init(options) {
-	const root = path.resolve(options.root);
+	const root = normalizePathSeparators(path.resolve(options.root));
 	const port = options.port ?? 3001;
 	const exec = options._exec ?? ((cmd, opts) => {
 		const [program, ...args] = cmd.split(" ");

package/dist/plugins/middleware-server-only.d.ts

@@ -2,8 +2,8 @@ import { Plugin } from "vite";
 
 //#region src/plugins/middleware-server-only.d.ts
 /**
- * Allow `import 'server-only'` from middleware (and any module reachable
- * from middleware) in the SSR environment.
+ * Allow `import 'server-only'` from neutral server targets (and any module
+ * reachable from them) in the SSR environment.
  *
  * Background: middleware runs server-side, so importing `server-only` is
  * semantically correct. However, vinext bundles middleware into the SSR
@@ -13,9 +13,9 @@ import { Plugin } from "vite";
  *
  *   'server-only' cannot be imported in client build ('ssr' environment)
  *
- * Next.js solves this with webpack `issuerLayer` rules: middleware (and
- * `instrumentation`) sit in the `neutralTarget` layer where `server-only`
- * is aliased to a no-op while `client-only` still errors. See
+ * Next.js solves this with webpack `issuerLayer` rules: middleware,
+ * instrumentation, and Pages API routes sit in server-only or neutral layers
+ * where `server-only` is aliased to a no-op while `client-only` still errors. See
  *   packages/next/src/build/webpack-config.ts ("Alias server-only and
  *   client-only to proper exports based on bundling layers")
  *
@@ -23,7 +23,8 @@ import { Plugin } from "vite";
  * the behavior with import-chain taint tracking:
  *
  *   1. Seed a `tainted` set with the middleware entry path (and its
- *      canonical realpath).
+ *      canonical realpath), and recognize other neutral server entry modules
+ *      such as Pages API routes through `isNeutralServerModule`.
  *   2. For every resolveId call from a tainted importer, resolve the import
  *      via `this.resolve(..., { skipSelf: true })` and add the resolved id
  *      to the tainted set. This propagates the taint along the import graph
@@ -47,6 +48,7 @@ import { Plugin } from "vite";
 declare function createMiddlewareServerOnlyPlugin(options: {
   getMiddlewarePath: () => string | null;
   getCanonicalMiddlewarePath: () => string | null;
+  isNeutralServerModule?: (id: string) => boolean;
   serverOnlyShimPath: string;
 }): Plugin;
 //#endregion

package/dist/plugins/middleware-server-only.js

@@ -1,8 +1,8 @@
 import { normalizePathSeparators } from "../utils/path.js";
 //#region src/plugins/middleware-server-only.ts
 /**
-* Allow `import 'server-only'` from middleware (and any module reachable
-* from middleware) in the SSR environment.
+* Allow `import 'server-only'` from neutral server targets (and any module
+* reachable from them) in the SSR environment.
 *
 * Background: middleware runs server-side, so importing `server-only` is
 * semantically correct. However, vinext bundles middleware into the SSR
@@ -12,9 +12,9 @@ import { normalizePathSeparators } from "../utils/path.js";
 *
 *   'server-only' cannot be imported in client build ('ssr' environment)
 *
-* Next.js solves this with webpack `issuerLayer` rules: middleware (and
-* `instrumentation`) sit in the `neutralTarget` layer where `server-only`
-* is aliased to a no-op while `client-only` still errors. See
+* Next.js solves this with webpack `issuerLayer` rules: middleware,
+* instrumentation, and Pages API routes sit in server-only or neutral layers
+* where `server-only` is aliased to a no-op while `client-only` still errors. See
 *   packages/next/src/build/webpack-config.ts ("Alias server-only and
 *   client-only to proper exports based on bundling layers")
 *
@@ -22,7 +22,8 @@ import { normalizePathSeparators } from "../utils/path.js";
 * the behavior with import-chain taint tracking:
 *
 *   1. Seed a `tainted` set with the middleware entry path (and its
-*      canonical realpath).
+*      canonical realpath), and recognize other neutral server entry modules
+*      such as Pages API routes through `isNeutralServerModule`.
 *   2. For every resolveId call from a tainted importer, resolve the import
 *      via `this.resolve(..., { skipSelf: true })` and add the resolved id
 *      to the tainted set. This propagates the taint along the import graph
@@ -72,7 +73,7 @@ function createMiddlewareServerOnlyPlugin(options) {
 			async handler(id, importer, opts) {
 				if (this.environment?.name === "rsc") return;
 				if (!importer) return;
-				if (!isTainted(importer)) return;
+				if (!isTainted(importer) && !options.isNeutralServerModule?.(canonicalizeId(importer))) return;
 				if (id === "server-only") return {
 					id: options.serverOnlyShimPath,
 					moduleSideEffects: false

package/dist/plugins/optimize-imports.js

@@ -1,5 +1,5 @@
-import { normalizePathSeparators } from "../utils/path.js";
 import { escapeRegExp } from "../utils/regex.js";
+import { normalizePathSeparators } from "../utils/path.js";
 import { VIRTUAL_MODULE_ID_RE } from "../utils/virtual-module.js";
 import { getAstName } from "./ast-utils.js";
 import { createRequire } from "node:module";

package/dist/routing/app-route-graph.d.ts

@@ -23,7 +23,9 @@ type InterceptingRoute = {
   sourceMatchPattern: string; /** Absolute path to the intercepting page component */
   pagePath: string; /** Filesystem segments from app/ root to the intercepting page directory. */
   sourcePageSegments?: string[]; /** Absolute layout paths inside the intercepting route tree, outermost to innermost */
-  layoutPaths: string[]; /** Parameter names for dynamic segments */
+  layoutPaths: string[]; /** Normalized branch segments accumulated at each intercept layout. */
+  layoutSegments?: string[][]; /** Full normalized interception branch segments through the page. */
+  branchSegments?: string[]; /** Parameter names for dynamic segments */
   params: string[];
   /**
    * Synthetic page-carrier slot id for sibling (slot-less) interception.
@@ -40,7 +42,9 @@ type ParallelSlot = {
   hasPage: boolean; /** Absolute path to the slot's page component */
   pagePath: string | null; /** Absolute path to the slot's default.tsx fallback */
   defaultPath: string | null; /** Absolute path to the slot's layout component (wraps slot content) */
-  layoutPath: string | null; /** Absolute path to the slot's loading component */
+  layoutPath: string | null; /** Nested active-branch layouts whose exports contribute route config. */
+  configLayoutPaths?: string[]; /** Tree positions of configLayoutPaths relative to the slot root. */
+  configLayoutTreePositions?: number[]; /** Absolute path to the slot's loading component */
   loadingPath: string | null; /** Absolute path to the slot's error component */
   errorPath: string | null; /** Intercepting routes within this slot */
   interceptingRoutes: InterceptingRoute[];