vinext 0.0.41 → 0.0.42

package/dist/index.js

@@ -3,7 +3,7 @@ import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { createValidFileMatcher } from "./routing/file-matcher.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { buildRequestHeadersFromMiddlewareResponse } from "./server/middleware-request-headers.js";
-import { isExternalUrl, matchConfigPattern, matchHeaders, matchRedirect, matchRewrite, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "./config/config-matchers.js";
+import { isExternalUrl, matchHeaders, matchRedirect, matchRewrite, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "./config/config-matchers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { findMiddlewareFile, runMiddleware } from "./server/middleware.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
@@ -19,21 +19,28 @@ import { validateDevRequest } from "./server/dev-origin-check.js";
 import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
 import { generateBrowserEntry } from "./entries/app-browser-entry.js";
+import { buildGenerateBundleReplacement, buildReasonsReplacement, collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
+import { classifyLayoutByModuleGraph, isStaticModuleGraphResult, moduleGraphReason } from "./build/layout-classification.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
 import { findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
 import { precompressAssets } from "./build/precompress.js";
 import { scanMetadataFiles } from "./server/metadata-routes.js";
-import { manifestFileWithBase, manifestFilesWithBase, normalizeManifestFile } from "./utils/manifest-paths.js";
+import { manifestFileWithBase, manifestFilesWithBase } from "./utils/manifest-paths.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
 import { createInstrumentationClientTransformPlugin } from "./plugins/instrumentation-client.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
-import { fixUseServerClosureCollisionPlugin } from "./plugins/fix-use-server-closure-collision.js";
 import { createOgInlineFetchAssetsPlugin, ogAssetsPlugin } from "./plugins/og-assets.js";
 import { createServerExternalsManifestPlugin } from "./plugins/server-externals-manifest.js";
-import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, _findBalancedObject, _findCallEnd, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
+import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
 import { computeLazyChunks } from "./utils/lazy-chunks.js";
 import { formatMissingCloudflarePluginError, hasWranglerConfig } from "./deploy.js";
+import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
+import { createClientCodeSplittingConfig, createClientManualChunks, createClientOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
+import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
+import { stripServerExports } from "./plugins/strip-server-exports.js";
+import { hasMdxFiles } from "./utils/mdx-scan.js";
+import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
@@ -172,34 +179,6 @@ function getViteMajorVersion() {
 		return 7;
 	}
 }
-/**
-* PostCSS config file names to search for, in priority order.
-* Matches the same search order as postcss-load-config / lilconfig.
-*/
-const POSTCSS_CONFIG_FILES = [
-	"postcss.config.js",
-	"postcss.config.cjs",
-	"postcss.config.mjs",
-	"postcss.config.ts",
-	"postcss.config.cts",
-	"postcss.config.mts",
-	".postcssrc",
-	".postcssrc.js",
-	".postcssrc.cjs",
-	".postcssrc.mjs",
-	".postcssrc.ts",
-	".postcssrc.cts",
-	".postcssrc.mts",
-	".postcssrc.json",
-	".postcssrc.yaml",
-	".postcssrc.yml"
-];
-/**
-* Module-level cache for resolvePostcssStringPlugins — avoids re-scanning per Vite environment.
-* Stores the Promise itself so concurrent calls (RSC/SSR/Client config() hooks firing in
-* parallel) all await the same in-flight scan rather than each starting their own.
-*/
-const _postcssCache = /* @__PURE__ */ new Map();
 const _tsconfigAliasCache = /* @__PURE__ */ new Map();
 function resolveTsconfigAliases(projectRoot) {
 	if (_tsconfigAliasCache.has(projectRoot)) return _tsconfigAliasCache.get(projectRoot);
@@ -213,63 +192,6 @@ function resolveTsconfigAliases(projectRoot) {
 	_tsconfigAliasCache.set(projectRoot, aliases);
 	return aliases;
 }
-/**
-* Resolve PostCSS string plugin names in a project's PostCSS config.
-*
-* Next.js (via postcss-load-config) resolves string plugin names in the
-* object form `{ plugins: { "pkg-name": opts } }` but NOT in the array form
-* `{ plugins: ["pkg-name"] }`. Since many Next.js projects use the array
-* form (particularly with Tailwind CSS v4), we detect this case and resolve
-* the string names to actual plugin functions so Vite can use them.
-*
-* Returns the resolved PostCSS config object to inject into Vite's
-* `css.postcss`, or `undefined` if no resolution is needed.
-*/
-function resolvePostcssStringPlugins(projectRoot) {
-	if (_postcssCache.has(projectRoot)) return _postcssCache.get(projectRoot);
-	const promise = _resolvePostcssStringPluginsUncached(projectRoot);
-	_postcssCache.set(projectRoot, promise);
-	return promise;
-}
-async function _resolvePostcssStringPluginsUncached(projectRoot) {
-	let configPath = null;
-	for (const name of POSTCSS_CONFIG_FILES) {
-		const candidate = path.join(projectRoot, name);
-		if (fs.existsSync(candidate)) {
-			configPath = candidate;
-			break;
-		}
-	}
-	if (!configPath) return;
-	let config;
-	try {
-		if (configPath.endsWith(".json") || configPath.endsWith(".yaml") || configPath.endsWith(".yml")) return;
-		if (configPath.endsWith(".postcssrc")) {
-			if (fs.readFileSync(configPath, "utf-8").trim().startsWith("{")) return;
-		}
-		const mod = await import(pathToFileURL(configPath).href);
-		config = mod.default ?? mod;
-	} catch {
-		return;
-	}
-	if (!config || !Array.isArray(config.plugins)) return;
-	if (!config.plugins.some((p) => typeof p === "string" || Array.isArray(p) && typeof p[0] === "string")) return;
-	const req = createRequire(path.join(projectRoot, "package.json"));
-	return { plugins: await Promise.all(config.plugins.filter(Boolean).map(async (plugin) => {
-		if (typeof plugin === "string") {
-			const mod = await import(pathToFileURL(req.resolve(plugin)).href);
-			const fn = mod.default ?? mod;
-			return typeof fn === "function" ? fn() : fn;
-		}
-		if (Array.isArray(plugin) && typeof plugin[0] === "string") {
-			const [name, options] = plugin;
-			const mod = await import(pathToFileURL(req.resolve(name)).href);
-			const fn = mod.default ?? mod;
-			return typeof fn === "function" ? fn(options) : fn;
-		}
-		return plugin;
-	})) };
-}
 const VIRTUAL_SERVER_ENTRY = "virtual:vinext-server-entry";
 const RESOLVED_SERVER_ENTRY = "\0" + VIRTUAL_SERVER_ENTRY;
 const VIRTUAL_CLIENT_ENTRY = "virtual:vinext-client-entry";
@@ -283,213 +205,34 @@ const RESOLVED_APP_BROWSER_ENTRY = "\0" + VIRTUAL_APP_BROWSER_ENTRY;
 /** Image file extensions handled by the vinext:image-imports plugin.
 *  Shared between the Rolldown hook filter and the transform handler regex. */
 const IMAGE_EXTS = "png|jpe?g|gif|webp|avif|svg|ico|bmp|tiff?";
-/**
-* Extract the npm package name from a module ID (file path).
-* Returns null if not in node_modules.
-*
-* Handles scoped packages (@org/pkg) and pnpm-style paths
-* (node_modules/.pnpm/pkg@ver/node_modules/pkg).
-*/
-function getPackageName(id) {
-	const nmIdx = id.lastIndexOf("node_modules/");
-	if (nmIdx === -1) return null;
-	const rest = id.slice(nmIdx + 13);
-	if (rest.startsWith("@")) {
-		const parts = rest.split("/");
-		return parts.length >= 2 ? parts[0] + "/" + parts[1] : null;
-	}
-	return rest.split("/")[0] || null;
-}
 /** Absolute path to vinext's shims directory, used by clientManualChunks. */
 const _shimsDir = path.resolve(__dirname, "shims") + "/";
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
 /**
-* manualChunks function for client builds.
-*
-* Splits the client bundle into:
-* - "framework" — React, ReactDOM, and scheduler (loaded on every page)
-* - "vinext"    — vinext shims (router, head, link, etc.)
-*
-* All other vendor code is left to Rollup's default chunk-splitting
-* algorithm. Rollup automatically deduplicates shared modules into
-* common chunks based on the import graph — no manual intervention
-* needed.
-*
-* Why not split every npm package into its own chunk?
-* - Per-package splitting (`vendor-X`) creates 50-200+ chunks for a
-*   typical app, far exceeding the ~25-request sweet spot for HTTP/2.
-* - gzip/brotli compress small files poorly — each file restarts with
-*   an empty dictionary, losing ~5-15% total compressed size vs fewer
-*   larger chunks (Khan Academy measured +2.5% wire size with 10x
-*   more files containing less raw code).
-* - ES module evaluation has per-module overhead that compounds on
-*   mobile devices.
-* - No major Vite-based framework (Remix, SvelteKit, Astro, TanStack)
-*   uses per-package splitting. Next.js only isolates packages >160KB.
-* - Rollup's graph-based splitting already handles the common case
-*   well: shared dependencies between routes get their own chunks,
-*   and route-specific code stays in route chunks.
-*/
-function clientManualChunks(id) {
-	if (id.includes("node_modules")) {
-		const pkg = getPackageName(id);
-		if (!pkg) return void 0;
-		if (pkg === "react" || pkg === "react-dom" || pkg === "scheduler") return "framework";
-		return;
-	}
-	if (id.startsWith(_shimsDir)) return "vinext";
-}
-/**
-* Rollup output config with manualChunks for client code-splitting.
-* Used by both CLI builds and multi-environment builds.
-*
-* experimentalMinChunkSize merges tiny shared chunks (< 10KB) back into
-* their importers. This reduces HTTP request count and improves gzip
-* compression efficiency — small files restart the compression dictionary,
-* adding ~5-15% wire overhead vs fewer larger chunks.
-*/
-const clientOutputConfig = {
-	manualChunks: clientManualChunks,
-	experimentalMinChunkSize: 1e4
-};
-const clientCodeSplittingConfig = {
-	minSize: 1e4,
-	groups: [{ name(moduleId) {
-		return clientManualChunks(moduleId) ?? null;
-	} }]
-};
-/**
-* Rollup treeshake configuration for production client builds.
-*
-* Uses the 'recommended' preset as a safe base, then overrides
-* moduleSideEffects to strip unused re-exports from npm packages.
+* Shims with a `.react-server.ts` variant for the RSC environment.
+* Maps import specifier → base shim name. In the RSC env, resolveId
+* appends `.react-server`; in other envs it resolves to the base.
 *
-* The 'no-external' value for moduleSideEffects means:
-* - Local project modules: preserve side effects (CSS imports, polyfills)
-* - node_modules packages: treat as side-effect-free unless exports are used
+* These MUST NOT appear in `nextShimMap` (resolve.alias) because Vite's
+* alias plugin runs before user `enforce:"pre"` plugins — aliases are
+* unoverridable. Keeping them out of the alias lets the resolveId hook
+* control resolution per-environment.
 *
-* This is the single highest-impact optimization for large barrel-exporting
-* libraries like mermaid, @mui/material, lucide-react, etc. These libraries
-* re-export hundreds of sub-modules through barrel files. Without this,
-* Rollup preserves every sub-module even when only a few exports are consumed.
-*
-* Why 'no-external' instead of false (global side-effect-free)?
-* - User code may rely on import-time side effects (e.g., `import './global.css'`)
-* - 'no-external' is safe for app code while still enabling aggressive DCE for deps
-*
-* Why not the 'smallest' preset?
-* - 'smallest' also sets propertyReadSideEffects: false and
-*   tryCatchDeoptimization: false, which can break specific libraries
-*   that rely on property access side effects or try/catch for feature detection
-* - 'recommended' + 'no-external' gives most of the benefit with less risk
-*
-* @deprecated Use getClientTreeshakeConfigForVite(viteMajorVersion) instead
-* for Vite version compatibility. Kept for backward compatibility.
+* To add a new react-server shim:
+*   1. Create `<name>.react-server.ts` in src/shims/
+*   2. Add entries here for each import specifier.
 */
-const clientTreeshakeConfig = {
-	preset: "recommended",
-	moduleSideEffects: "no-external"
-};
-function getBuildBundlerOptions(build) {
-	const buildConfig = build;
-	return buildConfig?.rolldownOptions ?? buildConfig?.rollupOptions;
-}
-function withBuildBundlerOptions(viteMajorVersion, bundlerOptions) {
-	return viteMajorVersion >= 8 ? { rolldownOptions: bundlerOptions } : { rollupOptions: bundlerOptions };
-}
+const _reactServerShims = new Map([
+	["next/navigation", "navigation"],
+	["next/navigation.js", "navigation"],
+	["next/dist/client/components/navigation", "navigation"]
+]);
+const clientManualChunks = createClientManualChunks(_shimsDir);
+const clientOutputConfig = createClientOutputConfig(clientManualChunks);
+const clientCodeSplittingConfig = createClientCodeSplittingConfig(clientManualChunks);
 function getClientOutputConfigForVite(viteMajorVersion) {
 	return viteMajorVersion >= 8 ? { codeSplitting: clientCodeSplittingConfig } : clientOutputConfig;
 }
-/**
-* Returns treeshake configuration appropriate for the Vite version.
-*
-* Rollup (Vite 7) supports presets like "recommended" which set multiple
-* treeshake options at once. Rolldown (Vite 8+) doesn't support presets,
-* so we only return moduleSideEffects for Vite 8+.
-*
-* The Rollup "recommended" preset sets:
-* - annotations: true (Rolldown default is also true)
-* - manualPureFunctions: [] (Rolldown default is also [])
-* - propertyReadSideEffects: true (Rolldown equivalent is 'always', the default)
-* - unknownGlobalSideEffects: false (Rolldown default is true — this is a known acceptable
-*   divergence. Slightly less aggressive DCE on unknown globals, acceptable for client bundles)
-* - correctVarValueBeforeDeclaration and tryCatchDeoptimization (Rolldown handles these differently)
-*
-* The key optimization is moduleSideEffects: "no-external", which is supported
-* by both bundlers and provides the DCE benefits for barrel-exporting libraries.
-* It treats node_modules as side-effect-free (enabling aggressive DCE) while
-* preserving side effects in local code.
-*/
-function getClientTreeshakeConfigForVite(viteMajorVersion) {
-	if (viteMajorVersion >= 8) return { moduleSideEffects: "no-external" };
-	return {
-		preset: "recommended",
-		moduleSideEffects: "no-external"
-	};
-}
-function tryRealpathSync(candidate) {
-	try {
-		return fs.realpathSync.native(candidate);
-	} catch {
-		return null;
-	}
-}
-function isWindowsAbsolutePath(candidate) {
-	return /^[a-zA-Z]:[\\/]/.test(candidate) || candidate.startsWith("\\\\");
-}
-function relativeWithinRoot(root, moduleId) {
-	const relativeId = (isWindowsAbsolutePath(root) || isWindowsAbsolutePath(moduleId) ? path.win32.relative(root, moduleId) : path.relative(root, moduleId)).replace(/\\/g, "/");
-	if (!relativeId || relativeId === ".." || relativeId.startsWith("../")) return null;
-	return relativeId;
-}
-function normalizeManifestModuleId(moduleId, root) {
-	const normalizedId = moduleId.replace(/\\/g, "/");
-	if (normalizedId.startsWith("\0")) return normalizedId;
-	if (normalizedId.startsWith("node_modules/") || normalizedId.includes("/node_modules/")) return normalizedId;
-	if (!isWindowsAbsolutePath(moduleId) && !path.isAbsolute(moduleId)) {
-		if (!normalizedId.startsWith(".") && !normalizedId.includes("../")) return normalizedId;
-	}
-	const rootCandidates = new Set([root]);
-	const realRoot = tryRealpathSync(root);
-	if (realRoot) rootCandidates.add(realRoot);
-	const moduleCandidates = /* @__PURE__ */ new Set();
-	if (isWindowsAbsolutePath(moduleId) || path.isAbsolute(moduleId)) moduleCandidates.add(moduleId);
-	else moduleCandidates.add(path.resolve(root, moduleId));
-	for (const candidate of moduleCandidates) {
-		const realCandidate = tryRealpathSync(candidate);
-		if (realCandidate) moduleCandidates.add(realCandidate);
-	}
-	for (const rootCandidate of rootCandidates) for (const moduleCandidate of moduleCandidates) {
-		const relativeId = relativeWithinRoot(rootCandidate, moduleCandidate);
-		if (relativeId) return relativeId;
-	}
-	return normalizedId;
-}
-function augmentSsrManifestFromBundle(ssrManifest, bundle, root, base = "/") {
-	const nextManifest = {};
-	for (const [key, files] of Object.entries(ssrManifest)) {
-		const normalizedKey = normalizeManifestModuleId(key, root);
-		if (!nextManifest[normalizedKey]) nextManifest[normalizedKey] = /* @__PURE__ */ new Set();
-		for (const file of files) nextManifest[normalizedKey].add(normalizeManifestFile(file));
-	}
-	for (const item of Object.values(bundle)) {
-		if (item.type !== "chunk") continue;
-		const chunk = item;
-		const files = /* @__PURE__ */ new Set();
-		files.add(manifestFileWithBase(chunk.fileName, base));
-		for (const importedFile of chunk.imports ?? []) files.add(manifestFileWithBase(importedFile, base));
-		for (const cssFile of chunk.viteMetadata?.importedCss ?? []) files.add(manifestFileWithBase(cssFile, base));
-		for (const assetFile of chunk.viteMetadata?.importedAssets ?? []) files.add(manifestFileWithBase(assetFile, base));
-		for (const moduleId of Object.keys(chunk.modules ?? {})) {
-			const key = normalizeManifestModuleId(moduleId, root);
-			if (key.startsWith("node_modules/") || key.includes("/node_modules/")) continue;
-			if (key.startsWith("\0")) continue;
-			if (!nextManifest[key]) nextManifest[key] = /* @__PURE__ */ new Set();
-			for (const file of files) nextManifest[key].add(file);
-		}
-	}
-	return Object.fromEntries(Object.entries(nextManifest).map(([key, files]) => [key, [...files]]));
-}
 function vinext(options = {}) {
 	const viteMajorVersion = getViteMajorVersion();
 	let root;
@@ -505,7 +248,14 @@ function vinext(options = {}) {
 	let hasCloudflarePlugin = false;
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
+	let rscClassificationManifest = null;
 	const shimsDir = path.resolve(__dirname, "shims");
+	const canonicalize = (p) => tryRealpathSync(p) ?? p;
+	const dynamicShimPaths = new Set([
+		resolveShimModulePath(shimsDir, "headers"),
+		resolveShimModulePath(shimsDir, "server"),
+		resolveShimModulePath(shimsDir, "cache")
+	].map(canonicalize));
 	let nextShimMap = {};
 	/**
 	* Generate the virtual SSR server entry module.
@@ -593,7 +343,6 @@ function vinext(options = {}) {
 		...viteMajorVersion >= 8 ? [] : [tsconfigPaths()],
 		reactPluginPromise,
 		commonjs(),
-		fixUseServerClosureCollisionPlugin,
 		{
 			name: "vinext:config",
 			enforce: "pre",
@@ -691,7 +440,6 @@ function vinext(options = {}) {
 					"next/config": path.join(shimsDir, "config"),
 					"next/script": path.join(shimsDir, "script"),
 					"next/server": path.join(shimsDir, "server"),
-					"next/navigation": path.join(shimsDir, "navigation"),
 					"next/headers": path.join(shimsDir, "headers"),
 					"next/font/google": path.join(shimsDir, "font-google"),
 					"next/font/local": path.join(shimsDir, "font-local"),
@@ -713,7 +461,6 @@ function vinext(options = {}) {
 					"next/dist/client/components/work-unit-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
 					"next/dist/client/components/request-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
 					"next/dist/client/components/request-async-storage": path.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/client/components/navigation": path.join(shimsDir, "navigation"),
 					"next/dist/server/config-shared": path.join(shimsDir, "internal", "utils"),
 					"server-only": path.join(shimsDir, "server-only"),
 					"client-only": path.join(shimsDir, "client-only"),
@@ -799,13 +546,22 @@ function vinext(options = {}) {
 				const userSsrExternal = Array.isArray(config.ssr?.external) ? [...config.ssr.external, ...nextServerExternal] : config.ssr?.external === true ? true : nextServerExternal;
 				const incomingExclude = config.optimizeDeps?.exclude ?? [];
 				const incomingInclude = config.optimizeDeps?.include ?? [];
+				const depOptimizeAliasPlugin = {
+					name: "vinext:dep-optimize-alias",
+					resolveId(id) {
+						const shimBase = _reactServerShims.get(id);
+						if (shimBase !== void 0) return resolveShimModulePath(shimsDir, shimBase);
+					}
+				};
 				viteConfig.optimizeDeps = {
 					exclude: [...new Set([
 						...incomingExclude,
 						"vinext",
-						"@vercel/og"
+						"@vercel/og",
+						"@tailwindcss/oxide"
 					])],
-					...incomingInclude.length > 0 ? { include: incomingInclude } : {}
+					...incomingInclude.length > 0 ? { include: incomingInclude } : {},
+					rolldownOptions: { plugins: [depOptimizeAliasPlugin] }
 				};
 				const pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
 				if (hasAppDir) {
@@ -971,6 +727,8 @@ function vinext(options = {}) {
 						const queryIndex = cleanId.indexOf(VIRTUAL_GOOGLE_FONTS + "?");
 						return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(queryIndex + VIRTUAL_GOOGLE_FONTS.length);
 					}
+					const reactServerShim = _reactServerShims.get(cleanId);
+					if (reactServerShim !== void 0) return resolveShimModulePath(_shimsDir, this.environment?.name === "rsc" ? `${reactServerShim}.react-server` : reactServerShim);
 				}
 			},
 			async load(id) {
@@ -980,6 +738,7 @@ function vinext(options = {}) {
 					const routes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
 					const metaRoutes = scanMetadataFiles(appDir);
 					const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
+					rscClassificationManifest = collectRouteClassificationManifest(routes);
 					return generateRscEntry(appDir, routes, middlewarePath, metaRoutes, globalErrorPath, nextConfig?.basePath, nextConfig?.trailingSlash, {
 						redirects: nextConfig?.redirects,
 						rewrites: nextConfig?.rewrites,
@@ -995,6 +754,66 @@ function vinext(options = {}) {
 				if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) return generateSsrEntry(hasPagesDir);
 				if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) return generateBrowserEntry();
 				if (id.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
+			},
+			generateBundle(_options, bundle) {
+				if (this.environment?.name !== "rsc") return;
+				if (!rscClassificationManifest) return;
+				const enableClassificationDebug = Boolean(process.env.VINEXT_DEBUG_CLASSIFICATION);
+				const stubRe = /function __VINEXT_CLASS\(routeIdx\)\s*\{\s*return null;?\s*\}/;
+				const reasonsStubRe = /function __VINEXT_CLASS_REASONS\(routeIdx\)\s*\{\s*return null;?\s*\}/;
+				const chunksMentioningStub = [];
+				const chunksWithStubBody = [];
+				for (const chunk of Object.values(bundle)) {
+					if (chunk.type !== "chunk") continue;
+					if (!chunk.code.includes("__VINEXT_CLASS")) continue;
+					chunksMentioningStub.push({
+						chunk,
+						fileName: chunk.fileName
+					});
+					if (stubRe.test(chunk.code)) chunksWithStubBody.push({
+						chunk,
+						fileName: chunk.fileName
+					});
+				}
+				if (chunksMentioningStub.length === 0) return;
+				if (chunksWithStubBody.length === 0) throw new Error(`vinext: build-time classification — __VINEXT_CLASS is referenced in ${chunksMentioningStub.map((c) => c.fileName).join(", ")} but no chunk contains the stub body. The generator and generateBundle have drifted.`);
+				if (chunksWithStubBody.length > 1) throw new Error(`vinext: build-time classification — expected __VINEXT_CLASS stub in exactly one RSC chunk, found ${chunksWithStubBody.length}`);
+				if (enableClassificationDebug && !reasonsStubRe.test(chunksWithStubBody[0].chunk.code)) throw new Error("vinext: build-time classification — __VINEXT_CLASS_REASONS stub is missing alongside __VINEXT_CLASS. The generator and generateBundle have drifted.");
+				const moduleInfo = { getModuleInfo: (moduleId) => {
+					const info = this.getModuleInfo(moduleId);
+					if (!info) return null;
+					return {
+						importedIds: info.importedIds ?? [],
+						dynamicImportedIds: info.dynamicallyImportedIds ?? []
+					};
+				} };
+				const layer2PerRoute = /* @__PURE__ */ new Map();
+				const graphCache = /* @__PURE__ */ new Map();
+				for (let routeIdx = 0; routeIdx < rscClassificationManifest.routes.length; routeIdx++) {
+					const route = rscClassificationManifest.routes[routeIdx];
+					const perRoute = /* @__PURE__ */ new Map();
+					for (let layoutIdx = 0; layoutIdx < route.layoutPaths.length; layoutIdx++) {
+						if (route.layer1.has(layoutIdx)) continue;
+						const layoutModuleId = canonicalize(route.layoutPaths[layoutIdx]);
+						if (!moduleInfo.getModuleInfo(layoutModuleId)) continue;
+						let graphResult = graphCache.get(layoutModuleId);
+						if (graphResult === void 0) {
+							graphResult = classifyLayoutByModuleGraph(layoutModuleId, dynamicShimPaths, moduleInfo);
+							graphCache.set(layoutModuleId, graphResult);
+						}
+						if (isStaticModuleGraphResult(graphResult)) perRoute.set(layoutIdx, moduleGraphReason(graphResult));
+					}
+					if (perRoute.size > 0) layer2PerRoute.set(routeIdx, perRoute);
+				}
+				const patchedBody = `function __VINEXT_CLASS(routeIdx) { return (${buildGenerateBundleReplacement(rscClassificationManifest, layer2PerRoute)})(routeIdx); }`;
+				const target = chunksWithStubBody[0].chunk;
+				target.code = target.code.replace(stubRe, patchedBody);
+				if (enableClassificationDebug) {
+					const patchedReasonsBody = `function __VINEXT_CLASS_REASONS(routeIdx) { return (${buildReasonsReplacement(rscClassificationManifest, layer2PerRoute)})(routeIdx); }`;
+					target.code = target.code.replace(reasonsStubRe, patchedReasonsBody);
+				}
+				target.map = null;
+				rscClassificationManifest = null;
 			}
 		},
 		asyncHooksStubPlugin,
@@ -1320,8 +1139,7 @@ function vinext(options = {}) {
 								}
 							}
 							const reqUrl = new URL(url, requestOrigin);
-							const reqCtxHeaders = middlewareRequestHeaders ?? nodeRequestHeaders;
-							const reqCtx = requestContextFromRequest(new Request(reqUrl, { headers: reqCtxHeaders }));
+							const reqCtx = requestContextFromRequest(new Request(reqUrl, { headers: middlewareRequestHeaders ?? nodeRequestHeaders }));
 							if (nextConfig?.headers.length) applyHeaders(pathname, res, nextConfig.headers, preMiddlewareReqCtx);
 							let resolvedUrl = url;
 							if (nextConfig?.rewrites.beforeFiles.length) resolvedUrl = applyRewrites(pathname, nextConfig.rewrites.beforeFiles, reqCtx) ?? url;
@@ -1891,72 +1709,6 @@ function getNextPublicEnvDefines() {
 	return defines;
 }
 /**
-* Strip server-only data-fetching exports (getServerSideProps,
-* getStaticProps, getStaticPaths) from page modules for the client
-* bundle. Uses Vite's parseAst (Rollup/acorn) for correct handling
-* of all export patterns including function expressions, arrow
-* functions with TS return types, and re-exports.
-*
-* Modeled after Next.js's SWC `next-ssg-transform`.
-*/
-function stripServerExports(code) {
-	const SERVER_EXPORTS = new Set([
-		"getServerSideProps",
-		"getStaticProps",
-		"getStaticPaths"
-	]);
-	if (![...SERVER_EXPORTS].some((name) => code.includes(name))) return null;
-	let ast;
-	try {
-		ast = parseAst(code);
-	} catch {
-		return null;
-	}
-	const s = new MagicString(code);
-	let changed = false;
-	for (const node of ast.body) {
-		if (node.type !== "ExportNamedDeclaration") continue;
-		if (node.declaration) {
-			const decl = node.declaration;
-			if (decl.type === "FunctionDeclaration" && decl.id && SERVER_EXPORTS.has(decl.id.name)) {
-				s.overwrite(node.start, node.end, `export function ${decl.id.name}() { return { props: {} }; }`);
-				changed = true;
-			} else if (decl.type === "VariableDeclaration") {
-				for (const declarator of decl.declarations) if (declarator.id?.type === "Identifier" && SERVER_EXPORTS.has(declarator.id.name)) {
-					s.overwrite(node.start, node.end, `export const ${declarator.id.name} = undefined;`);
-					changed = true;
-				}
-			}
-			continue;
-		}
-		if (node.specifiers && node.specifiers.length > 0 && !node.source) {
-			const kept = [];
-			const stripped = [];
-			for (const spec of node.specifiers) {
-				const exportedName = spec.exported?.name ?? spec.exported?.value;
-				if (SERVER_EXPORTS.has(exportedName)) stripped.push(exportedName);
-				else kept.push(spec);
-			}
-			if (stripped.length > 0) {
-				const parts = [];
-				if (kept.length > 0) {
-					const keptStr = kept.map((sp) => {
-						const local = sp.local.name;
-						const exported = sp.exported?.name ?? sp.exported?.value;
-						return local === exported ? local : `${local} as ${exported}`;
-					}).join(", ");
-					parts.push(`export { ${keptStr} };`);
-				}
-				for (const name of stripped) parts.push(`export const ${name} = undefined;`);
-				s.overwrite(node.start, node.end, parts.join("\n"));
-				changed = true;
-			}
-		}
-	}
-	if (!changed) return null;
-	return s.toString();
-}
-/**
 * Apply redirect rules from next.config.js.
 * Returns true if a redirect was applied.
 */
@@ -2045,79 +1797,7 @@ function findFileWithExts(dir, name, matcher) {
 	}
 	return null;
 }
-/** Module-level cache for hasMdxFiles — avoids re-scanning per Vite environment. */
-const _mdxScanCache = /* @__PURE__ */ new Map();
-/**
-* Check if the project has .mdx files in app/ or pages/ directories.
-*/
-function hasMdxFiles(root, appDir, pagesDir) {
-	const cacheKey = `${root}\0${appDir ?? ""}\0${pagesDir ?? ""}`;
-	if (_mdxScanCache.has(cacheKey)) return _mdxScanCache.get(cacheKey);
-	const dirs = [appDir, pagesDir].filter(Boolean);
-	for (const dir of dirs) if (fs.existsSync(dir) && scanDirForMdx(dir)) {
-		_mdxScanCache.set(cacheKey, true);
-		return true;
-	}
-	_mdxScanCache.set(cacheKey, false);
-	return false;
-}
-function scanDirForMdx(dir) {
-	try {
-		const entries = fs.readdirSync(dir, { withFileTypes: true });
-		for (const entry of entries) {
-			if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
-			const full = path.join(dir, entry.name);
-			if (entry.isDirectory()) {
-				if (scanDirForMdx(full)) return true;
-			} else if (entry.isFile() && entry.name.toLowerCase().endsWith(".mdx")) return true;
-		}
-	} catch {}
-	return false;
-}
-function scanPublicFileRoutes(root) {
-	const publicDir = path.join(root, "public");
-	const routes = [];
-	const visitedDirs = /* @__PURE__ */ new Set();
-	function walk(dir) {
-		let realDir;
-		try {
-			realDir = fs.realpathSync(dir);
-		} catch {
-			return;
-		}
-		if (visitedDirs.has(realDir)) return;
-		visitedDirs.add(realDir);
-		const entries = fs.readdirSync(dir, { withFileTypes: true });
-		for (const entry of entries) {
-			const fullPath = path.join(dir, entry.name);
-			if (entry.isDirectory()) {
-				walk(fullPath);
-				continue;
-			}
-			if (entry.isSymbolicLink()) {
-				let stat;
-				try {
-					stat = fs.statSync(fullPath);
-				} catch {
-					continue;
-				}
-				if (stat.isDirectory()) {
-					walk(fullPath);
-					continue;
-				}
-				if (!stat.isFile()) continue;
-			} else if (!entry.isFile()) continue;
-			const relativePath = path.relative(publicDir, fullPath).split(path.sep).join("/");
-			routes.push("/" + relativePath);
-		}
-	}
-	if (fs.existsSync(publicDir)) try {
-		walk(publicDir);
-	} catch {}
-	routes.sort();
-	return routes;
-}
 //#endregion
-export { asyncHooksStubPlugin as _asyncHooksStubPlugin, augmentSsrManifestFromBundle as _augmentSsrManifestFromBundle, _findBalancedObject, _findCallEnd, hasMdxFiles as _hasMdxFiles, _mdxScanCache, parseStaticObjectLiteral as _parseStaticObjectLiteral, _postcssCache, resolvePostcssStringPlugins as _resolvePostcssStringPlugins, scanPublicFileRoutes as _scanPublicFileRoutes, stripServerExports as _stripServerExports, clientManualChunks, clientOutputConfig, clientTreeshakeConfig, computeLazyChunks, vinext as default, getClientOutputConfigForVite, getClientTreeshakeConfigForVite, matchConfigPattern, staticExportApp, staticExportPages };
+export { vinext as default, staticExportApp, staticExportPages };
 
 //# sourceMappingURL=index.js.map