vinext 1.3.0 → 1.4.0

package/dist/index.js

@@ -46,6 +46,7 @@ import { handleApiRoute } from "./server/api-handler.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, resolveDevImageRedirect } from "./server/image-optimization.js";
 import { CACHEABILITY_MANIFEST_MODULE, CACHEABILITY_REQUEST_PROJECTION_MODULE } from "./server/cacheability-manifest.js";
 import { PREGENERATED_CONCRETE_PATHS_MODULE } from "./server/pregenerated-concrete-paths.js";
+import { isAppInterceptRenderedDynamically, isAppPageRouteRenderedDynamically } from "./build/app-page-static-eligibility.js";
 import { rewriteOutputRootExternals } from "./build/output-root-externals.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
 import { invalidateMetadataFileCache, scanMetadataFiles } from "./server/metadata-routes.js";
@@ -59,14 +60,12 @@ import { generateSsrEntry } from "./entries/app-ssr-entry.js";
 import { VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY, VIRTUAL_CACHE_ADAPTERS, VIRTUAL_CDN_CACHE_ADAPTER, generateCacheAdaptersModule, generateCdnCacheAdapterModule } from "./cache/cache-adapters-virtual.js";
 import { VIRTUAL_IMAGE_ADAPTERS, generateImageAdaptersModule } from "./image/image-adapters-virtual.js";
 import { generateBrowserEntry, generateBrowserRouteManifestModule, toHashedRouteHandlerRoutes, toLinkPrefetchRoutes } from "./entries/app-browser-entry.js";
-import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
-import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
 import { createRscScanGlobImportsPlugin, isRscScanGlobImportsAffected } from "./plugins/rsc-scan-glob-imports.js";
 import { loadOrGenerateServerActionsEncryptionKey } from "./build/server-actions-encryption-key.js";
 import { findOpenTelemetryPackages, mergeServerExternalPackages } from "./config/server-external-packages.js";
 import { precompressAssets } from "./build/precompress.js";
 import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VINEXT_ROUTE_ROOT_CONFIG_PLUGIN_PROPERTY, normalizeVinextPrerenderConfig } from "./config/prerender.js";
-import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
+import { VINEXT_CLIENT_ENTRY_MANIFEST, VINEXT_CLIENT_REFERENCE_SOURCES } from "./utils/client-entry-manifest.js";
 import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, collectClientBuildFiles, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
 import { createPreviewBuildCredentials, getPreviewBuildCredentials } from "./build/preview-credentials.js";
 import { VINEXT_BUILD_LIFECYCLE_CONFIG, createBuildLifecyclePlugins } from "./build/lifecycle.js";
@@ -85,6 +84,7 @@ import { VIRTUAL_MODULE_ID_RE } from "./utils/virtual-module.js";
 import { assertNoPublicDirAssetConflict, assertNoPublicNextRequestConflict } from "./build/public-dir-conflict.js";
 import { renderVinextBuiltUrl } from "./utils/built-asset-url.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
+import { createClientCompileHintsPlugin } from "./plugins/client-compile-hints.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
 import { dataUrlCssPlugin } from "./plugins/css-data-url.js";
 import { createCssModuleImportCompatibilityPlugin } from "./plugins/css-module-imports.js";
@@ -94,6 +94,7 @@ import { createRouteClientReferencesFallbackPlugin, createRscClientReferenceLoad
 import { createRscReferenceValidationNormalizerPlugin } from "./plugins/rsc-reference-validation-normalizer.js";
 import { createScanBuildCssPlugin } from "./plugins/scan-build-css.js";
 import { createInstrumentationClientTransformPlugin, createInstrumentationServerTransformPlugin } from "./plugins/instrumentation-client.js";
+import { createNextIntlCatalogPlugin } from "./plugins/next-intl-catalog.js";
 import { createStyledJsxPlugin } from "./plugins/styled-jsx.js";
 import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
 import { isServerEnvironment } from "./plugins/environment.js";
@@ -117,6 +118,7 @@ import { readPrerenderSecret, readServerRuntimeOutputDirs } from "./build/server
 import { ModuleDependencyStore, createModuleDependencyCache } from "./build/module-dependency-cache.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
 import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassCssUrlAssetImporter, createSassTildeImporter, createSassTsconfigPathImporters } from "./plugins/sass.js";
+import { collectClientReferenceChunks, collectClientReferenceSources } from "./build/client-reference-chunks.js";
 import { EXPORT_ALL_CANDIDATE_FILTER, hasExportAllCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
@@ -139,7 +141,7 @@ import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import { pathToFileURL } from "node:url";
-import { createIdResolver, createLogger, isRunnableDevEnvironment, transformWithOxc } from "vite";
+import { createIdResolver, createLogger, esmExternalRequirePlugin, isRunnableDevEnvironment, transformWithOxc } from "vite";
 import { createHash, randomBytes } from "node:crypto";
 import MagicString from "magic-string";
 import commonjs from "vite-plugin-commonjs";
@@ -152,7 +154,12 @@ const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
 	"react/jsx-runtime",
 	"react/jsx-dev-runtime"
 ]);
-const PAGES_CLOUDFLARE_WORKER_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze(["use-sync-external-store/with-selector", "vinext > @vitejs/plugin-rsc/react/rsc"]);
+const PAGES_CLOUDFLARE_WORKER_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
+	"use-sync-external-store/with-selector",
+	"vinext > @vitejs/plugin-rsc/react/rsc",
+	"vinext > @unpic/react",
+	"vinext > ipaddr.js"
+]);
 const APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
 	"use-sync-external-store/shim",
 	"use-sync-external-store/shim/index.js",
