vinext 1.1.0 → 1.2.1

package/dist/index.js

@@ -2,32 +2,34 @@ import path, { toSlash } from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/
 import { detectPackageManager, formatMissingCloudflarePluginError, hasWranglerConfig } from "./utils/project.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, normalizeViteResolveExtensions } from "./routing/file-matcher.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
+import { TRIVIA_PATTERN, hasImportAttributes, isTypeOnlyImport, parseModuleRecord, parseProgram } from "./plugins/ast-utils.js";
 import { claimViteCliBuildInvocation, getViteCliInvocation, isViteCliConfigFile } from "./utils/vite-cli-invocation.js";
 import { VINEXT_DEV_CLI_LIFECYCLE, applyDevServerDefaults, claimViteCliDevInvocation, createDevServerLifecyclePlugin, reserveViteCliDevInvocation } from "./cli-dev-config.js";
 import { isUnknownRecord } from "./utils/record.js";
-import { getReactUpgradeDeps } from "./utils/react-version.js";
+import { getReactUpgradeDeps, reactUpgradeRequiredMessage } from "./utils/react-version.js";
 import { loadDotenv } from "./config/dotenv.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
 import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
 import { encodeMiddlewareRequestHeaders } from "./utils/middleware-request-headers.js";
+import { hasBasePath, stripBasePath } from "./utils/base-path.js";
+import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
+import { methodNotAllowedResponse, notFoundStaticAssetResponse } from "./server/http-error-responses.js";
+import { isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./server/open-redirect.js";
+import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
 import { omitUnusedBuildSourcemap } from "./plugins/transform-result.js";
 import { assetPrefixPathname, isNextStaticPath, resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
 import { VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, findNextConfigPath, lightningCssFeatureNamesToMask, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
-import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
-import { hasBasePath, stripBasePath } from "./utils/base-path.js";
+import { normalizePathnameForRouteMatch, normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
 import { generateRouteTypes } from "./typegen.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { resolveRuntimeEntryModule } from "./entries/runtime-entry-module.js";
-import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
-import { methodNotAllowedResponse, notFoundStaticAssetResponse } from "./server/http-error-responses.js";
-import { isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./server/open-redirect.js";
-import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { resolvePagesI18nRequest, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
+import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
 import { extractMiddlewareMatcherConfig, extractMiddlewareMatcherConfigValue, hasExportedName } from "./build/report.js";
@@ -35,7 +37,6 @@ import { generatePagesRequestEntry, generatePagesResponseEntry, generateServerEn
 import { compileClientMiddlewareMatchers, generateClientEntry } from "./entries/pages-client-entry.js";
 import { isPathInside, isPathInsideOrEqual, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { logRequest, now } from "./server/request-log.js";
-import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
 import { getPagesPreviewModeId } from "./server/pages-preview.js";
 import { createSSRHandler } from "./server/dev-server.js";
 import { signalFromNodeResponse } from "./server/node-response-signal.js";
@@ -43,6 +44,7 @@ import { handleApiRoute } from "./server/api-handler.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, resolveDevImageRedirect } from "./server/image-optimization.js";
 import { CACHEABILITY_MANIFEST_MODULE, CACHEABILITY_REQUEST_PROJECTION_MODULE } from "./server/cacheability-manifest.js";
 import { PREGENERATED_CONCRETE_PATHS_MODULE } from "./server/pregenerated-concrete-paths.js";
+import { rewriteOutputRootExternals } from "./build/output-root-externals.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
 import { invalidateMetadataFileCache, scanMetadataFiles } from "./server/metadata-routes.js";
 import { shouldInvalidateAppRouteFile } from "./server/dev-route-files.js";
@@ -56,16 +58,19 @@ import { VIRTUAL_IMAGE_ADAPTERS, generateImageAdaptersModule } from "./image/ima
 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 { createRscScanGlobImportsPlugin, isRscScanGlobImportsAffected } from "./plugins/rsc-scan-glob-imports.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 { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
+import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, collectClientBuildFiles, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
 import { createPreviewBuildCredentials, getPreviewBuildCredentials } from "./build/preview-credentials.js";
 import { VINEXT_BUILD_LIFECYCLE_CONFIG, createBuildLifecyclePlugins } from "./build/lifecycle.js";
 import { ensureAssetsIgnore } from "./build/assets-ignore.js";
 import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-manifests.js";
 import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
 import { readTrustedRevalidationHostname } from "./server/revalidation-host.js";
+import { sealForwardedMiddlewareContext } from "./server/forwarded-middleware-context.js";
 import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
 import { traceFrameworkRequest } from "./server/request-tracing.js";
 import { runPagesRequest } from "./server/pages-request-pipeline.js";
@@ -84,9 +89,10 @@ 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";
 import { isServerEnvironment } from "./plugins/environment.js";
+import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
 import { createPagesNodeExternalsPlugin } from "./plugins/pages-node-externals.js";
+import { createCloudflareDevModuleUrlsPlugin } from "./plugins/cloudflare-dev-module-urls.js";
 import { validateMiddlewareModuleExports } from "./plugins/middleware-export-validation.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
@@ -95,22 +101,22 @@ import { createTransformCache } from "./plugins/transform-cache.js";
 import { createOgHarfbuzzPlugin } from "./plugins/og-harfbuzz.js";
 import { createOgAssetsPlugin, createOgInlineFetchAssetsPlugin } from "./plugins/og-assets.js";
 import { createUseCacheCallablePlugin } from "./plugins/use-cache-callable.js";
-import { cacheFlightCodecPlugin } from "./plugins/cache-flight-codec.js";
 import { SSR_EXTERNAL_REACT_ENTRIES, VINEXT_OPTIMIZE_DEPS_EXCLUDE, mergeOptimizeDepsExclude } from "./plugins/rsc-client-shim-excludes.js";
 import { createServerExternalsManifestPlugin } from "./plugins/server-externals-manifest.js";
 import { createTransitiveExternalsPlugin } from "./plugins/transitive-externals.js";
 import public_shim_map_default from "./shims/public-shim-map.json.js";
-import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
 import { computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
 import { readPrerenderSecret, readServerRuntimeOutputDirs } from "./build/server-manifest.js";
 import { createModuleDependencyCache } from "./build/module-dependency-cache.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
 import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassCssUrlAssetImporter, createSassTildeImporter, createSassTsconfigPathImporters } from "./plugins/sass.js";
-import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createMultiStageChunkFileNames, createMultiStageCodeSplittingConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfig, withBuildBundlerOptions } from "./build/client-build-config.js";
+import { assertClientOutDirIsSeparate, createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createMultiStageChunkFileNames, createMultiStageCodeSplittingConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfig, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { EXPORT_ALL_CANDIDATE_FILTER, hasExportAllCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
 import { createWorkerImageImportsPlugin } from "./plugins/worker-image-imports.js";
+import { SERVER_ONLY_SPECIFIER_RE, createWorkerServerOnlyImportsPlugin } from "./plugins/worker-server-only-imports.js";
+import { createWorkerUseServerPlugins } from "./plugins/worker-use-server.js";
 import { createRequireContextPlugin } from "./plugins/require-context.js";
 import { commonJsEsmFacadeOptimizeDepsPlugin, stripEsmCommonJsExportFacade } from "./plugins/commonjs-esm-facade.js";
 import { COMMONJS_SYNTAX_CODE_FILTER } from "./plugins/commonjs-syntax.js";
@@ -119,16 +125,16 @@ import { createExtensionlessDynamicImportPlugin } from "./plugins/extensionless-
 import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
 import { consumerEnvironmentConditionFilter, getTypeofWindowReplacement, mayFoldChangeScannedImports, replaceConsumerEnvironmentConditions } from "./plugins/typeof-window.js";
 import { hasMdxFiles, loadMdxEsmReader, pageExtensionsIncludeMdx } from "./utils/mdx-scan.js";
-import { publicFilePathVariants } from "./utils/public-file-path.js";
+import { publicFileRouteKey } from "./utils/public-file-path.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
+import { assertPluginRscVersion, needsAppReactServerDom } from "./utils/plugin-rsc-version.js";
 import { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine } from "./utils/vite-version.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import { pathToFileURL } from "node:url";
-import { createIdResolver, createLogger, isRunnableDevEnvironment, parseAst, transformWithOxc } from "vite";
-import { execFileSync } from "node:child_process";
+import { createIdResolver, createLogger, isRunnableDevEnvironment, transformWithOxc } from "vite";
 import { createHash, randomBytes } from "node:crypto";
 import MagicString from "magic-string";
 import commonjs from "vite-plugin-commonjs";
@@ -141,6 +147,7 @@ const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
 	"react/jsx-runtime",
 	"react/jsx-dev-runtime"
 ]);
+const PAGES_CLOUDFLARE_WORKER_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze(["use-sync-external-store/with-selector", "vinext > @vitejs/plugin-rsc/react/rsc"]);
 const APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
 	"use-sync-external-store/shim",
 	"use-sync-external-store/shim/index.js",
@@ -156,6 +163,17 @@ const RSC_ENVIRONMENTS = /* @__PURE__ */ new Set([
 	"client"
 ]);
 const VINEXT_GENERATED_DIR_RE = /(?:^|[/\\])\.vinext(?:[/\\]|$)/;
+function removeForwardedMiddlewareContext(req) {
+	delete req.headers[VINEXT_MW_CTX_HEADER];
+	const rawHeaders = req.rawHeaders;
+	for (let i = rawHeaders.length - 2; i >= 0; i -= 2) if (rawHeaders[i].toLowerCase() === "x-vinext-mw-ctx") rawHeaders.splice(i, 2);
+}
+function setForwardedMiddlewareContext(req, key, context) {
+	removeForwardedMiddlewareContext(req);
+	const value = sealForwardedMiddlewareContext(key, context);
+	req.headers[VINEXT_MW_CTX_HEADER] = value;
+	req.rawHeaders.push(VINEXT_MW_CTX_HEADER, value);
+}
 function scopeRscPlugin(plugin) {
 	const applyToEnvironment = plugin.applyToEnvironment;
 	return {
@@ -176,11 +194,20 @@ if (earlyViteCliInvocation) {
 	});
 }
 installSocketErrorBackstop();
+const INVALID_SERVER_ONLY_ID_PREFIX = "\0vinext:invalid-server-only:";
+const INVALID_SERVER_ONLY_ID_RE = /^\0vinext:invalid-server-only:/;
+function createServerOnlyClientImportError(importer) {
+	return /* @__PURE__ */ new Error(`You're importing a module that depends on "server-only". This API is only available in Server Components in the App Router, but ${importer || "this module"} is reachable from a client bundle.`);
+}
 function hasServerOnlyMarkerImport(code) {
 	if (!code.includes("server-only")) return false;
+	const record = parseModuleRecord(code, "js");
+	if (!record) return false;
+	if (record.staticImports.some((statement) => statement.moduleRequest.value === "server-only")) return true;
+	if (!code.includes("require")) return false;
 	let ast;
 	try {
-		ast = parseAst(code);
+		ast = parseProgram(code);
 	} catch {
 		return false;
 	}
@@ -188,9 +215,6 @@ function hasServerOnlyMarkerImport(code) {
 		if (!node) return false;
 		if (Array.isArray(node)) return node.some((child) => walk(child));
 		if (typeof node !== "object") return false;
-		if (node.type === "ImportDeclaration") {
-			if (node.source?.value === "server-only") return true;
-		}
 		if (node.type === "CallExpression") {
 			const call = node;
 			if (call.callee?.type === "Identifier" && call.callee.name === "require" && call.arguments?.[0]?.type === "Literal" && call.arguments[0].value === "server-only") return true;
@@ -279,24 +303,16 @@ function isolateMdxStylesheetImports(code) {
 }
 function isolateGlobalNotFoundStylesheetImports(code, id) {
 	if (isMdxModuleId(id)) return isolateMdxStylesheetImports(code);
-	let ast;
-	try {
-		ast = parseAst(code, { lang: parserLanguageForScript(id) });
-	} catch {
-		return null;
-	}
+	const record = parseModuleRecord(code, parserLanguageForScript(id));
+	if (!record) return null;
 	let output = null;
-	for (const statement of ast.body) {
-		if (statement.type !== "ImportDeclaration" || statement.importKind === "type") continue;
-		if (statement.specifiers && statement.specifiers.length > 0) continue;
-		if (statement.attributes && statement.attributes.length > 0) continue;
-		const source = statement.source;
-		const specifier = source?.value;
-		if (typeof specifier !== "string" || !isStylesheetSpecifier(specifier)) continue;
-		const range = source;
-		if (typeof range.start !== "number" || typeof range.end !== "number") continue;
+	for (const statement of record.staticImports) {
+		if (statement.entries.length > 0 || isTypeOnlyImport(code, statement)) continue;
+		const source = statement.moduleRequest;
+		if (hasImportAttributes(code, source.end, statement.end)) continue;
+		if (!isStylesheetSpecifier(source.value)) continue;
 		output ??= new MagicString(code);
-		output.overwrite(range.start, range.end, JSON.stringify(specifier + GLOBAL_NOT_FOUND_CSS_QUERY));
+		output.overwrite(source.start, source.end, JSON.stringify(source.value + GLOBAL_NOT_FOUND_CSS_QUERY));
 	}
 	return output ? toMagicStringTransformResult(output) : null;
 }
@@ -309,8 +325,46 @@ function commonjsTransformFilter(id, transformProjectLocalCommonJs = false, tran
 	if (transformBundledDependencies && isBundledCommonJsDependency(cleanId)) return true;
 	if (/\.c[jt]s$/i.test(cleanId) && !cleanId.includes("node_modules")) return transformProjectLocalCommonJs;
 }
-function hasOnlyTypeSpecifiers(statement) {
-	return statement.specifiers !== void 0 && statement.specifiers.length > 0 && statement.specifiers.every((specifier) => specifier.importKind === "type" || specifier.exportKind === "type");
+const EMPTY_EXPORT_PRESCAN = new RegExp(String.raw`\bexport${TRIVIA_PATTERN}*\{${TRIVIA_PATTERN}*\}`);
+/**
+* Sources of a module's static imports and re-exports, in source order.
+* Type-only declarations and declarations with import attributes are skipped.
+*/
+function runtimeStaticDependencySpecifiers(code, record, lang) {
+	const dependencies = [];
+	for (const statement of record.staticImports) {
+		if (isTypeOnlyImport(code, statement)) continue;
+		if (hasImportAttributes(code, statement.moduleRequest.end, statement.end)) continue;
+		dependencies.push({
+			start: statement.start,
+			specifier: statement.moduleRequest.value
+		});
+	}
+	for (const statement of record.staticExports) {
+		const source = statement.entries[0]?.moduleRequest;
+		if (!source || statement.entries.every((entry) => entry.isType)) continue;
+		if (hasImportAttributes(code, source.end, statement.end)) continue;
+		dependencies.push({
+			start: statement.start,
+			specifier: source.value
+		});
+	}
+	if (EMPTY_EXPORT_PRESCAN.test(code)) {
+		let program = null;
+		try {
+			program = parseProgram(code, { lang });
+		} catch {}
+		for (const statement of program?.body ?? []) {
+			if (statement.type !== "ExportNamedDeclaration" || !statement.source) continue;
+			if (statement.specifiers.length > 0 || statement.exportKind === "type") continue;
+			if (statement.attributes.length > 0) continue;
+			dependencies.push({
+				start: statement.start,
+				specifier: statement.source.value
+			});
+		}
+	}
+	return dependencies.sort((a, b) => a.start - b.start).map(({ specifier }) => specifier);
 }
 function resolvedStylesheetToDevManifestAsset(root, resolvedId) {
 	const cleanId = stripViteModuleQuery(resolvedId);
@@ -342,22 +396,17 @@ function createDevPagesModuleDependencyReader(root, resolve) {
 	async function collectModuleDependencies(modulePath) {
 		const cleanModulePath = stripViteModuleQuery(modulePath);
 		if (!path.isAbsolute(cleanModulePath) || !fs.existsSync(cleanModulePath)) return [];
-		let ast;
+		let code;
 		try {
-			ast = parseAst(fs.readFileSync(cleanModulePath, "utf-8"), { lang: parserLanguageForScript(cleanModulePath) });
+			code = fs.readFileSync(cleanModulePath, "utf-8");
 		} catch {
 			return [];
 		}
+		const record = parseModuleRecord(code, parserLanguageForScript(cleanModulePath));
+		if (!record) return [];
 		const dependencies = [];
-		for (const statement of ast.body) {
-			if (statement.type !== "ImportDeclaration" && statement.type !== "ExportNamedDeclaration" && statement.type !== "ExportAllDeclaration") continue;
-			if (statement.importKind === "type") continue;
-			if (statement.exportKind === "type") continue;
-			if (hasOnlyTypeSpecifiers(statement)) continue;
-			if (statement.attributes && statement.attributes.length > 0) continue;
-			const specifier = statement.source?.value;
-			if (typeof specifier !== "string") continue;
-			const resolved = await resolve(specifier, cleanModulePath, { skipSelf: true });
+		for (const specifier of runtimeStaticDependencySpecifiers(code, record, parserLanguageForScript(cleanModulePath))) {
+			const resolved = await resolve(specifier, cleanModulePath, { skipSelf: false });
 			if (!resolved?.id) continue;
 			if (isStylesheetSpecifier(specifier) || isStylesheetSpecifier(resolved.id)) {
 				const asset = resolvedStylesheetToDevManifestAsset(root, resolved.id);
@@ -700,6 +749,11 @@ const VIRTUAL_CACHEABILITY_REQUEST_PROJECTION = "virtual:vinext-cacheability-req
 const RESOLVED_CACHEABILITY_REQUEST_PROJECTION = "\0" + VIRTUAL_CACHEABILITY_REQUEST_PROJECTION;
 const VIRTUAL_PREGENERATED_CONCRETE_PATHS = "virtual:vinext-pregenerated-concrete-paths";
 const RESOLVED_PREGENERATED_CONCRETE_PATHS = "\0" + VIRTUAL_PREGENERATED_CONCRETE_PATHS;
+const OUTPUT_ROOT_SERVER_EXTERNALS = /* @__PURE__ */ new Map([
+	[VIRTUAL_CACHEABILITY_MANIFEST, CACHEABILITY_MANIFEST_MODULE],
+	[VIRTUAL_CACHEABILITY_REQUEST_PROJECTION, CACHEABILITY_REQUEST_PROJECTION_MODULE],
+	[VIRTUAL_PREGENERATED_CONCRETE_PATHS, PREGENERATED_CONCRETE_PATHS_MODULE]
+]);
 const VIRTUAL_APP_REQUEST_ENTRY = "virtual:vinext-app-request-entry";
 const RESOLVED_APP_REQUEST_ENTRY = "\0" + VIRTUAL_APP_REQUEST_ENTRY;
 const VIRTUAL_APP_RESPONSE_ENTRY = "virtual:vinext-app-response-entry";
@@ -891,7 +945,7 @@ function vinext(options = {}) {
 	let hasPlainPagesBuildEnvironments = false;
 	let originalPlainPagesEnvironments;
 	let buildLifecycleInvocation;
-	let reactUpgradeChecked = false;
+	let reactVersionChecked = false;
 	let pagesOptimizeEntries = [];
 	const importMetaUrlCapability = createImportMetaUrlPlugin({
 		getRoot: () => root,
@@ -901,8 +955,10 @@ function vinext(options = {}) {
 		}
 	});
 	const pagesClientAssetsOutputDirs = /* @__PURE__ */ new Set();
+	const pagesClientAssetsExternalTargets = /* @__PURE__ */ new Map();
 	const resolvePagesClientAssetsOutputDir = (environmentName, outputDir) => !selectedMultiStageOutput && !hasAppDir && !hasCloudflarePlugin && environmentName === "ssr" ? path.dirname(outputDir) : outputDir;
 	let pagesClientAssetsModule = internalOptions.__pagesClientAssetsModule ?? null;
+	let clientBuildFiles = [];
 	let devPublicFileRoutes = null;
 	let publicDirConflictOptions = null;
 	let copyPublicDirIntoStaticExportBasePath = false;
@@ -911,6 +967,7 @@ function vinext(options = {}) {
 	let draftModeSecret = getPagesPreviewModeId();
 	const prerenderSecret = process.env.__VINEXT_SHARED_PRERENDER_SECRET ?? randomBytes(32).toString("hex");
 	let revalidateSecret = process.env.__VINEXT_SHARED_REVALIDATE_SECRET;
+	const devForwardedMiddlewareContextKey = randomBytes(32).toString("hex");
 	let previewBuildCredentials;
 	const sassComposesLoader = createSassAwareFileSystemLoader();
 	const rscClassificationManifests = /* @__PURE__ */ new Map();
@@ -999,6 +1056,7 @@ function vinext(options = {}) {
 	let rscPluginModulePromise = null;
 	resolvedReactPath = resolveOptionalDependency(earlyBaseDir, "@vitejs/plugin-react");
 	resolvedRscPath = resolveOptionalDependency(earlyBaseDir, "@vitejs/plugin-rsc");
+	const rscVersion = earlyAppDirExists && resolvedRscPath ? assertPluginRscVersion(resolvedRscPath) : null;
 	let rscPluginPromise = null;
 	let manualUseCachePluginPromise = null;
 	if (earlyAppDirExists && autoRsc) {
@@ -1018,7 +1076,7 @@ function vinext(options = {}) {
 			});
 			const useServerIndex = plugins.findIndex((plugin) => plugin.name === "rsc:use-server");
 			if (useServerIndex === -1) throw new Error("vinext: Failed to locate @vitejs/plugin-rsc use-server plugin.");
-			plugins.splice(useServerIndex, 0, cacheFlightCodecPlugin(), useCachePlugin);
+			plugins.splice(useServerIndex, 0, useCachePlugin);
 			return plugins.map(scopeRscPlugin);
 		}).catch((cause) => {
 			throw new Error("vinext: Failed to load @vitejs/plugin-rsc.", { cause });
@@ -1190,17 +1248,13 @@ function vinext(options = {}) {
 		shouldDeferPostBuild: () => buildLifecycleInvocation !== void 0,
 		shouldPrepare: (config) => buildLifecycleEnabled && config.build?.write !== false && !config.build?.lib && (buildLifecycleInvocation !== void 0 || !config.build?.watch && !config.build?.ssr && getBuildBundlerOptions(config.build)?.input === void 0),
 		onPrepare: () => {
-			if (!hasAppDir || reactUpgradeChecked) return;
-			reactUpgradeChecked = true;
+			if (!hasAppDir || reactVersionChecked) return;
+			reactVersionChecked = true;
 			const reactUpgrade = getReactUpgradeDeps(root);
+			const needsAppRsdw = rscVersion !== null && needsAppReactServerDom(process.cwd(), rscVersion);
+			if (needsAppRsdw && !reactUpgrade.includes("react-server-dom-webpack@latest")) reactUpgrade.push("react-server-dom-webpack@latest");
 			if (reactUpgrade.length === 0) return;
-			const [packageManager, ...packageManagerArgs] = detectPackageManager(root).replace(/ -D$/, "").split(" ");
-			console.log("  Upgrading React for RSC compatibility...");
-			execFileSync(packageManager, [...packageManagerArgs, ...reactUpgrade], {
-				cwd: root,
-				stdio: "inherit",
-				shell: process.platform === "win32"
-			});
+			throw new Error(reactUpgradeRequiredMessage(detectPackageManager(root).replace(/ -D$/, ""), reactUpgrade, needsAppRsdw ? rscVersion : void 0));
 		},
 		shouldBuildPlainPages: () => !hasAppDir && !hasCloudflarePlugin && !hasNitroPlugin,
 		createContext: () => ({
@@ -1325,6 +1379,7 @@ function vinext(options = {}) {
 				buildEmptyOutDir = typeof config.build?.emptyOutDir === "boolean" ? config.build.emptyOutDir : void 0;
 				isServeCommand = env.command === "serve";
 				root = path.resolve(toSlash(process.cwd()), config.root ?? ".");
+				if (env.command === "build") assertClientOutDirIsSeparate(root, options);
 				const devCliLifecycleEnabled = env.command === "serve" && env.isPreview !== true && claimViteCliDevInvocation(root, config["__vinextDevRestart"] === true, reservedDevCliInvocation && config.configFile === false);
 				buildLifecycleInvocation = config[VINEXT_BUILD_LIFECYCLE_CONFIG];
 				buildLifecycleEnabled = env.command === "build" && !internalOptions.__skipBuildLifecycle && (buildLifecycleInvocation !== void 0 || claimViteCliBuildInvocation());
@@ -1442,6 +1497,7 @@ function vinext(options = {}) {
 				defines["process.env.__NEXT_TEST_MODE"] = JSON.stringify(process.env.__NEXT_TEST_MODE ?? false);
 				defines["process.env.__NEXT_SCROLL_RESTORATION"] = JSON.stringify(nextConfig.scrollRestoration ? "true" : "false");
 				defines["process.env.__VINEXT_TRAILING_SLASH"] = JSON.stringify(nextConfig.trailingSlash ? "true" : "false");
+				defines["process.env.__VINEXT_MANUAL_TRAILING_SLASH"] = JSON.stringify(nextConfig.skipTrailingSlashRedirect ? "true" : "false");
 				defines["process.env.__NEXT_CONFIG_OUTPUT"] = JSON.stringify(nextConfig.output ?? "");
 				defines["process.env.__VINEXT_IMAGE_REMOTE_PATTERNS"] = JSON.stringify(JSON.stringify(nextConfig.images?.remotePatterns ?? []));
 				defines["process.env.__VINEXT_IMAGE_DOMAINS"] = JSON.stringify(JSON.stringify(nextConfig.images?.domains ?? []));
@@ -1507,6 +1563,7 @@ function vinext(options = {}) {
 					"vinext/head-state": path.join(shimsDir, "head-state"),
 					"vinext/i18n-state": path.join(shimsDir, "i18n-state"),
 					"vinext/i18n-context": path.join(shimsDir, "i18n-context"),
+					"vinext/document-placeholders": path.join(shimsDir, "document-placeholders"),
 					"vinext/client": path.resolve(__dirname, "client", "index"),
 					"vinext/cache": path.resolve(__dirname, "cache"),
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
@@ -1598,7 +1655,14 @@ function vinext(options = {}) {
 							...!isSSR && !isMultiEnv ? { output: getClientOutputConfig(clientAssetsDir) } : {}
 						})
 					},
-					worker: { plugins: () => [createWorkerImageImportsPlugin({ deploymentId: nextConfig.deploymentId })] },
+					worker: { plugins: () => [
+						createWorkerImageImportsPlugin({ deploymentId: nextConfig.deploymentId }),
+						createWorkerServerOnlyImportsPlugin(),
+						...rscPluginModulePromise && resolvedRscPath ? [createWorkerUseServerPlugins({
+							rscPluginModule: rscPluginModulePromise,
+							rscPluginPath: resolvedRscPath
+						})] : []
+					] },
 					server: {
 						watch: config.server?.watch === null ? null : {
 							ignored: [VINEXT_GENERATED_DIR_RE],
@@ -1835,6 +1899,7 @@ function vinext(options = {}) {
 								...depOptimizeNodeEnvOptions
 							},
 							build: {
+								...options.clientOutDir ? { outDir: options.clientOutDir } : {},
 								manifest: true,
 								...hasPagesDir ? { ssrManifest: true } : {},
 								assetsInlineLimit: clientAssetsInlineLimit,
@@ -1854,6 +1919,7 @@ function vinext(options = {}) {
 						...depOptimizeNodeEnvOptions
 					},
 					build: {
+						...options.clientOutDir ? { outDir: options.clientOutDir } : {},
 						manifest: true,
 						ssrManifest: true,
 						assetsInlineLimit: clientAssetsInlineLimit,
@@ -1874,7 +1940,7 @@ function vinext(options = {}) {
 								...depOptimizeNodeEnvOptions
 							},
 							build: {
-								outDir: "dist/client",
+								outDir: options.clientOutDir ?? "dist/client",
 								manifest: true,
 								ssrManifest: true,
 								assetsInlineLimit: clientAssetsInlineLimit,
@@ -1954,9 +2020,10 @@ function vinext(options = {}) {
 					const optionalWarnings = /* @__PURE__ */ new Set();
 					for (const [name, environment] of Object.entries(config.environments)) {
 						const optimizer = environment.optimizeDeps;
-						const optionalIncludes = hasAppDir ? name === "client" && !optimizer.noDiscovery ? APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE : [] : name !== "client" ? ["use-sync-external-store/with-selector"] : [];
+						const optionalIncludes = hasAppDir ? name === "client" && !optimizer.noDiscovery ? APP_CLIENT_OPTIONAL_OPTIMIZE_DEPS_INCLUDE : [] : name !== "client" ? PAGES_CLOUDFLARE_WORKER_OPTIONAL_OPTIMIZE_DEPS_INCLUDE : [];
 						for (const id of optionalIncludes) {
-							if (optimizer.include?.includes(id) || optimizer.exclude?.some((excluded) => id === excluded || id.startsWith(`${excluded}/`))) continue;
+							const depId = id.slice(id.lastIndexOf(">") + 1).trim();
+							if (optimizer.include?.includes(id) || optimizer.include?.includes(depId) || optimizer.exclude?.some((excluded) => depId === excluded || depId.startsWith(`${excluded}/`))) continue;
 							(optimizer.include ??= []).push(id);
 							optionalWarnings.add(`Failed to resolve dependency: ${id}, present in ${name} 'optimizeDeps.include'`);
 						}
@@ -2084,21 +2151,21 @@ function vinext(options = {}) {
 					if (cleanId === VIRTUAL_RSC_ENTRY) return RESOLVED_RSC_ENTRY;
 					if (cleanId === VIRTUAL_CACHEABILITY_MANIFEST) {
 						if ((hasAppDir ? this.environment?.name === "rsc" : this.environment !== void 0 && isServerEnvironment(this.environment)) && this.environment.config?.command === "build") return {
-							id: `./${CACHEABILITY_MANIFEST_MODULE}`,
+							id: VIRTUAL_CACHEABILITY_MANIFEST,
 							external: true
 						};
 						return RESOLVED_CACHEABILITY_MANIFEST;
 					}
 					if (cleanId === VIRTUAL_CACHEABILITY_REQUEST_PROJECTION) {
 						if (hasAppDir && this.environment?.name === "rsc" && this.environment.config?.command === "build") return {
-							id: `./${CACHEABILITY_REQUEST_PROJECTION_MODULE}`,
+							id: VIRTUAL_CACHEABILITY_REQUEST_PROJECTION,
 							external: true
 						};
 						return RESOLVED_CACHEABILITY_REQUEST_PROJECTION;
 					}
 					if (cleanId === VIRTUAL_PREGENERATED_CONCRETE_PATHS) {
 						if ((hasAppDir ? this.environment?.name === "rsc" : this.environment !== void 0 && isServerEnvironment(this.environment)) && this.environment.config?.command === "build") return {
-							id: `./${PREGENERATED_CONCRETE_PATHS_MODULE}`,
+							id: VIRTUAL_PREGENERATED_CONCRETE_PATHS,
 							external: true
 						};
 						return RESOLVED_PREGENERATED_CONCRETE_PATHS;
@@ -2206,6 +2273,7 @@ function vinext(options = {}) {
 							nodeOpenTelemetryLoader: registerNodeOpenTelemetryLoader,
 							assetPrefix: nextConfig?.assetPrefix,
 							crossOrigin: nextConfig?.crossOrigin,
+							skipTrailingSlashRedirect: nextConfig?.skipTrailingSlashRedirect,
 							expireTime: nextConfig?.expireTime,
 							reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
 							cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
@@ -2230,7 +2298,8 @@ function vinext(options = {}) {
 							publicFiles: isServeCommand && devPublicFileRoutes ? [...devPublicFileRoutes].sort() : scanPublicFileRoutes(root, this.environment.config.publicDir === "" ? false : this.environment.config.publicDir),
 							globalNotFoundPath,
 							draftModeSecret,
-							prerenderSecret
+							prerenderSecret,
+							devForwardedMiddlewareContextKey: isServeCommand && this.environment.config.consumer === "server" ? devForwardedMiddlewareContextKey : void 0
 						}, instrumentationPath);
 					}
 					if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
@@ -2332,15 +2401,19 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					const buildRoot = this.environment.config.root ?? process.cwd();
 					const environmentOutDir = path.resolve(buildRoot, this.environment.config.build.outDir);
 					const sidecarDir = resolvePagesClientAssetsOutputDir(this.environment.name, environmentOutDir);
-					let externalId = path.relative(environmentOutDir, path.join(sidecarDir, PAGES_CLIENT_ASSETS_MODULE));
-					if (!externalId.startsWith(".")) externalId = `./${externalId}`;
+					pagesClientAssetsExternalTargets.set(this.environment.name, /* @__PURE__ */ new Map([[VIRTUAL_PAGES_CLIENT_ASSETS, path.relative(environmentOutDir, path.join(sidecarDir, PAGES_CLIENT_ASSETS_MODULE))]]));
 					pagesClientAssetsOutputDirs.add(sidecarDir);
 					return {
-						id: externalId,
+						id: VIRTUAL_PAGES_CLIENT_ASSETS,
 						external: true
 					};
 				}
 			},
+			renderChunk(code, chunk) {
+				const targets = pagesClientAssetsExternalTargets.get(this.environment.name);
+				if (!targets) return null;
+				return rewriteOutputRootExternals(code, chunk.fileName, targets);
+			},
 			outputOptions(output) {
 				const environment = this.environment;
 				if (!selectedMultiStageOutput || !environment || !isMultiStageServerEnvironment(environment)) return;
@@ -2446,6 +2519,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		{
 			name: "vinext:cacheability-manifest-asset",
 			apply: "build",
+			renderChunk(code, chunk) {
+				return rewriteOutputRootExternals(code, chunk.fileName, OUTPUT_ROOT_SERVER_EXTERNALS);
+			},
 			generateBundle() {
 				if (!(hasAppDir ? this.environment?.name === "rsc" : this.environment !== void 0 && isServerEnvironment(this.environment))) return;
 				this.emitFile({
@@ -2595,10 +2671,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 			},
 			configureServer(server) {
+				installSocketErrorBackstop({ runningServer: true });
 				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];
+					removeForwardedMiddlewareContext(req);
 					next();
 				});
 				const pageExtensions = fileMatcher.extensionRegex;
@@ -2609,7 +2686,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						return new URL(resolved).origin;
 					} catch {}
 					const address = server.httpServer?.address();
-					return `http://localhost:${typeof address === "object" && address ? address.port : server.config.server.port ?? 3e3}`;
+					return `http://localhost:${typeof address === "object" && address ? address.port : server.config.server.port}`;
 				};
 				let cachedSSRHandler = null;
 				const devPageRouteDataKinds = /* @__PURE__ */ new Map();
@@ -2777,7 +2854,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					const cleanPath = toSlash(stripViteModuleQuery(filePath));
 					const relativePath = path.relative(devPublicDir, cleanPath);
 					if (relativePath === "" || relativePath.startsWith("../") || path.isAbsolute(relativePath)) return null;
-					return publicFilePathVariants(`/${relativePath}`);
+					return [publicFileRouteKey(`/${relativePath}`)];
 				};
 				const updatePublicFileRoute = (filePath, present) => {
 					const routes = publicRoutesForFile(filePath);
@@ -3072,16 +3149,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							}
 							const canonicalOriginalUrl = canonicalizeRequestUrlPathname(originalEncodedUrl);
 							url = canonicalizeRequestUrlPathname(url);
-							const rawPathname = url.split("?")[0];
-							if (rawPathname.endsWith("/index.html")) url = url.replace("/index.html", "/");
-							else if (rawPathname.endsWith(".html")) url = url.replace(/\.html(?=\?|$)/, "");
 							let middlewareUrl = canonicalOriginalUrl;
 							let routeUrl = middlewareUrl;
-							{
-								const routePathname = routeUrl.split("?")[0];
-								if (routePathname.endsWith("/index.html")) routeUrl = routeUrl.replace("/index.html", "/");
-								else if (routePathname.endsWith(".html")) routeUrl = routeUrl.replace(/\.html(?=\?|$)/, "");
-							}
 							let pathname = url.split("?")[0];
 							if (isOpenRedirectShaped(pathname)) {
 								res.writeHead(404);
@@ -3129,7 +3198,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								}
 							}
 							let configMatchPathname = stripBasePath(middlewareUrl.split("?")[0], routingBasePath);
-							if (nextConfig) {
+							if (nextConfig && !nextConfig.skipTrailingSlashRedirect) {
 								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
 								const trailingSlashRedirect = normalizeTrailingSlash(routeUrl.split("?")[0], bp, nextConfig.trailingSlash, qs);
 								if (trailingSlashRedirect) {
@@ -3142,18 +3211,22 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							if (hasCloudflarePlugin) return next();
 							let isDataReq = false;
 							let dataNotFoundResponse = null;
-							if (isNextDataPathname(pathname)) {
-								const dataMatch = parseNextDataPathname(pathname, devBuildId);
-								if (dataMatch) {
+							const rawRoutePathname = routeUrl.split("?")[0];
+							if (isNextDataPathname(rawRoutePathname)) {
+								const rawDataMatch = parseNextDataPathname(rawRoutePathname, devBuildId);
+								const dataMatch = rawDataMatch ? parseNextDataPathname(pathname, devBuildId) : null;
+								if (dataMatch && rawDataMatch) {
 									isDataReq = true;
 									const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-									const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, shouldAddTrailingSlashToPagesDataPath(capturedMiddlewarePath !== null, nextConfig?.trailingSlash === true, nextConfig?.skipProxyUrlNormalize === true));
+									const addTrailingSlash = shouldAddTrailingSlashToPagesDataPath(capturedMiddlewarePath !== null, nextConfig?.trailingSlash === true, nextConfig?.skipProxyUrlNormalize === true);
+									const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, addTrailingSlash);
+									const rawPagePathname = normalizeNextDataPagePathname(rawDataMatch.pagePathname, addTrailingSlash);
 									url = pagePathname + qs;
-									if (!nextConfig?.skipProxyUrlNormalize) middlewareUrl = url;
-									routeUrl = url;
+									routeUrl = rawPagePathname + qs;
+									if (!nextConfig?.skipProxyUrlNormalize) middlewareUrl = routeUrl;
 									pathname = pagePathname;
-									configMatchPathname = pagePathname;
-									req.url = url;
+									configMatchPathname = rawPagePathname;
+									req.url = routeUrl;
 								} else {
 									const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
 									const notFoundHeaders = { "Content-Type": "application/json" };
@@ -3202,6 +3275,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								signal: signalFromNodeResponse(res)
 							});
 							const applyRequestHeadersToNodeRequest = (nextRequestHeaders) => {
+								removeForwardedMiddlewareContext(req);
 								for (const key of Object.keys(req.headers)) delete req.headers[key];
 								for (const [key, value] of nextRequestHeaders) req.headers[key] = value;
 							};
@@ -3213,18 +3287,19 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									headers: nodeRequestHeaders,
 									signal: webRequest.signal
 								});
-								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname);
+								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname, opts.isStaleDataRequest, nextConfig?.skipTrailingSlashRedirect);
 								if (hasAppDir && result.continue) {
 									const mwCtxEntries = [];
 									if (result.responseHeaders) {
 										for (const [key, value] of result.responseHeaders) if (key !== "x-middleware-next" && key !== "x-middleware-rewrite") mwCtxEntries.push([key, value]);
 									}
 									const mwStatus = result.status ?? result.rewriteStatus;
-									req.headers[VINEXT_MW_CTX_HEADER] = JSON.stringify({
+									setForwardedMiddlewareContext(req, devForwardedMiddlewareContextKey, JSON.stringify({
 										h: mwCtxEntries,
 										s: mwStatus ?? null,
-										r: result.rewriteUrl ?? null
-									});
+										r: result.rewriteUrl ?? null,
+										b: result.rewriteHadBasePath ?? null
+									}));
 								}
 								return result;
 							} : null;
@@ -3238,6 +3313,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								assetPrefix: nextConfig?.assetPrefix,
 								basePath: bp,
 								trailingSlash: nextConfig?.trailingSlash ?? false,
+								skipTrailingSlashRedirect: nextConfig?.skipTrailingSlashRedirect ?? false,
 								i18nConfig: nextConfig?.i18n ?? null,
 								configRedirects: nextConfig?.redirects ?? [],
 								configRewrites: nextConfig?.rewrites ?? {
@@ -3286,8 +3362,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									const reqWithBody = new Request(new URL(url, requestOrigin), externalInit);
 									return proxyExternalRequest(reqWithBody, externalUrl);
 								},
-								serveFilesystemRoute: async (requestPathname, stagedHeaders, phase, resolvedUrl) => {
-									if (isImageOptimizationPath(requestPathname)) {
+								serveFilesystemRoute: async (requestPathname, stagedHeaders, phase, resolvedUrl, _request, resolvedPathnameHasBasePath) => {
+									if (resolvedPathnameHasBasePath && isImageOptimizationPath(requestPathname)) {
 										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);
@@ -3298,7 +3374,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									}
 									const isRetrievalMethod = req.method === "GET" || req.method === "HEAD";
 									if (phase === "direct" && isRetrievalMethod || requestPathname === "/" || requestPathname === "/api" || requestPathname.startsWith("/api/")) return false;
-									if (!isRetrievalMethod) return isExistingDevPublicFile(requestPathname) ? methodNotAllowedResponse("GET, HEAD") : false;
+									if (!isRetrievalMethod) return isExistingDevPublicFile(normalizePathnameForRouteMatch(requestPathname)) ? methodNotAllowedResponse("GET, HEAD") : false;
 									return serveRewrittenViteFilesystemRoute(req, res, requestPathname, stagedHeaders);
 								}
 							};
@@ -3325,12 +3401,12 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								const requestHeaders = new Headers();
 								encodeMiddlewareRequestHeaders(requestHeaders, pipelineResult.requestHeaders);
 								flushRequestHeaders();
-								req.headers[VINEXT_MW_CTX_HEADER] = JSON.stringify({
+								setForwardedMiddlewareContext(req, devForwardedMiddlewareContextKey, JSON.stringify({
 									h: responseHeaders,
 									q: [...requestHeaders],
 									s: pipelineResult.middlewareStatus ?? null,
 									r: apiUrl
-								});
+								}));
 							};
 							if (pipelineResult.type === "api") {
 								const devApiRoutes = await getDevApiRoutes();
@@ -3350,7 +3426,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									i18n: nextConfig?.i18n,
 									trustedRevalidateOrigin: getTrustedDevRevalidateOrigin(),
 									allowedRevalidateHeaderKeys: nextConfig?.allowedRevalidateHeaderKeys,
-									trailingSlash: nextConfig?.trailingSlash
+									trailingSlash: nextConfig?.trailingSlash,
+									skipTrailingSlashRedirect: nextConfig?.skipTrailingSlashRedirect
 								})) return;
 								if (hasAppDir) {
 									if (pipelineResult.configRewriteFired) forwardInternalApiRewriteToApp(pipelineResult.apiUrl);
@@ -3498,6 +3575,25 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		},
 		{
 			name: "vinext:validate-server-only-client-imports",
+			resolveId: {
+				order: "pre",
+				filter: { id: SERVER_ONLY_SPECIFIER_RE },
+				handler(_source, importer) {
+					const environment = this.environment;
+					if (environment?.name !== "client" || hasAppDir) return null;
+					if (environment.mode === "dev" && !(importer && environment.moduleGraph.getModuleById(importer))) return {
+						id: INVALID_SERVER_ONLY_ID_PREFIX + (importer ?? ""),
+						moduleSideEffects: true
+					};
+					throw createServerOnlyClientImportError(importer);
+				}
+			},
+			load: {
+				filter: { id: INVALID_SERVER_ONLY_ID_RE },
+				handler(id) {
+					throw createServerOnlyClientImportError(id.slice(28));
+				}
+			},
 			transform: {
 				filter: {
 					id: {
@@ -3507,7 +3603,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					code: "server-only"
 				},
 				handler(code) {
-					if (this.environment?.name !== "client") return null;
+					if (this.environment?.name !== "client" || !hasAppDir) return null;
+					// @vitejs/plugin-rsc replaces a "use server" module in the client
 					if (getLeadingReactDirective(code) === "use server") return null;
 					if (!hasServerOnlyMarkerImport(code)) return null;
 					throw new Error(`You're importing a module that depends on "server-only". This API is only available in Server Components in the App Router, but this module is reachable from a client bundle.`);
@@ -3665,27 +3762,18 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				},
 				async handler(code, id) {
 					const lang = id.endsWith(".ts") ? "ts" : "tsx";
-					let ast;
-					try {
-						ast = parseAst(code, { lang });
-					} catch {
-						return null;
-					}
+					const record = parseModuleRecord(code, lang);
+					if (!record) return null;
 					const s = new MagicString(code);
 					let hasChanges = false;
 					const imageImports = /* @__PURE__ */ new Set();
-					for (const node of ast.body) {
-						if (node.type !== "ImportDeclaration") continue;
-						const importNode = node;
-						const importPath = importNode.source?.value;
-						if (typeof importPath !== "string") continue;
+					for (const importNode of record.staticImports) {
+						const importPath = importNode.moduleRequest.value;
 						if (!IMAGE_EXT_RE.test(importPath)) continue;
-						const specifiers = importNode.specifiers ?? [];
-						if (specifiers.length !== 1) continue;
-						const specifier = specifiers[0];
-						if (specifier.type !== "ImportDefaultSpecifier") continue;
-						const varName = specifier.local?.name;
-						if (!varName) continue;
+						if (importNode.entries.length !== 1) continue;
+						const [entry] = importNode.entries;
+						if (entry.importName.kind !== "Default") continue;
+						const varName = entry.localName.value;
 						const dir = path.dirname(id);
 						const resolvedImage = importPath.startsWith(".") ? path.resolve(dir, importPath) : (await this.resolve(importPath, id, { skipSelf: true }))?.id;
 						if (!resolvedImage) continue;
@@ -3735,7 +3823,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		createGoogleFontsPlugin(_fontGoogleShimPath, _shimsDir),
 		createLocalFontsPlugin(_shimsDir),
 		createOptimizeImportsPlugin(() => nextConfig, () => root),
-		createDynamicPreloadMetadataPlugin(),
+		createDynamicPreloadMetadataPlugin(() => nextConfig?.turbopackTranspilePackages ?? []),
 		importMetaUrlCapability.vitePlugin,
 		createExtensionlessDynamicImportPlugin(),
 		createRequireContextPlugin(),
@@ -3807,24 +3895,13 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			}
 		},
 		{
-			name: "vinext:nitro-route-rules",
-			nitro: { setup: async (nitro) => {
+			name: "vinext:nitro-setup",
+			nitro: { setup: (nitro) => {
 				nitroBuildDir = nitro.options.buildDir ? path.resolve(root, nitro.options.buildDir) : void 0;
 				nitroHostRuntime = nitro.options.exportConditions?.includes("workerd") ? "worker" : "node";
 				if (!nextConfig) return;
 				if (!hasAppDir && !hasPagesDir) return;
 				if (resolvedServerExternalPackages.length > 0) nitro.options.traceDeps = [.../* @__PURE__ */ new Set([...nitro.options.traceDeps ?? [], ...resolvedServerExternalPackages])];
-				if (nitro.options.dev) return;
-				const { collectNitroRouteRules, mergeNitroRouteRules } = await import("./build/nitro-route-rules.js");
-				const generatedRouteRules = await collectNitroRouteRules({
-					appDir: hasAppDir ? appDir : null,
-					pagesDir: hasPagesDir ? pagesDir : null,
-					pageExtensions: nextConfig.pageExtensions
-				});
-				if (Object.keys(generatedRouteRules).length === 0) return;
-				const { routeRules, skippedRoutes } = mergeNitroRouteRules(nitro.options.routeRules, generatedRouteRules);
-				nitro.options.routeRules = routeRules;
-				if (skippedRoutes.length > 0) (nitro.logger?.warn ?? console.warn)(`[vinext] Skipping generated Nitro routeRules for routes with existing exact cache config: ${skippedRoutes.join(", ")}`);
 			} }
 		},
 		{
@@ -3941,6 +4018,10 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			apply: "build",
 			enforce: "post",
 			sharedDuringBuild: true,
+			writeBundle(_options, bundle) {
+				if (this.environment.name !== "client") return;
+				clientBuildFiles = collectClientBuildFiles(Object.keys(bundle));
+			},
 			closeBundle: {
 				sequential: true,
 				order: "post",
@@ -3967,7 +4048,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							cssGraph: runtimeMetadata.cssGraph,
 							lazyChunks: runtimeMetadata.lazyChunks ?? void 0,
 							dynamicPreloads: runtimeMetadata.dynamicPreloads ?? void 0,
-							crossOrigin: nextConfig.crossOrigin ?? ""
+							crossOrigin: nextConfig.crossOrigin ?? "",
+							clientBuildFiles: clientBuildFiles.length > 0 ? clientBuildFiles : void 0
 						});
 					}
 					if (pagesClientAssetsModule === null && pagesClientAssetsOutputDirs.size === 0) return;
@@ -4004,13 +4086,37 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					const envConfig = this.environment?.config;
 					if (!envConfig) return;
 					const buildRoot = envConfig.root ?? process.cwd();
-					const clientDir = path.resolve(buildRoot, "dist", "client");
+					const clientDir = path.resolve(buildRoot, envConfig.build.outDir);
 					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;
 				}
 			}
 		},
+		(
+		// @vitejs/plugin-rsc's preview handler, and Cloudflare and Nitro builds
+		{
+			name: "vinext:preview-server",
+			async configurePreviewServer(server) {
+				if (hasAppDir || hasCloudflarePlugin || hasNitroPlugin) return;
+				if (nextConfig?.output === "export") return;
+				const { createPagesPreviewHandler } = await import("./server/prod-server.js");
+				const { environments, preview, root } = server.config;
+				const handler = await createPagesPreviewHandler({
+					clientDir: path.resolve(root, environments.client?.build.outDir ?? "dist/client"),
+					serverDir: path.resolve(root, environments.ssr?.build.outDir ?? "dist/server"),
+					host: typeof preview.host === "string" ? preview.host : "localhost",
+					port: preview.port ?? 4173
+				});
+				if (!handler) return;
+				return () => {
+					server.middlewares.use((req, res) => {
+						if (nextConfig?.basePath) req.url = nextConfig.basePath + (req.url ?? "/");
+						handler(req, res);
+					});
+				};
+			}
+		}),
 		{
 			name: "vinext:cloudflare-build",
 			apply: "build",
@@ -4127,6 +4233,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		}
 	});
 	if (rscPluginPromise) plugins.push(rscPluginPromise);
+	if (rscVersion && isRscScanGlobImportsAffected(rscVersion)) plugins.push(createRscScanGlobImportsPlugin({ async getManager(config) {
+		return (await rscPluginModulePromise)?.getPluginApi(config)?.manager;
+	} }));
 	if (earlyAppDirExists) {
 		plugins.push(createActionOwnerManifestPlugin({
 			canonicalizeModuleId: canonicalize,
@@ -4145,7 +4254,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 	if (rscPluginPromise) {
 		plugins.push(createRscReferenceValidationNormalizerPlugin());
 		plugins.push(createRscClientReferenceLoadersPlugin());
-	} else if (manualUseCachePluginPromise) plugins.push(cacheFlightCodecPlugin(), manualUseCachePluginPromise);
+	} else if (manualUseCachePluginPromise) plugins.push(manualUseCachePluginPromise);
 	plugins.push({
 		name: "vinext:plain-pages-build-config",
 		apply: "build",
@@ -4166,6 +4275,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			}
 		}
 	});
+	plugins.push(createCloudflareDevModuleUrlsPlugin({ isEnabled: () => hasCloudflarePlugin }));
 	plugins.push(buildLifecyclePlugins[1]);
 	return plugins;
 }