vinext 1.2.1 → 1.3.1

package/dist/index.js

@@ -1,5 +1,6 @@
 import path, { toSlash } from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { detectPackageManager, formatMissingCloudflarePluginError, hasWranglerConfig } from "./utils/project.js";
+import { escapeRegExp } from "./utils/regex.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, normalizeViteResolveExtensions } from "./routing/file-matcher.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
 import { TRIVIA_PATTERN, hasImportAttributes, isTypeOnlyImport, parseModuleRecord, parseProgram } from "./plugins/ast-utils.js";
@@ -7,6 +8,7 @@ import { claimViteCliBuildInvocation, getViteCliInvocation, isViteCliConfigFile
 import { VINEXT_DEV_CLI_LIFECYCLE, applyDevServerDefaults, claimViteCliDevInvocation, createDevServerLifecyclePlugin, reserveViteCliDevInvocation } from "./cli-dev-config.js";
 import { isUnknownRecord } from "./utils/record.js";
 import { getReactUpgradeDeps, reactUpgradeRequiredMessage } from "./utils/react-version.js";
+import { resolvePluginReactPath } from "./utils/plugin-react-version.js";
 import { loadDotenv } from "./config/dotenv.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
 import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
@@ -28,14 +30,14 @@ import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./rout
 import { resolveRuntimeEntryModule } from "./entries/runtime-entry-module.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
-import { resolvePagesI18nRequest, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
+import { resolvePagesI18nRequest, shouldRestoreLocaleRootTrailingSlash, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
 import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
 import { extractMiddlewareMatcherConfig, extractMiddlewareMatcherConfigValue, hasExportedName } from "./build/report.js";
 import { generatePagesRequestEntry, generatePagesResponseEntry, generateServerEntry } from "./entries/pages-server-entry.js";
 import { compileClientMiddlewareMatchers, generateClientEntry } from "./entries/pages-client-entry.js";
-import { isPathInside, isPathInsideOrEqual, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
+import { canonicalizeFilePath, isPathInside, isPathInsideOrEqual, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { logRequest, now } from "./server/request-log.js";
 import { getPagesPreviewModeId } from "./server/pages-preview.js";
 import { createSSRHandler } from "./server/dev-server.js";
@@ -44,30 +46,34 @@ 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";
 import { shouldInvalidateAppRouteFile } from "./server/dev-route-files.js";
 import { createDirectRunner } from "./server/dev-module-runner.js";
+import { rootBoundaryFiles, rootBoundaryRouteFiles } from "./entries/app-rsc-manifest.js";
 import { validateDevRequest } from "./server/dev-origin-check.js";
 import { createActionOwnerManifestPlugin } from "./plugins/action-owner-manifest.js";
 import { generateAppRequestRscEntry, generateAppResponseRscEntry, generateRscEntry } from "./entries/app-rsc-entry.js";
 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, toLinkPrefetchRoutes } from "./entries/app-browser-entry.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";
 import { ensureAssetsIgnore } from "./build/assets-ignore.js";
-import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-manifests.js";
+import { registerNitroPublicFiles } from "./build/nitro-public-files.js";
+import { emitNextClientRuntimeManifests, getPagesManifestPage } from "./build/next-client-runtime-manifests.js";
 import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
 import { readTrustedRevalidationHostname } from "./server/revalidation-host.js";
 import { sealForwardedMiddlewareContext } from "./server/forwarded-middleware-context.js";
@@ -80,10 +86,13 @@ 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";
-import { createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-reference-loaders.js";
+import { createWorkerImageImportsPlugin } from "./plugins/worker-image-imports.js";
+import { assertClientOutDirIsSeparate, createClientAssetFileNames, createClientCodeSplittingConfig, createClientManualChunks, createClientOutputFileNameDefaults, createMultiStageChunkFileNames, createMultiStageCodeSplittingConfig, createRscFrameworkChunkOutputConfig, createWorkerFileNames, findUnsupportedClientOutputFileNames, getBuildBundlerOptions, getClientTreeshakeConfig, getOutputFileNames, withBuildBundlerOptions } from "./build/client-build-config.js";
+import { createRouteClientReferencesFallbackPlugin, createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-reference-loaders.js";
 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";
@@ -107,14 +116,13 @@ import { createTransitiveExternalsPlugin } from "./plugins/transitive-externals.
 import public_shim_map_default from "./shims/public-shim-map.json.js";
 import { computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
 import { readPrerenderSecret, readServerRuntimeOutputDirs } from "./build/server-manifest.js";
-import { createModuleDependencyCache } from "./build/module-dependency-cache.js";
+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 { assertClientOutDirIsSeparate, createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createMultiStageChunkFileNames, createMultiStageCodeSplittingConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfig, withBuildBundlerOptions } from "./build/client-build-config.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";
-import { createWorkerImageImportsPlugin } from "./plugins/worker-image-imports.js";
 import { SERVER_ONLY_SPECIFIER_RE, createWorkerServerOnlyImportsPlugin } from "./plugins/worker-server-only-imports.js";
 import { createWorkerUseServerPlugins } from "./plugins/worker-use-server.js";
 import { createRequireContextPlugin } from "./plugins/require-context.js";
@@ -126,7 +134,7 @@ import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
 import { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, mayFoldChangeScannedImports, replaceConsumerEnvironmentConditions } from "./plugins/typeof-window.js";
 import { hasMdxFiles, loadMdxEsmReader, pageExtensionsIncludeMdx } from "./utils/mdx-scan.js";
 import { publicFileRouteKey } from "./utils/public-file-path.js";
-import { scanPublicFileRoutes } from "./utils/public-routes.js";
+import { scanPublicFileRoutes, scanPublicFiles } from "./utils/public-routes.js";
 import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
 import { assertPluginRscVersion, needsAppReactServerDom } from "./utils/plugin-rsc-version.js";
 import { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine } from "./utils/vite-version.js";
@@ -134,7 +142,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";
@@ -156,6 +164,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",
@@ -185,13 +198,17 @@ function scopeRscPlugin(plugin) {
 	};
 }
 const earlyViteCliInvocation = getViteCliInvocation();
+let earlyDotenv;
 const viteCliBuildConfigNodeEnv = earlyViteCliInvocation?.command === "build" && process.env.NODE_ENV === "test" ? "test" : void 0;
 if (earlyViteCliInvocation) {
 	if (!process.env.NODE_ENV) Reflect.set(process.env, "NODE_ENV", earlyViteCliInvocation.command === "build" ? viteCliBuildConfigNodeEnv ?? "production" : earlyViteCliInvocation.mode === "test" ? "test" : "development");
-	loadDotenv({
-		root: earlyViteCliInvocation.root,
-		mode: earlyViteCliInvocation.mode
-	});
+	earlyDotenv = {
+		dir: path.resolve(earlyViteCliInvocation.root),
+		env: loadDotenv({
+			root: earlyViteCliInvocation.root,
+			mode: earlyViteCliInvocation.mode
+		}).loadedEnv
+	};
 }
 installSocketErrorBackstop();
 const INVALID_SERVER_ONLY_ID_PREFIX = "\0vinext:invalid-server-only:";
@@ -391,23 +408,35 @@ async function collectDevPagesAppStylesheetAssets(appFilePath, getModuleDependen
 	await visitModule(appFilePath);
 	return stylesheetAssets;
 }
-function createDevPagesModuleDependencyReader(root, resolve) {
-	return createModuleDependencyCache(collectModuleDependencies);
+function createDevPagesModuleDependencyReader(root, resolve, store) {
+	return createModuleDependencyCache((modulePath) => store.read(modulePath, collectModuleDependencies));
 	async function collectModuleDependencies(modulePath) {
+		const dependencies = [];
+		const entry = {
+			dependencies,
+			resolvedFiles: [],
+			cacheable: true
+		};
 		const cleanModulePath = stripViteModuleQuery(modulePath);
-		if (!path.isAbsolute(cleanModulePath) || !fs.existsSync(cleanModulePath)) return [];
+		if (!path.isAbsolute(cleanModulePath) || !fs.existsSync(cleanModulePath)) return entry;
 		let code;
 		try {
 			code = fs.readFileSync(cleanModulePath, "utf-8");
 		} catch {
-			return [];
+			return {
+				...entry,
+				cacheable: false
+			};
 		}
 		const record = parseModuleRecord(code, parserLanguageForScript(cleanModulePath));
-		if (!record) return [];
-		const dependencies = [];
+		if (!record) return entry;
 		for (const specifier of runtimeStaticDependencySpecifiers(code, record, parserLanguageForScript(cleanModulePath))) {
 			const resolved = await resolve(specifier, cleanModulePath, { skipSelf: false });
-			if (!resolved?.id) continue;
+			if (!resolved?.id) {
+				entry.cacheable = false;
+				continue;
+			}
+			entry.resolvedFiles.push(stripViteModuleQuery(resolved.id));
 			if (isStylesheetSpecifier(specifier) || isStylesheetSpecifier(resolved.id)) {
 				const asset = resolvedStylesheetToDevManifestAsset(root, resolved.id);
 				if (asset) dependencies.push({
@@ -419,7 +448,7 @@ function createDevPagesModuleDependencyReader(root, resolve) {
 				id: resolved.id
 			});
 		}
-		return dependencies;
+		return entry;
 	}
 }
 const TSCONFIG_FILES = ["tsconfig.json", "jsconfig.json"];
@@ -762,13 +791,18 @@ const VIRTUAL_APP_SSR_ENTRY = "virtual:vinext-app-ssr-entry";
 const RESOLVED_APP_SSR_ENTRY = "\0" + VIRTUAL_APP_SSR_ENTRY;
 const VIRTUAL_APP_BROWSER_ENTRY = "virtual:vinext-app-browser-entry";
 const RESOLVED_APP_BROWSER_ENTRY = "\0" + VIRTUAL_APP_BROWSER_ENTRY;
+const VIRTUAL_APP_ROUTE_MANIFEST = "virtual:vinext-app-route-manifest";
+const RESOLVED_APP_ROUTE_MANIFEST = "\0" + VIRTUAL_APP_ROUTE_MANIFEST;
 const VIRTUAL_APP_CAPABILITIES = "virtual:vinext-app-capabilities";
 const RESOLVED_APP_CAPABILITIES = "\0" + VIRTUAL_APP_CAPABILITIES;
 const RESOLVED_ROOT_PARAMS = "\0virtual:vinext-root-params";
+const RESOLVED_NEXT_IMAGE_RSC = "\0virtual:vinext-next-image-rsc";
 const APP_REQUEST_STAGE_ENTRY = resolveRuntimeEntryModule("app-request-stage-independent-entry");
 const APP_RESPONSE_STAGE_ENTRY = resolveRuntimeEntryModule("app-response-stage-entry");
 const PAGES_REQUEST_STAGE_ENTRY = resolveRuntimeEntryModule("pages-request-stage-entry");
 const PAGES_RESPONSE_STAGE_ENTRY = resolveRuntimeEntryModule("pages-response-stage-entry");
+const NITRO_PUBLIC_FILES_ENTRY = resolveRuntimeEntryModule("nitro-public-files");
+const NITRO_PUBLIC_FILES_PLUGIN = resolveRuntimeEntryModule("nitro-public-files-plugin");
 const WORKER_ROUTER_ENTRIES = /* @__PURE__ */ new Set([resolveRuntimeEntryModule("app-router-entry"), resolveRuntimeEntryModule("pages-router-entry")]);
 /** Virtual module that registers config-driven cache adapters (see VinextOptions.cache). */
 const RESOLVED_CACHE_ADAPTERS = "\0" + VIRTUAL_CACHE_ADAPTERS;
@@ -883,13 +917,8 @@ const clientManualChunks = createClientManualChunks(_shimsDir);
 const clientCodeSplittingConfig = createClientCodeSplittingConfig(clientManualChunks);
 const appClientManualChunks = createClientManualChunks(_shimsDir, true);
 const appClientCodeSplittingConfig = createClientCodeSplittingConfig(appClientManualChunks);
-function getClientOutputConfig(assetsDir, preserveAppRouteBoundaries = false) {
-	const codeSplitting = preserveAppRouteBoundaries ? appClientCodeSplittingConfig : clientCodeSplittingConfig;
-	return {
-		...createClientFileNameConfig(assetsDir),
-		assetFileNames: createClientAssetFileNames(assetsDir),
-		codeSplitting
-	};
+function getClientOutputConfig(preserveAppRouteBoundaries = false) {
+	return { codeSplitting: preserveAppRouteBoundaries ? appClientCodeSplittingConfig : clientCodeSplittingConfig };
 }
 function createServerEnvironmentFileNameResolver(config, outputRoot) {
 	const resolvedOutputRoot = path.resolve(config.root, outputRoot);
@@ -928,6 +957,10 @@ function vinext(options = {}) {
 	let clientInjectModule = null;
 	let globalNotFoundCssIsolationPath = null;
 	let clientAssetsInlineLimit = 0;
+	let clientOutputFileNamesAssetsDir = null;
+	let plainPagesSsrFileNamesAssetsDir = null;
+	let topLevelFileNames = {};
+	let environmentFileNames = {};
 	let hasCloudflarePlugin = false;
 	let matchedMultiStageOutput;
 	let selectedMultiStageOutput;
@@ -935,6 +968,8 @@ function vinext(options = {}) {
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
 	let nitroHostRuntime = "node";
+	let nitroPublicFiles = false;
+	let nitroPublicDir = "public";
 	let resolvedServerExternalPackages = [];
 	let registerNodeOpenTelemetryLoader = false;
 	let pagesTsconfigAliases = {};
@@ -956,6 +991,7 @@ function vinext(options = {}) {
 	});
 	const pagesClientAssetsOutputDirs = /* @__PURE__ */ new Set();
 	const pagesClientAssetsExternalTargets = /* @__PURE__ */ new Map();
+	const devPagesModuleDependencyStores = /* @__PURE__ */ new Map();
 	const resolvePagesClientAssetsOutputDir = (environmentName, outputDir) => !selectedMultiStageOutput && !hasAppDir && !hasCloudflarePlugin && environmentName === "ssr" ? path.dirname(outputDir) : outputDir;
 	let pagesClientAssetsModule = internalOptions.__pagesClientAssetsModule ?? null;
 	let clientBuildFiles = [];
@@ -973,6 +1009,10 @@ function vinext(options = {}) {
 	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();
 	const serverRuntimeOutputDirs = /* @__PURE__ */ new Set();
 	function recordServerEntryLoad(environmentName, id) {
@@ -985,6 +1025,8 @@ function vinext(options = {}) {
 		entries.add(id);
 	}
 	const shimsDir = path.resolve(__dirname, "shims");
+	const nextImageAliasTarget = toSlash(path.join(shimsDir, "image"));
+	const nextImageAliasTargetRE = new RegExp(`^${nextImageAliasTarget.split("/").map(escapeRegExp).join("[\\\\/]")}$`);
 	const canonicalize = (p) => toSlash(tryRealpathSync(p) ?? p);
 	const pageTransformCanonicalPaths = /* @__PURE__ */ new Map();
 	const canonicalizePageTransformPath = (modulePath) => {
@@ -1005,6 +1047,8 @@ function vinext(options = {}) {
 		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`.
@@ -1032,9 +1076,10 @@ function vinext(options = {}) {
 	* __NEXT_DATA__ to determine which page to hydrate.
 	*/
 	async function generateClientEntry$1() {
-		const appPrefetchRoutes = hasAppDir ? toLinkPrefetchRoutes(await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)) : [];
+		const appRoutes = hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : [];
 		return generateClientEntry(pagesDir, nextConfig, fileMatcher, {
-			appPrefetchRoutes,
+			appPrefetchRoutes: toLinkPrefetchRoutes(appRoutes),
+			appRouteHandlers: toHashedRouteHandlerRoutes(appRoutes),
 			instrumentationClientPath,
 			middlewareMatcher: middlewarePath ? extractMiddlewareMatcherConfig(middlewarePath) : void 0,
 			reactPreamble: options.react !== false
@@ -1051,28 +1096,29 @@ function vinext(options = {}) {
 	const earlyRoot = earlyViteCliInvocation?.root ?? process.cwd();
 	const earlyBaseDir = path.resolve(earlyRoot, options.appDir ?? ".");
 	const earlyAppDirExists = !options.disableAppRouter && (fs.existsSync(path.join(earlyBaseDir, "app")) || fs.existsSync(path.join(earlyBaseDir, "src", "app")));
-	let resolvedReactPath = null;
 	let resolvedRscPath = null;
 	let rscPluginModulePromise = null;
-	resolvedReactPath = resolveOptionalDependency(earlyBaseDir, "@vitejs/plugin-react");
 	resolvedRscPath = resolveOptionalDependency(earlyBaseDir, "@vitejs/plugin-rsc");
 	const rscVersion = earlyAppDirExists && resolvedRscPath ? assertPluginRscVersion(resolvedRscPath) : null;
 	let rscPluginPromise = null;
 	let manualUseCachePluginPromise = null;
+	const rscPluginOptions = { entries: {
+		rsc: VIRTUAL_RSC_ENTRY,
+		ssr: VIRTUAL_APP_SSR_ENTRY,
+		client: VIRTUAL_APP_BROWSER_ENTRY
+	} };
+	let serverActionsEncryptionKey;
 	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");
 		const rscImport = import(pathToFileURL(resolvedRscPath).href);
 		rscPluginModulePromise = rscImport;
 		rscPluginPromise = rscImport.then(async (mod) => {
 			const rsc = mod.default;
-			const plugins = rsc({ entries: {
-				rsc: VIRTUAL_RSC_ENTRY,
-				ssr: VIRTUAL_APP_SSR_ENTRY,
-				client: VIRTUAL_APP_BROWSER_ENTRY
-			} });
+			const plugins = rsc(rscPluginOptions);
 			const useCachePlugin = await createUseCacheCallablePlugin({
 				projectRoot: earlyBaseDir,
-				cacheRuntime: pathToFileURL(resolveShimModulePath(shimsDir, "cache-callable-runtime")).href
+				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.");
@@ -1101,6 +1147,7 @@ function vinext(options = {}) {
 	let reactPluginPromise = null;
 	let reactCompilerPluginPromise = null;
 	if (options.react !== false) {
+		const resolvedReactPath = resolvePluginReactPath(earlyBaseDir);
 		if (!resolvedReactPath) throw new Error("vinext: @vitejs/plugin-react is not installed.\nRun: " + detectPackageManager(process.cwd()) + " @vitejs/plugin-react");
 		const allReactPlugins = import(pathToFileURL(resolvedReactPath).href).catch((cause) => {
 			throw new Error("vinext: Failed to load @vitejs/plugin-react.", { cause });
@@ -1378,6 +1425,7 @@ function vinext(options = {}) {
 				originalPlainPagesEnvironments = void 0;
 				buildEmptyOutDir = typeof config.build?.emptyOutDir === "boolean" ? config.build.emptyOutDir : void 0;
 				isServeCommand = env.command === "serve";
+				const ipaddrSsrExternal = env.command === "serve" ? ["ipaddr.js"] : [];
 				root = path.resolve(toSlash(process.cwd()), config.root ?? ".");
 				if (env.command === "build") assertClientOutDirIsSeparate(root, options);
 				const devCliLifecycleEnabled = env.command === "serve" && env.isPreview !== true && claimViteCliDevInvocation(root, config["__vinextDevRestart"] === true, reservedDevCliInvocation && config.configFile === false);
@@ -1388,13 +1436,15 @@ function vinext(options = {}) {
 				let sassTsconfigPathAliases = [];
 				const swcHelpersAlias = resolveSwcHelpersAlias(root);
 				const mode = env?.mode ?? "development";
-				if (config.envDir !== false) {
-					const envDir = config.envDir ?? root;
-					loadDotenv({
-						root: envDir,
-						mode
-					});
+				const envDir = config.envDir === false ? void 0 : config.envDir ? path.resolve(root, config.envDir) : root;
+				if (earlyDotenv && envDir !== earlyDotenv.dir) {
+					for (const [key, value] of Object.entries(earlyDotenv.env)) if (process.env[key] === value) Reflect.deleteProperty(process.env, key);
+					earlyDotenv = void 0;
 				}
+				if (envDir) loadDotenv({
+					root: envDir,
+					mode
+				});
 				let resolvedNodeEnv;
 				if (env?.command === "build" || env?.isPreview === true) resolvedNodeEnv = "production";
 				else if (mode === "test") resolvedNodeEnv = "test";
@@ -1443,6 +1493,13 @@ function vinext(options = {}) {
 						buildId: sharedBuildId
 					};
 				}
+				if (rscPluginPromise) {
+					serverActionsEncryptionKey = loadOrGenerateServerActionsEncryptionKey({
+						root,
+						isBuild: env.command === "build"
+					});
+					rscPluginOptions.defineEncryptionKey = `process.env.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY || ${JSON.stringify(serverActionsEncryptionKey)}`;
+				}
 				if (env?.command === "build" && earlyViteCliInvocation?.command === "build") Reflect.set(process.env, "NODE_ENV", "production");
 				const configuredTsconfigPath = isUnknownRecord(nextConfig.typescript) ? typeof nextConfig.typescript.tsconfigPath === "string" ? nextConfig.typescript.tsconfigPath : void 0 : void 0;
 				const resolvedTsconfigAliases = resolveTsconfigAliases(root, configuredTsconfigPath);
@@ -1520,9 +1577,9 @@ function vinext(options = {}) {
 				defines["process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_SVG"] = JSON.stringify(String(nextConfig.images?.dangerouslyAllowSVG ?? false));
 				defines["process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_LOCAL_IP"] = JSON.stringify(String(nextConfig.images?.dangerouslyAllowLocalIP ?? false));
 				defines["process.env.__VINEXT_IMAGE_UNOPTIMIZED"] = JSON.stringify(String(nextConfig.images?.unoptimized === true));
-				defines["process.env.__VINEXT_BUILD_ID"] = JSON.stringify(nextConfig.buildId);
-				defines["process.env.__VINEXT_RSC_COMPATIBILITY_ID"] = JSON.stringify(rscCompatibilityId);
-				defines["process.env.__VINEXT_RSC_BUILD_IDENTITY"] = JSON.stringify(rscBuildIdentity ?? "");
+				defines["process.env.__VINEXT_BUILD_ID"] = "undefined";
+				defines["process.env.__VINEXT_RSC_COMPATIBILITY_ID"] = JSON.stringify("");
+				defines["process.env.__VINEXT_RSC_BUILD_IDENTITY"] = JSON.stringify("");
 				defines["process.env.__VINEXT_DEPLOYMENT_ID"] = JSON.stringify(nextConfig.deploymentId ?? "");
 				defines["process.env.NEXT_DEPLOYMENT_ID"] = nextConfig.deploymentId ? JSON.stringify(nextConfig.deploymentId) : "false";
 				defines["process.env.NEXT_RUNTIME"] = "\"\"";
@@ -1572,6 +1629,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);
@@ -1608,6 +1666,10 @@ function vinext(options = {}) {
 				const hasClientBuildEnvironment = hasAppDir || hasCloudflarePlugin || hasNitroPlugin || shouldInjectPlainPagesEnvironments;
 				const clientAssetsDir = resolveAssetsDir(nextConfig.assetPrefix ?? "");
 				clientAssetsInlineLimit = config.build?.assetsInlineLimit ?? 0;
+				clientOutputFileNamesAssetsDir = !isSSR && !isMultiEnv || hasAppDir || hasCloudflarePlugin || shouldInjectPlainPagesEnvironments ? clientAssetsDir : null;
+				plainPagesSsrFileNamesAssetsDir = !isMultiEnv && shouldInjectPlainPagesEnvironments ? clientAssetsDir : null;
+				topLevelFileNames = getOutputFileNames(getBuildBundlerOptions(config.build)?.output);
+				environmentFileNames = Object.fromEntries(Object.entries(config.environments ?? {}).map(([environmentName, environment]) => [environmentName, getOutputFileNames(getBuildBundlerOptions(environment?.build)?.output)]));
 				const devHmrConfig = config.server?.hmr === false ? false : {
 					...typeof config.server?.hmr === "object" ? config.server.hmr : {},
 					overlay: false
@@ -1652,7 +1714,7 @@ function vinext(options = {}) {
 								};
 							})(),
 							...!isSSR && !isMultiEnv ? { treeshake: getClientTreeshakeConfig() } : {},
-							...!isSSR && !isMultiEnv ? { output: getClientOutputConfig(clientAssetsDir) } : {}
+							...!isSSR && !isMultiEnv ? { output: getClientOutputConfig() } : {}
 						})
 					},
 					worker: { plugins: () => [
@@ -1682,7 +1744,7 @@ function vinext(options = {}) {
 							"react",
 							"react-dom",
 							"react-dom/server",
-							"ipaddr.js",
+							...ipaddrSsrExternal,
 							...Array.isArray(config.ssr?.external) ? config.ssr.external : [],
 							...nextServerExternal
 						],
@@ -1765,12 +1827,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)] : [])] : [];
@@ -1825,7 +1887,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 };
@@ -1845,13 +1906,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: {
@@ -1867,13 +1924,14 @@ function vinext(options = {}) {
 							...hasCloudflarePlugin || hasNitroPlugin ? {} : { resolve: {
 								external: userSsrExternal === true ? true : [
 									...userSsrExternal,
-									"ipaddr.js",
+									...ipaddrSsrExternal,
 									...externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []
 								],
 								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
 							},
@@ -1885,7 +1943,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,
@@ -1905,7 +1963,7 @@ function vinext(options = {}) {
 								assetsInlineLimit: clientAssetsInlineLimit,
 								...withBuildBundlerOptions({
 									input: appClientInput,
-									output: getClientOutputConfig(clientAssetsDir, true),
+									output: getClientOutputConfig(true),
 									treeshake: getClientTreeshakeConfig()
 								})
 							}
@@ -1925,7 +1983,7 @@ function vinext(options = {}) {
 						assetsInlineLimit: clientAssetsInlineLimit,
 						...withBuildBundlerOptions({
 							input: { index: VIRTUAL_CLIENT_ENTRY },
-							output: getClientOutputConfig(clientAssetsDir),
+							output: getClientOutputConfig(),
 							treeshake: getClientTreeshakeConfig()
 						})
 					}
@@ -1946,7 +2004,7 @@ function vinext(options = {}) {
 								assetsInlineLimit: clientAssetsInlineLimit,
 								...withBuildBundlerOptions({
 									input: { index: VIRTUAL_CLIENT_ENTRY },
-									output: getClientOutputConfig(clientAssetsDir),
+									output: getClientOutputConfig(),
 									treeshake: getClientTreeshakeConfig()
 								})
 							}
@@ -1957,13 +2015,13 @@ function vinext(options = {}) {
 									"react",
 									"react-dom",
 									"react-dom/server",
-									"ipaddr.js",
+									...ipaddrSsrExternal,
 									...nextServerExternal
 								],
 								noExternal: true
 							},
 							optimizeDeps: {
-								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], Object.keys(nextShimMap)),
+								exclude: mergeOptimizeDepsExclude(incomingExclude, shimOptimizeDepsExclude, ["ipaddr.js"]),
 								...depOptimizeNodeEnvOptions
 							},
 							build: {
@@ -1991,17 +2049,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);
@@ -2016,11 +2084,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;
@@ -2031,16 +2109,14 @@ function vinext(options = {}) {
 					Object.assign(config, { logger: createOptionalOptimizeDepsLogger(config.logger, optionalWarnings) });
 				}
 				if (config.worker?.rolldownOptions) {
-					const workerFileNames = `${resolveAssetsDir(nextConfig.assetPrefix ?? "")}/workers/[name]-[hash].js`;
+					const workerFileNames = createWorkerFileNames(resolveAssetsDir(nextConfig.assetPrefix ?? ""), config.root);
 					const workerOutputs = config.worker.rolldownOptions.output;
 					config.worker.rolldownOptions.output = Array.isArray(workerOutputs) ? (workerOutputs.length > 0 ? workerOutputs : [{}]).map((output) => ({
 						...output,
-						entryFileNames: workerFileNames,
-						chunkFileNames: workerFileNames
+						...workerFileNames
 					})) : {
 						...workerOutputs,
-						entryFileNames: workerFileNames,
-						chunkFileNames: workerFileNames
+						...workerFileNames
 					};
 				}
 				sassComposesLoader.setResolvedConfig(config);
@@ -2114,8 +2190,9 @@ function vinext(options = {}) {
 				}
 			},
 			resolveId: {
-				filter: { id: /(?:next\/|vinext\/(?:shims\/|server\/(?:app-rsc-(?:combined-)?handler|app-router-entry|pages-router-entry))|virtual:vinext-|@vercel\/og(?:\.js)?$)/ },
+				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) {
+					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") {
 						if (_canExternalizeAppRscHandler && this.environment?.name === "rsc" && this.environment.config?.command === "serve") return {
@@ -2132,6 +2209,7 @@ 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 === 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;
@@ -2174,6 +2252,7 @@ function vinext(options = {}) {
 					if (cleanId === VIRTUAL_APP_RESPONSE_ENTRY) return RESOLVED_APP_RESPONSE_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_ROUTE_MANIFEST) return RESOLVED_APP_ROUTE_MANIFEST;
 					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")) return RESOLVED_CACHE_ADAPTERS;
@@ -2207,7 +2286,8 @@ function vinext(options = {}) {
 						].join("\n");
 						const entry = hasAppDir ? "vinext/server/app-router-entry" : "vinext/server/pages-router-entry";
 						if (!hasAppDir && hasNitroPlugin) return [
-							`import worker from ${JSON.stringify(entry)};`,
+							`import pagesWorker from ${JSON.stringify(entry)};`,
+							...nitroPublicFiles ? [`import { withNitroPagesPublicFiles } from ${JSON.stringify(NITRO_PUBLIC_FILES_ENTRY)};`, "const worker = withNitroPagesPublicFiles(pagesWorker);"] : ["const worker = pagesWorker;"],
 							"export default { fetch(request, env, ctx) {",
 							`  return worker.fetch(request, env, { ...ctx, hostRuntime: ${JSON.stringify(nitroHostRuntime)} });`,
 							"} };"
@@ -2238,7 +2318,12 @@ function vinext(options = {}) {
 						const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
 						const pagesRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 						const moduleFilePaths = [...appFilePath ? [appFilePath] : [], ...pagesRoutes.map((route) => route.filePath)];
-						const getModuleDependencies = createDevPagesModuleDependencyReader(root, this.resolve.bind(this));
+						let dependencyStore = devPagesModuleDependencyStores.get(this.environment.name);
+						if (!dependencyStore) {
+							dependencyStore = new ModuleDependencyStore();
+							devPagesModuleDependencyStores.set(this.environment.name, dependencyStore);
+						}
+						const getModuleDependencies = createDevPagesModuleDependencyReader(root, this.resolve.bind(this), dependencyStore);
 						for (const moduleFilePath of moduleFilePaths) {
 							const stylesheetAssets = await collectDevPagesAppStylesheetAssets(moduleFilePath, getModuleDependencies);
 							if (stylesheetAssets.length > 0) ssrManifest[toSlash(moduleFilePath)] = stylesheetAssets;
@@ -2259,6 +2344,9 @@ function vinext(options = {}) {
 							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;
+							clientReferenceAlwaysRenderedFiles = [...globalErrorPath ? [globalErrorPath] : [], ...rootBoundaryFiles(routes)];
+							clientReferenceRoutelessFiles = [...rootBoundaryRouteFiles(routes), ...globalNotFoundPath ? [globalNotFoundPath] : []];
 						}
 						return (id === RESOLVED_APP_REQUEST_ENTRY ? generateAppRequestRscEntry : id === RESOLVED_APP_RESPONSE_ENTRY ? generateAppResponseRscEntry : generateRscEntry)(appDir, routes, middlewarePath, metaRoutes, globalErrorPath, nextConfig?.basePath, nextConfig?.trailingSlash, {
 							redirects: nextConfig?.redirects,
@@ -2273,6 +2361,7 @@ function vinext(options = {}) {
 							nodeOpenTelemetryLoader: registerNodeOpenTelemetryLoader,
 							assetPrefix: nextConfig?.assetPrefix,
 							crossOrigin: nextConfig?.crossOrigin,
+							skipProxyUrlNormalize: nextConfig?.skipProxyUrlNormalize,
 							skipTrailingSlashRedirect: nextConfig?.skipTrailingSlashRedirect,
 							expireTime: nextConfig?.expireTime,
 							reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
@@ -2302,27 +2391,36 @@ function vinext(options = {}) {
 							devForwardedMiddlewareContextKey: isServeCommand && this.environment.config.consumer === "server" ? devForwardedMiddlewareContextKey : void 0
 						}, instrumentationPath);
 					}
+					if (id === RESOLVED_NEXT_IMAGE_RSC) return [
+						`export { getImageProps, imageOptimizationUrl } from "vinext/shims/image-props";`,
+						`export { default } from "vinext/shims/image";`,
+						""
+					].join("\n");
 					if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
 					if (id === RESOLVED_CACHE_ADAPTERS) return generateCacheAdaptersModule(options.cache);
 					if (id === RESOLVED_CDN_CACHE_ADAPTER) return generateCdnCacheAdapterModule(options.cache);
 					if (id === RESOLVED_IMAGE_ADAPTERS) return generateImageAdaptersModule(options.images);
 					if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) {
 						recordServerEntryLoad(this.environment?.name, id);
-						return generateSsrEntry(hasPagesDir);
+						return generateSsrEntry(hasPagesDir, nitroPublicFiles ? NITRO_PUBLIC_FILES_ENTRY : null);
 					}
 					if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) {
 						const graph = await appRouteGraph(appDir, nextConfig?.pageExtensions, fileMatcher);
-						const pagesPrefetchRoutes = hasPagesDir ? [...(await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => ({
-							canPrefetchLoadingShell: false,
-							isDynamic: route.isDynamic,
-							patternParts: [...route.patternParts]
-						})), ...(await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => ({
+						const pagesPrefetchRoutes = hasPagesDir ? (await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => ({
 							canPrefetchLoadingShell: false,
-							documentOnly: true,
 							isDynamic: route.isDynamic,
 							patternParts: [...route.patternParts]
-						}))] : [];
-						return generateBrowserEntry(graph.routes, graph.routeManifest, 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);
+						return generateBrowserRouteManifestModule(graph.routeManifest);
 					}
 					if (id === RESOLVED_APP_CAPABILITIES && hasAppDir) {
 						const hasServerActions = await resolveHasServerActions(this.environment.config);
@@ -2374,6 +2472,20 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 			}
 		},
+		{
+			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
+					});
+				}
+			}
+		},
 		{
 			name: "vinext:cloudflare-framework-tracing",
 			transform: {
@@ -2488,12 +2600,36 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			name: "vinext:css-url-assets-defaults",
 			apply: "build",
 			configEnvironment(name, config) {
-				if (name === "client") return { build: { assetsInlineLimit: clientAssetsInlineLimit } };
-				if (!hasAppDir || name !== "rsc" && name !== "ssr") return null;
+				if (name === "client") {
+					const output = getBuildBundlerOptions(config.build)?.output;
+					const fileNameDefaults = clientOutputFileNamesAssetsDir ? createClientOutputFileNameDefaults(output, clientOutputFileNamesAssetsDir) : null;
+					if (clientOutputFileNamesAssetsDir) {
+						const unsupported = findUnsupportedClientOutputFileNames(output, clientOutputFileNamesAssetsDir);
+						if (unsupported.length > 0) console.warn(`[vinext] Client output file names should stay under "${clientOutputFileNamesAssetsDir}/", include [hash], emit ".js" chunks and start asset basenames with "[name]." or "[name]-" and end them with [extname] so asset URLs, immutable caching, content types, CSS url() assets and script tags keep working: ` + unsupported.join("; "));
+					}
+					return { build: {
+						assetsInlineLimit: clientAssetsInlineLimit,
+						...fileNameDefaults && Object.keys(fileNameDefaults).length > 0 ? withBuildBundlerOptions({ output: fileNameDefaults }) : {}
+					} };
+				}
+				const plainPagesSsrAssetsDir = name === "ssr" ? plainPagesSsrFileNamesAssetsDir : null;
+				const isCloudflarePagesServer = hasCloudflarePlugin && !hasAppDir;
+				if (!(hasAppDir && (name === "rsc" || name === "ssr")) && !plainPagesSsrAssetsDir && !isCloudflarePagesServer) return null;
 				const output = getBuildBundlerOptions(config.build)?.output;
-				if (Array.isArray(output) || output?.assetFileNames !== void 0) return null;
-				const assetFileNames = createClientAssetFileNames(resolveAssetsDir(nextConfig.assetPrefix ?? ""));
-				return { build: { ...withBuildBundlerOptions({ output: { assetFileNames } }) } };
+				if (Array.isArray(output)) return null;
+				const ownFileNames = environmentFileNames[name] ?? {};
+				const inheritsTopLevel = (key) => ownFileNames[key] === void 0 && topLevelFileNames[key] !== void 0 && output?.[key] === topLevelFileNames[key];
+				const clientAssetFileNames = environmentFileNames.client?.assetFileNames;
+				const serverAssetFileNames = ownFileNames.assetFileNames === void 0 && clientAssetFileNames !== void 0 ? clientAssetFileNames : output?.assetFileNames === void 0 ? createClientAssetFileNames(resolveAssetsDir(nextConfig.assetPrefix ?? "")) : void 0;
+				if (isCloudflarePagesServer) return serverAssetFileNames === void 0 ? null : { build: withBuildBundlerOptions({ output: { assetFileNames: serverAssetFileNames } }) };
+				const serverChunkFileNames = output?.chunkFileNames === void 0 || inheritsTopLevel("chunkFileNames") ? plainPagesSsrAssetsDir ? `${plainPagesSsrAssetsDir}/chunks/[name]-[hash].js` : output?.chunkFileNames === void 0 ? void 0 : `${config.build?.assetsDir ?? "assets"}/[name]-[hash].js` : void 0;
+				const serverFileNameDefaults = {
+					...serverAssetFileNames !== void 0 ? { assetFileNames: serverAssetFileNames } : {},
+					...serverChunkFileNames !== void 0 ? { chunkFileNames: serverChunkFileNames } : {},
+					...inheritsTopLevel("entryFileNames") ? { entryFileNames: "[name].js" } : {}
+				};
+				if (Object.keys(serverFileNameDefaults).length === 0) return null;
+				return { build: { ...withBuildBundlerOptions({ output: serverFileNameDefaults }) } };
 			}
 		},
 		{
@@ -2560,22 +2696,38 @@ 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),
@@ -2672,6 +2824,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			},
 			configureServer(server) {
 				installSocketErrorBackstop({ runningServer: true });
+				devPagesModuleDependencyStores.clear();
 				const devBuildId = nextConfig?.buildId ?? process.env.__VINEXT_BUILD_ID ?? "development";
 				server.middlewares.use((req, _res, next) => {
 					req.__vinextOriginalEncodedUrl ??= req.url;
@@ -2747,6 +2900,20 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					pagesRunner?.clearCache();
 				}
+				function invalidatePagesModuleDependencies(filePath, event) {
+					if (devPagesModuleDependencyStores.size === 0) return;
+					if (path.basename(filePath) === "tsconfig.json") {
+						devPagesModuleDependencyStores.clear();
+						return;
+					}
+					const files = /* @__PURE__ */ new Set([
+						toSlash(filePath),
+						canonicalizeFilePath(filePath),
+						path.join(canonicalizeFilePath(path.dirname(filePath)), path.basename(filePath))
+					]);
+					const unmappedDelete = event === "delete" && (isScriptModuleId(filePath) || isStylesheetSpecifier(filePath));
+					for (const store of devPagesModuleDependencyStores.values()) if (!store.invalidate([...files], event) && unmappedDelete) store.clear();
+				}
 				function invalidatePagesClientAssetsModule() {
 					for (const env of Object.values(server.environments)) {
 						const mod = env.moduleGraph.getModuleById(RESOLVED_PAGES_CLIENT_ASSETS);
@@ -2759,11 +2926,18 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (!graph) return;
 					for (const mod of graph.idToModuleMap.values()) if (mod.id?.includes("?html-proxy&index=")) graph.invalidateModule(mod);
 				}
+				function invalidateAppRouteManifestModule() {
+					for (const env of Object.values(server.environments)) {
+						const mod = env.moduleGraph.getModuleById(RESOLVED_APP_ROUTE_MANIFEST);
+						if (mod) env.moduleGraph.invalidateModule(mod);
+					}
+				}
 				function invalidateAppRoutingModules() {
 					invalidateAppRouteCache();
 					invalidateMetadataFileCache();
 					invalidateRscEntryModule();
 					invalidateRootParamsModule();
+					invalidateAppRouteManifestModule();
 				}
 				let hybridRouteValidation = Promise.resolve();
 				let hybridRouteValidationError = null;
@@ -2876,6 +3050,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					server.ws.send({ type: "full-reload" });
 				}
 				server.watcher.on("add", (filePath) => {
+					invalidatePagesModuleDependencies(filePath, "create");
 					invalidatePagesMiddlewareMatcher(filePath);
 					updatePublicFileRoute(filePath, true);
 					let routeChanged = false;
@@ -2901,6 +3076,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 				});
 				server.watcher.on("change", (filePath) => {
+					invalidatePagesModuleDependencies(filePath, "update");
 					invalidatePagesMiddlewareMatcher(filePath);
 					if (hasPagesDir && toSlash(filePath).startsWith(pagesDir) && pageExtensions.test(filePath)) {
 						const pageFile = toSlash(filePath);
@@ -2917,6 +3093,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule();
 				});
 				server.watcher.on("unlink", (filePath) => {
+					invalidatePagesModuleDependencies(filePath, "delete");
 					invalidatePagesMiddlewareMatcher(filePath);
 					updatePublicFileRoute(filePath, false);
 					let routeChanged = false;
@@ -3329,6 +3506,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								dataNotFoundResponse,
 								rawSearch: url.includes("?") ? url.slice(url.indexOf("?")) : "",
 								configMatchPathname,
+								restoreLocaleRootTrailingSlash: shouldRestoreLocaleRootTrailingSlash(canonicalOriginalUrl.split("?")[0], nextConfig ?? {}),
 								runMiddleware: devRunMiddlewareAdapter,
 								matchApiRoute: async (apiUrl) => {
 									const devApiRoutes = await getDevApiRoutes();
@@ -3373,7 +3551,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 										}) : new Response("Invalid image optimization parameters", { status: 400 });
 									}
 									const isRetrievalMethod = req.method === "GET" || req.method === "HEAD";
-									if (phase === "direct" && isRetrievalMethod || requestPathname === "/" || requestPathname === "/api" || requestPathname.startsWith("/api/")) return false;
+									if (!resolvedPathnameHasBasePath || phase === "direct" && isRetrievalMethod || requestPathname === "/" || requestPathname === "/api" || requestPathname.startsWith("/api/")) return false;
 									if (!isRetrievalMethod) return isExistingDevPublicFile(normalizePathnameForRouteMatch(requestPathname)) ? methodNotAllowedResponse("GET, HEAD") : false;
 									return serveRewrittenViteFilesystemRoute(req, res, requestPathname, stagedHeaders);
 								}
@@ -3673,12 +3851,15 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		},
 		{
 			name: "vinext:compiler-define-server",
-			configEnvironment(name) {
-				if (name === "client") return null;
+			configEnvironment(name, config) {
+				if (name === "client" || config.consumer === "client") return null;
 				const serverDefines = { ...nextConfig.compilerDefineServer };
 				serverDefines["process.env.NEXT_RUNTIME"] = JSON.stringify("nodejs");
 				serverDefines["process.env.NEXT_PHASE"] = "globalThis.__VINEXT_NEXT_PHASE";
 				if (revalidateSecret) serverDefines["process.env.__VINEXT_REVALIDATE_SECRET"] = JSON.stringify(revalidateSecret);
+				serverDefines["process.env.__VINEXT_BUILD_ID"] = JSON.stringify(nextConfig.buildId);
+				if (rscCompatibilityId) serverDefines["process.env.__VINEXT_RSC_COMPATIBILITY_ID"] = JSON.stringify(rscCompatibilityId);
+				if (rscBuildIdentity) serverDefines["process.env.__VINEXT_RSC_BUILD_IDENTITY"] = JSON.stringify(rscBuildIdentity);
 				if (previewBuildCredentials) {
 					serverDefines["process.env.__VINEXT_PREVIEW_MODE_ID"] = JSON.stringify(previewBuildCredentials.id);
 					serverDefines["process.env.__VINEXT_PREVIEW_MODE_SIGNING_KEY"] = JSON.stringify(previewBuildCredentials.signingKey);
@@ -3737,7 +3918,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,
@@ -3896,11 +4077,25 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		},
 		{
 			name: "vinext:nitro-setup",
+			configResolved(config) {
+				nitroPublicDir = config.publicDir;
+			},
+			buildStart() {
+				if (this.environment?.name !== "nitro" || this.environment.mode !== "build") return;
+				const config = this.environment.getTopLevelConfig();
+				const clientOutDir = config.environments.client?.build.outDir;
+				if (!clientOutDir) return;
+				fs.rmSync(path.resolve(config.root, clientOutDir, ".vite"), {
+					recursive: true,
+					force: true
+				});
+			},
 			nitro: { setup: (nitro) => {
 				nitroBuildDir = nitro.options.buildDir ? path.resolve(root, nitro.options.buildDir) : void 0;
 				nitroHostRuntime = nitro.options.exportConditions?.includes("workerd") ? "worker" : "node";
 				if (!nextConfig) return;
 				if (!hasAppDir && !hasPagesDir) return;
+				nitroPublicFiles = registerNitroPublicFiles(nitro.options, NITRO_PUBLIC_FILES_PLUGIN, () => scanPublicFiles(root, nitroPublicDir));
 				if (resolvedServerExternalPackages.length > 0) nitro.options.traceDeps = [.../* @__PURE__ */ new Set([...nitro.options.traceDeps ?? [], ...resolvedServerExternalPackages])];
 			} }
 		},
@@ -3936,15 +4131,17 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			writeBundle: {
 				sequential: true,
 				order: "post",
-				handler(outputOptions) {
+				async handler(outputOptions) {
 					const clientDir = outputOptions.dir;
 					if (!clientDir) return;
 					if (!(this.environment?.name === "client")) return;
+					const pageRoutes = hasPagesDir ? (await Promise.all([pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher), apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)])).flat() : [];
 					emitNextClientRuntimeManifests({
 						clientDir,
 						assetsSubdir: resolveAssetsDir(nextConfig.assetPrefix),
 						buildId: nextConfig.buildId,
-						rewrites: nextConfig.rewrites
+						rewrites: nextConfig.rewrites,
+						pages: pageRoutes.map((route) => getPagesManifestPage(pagesDir, route.filePath, fileMatcher))
 					});
 				}
 			}
@@ -4044,8 +4241,11 @@ 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,
 							lazyChunks: runtimeMetadata.lazyChunks ?? void 0,
 							dynamicPreloads: runtimeMetadata.dynamicPreloads ?? void 0,
 							crossOrigin: nextConfig.crossOrigin ?? "",
@@ -4247,14 +4447,38 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			onComplete() {
 				rscActionOwnerRoutes = null;
 				rscActionOwnerSharedRoots = [];
+				clientReferenceRoutes = null;
+				clientReferenceAlwaysRenderedFiles = [];
+				clientReferenceRoutelessFiles = [];
 			}
 		}));
 		plugins.push(createScanBuildCssPlugin());
 	}
 	if (rscPluginPromise) {
 		plugins.push(createRscReferenceValidationNormalizerPlugin());
-		plugins.push(createRscClientReferenceLoadersPlugin());
-	} else if (manualUseCachePluginPromise) plugins.push(manualUseCachePluginPromise);
+		plugins.push(createRscClientReferenceLoadersPlugin({
+			onClientReferenceModules(modules) {
+				clientReferenceModules = modules;
+			},
+			routes: {
+				canonicalizeModuleId: canonicalize,
+				getAlwaysRenderedFiles: () => clientReferenceAlwaysRenderedFiles,
+				getRoutelessFiles: () => clientReferenceRoutelessFiles,
+				getRoutes: () => clientReferenceRoutes,
+				getSharedRoots: () => rscActionOwnerSharedRoots
+			},
+			grouping: options.disableNextLikeChunking ? void 0 : {
+				isAlwaysLoadedClientModule(id) {
+					const chunkName = appClientManualChunks(id);
+					return chunkName === "framework" || chunkName === "vinext";
+				},
+				ownClientChunkGroups: /* @__PURE__ */ new Set([...appClientCodeSplittingConfig.groups, ...clientCodeSplittingConfig.groups])
+			}
+		}));
+	} else {
+		plugins.push(createRouteClientReferencesFallbackPlugin());
+		if (manualUseCachePluginPromise) plugins.push(manualUseCachePluginPromise);
+	}
 	plugins.push({
 		name: "vinext:plain-pages-build-config",
 		apply: "build",