vinext 1.0.0-beta.9 → 1.0.1

package/dist/index.js

@@ -1,34 +1,46 @@
 import path, { toSlash } from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 import { detectPackageManager, formatMissingCloudflarePluginError, hasWranglerConfig } from "./utils/project.js";
-import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, normalizeViteResolveExtensions } from "./routing/file-matcher.js";
+import { resolvePostcssStringPlugins } from "./plugins/postcss.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 { 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 { 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, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
+import { 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 { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.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 { encodeMiddlewareRequestHeaders } from "./utils/middleware-request-headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
-import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
 import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
-import { methodNotAllowedResponse } from "./server/http-error-responses.js";
+import { methodNotAllowedResponse, notFoundStaticAssetResponse } from "./server/http-error-responses.js";
 import { isOpenRedirectShaped } from "./server/open-redirect.js";
 import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { resolvePagesI18nRequest, stripI18nLocaleForApiRoute } from "./server/pages-i18n.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 { generateServerEntry } from "./entries/pages-server-entry.js";
-import { generateClientEntry } from "./entries/pages-client-entry.js";
-import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
-import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
-import { isUnknownRecord } from "./utils/record.js";
+import { generatePagesRequestEntry, generatePagesResponseEntry, generateServerEntry } from "./entries/pages-server-entry.js";
+import { compileClientMiddlewareMatchers, generateClientEntry } from "./entries/pages-client-entry.js";
 import { logRequest, now } from "./server/request-log.js";
 import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
-import { resolveAssetsDir } from "./utils/asset-prefix.js";
 import { getPagesPreviewModeId } from "./server/pages-preview.js";
 import { createSSRHandler } from "./server/dev-server.js";
 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 } from "./server/cacheability-manifest.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 { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
 import { isPathInside, isPathInsideOrEqual, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { invalidateMetadataFileCache, scanMetadataFiles } from "./server/metadata-routes.js";
@@ -36,24 +48,25 @@ import { shouldInvalidateAppRouteFile } from "./server/dev-route-files.js";
 import { createDirectRunner } from "./server/dev-module-runner.js";
 import { validateDevRequest } from "./server/dev-origin-check.js";
 import { createActionOwnerManifestPlugin } from "./plugins/action-owner-manifest.js";
-import { generateRscEntry } from "./entries/app-rsc-entry.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, generateCacheAdaptersModule, hasVerbatimResponseVary } from "./cache/cache-adapters-virtual.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 { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
 import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
-import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.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, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
-import { loadDotenv } from "./config/dotenv.js";
-import { mergeServerExternalPackages } from "./config/server-external-packages.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 { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, 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 { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
 import { readTrustedRevalidationHostname } from "./server/revalidation-host.js";
 import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
+import { traceFrameworkRequest } from "./server/request-tracing.js";
 import { runPagesRequest } from "./server/pages-request-pipeline.js";
 import { pagesRouteHasPriorityOverAppRoute, validateHybridRouteConflicts } from "./server/hybrid-route-priority.js";
 import { hasReactCompilerPlugin, isReactCompilerPlugin, isReactCompilerRequested, reactCompilerUnsupportedMessage } from "./utils/react-compiler-support.js";
@@ -66,7 +79,8 @@ 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 { createRscReferenceValidationNormalizerPlugin } from "./plugins/rsc-reference-validation-normalizer.js";
-import { createInstrumentationClientTransformPlugin } from "./plugins/instrumentation-client.js";
+import { createScanBuildCssPlugin } from "./plugins/scan-build-css.js";
+import { createInstrumentationClientTransformPlugin, createInstrumentationServerTransformPlugin } from "./plugins/instrumentation-client.js";
 import { createStyledJsxPlugin } from "./plugins/styled-jsx.js";
 import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
 import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
@@ -76,46 +90,45 @@ import { validateMiddlewareModuleExports } from "./plugins/middleware-export-val
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
 import { createDynamicPreloadMetadataPlugin } from "./plugins/dynamic-preload-metadata.js";
+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 { generateRouteTypes } from "./typegen.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 { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
 import { computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
-import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, setPagesClientAssetsBuildMetadata, takePagesClientAssetsBuildMetadata, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
-import { createPreviewBuildCredentials, getPreviewBuildCredentials } from "./build/preview-credentials.js";
+import { readPrerenderSecret, readServerRuntimeOutputDirs } from "./build/server-manifest.js";
 import { createModuleDependencyCache } from "./build/module-dependency-cache.js";
-import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
 import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassCssUrlAssetImporter, createSassTildeImporter, createSassTsconfigPathImporters } from "./plugins/sass.js";
-import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfig, withBuildBundlerOptions } from "./build/client-build-config.js";
-import { hasExportAllCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.js";
+import { 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 { createRequireContextPlugin } from "./plugins/require-context.js";
+import { COMMONJS_SYNTAX_CODE_FILTER } from "./plugins/commonjs-syntax.js";
 import { createRequireConditionResolutionPlugin, isConditionalRequireScriptModuleId } from "./plugins/require-condition-resolution.js";
-import { createTransformCache } from "./plugins/transform-cache.js";
 import { createExtensionlessDynamicImportPlugin } from "./plugins/extensionless-dynamic-import.js";
 import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
-import { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, replaceConsumerEnvironmentConditions } from "./plugins/typeof-window.js";
+import { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, mayFoldChangeScannedImports, replaceConsumerEnvironmentConditions } from "./plugins/typeof-window.js";
 import { hasMdxFiles } from "./utils/mdx-scan.js";
 import { publicFilePathVariants } from "./utils/public-file-path.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
 import { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine } from "./utils/vite-version.js";
-import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VINEXT_ROUTE_ROOT_CONFIG_PLUGIN_PROPERTY, normalizeVinextPrerenderConfig } from "./config/prerender.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
-import { createIdResolver, createLogger, parseAst, transformWithOxc } from "vite";
 import { pathToFileURL } from "node:url";
+import { createIdResolver, createLogger, isRunnableDevEnvironment, parseAst, transformWithOxc } from "vite";
+import { execFileSync } from "node:child_process";
 import { createHash, randomBytes } from "node:crypto";
-import commonjs from "vite-plugin-commonjs";
 import MagicString from "magic-string";
+import commonjs from "vite-plugin-commonjs";
 //#region src/index.ts
 const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_EXCLUDE = Object.freeze(["vinext/server/fetch-handler", "vinext/server/pages-router-entry"]);
 const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
@@ -123,12 +136,42 @@ const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
 	"react-dom",
 	"react-dom/server.edge",
 	"react/jsx-runtime",
-	"react/jsx-dev-runtime",
-	"use-sync-external-store/with-selector"
+	"react/jsx-dev-runtime"
+]);
+const APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
+	"use-sync-external-store/shim",
+	"use-sync-external-store/shim/index.js",
+	"use-sync-external-store/shim/with-selector",
+	"use-sync-external-store/shim/with-selector.js",
+	"use-sync-external-store/with-selector",
+	"use-sync-external-store/with-selector.js"
 ]);
-const OPTIONAL_OPTIMIZE_DEPS_WARNING_RE = /Failed to resolve dependency: .*use-sync-external-store\/with-selector.*present in .* 'optimizeDeps\.include'/;
-const VINEXT_FILTERED_OPTIMIZE_DEPS_WARN = Symbol.for("vinext.filteredOptimizeDepsWarn");
 const ANSI_ESCAPE_RE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
+const RSC_ENVIRONMENTS = /* @__PURE__ */ new Set([
+	"rsc",
+	"ssr",
+	"client"
+]);
+const VINEXT_GENERATED_DIR_RE = /(?:^|[/\\])\.vinext(?:[/\\]|$)/;
+function scopeRscPlugin(plugin) {
+	const applyToEnvironment = plugin.applyToEnvironment;
+	return {
+		...plugin,
+		applyToEnvironment(environment) {
+			if (!RSC_ENVIRONMENTS.has(environment.name)) return false;
+			return applyToEnvironment?.(environment) ?? true;
+		}
+	};
+}
+const earlyViteCliInvocation = getViteCliInvocation();
+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
+	});
+}
 installSocketErrorBackstop();
 function hasServerOnlyMarkerImport(code) {
 	if (!code.includes("server-only")) return false;
@@ -183,6 +226,7 @@ function resolveShimModulePath(shimsDir, moduleName) {
 	}
 	return path.join(shimsDir, `${moduleName}.js`);
 }
+const PATCHED_SERVER_PACKAGES = ["@vercel/og"];
 function isVercelOgImport(id) {
 	return id === "@vercel/og" || id === "@vercel/og.js";
 }