@@ -161,6 +168,11 @@ const APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
 	"use-sync-external-store/with-selector",
 	"use-sync-external-store/with-selector.js"
 ]);
+const CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
+	"vinext > @unpic/react",
+	"vinext > ipaddr.js",
+	"vinext > web-vitals"
+]);
 const ANSI_ESCAPE_RE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
 const RSC_ENVIRONMENTS = /* @__PURE__ */ new Set([
 	"rsc",
@@ -491,6 +503,7 @@ function hasZeroOrOneAsterisk(value) {
 }
 function materializeTsconfigPathAliases(pathsConfig, baseUrl, projectRoot) {
 	const vite = {};
+	const viteExact = {};
 	const sass = [];
 	for (const [find, rawTargets] of Object.entries(pathsConfig)) {
 		const targets = Array.isArray(rawTargets) ? rawTargets.filter((value) => typeof value === "string") : typeof rawTargets === "string" ? [rawTargets] : [];
@@ -513,10 +526,11 @@ function materializeTsconfigPathAliases(pathsConfig, baseUrl, projectRoot) {
 			vite[aliasKey] = toViteAliasReplacement(path.resolve(baseUrl, targetDir), projectRoot);
 			continue;
 		}
-		vite[find] = toViteAliasReplacement(path.resolve(baseUrl, target), projectRoot);
+		viteExact[find] = toViteAliasReplacement(path.resolve(baseUrl, target), projectRoot);
 	}
 	return {
 		vite,
+		viteExact,
 		sass
 	};
 }
@@ -553,6 +567,7 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 	const normalizedPath = tryRealpathSync(configPath) ?? configPath;
 	if (seen.has(normalizedPath)) return {
 		vite: {},
+		viteExact: {},
 		sass: []
 	};
 	seen.add(normalizedPath);
@@ -562,15 +577,18 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 	} catch {
 		return {
 			vite: {},
+			viteExact: {},
 			sass: []
 		};
 	}
 	if (!parsed) return {
 		vite: {},
+		viteExact: {},
 		sass: []
 	};
 	let aliases = {
 		vite: {},
+		viteExact: {},
 		sass: []
 	};
 	for (const extendsSpecifier of normalizeTsconfigExtends(parsed.extends)) {
@@ -582,6 +600,10 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 					...aliases.vite,
 					...parent.vite
 				},
+				viteExact: {
+					...aliases.viteExact,
+					...parent.viteExact
+				},
 				sass: mergeSassTsconfigPathAliases(aliases.sass, parent.sass)
 			};
 		}
@@ -596,6 +618,10 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 			...aliases.vite,
 			...own.vite
 		},
+		viteExact: {
+			...aliases.viteExact,
+			...own.viteExact
+		},
 		sass: mergeSassTsconfigPathAliases(aliases.sass, own.sass)
 	};
 }
@@ -664,17 +690,20 @@ function resolveTsconfigAliases(projectRoot, configuredPath) {
 	if (_tsconfigAliasCache.has(cacheKey)) return _tsconfigAliasCache.get(cacheKey);
 	let aliases = {
 		vite: {},
+		viteExact: {},
 		sass: []
 	};
 	for (const candidate of configPath ? [configPath] : TSCONFIG_FILES.map((name) => path.join(projectRoot, name))) {
 		if (!fs.existsSync(candidate)) continue;
 		const materialized = loadTsconfigPathAliases(candidate, projectRoot);
 		aliases = {
-			vite: sortTsconfigAliasesBySpecificity(materialized.vite),
-			sass: materialized.sass
+			...materialized,
+			vite: sortTsconfigAliasesBySpecificity(materialized.vite)
 		};
 		break;
 	}
+	aliases.vite = Object.fromEntries(Object.entries(aliases.vite).filter(([find]) => !_reactServerShims.has(find)));
+	aliases.viteExact = Object.fromEntries(Object.entries(aliases.viteExact).filter(([find]) => !_reactServerShims.has(find)));
 	_tsconfigAliasCache.set(cacheKey, aliases);
 	return aliases;
 }
@@ -718,20 +747,38 @@ const tsconfigAliasCustomResolver = async function(updatedId, importer, options)
 		skipSelf: true
 	}) ?? { id: updatedId };
 };
+function aliasFindMatches(find, id) {
+	if (typeof find === "string") return id === find || id.startsWith(`${find}/`);
+	const { lastIndex } = find;
+	find.lastIndex = 0;
+	const matches = find.test(id);
+	find.lastIndex = lastIndex;
+	return matches;
+}
 /**
 * Convert the merged alias map into Vite alias entries, attaching the
 * stylesheet-scoping resolver to entries that came from tsconfig `paths`.
 * Array order preserves the map's first-match ordering.
+*
+* Exact tsconfig keys come first as anchored RegExps: a string `find` would
+* also match paths below the key, so `"@acme/pkg": ["./src/index.ts"]` would
+* rewrite `@acme/pkg/runtime` to `./src/index.ts/runtime`. TypeScript and
+* Next.js match such keys only against the exact specifier and prefer them over
+* `*` patterns.
 */
