vinext 1.2.0 → 1.3.0

package/dist/index.js

@@ -1,40 +1,43 @@
 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";
 import { claimViteCliBuildInvocation, getViteCliInvocation, isViteCliConfigFile } from "./utils/vite-cli-invocation.js";
 import { VINEXT_DEV_CLI_LIFECYCLE, applyDevServerDefaults, claimViteCliDevInvocation, createDevServerLifecyclePlugin, reserveViteCliDevInvocation } from "./cli-dev-config.js";
 import { isUnknownRecord } from "./utils/record.js";
-import { getReactUpgradeDeps } from "./utils/react-version.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";
 import { encodeMiddlewareRequestHeaders } from "./utils/middleware-request-headers.js";
+import { hasBasePath, stripBasePath } from "./utils/base-path.js";
+import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
+import { methodNotAllowedResponse, notFoundStaticAssetResponse } from "./server/http-error-responses.js";
+import { isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./server/open-redirect.js";
+import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
 import { omitUnusedBuildSourcemap } from "./plugins/transform-result.js";
 import { assetPrefixPathname, isNextStaticPath, resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
 import { VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, findNextConfigPath, lightningCssFeatureNamesToMask, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
 import { normalizePathnameForRouteMatch, normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
-import { hasBasePath, stripBasePath } from "./utils/base-path.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
 import { generateRouteTypes } from "./typegen.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { resolveRuntimeEntryModule } from "./entries/runtime-entry-module.js";
-import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
-import { methodNotAllowedResponse, notFoundStaticAssetResponse } from "./server/http-error-responses.js";
-import { isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./server/open-redirect.js";
-import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.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";
@@ -43,20 +46,23 @@ 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 { 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";
@@ -65,7 +71,8 @@ import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, collectClient
 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";
@@ -81,7 +88,9 @@ import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.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";
@@ -90,6 +99,7 @@ import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjec
 import { isServerEnvironment } from "./plugins/environment.js";
 import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
 import { createPagesNodeExternalsPlugin } from "./plugins/pages-node-externals.js";
+import { createCloudflareDevModuleUrlsPlugin } from "./plugins/cloudflare-dev-module-urls.js";
 import { validateMiddlewareModuleExports } from "./plugins/middleware-export-validation.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
@@ -98,21 +108,18 @@ import { createTransformCache } from "./plugins/transform-cache.js";
 import { createOgHarfbuzzPlugin } from "./plugins/og-harfbuzz.js";
 import { createOgAssetsPlugin, createOgInlineFetchAssetsPlugin } from "./plugins/og-assets.js";
 import { createUseCacheCallablePlugin } from "./plugins/use-cache-callable.js";
-import { cacheFlightCodecPlugin } from "./plugins/cache-flight-codec.js";
 import { SSR_EXTERNAL_REACT_ENTRIES, VINEXT_OPTIMIZE_DEPS_EXCLUDE, mergeOptimizeDepsExclude } from "./plugins/rsc-client-shim-excludes.js";
 import { createServerExternalsManifestPlugin } from "./plugins/server-externals-manifest.js";
 import { createTransitiveExternalsPlugin } from "./plugins/transitive-externals.js";
 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 { 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";
@@ -124,16 +131,15 @@ 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 } from "./utils/plugin-rsc-version.js";
+import { assertPluginRscVersion, needsAppReactServerDom } from "./utils/plugin-rsc-version.js";
 import { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine } from "./utils/vite-version.js";
 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, parseAst, transformWithOxc } from "vite";
-import { execFileSync } from "node:child_process";
+import { createIdResolver, createLogger, isRunnableDevEnvironment, transformWithOxc } from "vite";
 import { createHash, randomBytes } from "node:crypto";
 import MagicString from "magic-string";
 import commonjs from "vite-plugin-commonjs";
@@ -146,6 +152,7 @@ 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 APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
 	"use-sync-external-store/shim",
 	"use-sync-external-store/shim/index.js",
@@ -183,13 +190,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:";
@@ -199,9 +210,13 @@ function createServerOnlyClientImportError(importer) {
 }
 function hasServerOnlyMarkerImport(code) {
 	if (!code.includes("server-only")) return false;
+	const record = parseModuleRecord(code, "js");
+	if (!record) return false;
+	if (record.staticImports.some((statement) => statement.moduleRequest.value === "server-only")) return true;
+	if (!code.includes("require")) return false;
 	let ast;
 	try {
-		ast = parseAst(code);
+		ast = parseProgram(code);
 	} catch {
 		return false;
 	}
@@ -209,9 +224,6 @@ function hasServerOnlyMarkerImport(code) {
 		if (!node) return false;
 		if (Array.isArray(node)) return node.some((child) => walk(child));
 		if (typeof node !== "object") return false;
-		if (node.type === "ImportDeclaration") {
-			if (node.source?.value === "server-only") return true;
-		}
 		if (node.type === "CallExpression") {
 			const call = node;
 			if (call.callee?.type === "Identifier" && call.callee.name === "require" && call.arguments?.[0]?.type === "Literal" && call.arguments[0].value === "server-only") return true;
@@ -300,24 +312,16 @@ function isolateMdxStylesheetImports(code) {
 }
 function isolateGlobalNotFoundStylesheetImports(code, id) {
 	if (isMdxModuleId(id)) return isolateMdxStylesheetImports(code);
-	let ast;
-	try {
-		ast = parseAst(code, { lang: parserLanguageForScript(id) });
-	} catch {
-		return null;
-	}
+	const record = parseModuleRecord(code, parserLanguageForScript(id));
+	if (!record) return null;
 	let output = null;
-	for (const statement of ast.body) {
-		if (statement.type !== "ImportDeclaration" || statement.importKind === "type") continue;
-		if (statement.specifiers && statement.specifiers.length > 0) continue;
-		if (statement.attributes && statement.attributes.length > 0) continue;
-		const source = statement.source;
-		const specifier = source?.value;
-		if (typeof specifier !== "string" || !isStylesheetSpecifier(specifier)) continue;
-		const range = source;
-		if (typeof range.start !== "number" || typeof range.end !== "number") continue;
+	for (const statement of record.staticImports) {
+		if (statement.entries.length > 0 || isTypeOnlyImport(code, statement)) continue;
+		const source = statement.moduleRequest;
+		if (hasImportAttributes(code, source.end, statement.end)) continue;
+		if (!isStylesheetSpecifier(source.value)) continue;
 		output ??= new MagicString(code);
-		output.overwrite(range.start, range.end, JSON.stringify(specifier + GLOBAL_NOT_FOUND_CSS_QUERY));
+		output.overwrite(source.start, source.end, JSON.stringify(source.value + GLOBAL_NOT_FOUND_CSS_QUERY));
 	}
 	return output ? toMagicStringTransformResult(output) : null;
 }
@@ -330,8 +334,46 @@ function commonjsTransformFilter(id, transformProjectLocalCommonJs = false, tran
 	if (transformBundledDependencies && isBundledCommonJsDependency(cleanId)) return true;
 	if (/\.c[jt]s$/i.test(cleanId) && !cleanId.includes("node_modules")) return transformProjectLocalCommonJs;
 }
-function hasOnlyTypeSpecifiers(statement) {
-	return statement.specifiers !== void 0 && statement.specifiers.length > 0 && statement.specifiers.every((specifier) => specifier.importKind === "type" || specifier.exportKind === "type");
+const EMPTY_EXPORT_PRESCAN = new RegExp(String.raw`\bexport${TRIVIA_PATTERN}*\{${TRIVIA_PATTERN}*\}`);
+/**
+* Sources of a module's static imports and re-exports, in source order.
+* Type-only declarations and declarations with import attributes are skipped.
+*/
+function runtimeStaticDependencySpecifiers(code, record, lang) {
+	const dependencies = [];
+	for (const statement of record.staticImports) {
+		if (isTypeOnlyImport(code, statement)) continue;
+		if (hasImportAttributes(code, statement.moduleRequest.end, statement.end)) continue;
+		dependencies.push({
+			start: statement.start,
+			specifier: statement.moduleRequest.value
+		});
+	}
+	for (const statement of record.staticExports) {
+		const source = statement.entries[0]?.moduleRequest;
+		if (!source || statement.entries.every((entry) => entry.isType)) continue;
+		if (hasImportAttributes(code, source.end, statement.end)) continue;
+		dependencies.push({
+			start: statement.start,
+			specifier: source.value
+		});
+	}
+	if (EMPTY_EXPORT_PRESCAN.test(code)) {
+		let program = null;
+		try {
+			program = parseProgram(code, { lang });
+		} catch {}
+		for (const statement of program?.body ?? []) {
+			if (statement.type !== "ExportNamedDeclaration" || !statement.source) continue;
+			if (statement.specifiers.length > 0 || statement.exportKind === "type") continue;
+			if (statement.attributes.length > 0) continue;
+			dependencies.push({
+				start: statement.start,
+				specifier: statement.source.value
+			});
+		}
+	}
+	return dependencies.sort((a, b) => a.start - b.start).map(({ specifier }) => specifier);
 }
 function resolvedStylesheetToDevManifestAsset(root, resolvedId) {
 	const cleanId = stripViteModuleQuery(resolvedId);
@@ -358,28 +400,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 [];
-		let ast;
+		if (!path.isAbsolute(cleanModulePath) || !fs.existsSync(cleanModulePath)) return entry;
+		let code;
 		try {
-			ast = parseAst(fs.readFileSync(cleanModulePath, "utf-8"), { lang: parserLanguageForScript(cleanModulePath) });
+			code = fs.readFileSync(cleanModulePath, "utf-8");
 		} catch {
-			return [];
+			return {
+				...entry,
+				cacheable: false
+			};
 		}
-		const dependencies = [];
-		for (const statement of ast.body) {
-			if (statement.type !== "ImportDeclaration" && statement.type !== "ExportNamedDeclaration" && statement.type !== "ExportAllDeclaration") continue;
-			if (statement.importKind === "type") continue;
-			if (statement.exportKind === "type") continue;
-			if (hasOnlyTypeSpecifiers(statement)) continue;
-			if (statement.attributes && statement.attributes.length > 0) continue;
-			const specifier = statement.source?.value;
-			if (typeof specifier !== "string") continue;
-			const resolved = await resolve(specifier, cleanModulePath, { skipSelf: true });
-			if (!resolved?.id) continue;
+		const record = parseModuleRecord(code, parserLanguageForScript(cleanModulePath));
+		if (!record) return entry;
+		for (const specifier of runtimeStaticDependencySpecifiers(code, record, parserLanguageForScript(cleanModulePath))) {
+			const resolved = await resolve(specifier, cleanModulePath, { skipSelf: false });
+			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({
@@ -391,7 +440,7 @@ function createDevPagesModuleDependencyReader(root, resolve) {
 				id: resolved.id
 			});
 		}
-		return dependencies;
+		return entry;
 	}
 }
 const TSCONFIG_FILES = ["tsconfig.json", "jsconfig.json"];
@@ -721,6 +770,11 @@ const VIRTUAL_CACHEABILITY_REQUEST_PROJECTION = "virtual:vinext-cacheability-req
 const RESOLVED_CACHEABILITY_REQUEST_PROJECTION = "\0" + VIRTUAL_CACHEABILITY_REQUEST_PROJECTION;
 const VIRTUAL_PREGENERATED_CONCRETE_PATHS = "virtual:vinext-pregenerated-concrete-paths";
 const RESOLVED_PREGENERATED_CONCRETE_PATHS = "\0" + VIRTUAL_PREGENERATED_CONCRETE_PATHS;
+const OUTPUT_ROOT_SERVER_EXTERNALS = /* @__PURE__ */ new Map([
+	[VIRTUAL_CACHEABILITY_MANIFEST, CACHEABILITY_MANIFEST_MODULE],
+	[VIRTUAL_CACHEABILITY_REQUEST_PROJECTION, CACHEABILITY_REQUEST_PROJECTION_MODULE],
+	[VIRTUAL_PREGENERATED_CONCRETE_PATHS, PREGENERATED_CONCRETE_PATHS_MODULE]
+]);
 const VIRTUAL_APP_REQUEST_ENTRY = "virtual:vinext-app-request-entry";
 const RESOLVED_APP_REQUEST_ENTRY = "\0" + VIRTUAL_APP_REQUEST_ENTRY;
 const VIRTUAL_APP_RESPONSE_ENTRY = "virtual:vinext-app-response-entry";
@@ -729,13 +783,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;
@@ -850,13 +909,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);
@@ -895,6 +949,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;
@@ -902,6 +960,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 = {};
@@ -912,7 +972,7 @@ function vinext(options = {}) {
 	let hasPlainPagesBuildEnvironments = false;
 	let originalPlainPagesEnvironments;
 	let buildLifecycleInvocation;
-	let reactUpgradeChecked = false;
+	let reactVersionChecked = false;
 	let pagesOptimizeEntries = [];
 	const importMetaUrlCapability = createImportMetaUrlPlugin({
 		getRoot: () => root,
@@ -922,6 +982,8 @@ 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 = [];
@@ -939,6 +1001,9 @@ function vinext(options = {}) {
 	const rscClassificationManifests = /* @__PURE__ */ new Map();
 	let rscActionOwnerRoutes = null;
 	let rscActionOwnerSharedRoots = [];
+	let clientReferenceRoutes = null;
+	let clientReferenceAlwaysRenderedFiles = [];
+	let clientReferenceRoutelessFiles = [];
 	const serverEntryKindsByEnvironment = /* @__PURE__ */ new Map();
 	const serverRuntimeOutputDirs = /* @__PURE__ */ new Set();
 	function recordServerEntryLoad(environmentName, id) {
@@ -951,6 +1016,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) => {
@@ -998,9 +1065,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
@@ -1017,32 +1085,33 @@ 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.");
-			plugins.splice(useServerIndex, 0, cacheFlightCodecPlugin(), useCachePlugin);
+			plugins.splice(useServerIndex, 0, useCachePlugin);
 			return plugins.map(scopeRscPlugin);
 		}).catch((cause) => {
 			throw new Error("vinext: Failed to load @vitejs/plugin-rsc.", { cause });
@@ -1067,6 +1136,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 });
@@ -1214,17 +1284,13 @@ function vinext(options = {}) {
 		shouldDeferPostBuild: () => buildLifecycleInvocation !== void 0,
 		shouldPrepare: (config) => buildLifecycleEnabled && config.build?.write !== false && !config.build?.lib && (buildLifecycleInvocation !== void 0 || !config.build?.watch && !config.build?.ssr && getBuildBundlerOptions(config.build)?.input === void 0),
 		onPrepare: () => {
-			if (!hasAppDir || reactUpgradeChecked) return;
-			reactUpgradeChecked = true;
+			if (!hasAppDir || reactVersionChecked) return;
+			reactVersionChecked = true;
 			const reactUpgrade = getReactUpgradeDeps(root);
+			const needsAppRsdw = rscVersion !== null && needsAppReactServerDom(process.cwd(), rscVersion);
+			if (needsAppRsdw && !reactUpgrade.includes("react-server-dom-webpack@latest")) reactUpgrade.push("react-server-dom-webpack@latest");
 			if (reactUpgrade.length === 0) return;
-			const [packageManager, ...packageManagerArgs] = detectPackageManager(root).replace(/ -D$/, "").split(" ");
-			console.log("  Upgrading React for RSC compatibility...");
-			execFileSync(packageManager, [...packageManagerArgs, ...reactUpgrade], {
-				cwd: root,
-				stdio: "inherit",
-				shell: process.platform === "win32"
-			});
+			throw new Error(reactUpgradeRequiredMessage(detectPackageManager(root).replace(/ -D$/, ""), reactUpgrade, needsAppRsdw ? rscVersion : void 0));
 		},
 		shouldBuildPlainPages: () => !hasAppDir && !hasCloudflarePlugin && !hasNitroPlugin,
 		createContext: () => ({
@@ -1348,6 +1414,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);
@@ -1358,13 +1425,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";
@@ -1413,6 +1482,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);
@@ -1490,9 +1566,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"] = "\"\"";
@@ -1578,6 +1654,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
@@ -1622,7 +1702,7 @@ function vinext(options = {}) {
 								};
 							})(),
 							...!isSSR && !isMultiEnv ? { treeshake: getClientTreeshakeConfig() } : {},
-							...!isSSR && !isMultiEnv ? { output: getClientOutputConfig(clientAssetsDir) } : {}
+							...!isSSR && !isMultiEnv ? { output: getClientOutputConfig() } : {}
 						})
 					},
 					worker: { plugins: () => [
@@ -1652,7 +1732,7 @@ function vinext(options = {}) {
 							"react",
 							"react-dom",
 							"react-dom/server",
-							"ipaddr.js",
+							...ipaddrSsrExternal,
 							...Array.isArray(config.ssr?.external) ? config.ssr.external : [],
 							...nextServerExternal
 						],
@@ -1837,7 +1917,7 @@ 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
@@ -1875,7 +1955,7 @@ function vinext(options = {}) {
 								assetsInlineLimit: clientAssetsInlineLimit,
 								...withBuildBundlerOptions({
 									input: appClientInput,
-									output: getClientOutputConfig(clientAssetsDir, true),
+									output: getClientOutputConfig(true),
 									treeshake: getClientTreeshakeConfig()
 								})
 							}
@@ -1895,7 +1975,7 @@ function vinext(options = {}) {
 						assetsInlineLimit: clientAssetsInlineLimit,
 						...withBuildBundlerOptions({
 							input: { index: VIRTUAL_CLIENT_ENTRY },
-							output: getClientOutputConfig(clientAssetsDir),
+							output: getClientOutputConfig(),
 							treeshake: getClientTreeshakeConfig()
 						})
 					}
@@ -1916,7 +1996,7 @@ function vinext(options = {}) {
 								assetsInlineLimit: clientAssetsInlineLimit,
 								...withBuildBundlerOptions({
 									input: { index: VIRTUAL_CLIENT_ENTRY },
-									output: getClientOutputConfig(clientAssetsDir),
+									output: getClientOutputConfig(),
 									treeshake: getClientTreeshakeConfig()
 								})
 							}
@@ -1927,7 +2007,7 @@ function vinext(options = {}) {
 									"react",
 									"react-dom",
 									"react-dom/server",
-									"ipaddr.js",
+									...ipaddrSsrExternal,
 									...nextServerExternal
 								],
 								noExternal: true
@@ -1990,9 +2070,10 @@ function vinext(options = {}) {
 					const optionalWarnings = /* @__PURE__ */ new Set();
 					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" ? ["use-sync-external-store/with-selector"] : [];
+						const optionalIncludes = hasAppDir ? name === "client" && !optimizer.noDiscovery ? APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE : [] : name !== "client" ? PAGES_CLOUDFLARE_WORKER_OPTIONAL_OPTIMIZE_DEPS_INCLUDE : [];
 						for (const id of optionalIncludes) {
-							if (optimizer.include?.includes(id) || optimizer.exclude?.some((excluded) => id === excluded || id.startsWith(`${excluded}/`))) continue;
+							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;
 							(optimizer.include ??= []).push(id);
 							optionalWarnings.add(`Failed to resolve dependency: ${id}, present in ${name} 'optimizeDeps.include'`);
 						}
@@ -2000,16 +2081,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);
@@ -2083,8 +2162,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 {
@@ -2101,6 +2181,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;
@@ -2120,21 +2201,21 @@ function vinext(options = {}) {
 					if (cleanId === VIRTUAL_RSC_ENTRY) return RESOLVED_RSC_ENTRY;
 					if (cleanId === VIRTUAL_CACHEABILITY_MANIFEST) {
 						if ((hasAppDir ? this.environment?.name === "rsc" : this.environment !== void 0 && isServerEnvironment(this.environment)) && this.environment.config?.command === "build") return {
-							id: `./${CACHEABILITY_MANIFEST_MODULE}`,
+							id: VIRTUAL_CACHEABILITY_MANIFEST,
 							external: true
 						};
 						return RESOLVED_CACHEABILITY_MANIFEST;
 					}
 					if (cleanId === VIRTUAL_CACHEABILITY_REQUEST_PROJECTION) {
 						if (hasAppDir && this.environment?.name === "rsc" && this.environment.config?.command === "build") return {
-							id: `./${CACHEABILITY_REQUEST_PROJECTION_MODULE}`,
+							id: VIRTUAL_CACHEABILITY_REQUEST_PROJECTION,
 							external: true
 						};
 						return RESOLVED_CACHEABILITY_REQUEST_PROJECTION;
 					}
 					if (cleanId === VIRTUAL_PREGENERATED_CONCRETE_PATHS) {
 						if ((hasAppDir ? this.environment?.name === "rsc" : this.environment !== void 0 && isServerEnvironment(this.environment)) && this.environment.config?.command === "build") return {
-							id: `./${PREGENERATED_CONCRETE_PATHS_MODULE}`,
+							id: VIRTUAL_PREGENERATED_CONCRETE_PATHS,
 							external: true
 						};
 						return RESOLVED_PREGENERATED_CONCRETE_PATHS;
@@ -2143,6 +2224,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;
@@ -2176,7 +2258,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)} });`,
 							"} };"
@@ -2207,7 +2290,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;
@@ -2228,6 +2316,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,
@@ -2242,6 +2333,7 @@ function vinext(options = {}) {
 							nodeOpenTelemetryLoader: registerNodeOpenTelemetryLoader,
 							assetPrefix: nextConfig?.assetPrefix,
 							crossOrigin: nextConfig?.crossOrigin,
+							skipProxyUrlNormalize: nextConfig?.skipProxyUrlNormalize,
 							skipTrailingSlashRedirect: nextConfig?.skipTrailingSlashRedirect,
 							expireTime: nextConfig?.expireTime,
 							reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
@@ -2271,27 +2363,31 @@ 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) => ({
+						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) => ({
-							canPrefetchLoadingShell: false,
-							documentOnly: true,
-							isDynamic: route.isDynamic,
-							patternParts: [...route.patternParts]
-						}))] : [];
-						return generateBrowserEntry(graph.routes, graph.routeManifest, pagesPrefetchRoutes, nextConfig.rewrites, nextConfig.i18n?.locales);
+						})) : [];
+						return generateBrowserEntry(graph.routes, pagesPrefetchRoutes, nextConfig.rewrites, nextConfig.i18n?.locales);
+					}
+					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);
@@ -2370,15 +2466,19 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					const buildRoot = this.environment.config.root ?? process.cwd();
 					const environmentOutDir = path.resolve(buildRoot, this.environment.config.build.outDir);
 					const sidecarDir = resolvePagesClientAssetsOutputDir(this.environment.name, environmentOutDir);
-					let externalId = path.relative(environmentOutDir, path.join(sidecarDir, PAGES_CLIENT_ASSETS_MODULE));
-					if (!externalId.startsWith(".")) externalId = `./${externalId}`;
+					pagesClientAssetsExternalTargets.set(this.environment.name, /* @__PURE__ */ new Map([[VIRTUAL_PAGES_CLIENT_ASSETS, path.relative(environmentOutDir, path.join(sidecarDir, PAGES_CLIENT_ASSETS_MODULE))]]));
 					pagesClientAssetsOutputDirs.add(sidecarDir);
 					return {
-						id: externalId,
+						id: VIRTUAL_PAGES_CLIENT_ASSETS,
 						external: true
 					};
 				}
 			},
+			renderChunk(code, chunk) {
+				const targets = pagesClientAssetsExternalTargets.get(this.environment.name);
+				if (!targets) return null;
+				return rewriteOutputRootExternals(code, chunk.fileName, targets);
+			},
 			outputOptions(output) {
 				const environment = this.environment;
 				if (!selectedMultiStageOutput || !environment || !isMultiStageServerEnvironment(environment)) return;
@@ -2453,12 +2553,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 }) } };
 			}
 		},
 		{
@@ -2484,6 +2608,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		{
 			name: "vinext:cacheability-manifest-asset",
 			apply: "build",
+			renderChunk(code, chunk) {
+				return rewriteOutputRootExternals(code, chunk.fileName, OUTPUT_ROOT_SERVER_EXTERNALS);
+			},
 			generateBundle() {
 				if (!(hasAppDir ? this.environment?.name === "rsc" : this.environment !== void 0 && isServerEnvironment(this.environment))) return;
 				this.emitFile({
@@ -2634,6 +2761,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;
@@ -2648,7 +2776,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						return new URL(resolved).origin;
 					} catch {}
 					const address = server.httpServer?.address();
-					return `http://localhost:${typeof address === "object" && address ? address.port : server.config.server.port ?? 3e3}`;
+					return `http://localhost:${typeof address === "object" && address ? address.port : server.config.server.port}`;
 				};
 				let cachedSSRHandler = null;
 				const devPageRouteDataKinds = /* @__PURE__ */ new Map();
@@ -2709,6 +2837,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);
@@ -2721,11 +2863,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;
@@ -2838,6 +2987,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;
@@ -2863,6 +3013,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);
@@ -2879,6 +3030,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;
@@ -3291,6 +3443,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();
@@ -3335,7 +3488,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);
 								}
@@ -3635,12 +3788,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);
@@ -3724,27 +3880,18 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				},
 				async handler(code, id) {
 					const lang = id.endsWith(".ts") ? "ts" : "tsx";
-					let ast;
-					try {
-						ast = parseAst(code, { lang });
-					} catch {
-						return null;
-					}
+					const record = parseModuleRecord(code, lang);
+					if (!record) return null;
 					const s = new MagicString(code);
 					let hasChanges = false;
 					const imageImports = /* @__PURE__ */ new Set();
-					for (const node of ast.body) {
-						if (node.type !== "ImportDeclaration") continue;
-						const importNode = node;
-						const importPath = importNode.source?.value;
-						if (typeof importPath !== "string") continue;
+					for (const importNode of record.staticImports) {
+						const importPath = importNode.moduleRequest.value;
 						if (!IMAGE_EXT_RE.test(importPath)) continue;
-						const specifiers = importNode.specifiers ?? [];
-						if (specifiers.length !== 1) continue;
-						const specifier = specifiers[0];
-						if (specifier.type !== "ImportDefaultSpecifier") continue;
-						const varName = specifier.local?.name;
-						if (!varName) continue;
+						if (importNode.entries.length !== 1) continue;
+						const [entry] = importNode.entries;
+						if (entry.importName.kind !== "Default") continue;
+						const varName = entry.localName.value;
 						const dir = path.dirname(id);
 						const resolvedImage = importPath.startsWith(".") ? path.resolve(dir, importPath) : (await this.resolve(importPath, id, { skipSelf: true }))?.id;
 						if (!resolvedImage) continue;
@@ -3866,24 +4013,27 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			}
 		},
 		{
-			name: "vinext:nitro-route-rules",
-			nitro: { setup: async (nitro) => {
+			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])];
-				if (nitro.options.dev) return;
-				const { collectNitroRouteRules, mergeNitroRouteRules } = await import("./build/nitro-route-rules.js");
-				const generatedRouteRules = await collectNitroRouteRules({
-					appDir: hasAppDir ? appDir : null,
-					pagesDir: hasPagesDir ? pagesDir : null,
-					pageExtensions: nextConfig.pageExtensions
-				});
-				if (Object.keys(generatedRouteRules).length === 0) return;
-				const { routeRules, skippedRoutes } = mergeNitroRouteRules(nitro.options.routeRules, generatedRouteRules);
-				nitro.options.routeRules = routeRules;
-				if (skippedRoutes.length > 0) (nitro.logger?.warn ?? console.warn)(`[vinext] Skipping generated Nitro routeRules for routes with existing exact cache config: ${skippedRoutes.join(", ")}`);
 			} }
 		},
 		{
@@ -3918,15 +4068,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))
 					});
 				}
 			}
@@ -4028,6 +4180,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							appBootstrapPreinitModules: runtimeMetadata.appBootstrapPreinitModules,
 							ssrManifest,
 							cssGraph: runtimeMetadata.cssGraph,
+							sharedChunks: runtimeMetadata.sharedChunks,
 							lazyChunks: runtimeMetadata.lazyChunks ?? void 0,
 							dynamicPreloads: runtimeMetadata.dynamicPreloads ?? void 0,
 							crossOrigin: nextConfig.crossOrigin ?? "",
@@ -4229,14 +4382,35 @@ 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(cacheFlightCodecPlugin(), manualUseCachePluginPromise);
+		plugins.push(createRscClientReferenceLoadersPlugin({
+			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",
@@ -4257,6 +4431,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			}
 		}
 	});
+	plugins.push(createCloudflareDevModuleUrlsPlugin({ isEnabled: () => hasCloudflarePlugin }));
 	plugins.push(buildLifecyclePlugins[1]);
 	return plugins;
 }