@@ -312,7 +356,7 @@ function createDevPagesModuleDependencyReader(root, resolve) {
 			if (typeof specifier !== "string") continue;
 			const resolved = await resolve(specifier, cleanModulePath, { skipSelf: true });
 			if (!resolved?.id) continue;
-			if (isStylesheetSpecifier(specifier)) {
+			if (isStylesheetSpecifier(specifier) || isStylesheetSpecifier(resolved.id)) {
 				const asset = resolvedStylesheetToDevManifestAsset(root, resolved.id);
 				if (asset) dependencies.push({
 					type: "stylesheet",
@@ -509,15 +553,24 @@ function mergeStringArrayValues(value, additions) {
 function stripAnsi(value) {
 	return value.replace(ANSI_ESCAPE_RE, "");
 }
-function suppressOptionalOptimizeDepsWarnings(logger) {
-	const marker = logger;
-	if (marker[VINEXT_FILTERED_OPTIMIZE_DEPS_WARN]) return;
-	const warn = logger.warn.bind(logger);
-	logger.warn = (msg, options) => {
-		if (OPTIONAL_OPTIMIZE_DEPS_WARNING_RE.test(stripAnsi(msg))) return;
-		warn(msg, options);
+function createOptionalOptimizeDepsLogger(logger, warnings) {
+	if (warnings.size === 0) return logger;
+	return {
+		get hasWarned() {
+			return logger.hasWarned;
+		},
+		set hasWarned(value) {
+			logger.hasWarned = value;
+		},
+		info: logger.info.bind(logger),
+		warn(msg, options) {
+			if (!warnings.has(stripAnsi(msg))) logger.warn(msg, options);
+		},
+		warnOnce: logger.warnOnce.bind(logger),
+		error: logger.error.bind(logger),
+		clearScreen: logger.clearScreen.bind(logger),
+		hasErrorLogged: logger.hasErrorLogged.bind(logger)
 	};
-	marker[VINEXT_FILTERED_OPTIMIZE_DEPS_WARN] = true;
 }
 const _tsconfigAliasCache = /* @__PURE__ */ new Map();
 /**
@@ -597,8 +650,8 @@ const tsconfigAliasCustomResolver = async function(updatedId, importer, options)
 * stylesheet-scoping resolver to entries that came from tsconfig `paths`.
 * Array order preserves the map's first-match ordering.
 */
-function buildResolveAliasEntries(aliasMap, tsconfigPathAliases) {
-	return Object.entries(aliasMap).map(([find, replacement]) => tsconfigPathAliases[find] === replacement ? {
+function buildResolveAliasEntries(aliasMap, tsconfigPathAliases, explicitAliases) {
+	return Object.entries(aliasMap).map(([find, replacement]) => Object.hasOwn(tsconfigPathAliases, find) && !Object.hasOwn(explicitAliases, find) ? {
 		find,
 		replacement,
 		customResolver: tsconfigAliasCustomResolver
@@ -621,26 +674,49 @@ function suppressAliasCustomResolverDeprecationWarning(logger) {
 	return logger;
 }
 const VIRTUAL_WORKER_ENTRY = "virtual:vinext-worker-entry";
-const RESOLVED_WORKER_ENTRY = "\0virtual:vinext-worker-entry";
+const RESOLVED_WORKER_ENTRY = "\0" + VIRTUAL_WORKER_ENTRY;
+const VIRTUAL_REQUEST_STAGE = "virtual:vinext-request-stage";
+const RESOLVED_REQUEST_STAGE = "\0" + VIRTUAL_REQUEST_STAGE;
+const VIRTUAL_RESPONSE_STAGE = "virtual:vinext-response-stage";
+const RESOLVED_RESPONSE_STAGE = "\0" + VIRTUAL_RESPONSE_STAGE;
 const VIRTUAL_SERVER_ENTRY = "virtual:vinext-server-entry";
-const RESOLVED_SERVER_ENTRY = "\0virtual:vinext-server-entry";
+const RESOLVED_SERVER_ENTRY = "\0" + VIRTUAL_SERVER_ENTRY;
+const VIRTUAL_PAGES_REQUEST_ENTRY = "virtual:vinext-pages-request-entry";
+const RESOLVED_PAGES_REQUEST_ENTRY = "\0" + VIRTUAL_PAGES_REQUEST_ENTRY;
+const VIRTUAL_PAGES_RESPONSE_ENTRY = "virtual:vinext-pages-response-entry";
+const RESOLVED_PAGES_RESPONSE_ENTRY = "\0" + VIRTUAL_PAGES_RESPONSE_ENTRY;
 const VIRTUAL_CLIENT_ENTRY = "virtual:vinext-client-entry";
-const RESOLVED_CLIENT_ENTRY = "\0virtual:vinext-client-entry";
+const RESOLVED_CLIENT_ENTRY = "\0" + VIRTUAL_CLIENT_ENTRY;
 const VIRTUAL_PAGES_CLIENT_ASSETS = "virtual:vinext-pages-client-assets";
-const RESOLVED_PAGES_CLIENT_ASSETS = "\0virtual:vinext-pages-client-assets";
+const RESOLVED_PAGES_CLIENT_ASSETS = "\0" + VIRTUAL_PAGES_CLIENT_ASSETS;
 const VIRTUAL_RSC_ENTRY = "virtual:vinext-rsc-entry";
-const RESOLVED_RSC_ENTRY = "\0virtual:vinext-rsc-entry";
+const RESOLVED_RSC_ENTRY = "\0" + VIRTUAL_RSC_ENTRY;
 const VIRTUAL_CACHEABILITY_MANIFEST = "virtual:vinext-cacheability-manifest";
-const RESOLVED_CACHEABILITY_MANIFEST = "\0virtual:vinext-cacheability-manifest";
+const RESOLVED_CACHEABILITY_MANIFEST = "\0" + VIRTUAL_CACHEABILITY_MANIFEST;
+const VIRTUAL_CACHEABILITY_REQUEST_PROJECTION = "virtual:vinext-cacheability-request-projection";
+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 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";
+const RESOLVED_APP_RESPONSE_ENTRY = "\0" + VIRTUAL_APP_RESPONSE_ENTRY;
 const VIRTUAL_APP_SSR_ENTRY = "virtual:vinext-app-ssr-entry";
-const RESOLVED_APP_SSR_ENTRY = "\0virtual: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 = "\0virtual:vinext-app-browser-entry";
+const RESOLVED_APP_BROWSER_ENTRY = "\0" + VIRTUAL_APP_BROWSER_ENTRY;
 const VIRTUAL_APP_CAPABILITIES = "virtual:vinext-app-capabilities";
-const RESOLVED_APP_CAPABILITIES = "\0virtual:vinext-app-capabilities";
+const RESOLVED_APP_CAPABILITIES = "\0" + VIRTUAL_APP_CAPABILITIES;
 const RESOLVED_ROOT_PARAMS = "\0virtual:vinext-root-params";
+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 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;
+/** CDN-only registrar kept out of the data-cache response graph. */
+const RESOLVED_CDN_CACHE_ADAPTER = "\0" + VIRTUAL_CDN_CACHE_ADAPTER;
 /** Virtual module that registers the config-driven image optimizer (see VinextOptions.images). */
 const RESOLVED_IMAGE_ADAPTERS = "\0" + VIRTUAL_IMAGE_ADAPTERS;
 /** Virtual module for composed instrumentation-client bootstrap. */
@@ -671,9 +747,10 @@ const _shimsDir = path.resolve(__dirname, "shims") + "/";
 const _serverDir = path.resolve(__dirname, "server");
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
 const _appBrowserServerActionClientPath = resolveShimModulePath(_serverDir, "app-browser-server-action-client");
+const _appRscCombinedHandlerPath = resolveShimModulePath(_serverDir, "app-rsc-combined-handler");
 const _appRscHandlerPath = resolveShimModulePath(_serverDir, "app-rsc-handler");
 const _pagesClientAssetsPath = resolveShimModulePath(_serverDir, "pages-client-assets");
-const _canExternalizeAppRscHandler = _appRscHandlerPath.endsWith(".js");
+const _canExternalizeAppRscHandler = _appRscHandlerPath.endsWith(".js") && _appRscCombinedHandlerPath.endsWith(".js");
 function isValidExportIdentifier(name) {
 	return /^[$A-Z_a-z][$\w]*$/.test(name);
 }
@@ -745,8 +822,10 @@ for (const [specifier, definition] of Object.entries(_publicNextShimMap)) {
 	_reactServerShims.set(`${specifier}.js`, definition.shim);
 }
 _reactServerShims.set("next/dist/client/components/navigation", "navigation");
-const clientCodeSplittingConfig = createClientCodeSplittingConfig(createClientManualChunks(_shimsDir));
-const appClientCodeSplittingConfig = createClientCodeSplittingConfig(createClientManualChunks(_shimsDir, true));
+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 {
@@ -771,7 +850,9 @@ function createServerEnvironmentFileNameResolver(config, outputRoot) {
 	};
 }
 function vinext(options = {}) {
+	const internalOptions = options;
 	const { supportsNativeTypeofWindowFolding: useNativeTypeofWindowFolding } = assertSupportedViteVersion();
+	const reservedDevCliInvocation = reserveViteCliDevInvocation();
 	const prerenderConfig = normalizeVinextPrerenderConfig(options.prerender);
 	const cacheAdapterBuildOutputs = [options.cache?.data?.output, options.cache?.cdn?.output].filter((output) => output !== void 0);
 	let root;
@@ -781,20 +862,33 @@ function vinext(options = {}) {
 	let hasAppDir = false;
 	let hasPagesDir = false;
 	let nextConfig;
+	let nitroBuildDir;
 	let fileMatcher;
 	let middlewarePath = null;
+	let canonicalMiddlewarePath = null;
 	let instrumentationPath = null;
 	let instrumentationClientPath = null;
 	let clientInjectModule = null;
 	let globalNotFoundCssIsolationPath = null;
 	let clientAssetsInlineLimit = 0;
 	let hasCloudflarePlugin = false;
+	let matchedMultiStageOutput;
+	let selectedMultiStageOutput;
+	const isMultiStageServerEnvironment = (environment) => isServerEnvironment(environment) && (!hasAppDir || environment.name === "rsc");
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
+	let nitroHostRuntime = "node";
 	let resolvedServerExternalPackages = [];
+	let registerNodeOpenTelemetryLoader = false;
 	let pagesTsconfigAliases = {};
 	let pagesBundledPackages = /* @__PURE__ */ new Set();
 	let isServeCommand = false;
+	let buildEmptyOutDir;
+	let buildLifecycleEnabled = false;
+	let hasPlainPagesBuildEnvironments = false;
+	let originalPlainPagesEnvironments;
+	let buildLifecycleInvocation;
+	let reactUpgradeChecked = false;
 	let pagesOptimizeEntries = [];
 	const importMetaUrlCapability = createImportMetaUrlPlugin({
 		getRoot: () => root,
@@ -804,7 +898,8 @@ function vinext(options = {}) {
 		}
 	});
 	const pagesClientAssetsOutputDirs = /* @__PURE__ */ new Set();
-	let pagesClientAssetsModule = null;
+	const resolvePagesClientAssetsOutputDir = (environmentName, outputDir) => !selectedMultiStageOutput && !hasAppDir && !hasCloudflarePlugin && environmentName === "ssr" ? path.dirname(outputDir) : outputDir;
+	let pagesClientAssetsModule = internalOptions.__pagesClientAssetsModule ?? null;
 	let devPublicFileRoutes = null;
 	let publicDirConflictOptions = null;
 	let copyPublicDirIntoStaticExportBasePath = false;
@@ -812,12 +907,14 @@ function vinext(options = {}) {
 	let rscCompatibilityId;
 	let draftModeSecret = getPagesPreviewModeId();
 	const prerenderSecret = process.env.__VINEXT_SHARED_PRERENDER_SECRET ?? randomBytes(32).toString("hex");
+	let revalidateSecret = process.env.__VINEXT_SHARED_REVALIDATE_SECRET;
 	let previewBuildCredentials;
 	const sassComposesLoader = createSassAwareFileSystemLoader();
-	let rscClassificationManifest = null;
+	const rscClassificationManifests = /* @__PURE__ */ new Map();
 	let rscActionOwnerRoutes = null;
 	let rscActionOwnerSharedRoots = [];
 	const serverEntryKindsByEnvironment = /* @__PURE__ */ new Map();
+	const serverRuntimeOutputDirs = /* @__PURE__ */ new Set();
 	function recordServerEntryLoad(environmentName, id) {
 		if (!environmentName) return;
 		let entries = serverEntryKindsByEnvironment.get(environmentName);
@@ -854,7 +951,17 @@ function vinext(options = {}) {
 	*/
 	async function generateServerEntry$1(configuredPublicDir) {
 		const publicFiles = isServeCommand && devPublicFileRoutes ? [...devPublicFileRoutes].sort() : scanPublicFileRoutes(root, configuredPublicDir === "" ? false : configuredPublicDir);
-		return generateServerEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, publicFiles, prerenderSecret);
+		return generateServerEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, publicFiles, {
+			nodeOpenTelemetryLoader: registerNodeOpenTelemetryLoader,
+			prerenderSecret
+		});
+	}
+	async function generatePagesRequestEntry$1(configuredPublicDir) {
+		const publicFiles = isServeCommand && devPublicFileRoutes ? [...devPublicFileRoutes].sort() : scanPublicFileRoutes(root, configuredPublicDir === "" ? false : configuredPublicDir);
+		return generatePagesRequestEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, publicFiles, prerenderSecret);
+	}
+	function generatePagesResponseEntry$1() {
+		return generatePagesResponseEntry(pagesDir, nextConfig, fileMatcher, middlewarePath, instrumentationPath, prerenderSecret);
 	}
 	/**
 	* Generate the virtual client hydration entry module.
@@ -881,7 +988,8 @@ function vinext(options = {}) {
 		});
 	}
 	const autoRsc = options.rsc !== false;
-	const earlyBaseDir = options.appDir ?? process.cwd();
+	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;
@@ -903,14 +1011,12 @@ function vinext(options = {}) {
 			} });
 			const useCachePlugin = await createUseCacheCallablePlugin({
 				projectRoot: earlyBaseDir,
-				cacheRuntime: pathToFileURL(resolveShimModulePath(shimsDir, "cache-callable-runtime")).href,
-				getAppDir: () => appDir,
-				matchesPageExtension: (fileName) => fileMatcher.extensionRegex.test(fileName)
+				cacheRuntime: pathToFileURL(resolveShimModulePath(shimsDir, "cache-callable-runtime")).href
 			});
 			const useServerIndex = plugins.findIndex((plugin) => plugin.name === "rsc:use-server");
 			if (useServerIndex === -1) throw new Error("vinext: Failed to locate @vitejs/plugin-rsc use-server plugin.");
 			plugins.splice(useServerIndex, 0, useCachePlugin);
-			return plugins;
+			return plugins.map(scopeRscPlugin);
 		}).catch((cause) => {
 			throw new Error("vinext: Failed to load @vitejs/plugin-rsc.", { cause });
 		});
@@ -919,8 +1025,6 @@ function vinext(options = {}) {
 		manualUseCachePluginPromise = createUseCacheCallablePlugin({
 			projectRoot: earlyBaseDir,
 			cacheRuntime: pathToFileURL(resolveShimModulePath(shimsDir, "cache-callable-runtime")).href,
-			getAppDir: () => appDir,
-			matchesPageExtension: (fileName) => fileMatcher.extensionRegex.test(fileName),
 			allowMissingRsc: true
 		});
 	}
@@ -987,9 +1091,10 @@ function vinext(options = {}) {
 				}
 				const delegate = mdxFactory(mdxOpts);
 				mdxDelegate = delegate;
-				if (reason === "detected") if (nextConfig.mdx) console.log("[vinext] Auto-injected @mdx-js/rollup with remark/rehype plugins from next.config");
-				else console.log("[vinext] Auto-injected @mdx-js/rollup for MDX support");
-				else console.log("[vinext] Auto-injected @mdx-js/rollup for on-demand MDX support");
+				if (reason === "detected") {
+					if (nextConfig.mdx) console.log("[vinext] Auto-injected @mdx-js/rollup with remark/rehype plugins from next.config");
+					else console.log("[vinext] Auto-injected @mdx-js/rollup for MDX support");
+				} else console.log("[vinext] Auto-injected @mdx-js/rollup for on-demand MDX support");
 				return delegate;
 			} catch {
 				if (reason === "detected" && !warnedMissingMdxPlugin) {
@@ -1029,30 +1134,97 @@ function vinext(options = {}) {
 		}
 	};
 	const cachedConsumerConditionTransform = createTransformCache();
+	const cachedJsxInJsTransform = createTransformCache();
 	let transformProjectLocalCommonJs = false;
 	let transformBundledCommonJsDependencies = false;
 	const commonJsPlugin = commonjs({ filter(id) {
+		if (isPathInside(__dirname, toSlash(stripViteModuleQuery(id)))) return false;
 		return commonjsTransformFilter(id, transformProjectLocalCommonJs, transformBundledCommonJsDependencies, importMetaUrlCapability.isBundledCommonJsDependencyId);
 	} });
 	const commonJsTransform = commonJsPlugin.transform;
-	if (typeof commonJsTransform === "function") commonJsPlugin.transform = function environmentAwareCommonJsTransform(code, id, ...args) {
-		if (this.environment.mode === "dev" && this.environment.depsOptimizer?.isOptimizedDepFile(id)) return null;
-		const isDev = this.environment.mode === "dev";
-		const isServer = this.environment.config.consumer === "server";
-		const bundledDependency = isDev && isServer && (code.includes("__filename") || code.includes("__dirname")) && importMetaUrlCapability.isBundledCommonJsDependencyId(id);
-		const projectLocal = !bundledDependency && !id.includes("/node_modules/") && !id.includes("\\node_modules\\");
-		const previousProjectLocal = transformProjectLocalCommonJs;
-		const previous = transformBundledCommonJsDependencies;
-		transformProjectLocalCommonJs = projectLocal && isDev;
-		transformBundledCommonJsDependencies = bundledDependency;
-		try {
-			return commonJsTransform.call(this, code, id, ...args);
-		} finally {
-			transformProjectLocalCommonJs = previousProjectLocal;
-			transformBundledCommonJsDependencies = previous;
-		}
-	};
+	if (typeof commonJsTransform === "function") {
+		const environmentAwareCommonJsTransform = function(code, id, ...args) {
+			const normalizedId = toSlash(stripViteModuleQuery(id));
+			const nitroServicePath = this.environment.name === "nitro" && nitroBuildDir && normalizedId.endsWith("/entry.js") ? path.relative(path.join(canonicalize(nitroBuildDir), "vite/services"), normalizedId) : "";
+			if (/^[^/]+\/entry\.js$/.test(nitroServicePath)) return null;
+			if (isPathInside(__dirname, toSlash(stripViteModuleQuery(id)))) return null;
+			if (this.environment.mode === "dev" && this.environment.depsOptimizer?.isOptimizedDepFile(id)) return null;
+			const isDev = this.environment.mode === "dev";
+			const isServer = this.environment.config.consumer === "server";
+			const bundledDependency = isDev && isServer && (code.includes("__filename") || code.includes("__dirname")) && importMetaUrlCapability.isBundledCommonJsDependencyId(id);
+			const projectLocal = !bundledDependency && !id.includes("/node_modules/") && !id.includes("\\node_modules\\");
+			const userCondition = commonjsTransformFilter(id, projectLocal && isDev, bundledDependency, importMetaUrlCapability.isBundledCommonJsDependencyId);
+			if (userCondition === false) return null;
+			if (userCondition !== true && id.includes("node_modules")) return null;
+			const previousProjectLocal = transformProjectLocalCommonJs;
+			const previous = transformBundledCommonJsDependencies;
+			transformProjectLocalCommonJs = projectLocal && isDev;
+			transformBundledCommonJsDependencies = bundledDependency;
+			try {
+				return commonJsTransform.call(this, code, id, ...args);
+			} finally {
+				transformProjectLocalCommonJs = previousProjectLocal;
+				transformBundledCommonJsDependencies = previous;
+			}
+		};
+		commonJsPlugin.transform = {
+			filter: { code: { include: COMMONJS_SYNTAX_CODE_FILTER } },
+			handler: environmentAwareCommonJsTransform
+		};
+	}
+	const buildLifecyclePlugins = createBuildLifecyclePlugins({
+		isEnabled: (builder) => buildLifecycleEnabled && builder.config.build.write !== false && !builder.config.build.lib && (buildLifecycleInvocation !== void 0 || !builder.config.build.watch && !builder.config.build.ssr && getBuildBundlerOptions(builder.config.build)?.input === void 0),
+		onComplete: () => buildLifecycleInvocation?.onComplete?.(),
+		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;
+			const reactUpgrade = getReactUpgradeDeps(root);
+			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"
+			});
+		},
+		shouldBuildPlainPages: () => !hasAppDir && !hasCloudflarePlugin && !hasNitroPlugin,
+		createContext: () => ({
+			cacheConfig: options.cache ?? null,
+			configNodeEnv: viteCliBuildConfigNodeEnv,
+			createPagesOnlyPlugins: (pagesClientAssetsModule) => vinext({
+				...options,
+				disableAppRouter: true,
+				precompress: false,
+				prerender: void 0,
+				__skipBuildLifecycle: true,
+				__pagesClientAssetsModule: pagesClientAssetsModule
+			}),
+			emptyOutDir: buildEmptyOutDir,
+			hasAppDir,
+			hasPagesDir,
+			nextConfig,
+			prerenderConfig,
+			prerenderConcurrency: prerenderConfig?.concurrency,
+			prerenderSecret,
+			previewBuildCredentials,
+			revalidateSecret,
+			root,
+			routeRootConfig: {
+				appDir: options.appDir,
+				disableAppRouter: options.disableAppRouter,
+				rscOutDir: options.rscOutDir,
+				ssrOutDir: options.ssrOutDir
+			},
+			rscBuildIdentity,
+			rscCompatibilityId,
+			skipHybridPagesBundle: hasCloudflarePlugin
+		})
+	});
 	const plugins = [
+		buildLifecyclePlugins[0],
 		createStyledJsxPlugin(earlyBaseDir),
 		mdxProxyPlugin,
 		reactPluginPromise,
@@ -1087,15 +1259,17 @@ function vinext(options = {}) {
 						if (!code.includes("use client") && !code.includes("use server")) return;
 						if (!hasReactDirective(code)) return;
 					}
-					const result = await transformWithOxc(code, id, {
-						lang: "jsx",
-						jsx: { runtime: "automatic" },
-						sourcemap: true
+					return cachedJsxInJsTransform(id, code, void 0, async () => {
+						const result = await transformWithOxc(code, id, {
+							lang: "jsx",
+							jsx: { runtime: "automatic" },
+							sourcemap: true
+						});
+						return {
+							code: result.code,
+							map: result.map
+						};
 					});
-					return {
-						code: result.code,
-						map: result.map
-					};
 				}
 			}
 		},
@@ -1119,6 +1293,7 @@ function vinext(options = {}) {
 		}),
 		dataUrlCssPlugin(),
 		createCssModuleImportCompatibilityPlugin(),
+		createDevServerLifecyclePlugin({}, (config) => config[VINEXT_DEV_CLI_LIFECYCLE] === true),
 		{
 			name: "vinext:config",
 			enforce: "pre",
@@ -1126,33 +1301,48 @@ function vinext(options = {}) {
 			[VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY]: options.nextConfig ?? null,
 			[VINEXT_ROUTE_ROOT_CONFIG_PLUGIN_PROPERTY]: {
 				appDir: options.appDir,
+				clientOutDir: options.clientOutDir,
 				disableAppRouter: options.disableAppRouter,
 				rscOutDir: options.rscOutDir,
 				ssrOutDir: options.ssrOutDir
 			},
 			[VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY]: options.cache ?? null,
 			async config(config, env) {
+				hasPlainPagesBuildEnvironments = false;
+				originalPlainPagesEnvironments = void 0;
+				buildEmptyOutDir = typeof config.build?.emptyOutDir === "boolean" ? config.build.emptyOutDir : void 0;
 				isServeCommand = env.command === "serve";
-				root = toSlash(config.root ?? process.cwd());
+				root = path.resolve(toSlash(process.cwd()), config.root ?? ".");
+				const devCliLifecycleEnabled = env.command === "serve" && env.isPreview !== true && claimViteCliDevInvocation(root, config["__vinextDevRestart"] === true, reservedDevCliInvocation && config.configFile === false);
+				buildLifecycleInvocation = config[VINEXT_BUILD_LIFECYCLE_CONFIG];
+				buildLifecycleEnabled = env.command === "build" && !internalOptions.__skipBuildLifecycle && (buildLifecycleInvocation !== void 0 || claimViteCliBuildInvocation());
 				const userResolve = config.resolve;
 				let tsconfigPathAliases = {};
 				let sassTsconfigPathAliases = [];
 				const swcHelpersAlias = resolveSwcHelpersAlias(root);
 				const mode = env?.mode ?? "development";
-				if (config.envDir !== false) loadDotenv({
-					root: config.envDir ?? root,
-					mode
-				});
+				if (config.envDir !== false) {
+					const envDir = config.envDir ?? root;
+					loadDotenv({
+						root: envDir,
+						mode
+					});
+				}
 				let resolvedNodeEnv;
 				if (env?.command === "build" || env?.isPreview === true) resolvedNodeEnv = "production";
 				else if (mode === "test") resolvedNodeEnv = "test";
 				else resolvedNodeEnv = "development";
-				if (process.env.NODE_ENV !== resolvedNodeEnv) Reflect.set(process.env, "NODE_ENV", resolvedNodeEnv);
-				if (env?.command === "build") previewBuildCredentials = getPreviewBuildCredentials() ?? createPreviewBuildCredentials();
+				if (!(process.env.NODE_ENV === "test" && viteCliBuildConfigNodeEnv === "test") && process.env.NODE_ENV !== resolvedNodeEnv) Reflect.set(process.env, "NODE_ENV", resolvedNodeEnv);
+				if (env?.command === "build") {
+					previewBuildCredentials = getPreviewBuildCredentials() ?? createPreviewBuildCredentials();
+					if (buildLifecycleEnabled) revalidateSecret ??= randomBytes(32).toString("hex");
+				}
 				draftModeSecret = previewBuildCredentials?.id ?? getPagesPreviewModeId();
 				let baseDir;
-				if (options.appDir) baseDir = toSlash(path.isAbsolute(options.appDir) ? options.appDir : path.resolve(root, options.appDir));
-				else {
+				if (options.appDir) {
+					const dir = path.isAbsolute(options.appDir) ? options.appDir : path.resolve(root, options.appDir);
+					baseDir = toSlash(dir);
+				} else {
 					const hasRootApp = fs.existsSync(path.join(root, "app"));
 					const hasRootPages = fs.existsSync(path.join(root, "pages"));
 					const hasSrcApp = fs.existsSync(path.join(root, "src", "app"));
@@ -1186,6 +1376,7 @@ function vinext(options = {}) {
 						buildId: sharedBuildId
 					};
 				}
+				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);
 				tsconfigPathAliases = resolvedTsconfigAliases.vite;
@@ -1207,6 +1398,8 @@ function vinext(options = {}) {
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
 				const middlewareConventionDir = canonicalize(baseDir) === canonicalize(path.join(root, "src")) ? path.join(root, "src") : root;
 				middlewarePath = findMiddlewareFile(root, fileMatcher, middlewareConventionDir);
+				pageTransformCanonicalPaths.clear();
+				canonicalMiddlewarePath = middlewarePath ? canonicalize(middlewarePath) : null;
 				if (middlewarePath) {
 					const staticMatcher = extractMiddlewareMatcherConfigValue(middlewarePath);
 					if (staticMatcher !== void 0) validateMiddlewareMatcherPatterns(staticMatcher);
@@ -1260,7 +1453,6 @@ function vinext(options = {}) {
 				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_CANONICAL_RSC_REQUESTS"] = JSON.stringify(env?.command === "build" && hasVerbatimResponseVary(options.cache) ? "1" : "");
 				defines["process.env.__VINEXT_RSC_COMPATIBILITY_ID"] = JSON.stringify(rscCompatibilityId);
 				defines["process.env.__VINEXT_RSC_BUILD_IDENTITY"] = JSON.stringify(rscBuildIdentity ?? "");
 				defines["process.env.__VINEXT_DEPLOYMENT_ID"] = JSON.stringify(nextConfig.deploymentId ?? "");
@@ -1318,6 +1510,9 @@ function vinext(options = {}) {
 				}
 				flattenPlugins(config.plugins ?? []);
 				hasCloudflarePlugin = pluginsFlat.some((p) => p && typeof p === "object" && "name" in p && typeof p.name === "string" && (p.name === "vite-plugin-cloudflare" || p.name.startsWith("vite-plugin-cloudflare:")));
+				const configuredMultiStageOutput = options.cache?.cdn?.output;
+				matchedMultiStageOutput = configuredMultiStageOutput?.type === "multi-stage" && (configuredMultiStageOutput.matchesBuild?.({ plugins: pluginsFlat }) ?? true) ? configuredMultiStageOutput : void 0;
+				selectedMultiStageOutput = isServeCommand ? void 0 : matchedMultiStageOutput;
 				hasNitroPlugin = pluginsFlat.some((p) => p && typeof p === "object" && "name" in p && typeof p.name === "string" && (p.name === "nitro" || p.name.startsWith("nitro:")));
 				let postcssOverride;
 				if (!config.css?.postcss || typeof config.css.postcss === "string") postcssOverride = await resolvePostcssStringPlugins(root);
@@ -1327,11 +1522,20 @@ function vinext(options = {}) {
 				const isSSR = !!config.build?.ssr;
 				const serverTranspilePackages = [...nextConfig?.turbopackTranspilePackages ?? [], ...nextConfig?.optimizePackageImports ?? []];
 				pagesBundledPackages = new Set(serverTranspilePackages);
-				const nextServerExternal = mergeServerExternalPackages(nextConfig?.serverExternalPackages, serverTranspilePackages);
+				const openTelemetryPackages = findOpenTelemetryPackages(root);
+				registerNodeOpenTelemetryLoader = env.command === "build" && !hasCloudflarePlugin && !hasNitroPlugin && instrumentationPath !== null && openTelemetryPackages.includes("@opentelemetry/instrumentation") && !serverTranspilePackages.includes("@opentelemetry/instrumentation") && (() => {
+					try {
+						createRequire(path.join(root, "package.json")).resolve("@opentelemetry/instrumentation/hook.mjs");
+						return true;
+					} catch {
+						return false;
+					}
+				})();
+				const nextServerExternal = mergeServerExternalPackages(nextConfig?.serverExternalPackages, serverTranspilePackages, openTelemetryPackages);
 				resolvedServerExternalPackages = nextServerExternal;
 				const isMultiEnv = hasAppDir || hasCloudflarePlugin || hasNitroPlugin;
 				const hasBuildInput = getBuildBundlerOptions(config.build)?.input !== void 0;
-				const shouldInjectPlainPagesEnvironments = !hasAppDir && !hasCloudflarePlugin && !isSSR && !hasBuildInput;
+				const shouldInjectPlainPagesEnvironments = !hasAppDir && !hasCloudflarePlugin && !isSSR && !hasBuildInput && !config.build?.lib;
 				const hasClientBuildEnvironment = hasAppDir || hasCloudflarePlugin || hasNitroPlugin || shouldInjectPlainPagesEnvironments;
 				const clientAssetsDir = resolveAssetsDir(nextConfig.assetPrefix ?? "");
 				clientAssetsInlineLimit = config.build?.assetsInlineLimit ?? 0;
@@ -1340,8 +1544,23 @@ function vinext(options = {}) {
 					overlay: false
 				};
 				const cssModulesOverride = config.css?.modules === false || typeof config.css?.modules === "object" && "Loader" in config.css.modules ? {} : { modules: { Loader: sassComposesLoader.Loader } };
+				const explicitViteAliases = config.resolve?.alias;
+				const userAliasEntries = Array.isArray(explicitViteAliases) ? explicitViteAliases : Object.entries(explicitViteAliases ?? {}).map(([find, replacement]) => ({
+					find,
+					replacement
+				}));
+				if (config.resolve) {
+					config.resolve = { ...config.resolve };
+					delete config.resolve.alias;
+				}
 				const viteConfig = {
 					appType: "custom",
+					...devCliLifecycleEnabled ? { [VINEXT_DEV_CLI_LIFECYCLE]: true } : {},
+					...hasAppDir && hasNitroPlugin ? { rsc: { serverHandler: false } } : {},
+					...!hasAppDir && hasCloudflarePlugin ? { builder: {
+						...config.builder,
+						sharedConfigBuild: true
+					} } : {},
 					build: {
 						ssrEmitAssets: true,
 						cssTarget: [
@@ -1369,13 +1588,20 @@ function vinext(options = {}) {
 					},
 					worker: { plugins: () => [createWorkerImageImportsPlugin({ deploymentId: nextConfig.deploymentId })] },
 					server: {
+						watch: config.server?.watch === null ? null : {
+							ignored: [VINEXT_GENERATED_DIR_RE],
+							exclude: [VINEXT_GENERATED_DIR_RE]
+						},
 						cors: {
 							preflightContinue: true,
 							origin: /^https?:\/\/(?:(?:[^:]+\.)?localhost|127\.0\.0\.1|\[::1\])(?::\d+)?$/
 						},
 						hmr: devHmrConfig
 					},
-					...hasCloudflarePlugin || hasNitroPlugin ? {} : config.ssr?.external === true ? { ssr: { external: true } } : { ssr: {
+					...hasCloudflarePlugin || hasNitroPlugin ? {} : config.ssr?.external === true ? { ssr: {
+						external: true,
+						noExternal: [...PATCHED_SERVER_PACKAGES]
+					} } : { ssr: {
 						external: [
 							"react",
 							"react-dom",
@@ -1387,13 +1613,16 @@ function vinext(options = {}) {
 						noExternal: true
 					} },
 					resolve: {
-						alias: buildResolveAliasEntries({
+						alias: [...userAliasEntries, ...buildResolveAliasEntries({
 							...swcHelpersAlias ? { "@swc/helpers/_": swcHelpersAlias } : {},
 							...tsconfigPathAliases,
 							...nextConfig.aliases,
 							...nextShimMap,
 							"vinext/server/pages-client-assets": _pagesClientAssetsPath
-						}, tsconfigPathAliases),
+						}, tsconfigPathAliases, {
+							...nextConfig.aliases,
+							...nextShimMap
+						})],
 						dedupe: [
 							"react",
 							"react-dom",
@@ -1468,28 +1697,84 @@ function vinext(options = {}) {
 					}
 				};
 				pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
+				if (env.command === "serve" && !hasAppDir && !hasCloudflarePlugin && !shouldInjectPlainPagesEnvironments) viteConfig.optimizeDeps.include = [.../* @__PURE__ */ new Set([...incomingInclude, "react-dom/client"])];
 				if (hasAppDir) {
 					const appEntries = [`${path.relative(root, appDir)}/**/*.{tsx,ts,jsx,js}`];
 					const explicitInstrumentationEntries = [instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : []);
 					const optimizeEntries = [.../* @__PURE__ */ new Set([...appEntries, ...explicitInstrumentationEntries])];
+					const additionalRscOptimizeIncludes = [];
+					if (env.command === "serve" && hasCloudflarePlugin && nextConfig?.aliases["next-intl/config"] && !(config.environments?.rsc?.optimizeDeps?.noDiscovery ?? config.optimizeDeps?.noDiscovery)) {
+						const projectRequire = createRequire(path.join(root, "package.json"));
+						const excluded = [...incomingExclude, ...config.environments?.rsc?.optimizeDeps?.exclude ?? []];
+						for (const id of [
+							"@formatjs/intl-localematcher",
+							"negotiator",
+							"@formatjs/fast-memoize",
+							"intl-messageformat"
+						]) {
+							if (excluded.includes(id)) continue;
+							try {
+								projectRequire.resolve(id);
+								additionalRscOptimizeIncludes.push(id);
+							} catch {}
+						}
+					}
+					const additionalClientOptimizeIncludes = [];
+					let hasNextIntl = Boolean(nextConfig?.aliases["next-intl/config"]);
+					if (env.command === "serve" && !hasNextIntl) try {
+						const pkg = JSON.parse(fs.readFileSync(path.join(root, "package.json"), "utf8"));
+						hasNextIntl = [
+							"dependencies",
+							"devDependencies",
+							"optionalDependencies",
+							"peerDependencies"
+						].some((field) => Object.hasOwn(pkg[field] ?? {}, "next-intl"));
+					} catch {}
+					if (env.command === "serve" && hasNextIntl && !(config.environments?.client?.optimizeDeps?.noDiscovery ?? config.optimizeDeps?.noDiscovery)) {
+						const excluded = [...incomingExclude, ...config.environments?.client?.optimizeDeps?.exclude ?? []];
+						try {
+							const projectRequire = createRequire(path.join(root, "package.json"));
+							const packageRequire = createRequire(projectRequire.resolve("next-intl"));
+							for (const id of [
+								"use-intl",
+								"use-intl/react",
+								"use-intl/_IntlProvider",
+								"use-intl/_useLocale"
+							]) {
+								const include = `next-intl > ${id}`;
+								if (excluded.includes("use-intl") || excluded.includes(id) || excluded.includes(include)) continue;
+								try {
+									packageRequire.resolve(id);
+									additionalClientOptimizeIncludes.push(include);
+								} catch {}
+							}
+							if (!excluded.includes("next") && !excluded.includes("next/link")) additionalClientOptimizeIncludes.push("next/link");
+						} catch {}
+					}
 					const appClientInput = { index: VIRTUAL_APP_BROWSER_ENTRY };
 					if (hasPagesDir) appClientInput["vinext-client-entry"] = VIRTUAL_CLIENT_ENTRY;
+					const nitroDevEnvironmentResolve = hasNitroPlugin && env?.command === "serve" ? { resolve: { noExternal: ["next"] } } : {};
 					viteConfig.environments = {
 						rsc: {
+							...nitroDevEnvironmentResolve,
 							...hasCloudflarePlugin || hasNitroPlugin ? {} : { resolve: {
 								external: userSsrExternal === true ? true : [
 									"satori",
 									"@resvg/resvg-js",
 									"yoga-wasm-web",
-									...env?.command === "serve" && _canExternalizeAppRscHandler ? ["vinext/server/app-rsc-handler"] : [],
+									...env?.command === "serve" && _canExternalizeAppRscHandler ? ["vinext/server/app-rsc-combined-handler", "vinext/server/app-rsc-handler"] : [],
 									...userSsrExternal
 								],
-								...userSsrExternal === true ? {} : { noExternal: true }
+								noExternal: userSsrExternal === true ? [...PATCHED_SERVER_PACKAGES] : true
 							} },
 							optimizeDeps: {
 								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE),
 								entries: optimizeEntries,
-								include: [.../* @__PURE__ */ new Set([...incomingInclude, "react-server-dom-webpack/static.edge"])],
+								include: [.../* @__PURE__ */ new Set([
+									...incomingInclude,
+									...additionalRscOptimizeIncludes,
+									"react-server-dom-webpack/static.edge"
+								])],
 								...depOptimizeNodeEnvOptions
 							},
 							build: {
@@ -1501,13 +1786,14 @@ function vinext(options = {}) {
 							}
 						},
 						ssr: {
+							...nitroDevEnvironmentResolve,
 							...hasCloudflarePlugin || hasNitroPlugin ? {} : { resolve: {
 								external: userSsrExternal === true ? true : [
 									...userSsrExternal,
 									"ipaddr.js",
 									...externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []
 								],
-								...userSsrExternal === true ? {} : { noExternal: true }
+								noExternal: userSsrExternal === true ? [...PATCHED_SERVER_PACKAGES] : true
 							} },
 							optimizeDeps: {
 								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], userSsrExternal === true || externalizeSsrReactInDev ? SSR_EXTERNAL_REACT_ENTRIES : []),
@@ -1526,6 +1812,7 @@ function vinext(options = {}) {
 								entries: optimizeEntries,
 								include: [.../* @__PURE__ */ new Set([
 									...incomingInclude,
+									...additionalClientOptimizeIncludes,
 									"react",
 									"react-dom",
 									"react-dom/client",
@@ -1549,6 +1836,7 @@ function vinext(options = {}) {
 				} else if (hasCloudflarePlugin) viteConfig.environments = { client: {
 					consumer: "client",
 					optimizeDeps: {
+						include: ["react-dom/client"],
 						...pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : {},
 						...depOptimizeNodeEnvOptions
 					},
@@ -1563,49 +1851,55 @@ function vinext(options = {}) {
 						})
 					}
 				} };
-				else if (shouldInjectPlainPagesEnvironments) viteConfig.environments = {
-					client: {
-						consumer: "client",
-						optimizeDeps: {
-							...pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : {},
-							...depOptimizeNodeEnvOptions
-						},
-						build: {
-							outDir: "dist/client",
-							manifest: true,
-							ssrManifest: true,
-							assetsInlineLimit: clientAssetsInlineLimit,
-							...withBuildBundlerOptions({
-								input: { index: VIRTUAL_CLIENT_ENTRY },
-								output: getClientOutputConfig(clientAssetsDir),
-								treeshake: getClientTreeshakeConfig()
-							})
-						}
-					},
-					ssr: {
-						resolve: {
-							external: [
-								"react",
-								"react-dom",
-								"react-dom/server",
-								"ipaddr.js",
-								...nextServerExternal
-							],
-							noExternal: true
-						},
-						optimizeDeps: {
-							exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], Object.keys(nextShimMap)),
-							...depOptimizeNodeEnvOptions
+				else if (shouldInjectPlainPagesEnvironments) {
+					const plainPagesEnvironments = {
+						client: {
+							consumer: "client",
+							optimizeDeps: {
+								include: ["react-dom/client"],
+								...pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : {},
+								...depOptimizeNodeEnvOptions
+							},
+							build: {
+								outDir: "dist/client",
+								manifest: true,
+								ssrManifest: true,
+								assetsInlineLimit: clientAssetsInlineLimit,
+								...withBuildBundlerOptions({
+									input: { index: VIRTUAL_CLIENT_ENTRY },
+									output: getClientOutputConfig(clientAssetsDir),
+									treeshake: getClientTreeshakeConfig()
+								})
+							}
 						},
-						build: {
-							outDir: "dist/server",
-							...withBuildBundlerOptions({
-								input: { index: VIRTUAL_SERVER_ENTRY },
-								output: { entryFileNames: "entry.js" }
-							})
+						ssr: {
+							resolve: {
+								external: [
+									"react",
+									"react-dom",
+									"react-dom/server",
+									"ipaddr.js",
+									...nextServerExternal
+								],
+								noExternal: true
+							},
+							optimizeDeps: {
+								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], Object.keys(nextShimMap)),
+								...depOptimizeNodeEnvOptions
+							},
+							build: {
+								outDir: "dist/server",
+								...withBuildBundlerOptions({
+									input: { index: hasNitroPlugin ? VIRTUAL_WORKER_ENTRY : VIRTUAL_SERVER_ENTRY },
+									output: { entryFileNames: "entry.js" }
+								})
+							}
 						}
-					}
-				};
+					};
+					originalPlainPagesEnvironments = config.environments;
+					viteConfig.environments = plainPagesEnvironments;
+					hasPlainPagesBuildEnvironments = env.command === "build";
+				}
 				if (pagesOptimizeEntries.length > 0 && !hasCloudflarePlugin) viteConfig.optimizeDeps = {
 					...viteConfig.optimizeDeps,
 					entries: pagesOptimizeEntries
@@ -1637,7 +1931,25 @@ function vinext(options = {}) {
 				return null;
 			},
 			async configResolved(config) {
-				if (isServeCommand && hasCloudflarePlugin && hasPagesDir && !hasAppDir) suppressOptionalOptimizeDepsWarnings(config.logger);
+				if (isServeCommand && !config["__vinextDevCliLifecycle"] && config.configFile && isViteCliConfigFile(config.configFile, config.inlineConfig)) {
+					if (claimViteCliDevInvocation(config.root, false, true)) {
+						config[VINEXT_DEV_CLI_LIFECYCLE] = true;
+						if (!config.server.middlewareMode) applyDevServerDefaults(config.server, {});
+					}
+				}
+				if (isServeCommand && (hasAppDir || hasCloudflarePlugin && hasPagesDir)) {
+					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"] : [];
+						for (const id of optionalIncludes) {
+							if (optimizer.include?.includes(id) || optimizer.exclude?.some((excluded) => id === excluded || id.startsWith(`${excluded}/`))) continue;
+							(optimizer.include ??= []).push(id);
+							optionalWarnings.add(`Failed to resolve dependency: ${id}, present in ${name} 'optimizeDeps.include'`);
+						}
+					}
+					Object.assign(config, { logger: createOptionalOptimizeDepsLogger(config.logger, optionalWarnings) });
+				}
 				if (config.worker?.rolldownOptions) {
 					const workerFileNames = `${resolveAssetsDir(nextConfig.assetPrefix ?? "")}/workers/[name]-[hash].js`;
 					const workerOutputs = config.worker.rolldownOptions.output;
@@ -1722,9 +2034,16 @@ function vinext(options = {}) {
 				}
 			},
 			resolveId: {
-				filter: { id: /(?:next\/|vinext\/(?:shims\/|server\/app-rsc-handler)|virtual:vinext-|@vercel\/og(?:\.js)?$)/ },
+				filter: { id: /(?:next\/|vinext\/(?:shims\/|server\/(?:app-rsc-(?:combined-)?handler|app-router-entry|pages-router-entry))|virtual:vinext-|@vercel\/og(?:\.js)?$)/ },
 				handler(id, importer) {
 					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 {
+							id: _appRscCombinedHandlerPath,
+							external: true
+						};
+						return _appRscCombinedHandlerPath;
+					}
 					if (cleanId === "vinext/server/app-rsc-handler") {
 						if (_canExternalizeAppRscHandler && this.environment?.name === "rsc" && this.environment.config?.command === "serve") return {
 							id: _appRscHandlerPath,
@@ -1735,11 +2054,20 @@ function vinext(options = {}) {
 					if (isVercelOgImport(cleanId) && !isVinextOgShimImporter(importer)) return resolveShimModulePath(_shimsDir, "og");
 					if (cleanId.startsWith("vinext/shims/")) return resolveShimModulePath(_shimsDir, stripJsExtension(stripViteModuleQuery(cleanId.slice(13))));
 					if (cleanId === VIRTUAL_WORKER_ENTRY) return RESOLVED_WORKER_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-worker-entry")) return RESOLVED_WORKER_ENTRY;
+					if (selectedMultiStageOutput && (cleanId === "vinext/server/app-router-entry" || cleanId === "vinext/server/pages-router-entry")) return RESOLVED_WORKER_ENTRY;
+					if (cleanId.endsWith("/" + VIRTUAL_WORKER_ENTRY)) return RESOLVED_WORKER_ENTRY;
+					if (cleanId === VIRTUAL_REQUEST_STAGE) return RESOLVED_REQUEST_STAGE;
+					if (cleanId.endsWith("/" + VIRTUAL_REQUEST_STAGE)) return RESOLVED_REQUEST_STAGE;
+					if (cleanId === VIRTUAL_RESPONSE_STAGE) return RESOLVED_RESPONSE_STAGE;
+					if (cleanId.endsWith("/" + VIRTUAL_RESPONSE_STAGE)) return RESOLVED_RESPONSE_STAGE;
 					if (cleanId === VIRTUAL_SERVER_ENTRY) return RESOLVED_SERVER_ENTRY;
+					if (cleanId === VIRTUAL_PAGES_REQUEST_ENTRY) return RESOLVED_PAGES_REQUEST_ENTRY;
+					if (cleanId === VIRTUAL_PAGES_RESPONSE_ENTRY) return RESOLVED_PAGES_RESPONSE_ENTRY;
 					if (cleanId === VIRTUAL_CLIENT_ENTRY) return RESOLVED_CLIENT_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-server-entry")) return RESOLVED_SERVER_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-client-entry")) return RESOLVED_CLIENT_ENTRY;
+					if (cleanId.endsWith("/" + VIRTUAL_SERVER_ENTRY)) return RESOLVED_SERVER_ENTRY;
+					if (cleanId.endsWith("/" + VIRTUAL_PAGES_REQUEST_ENTRY)) return RESOLVED_PAGES_REQUEST_ENTRY;
+					if (cleanId.endsWith("/" + VIRTUAL_PAGES_RESPONSE_ENTRY)) return RESOLVED_PAGES_RESPONSE_ENTRY;
+					if (cleanId.endsWith("/" + VIRTUAL_CLIENT_ENTRY)) return RESOLVED_CLIENT_ENTRY;
 					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 {
@@ -1748,16 +2076,35 @@ function vinext(options = {}) {
 						};
 						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}`,
+							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}`,
+							external: true
+						};
+						return RESOLVED_PREGENERATED_CONCRETE_PATHS;
+					}
+					if (cleanId === VIRTUAL_APP_REQUEST_ENTRY) return RESOLVED_APP_REQUEST_ENTRY;
+					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_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;
+					if (cleanId === "virtual:vinext-cdn-cache-adapter" || cleanId.endsWith("/virtual:vinext-cdn-cache-adapter")) return RESOLVED_CDN_CACHE_ADAPTER;
 					if (cleanId === "virtual:vinext-image-adapters" || cleanId.endsWith("/virtual:vinext-image-adapters")) return RESOLVED_IMAGE_ADAPTERS;
 					if (cleanId.startsWith("virtual:vinext-google-fonts?")) return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(VIRTUAL_GOOGLE_FONTS.length);
-					if (cleanId.endsWith("/virtual:vinext-rsc-entry")) return RESOLVED_RSC_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-app-ssr-entry")) return RESOLVED_APP_SSR_ENTRY;
-					if (cleanId.endsWith("/virtual:vinext-app-browser-entry")) return RESOLVED_APP_BROWSER_ENTRY;
+					if (cleanId.endsWith("/" + VIRTUAL_RSC_ENTRY)) return RESOLVED_RSC_ENTRY;
+					if (cleanId.endsWith("/" + VIRTUAL_APP_REQUEST_ENTRY)) return RESOLVED_APP_REQUEST_ENTRY;
+					if (cleanId.endsWith("/" + VIRTUAL_APP_RESPONSE_ENTRY)) return RESOLVED_APP_RESPONSE_ENTRY;
+					if (cleanId.endsWith("/" + VIRTUAL_APP_SSR_ENTRY)) return RESOLVED_APP_SSR_ENTRY;
+					if (cleanId.endsWith("/" + VIRTUAL_APP_BROWSER_ENTRY)) return RESOLVED_APP_BROWSER_ENTRY;
 					if (cleanId.includes("/virtual:vinext-google-fonts?")) {
 						const queryIndex = cleanId.indexOf(VIRTUAL_GOOGLE_FONTS + "?");
 						return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(queryIndex + VIRTUAL_GOOGLE_FONTS.length);
@@ -1772,14 +2119,41 @@ function vinext(options = {}) {
 			load: {
 				filter: { id: /virtual:vinext-/ },
 				async handler(id) {
-					if (id === RESOLVED_WORKER_ENTRY) return `export { default } from ${JSON.stringify(hasAppDir ? "vinext/server/app-router-entry" : "vinext/server/pages-router-entry")};`;
+					if (id === RESOLVED_WORKER_ENTRY) {
+						if (selectedMultiStageOutput?.type === "multi-stage") return [
+							`export { default } from ${JSON.stringify(selectedMultiStageOutput.entry)};`,
+							`export * from ${JSON.stringify(selectedMultiStageOutput.entry)};`,
+							""
+						].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)};`,
+							"export default { fetch(request, env, ctx) {",
+							`  return worker.fetch(request, env, { ...ctx, hostRuntime: ${JSON.stringify(nitroHostRuntime)} });`,
+							"} };"
+						].join("\n");
+						return `export { default } from ${JSON.stringify(entry)};`;
+					}
+					if (id === RESOLVED_REQUEST_STAGE) return `export { handleRequestStage } from ${JSON.stringify(hasAppDir ? APP_REQUEST_STAGE_ENTRY : PAGES_REQUEST_STAGE_ENTRY)};\n`;
+					if (id === RESOLVED_RESPONSE_STAGE) return `export * from ${JSON.stringify(hasAppDir ? APP_RESPONSE_STAGE_ENTRY : PAGES_RESPONSE_STAGE_ENTRY)};\n`;
 					if (id === RESOLVED_SERVER_ENTRY) {
 						recordServerEntryLoad(this.environment?.name, id);
 						return await generateServerEntry$1(this.environment.config.publicDir === "" ? false : this.environment.config.publicDir);
 					}
+					if (id === RESOLVED_PAGES_REQUEST_ENTRY) {
+						recordServerEntryLoad(this.environment?.name, id);
+						return await generatePagesRequestEntry$1(this.environment.config.publicDir === "" ? false : this.environment.config.publicDir);
+					}
+					if (id === RESOLVED_PAGES_RESPONSE_ENTRY) {
+						recordServerEntryLoad(this.environment?.name, id);
+						return await generatePagesResponseEntry$1();
+					}
 					if (id === RESOLVED_CLIENT_ENTRY) return await generateClientEntry$1();
 					if (id === RESOLVED_PAGES_CLIENT_ASSETS) {
-						const metadata = { clientEntry: DEV_PAGES_CLIENT_ENTRY };
+						const metadata = {
+							clientEntry: DEV_PAGES_CLIENT_ENTRY,
+							crossOrigin: nextConfig?.crossOrigin ?? ""
+						};
 						const ssrManifest = {};
 						const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
 						const pagesRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
@@ -1792,18 +2166,21 @@ function vinext(options = {}) {
 						if (Object.keys(ssrManifest).length > 0) metadata.ssrManifest = ssrManifest;
 						return `export default ${JSON.stringify(metadata)};`;
 					}
-					if (id === RESOLVED_CACHEABILITY_MANIFEST) return "export default null;";
-					if (id === RESOLVED_RSC_ENTRY && hasAppDir) {
+					if (id === RESOLVED_CACHEABILITY_MANIFEST || id === RESOLVED_CACHEABILITY_REQUEST_PROJECTION) return "export default null;";
+					if (id === RESOLVED_PREGENERATED_CONCRETE_PATHS) return "export {};";
+					if ((id === RESOLVED_RSC_ENTRY || id === RESOLVED_APP_REQUEST_ENTRY || id === RESOLVED_APP_RESPONSE_ENTRY) && hasAppDir) {
 						recordServerEntryLoad(this.environment?.name, id);
 						const routes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
 						const metaRoutes = scanMetadataFiles(appDir);
 						const hasServerActions = await resolveHasServerActions(this.environment.config);
 						const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
 						const globalNotFoundPath = nextConfig?.globalNotFound ? findFileWithExts(appDir, "global-not-found", fileMatcher) : null;
-						rscClassificationManifest = collectRouteClassificationManifest(routes);
-						rscActionOwnerRoutes = this.environment.config.command === "build" && hasServerActions ? routes : null;
-						rscActionOwnerSharedRoots = [globalErrorPath, globalNotFoundPath].filter((path) => path !== null);
-						return generateRscEntry(appDir, routes, middlewarePath, metaRoutes, globalErrorPath, nextConfig?.basePath, nextConfig?.trailingSlash, {
+						if (id !== RESOLVED_APP_REQUEST_ENTRY) {
+							rscClassificationManifests.set(id, collectRouteClassificationManifest(routes));
+							rscActionOwnerRoutes = this.environment.config.command === "build" && hasServerActions ? routes : null;
+							rscActionOwnerSharedRoots = [globalErrorPath, globalNotFoundPath].filter((path) => path !== null);
+						}
+						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,
 							rewrites: nextConfig?.rewrites,
 							headers: nextConfig?.headers,
@@ -1813,7 +2190,9 @@ function vinext(options = {}) {
 							bodySizeLimitLabel: nextConfig?.serverActionsBodySizeLimitLabel,
 							htmlLimitedBots: nextConfig?.htmlLimitedBots,
 							clientTraceMetadata: nextConfig?.clientTraceMetadata,
+							nodeOpenTelemetryLoader: registerNodeOpenTelemetryLoader,
 							assetPrefix: nextConfig?.assetPrefix,
+							crossOrigin: nextConfig?.crossOrigin,
 							expireTime: nextConfig?.expireTime,
 							reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
 							cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
@@ -1842,6 +2221,7 @@ function vinext(options = {}) {
 					}
 					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);
@@ -1876,9 +2256,12 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				order: "pre",
 				handler(code, chunk) {
 					if (this.environment?.name !== "rsc") return null;
-					if (!rscClassificationManifest) return null;
 					const hasClassificationStub = code.includes("__VINEXT_CLASS");
 					if (!hasClassificationStub) return null;
+					const rscEntryId = [RESOLVED_RSC_ENTRY, RESOLVED_APP_RESPONSE_ENTRY].find((id) => chunk.moduleIds.includes(id));
+					if (!rscEntryId) return null;
+					const rscClassificationManifest = rscClassificationManifests.get(rscEntryId);
+					if (!rscClassificationManifest) return null;
 					const enableClassificationDebug = Boolean(process.env.VINEXT_DEBUG_CLASSIFICATION);
 					const patchPlan = hasClassificationStub && rscClassificationManifest ? planRouteClassificationInjection({
 						canonicalizeLayoutPath: canonicalize,
@@ -1900,7 +2283,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}) : { kind: "skip" };
 					const nextCode = patchPlan.kind === "skip" ? code : patchPlan.code;
 					if (patchPlan.kind === "skip") return null;
-					rscClassificationManifest = null;
+					rscClassificationManifests.delete(rscEntryId);
 					return {
 						code: nextCode,
 						map: null
@@ -1908,6 +2291,21 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 			}
 		},
+		{
+			name: "vinext:cloudflare-framework-tracing",
+			transform: {
+				filter: { id: /(?:app|pages)-router-entry\.[cm]?[jt]s(?:\?|$)/ },
+				handler(code, id) {
+					if (!hasCloudflarePlugin) return null;
+					const cleanId = toSlash(stripViteModuleQuery(id));
+					if (!WORKER_ROUTER_ENTRIES.has(cleanId)) return null;
+					return {
+						code: `import "vinext/internal/server/cloudflare-workers-tracing";\n${code}`,
+						map: null
+					};
+				}
+			}
+		},
 		{
 			name: "vinext:pages-client-assets-resolver",
 			sharedDuringBuild: true,
@@ -1915,11 +2313,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				filter: { id: /virtual:vinext-pages-client-assets$/ },
 				handler(id) {
 					const cleanId = toSlash(id.startsWith("\0") ? id.slice(1) : id);
-					if (cleanId !== VIRTUAL_PAGES_CLIENT_ASSETS && !cleanId.endsWith("/virtual:vinext-pages-client-assets")) return;
+					if (cleanId !== VIRTUAL_PAGES_CLIENT_ASSETS && !cleanId.endsWith("/" + VIRTUAL_PAGES_CLIENT_ASSETS)) return;
 					if (this.environment?.config.command !== "build") return RESOLVED_PAGES_CLIENT_ASSETS;
 					const buildRoot = this.environment.config.root ?? process.cwd();
 					const environmentOutDir = path.resolve(buildRoot, this.environment.config.build.outDir);
-					const sidecarDir = !hasAppDir && this.environment.name === "ssr" ? path.dirname(environmentOutDir) : environmentOutDir;
+					const sidecarDir = resolvePagesClientAssetsOutputDir(this.environment.name, environmentOutDir);
 					let externalId = path.relative(environmentOutDir, path.join(sidecarDir, PAGES_CLIENT_ASSETS_MODULE));
 					if (!externalId.startsWith(".")) externalId = `./${externalId}`;
 					pagesClientAssetsOutputDirs.add(sidecarDir);
@@ -1928,6 +2326,13 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						external: true
 					};
 				}
+			},
+			outputOptions(output) {
+				const environment = this.environment;
+				if (!selectedMultiStageOutput || !environment || !isMultiStageServerEnvironment(environment)) return;
+				const buildRoot = environment.config.root ?? process.cwd();
+				const outputDir = path.resolve(buildRoot, output.dir ?? environment.config.build.outDir);
+				pagesClientAssetsOutputDirs.add(resolvePagesClientAssetsOutputDir(environment.name, outputDir));
 			}
 		},
 		{
@@ -1949,6 +2354,49 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 			}
 		},
+		{
+			name: "vinext:multi-stage-host-entry",
+			transform: {
+				filter: { id: /virtual:|\.[cm]?[jt]sx?(?:\?|$)/ },
+				handler(code, id) {
+					const environment = this.environment;
+					if (!isServeCommand && (!environment || !isMultiStageServerEnvironment(environment))) return null;
+					const transformed = matchedMultiStageOutput?.transformHostEntry?.({
+						code,
+						id
+					});
+					return transformed == null ? null : {
+						code: transformed,
+						map: null
+					};
+				}
+			}
+		},
+		{
+			name: "vinext:multi-stage-server-output",
+			apply: "build",
+			buildStart() {
+				const entries = selectedMultiStageOutput?.entries;
+				const environment = this.environment;
+				if (!entries || !environment || !isMultiStageServerEnvironment(environment)) return;
+				for (const [name, id] of [["vinext-request-stage", entries.request], ["vinext-response-stage", entries.response]]) this.emitFile({
+					id,
+					name,
+					preserveSignature: "strict",
+					type: "chunk"
+				});
+			},
+			outputOptions(output) {
+				const environment = this.environment;
+				if (!selectedMultiStageOutput || !environment || !isMultiStageServerEnvironment(environment)) return;
+				if (output.format !== void 0 && output.format !== "es" && output.format !== "esm" && output.format !== "module") throw new Error(`[vinext] Multi-stage output requires an ES module format; ${JSON.stringify(output.format)} cannot represent independently deployable request and response entries.`);
+				return {
+					...output,
+					chunkFileNames: createMultiStageChunkFileNames(resolveAssetsDir(nextConfig.assetPrefix ?? ""), output.chunkFileNames),
+					codeSplitting: createMultiStageCodeSplittingConfig(output.codeSplitting)
+				};
+			}
+		},
 		{
 			name: "vinext:css-url-assets-defaults",
 			apply: "build",
@@ -1957,7 +2405,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				if (!hasAppDir || name !== "rsc" && name !== "ssr") return null;
 				const output = getBuildBundlerOptions(config.build)?.output;
 				if (Array.isArray(output) || output?.assetFileNames !== void 0) return null;
-				return { build: { ...withBuildBundlerOptions({ output: { assetFileNames: createClientAssetFileNames(resolveAssetsDir(nextConfig.assetPrefix ?? "")) } }) } };
+				const assetFileNames = createClientAssetFileNames(resolveAssetsDir(nextConfig.assetPrefix ?? ""));
+				return { build: { ...withBuildBundlerOptions({ output: { assetFileNames } }) } };
 			}
 		},
 		{
@@ -1990,6 +2439,18 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					fileName: CACHEABILITY_MANIFEST_MODULE,
 					source: "export default null;\n"
 				});
+				if (hasAppDir) {
+					this.emitFile({
+						type: "asset",
+						fileName: CACHEABILITY_REQUEST_PROJECTION_MODULE,
+						source: "export default null;\n"
+					});
+					this.emitFile({
+						type: "asset",
+						fileName: PREGENERATED_CONCRETE_PATHS_MODULE,
+						source: "delete globalThis.__VINEXT_PREGENERATED_CONCRETE_PATHS;\n"
+					});
+				}
 			}
 		},
 		{
@@ -2026,7 +2487,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			}
 		},
 		asyncHooksStubPlugin,
-		createInstrumentationClientTransformPlugin(() => instrumentationClientPath),
+		createInstrumentationClientTransformPlugin(() => instrumentationClientPath, () => nextConfig.instrumentationClientRouteManifest),
+		createInstrumentationServerTransformPlugin(() => instrumentationPath, () => nextConfig.instrumentationServerValueInjections),
 		{
 			name: "vinext:instrumentation-client-inject",
 			enforce: "pre",
@@ -2122,6 +2584,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				const devBuildId = nextConfig?.buildId ?? process.env.__VINEXT_BUILD_ID ?? "development";
 				server.middlewares.use((req, _res, next) => {
 					req.__vinextOriginalEncodedUrl ??= req.url;
+					delete req.headers[VINEXT_MW_CTX_HEADER];
 					next();
 				});
 				server.middlewares.use((req, _res, next) => {
@@ -2148,8 +2611,23 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					return `http://localhost:${typeof address === "object" && address ? address.port : server.config.server.port ?? 3e3}`;
 				};
 				let cachedSSRHandler = null;
+				const devPageRouteDataKinds = /* @__PURE__ */ new Map();
+				function classifyDevPageFile(filePath) {
+					const cached = devPageRouteDataKinds.get(filePath);
+					if (cached) return cached;
+					let dataKind = "none";
+					try {
+						const source = fs.readFileSync(filePath, "utf8");
+						dataKind = hasExportedName(source, "getStaticProps") ? "static" : hasExportedName(source, "getServerSideProps") ? "server" : "none";
+					} catch {}
+					devPageRouteDataKinds.set(filePath, dataKind);
+					return dataKind;
+				}
 				function getPagesRunner() {
-					if (!pagesRunner) pagesRunner = createDirectRunner(server.environments["ssr"] ?? Object.values(server.environments).find((e) => e !== server.environments["rsc"]) ?? Object.values(server.environments)[0]);
+					if (!pagesRunner) {
+						const env = server.environments["ssr"] ?? Object.values(server.environments).find((e) => e !== server.environments["rsc"]) ?? Object.values(server.environments)[0];
+						pagesRunner = createDirectRunner(env);
+					}
 					return pagesRunner;
 				}
 				/**
@@ -2198,6 +2676,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					pagesRunner?.clearCache();
 				}
+				function invalidatePagesHydrationProxies() {
+					const graph = server.environments.client?.moduleGraph;
+					if (!graph) return;
+					for (const mod of graph.idToModuleMap.values()) if (mod.id?.includes("?html-proxy&index=")) graph.invalidateModule(mod);
+				}
 				function invalidateAppRoutingModules() {
 					invalidateAppRouteCache();
 					invalidateMetadataFileCache();
@@ -2309,13 +2792,20 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (hasAppDir) invalidateRscEntryModule();
 					if (hasCloudflarePlugin && hasPagesDir && !hasAppDir) invalidatePagesServerEntry();
 				};
+				function invalidatePagesMiddlewareMatcher(filePath) {
+					if (!hasPagesDir || !middlewarePath || toSlash(filePath) !== middlewarePath) return;
+					cachedSSRHandler = null;
+					server.ws.send({ type: "full-reload" });
+				}
 				server.watcher.on("add", (filePath) => {
+					invalidatePagesMiddlewareMatcher(filePath);
 					updatePublicFileRoute(filePath, true);
 					let routeChanged = false;
 					const pagesAppChanged = isPagesAppFile(filePath);
 					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
 					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule();
 					if (hasPagesDir && toSlash(filePath).startsWith(pagesDir) && pageExtensions.test(filePath)) {
+						devPageRouteDataKinds.delete(toSlash(filePath));
 						invalidateRouteCache(pagesDir);
 						routeChanged = true;
 					}
@@ -2326,23 +2816,37 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					if (routeChanged) {
 						invalidatePagesServerEntry();
+						if (hasPagesDir) invalidatePagesHydrationProxies();
 						if (!hasAppDir) server.ws.send({ type: "full-reload" });
 						invalidateHybridClientEntries();
 						revalidateHybridRoutes();
 					}
 				});
 				server.watcher.on("change", (filePath) => {
+					invalidatePagesMiddlewareMatcher(filePath);
+					if (hasPagesDir && toSlash(filePath).startsWith(pagesDir) && pageExtensions.test(filePath)) {
+						const pageFile = toSlash(filePath);
+						const previousKind = devPageRouteDataKinds.get(pageFile);
+						devPageRouteDataKinds.delete(pageFile);
+						if (previousKind !== void 0 && previousKind !== classifyDevPageFile(pageFile)) {
+							cachedSSRHandler = null;
+							invalidatePagesHydrationProxies();
+							server.ws.send({ type: "full-reload" });
+						}
+					}
 					const pagesAppChanged = isPagesAppFile(filePath);
 					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
 					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule();
 				});
 				server.watcher.on("unlink", (filePath) => {
+					invalidatePagesMiddlewareMatcher(filePath);
 					updatePublicFileRoute(filePath, false);
 					let routeChanged = false;
 					const pagesAppChanged = isPagesAppFile(filePath);
 					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
 					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule();
 					if (hasPagesDir && toSlash(filePath).startsWith(pagesDir) && pageExtensions.test(filePath)) {
+						devPageRouteDataKinds.delete(toSlash(filePath));
 						invalidateRouteCache(pagesDir);
 						routeChanged = true;
 					}
@@ -2353,6 +2857,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					if (routeChanged) {
 						invalidatePagesServerEntry();
+						if (hasPagesDir) invalidatePagesHydrationProxies();
 						if (!hasAppDir) server.ws.send({ type: "full-reload" });
 						invalidateHybridClientEntries();
 						revalidateHybridRoutes();
@@ -2393,7 +2898,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				});
 				server.middlewares.use((req, res, next) => {
 					if (!hasPagesDir || !handlePagesMiddleware || !isUnsupportedDevPublicRequest(req)) return next();
-					handlePagesMiddleware(req, res, next);
+					handlePagesMiddleware(req, res, next).catch(next);
 				});
 				installDevStackSourcemapMiddleware(server);
 				return () => {
@@ -2453,9 +2958,15 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						restore();
 						return false;
 					};
-					if (instrumentationPath && !hasAppDir) runInstrumentation(getPagesRunner(), instrumentationPath).catch((err) => {
-						console.error("[vinext] Instrumentation error:", err);
-					});
+					const pagesInstrumentationReady = (async () => {
+						if (!instrumentationPath || hasAppDir && hasCloudflarePlugin) return;
+						if (hasAppDir) {
+							const environment = server.environments["rsc"];
+							if (!isRunnableDevEnvironment(environment)) return;
+							return runInstrumentation(environment.runner, instrumentationPath);
+						} else return runInstrumentation(getPagesRunner(), instrumentationPath);
+					})();
+					pagesInstrumentationReady.catch(() => {});
 					if (hasAppDir) server.middlewares.use((req, res, next) => {
 						const url = req.url ?? "/";
 						const [pathname] = url.split("?");
@@ -2506,13 +3017,10 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						});
 						next();
 					});
-					handlePagesMiddleware = async (req, res, next) => {
+					const handlePagesRequest = async (req, res, next) => {
 						try {
 							let url = req.url ?? "/";
 							const originalRequestUrl = url;
-							if (!hasPagesDir) return next();
-							if (url.startsWith("/@") || url.startsWith("/__vite") || url.startsWith("/node_modules")) return next();
-							if (url.split("?")[0].endsWith(".rsc")) return next();
 							const blockReason = validateDevRequest({
 								origin: req.headers.origin,
 								host: req.headers.host,
@@ -2663,7 +3171,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								const apiRouteUrl = stripI18nLocaleForApiRoute(pathname, nextConfig?.i18n ?? null);
 								filePathMatchesPagesRoute = matchRoute(pageRouteUrl, pageRoutes) !== null || matchRoute(apiRouteUrl, apiRoutes) !== null;
 							}
-							if (isFilePathRequest && !isDataReq && !filePathMatchesRewrite && !filePathMatchesPagesRoute && !isExistingPublicMutation) return next();
+							if (isFilePathRequest && !isDataReq && !filePathMatchesRewrite && !filePathMatchesPagesRoute && !isNextStaticPath(pathname, "", assetPrefixPathname(nextConfig?.assetPrefix ?? "")) && !isExistingPublicMutation) return next();
 							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
 							const isDataRequest = isDataReq;
 							const nodeRequestHeaders = filterInternalHeaders(rawHeaders);
@@ -2706,19 +3214,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							const getDevApiRoutes = () => devApiRoutesPromise ??= apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
 							let devAppRoutesPromise = null;
 							const getDevAppRoutes = () => devAppRoutesPromise ??= hasAppDir && appDir ? appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : Promise.resolve([]);
-							const devPageRouteDataKinds = /* @__PURE__ */ new Map();
-							const classifyDevPageRoute = (route) => {
-								const cached = devPageRouteDataKinds.get(route.filePath);
-								if (cached) return cached;
-								let dataKind = "none";
-								try {
-									const source = fs.readFileSync(route.filePath, "utf8");
-									dataKind = hasExportedName(source, "getStaticProps") ? "static" : hasExportedName(source, "getServerSideProps") ? "server" : "none";
-								} catch {}
-								devPageRouteDataKinds.set(route.filePath, dataKind);
-								return dataKind;
-							};
-							const pipelineResult = await runPagesRequest(webRequest, {
+							const classifyDevPageRoute = (route) => classifyDevPageFile(route.filePath);
+							const pipelineDeps = {
+								assetPrefix: nextConfig?.assetPrefix,
 								basePath: bp,
 								trailingSlash: nextConfig?.trailingSlash ?? false,
 								i18nConfig: nextConfig?.i18n ?? null,
@@ -2738,12 +3236,15 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								configMatchPathname,
 								runMiddleware: devRunMiddlewareAdapter,
 								matchApiRoute: async (apiUrl) => {
-									const pagesMatch = matchRoute(apiUrl, await getDevApiRoutes());
+									const devApiRoutes = await getDevApiRoutes();
+									const pagesMatch = matchRoute(apiUrl, devApiRoutes);
 									if (pagesMatch) return pagesMatch;
-									return matchAppRoute(apiUrl, await getDevAppRoutes());
+									const devAppRoutes = await getDevAppRoutes();
+									return matchAppRoute(apiUrl, devAppRoutes);
 								},
 								matchPageRoute: (resolvedPathname, request) => {
-									const m = matchRoute(nextConfig?.i18n ? resolvePagesI18nRequest(resolvedPathname, nextConfig.i18n, request.headers, getUrlHostname(request.url), bp, nextConfig.trailingSlash ?? false).url : resolvedPathname, devPageRoutes);
+									const routeUrl = nextConfig?.i18n ? resolvePagesI18nRequest(resolvedPathname, nextConfig.i18n, request.headers, getUrlHostname(request.url), bp, nextConfig.trailingSlash ?? false).url : resolvedPathname;
+									const m = matchRoute(routeUrl, devPageRoutes);
 									return m ? { route: {
 										dataKind: classifyDevPageRoute(m.route),
 										isDynamic: m.route.isDynamic,
@@ -2762,11 +3263,14 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 										externalInit.body = Readable.toWeb(req);
 										externalInit.duplex = "half";
 									}
-									return proxyExternalRequest(new Request(new URL(url, requestOrigin), externalInit), externalUrl);
+									const reqWithBody = new Request(new URL(url, requestOrigin), externalInit);
+									return proxyExternalRequest(reqWithBody, externalUrl);
 								},
 								serveFilesystemRoute: async (requestPathname, stagedHeaders, phase, resolvedUrl) => {
 									if (isImageOptimizationPath(requestPathname)) {
-										const encodedLocation = resolveDevImageRedirect(new URL(resolvedUrl, requestOrigin), [...nextConfig.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...nextConfig.images?.imageSizes ?? DEFAULT_IMAGE_SIZES], nextConfig.images?.qualities);
+										const imageRequestUrl = new URL(resolvedUrl, requestOrigin);
+										const allowedWidths = [...nextConfig.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...nextConfig.images?.imageSizes ?? DEFAULT_IMAGE_SIZES];
+										const encodedLocation = resolveDevImageRedirect(imageRequestUrl, allowedWidths, nextConfig.images?.qualities);
 										return encodedLocation ? new Response(null, {
 											status: 302,
 											headers: { Location: encodedLocation }
@@ -2777,7 +3281,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									if (!isRetrievalMethod) return isExistingDevPublicFile(requestPathname) ? methodNotAllowedResponse("GET, HEAD") : false;
 									return serveRewrittenViteFilesystemRoute(req, res, requestPathname, stagedHeaders);
 								}
-							});
+							};
+							const pipelineResult = await runPagesRequest(webRequest, pipelineDeps);
 							if (pipelineResult.type === "response") {
 								await writeWebResponseToNodeRes(res, pipelineResult.response);
 								return;
@@ -2841,12 +3346,19 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								const renderMatch = matchRoute(resolvedPathname, routes);
 								if (hasAppDir && appDir) {
 									if (!renderMatch) return next();
-									const appMatch = matchAppRoute(resolvedPathname, await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher));
+									const appRoutes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
+									const appMatch = matchAppRoute(resolvedPathname, appRoutes);
 									if (appMatch && !pagesRouteHasPriorityOverAppRoute(renderMatch.route, appMatch.route)) return next();
 								}
+								if (!renderMatch && isNextStaticPath(resolvedPathname, "", assetPrefixPathname(nextConfig?.assetPrefix ?? ""))) {
+									const headers = new Headers();
+									forEachStagedHeader((key, value) => headers.append(key, value));
+									await writeWebResponseToNodeRes(res, notFoundStaticAssetResponse(headers));
+									return;
+								}
 								if (!cachedSSRHandler || cachedSSRHandler.routes !== routes) cachedSSRHandler = {
 									routes,
-									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots, nextConfig?.reactStrictMode === true, nextConfig?.expireTime, nextConfig?.crossOrigin, devBuildId)
+									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots, nextConfig?.reactStrictMode === true, nextConfig?.expireTime, nextConfig?.crossOrigin, devBuildId, middlewarePath ? compileClientMiddlewareMatchers(extractMiddlewareMatcherConfig(middlewarePath)) : void 0, classifyDevPageRoute)
 								};
 								flushStagedHeaders();
 								flushRequestHeaders();
@@ -2855,11 +3367,54 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								await cachedSSRHandler.handler(req, res, pipelineResult.resolvedUrl, req.__vinextMiddlewareStatus, pipelineResult.isDataReq, originalRequestUrl);
 							}
 						} catch (e) {
-							next(e);
+							return next(e);
 						}
 					};
+					handlePagesMiddleware = async (req, res, next) => {
+						const url = req.url ?? "/";
+						if (!hasPagesDir) return next();
+						if (url.startsWith("/@") || url.startsWith("/__vite") || url.startsWith("/node_modules")) return next();
+						if (url.split("?")[0].endsWith(".rsc")) return next();
+						if (hasCloudflarePlugin) return next();
+						await pagesInstrumentationReady;
+						const traceHeaders = new Headers();
+						for (const [name, value] of Object.entries(req.headers)) {
+							if (value === void 0 || name.startsWith(":")) continue;
+							traceHeaders.set(name, Array.isArray(value) ? value.join(", ") : value);
+						}
+						const continueRequest = (error) => new Promise((resolve, reject) => {
+							const finish = () => {
+								res.off("finish", finish);
+								res.off("close", finish);
+								res.off("error", fail);
+								resolve();
+							};
+							const fail = (responseError) => {
+								res.off("finish", finish);
+								res.off("close", finish);
+								res.off("error", fail);
+								reject(responseError);
+							};
+							res.once("finish", finish);
+							res.once("close", finish);
+							res.once("error", fail);
+							try {
+								next(error);
+								if (res.writableFinished || res.destroyed) finish();
+							} catch (nextError) {
+								fail(nextError);
+							}
+						});
+						return traceFrameworkRequest({
+							callback: () => handlePagesRequest(req, res, continueRequest),
+							getStatus: () => res.statusCode,
+							headers: traceHeaders,
+							method: req.method ?? "GET",
+							target: url
+						});
+					};
 					server.middlewares.use((req, res, next) => {
-						handlePagesMiddleware(req, res, next);
+						handlePagesMiddleware(req, res, next).catch(next);
 					});
 				};
 			}
@@ -2867,12 +3422,15 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		{
 			name: "vinext:validate-middleware-exports",
 			enforce: "pre",
-			transform(code, id) {
-				if (!middlewarePath) return null;
-				const modulePath = stripViteModuleQuery(id);
-				if (canonicalize(modulePath) !== canonicalize(middlewarePath)) return null;
-				validateMiddlewareModuleExports(code, modulePath, middlewarePath, isProxyFile(middlewarePath));
-				return null;
+			transform: {
+				filter: { id: { exclude: VIRTUAL_MODULE_ID_RE } },
+				handler(code, id) {
+					if (!middlewarePath) return null;
+					const modulePath = stripViteModuleQuery(id);
+					if (canonicalizePageTransformPath(modulePath) !== canonicalMiddlewarePath) return null;
+					validateMiddlewareModuleExports(code, modulePath, middlewarePath, isProxyFile(middlewarePath));
+					return null;
+				}
 			}
 		},
 		{
@@ -2880,7 +3438,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			transform: {
 				filter: {
 					id: { exclude: VIRTUAL_MODULE_ID_RE },
-					code: /\bexport\b[\s\S]*\*/
+					code: EXPORT_ALL_CANDIDATE_FILTER
 				},
 				handler(code, id) {
 					if (this.environment?.name !== "client") return null;
@@ -2977,6 +3535,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				filter: { code: consumerEnvironmentConditionFilter },
 				handler(code, id) {
 					const scansImports = this.environment.config.build.write === false;
+					const skipsUnobservableFold = scansImports && useNativeTypeofWindowFolding && this.environment.config.isBundled;
+					if (skipsUnobservableFold && !mayFoldChangeScannedImports(code)) return null;
 					const replaceTypeofWindow = !useNativeTypeofWindowFolding || scansImports;
 					const replaceProcessBrowser = scansImports;
 					if (!replaceTypeofWindow && !replaceProcessBrowser) return null;
@@ -2984,12 +3544,13 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (toSlash(id).startsWith(cacheDir)) return null;
 					const typeofWindow = getTypeofWindowReplacement(this.environment);
 					const processBrowser = this.environment.config.consumer === "client";
-					const variant = `${replaceTypeofWindow ? typeofWindow : "-"}:${replaceProcessBrowser ? processBrowser : "-"}`;
-					return cachedConsumerConditionTransform(id, code, variant, () => replaceConsumerEnvironmentConditions(code, {
+					const variant = `${replaceTypeofWindow ? typeofWindow : "-"}:${replaceProcessBrowser ? processBrowser : "-"}:${skipsUnobservableFold ? "gated" : "full"}`;
+					return omitUnusedBuildSourcemap(this.environment, cachedConsumerConditionTransform(id, code, variant, () => replaceConsumerEnvironmentConditions(code, {
 						...replaceTypeofWindow ? { typeofWindow } : {},
 						...replaceProcessBrowser ? { processBrowser } : {},
-						pruneUnreachableImports: scansImports
-					}, id));
+						pruneUnreachableImports: scansImports,
+						onlyIfScannedImportsChange: skipsUnobservableFold
+					}, id)));
 				}
 			}
 		},
@@ -3000,8 +3561,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				const serverDefines = { ...nextConfig.compilerDefineServer };
 				serverDefines["process.env.NEXT_RUNTIME"] = JSON.stringify("nodejs");
 				serverDefines["process.env.NEXT_PHASE"] = "globalThis.__VINEXT_NEXT_PHASE";
-				const sharedRevalidateSecret = process.env.__VINEXT_SHARED_REVALIDATE_SECRET;
-				if (sharedRevalidateSecret) serverDefines["process.env.__VINEXT_REVALIDATE_SECRET"] = JSON.stringify(sharedRevalidateSecret);
+				if (revalidateSecret) serverDefines["process.env.__VINEXT_REVALIDATE_SECRET"] = JSON.stringify(revalidateSecret);
 				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);
@@ -3176,7 +3736,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					sequential: true,
 					order: "post",
 					handler() {
-						if (buildIdWritten) return;
+						if (buildIdWritten || !isServerEnvironment(this.environment)) return;
 						buildIdWritten = true;
 						const outDir = path.join(root, "dist", "server");
 						fs.mkdirSync(outDir, { recursive: true });
@@ -3207,14 +3767,20 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					if (!environment || (hasAppDir ? environment.name !== "rsc" : !isServerEnvironment(environment))) return;
 					const outDir = options.dir;
 					if (!outDir) return;
-					const source = JSON.stringify({ prerenderSecret });
+					const canonicalServerDir = path.join(root, "dist", "server");
+					if (selectedMultiStageOutput) {
+						if (readPrerenderSecret(canonicalServerDir) === prerenderSecret) for (const runtimeOutputDir of readServerRuntimeOutputDirs(canonicalServerDir, root)) serverRuntimeOutputDirs.add(runtimeOutputDir);
+						serverRuntimeOutputDirs.add(path.resolve(outDir));
+					}
+					const manifest = {
+						prerenderSecret,
+						...serverRuntimeOutputDirs.size === 0 ? {} : { runtimeOutputDirs: [...serverRuntimeOutputDirs].map((runtimeOutputDir) => path.relative(root, runtimeOutputDir) || ".").sort() }
+					};
+					const source = JSON.stringify(manifest);
 					fs.writeFileSync(path.join(outDir, "vinext-server.json"), source);
-					if (!hasAppDir) {
-						const canonicalServerDir = path.join(root, "dist", "server");
-						if (path.resolve(outDir) !== canonicalServerDir) {
-							fs.mkdirSync(canonicalServerDir, { recursive: true });
-							fs.writeFileSync(path.join(canonicalServerDir, "vinext-server.json"), source);
-						}
+					if (path.resolve(outDir) !== canonicalServerDir) {
+						fs.mkdirSync(canonicalServerDir, { recursive: true });
+						fs.writeFileSync(path.join(canonicalServerDir, "vinext-server.json"), source);
 					}
 				}
 			}
@@ -3222,6 +3788,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		{
 			name: "vinext:nitro-route-rules",
 			nitro: { setup: async (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;
 				if (resolvedServerExternalPackages.length > 0) nitro.options.traceDeps = [.../* @__PURE__ */ new Set([...nitro.options.traceDeps ?? [], ...resolvedServerExternalPackages])];
@@ -3252,7 +3820,10 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					const ssrManifestPath = path.join(viteDir, "ssr-manifest.json");
 					if (!fs.existsSync(ssrManifestPath)) return;
 					try {
-						const augmentedManifest = augmentSsrManifestFromBundle(JSON.parse(fs.readFileSync(ssrManifestPath, "utf-8")), bundle, this.environment?.config.root ?? process.cwd(), this.environment?.config.base ?? "/");
+						const ssrManifest = JSON.parse(fs.readFileSync(ssrManifestPath, "utf-8"));
+						const buildRoot = this.environment?.config.root ?? process.cwd();
+						const buildBase = this.environment?.config.base ?? "/";
+						const augmentedManifest = augmentSsrManifestFromBundle(ssrManifest, bundle, buildRoot, buildBase);
 						fs.writeFileSync(ssrManifestPath, JSON.stringify(augmentedManifest, null, 2));
 					} catch (err) {
 						console.warn("[vinext] Failed to augment SSR manifest:", err);
@@ -3372,17 +3943,13 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							clientEntry: runtimeMetadata.clientEntryFile ?? void 0,
 							appBootstrapPreinitModules: runtimeMetadata.appBootstrapPreinitModules,
 							ssrManifest,
+							cssGraph: runtimeMetadata.cssGraph,
 							lazyChunks: runtimeMetadata.lazyChunks ?? void 0,
-							dynamicPreloads: runtimeMetadata.dynamicPreloads ?? void 0
+							dynamicPreloads: runtimeMetadata.dynamicPreloads ?? void 0,
+							crossOrigin: nextConfig.crossOrigin ?? ""
 						});
-						const buildSession = process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION;
-						if (hasAppDir && hasPagesDir && buildSession) setPagesClientAssetsBuildMetadata(buildSession, pagesClientAssetsModule);
-					}
-					if (pagesClientAssetsModule === null) {
-						if (pagesClientAssetsOutputDirs.size === 0) return;
-						const buildSession = process.env.__VINEXT_PAGES_CLIENT_ASSETS_BUILD_SESSION;
-						if (buildSession) pagesClientAssetsModule = takePagesClientAssetsBuildMetadata(buildSession);
 					}
+					if (pagesClientAssetsModule === null && pagesClientAssetsOutputDirs.size === 0) return;
 					if (pagesClientAssetsModule === null) {
 						const emptyModule = buildPagesClientAssetsModule({});
 						for (const outputDir of pagesClientAssetsOutputDirs) writePagesClientAssetsModuleIfMissing(outputDir, emptyModule);
@@ -3416,7 +3983,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					const envConfig = this.environment?.config;
 					if (!envConfig) return;
 					const buildRoot = envConfig.root ?? process.cwd();
-					const manifest = collectInlineCssManifest(path.resolve(buildRoot, "dist", "client"), nextConfig.assetPrefix);
+					const clientDir = path.resolve(buildRoot, "dist", "client");
+					const manifest = collectInlineCssManifest(clientDir, nextConfig.assetPrefix);
 					const rscOutDir = path.resolve(buildRoot, options.rscOutDir ?? path.join("dist", "server"));
 					for (const entryFile of ["index.js", "index.mjs"]) if (injectInlineCssManifestGlobal(path.join(rscOutDir, entryFile), manifest)) break;
 				}
@@ -3453,6 +4021,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			}
 		},
 		createWasmModuleImportPlugin(),
+		createOgHarfbuzzPlugin(),
 		{
 			name: "vinext:og-font-patch",
 			enforce: "pre",
@@ -3524,7 +4093,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				const buildRoot = config.root ?? process.cwd();
 				const outDir = path.resolve(buildRoot, outputOptions.dir);
 				const loadedEntries = serverEntryKindsByEnvironment.get(this.environment?.name ?? "");
-				const isPrimaryServerOutput = Boolean(loadedEntries?.has(RESOLVED_RSC_ENTRY) || loadedEntries?.has(RESOLVED_SERVER_ENTRY) && !loadedEntries.has(RESOLVED_APP_SSR_ENTRY));
+				const isPrimaryServerOutput = Boolean(loadedEntries?.has(RESOLVED_RSC_ENTRY) || loadedEntries?.has(RESOLVED_APP_REQUEST_ENTRY) || loadedEntries?.has(RESOLVED_APP_RESPONSE_ENTRY) || loadedEntries?.has(RESOLVED_PAGES_REQUEST_ENTRY) || loadedEntries?.has(RESOLVED_PAGES_RESPONSE_ENTRY) || loadedEntries?.has(RESOLVED_SERVER_ENTRY) && !loadedEntries.has(RESOLVED_APP_SSR_ENTRY));
 				for (const output of cacheAdapterBuildOutputs) {
 					if (output.matchesBuild && !output.matchesBuild(build)) continue;
 					await output.finalizeBuildOutput?.({
@@ -3537,22 +4106,46 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		}
 	});
 	if (rscPluginPromise) plugins.push(rscPluginPromise);
-	if (earlyAppDirExists) plugins.push(createActionOwnerManifestPlugin({
-		canonicalizeModuleId: canonicalize,
-		async getManager(config) {
-			return (await rscPluginModulePromise)?.getPluginApi(config)?.manager;
-		},
-		getRoutes: () => rscActionOwnerRoutes ?? [],
-		getSharedRoots: () => rscActionOwnerSharedRoots,
-		onComplete() {
-			rscActionOwnerRoutes = null;
-			rscActionOwnerSharedRoots = [];
-		}
-	}));
+	if (earlyAppDirExists) {
+		plugins.push(createActionOwnerManifestPlugin({
+			canonicalizeModuleId: canonicalize,
+			async getManager(config) {
+				return (await rscPluginModulePromise)?.getPluginApi(config)?.manager;
+			},
+			getRoutes: () => rscActionOwnerRoutes ?? [],
+			getSharedRoots: () => rscActionOwnerSharedRoots,
+			onComplete() {
+				rscActionOwnerRoutes = null;
+				rscActionOwnerSharedRoots = [];
+			}
+		}));
+		plugins.push(createScanBuildCssPlugin());
+	}
 	if (rscPluginPromise) {
 		plugins.push(createRscReferenceValidationNormalizerPlugin());
 		plugins.push(createRscClientReferenceLoadersPlugin());
 	} else if (manualUseCachePluginPromise) plugins.push(manualUseCachePluginPromise);
+	plugins.push({
+		name: "vinext:plain-pages-build-config",
+		apply: "build",
+		enforce: "post",
+		config: {
+			order: "post",
+			handler(config) {
+				if (!hasPlainPagesBuildEnvironments) return;
+				if (config.build?.watch || config.build?.ssr || config.build?.lib || getBuildBundlerOptions(config.build)?.input !== void 0) {
+					for (const name of ["client", "ssr"]) if (originalPlainPagesEnvironments?.[name]) config.environments[name] = originalPlainPagesEnvironments[name];
+					else delete config.environments?.[name];
+					return;
+				}
+				return { builder: {
+					...config.builder,
+					sharedConfigBuild: true
+				} };
+			}
+		}
+	});
+	plugins.push(buildLifecyclePlugins[1]);
 	return plugins;
 }
 /**