-function buildResolveAliasEntries(aliasMap, tsconfigPathAliases, explicitAliases) {
-	return Object.entries(aliasMap).map(([find, replacement]) => Object.hasOwn(tsconfigPathAliases, find) && !Object.hasOwn(explicitAliases, find) ? {
+function buildResolveAliasEntries(aliasMap, tsconfigPathAliases, tsconfigExactPathAliases, explicitAliases) {
+	return [...Object.entries(tsconfigExactPathAliases).filter(([find]) => !Object.hasOwn(explicitAliases, find)).map(([find, replacement]) => ({
+		find: new RegExp(`^${escapeRegExp(find)}$`),
+		replacement,
+		customResolver: tsconfigAliasCustomResolver
+	})), ...Object.entries(aliasMap).map(([find, replacement]) => Object.hasOwn(tsconfigPathAliases, find) && !Object.hasOwn(explicitAliases, find) ? {
 		find,
 		replacement,
 		customResolver: tsconfigAliasCustomResolver
 	} : {
 		find,
 		replacement
-	});
+	})];
 }
 const ALIAS_CUSTOM_RESOLVER_DEPRECATION_RE = /`resolve\.alias` contains an alias with `customResolver` option/;
 const VINEXT_FILTERED_ALIAS_DEPRECATION_WARN = Symbol.for("vinext.filteredAliasDeprecationWarn");
@@ -965,6 +1012,7 @@ function vinext(options = {}) {
 	let resolvedServerExternalPackages = [];
 	let registerNodeOpenTelemetryLoader = false;
 	let pagesTsconfigAliases = {};
+	let pagesTsconfigExactAliases = {};
 	let pagesBundledPackages = /* @__PURE__ */ new Set();
 	let isServeCommand = false;
 	let buildEmptyOutDir;
@@ -998,10 +1046,10 @@ function vinext(options = {}) {
 	const devForwardedMiddlewareContextKey = randomBytes(32).toString("hex");
 	let previewBuildCredentials;
 	const sassComposesLoader = createSassAwareFileSystemLoader();
-	const rscClassificationManifests = /* @__PURE__ */ new Map();
 	let rscActionOwnerRoutes = null;
 	let rscActionOwnerSharedRoots = [];
 	let clientReferenceRoutes = null;
+	let clientReferenceModules = null;
 	let clientReferenceAlwaysRenderedFiles = [];
 	let clientReferenceRoutelessFiles = [];
 	const serverEntryKindsByEnvironment = /* @__PURE__ */ new Map();
@@ -1018,6 +1066,7 @@ function vinext(options = {}) {
 	const shimsDir = path.resolve(__dirname, "shims");
 	const nextImageAliasTarget = toSlash(path.join(shimsDir, "image"));
 	const nextImageAliasTargetRE = new RegExp(`^${nextImageAliasTarget.split("/").map(escapeRegExp).join("[\\\\/]")}$`);
+	let nextImageAliasedByUser = false;
 	const canonicalize = (p) => toSlash(tryRealpathSync(p) ?? p);
 	const pageTransformCanonicalPaths = /* @__PURE__ */ new Map();
 	const canonicalizePageTransformPath = (modulePath) => {
@@ -1032,12 +1081,9 @@ function vinext(options = {}) {
 		const relativePath = fileMatcher.stripExtension(canonicalId.slice(canonicalPagesDir.length));
 		return relativePath === "/api" || relativePath.startsWith("/api/");
 	};
-	const dynamicShimPaths = new Set([
-		resolveShimModulePath(shimsDir, "headers"),
-		resolveShimModulePath(shimsDir, "server"),
-		resolveShimModulePath(shimsDir, "cache")
-	].map(canonicalize));
 	let nextShimMap = {};
+	let shimOptimizeDepsExclude = VINEXT_OPTIMIZE_DEPS_EXCLUDE;
+	const createShimRequirePlugin = () => esmExternalRequirePlugin({ external: [...shimOptimizeDepsExclude] });
 	/**
 	* Generate the virtual SSR server entry module.
 	* This is the entry point for `vite build --ssr`.
@@ -1104,14 +1150,14 @@ function vinext(options = {}) {
 		rscPluginPromise = rscImport.then(async (mod) => {
 			const rsc = mod.default;
 			const plugins = rsc(rscPluginOptions);
-			const useCachePlugin = await createUseCacheCallablePlugin({
+			const useCachePlugins = await createUseCacheCallablePlugin({
 				projectRoot: earlyBaseDir,
 				cacheRuntime: pathToFileURL(resolveShimModulePath(shimsDir, "cache-callable-runtime")).href,
 				getEncryptionKey: () => serverActionsEncryptionKey
 			});
 			const useServerIndex = plugins.findIndex((plugin) => plugin.name === "rsc:use-server");
 			if (useServerIndex === -1) throw new Error("vinext: Failed to locate @vitejs/plugin-rsc use-server plugin.");
-			plugins.splice(useServerIndex, 0, useCachePlugin);
+			plugins.splice(useServerIndex, 0, ...useCachePlugins);
 			return plugins.map(scopeRscPlugin);
 		}).catch((cause) => {
 			throw new Error("vinext: Failed to load @vitejs/plugin-rsc.", { cause });
@@ -1390,6 +1436,7 @@ function vinext(options = {}) {
 			getPagesDir: () => hasPagesDir ? pagesDir : null,
 			getAliases: () => nextConfig?.aliases ?? {},
 			getTsconfigAliases: () => pagesTsconfigAliases,
+			getTsconfigExactAliases: () => pagesTsconfigExactAliases,
 			getBundledPackages: () => pagesBundledPackages,
 			isEnabled: () => !hasCloudflarePlugin && !hasNitroPlugin
 		}),
@@ -1422,6 +1469,7 @@ function vinext(options = {}) {
 				buildLifecycleEnabled = env.command === "build" && !internalOptions.__skipBuildLifecycle && (buildLifecycleInvocation !== void 0 || claimViteCliBuildInvocation());
 				const userResolve = config.resolve;
 				let tsconfigPathAliases = {};
+				let tsconfigExactPathAliases = {};
 				let sassTsconfigPathAliases = [];
 				const swcHelpersAlias = resolveSwcHelpersAlias(root);
 				const mode = env?.mode ?? "development";
@@ -1493,10 +1541,12 @@ function vinext(options = {}) {
 				const configuredTsconfigPath = isUnknownRecord(nextConfig.typescript) ? typeof nextConfig.typescript.tsconfigPath === "string" ? nextConfig.typescript.tsconfigPath : void 0 : void 0;
 				const resolvedTsconfigAliases = resolveTsconfigAliases(root, configuredTsconfigPath);
 				tsconfigPathAliases = resolvedTsconfigAliases.vite;
+				tsconfigExactPathAliases = resolvedTsconfigAliases.viteExact;
 				pagesTsconfigAliases = tsconfigPathAliases;
+				pagesTsconfigExactAliases = tsconfigExactPathAliases;
 				sassTsconfigPathAliases = resolvedTsconfigAliases.sass;
 				const shouldAutoEnableNativeTsconfigPaths = userResolve?.tsconfigPaths === void 0 && configuredTsconfigPath === void 0;
-				if (Object.keys(tsconfigPathAliases).length > 0) config.customLogger = suppressAliasCustomResolverDeprecationWarning(config.customLogger ?? createLogger(config.logLevel, { allowClearScreen: config.clearScreen }));
+				if (Object.keys(tsconfigPathAliases).length > 0 || Object.keys(tsconfigExactPathAliases).length > 0) config.customLogger = suppressAliasCustomResolverDeprecationWarning(config.customLogger ?? createLogger(config.logLevel, { allowClearScreen: config.clearScreen }));
 				if (rscCompatibilityId === void 0) {
 					const sharedRscCompatibilityId = process.env.__VINEXT_SHARED_RSC_COMPATIBILITY_ID;
 					rscCompatibilityId = sharedRscCompatibilityId && sharedRscCompatibilityId.length > 0 ? sharedRscCompatibilityId : createRscCompatibilityId(nextConfig);
@@ -1575,6 +1625,7 @@ function vinext(options = {}) {
 				defines["process.env.__NEXT_VERSION"] = JSON.stringify(getVinextVersion());
 				defines["process.env.__NEXT_APP_SHELLS"] = JSON.stringify(nextConfig.appShells);
 				defines["process.env.__NEXT_CACHE_COMPONENTS"] = JSON.stringify(nextConfig.cacheComponents ?? false);
+				defines["process.env.__NEXT_EXPERIMENTAL_CACHED_NAVIGATIONS"] = JSON.stringify(nextConfig.cachedNavigations);
 				for (const [key, value] of Object.entries(nextConfig.compilerDefine)) {
 					if (key in defines || key === "process.browser") throw new Error(`The \`compiler.define\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
 					defines[key] = value;
@@ -1618,6 +1669,7 @@ function vinext(options = {}) {
 					"vinext/html": path.resolve(__dirname, "server", "html"),
 					...clientInjectModule === null ? { "private-next-instrumentation-client": instrumentationClientPath ?? INSTRUMENTATION_CLIENT_EMPTY_MODULE } : {}
 				}).flatMap(([k, v]) => k.startsWith("next/") ? [[k, v], [`${k}.js`, v]] : [[k, v]]));
+				shimOptimizeDepsExclude = mergeOptimizeDepsExclude(VINEXT_OPTIMIZE_DEPS_EXCLUDE, Object.keys(nextShimMap), [..._reactServerShims.keys()]);
 				const pluginsFlat = [];
 				function flattenPlugins(arr) {
 					for (const p of arr) if (Array.isArray(p)) flattenPlugins(p);
@@ -1668,6 +1720,11 @@ function vinext(options = {}) {
 					find,
 					replacement
 				}));
+				const tsconfigOverridingAliases = {
+					...nextConfig.aliases,
+					...nextShimMap,
+					"vinext/server/pages-client-assets": _pagesClientAssetsPath
+				};
 				if (config.resolve) {
 					config.resolve = { ...config.resolve };
 					delete config.resolve.alias;
@@ -1742,13 +1799,8 @@ function vinext(options = {}) {
 						alias: [...userAliasEntries, ...buildResolveAliasEntries({
 							...swcHelpersAlias ? { "@swc/helpers/_": swcHelpersAlias } : {},
 							...tsconfigPathAliases,
-							...nextConfig.aliases,
-							...nextShimMap,
-							"vinext/server/pages-client-assets": _pagesClientAssetsPath
-						}, tsconfigPathAliases, {
-							...nextConfig.aliases,
-							...nextShimMap
-						})],
+							...tsconfigOverridingAliases
+						}, tsconfigPathAliases, tsconfigExactPathAliases, tsconfigOverridingAliases)],
 						dedupe: [
 							"react",
 							"react-dom",
@@ -1815,12 +1867,12 @@ function vinext(options = {}) {
 				};
 				const depOptimizeNodeEnvOptions = getDepOptimizeNodeEnvOptions(nodeEnvDefine);
 				viteConfig.optimizeDeps = {
-					exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["@tailwindcss/oxide"]),
+					exclude: mergeOptimizeDepsExclude(incomingExclude, hasAppDir ? shimOptimizeDepsExclude : VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["@tailwindcss/oxide"]),
 					...incomingInclude.length > 0 ? { include: incomingInclude } : {},
 					...depOptimizeNodeEnvOptions,
 					rolldownOptions: {
 						...depOptimizeNodeEnvOptions.rolldownOptions,
-						plugins: [depOptimizeAliasPlugin, commonJsEsmFacadeOptimizeDepsPlugin]
+						plugins: hasAppDir ? [commonJsEsmFacadeOptimizeDepsPlugin] : [depOptimizeAliasPlugin, commonJsEsmFacadeOptimizeDepsPlugin]
 					}
 				};
 				pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
@@ -1875,7 +1927,6 @@ function vinext(options = {}) {
 									additionalClientOptimizeIncludes.push(include);
 								} catch {}
 							}
-							if (!excluded.includes("next") && !excluded.includes("next/link")) additionalClientOptimizeIncludes.push("next/link");
 						} catch {}
 					}
 					const appClientInput = { index: VIRTUAL_APP_BROWSER_ENTRY };
@@ -1895,13 +1946,9 @@ function vinext(options = {}) {
 								noExternal: userSsrExternal === true ? [...PATCHED_SERVER_PACKAGES] : true
 							} },
 							optimizeDeps: {
-								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE),
+								exclude: mergeOptimizeDepsExclude(incomingExclude, shimOptimizeDepsExclude),
 								entries: optimizeEntries,
-								include: [.../* @__PURE__ */ new Set([
-									...incomingInclude,
-									...additionalRscOptimizeIncludes,
-									"react-server-dom-webpack/static.edge"
-								])],
+								include: [.../* @__PURE__ */ new Set([...incomingInclude, ...additionalRscOptimizeIncludes])],
 								...depOptimizeNodeEnvOptions
 							},
 							build: {
@@ -1923,7 +1970,8 @@ function vinext(options = {}) {
 								noExternal: userSsrExternal === true ? [...PATCHED_SERVER_PACKAGES] : true
 							} },
 							optimizeDeps: {
-								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], userSsrExternal === true || externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []),
+								exclude: mergeOptimizeDepsExclude(incomingExclude, shimOptimizeDepsExclude, ["ipaddr.js"], userSsrExternal === true || externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []),
+								...userSsrExternal === true || externalizeSsrReactInDev || hasCloudflarePlugin ? {} : { include: ["react-dom/server", "react-dom/static"] },
 								entries: optimizeEntries,
 								...depOptimizeNodeEnvOptions
 							},
@@ -1935,7 +1983,7 @@ function vinext(options = {}) {
 						client: {
 							consumer: "client",
 							optimizeDeps: {
-								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, nextServerExternal),
+								exclude: mergeOptimizeDepsExclude(incomingExclude, shimOptimizeDepsExclude, nextServerExternal),
 								entries: optimizeEntries,
 								include: [.../* @__PURE__ */ new Set([
 									...incomingInclude,
@@ -2013,7 +2061,7 @@ function vinext(options = {}) {
 								noExternal: true
 							},
 							optimizeDeps: {
-								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], Object.keys(nextShimMap)),
+								exclude: mergeOptimizeDepsExclude(incomingExclude, shimOptimizeDepsExclude, ["ipaddr.js"]),
 								...depOptimizeNodeEnvOptions
 							},
 							build: {
@@ -2041,17 +2089,27 @@ function vinext(options = {}) {
 					copyPublicDirIntoStaticExportBasePath = config.build.copyPublicDir !== false;
 					config.build.copyPublicDir = false;
 				}
-				if (name !== "client" && config.consumer !== "client") {
+				const isClientConsumer = name === "client" || config.consumer === "client";
+				if (isClientConsumer && hasAppDir) {
+					config.optimizeDeps ??= {};
+					config.optimizeDeps.exclude = mergeOptimizeDepsExclude(config.optimizeDeps.exclude ?? [], shimOptimizeDepsExclude);
+				}
+				if (!isClientConsumer) {
 					config.optimizeDeps ??= {};
 					config.optimizeDeps.rolldownOptions ??= {};
 					const configuredPlugins = config.optimizeDeps.rolldownOptions.plugins;
-					config.optimizeDeps.rolldownOptions.plugins = [...Array.isArray(configuredPlugins) ? configuredPlugins : configuredPlugins ? [configuredPlugins] : [], importMetaUrlCapability.optimizeDepsPlugin];
+					config.optimizeDeps.rolldownOptions.plugins = [
+						...Array.isArray(configuredPlugins) ? configuredPlugins : configuredPlugins ? [configuredPlugins] : [],
+						importMetaUrlCapability.optimizeDepsPlugin,
+						createShimRequirePlugin()
+					];
+					config.optimizeDeps.exclude = mergeOptimizeDepsExclude(config.optimizeDeps.exclude ?? [], shimOptimizeDepsExclude);
 				}
 				if (isServeCommand && hasCloudflarePlugin && hasPagesDir && !hasAppDir && name !== "client") {
 					config.optimizeDeps ??= {};
 					config.optimizeDeps.entries = mergeStringArrayValues(config.optimizeDeps.entries, pagesOptimizeEntries);
 					config.optimizeDeps.include = mergeStringArrayValues(config.optimizeDeps.include, PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE);
-					config.optimizeDeps.exclude = mergeOptimizeDepsExclude(config.optimizeDeps.exclude ?? [], VINEXT_OPTIMIZE_DEPS_EXCLUDE, PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_EXCLUDE);
+					config.optimizeDeps.exclude = mergeOptimizeDepsExclude(config.optimizeDeps.exclude ?? [], PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_EXCLUDE);
 				}
 				const configuredExtensions = name === "client" ? nextConfig.resolveExtensions : nextConfig.serverResolveExtensions;
 				const extensions = configuredExtensions === null ? buildViteResolveExtensions(config.resolve?.extensions) : normalizeViteResolveExtensions(configuredExtensions);
@@ -2066,11 +2124,21 @@ function vinext(options = {}) {
 						if (!config.server.middlewareMode) applyDevServerDefaults(config.server, {});
 					}
 				}
-				if (isServeCommand && (hasAppDir || hasCloudflarePlugin && hasPagesDir)) {
+				if (isServeCommand) {
 					const optionalWarnings = /* @__PURE__ */ new Set();
+					const isExcludedShim = (depId) => shimOptimizeDepsExclude.some((excluded) => {
+						if (depId === excluded || depId.startsWith(`${excluded}/`)) return true;
+						if (!/[*?[\]{}()!]/.test(depId)) return false;
+						const pkgName = depId.split("/").slice(0, depId.startsWith("@") ? 2 : 1).join("/");
+						if (excluded !== pkgName && !excluded.startsWith(`${pkgName}/`)) return false;
+						return typeof path.matchesGlob !== "function" || path.matchesGlob(excluded, depId);
+					});
 					for (const [name, environment] of Object.entries(config.environments)) {
 						const optimizer = environment.optimizeDeps;
-						const optionalIncludes = hasAppDir ? name === "client" && !optimizer.noDiscovery ? APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE : [] : name !== "client" ? PAGES_CLOUDFLARE_WORKER_OPTIONAL_OPTIMIZE_DEPS_INCLUDE : [];
+						const isClient = (environment.consumer ?? name) === "client";
+						const optimizerActive = !optimizer.noDiscovery || !!optimizer.include?.length;
+						if (optimizer.include && (!isClient || hasAppDir)) optimizer.include = optimizer.include.filter((id) => !isExcludedShim(id.slice(id.lastIndexOf(">") + 1).trim()));
+						const optionalIncludes = isClient ? hasAppDir && optimizerActive ? [...optimizer.noDiscovery ? [] : APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE, ...CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE] : [] : !hasAppDir && hasCloudflarePlugin && hasPagesDir ? PAGES_CLOUDFLARE_WORKER_OPTIONAL_OPTIMIZE_DEPS_INCLUDE : [];
 						for (const id of optionalIncludes) {
 							const depId = id.slice(id.lastIndexOf(">") + 1).trim();
 							if (optimizer.include?.includes(id) || optimizer.include?.includes(depId) || optimizer.exclude?.some((excluded) => depId === excluded || depId.startsWith(`${excluded}/`))) continue;
@@ -2092,6 +2160,8 @@ function vinext(options = {}) {
 					};
 				}
 				sassComposesLoader.setResolvedConfig(config);
+				const nextImageAlias = config.resolve?.alias?.find(({ find }) => aliasFindMatches(find, "next/image"));
+				nextImageAliasedByUser = nextImageAlias !== void 0 && (nextImageAlias.customResolver !== void 0 || toSlash(nextImageAlias.replacement) !== nextImageAliasTarget);
 				if (config.command === "build" && hasAppDir && hasPagesDir) {
 					const [appRoutes, pageRoutes, apiRoutes] = await Promise.all([
 						appRouter(appDir, nextConfig?.pageExtensions, fileMatcher),
@@ -2163,7 +2233,7 @@ function vinext(options = {}) {
 			},
 			resolveId: {
 				filter: { id: new RegExp(`${/(?:next\/|vinext\/(?:shims\/|server\/(?:app-rsc-(?:combined-)?handler|app-router-entry|pages-router-entry))|virtual:vinext-|@vercel\/og(?:\.js)?$)/.source}|${nextImageAliasTargetRE.source}`) },
-				handler(id, importer) {
+				handler(id, importer, options) {
 					if (nextImageAliasTargetRE.test(id)) return this.environment?.name === "rsc" ? RESOLVED_NEXT_IMAGE_RSC : void 0;
 					const cleanId = toSlash(id.startsWith("\0") ? id.slice(1) : id);
 					if (cleanId === "vinext/server/app-rsc-combined-handler") {
@@ -2181,8 +2251,14 @@ function vinext(options = {}) {
 						return _appRscHandlerPath;
 					}
 					if (isVercelOgImport(cleanId) && !isVinextOgShimImporter(importer)) return resolveShimModulePath(_shimsDir, "og");
-					if (cleanId === "vinext/shims/image" && this.environment?.name !== "rsc") return this.resolve("next/image", importer, { skipSelf: true });
-					if (cleanId.startsWith("vinext/shims/")) return resolveShimModulePath(_shimsDir, stripJsExtension(stripViteModuleQuery(cleanId.slice(13))));
+					if (cleanId === "vinext/shims/image" && this.environment?.name !== "rsc" && !nextImageAliasedByUser) return this.resolve("next/image", importer, { skipSelf: true });
+					if (cleanId.startsWith("vinext/shims/")) {
+						const shimPath = resolveShimModulePath(_shimsDir, stripJsExtension(stripViteModuleQuery(cleanId.slice(13))));
+						return this.resolve(shimPath, importer, {
+							...options,
+							skipSelf: true
+						});
+					}
 					if (cleanId === VIRTUAL_WORKER_ENTRY) return RESOLVED_WORKER_ENTRY;
 					if (selectedMultiStageOutput && (cleanId === "vinext/server/app-router-entry" || cleanId === "vinext/server/pages-router-entry")) return RESOLVED_WORKER_ENTRY;
 					if (cleanId.endsWith("/" + VIRTUAL_WORKER_ENTRY)) return RESOLVED_WORKER_ENTRY;
@@ -2243,7 +2319,10 @@ function vinext(options = {}) {
 					const reactServerShim = _reactServerShims.get(cleanId);
 					if (reactServerShim !== void 0) {
 						const shimName = this.environment?.name === "rsc" ? `${reactServerShim}.react-server` : reactServerShim;
-						return resolveShimModulePath(_shimsDir, shimName);
+						return this.resolve(resolveShimModulePath(_shimsDir, shimName), importer, {
+							...options,
+							skipSelf: true
+						});
 					}
 				}
 			},
@@ -2313,7 +2392,6 @@ function vinext(options = {}) {
 						const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
 						const globalNotFoundPath = nextConfig?.globalNotFound ? findFileWithExts(appDir, "global-not-found", fileMatcher) : null;
 						if (id !== RESOLVED_APP_REQUEST_ENTRY) {
-							rscClassificationManifests.set(id, collectRouteClassificationManifest(routes));
 							rscActionOwnerRoutes = this.environment.config.command === "build" && hasServerActions ? routes : null;
 							rscActionOwnerSharedRoots = [globalErrorPath, globalNotFoundPath].filter((path) => path !== null);
 							clientReferenceRoutes = this.environment.config.command === "build" ? routes : null;
@@ -2383,7 +2461,12 @@ function vinext(options = {}) {
 							isDynamic: route.isDynamic,
 							patternParts: [...route.patternParts]
 						})) : [];
-						return generateBrowserEntry(graph.routes, pagesPrefetchRoutes, nextConfig.rewrites, nextConfig.i18n?.locales);
+						const classifyDynamicRoutes = this.environment.config.command === "build" && !nextConfig?.cacheComponents;
+						const readMdxEsm = classifyDynamicRoutes && pageExtensionsIncludeMdx(nextConfig?.pageExtensions ?? []) ? await loadMdxEsmReader(root) : null;
+						return generateBrowserEntry(graph.routes, pagesPrefetchRoutes, nextConfig.rewrites, nextConfig.i18n?.locales, classifyDynamicRoutes ? {
+							route: (route) => isAppPageRouteRenderedDynamically(route, readMdxEsm),
+							intercept: (intercept, layoutPaths) => isAppInterceptRenderedDynamically(intercept, layoutPaths, readMdxEsm)
+						} : void 0);
 					}
 					if (id === RESOLVED_APP_ROUTE_MANIFEST && hasAppDir) {
 						const graph = await appRouteGraph(appDir, nextConfig?.pageExtensions, fileMatcher);
@@ -2398,44 +2481,19 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					if (id.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
 				}
-			},
-			// @vitejs/plugin-rsc runs the RSC environment build in two phases:
-			renderChunk: {
-				order: "pre",
-				handler(code, chunk) {
-					if (this.environment?.name !== "rsc") return null;
-					const hasClassificationStub = code.includes("__VINEXT_CLASS");
-					if (!hasClassificationStub) return null;
-					const rscEntryId = [RESOLVED_RSC_ENTRY, RESOLVED_APP_RESPONSE_ENTRY].find((id) => chunk.moduleIds.includes(id));
-					if (!rscEntryId) return null;
-					const rscClassificationManifest = rscClassificationManifests.get(rscEntryId);
-					if (!rscClassificationManifest) return null;
-					const enableClassificationDebug = Boolean(process.env.VINEXT_DEBUG_CLASSIFICATION);
-					const patchPlan = hasClassificationStub && rscClassificationManifest ? planRouteClassificationInjection({
-						canonicalizeLayoutPath: canonicalize,
-						chunks: [{
-							code,
-							fileName: chunk.fileName
-						}],
-						dynamicShimPaths,
-						enableDebugReasons: enableClassificationDebug,
-						manifest: rscClassificationManifest,
-						moduleInfo: { getModuleInfo: (moduleId) => {
-							const info = this.getModuleInfo(moduleId);
-							if (!info) return null;
-							return {
-								importedIds: info.importedIds ?? [],
-								dynamicImportedIds: info.dynamicallyImportedIds ?? []
-							};
-						} }
-					}) : { kind: "skip" };
-					const nextCode = patchPlan.kind === "skip" ? code : patchPlan.code;
-					if (patchPlan.kind === "skip") return null;
-					rscClassificationManifests.delete(rscEntryId);
-					return {
-						code: nextCode,
-						map: null
-					};
+			}
+		},
+		{
+			name: "vinext:cloudflare-react-dom-edge",
+			enforce: "pre",
+			resolveId: {
+				filter: { id: /^react-dom\/(?:server|static)$/ },
+				handler(id, importer, options) {
+					if (!hasCloudflarePlugin || this.environment?.config.consumer !== "server" || this.environment.name === "rsc") return;
+					return this.resolve(`${id}.edge`, importer, {
+						...options,
+						skipSelf: true
+					});
 				}
 			}
 		},
@@ -2649,25 +2707,42 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		{
 			name: "vinext:client-entry-manifest",
 			apply: "build",
-			generateBundle(_options, bundle) {
-				if (this.environment?.name !== "client") return;
-				const manifest = {};
-				for (const chunk of Object.values(bundle)) {
-					if (chunk.type !== "chunk" || !chunk.isEntry) continue;
-					if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_CLIENT_ENTRY)) manifest.pagesClientEntry = chunk.fileName;
-					else if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_BROWSER_ENTRY)) manifest.appBrowserEntry = chunk.fileName;
+			generateBundle: {
+				order: "post",
+				handler(_options, bundle) {
+					if (this.environment?.name !== "client") return;
+					const manifest = {};
+					for (const chunk of Object.values(bundle)) {
+						if (chunk.type !== "chunk") continue;
+						if (chunk.isDynamicEntry && isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_ROUTE_MANIFEST)) manifest.appRouteManifest = chunk.fileName;
+						if (!chunk.isEntry) continue;
+						if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_CLIENT_ENTRY)) manifest.pagesClientEntry = chunk.fileName;
+						else if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_BROWSER_ENTRY)) manifest.appBrowserEntry = chunk.fileName;
+					}
+					if (clientReferenceModules) {
+						const appBrowserEntry = manifest.appBrowserEntry ? bundle[manifest.appBrowserEntry] : void 0;
+						manifest.appClientReferenceChunks = collectClientReferenceChunks(bundle, clientReferenceModules, appBrowserEntry?.type === "chunk" ? appBrowserEntry : void 0, this.environment.config.build.modulePreload);
+						const sources = collectClientReferenceSources(bundle, (moduleId) => this.getModuleInfo(moduleId)?.importedIds, this.environment.config.root);
+						if (sources) this.emitFile({
+							type: "asset",
+							fileName: VINEXT_CLIENT_REFERENCE_SOURCES,
+							source: JSON.stringify(sources, null, 2) + "\n"
+						});
+					}
+					if (!manifest.pagesClientEntry && !manifest.appBrowserEntry) return;
+					this.emitFile({
+						type: "asset",
+						fileName: VINEXT_CLIENT_ENTRY_MANIFEST,
+						source: JSON.stringify(manifest, null, 2) + "\n"
+					});
 				}
-				if (!manifest.pagesClientEntry && !manifest.appBrowserEntry) return;
-				this.emitFile({
-					type: "asset",
-					fileName: VINEXT_CLIENT_ENTRY_MANIFEST,
-					source: JSON.stringify(manifest, null, 2) + "\n"
-				});
 			}
 		},
+		createClientCompileHintsPlugin((id) => isVirtualEntryFacade(id, VIRTUAL_APP_BROWSER_ENTRY) || isVirtualEntryFacade(id, VIRTUAL_CLIENT_ENTRY)),
 		asyncHooksStubPlugin,
 		createInstrumentationClientTransformPlugin(() => instrumentationClientPath, () => nextConfig.instrumentationClientRouteManifest),
 		createInstrumentationServerTransformPlugin(() => instrumentationPath, () => nextConfig.instrumentationServerValueInjections),
+		createNextIntlCatalogPlugin(() => root, () => nextConfig.nextIntlCatalogLoader),
 		{
 			name: "vinext:instrumentation-client-inject",
 			enforce: "pre",
@@ -3180,11 +3255,12 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						const [pathname] = url.split("?");
 						if (url.startsWith("/@") || url.startsWith("/__vite") || url.startsWith("/node_modules") || url.includes(".") && !pathname.endsWith(".html") && !pathname.endsWith(".rsc")) return next();
 						const _reqStart = now();
+						const _reqWallStart = Date.now();
 						let _compileMs;
 						let _renderMs;
 						function _parseTiming(raw) {
 							const [handlerStart, inHandlerCompileMs, renderMs] = String(raw).split(",").map((v) => Number(v));
-							if (!Number.isNaN(handlerStart) && !Number.isNaN(inHandlerCompileMs) && inHandlerCompileMs !== -1) _compileMs = Math.max(0, Math.round(handlerStart - _reqStart)) + inHandlerCompileMs;
+							if (!Number.isNaN(handlerStart) && !Number.isNaN(inHandlerCompileMs) && inHandlerCompileMs !== -1) _compileMs = Math.max(0, Math.round(handlerStart - _reqWallStart)) + inHandlerCompileMs;
 							if (!Number.isNaN(renderMs) && renderMs !== -1) _renderMs = renderMs;
 						}
 						const _origSetHeader = res.setHeader.bind(res);
@@ -3855,7 +3931,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				const cache = imageImportDimCache;
 				let dims = cache.get(imagePath);
 				if (!dims) try {
-					const { imageSize } = await import("./deps/.pnpm/image-size@2.0.2/deps/image-size/dist/index.js");
+					const { imageSize } = await import("./deps/.pnpm/image-size@2.0.4/deps/image-size/dist/esm/index.js");
 					const result = imageSize(fs.readFileSync(imagePath));
 					dims = {
 						width: result.width ?? 0,
@@ -4178,6 +4254,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						pagesClientAssetsModule = buildPagesClientAssetsModule({
 							clientEntry: runtimeMetadata.clientEntryFile ?? void 0,
 							appBootstrapPreinitModules: runtimeMetadata.appBootstrapPreinitModules,
+							appRouteManifestModule: runtimeMetadata.appRouteManifestModule,
+							appClientReferenceChunks: runtimeMetadata.appClientReferenceChunks,
 							ssrManifest,
 							cssGraph: runtimeMetadata.cssGraph,
 							sharedChunks: runtimeMetadata.sharedChunks,
@@ -4392,6 +4470,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 	if (rscPluginPromise) {
 		plugins.push(createRscReferenceValidationNormalizerPlugin());
 		plugins.push(createRscClientReferenceLoadersPlugin({
+			onClientReferenceModules(modules) {
+				clientReferenceModules = modules;
+			},
 			routes: {
 				canonicalizeModuleId: canonicalize,
 				getAlwaysRenderedFiles: () => clientReferenceAlwaysRenderedFiles,