vinext 1.2.0 → 1.2.1

package/dist/index.js

@@ -2,31 +2,32 @@ 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 { normalizePathnameForRouteMatch, normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
-import { hasBasePath, stripBasePath } from "./utils/base-path.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
 import { generateRouteTypes } from "./typegen.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { resolveRuntimeEntryModule } from "./entries/runtime-entry-module.js";
-import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
-import { methodNotAllowedResponse, notFoundStaticAssetResponse } from "./server/http-error-responses.js";
-import { isOpenRedirectShaped, sendRepeatedSlashRedirect } from "./server/open-redirect.js";
-import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { resolvePagesI18nRequest, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
 import { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, shouldAddTrailingSlashToPagesDataPath, urlParserCreatesPagesDataPath } from "./server/pages-data-route.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.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";
@@ -90,6 +92,7 @@ import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjec
 import { isServerEnvironment } from "./plugins/environment.js";
 import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
 import { createPagesNodeExternalsPlugin } from "./plugins/pages-node-externals.js";
+import { createCloudflareDevModuleUrlsPlugin } from "./plugins/cloudflare-dev-module-urls.js";
 import { validateMiddlewareModuleExports } from "./plugins/middleware-export-validation.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
@@ -98,7 +101,6 @@ 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";
@@ -126,14 +128,13 @@ import { hasMdxFiles, loadMdxEsmReader, pageExtensionsIncludeMdx } from "./utils
 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 } from "./utils/plugin-rsc-version.js";
+import { assertPluginRscVersion, needsAppReactServerDom } from "./utils/plugin-rsc-version.js";
 import { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine } from "./utils/vite-version.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import { pathToFileURL } from "node:url";
-import { createIdResolver, createLogger, isRunnableDevEnvironment, parseAst, transformWithOxc } from "vite";
-import { execFileSync } from "node:child_process";
+import { createIdResolver, createLogger, isRunnableDevEnvironment, transformWithOxc } from "vite";
 import { createHash, randomBytes } from "node:crypto";
 import MagicString from "magic-string";
 import commonjs from "vite-plugin-commonjs";
@@ -146,6 +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",
@@ -199,9 +201,13 @@ function createServerOnlyClientImportError(importer) {
 }
 function hasServerOnlyMarkerImport(code) {
 	if (!code.includes("server-only")) return false;
+	const record = parseModuleRecord(code, "js");
+	if (!record) return false;
+	if (record.staticImports.some((statement) => statement.moduleRequest.value === "server-only")) return true;
+	if (!code.includes("require")) return false;
 	let ast;
 	try {
-		ast = parseAst(code);
+		ast = parseProgram(code);
 	} catch {
 		return false;
 	}
@@ -209,9 +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;
@@ -300,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;
 }
@@ -330,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);
@@ -363,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);
@@ -721,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";
@@ -912,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,
@@ -922,6 +955,7 @@ 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 = [];
@@ -1042,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 });
@@ -1214,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: () => ({
@@ -1990,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'`);
 						}
@@ -2120,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;
@@ -2370,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;
@@ -2484,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({
@@ -2648,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();
@@ -3724,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;
@@ -3866,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(", ")}`);
 			} }
 		},
 		{
@@ -4236,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",
@@ -4257,6 +4275,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			}
 		}
 	});
+	plugins.push(createCloudflareDevModuleUrlsPlugin({ isEnabled: () => hasCloudflarePlugin }));
 	plugins.push(buildLifecyclePlugins[1]);
 	return plugins;
 }

package/dist/init.d.ts

@@ -70,7 +70,7 @@ export type InitDependencyGroups = {
   dependencies: string[];
   devDependencies: string[];
 };
-export declare function getInitDependencyGroups(isAppRouter: boolean, platform: InitPlatform, cloudflare?: CloudflareInitOptions, hasCssModules?: boolean): InitDependencyGroups;
+export declare function getInitDependencyGroups(isAppRouter: boolean, platform: InitPlatform, cloudflare?: CloudflareInitOptions, hasCssModules?: boolean, tailwindPostcss?: boolean): InitDependencyGroups;
 export declare function getInitDeps(isAppRouter: boolean, platform: InitPlatform, cloudflare?: CloudflareInitOptions, hasCssModules?: boolean): string[];
 export declare function isDepInstalled(root: string, dep: string): boolean;
 /**

package/dist/init.js

@@ -14,7 +14,8 @@ import { spawn, spawnSync } from "node:child_process";
 *   2. Add "type": "module" to package.json
 *   3. Rename CJS config files to .cjs
 *   4. Add vinext scripts to package.json
-*   5. Generate vite.config.ts and platform files
+*   5. Generate vite.config.ts and platform files, plus a Tailwind PostCSS
+*      config when Tailwind is only set up as a Turbopack loader
 *   6. Update .gitignore to include /dist/ and .vinext/
 *   7. Install dependencies (vite, @vitejs/plugin-react, and App Router deps)
 *   8. Print summary
@@ -94,6 +95,77 @@ function scanCssModuleFiles(root) {
 		exclude: (entry) => entry.isDirectory() && (CSS_MODULE_IGNORES.has(entry.name) || toSlash(entry.parentPath) === canonicalRoot && CSS_MODULE_ROOT_IGNORES.has(entry.name))
 	}).some((entry) => /\.module\.(css|scss|sass)$/.test(entry.name));
 }
+const NEXT_CONFIG_FILES = [
+	"next.config.ts",
+	"next.config.mts",
+	"next.config.mjs",
+	"next.config.js",
+	"next.config.cjs"
+];
+const TAILWIND_LOADERS = ["@tailwindcss/turbopack", "@tailwindcss/webpack"];
+const TAILWIND_POSTCSS_CONFIG = `const config = {
+  plugins: {
+    "@tailwindcss/postcss": {},
+  },
+};
+
+export default config;
+`;
+/**
+* Whether the project gets Tailwind from a Turbopack loader (as create-next-app
+* 16.4+ sets up in `turbopack.rules`) rather than from PostCSS, which is the
+* only way vinext compiles Tailwind. The config is not evaluated: a Next config
+* that names the loader, or a declared loader package, is enough.
+*/
+function usesTailwindTurbopackLoader(root) {
+	for (const file of NEXT_CONFIG_FILES) {
+		const configPath = path.join(root, file);
+		if (!fs.existsSync(configPath)) continue;
+		const source = fs.readFileSync(configPath, "utf-8");
+		if (TAILWIND_LOADERS.some((loader) => source.includes(loader))) return true;
+	}
+	return TAILWIND_LOADERS.some((loader) => isDepInstalled(root, loader));
+}
+const POSTCSS_CONFIG_SEARCH_ORDER = [
+	".postcssrc",
+	".postcssrc.json",
+	".postcssrc.yaml",
+	".postcssrc.yml",
+	".postcssrc.ts",
+	".postcssrc.cts",
+	".postcssrc.mts",
+	".postcssrc.js",
+	".postcssrc.cjs",
+	".postcssrc.mjs",
+	"postcss.config.ts",
+	"postcss.config.cts",
+	"postcss.config.mts",
+	"postcss.config.js",
+	"postcss.config.cjs",
+	"postcss.config.mjs"
+];
+/** The source of the PostCSS config Vite would load, which init never replaces. */
+function readPostcssConfig(root) {
+	try {
+		const pkg = JSON.parse(fs.readFileSync(path.join(root, "package.json"), "utf-8"));
+		if (pkg.postcss) return JSON.stringify(pkg.postcss);
+	} catch {}
+	for (const file of POSTCSS_CONFIG_SEARCH_ORDER) {
+		const configPath = path.join(root, file);
+		if (!fs.existsSync(configPath)) continue;
+		const source = fs.readFileSync(configPath, "utf-8");
+		if (source.trim() !== "") return source;
+	}
+}
+function getTailwindPostcssSetup(root, viteConfigPath) {
+	if (!usesTailwindTurbopackLoader(root)) return "none";
+	const viteConfig = viteConfigPath ? fs.readFileSync(viteConfigPath, "utf-8") : "";
+	const config = /postcss|lightningcss|tailwindcss/.test(viteConfig) ? viteConfig : readPostcssConfig(root);
+	if (config === void 0) return "generate";
+	if (/lightningcss/.test(config) && !config.includes("@tailwindcss/vite")) return "manual";
+	if (config.includes("@tailwindcss/postcss")) return "install";
+	return config.includes("tailwindcss") ? "none" : "manual";
+}
 /**
 * Add Vite scripts to package.json without overwriting custom scripts.
 * Exact scripts generated by older vinext versions are migrated in place.
@@ -133,7 +205,7 @@ function addScripts(root, port, platform = "node", options = {}) {
 		return [];
 	}
 }
-function getInitDependencyGroups(isAppRouter, platform, cloudflare, hasCssModules = false) {
+function getInitDependencyGroups(isAppRouter, platform, cloudflare, hasCssModules = false, tailwindPostcss = false) {
 	const dependencies = ["vinext"];
 	const devDependencies = ["vite", "@vitejs/plugin-react"];
 	if (isAppRouter) {
@@ -149,6 +221,7 @@ function getInitDependencyGroups(isAppRouter, platform, cloudflare, hasCssModule
 		} else devDependencies.push("@cloudflare/vite-plugin@1", "wrangler");
 	}
 	if (hasCssModules) devDependencies.push("vite-css-modules", "postcss");
+	if (tailwindPostcss) devDependencies.push("@tailwindcss/postcss");
 	return {
 		dependencies,
 		devDependencies
@@ -227,7 +300,7 @@ function addDependencyEntries(root, deps, { dev }) {
 * Check if react/react-dom need upgrading for react-server-dom-webpack compatibility.
 *
 * react-server-dom-webpack versions are pinned to match their React version
-* (e.g. rsdw@19.2.6 requires react@^19.2.6). When a project has an older
+* (e.g. rsdw@19.3.1 requires react@^19.3.1). When a project has an older
 * React (e.g. create-next-app ships react@19.2.3), we need to upgrade
 * react/react-dom BEFORE installing rsdw to avoid peer-dep conflicts.
 *
@@ -445,6 +518,7 @@ async function init(options) {
 	const viteConfigExists = hasViteConfig(root);
 	const isApp = detectProject(root).isAppRouter;
 	const hasCssModules = !options.skipCssModules && scanCssModuleFiles(root);
+	const tailwindPostcssSetup = getTailwindPostcssSetup(root, platform === "node" && options.force ? void 0 : existingViteConfigPath);
 	const pmName = detectPackageManagerName(root);
 	const shouldInstall = options.install ?? true;
 	const isStaticExport = platform === "cloudflare" && await resolvesToStaticExport(root, existingViteConfigPath);
@@ -495,15 +569,19 @@ async function init(options) {
 	};
 	const platformSetup = platform === "cloudflare" ? setupCloudflarePlatform(setupContext, cloudflareOptions) : setupNodePlatform(setupContext);
 	const { generatedViteConfig, skippedViteConfig, generatedPlatformFiles } = platformSetup;
+	if (tailwindPostcssSetup === "generate") fs.writeFileSync(path.join(root, "postcss.config.mjs"), TAILWIND_POSTCSS_CONFIG, "utf-8");
 	const updatedGitignore = updateGitignore(root, platform, options.cloudflare?.legacyWrangler);
-	const neededDeps = getInitDependencyGroups(isApp, platform, options.cloudflare, hasCssModules);
+	const neededDeps = getInitDependencyGroups(isApp, platform, options.cloudflare, hasCssModules, tailwindPostcssSetup === "generate" || tailwindPostcssSetup === "install");
 	const missingDependencies = neededDeps.dependencies.filter((dep) => !isDepInstalled(root, dep));
 	const missingDevDependencies = neededDeps.devDependencies.filter((dep) => !isDepInstalled(root, dep));
 	let dependencyInstallNeedsApproval = false;
 	const dependencyEntriesAdded = [];
 	const devDependencyEntriesAdded = [];
-	if (isApp && (!shouldInstall || missingDependencies.includes("react-server-dom-webpack"))) {
-		const reactUpgrade = getReactUpgradeDeps(root, { fromManifest: !shouldInstall });
+	if (isApp) {
+		const reactUpgrade = shouldInstall ? [.../* @__PURE__ */ new Set([...getReactUpgradeDeps(root), ...getReactUpgradeDeps(root, {
+			fromManifest: true,
+			installing: true
+		})])] : getReactUpgradeDeps(root, { fromManifest: true });
 		if (reactUpgrade.length > 0) {
 			console.log(`  ${terminalStyle.cyan(terminalStyle.bold("Upgrading dependencies:"))}`);
 			console.log(formatList(reactUpgrade.map((dep) => dep.replace(/@latest$/, "")), "    "));
@@ -576,6 +654,8 @@ async function init(options) {
 	if (skippedViteConfig) console.log(`    ${terminalStyle.yellow("-")} Skipped vite.config.ts (already exists, use --force to overwrite)`);
 	if (updatedGitignore) console.log(`    ${terminalStyle.green("✓")} Added vinext output directories to .gitignore`);
 	if (hasCssModules) console.log(`    ${terminalStyle.green("✓")} Configured vite-css-modules for CSS Modules`);
+	if (tailwindPostcssSetup === "generate") console.log(`    ${terminalStyle.green("✓")} Generated postcss.config.mjs for Tailwind CSS (vinext does not run turbopack.rules loaders)`);
+	else if (tailwindPostcssSetup === "manual") console.log(`    ${terminalStyle.yellow("!")} Tailwind CSS is set up as a Turbopack loader, which vinext does not run; set up "@tailwindcss/postcss" or "@tailwindcss/vite" for vinext`);
 	if (configKeepingWorkerName) console.log(`    ${terminalStyle.yellow("!")} Kept the Worker name in the existing ${configKeepingWorkerName}; --name was not applied, so update it there if it should be "${cloudflareOptions.name}"`);
 	if (platformSetup.preservedExistingGenerateScopedName) console.log(`    ${terminalStyle.yellow("!")} Preserved existing css.modules.generateScopedName; verify it produces identical class names in SSR and client builds`);
 	const nextSteps = [...platformSetup.nextSteps];