vinext 0.1.6 → 0.1.8

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) {
@@ -420,12 +428,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 +519,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,
@@ -524,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) {
@@ -569,7 +591,7 @@ function vinext(options = {}) {
 		return mdxDelegatePromise;
 	}
 	const plugins = [
-		...viteMajorVersion >= 8 ? [] : [tsconfigPaths()],
+		...viteMajorVersion >= 8 ? [] : [loadVite7TsconfigPathsPlugin(earlyBaseDir)],
 		reactPluginPromise,
 		commonjs(),
 		...viteMajorVersion >= 8 ? [{
@@ -599,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(),
@@ -674,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);
@@ -793,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;
@@ -843,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
 					} },
@@ -888,8 +918,8 @@ 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 ?? [];
 				const incomingInclude = config.optimizeDeps?.include ?? [];
 				const depOptimizeAliasPlugin = {
@@ -944,11 +974,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 +1011,7 @@ function vinext(options = {}) {
 								assetsInlineLimit: clientAssetsInlineLimit,
 								...withBuildBundlerOptions(viteMajorVersion, {
 									input: appClientInput,
-									output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
+									output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir, true),
 									treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
 								})
 							}
@@ -1019,7 +1053,8 @@ function vinext(options = {}) {
 								"react",
 								"react-dom",
 								"react-dom/server",
-								"ipaddr.js"
+								"ipaddr.js",
+								...nextServerExternal
 							],
 							noExternal: true
 						},
@@ -1090,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,
@@ -1102,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);
 					}
@@ -1127,6 +1163,7 @@ function vinext(options = {}) {
 				if (id === RESOLVED_RSC_ENTRY && hasAppDir) {
 					const routes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
 					const metaRoutes = scanMetadataFiles(appDir);
+					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);
@@ -1146,6 +1183,7 @@ function vinext(options = {}) {
 						cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
 						inlineCss: nextConfig?.inlineCss,
 						cacheComponents: nextConfig?.cacheComponents,
+						hasServerActions,
 						i18n: nextConfig?.i18n,
 						imageConfig: {
 							deviceSizes: nextConfig?.images?.deviceSizes,
@@ -1175,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:
@@ -1304,15 +1349,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 +1407,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 +1893,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 +2121,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 +2207,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 +2247,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/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/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/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/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/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[];