vinext 0.2.0 → 1.0.0-beta.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { detectPackageManager, formatMissingCloudflarePluginError, hasWranglerConfig } from "./utils/project.js";
+import { normalizePathSeparators, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
 import { escapeRegExp } from "./utils/regex.js";
-import { normalizePathSeparators, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, normalizeViteResolveExtensions } from "./routing/file-matcher.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
@@ -11,15 +11,16 @@ import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matc
 import { isOpenRedirectShaped } from "./server/open-redirect.js";
 import { filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
+import { extractMiddlewareMatcherConfig, hasExportedName } from "./build/report.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
-import { extractMiddlewareMatcherConfig } from "./build/report.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
 import { isUnknownRecord } from "./utils/record.js";
 import { logRequest, now } from "./server/request-log.js";
-import { resolvePagesI18nRequest } from "./server/pages-i18n.js";
-import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.js";
+import { resolvePagesI18nRequest, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
+import { isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname } from "./server/pages-data-route.js";
+import { resolveAssetsDir } from "./utils/asset-prefix.js";
 import { createSSRHandler } from "./server/dev-server.js";
 import { handleApiRoute } from "./server/api-handler.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, resolveDevImageRedirect } from "./server/image-optimization.js";
@@ -30,15 +31,13 @@ import { createDirectRunner } from "./server/dev-module-runner.js";
 import { validateDevRequest } from "./server/dev-origin-check.js";
 import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
-import { VIRTUAL_CACHE_ADAPTERS, generateCacheAdaptersModule } from "./cache/cache-adapters-virtual.js";
+import { VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY, VIRTUAL_CACHE_ADAPTERS, generateCacheAdaptersModule } from "./cache/cache-adapters-virtual.js";
 import { VIRTUAL_IMAGE_ADAPTERS, generateImageAdaptersModule } from "./image/image-adapters-virtual.js";
 import { generateBrowserEntry, isLinkPrefetchRoute, toDocumentOnlyAppRoute, toLinkPrefetchRoute } from "./entries/app-browser-entry.js";
 import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
 import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
-import { resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
-import { getDepOptimizeNodeEnvOptions, getViteMajorVersion, serializeViteDefine } from "./utils/vite-version.js";
 import { createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
 import { mergeServerExternalPackages } from "./config/server-external-packages.js";
 import { precompressAssets } from "./build/precompress.js";
@@ -55,7 +54,9 @@ import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js"
 import { dataUrlCssPlugin } from "./plugins/css-data-url.js";
 import { createCssModuleImportCompatibilityPlugin } from "./plugins/css-module-imports.js";
 import { createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-reference-loaders.js";
+import { createRscReferenceValidationNormalizerPlugin } from "./plugins/rsc-reference-validation-normalizer.js";
 import { createInstrumentationClientTransformPlugin } 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 { validateMiddlewareModuleExports } from "./plugins/middleware-export-validation.js";
@@ -70,9 +71,9 @@ import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
 import { computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
 import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, setPagesClientAssetsBuildMetadata, takePagesClientAssetsBuildMetadata, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
-import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassTildeImporter } from "./plugins/sass.js";
-import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
+import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassCssUrlAssetImporter, createSassTildeImporter } from "./plugins/sass.js";
+import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfig, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { hasExportAllCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
@@ -83,17 +84,30 @@ import { getTypeofWindowReplacement, replaceTypeofWindow } from "./plugins/typeo
 import { hasMdxFiles } from "./utils/mdx-scan.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { createIgnoreDynamicRequestsPlugin } from "./plugins/ignore-dynamic-requests.js";
-import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, normalizeVinextPrerenderConfig } from "./config/prerender.js";
+import { assertSupportedViteVersion, getDepOptimizeNodeEnvOptions, serializeViteDefine } from "./utils/vite-version.js";
+import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VINEXT_ROUTE_ROOT_CONFIG_PLUGIN_PROPERTY, normalizeVinextPrerenderConfig } from "./config/prerender.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
-import { loadEnv, parseAst, transformWithOxc } from "vite";
+import { createLogger, loadEnv, parseAst, transformWithOxc } from "vite";
 import { pathToFileURL } from "node:url";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import commonjs from "vite-plugin-commonjs";
 import MagicString from "magic-string";
 //#region src/index.ts
+const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_EXCLUDE = Object.freeze(["vinext/server/fetch-handler", "vinext/server/pages-router-entry"]);
+const PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE = Object.freeze([
+	"react",
+	"react-dom",
+	"react-dom/server.edge",
+	"react/jsx-runtime",
+	"react/jsx-dev-runtime",
+	"use-sync-external-store/with-selector"
+]);
+const OPTIONAL_OPTIMIZE_DEPS_WARNING_RE = /Failed to resolve dependency: .*use-sync-external-store\/with-selector.*present in .* 'optimizeDeps\.include'/;
+const VINEXT_FILTERED_OPTIMIZE_DEPS_WARN = Symbol.for("vinext.filteredOptimizeDepsWarn");
+const ANSI_ESCAPE_RE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
 installSocketErrorBackstop();
 function getCacheDirPrefix(cacheDir) {
 	const normalizedCacheDir = normalizePathSeparators(cacheDir);
@@ -145,11 +159,6 @@ function resolveOptionalDependency(projectRoot, specifier) {
 	} catch {}
 	return null;
 }
-async function loadVite7TsconfigPathsPlugin(projectRoot) {
-	const resolvedPath = resolveOptionalDependency(projectRoot, "vite-tsconfig-paths");
-	if (!resolvedPath) throw new Error("[vinext] Vite 7 requires the optional peer dependency vite-tsconfig-paths for tsconfig path alias support. Install vite-tsconfig-paths or upgrade to Vite 8.");
-	return (await import(pathToFileURL(resolvedPath).href)).default();
-}
 function resolveShimModulePath(shimsDir, moduleName) {
 	for (const ext of [
 		".ts",
@@ -172,6 +181,122 @@ function isVinextOgShimImporter(importer) {
 function toRelativeFileEntry(root, absPath) {
 	return path.relative(root, absPath).split(path.sep).join("/");
 }
+const DEV_PAGES_CLIENT_ENTRY = "/@id/__x00__virtual:vinext-client-entry";
+const STYLESHEET_IMPORT_RE = /\.(?:css|scss|sass)$/i;
+const STYLESHEET_FILE_RE = /\.(?:css|scss|sass)$/i;
+const SCRIPT_IMPORT_RE = /\.(?:[cm]?[jt]sx?)$/i;
+const GLOBAL_NOT_FOUND_CSS_QUERY = "?vinext-global-not-found-css";
+function toMagicStringTransformResult(output) {
+	return {
+		code: output.toString(),
+		map: output.generateMap({ hires: "boundary" })
+	};
+}
+function parserLanguageForScript(id) {
+	const cleanId = stripViteModuleQuery(id).toLowerCase();
+	return cleanId.endsWith(".ts") || cleanId.endsWith(".mts") || cleanId.endsWith(".cts") ? "ts" : "tsx";
+}
+function isStylesheetSpecifier(specifier) {
+	if (specifier.includes("?") || specifier.includes("#")) return false;
+	return STYLESHEET_IMPORT_RE.test(specifier.toLowerCase());
+}
+function isMdxModuleId(id) {
+	return stripViteModuleQuery(id).toLowerCase().endsWith(".mdx");
+}
+function isolateMdxStylesheetImports(code) {
+	const importRe = /(^|[;\n])(\s*import\s*)(["'])([^"'\n;]+)(\3)/g;
+	let output = null;
+	for (const match of code.matchAll(importRe)) {
+		const specifier = match[4];
+		if (!isStylesheetSpecifier(specifier)) continue;
+		const specifierStart = match.index + match[1].length + match[2].length + match[3].length;
+		const specifierEnd = specifierStart + specifier.length;
+		output ??= new MagicString(code);
+		output.overwrite(specifierStart, specifierEnd, specifier + GLOBAL_NOT_FOUND_CSS_QUERY);
+	}
+	return output ? toMagicStringTransformResult(output) : null;
+}
+function isolateGlobalNotFoundStylesheetImports(code, id) {
+	if (isMdxModuleId(id)) return isolateMdxStylesheetImports(code);
+	let ast;
+	try {
+		ast = parseAst(code, { lang: parserLanguageForScript(id) });
+	} catch {
+		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;
+		output ??= new MagicString(code);
+		output.overwrite(range.start, range.end, JSON.stringify(specifier + GLOBAL_NOT_FOUND_CSS_QUERY));
+	}
+	return output ? toMagicStringTransformResult(output) : null;
+}
+function isScriptModuleId(id) {
+	return SCRIPT_IMPORT_RE.test(stripViteModuleQuery(id).toLowerCase());
+}
+function skipCommonjsForLocalCjs(id) {
+	const cleanId = normalizePathSeparators(stripViteModuleQuery(id));
+	return /\.c[jt]s$/i.test(cleanId) && !cleanId.includes("node_modules") ? false : void 0;
+}
+function hasOnlyTypeSpecifiers(statement) {
+	return statement.specifiers !== void 0 && statement.specifiers.length > 0 && statement.specifiers.every((specifier) => specifier.importKind === "type" || specifier.exportKind === "type");
+}
+function resolvedStylesheetToDevManifestAsset(root, resolvedId) {
+	const cleanId = stripViteModuleQuery(resolvedId);
+	if (!path.isAbsolute(cleanId)) return null;
+	const rootForRelative = tryRealpathSync(root) ?? root;
+	const fileForRelative = tryRealpathSync(cleanId) ?? cleanId;
+	const relativePath = path.relative(rootForRelative, fileForRelative);
+	if (relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath)) return normalizePathSeparators(relativePath);
+	return `@fs/${normalizePathSeparators(cleanId).replace(/^\/+/, "")}`;
+}
+async function collectDevPagesAppStylesheetAssets(root, appFilePath, resolve) {
+	const stylesheetAssets = [];
+	const seenAssets = /* @__PURE__ */ new Set();
+	const seenModules = /* @__PURE__ */ new Set();
+	async function visitModule(modulePath) {
+		const cleanModulePath = stripViteModuleQuery(modulePath);
+		if (!path.isAbsolute(cleanModulePath) || !fs.existsSync(cleanModulePath)) return;
+		if (seenModules.has(cleanModulePath)) return;
+		seenModules.add(cleanModulePath);
+		let ast;
+		try {
+			ast = parseAst(fs.readFileSync(cleanModulePath, "utf-8"), { lang: parserLanguageForScript(cleanModulePath) });
+		} catch {
+			return;
+		}
+		for (const statement of ast.body) {
+			if (statement.type !== "ImportDeclaration" && statement.type !== "ExportNamedDeclaration" && statement.type !== "ExportAllDeclaration") continue;
+			if (statement.importKind === "type") continue;
+			if (statement.exportKind === "type") continue;
+			if (hasOnlyTypeSpecifiers(statement)) continue;
+			if (statement.attributes && statement.attributes.length > 0) continue;
+			const specifier = statement.source?.value;
+			if (typeof specifier !== "string") continue;
+			const resolved = await resolve(specifier, cleanModulePath, { skipSelf: true });
+			if (!resolved?.id) continue;
+			if (isStylesheetSpecifier(specifier)) {
+				const asset = resolvedStylesheetToDevManifestAsset(root, resolved.id);
+				if (!asset || seenAssets.has(asset)) continue;
+				seenAssets.add(asset);
+				stylesheetAssets.push(asset);
+				continue;
+			}
+			if (specifier.includes("?") || specifier.includes("#")) continue;
+			if (isScriptModuleId(resolved.id)) await visitModule(resolved.id);
+		}
+	}
+	await visitModule(appFilePath);
+	return stylesheetAssets;
+}
 const TSCONFIG_FILES = ["tsconfig.json", "jsconfig.json"];
 function resolveTsconfigPathCandidate(candidate) {
 	const candidates = candidate.endsWith(".json") ? [candidate] : [
@@ -306,19 +431,115 @@ function getVinextVersion() {
 	}
 	return _vinextVersionCache;
 }
+function mergeStringArrayValues(value, additions) {
+	return [...new Set([...value === void 0 ? [] : Array.isArray(value) ? value : [value], ...additions])];
+}
+function stripAnsi(value) {
+	return value.replace(ANSI_ESCAPE_RE, "");
+}
+function suppressOptionalOptimizeDepsWarnings(logger) {
+	const marker = logger;
+	if (marker[VINEXT_FILTERED_OPTIMIZE_DEPS_WARN]) return;
+	const warn = logger.warn.bind(logger);
+	logger.warn = (msg, options) => {
+		if (OPTIONAL_OPTIMIZE_DEPS_WARNING_RE.test(stripAnsi(msg))) return;
+		warn(msg, options);
+	};
+	marker[VINEXT_FILTERED_OPTIMIZE_DEPS_WARN] = true;
+}
 const _tsconfigAliasCache = /* @__PURE__ */ new Map();
+/**
+* Order materialized tsconfig path aliases by descending prefix length.
+*
+* TypeScript (and Next.js) match `paths` patterns by longest matched prefix,
+* regardless of declaration order, while Vite's alias plugin picks the first
+* matching entry. Overlapping patterns like `@/*` + `@/public/*` must
+* therefore be materialized longest-first or the general pattern shadows the
+* specific one (`@/public/foo.svg` would resolve into `src/public/`).
+*/
+function sortTsconfigAliasesBySpecificity(aliases) {
+	return Object.fromEntries(Object.entries(aliases).sort((a, b) => b[0].length - a[0].length));
+}
 function resolveTsconfigAliases(projectRoot) {
 	if (_tsconfigAliasCache.has(projectRoot)) return _tsconfigAliasCache.get(projectRoot);
 	let aliases = {};
 	for (const name of TSCONFIG_FILES) {
 		const candidate = path.join(projectRoot, name);
 		if (!fs.existsSync(candidate)) continue;
-		aliases = loadTsconfigPathAliases(candidate, projectRoot);
+		aliases = sortTsconfigAliasesBySpecificity(loadTsconfigPathAliases(candidate, projectRoot));
 		break;
 	}
 	_tsconfigAliasCache.set(projectRoot, aliases);
 	return aliases;
 }
+/**
+* Stylesheet importer contexts as seen by Vite's internal CSS resolvers.
+*
+* Vite resolves CSS `@import`/`composes`/`url()` specifiers through a
+* dedicated resolver container that only runs the alias plugin plus Vite's
+* own resolver — user plugins never participate. The importer is either the
+* stylesheet's own path (sass, CSS modules `composes`, url() rewriting) or a
+* synthetic `<basedir>/*` (postcss-import, less).
+*/
+const STYLESHEET_IMPORTER_RE = /\.(?:css|scss|sass|less|styl|stylus|pcss|sss)$/i;
+function isStylesheetImporter(importer) {
+	if (!importer) return false;
+	if (importer.endsWith("/*") || importer.endsWith("\\*")) return true;
+	return STYLESHEET_IMPORTER_RE.test(stripViteModuleQuery(importer));
+}
+/**
+* Alias resolver for tsconfig-derived path aliases that keeps them out of
+* stylesheet resolution.
+*
+* TypeScript `paths` never apply to CSS in Next.js — `@import` specifiers in
+* stylesheets use standard bundler resolution, including package.json
+* `exports` maps. A blind prefix-replacement alias breaks that: with
+* `"@scope/ui/*": ["../../packages/ui/src/*"]` in tsconfig, an
+* `@import "@scope/ui/globals.css"` whose real target is `exports`-mapped
+* gets rewritten to a nonexistent source path and fails with ENOENT.
+*
+* Returning `null` for stylesheet importers makes the alias plugin fall
+* through, so Vite's own resolver handles the original specifier. JS/TS
+* importers keep the default alias behavior (Next.js applies `paths` there,
+* including for `import "@/styles/globals.css"` from a layout), and Vite's
+* glob/dynamic-import transforms — which require blind prefix replacement
+* because their patterns never exist on disk — keep working.
+*/
+const tsconfigAliasCustomResolver = async function(updatedId, importer, options) {
+	if (isStylesheetImporter(importer)) return null;
+	return await this.resolve(updatedId, importer, {
+		...options,
+		skipSelf: true
+	}) ?? { id: updatedId };
+};
+/**
+* Convert the merged alias map into Vite alias entries, attaching the
+* stylesheet-scoping resolver to entries that came from tsconfig `paths`.
+* Array order preserves the map's first-match ordering.
+*/
+function buildResolveAliasEntries(aliasMap, tsconfigPathAliases) {
+	return Object.entries(aliasMap).map(([find, replacement]) => tsconfigPathAliases[find] === replacement ? {
+		find,
+		replacement,
+		customResolver: tsconfigAliasCustomResolver
+	} : {
+		find,
+		replacement
+	});
+}
+const ALIAS_CUSTOM_RESOLVER_DEPRECATION_RE = /`resolve\.alias` contains an alias with `customResolver` option/;
+const VINEXT_FILTERED_ALIAS_DEPRECATION_WARN = Symbol.for("vinext.filteredAliasDeprecationWarn");
+function suppressAliasCustomResolverDeprecationWarning(logger) {
+	const marker = logger;
+	if (marker[VINEXT_FILTERED_ALIAS_DEPRECATION_WARN]) return logger;
+	const warn = logger.warn.bind(logger);
+	logger.warn = (msg, warnOptions) => {
+		if (ALIAS_CUSTOM_RESOLVER_DEPRECATION_RE.test(stripAnsi(msg))) return;
+		warn(msg, warnOptions);
+	};
+	marker[VINEXT_FILTERED_ALIAS_DEPRECATION_WARN] = true;
+	return logger;
+}
 const VIRTUAL_WORKER_ENTRY = "virtual:vinext-worker-entry";
 const RESOLVED_WORKER_ENTRY = "\0virtual:vinext-worker-entry";
 const VIRTUAL_SERVER_ENTRY = "virtual:vinext-server-entry";
@@ -455,22 +676,19 @@ const _reactServerShims = new Map([
 	["next/error", "error"],
 	["next/error.js", "error"]
 ]);
-const clientManualChunks = createClientManualChunks(_shimsDir);
-const clientCodeSplittingConfig = createClientCodeSplittingConfig(clientManualChunks);
-const appClientManualChunks = createClientManualChunks(_shimsDir, true);
-const appClientCodeSplittingConfig = createClientCodeSplittingConfig(appClientManualChunks);
-function getClientOutputConfigForVite(viteMajorVersion, assetsDir, preserveAppRouteBoundaries = false) {
-	const manualChunks = preserveAppRouteBoundaries ? appClientManualChunks : clientManualChunks;
+const clientCodeSplittingConfig = createClientCodeSplittingConfig(createClientManualChunks(_shimsDir));
+const appClientCodeSplittingConfig = createClientCodeSplittingConfig(createClientManualChunks(_shimsDir, true));
+function getClientOutputConfig(assetsDir, preserveAppRouteBoundaries = false) {
 	const codeSplitting = preserveAppRouteBoundaries ? appClientCodeSplittingConfig : clientCodeSplittingConfig;
-	return viteMajorVersion >= 8 ? {
+	return {
 		...createClientFileNameConfig(assetsDir),
 		assetFileNames: createClientAssetFileNames(assetsDir),
 		codeSplitting
-	} : createClientOutputConfig(manualChunks, assetsDir);
+	};
 }
 function vinext(options = {}) {
+	assertSupportedViteVersion();
 	const prerenderConfig = normalizeVinextPrerenderConfig(options.prerender);
-	const viteMajorVersion = getViteMajorVersion();
 	let root;
 	let pagesDir;
 	let canonicalPagesDir;
@@ -483,10 +701,13 @@ function vinext(options = {}) {
 	let instrumentationPath = null;
 	let instrumentationClientPath = null;
 	let clientInjectModule = null;
+	let globalNotFoundCssIsolationPath = null;
 	let clientAssetsInlineLimit = 0;
 	let hasCloudflarePlugin = false;
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
+	let isServeCommand = false;
+	let pagesOptimizeEntries = [];
 	const pagesClientAssetsOutputDirs = /* @__PURE__ */ new Set();
 	let pagesClientAssetsModule = null;
 	let rscCompatibilityId;
@@ -625,11 +846,27 @@ function vinext(options = {}) {
 		return mdxDelegatePromise;
 	}
 	const plugins = [
-		...viteMajorVersion >= 8 ? [] : [loadVite7TsconfigPathsPlugin(earlyBaseDir)],
+		createStyledJsxPlugin(earlyBaseDir),
 		reactPluginPromise,
 		createIgnoreDynamicRequestsPlugin(() => nextConfig?.turbopackTranspilePackages ?? []),
-		commonjs(),
-		...viteMajorVersion >= 8 ? [{
+		commonjs({ filter: skipCommonjsForLocalCjs }),
+		{
+			name: "vinext:global-not-found-css-isolation",
+			apply: "build",
+			enforce: "pre",
+			transform: {
+				filter: {
+					id: /(?:^|[/\\])global-not-found(?:\.[^./?\\]+)+(?:\?.*)?$/,
+					code: /\.(?:css|scss|sass)['"]/
+				},
+				handler(code, id) {
+					const cleanId = normalizePathSeparators(stripViteModuleQuery(id));
+					if (!globalNotFoundCssIsolationPath || canonicalize(cleanId) !== canonicalize(globalNotFoundCssIsolationPath)) return null;
+					return isolateGlobalNotFoundStylesheetImports(code, cleanId);
+				}
+			}
+		},
+		{
 			name: "vinext:jsx-in-js",
 			enforce: "pre",
 			transform: {
@@ -652,7 +889,7 @@ function vinext(options = {}) {
 					};
 				}
 			}
-		}] : [],
+		},
 		createMiddlewareServerOnlyPlugin({
 			getMiddlewarePath: () => middlewarePath,
 			getCanonicalMiddlewarePath: () => middlewarePath ? tryRealpathSync(middlewarePath) ?? middlewarePath : null,
@@ -668,12 +905,20 @@ function vinext(options = {}) {
 			name: "vinext:config",
 			enforce: "pre",
 			[VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY]: prerenderConfig,
+			[VINEXT_ROUTE_ROOT_CONFIG_PLUGIN_PROPERTY]: {
+				appDir: options.appDir,
+				disableAppRouter: options.disableAppRouter,
+				rscOutDir: options.rscOutDir,
+				ssrOutDir: options.ssrOutDir
+			},
+			[VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY]: options.cache ?? null,
 			async config(config, env) {
+				isServeCommand = env.command === "serve";
 				root = normalizePathSeparators(config.root ?? process.cwd());
-				const userResolve = config.resolve;
-				const shouldEnableNativeTsconfigPaths = viteMajorVersion >= 8 && userResolve?.tsconfigPaths === void 0;
+				const shouldEnableNativeTsconfigPaths = config.resolve?.tsconfigPaths === void 0;
 				const tsconfigPathAliases = resolveTsconfigAliases(root);
 				const swcHelpersAlias = resolveSwcHelpersAlias(root);
+				if (Object.keys(tsconfigPathAliases).length > 0) config.customLogger = suppressAliasCustomResolverDeprecationWarning(config.customLogger ?? createLogger(config.logLevel, { allowClearScreen: config.clearScreen }));
 				const mode = env?.mode ?? "development";
 				const dotenvVars = loadEnv(mode, config.envDir ?? root, "");
 				for (const [key, value] of Object.entries(dotenvVars)) if (process.env[key] === void 0) process.env[key] = value;
@@ -721,6 +966,7 @@ function vinext(options = {}) {
 					rscCompatibilityId = sharedRscCompatibilityId && sharedRscCompatibilityId.length > 0 ? sharedRscCompatibilityId : createRscCompatibilityId(nextConfig);
 				}
 				fileMatcher = createValidFileMatcher(nextConfig.pageExtensions);
+				globalNotFoundCssIsolationPath = env?.command === "build" && nextConfig.globalNotFound ? findFileWithExts(appDir, "global-not-found", fileMatcher) : null;
 				instrumentationPath = findInstrumentationFile(root, fileMatcher);
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
 				const middlewareConventionDir = canonicalize(baseDir) === canonicalize(path.posix.join(root, "src")) ? path.posix.join(root, "src") : root;
@@ -885,7 +1131,7 @@ function vinext(options = {}) {
 						],
 						assetsDir: clientAssetsDir,
 						...!isSSR && !hasClientBuildEnvironment ? { assetsInlineLimit: clientAssetsInlineLimit } : {},
-						...withBuildBundlerOptions(viteMajorVersion, {
+						...withBuildBundlerOptions({
 							onwarn: (() => {
 								const userOnwarn = getBuildBundlerOptions(config.build)?.onwarn;
 								return (warning, defaultHandler) => {
@@ -896,8 +1142,8 @@ function vinext(options = {}) {
 									else defaultHandler(warning);
 								};
 							})(),
-							...!isSSR && !isMultiEnv ? { treeshake: getClientTreeshakeConfigForVite(viteMajorVersion) } : {},
-							...!isSSR && !isMultiEnv ? { output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir) } : {}
+							...!isSSR && !isMultiEnv ? { treeshake: getClientTreeshakeConfig() } : {},
+							...!isSSR && !isMultiEnv ? { output: getClientOutputConfig(clientAssetsDir) } : {}
 						})
 					},
 					server: {
@@ -919,13 +1165,13 @@ function vinext(options = {}) {
 						noExternal: true
 					} },
 					resolve: {
-						alias: {
+						alias: buildResolveAliasEntries({
 							...swcHelpersAlias ? { "@swc/helpers/_": swcHelpersAlias } : {},
 							...tsconfigPathAliases,
 							...nextConfig.aliases,
 							...nextShimMap,
 							"vinext/server/pages-client-assets": _pagesClientAssetsPath
-						},
+						}, tsconfigPathAliases),
 						dedupe: [
 							"react",
 							"react-dom",
@@ -934,7 +1180,10 @@ function vinext(options = {}) {
 						],
 						...shouldEnableNativeTsconfigPaths ? { tsconfigPaths: true } : {}
 					},
-					...viteMajorVersion >= 8 ? { oxc: { jsx: { runtime: "automatic" } } } : { esbuild: { jsx: "automatic" } },
+					oxc: {
+						jsx: { runtime: "automatic" },
+						typescript: { onlyRemoveTypeImports: false }
+					},
 					define: defines,
 					...nextConfig.basePath ? { base: nextConfig.basePath + "/" } : {},
 					...nextConfig.assetPrefix || nextConfig.deploymentId ? { experimental: { renderBuiltUrl: (filename, context) => renderVinextBuiltUrl(filename, nextConfig.assetPrefix, nextConfig.deploymentId, context.hostType) } } : {},
@@ -949,9 +1198,19 @@ function vinext(options = {}) {
 						...postcssOverride ? { postcss: postcssOverride } : {},
 						preprocessorOptions: (() => {
 							const tildeImporter = createSassTildeImporter(root);
+							const cssUrlAssetImporter = env.command === "build" ? createSassCssUrlAssetImporter() : null;
+							const userAdditionalData = sassPreprocessorOptions?.additionalData;
 							const baseOpts = {
 								...sassPreprocessorOptions,
-								importers: [tildeImporter, ...sassPreprocessorOptions?.importers ?? []]
+								...cssUrlAssetImporter ? { additionalData: async (source, filename) => {
+									const withUserData = typeof userAdditionalData === "function" ? await userAdditionalData(source, filename) : typeof userAdditionalData === "string" ? `${userAdditionalData}${source}` : source;
+									return cssUrlAssetImporter.rewriteImports(withUserData, filename);
+								} } : {},
+								importers: [
+									tildeImporter,
+									...cssUrlAssetImporter ? [cssUrlAssetImporter] : [],
+									...sassPreprocessorOptions?.importers ?? []
+								]
 							};
 							return {
 								scss: baseOpts,
@@ -972,7 +1231,7 @@ function vinext(options = {}) {
 						if (shimBase !== void 0) return resolveShimModulePath(shimsDir, shimBase);
 					}
 				};
-				const depOptimizeNodeEnvOptions = getDepOptimizeNodeEnvOptions(viteMajorVersion, nodeEnvDefine);
+				const depOptimizeNodeEnvOptions = getDepOptimizeNodeEnvOptions(nodeEnvDefine);
 				viteConfig.optimizeDeps = {
 					exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["@tailwindcss/oxide"]),
 					...incomingInclude.length > 0 ? { include: incomingInclude } : {},
@@ -982,7 +1241,7 @@ function vinext(options = {}) {
 						plugins: [depOptimizeAliasPlugin]
 					}
 				};
-				const pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
+				pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
 				if (hasAppDir) {
 					const appEntries = [`${path.relative(root, appDir)}/**/*.{tsx,ts,jsx,js}`];
 					const explicitInstrumentationEntries = [instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : []);
@@ -1009,9 +1268,9 @@ function vinext(options = {}) {
 							},
 							build: {
 								outDir: options.rscOutDir ?? "dist/server",
-								...withBuildBundlerOptions(viteMajorVersion, {
+								...withBuildBundlerOptions({
 									input: { index: VIRTUAL_RSC_ENTRY },
-									output: createRscFrameworkChunkOutputConfig(viteMajorVersion)
+									output: createRscFrameworkChunkOutputConfig()
 								})
 							}
 						},
@@ -1031,7 +1290,7 @@ function vinext(options = {}) {
 							},
 							build: {
 								outDir: options.ssrOutDir ?? "dist/server/ssr",
-								...withBuildBundlerOptions(viteMajorVersion, { input: { index: VIRTUAL_APP_SSR_ENTRY } })
+								...withBuildBundlerOptions({ input: { index: VIRTUAL_APP_SSR_ENTRY } })
 							}
 						},
 						client: {
@@ -1046,47 +1305,54 @@ function vinext(options = {}) {
 									"react-dom/client",
 									"react/jsx-runtime",
 									"react/jsx-dev-runtime"
-								])]
+								])],
+								...depOptimizeNodeEnvOptions
 							},
 							build: {
 								manifest: true,
 								...hasPagesDir ? { ssrManifest: true } : {},
 								assetsInlineLimit: clientAssetsInlineLimit,
-								...withBuildBundlerOptions(viteMajorVersion, {
+								...withBuildBundlerOptions({
 									input: appClientInput,
-									output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir, true),
-									treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
+									output: getClientOutputConfig(clientAssetsDir, true),
+									treeshake: getClientTreeshakeConfig()
 								})
 							}
 						}
 					};
 				} else if (hasCloudflarePlugin) viteConfig.environments = { client: {
 					consumer: "client",
-					optimizeDeps: pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : void 0,
+					optimizeDeps: {
+						...pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : {},
+						...depOptimizeNodeEnvOptions
+					},
 					build: {
 						manifest: true,
 						ssrManifest: true,
 						assetsInlineLimit: clientAssetsInlineLimit,
-						...withBuildBundlerOptions(viteMajorVersion, {
+						...withBuildBundlerOptions({
 							input: { index: VIRTUAL_CLIENT_ENTRY },
-							output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
-							treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
+							output: getClientOutputConfig(clientAssetsDir),
+							treeshake: getClientTreeshakeConfig()
 						})
 					}
 				} };
 				else if (shouldInjectPlainPagesEnvironments) viteConfig.environments = {
 					client: {
 						consumer: "client",
-						optimizeDeps: pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : void 0,
+						optimizeDeps: {
+							...pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : {},
+							...depOptimizeNodeEnvOptions
+						},
 						build: {
 							outDir: "dist/client",
 							manifest: true,
 							ssrManifest: true,
 							assetsInlineLimit: clientAssetsInlineLimit,
-							...withBuildBundlerOptions(viteMajorVersion, {
+							...withBuildBundlerOptions({
 								input: { index: VIRTUAL_CLIENT_ENTRY },
-								output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
-								treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
+								output: getClientOutputConfig(clientAssetsDir),
+								treeshake: getClientTreeshakeConfig()
 							})
 						}
 					},
@@ -1107,7 +1373,7 @@ function vinext(options = {}) {
 						},
 						build: {
 							outDir: "dist/server",
-							...withBuildBundlerOptions(viteMajorVersion, {
+							...withBuildBundlerOptions({
 								input: { index: VIRTUAL_SERVER_ENTRY },
 								output: { entryFileNames: "entry.js" }
 							})
@@ -1121,6 +1387,12 @@ function vinext(options = {}) {
 				return viteConfig;
 			},
 			configEnvironment(name, config) {
+				if (isServeCommand && hasCloudflarePlugin && hasPagesDir && !hasAppDir && name !== "client") {
+					config.optimizeDeps ??= {};
+					config.optimizeDeps.entries = mergeStringArrayValues(config.optimizeDeps.entries, pagesOptimizeEntries);
+					config.optimizeDeps.include = mergeStringArrayValues(config.optimizeDeps.include, PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_INCLUDE);
+					config.optimizeDeps.exclude = mergeOptimizeDepsExclude(config.optimizeDeps.exclude ?? [], VINEXT_OPTIMIZE_DEPS_EXCLUDE, PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_EXCLUDE);
+				}
 				const configuredExtensions = name === "client" ? nextConfig.resolveExtensions : nextConfig.serverResolveExtensions;
 				const extensions = configuredExtensions === null ? buildViteResolveExtensions(nextConfig.pageExtensions, config.resolve?.extensions) : normalizeViteResolveExtensions(configuredExtensions);
 				config.resolve ??= {};
@@ -1130,6 +1402,7 @@ function vinext(options = {}) {
 			async configResolved(config) {
 				const cacheDirPrefix = getCacheDirPrefix(config.cacheDir);
 				typeofWindowIdFilter.exclude = new RegExp(`^${escapeRegExp(cacheDirPrefix)}`);
+				if (isServeCommand && hasCloudflarePlugin && hasPagesDir && !hasAppDir) suppressOptionalOptimizeDepsWarnings(config.logger);
 				sassComposesLoader.setResolvedConfig(config);
 				if (config.command === "build" && hasAppDir && hasPagesDir) {
 					const [appRoutes, pageRoutes, apiRoutes] = await Promise.all([
@@ -1203,78 +1476,94 @@ function vinext(options = {}) {
 					if (reactServerShim !== void 0) return resolveShimModulePath(_shimsDir, this.environment?.name === "rsc" ? `${reactServerShim}.react-server` : reactServerShim);
 				}
 			},
-			async load(id) {
-				if (id === RESOLVED_WORKER_ENTRY) return `export { default } from ${JSON.stringify(hasAppDir ? "vinext/server/app-router-entry" : "vinext/server/pages-router-entry")};`;
-				if (id === RESOLVED_SERVER_ENTRY) return await generateServerEntry$1();
-				if (id === RESOLVED_CLIENT_ENTRY) return await generateClientEntry$1();
-				if (id === RESOLVED_PAGES_CLIENT_ASSETS) return "export default { clientEntry: '/@id/__x00__virtual:vinext-client-entry' };";
-				if (id === RESOLVED_RSC_ENTRY && hasAppDir) {
-					const routes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
-					const metaRoutes = scanMetadataFiles(appDir);
-					const hasServerActions = await resolveHasServerActions(this.environment.config);
-					const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
-					const globalNotFoundPath = nextConfig?.globalNotFound ? findFileWithExts(appDir, "global-not-found", fileMatcher) : null;
-					rscClassificationManifest = collectRouteClassificationManifest(routes);
-					return generateRscEntry(appDir, routes, middlewarePath, metaRoutes, globalErrorPath, nextConfig?.basePath, nextConfig?.trailingSlash, {
-						redirects: nextConfig?.redirects,
-						rewrites: nextConfig?.rewrites,
-						headers: nextConfig?.headers,
-						allowedOrigins: nextConfig?.serverActionsAllowedOrigins,
-						allowedDevOrigins: nextConfig?.allowedDevOrigins,
-						bodySizeLimit: nextConfig?.serverActionsBodySizeLimit,
-						bodySizeLimitLabel: nextConfig?.serverActionsBodySizeLimitLabel,
-						htmlLimitedBots: nextConfig?.htmlLimitedBots,
-						clientTraceMetadata: nextConfig?.clientTraceMetadata,
-						assetPrefix: nextConfig?.assetPrefix,
-						expireTime: nextConfig?.expireTime,
-						reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
-						cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
-						inlineCss: nextConfig?.inlineCss,
-						globalNotFound: nextConfig?.globalNotFound,
-						cacheComponents: nextConfig?.cacheComponents,
-						hasServerActions,
-						i18n: nextConfig?.i18n,
-						imageConfig: {
-							deviceSizes: nextConfig?.images?.deviceSizes,
-							imageSizes: nextConfig?.images?.imageSizes,
-							qualities: nextConfig?.images?.qualities,
-							dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
-							dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
-							contentDispositionType: nextConfig?.images?.contentDispositionType,
-							contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
-						},
-						hasPagesDir,
-						publicFiles: scanPublicFileRoutes(root),
-						globalNotFoundPath,
-						draftModeSecret
-					}, instrumentationPath);
-				}
-				if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
-				if (id === RESOLVED_CACHE_ADAPTERS) return generateCacheAdaptersModule(options.cache);
-				if (id === RESOLVED_IMAGE_ADAPTERS) return generateImageAdaptersModule(options.images);
-				if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) return generateSsrEntry(hasPagesDir);
-				if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) {
-					const graph = await appRouteGraph(appDir, nextConfig?.pageExtensions, fileMatcher);
-					const pagesPrefetchRoutes = hasPagesDir ? [...(await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => ({
-						canPrefetchLoadingShell: false,
-						isDynamic: route.isDynamic,
-						patternParts: [...route.patternParts]
-					})), ...(await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => ({
-						canPrefetchLoadingShell: false,
-						documentOnly: true,
-						isDynamic: route.isDynamic,
-						patternParts: [...route.patternParts]
-					}))] : [];
-					return generateBrowserEntry(graph.routes, graph.routeManifest, pagesPrefetchRoutes, nextConfig.rewrites);
-				}
-				if (id === RESOLVED_APP_CAPABILITIES && hasAppDir) {
-					const hasServerActions = await resolveHasServerActions(this.environment.config);
-					return `
+			load: {
+				filter: { id: /virtual:vinext-/ },
+				async handler(id) {
+					if (id === RESOLVED_WORKER_ENTRY) return `export { default } from ${JSON.stringify(hasAppDir ? "vinext/server/app-router-entry" : "vinext/server/pages-router-entry")};`;
+					if (id === RESOLVED_SERVER_ENTRY) return await generateServerEntry$1();
+					if (id === RESOLVED_CLIENT_ENTRY) return await generateClientEntry$1();
+					if (id === RESOLVED_PAGES_CLIENT_ASSETS) {
+						const metadata = { clientEntry: DEV_PAGES_CLIENT_ENTRY };
+						const ssrManifest = {};
+						const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
+						const pagesRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+						const moduleFilePaths = [...appFilePath ? [appFilePath] : [], ...pagesRoutes.map((route) => route.filePath)];
+						for (const moduleFilePath of moduleFilePaths) {
+							const stylesheetAssets = await collectDevPagesAppStylesheetAssets(root, moduleFilePath, this.resolve.bind(this));
+							if (stylesheetAssets.length > 0) ssrManifest[normalizePathSeparators(moduleFilePath)] = stylesheetAssets;
+						}
+						if (Object.keys(ssrManifest).length > 0) metadata.ssrManifest = ssrManifest;
+						return `export default ${JSON.stringify(metadata)};`;
+					}
+					if (id === RESOLVED_RSC_ENTRY && hasAppDir) {
+						const routes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
+						const metaRoutes = scanMetadataFiles(appDir);
+						const hasServerActions = await resolveHasServerActions(this.environment.config);
+						const globalErrorPath = findFileWithExts(appDir, "global-error", fileMatcher);
+						const globalNotFoundPath = nextConfig?.globalNotFound ? findFileWithExts(appDir, "global-not-found", fileMatcher) : null;
+						rscClassificationManifest = collectRouteClassificationManifest(routes);
+						return generateRscEntry(appDir, routes, middlewarePath, metaRoutes, globalErrorPath, nextConfig?.basePath, nextConfig?.trailingSlash, {
+							redirects: nextConfig?.redirects,
+							rewrites: nextConfig?.rewrites,
+							headers: nextConfig?.headers,
+							allowedOrigins: nextConfig?.serverActionsAllowedOrigins,
+							allowedDevOrigins: nextConfig?.allowedDevOrigins,
+							bodySizeLimit: nextConfig?.serverActionsBodySizeLimit,
+							bodySizeLimitLabel: nextConfig?.serverActionsBodySizeLimitLabel,
+							htmlLimitedBots: nextConfig?.htmlLimitedBots,
+							clientTraceMetadata: nextConfig?.clientTraceMetadata,
+							assetPrefix: nextConfig?.assetPrefix,
+							expireTime: nextConfig?.expireTime,
+							reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
+							cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
+							inlineCss: nextConfig?.inlineCss,
+							globalNotFound: nextConfig?.globalNotFound,
+							cacheComponents: nextConfig?.cacheComponents,
+							prefetchInlining: nextConfig?.prefetchInlining,
+							hasServerActions,
+							i18n: nextConfig?.i18n,
+							imageConfig: {
+								deviceSizes: nextConfig?.images?.deviceSizes,
+								imageSizes: nextConfig?.images?.imageSizes,
+								qualities: nextConfig?.images?.qualities,
+								dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
+								dangerouslyAllowLocalIP: nextConfig?.images?.dangerouslyAllowLocalIP,
+								contentDispositionType: nextConfig?.images?.contentDispositionType,
+								contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy
+							},
+							hasPagesDir,
+							publicFiles: scanPublicFileRoutes(root),
+							globalNotFoundPath,
+							draftModeSecret
+						}, instrumentationPath);
+					}
+					if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
+					if (id === RESOLVED_CACHE_ADAPTERS) return generateCacheAdaptersModule(options.cache);
+					if (id === RESOLVED_IMAGE_ADAPTERS) return generateImageAdaptersModule(options.images);
+					if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) return generateSsrEntry(hasPagesDir);
+					if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) {
+						const graph = await appRouteGraph(appDir, nextConfig?.pageExtensions, fileMatcher);
+						const pagesPrefetchRoutes = hasPagesDir ? [...(await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => ({
+							canPrefetchLoadingShell: false,
+							isDynamic: route.isDynamic,
+							patternParts: [...route.patternParts]
+						})), ...(await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => ({
+							canPrefetchLoadingShell: false,
+							documentOnly: true,
+							isDynamic: route.isDynamic,
+							patternParts: [...route.patternParts]
+						}))] : [];
+						return generateBrowserEntry(graph.routes, graph.routeManifest, pagesPrefetchRoutes, nextConfig.rewrites);
+					}
+					if (id === RESOLVED_APP_CAPABILITIES && hasAppDir) {
+						const hasServerActions = await resolveHasServerActions(this.environment.config);
+						return `
 export const hasServerActions = ${JSON.stringify(hasServerActions)};
 export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.stringify(_appBrowserServerActionClientPath)})` : "null"};
 `;
+					}
+					if (id.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
 				}
-				if (id.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
 			},
 			// @vitejs/plugin-rsc runs the RSC environment build in two phases:
 			renderChunk: {
@@ -1360,7 +1649,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				if (!hasAppDir || name !== "rsc" && name !== "ssr") return null;
 				const output = getBuildBundlerOptions(config.build)?.output;
 				if (Array.isArray(output) || output?.assetFileNames !== void 0) return null;
-				return { build: { ...withBuildBundlerOptions(viteMajorVersion, { output: { assetFileNames: createClientAssetFileNames(resolveAssetsDir(nextConfig.assetPrefix ?? "")) } }) } };
+				return { build: { ...withBuildBundlerOptions({ output: { assetFileNames: createClientAssetFileNames(resolveAssetsDir(nextConfig.assetPrefix ?? "")) } }) } };
 			}
 		},
 		{
@@ -1410,13 +1699,19 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		{
 			name: "vinext:instrumentation-client-inject",
 			enforce: "pre",
-			resolveId(id) {
-				if (id !== VIRTUAL_INSTRUMENTATION_CLIENT) return null;
-				return clientInjectModule !== null ? RESOLVED_INSTRUMENTATION_CLIENT : null;
+			resolveId: {
+				filter: { id: /^private-next-instrumentation-client$/ },
+				handler(id) {
+					if (id !== VIRTUAL_INSTRUMENTATION_CLIENT) return null;
+					return clientInjectModule !== null ? RESOLVED_INSTRUMENTATION_CLIENT : null;
+				}
 			},
-			load(id) {
-				if (id !== RESOLVED_INSTRUMENTATION_CLIENT) return null;
-				return clientInjectModule;
+			load: {
+				filter: { id: /private-next-instrumentation-client\.mjs$/ },
+				handler(id) {
+					if (id !== RESOLVED_INSTRUMENTATION_CLIENT) return null;
+					return clientInjectModule;
+				}
 			}
 		},
 		...options.experimental?.clientReferenceDedup ? [clientReferenceDedupPlugin()] : [],
@@ -1447,17 +1742,23 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		{
 			name: "vinext:react-canary",
 			enforce: "pre",
-			resolveId(id) {
-				if (id === "virtual:vinext-react-canary") return "\0virtual:vinext-react-canary";
+			resolveId: {
+				filter: { id: /^virtual:vinext-react-canary$/ },
+				handler(id) {
+					if (id === "virtual:vinext-react-canary") return "\0virtual:vinext-react-canary";
+				}
 			},
-			load(id) {
-				if (id === "\0virtual:vinext-react-canary") return [
-					`export * from "react";`,
-					`export { default } from "react";`,
-					`import * as _React from "react";`,
-					`export const ViewTransition = _React.ViewTransition || function ViewTransition({ children }) { return children; };`,
-					`export const addTransitionType = _React.addTransitionType || function addTransitionType() {};`
-				].join("\n");
+			load: {
+				filter: { id: /^\u0000virtual:vinext-react-canary$/ },
+				handler(id) {
+					if (id === "\0virtual:vinext-react-canary") return [
+						`export * from "react";`,
+						`export { default } from "react";`,
+						`import * as _React from "react";`,
+						`export const ViewTransition = _React.ViewTransition || function ViewTransition({ children }) { return children; };`,
+						`export const addTransitionType = _React.addTransitionType || function addTransitionType() {};`
+					].join("\n");
+				}
 			},
 			transform: {
 				filter: {
@@ -1478,7 +1779,32 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		{
 			name: "vinext:pages-router",
 			hotUpdate(options) {
-				if (!hasPagesDir || hasAppDir) return;
+				if (!hasPagesDir) return;
+				const isPagesAppFile = (filePath) => {
+					const relativePath = normalizePathSeparators(path.relative(pagesDir, filePath));
+					return !relativePath.includes("/") && relativePath.startsWith("_app.") && fileMatcher.extensionRegex.test(filePath);
+				};
+				const isPotentialPagesAssetGraphScript = (filePath) => {
+					const cleanPath = stripViteModuleQuery(filePath);
+					if (!path.isAbsolute(cleanPath)) return false;
+					if (!isScriptModuleId(cleanPath) || cleanPath.endsWith(".d.ts")) return false;
+					const relativeRootPath = normalizePathSeparators(path.relative(root, cleanPath));
+					if (relativeRootPath.startsWith("..") || path.isAbsolute(relativeRootPath)) return false;
+					if (relativeRootPath.includes("/node_modules/") || relativeRootPath.startsWith("node_modules/")) return false;
+					const relativeAppPath = normalizePathSeparators(path.relative(appDir, cleanPath));
+					return relativeAppPath.startsWith("..") || path.isAbsolute(relativeAppPath);
+				};
+				const pagesAppChanged = isPagesAppFile(options.file);
+				const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(options.file);
+				if (pagesAppChanged || STYLESHEET_FILE_RE.test(options.file) || pagesAssetGraphScriptChanged) for (const env of Object.values(options.server.environments)) {
+					const mod = env.moduleGraph.getModuleById(RESOLVED_PAGES_CLIENT_ASSETS);
+					if (mod) env.moduleGraph.invalidateModule(mod);
+				}
+				if (pagesAppChanged || !hasAppDir && pagesAssetGraphScriptChanged) {
+					options.server.ws.send({ type: "full-reload" });
+					return [];
+				}
+				if (hasAppDir) return;
 				if (options.file.startsWith(pagesDir) && fileMatcher.extensionRegex.test(options.file)) {
 					options.server.environments.client.hot.send({ type: "full-reload" });
 					return [];
@@ -1531,6 +1857,14 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					pagesRunner?.clearCache();
 				}
+				function invalidatePagesClientAssetsModule(reloadDocument = false) {
+					for (const env of Object.values(server.environments)) {
+						const mod = env.moduleGraph.getModuleById(RESOLVED_PAGES_CLIENT_ASSETS);
+						if (mod) env.moduleGraph.invalidateModule(mod);
+					}
+					pagesRunner?.clearCache();
+					if (reloadDocument) server.ws.send({ type: "full-reload" });
+				}
 				function invalidateAppRoutingModules() {
 					invalidateAppRouteCache();
 					invalidateMetadataFileCache();
@@ -1578,6 +1912,20 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				}
 				let appRouteTypeGeneration = null;
 				let appRouteTypeGenerationPending = false;
+				function isPagesAppFile(filePath) {
+					const relativePath = normalizePathSeparators(path.relative(pagesDir, filePath));
+					return !relativePath.includes("/") && relativePath.startsWith("_app.") && fileMatcher.extensionRegex.test(filePath);
+				}
+				function isPotentialPagesAssetGraphScript(filePath) {
+					const cleanPath = stripViteModuleQuery(filePath);
+					if (!path.isAbsolute(cleanPath)) return false;
+					if (!isScriptModuleId(cleanPath) || cleanPath.endsWith(".d.ts")) return false;
+					const relativeRootPath = normalizePathSeparators(path.relative(root, cleanPath));
+					if (relativeRootPath.startsWith("..") || path.isAbsolute(relativeRootPath)) return false;
+					if (relativeRootPath.includes("/node_modules/") || relativeRootPath.startsWith("node_modules/")) return false;
+					const relativeAppPath = normalizePathSeparators(path.relative(appDir, cleanPath));
+					return relativeAppPath.startsWith("..") || path.isAbsolute(relativeAppPath);
+				}
 				function warnRouteTypeGenerationFailure(error) {
 					server.config.logger.warn(`[vinext] Failed to regenerate route types: ${error instanceof Error ? error.message : String(error)}`);
 				}
@@ -1606,6 +1954,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				});
 				server.watcher.on("add", (filePath) => {
 					let routeChanged = false;
+					const pagesAppChanged = isPagesAppFile(filePath);
+					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
+					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule(pagesAppChanged || !hasAppDir && pagesAssetGraphScriptChanged);
 					if (hasPagesDir && filePath.startsWith(pagesDir) && pageExtensions.test(filePath)) {
 						invalidateRouteCache(pagesDir);
 						routeChanged = true;
@@ -1621,8 +1972,16 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						revalidateHybridRoutes();
 					}
 				});
+				server.watcher.on("change", (filePath) => {
+					const pagesAppChanged = isPagesAppFile(filePath);
+					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
+					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule(pagesAppChanged || !hasAppDir && pagesAssetGraphScriptChanged);
+				});
 				server.watcher.on("unlink", (filePath) => {
 					let routeChanged = false;
+					const pagesAppChanged = isPagesAppFile(filePath);
+					const pagesAssetGraphScriptChanged = isPotentialPagesAssetGraphScript(filePath);
+					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule(pagesAppChanged || !hasAppDir && pagesAssetGraphScriptChanged);
 					if (hasPagesDir && filePath.startsWith(pagesDir) && pageExtensions.test(filePath)) {
 						invalidateRouteCache(pagesDir);
 						routeChanged = true;
@@ -1774,8 +2133,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								res.end("Forbidden");
 								return;
 							}
+							const requestHost = (Array.isArray(req.headers.host) ? req.headers.host[0] : req.headers.host) || "localhost";
+							const requestOrigin = `http://${requestHost}`;
+							const getUrlHostname = (requestUrl) => new URL(requestUrl).hostname;
 							if (isImageOptimizationPath(url.split("?")[0])) {
-								const encodedLocation = resolveDevImageRedirect(new URL(url, `http://${req.headers.host || "localhost"}`), [...nextConfig.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...nextConfig.images?.imageSizes ?? DEFAULT_IMAGE_SIZES], nextConfig.images?.qualities);
+								const encodedLocation = resolveDevImageRedirect(new URL(url, requestOrigin), [...nextConfig.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...nextConfig.images?.imageSizes ?? DEFAULT_IMAGE_SIZES], nextConfig.images?.qualities);
 								if (!encodedLocation) {
 									res.writeHead(400);
 									res.end("Invalid image optimization parameters");
@@ -1806,6 +2168,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
 								url = pathname + qs;
 							}
+							const capturedMiddlewarePath = middlewarePath;
 							const bp = nextConfig?.basePath ?? "";
 							if (bp && pathname.startsWith(bp)) {
 								const stripped = pathname.slice(bp.length) || "/";
@@ -1830,8 +2193,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								if (dataMatch) {
 									isDataReq = true;
 									const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-									url = dataMatch.pagePathname + qs;
-									pathname = dataMatch.pagePathname;
+									const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, capturedMiddlewarePath !== null && nextConfig?.trailingSlash === true);
+									url = pagePathname + qs;
+									pathname = pagePathname;
 									req.url = url;
 								} else {
 									const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
@@ -1850,13 +2214,21 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								basePath: bp,
 								hadBasePath: true
 							}));
-							if (pathname.includes(".") && !pathname.endsWith(".html") && !filePathMatchesRewrite) return next();
+							const isFilePathRequest = pathname.includes(".") && !pathname.endsWith(".html");
+							let filePathMatchesPagesRoute = false;
+							const requestHostname = getUrlHostname(requestOrigin);
+							if (isFilePathRequest && !filePathMatchesRewrite) {
+								const [pageRoutes, apiRoutes] = await Promise.all([pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher), apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)]);
+								const pageRouteUrl = nextConfig?.i18n ? resolvePagesI18nRequest(pathname, nextConfig.i18n, req.headers, requestHostname, bp, nextConfig.trailingSlash ?? false).url : pathname;
+								const apiRouteUrl = stripI18nLocaleForApiRoute(pathname, nextConfig?.i18n ?? null);
+								filePathMatchesPagesRoute = matchRoute(pageRouteUrl, pageRoutes) !== null || matchRoute(apiRouteUrl, apiRoutes) !== null;
+							}
+							if (isFilePathRequest && !filePathMatchesRewrite && !filePathMatchesPagesRoute) return next();
 							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
 							const isDataRequest = isDataReq;
 							const nodeRequestHeaders = filterInternalHeaders(rawHeaders);
 							for (const header of INTERNAL_HEADERS) delete req.headers[header];
 							for (const header of VINEXT_INTERNAL_HEADERS) delete req.headers[header];
-							const requestOrigin = `http://${req.headers.host || "localhost"}`;
 							const method = req.method ?? "GET";
 							const webRequest = new Request(new URL(url, requestOrigin), {
 								method,
@@ -1866,10 +2238,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								for (const key of Object.keys(req.headers)) delete req.headers[key];
 								for (const [key, value] of nextRequestHeaders) req.headers[key] = value;
 							};
-							const capturedMiddlewarePath = middlewarePath;
 							const devRunMiddlewareAdapter = capturedMiddlewarePath ? async (_request, _ctx, opts) => {
 								const rawProto = process.env.VINEXT_TRUST_PROXY === "1" || (process.env.VINEXT_TRUSTED_HOSTS ?? "").split(",").some((h) => h.trim()) ? String(req.headers["x-forwarded-proto"] || "").split(",")[0].trim() : "";
-								const mwOrigin = `${rawProto === "https" || rawProto === "http" ? rawProto : "http"}://${req.headers.host || "localhost"}`;
+								const mwOrigin = `${rawProto === "https" || rawProto === "http" ? rawProto : "http"}://${requestHost}`;
 								const middlewareRequest = new Request(new URL(url, mwOrigin), {
 									method: req.method,
 									headers: nodeRequestHeaders
@@ -1890,6 +2261,18 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								return result;
 							} : null;
 							const devPageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+							const devPageRouteDataKinds = /* @__PURE__ */ new Map();
+							const classifyDevPageRoute = (route) => {
+								const cached = devPageRouteDataKinds.get(route.filePath);
+								if (cached) return cached;
+								let dataKind = "none";
+								try {
+									const source = fs.readFileSync(route.filePath, "utf8");
+									dataKind = hasExportedName(source, "getStaticProps") ? "static" : hasExportedName(source, "getServerSideProps") ? "server" : "none";
+								} catch {}
+								devPageRouteDataKinds.set(route.filePath, dataKind);
+								return dataKind;
+							};
 							const pipelineResult = await runPagesRequest(webRequest, {
 								basePath: bp,
 								trailingSlash: nextConfig?.trailingSlash ?? false,
@@ -1908,8 +2291,9 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								rawSearch: url.includes("?") ? url.slice(url.indexOf("?")) : "",
 								runMiddleware: devRunMiddlewareAdapter,
 								matchPageRoute: (resolvedPathname, request) => {
-									const m = matchRoute(nextConfig?.i18n ? resolvePagesI18nRequest(resolvedPathname, nextConfig.i18n, request.headers, new URL(request.url).hostname, bp, nextConfig.trailingSlash ?? false).url : resolvedPathname, devPageRoutes);
+									const m = matchRoute(nextConfig?.i18n ? resolvePagesI18nRequest(resolvedPathname, nextConfig.i18n, request.headers, getUrlHostname(request.url), bp, nextConfig.trailingSlash ?? false).url : resolvedPathname, devPageRoutes);
 									return m ? { route: {
+										dataKind: classifyDevPageRoute(m.route),
 										isDynamic: m.route.isDynamic,
 										pattern: m.route.pattern
 									} } : null;
@@ -1980,7 +2364,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								}
 								if (!cachedSSRHandler || cachedSSRHandler.routes !== routes) cachedSSRHandler = {
 									routes,
-									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots)
+									handler: createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots, nextConfig?.reactStrictMode === true)
 								};
 								flushStagedHeaders();
 								flushRequestHeaders();
@@ -2114,6 +2498,18 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				return { define: serverDefines };
 			}
 		},
+		{
+			name: "vinext:client-global-define",
+			configEnvironment(name) {
+				if (name !== "client") return null;
+				if (Object.hasOwn(nextConfig.compilerDefine, "global")) return null;
+				const define = { global: "globalThis" };
+				return {
+					define,
+					optimizeDeps: { rolldownOptions: { transform: { define } } }
+				};
+			}
+		},
 		{
 			name: "vinext:image-imports",
 			enforce: "pre",
@@ -2692,6 +3088,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 	];
 	if (rscPluginPromise) {
 		plugins.push(rscPluginPromise);
+		plugins.push(createRscReferenceValidationNormalizerPlugin());
 		plugins.push(createRscClientReferenceLoadersPlugin());
 	}
 	return plugins;