vinext 0.2.1 → 1.0.0-beta.0

package/dist/index.js

@@ -31,14 +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 { 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";
@@ -74,7 +73,7 @@ import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, setPagesClien
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
 import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassCssUrlAssetImporter, createSassTildeImporter } from "./plugins/sass.js";
-import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.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";
@@ -85,12 +84,13 @@ 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";
@@ -159,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",
@@ -453,18 +448,98 @@ function suppressOptionalOptimizeDepsWarnings(logger) {
 	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";
@@ -601,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;
@@ -774,7 +846,6 @@ function vinext(options = {}) {
 		return mdxDelegatePromise;
 	}
 	const plugins = [
-		...viteMajorVersion >= 8 ? [] : [loadVite7TsconfigPathsPlugin(earlyBaseDir)],
 		createStyledJsxPlugin(earlyBaseDir),
 		reactPluginPromise,
 		createIgnoreDynamicRequestsPlugin(() => nextConfig?.turbopackTranspilePackages ?? []),
@@ -795,7 +866,7 @@ function vinext(options = {}) {
 				}
 			}
 		},
-		...viteMajorVersion >= 8 ? [{
+		{
 			name: "vinext:jsx-in-js",
 			enforce: "pre",
 			transform: {
@@ -818,7 +889,7 @@ function vinext(options = {}) {
 					};
 				}
 			}
-		}] : [],
+		},
 		createMiddlewareServerOnlyPlugin({
 			getMiddlewarePath: () => middlewarePath,
 			getCanonicalMiddlewarePath: () => middlewarePath ? tryRealpathSync(middlewarePath) ?? middlewarePath : null,
@@ -834,13 +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;
@@ -1053,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) => {
@@ -1064,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: {
@@ -1087,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",
@@ -1102,13 +1180,10 @@ function vinext(options = {}) {
 						],
 						...shouldEnableNativeTsconfigPaths ? { tsconfigPaths: true } : {}
 					},
-					...viteMajorVersion >= 8 ? { oxc: {
+					oxc: {
 						jsx: { runtime: "automatic" },
 						typescript: { onlyRemoveTypeImports: false }
-					} } : { esbuild: {
-						jsx: "automatic",
-						tsconfigRaw: { compilerOptions: { verbatimModuleSyntax: false } }
-					} },
+					},
 					define: defines,
 					...nextConfig.basePath ? { base: nextConfig.basePath + "/" } : {},
 					...nextConfig.assetPrefix || nextConfig.deploymentId ? { experimental: { renderBuiltUrl: (filename, context) => renderVinextBuiltUrl(filename, nextConfig.assetPrefix, nextConfig.deploymentId, context.hostType) } } : {},
@@ -1156,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 } : {},
@@ -1193,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()
 								})
 							}
 						},
@@ -1215,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: {
@@ -1237,10 +1312,10 @@ function vinext(options = {}) {
 								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()
 								})
 							}
 						}
@@ -1255,10 +1330,10 @@ function vinext(options = {}) {
 						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()
 						})
 					}
 				} };
@@ -1274,10 +1349,10 @@ function vinext(options = {}) {
 							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()
 							})
 						}
 					},
@@ -1298,7 +1373,7 @@ function vinext(options = {}) {
 						},
 						build: {
 							outDir: "dist/server",
-							...withBuildBundlerOptions(viteMajorVersion, {
+							...withBuildBundlerOptions({
 								input: { index: VIRTUAL_SERVER_ENTRY },
 								output: { entryFileNames: "entry.js" }
 							})
@@ -1401,91 +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) {
-					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;
+			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 (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 `
+					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: {
@@ -1571,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 ?? "")) } }) } };
 			}
 		},
 		{
@@ -1621,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()] : [],
@@ -1658,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: {
@@ -2408,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",