vinext 0.2.1 → 1.0.0-beta.1

package/dist/index.js

@@ -1,7 +1,6 @@
+import path, { toSlash } from "./deps/.pnpm/pathslash@0.1.0/deps/pathslash/dist/index.js";
 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 { 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";
@@ -21,6 +20,7 @@ import { logRequest, now } from "./server/request-log.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 { getPagesPreviewModeId } from "./server/pages-preview.js";
 import { createSSRHandler } from "./server/dev-server.js";
 import { handleApiRoute } from "./server/api-handler.js";
 import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, resolveDevImageRedirect } from "./server/image-optimization.js";
@@ -31,15 +31,14 @@ 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 { VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY, createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
 import { mergeServerExternalPackages } from "./config/server-external-packages.js";
 import { precompressAssets } from "./build/precompress.js";
 import { ensureAssetsIgnore } from "./build/assets-ignore.js";
@@ -60,6 +59,7 @@ import { createInstrumentationClientTransformPlugin } from "./plugins/instrument
 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 { stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { validateMiddlewareModuleExports } from "./plugins/middleware-export-validation.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
@@ -71,10 +71,12 @@ import { createServerExternalsManifestPlugin } from "./plugins/server-externals-
 import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
 import { computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
 import { PAGES_CLIENT_ASSETS_MODULE, buildPagesClientAssetsModule, setPagesClientAssetsBuildMetadata, takePagesClientAssetsBuildMetadata, writePagesClientAssetsModuleIfMissing } from "./build/pages-client-assets-module.js";
+import { createPreviewBuildCredentials, getPreviewBuildCredentials } from "./build/preview-credentials.js";
+import { createModuleDependencyCache } from "./build/module-dependency-cache.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
 import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassCssUrlAssetImporter, createSassTildeImporter } 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,14 +87,14 @@ 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 { createHash, randomBytes } from "node:crypto";
 import commonjs from "vite-plugin-commonjs";
 import MagicString from "magic-string";
 //#region src/index.ts
@@ -109,10 +111,6 @@ const OPTIONAL_OPTIMIZE_DEPS_WARNING_RE = /Failed to resolve dependency: .*use-s
 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);
-	return normalizedCacheDir.endsWith("/") ? normalizedCacheDir : `${normalizedCacheDir}/`;
-}
 function isInsideDirectory(dir, filePath) {
 	const relativePath = path.relative(dir, filePath);
 	return relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath);
@@ -159,32 +157,28 @@ 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",
 		".tsx",
 		".js"
 	]) {
-		const candidate = path.posix.join(shimsDir, `${moduleName}${ext}`);
+		const candidate = path.join(shimsDir, `${moduleName}${ext}`);
 		if (fs.existsSync(candidate)) return candidate;
 	}
-	return path.posix.join(shimsDir, `${moduleName}.js`);
+	return path.join(shimsDir, `${moduleName}.js`);
 }
 function isVercelOgImport(id) {
 	return id === "@vercel/og" || id === "@vercel/og.js";
 }
 function isVinextOgShimImporter(importer) {
 	if (!importer) return false;
-	const normalizedImporter = (importer.startsWith("\0") ? importer.slice(1) : importer).split("?")[0].replace(/\\/g, "/");
+	const cleanImporter = (importer.startsWith("\0") ? importer.slice(1) : importer).split("?")[0];
+	const normalizedImporter = toSlash(cleanImporter);
 	return normalizedImporter.endsWith("/shims/og.tsx") || normalizedImporter.endsWith("/shims/og.js") || normalizedImporter.endsWith("/dist/shims/og.js");
 }
 function toRelativeFileEntry(root, absPath) {
-	return path.relative(root, absPath).split(path.sep).join("/");
+	return path.relative(root, absPath);
 }
 const DEV_PAGES_CLIENT_ENTRY = "/@id/__x00__virtual:vinext-client-entry";
 const STYLESHEET_IMPORT_RE = /\.(?:css|scss|sass)$/i;
@@ -248,7 +242,7 @@ function isScriptModuleId(id) {
 	return SCRIPT_IMPORT_RE.test(stripViteModuleQuery(id).toLowerCase());
 }
 function skipCommonjsForLocalCjs(id) {
-	const cleanId = normalizePathSeparators(stripViteModuleQuery(id));
+	const cleanId = toSlash(stripViteModuleQuery(id));
 	return /\.c[jt]s$/i.test(cleanId) && !cleanId.includes("node_modules") ? false : void 0;
 }
 function hasOnlyTypeSpecifiers(statement) {
@@ -260,24 +254,37 @@ function resolvedStylesheetToDevManifestAsset(root, resolvedId) {
 	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(/^\/+/, "")}`;
+	if (relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath)) return relativePath;
+	return `@fs/${toSlash(cleanId).replace(/^\/+/, "")}`;
 }
-async function collectDevPagesAppStylesheetAssets(root, appFilePath, resolve) {
+async function collectDevPagesAppStylesheetAssets(appFilePath, getModuleDependencies) {
 	const stylesheetAssets = [];
 	const seenAssets = /* @__PURE__ */ new Set();
 	const seenModules = /* @__PURE__ */ new Set();
 	async function visitModule(modulePath) {
+		if (seenModules.has(modulePath)) return;
+		seenModules.add(modulePath);
+		for (const dependency of await getModuleDependencies(modulePath)) if (dependency.type === "stylesheet") {
+			if (seenAssets.has(dependency.asset)) continue;
+			seenAssets.add(dependency.asset);
+			stylesheetAssets.push(dependency.asset);
+		} else await visitModule(dependency.id);
+	}
+	await visitModule(appFilePath);
+	return stylesheetAssets;
+}
+function createDevPagesModuleDependencyReader(root, resolve) {
+	return createModuleDependencyCache(collectModuleDependencies);
+	async function collectModuleDependencies(modulePath) {
 		const cleanModulePath = stripViteModuleQuery(modulePath);
-		if (!path.isAbsolute(cleanModulePath) || !fs.existsSync(cleanModulePath)) return;
-		if (seenModules.has(cleanModulePath)) return;
-		seenModules.add(cleanModulePath);
+		if (!path.isAbsolute(cleanModulePath) || !fs.existsSync(cleanModulePath)) return [];
 		let ast;
 		try {
 			ast = parseAst(fs.readFileSync(cleanModulePath, "utf-8"), { lang: parserLanguageForScript(cleanModulePath) });
 		} catch {
-			return;
+			return [];
 		}
+		const dependencies = [];
 		for (const statement of ast.body) {
 			if (statement.type !== "ImportDeclaration" && statement.type !== "ExportNamedDeclaration" && statement.type !== "ExportAllDeclaration") continue;
 			if (statement.importKind === "type") continue;
@@ -290,17 +297,17 @@ async function collectDevPagesAppStylesheetAssets(root, appFilePath, resolve) {
 			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);
+				if (asset) dependencies.push({
+					type: "stylesheet",
+					asset
+				});
+			} else if (!specifier.includes("?") && !specifier.includes("#") && isScriptModuleId(resolved.id)) dependencies.push({
+				type: "script",
+				id: resolved.id
+			});
 		}
+		return dependencies;
 	}
-	await visitModule(appFilePath);
-	return stylesheetAssets;
 }
 const TSCONFIG_FILES = ["tsconfig.json", "jsconfig.json"];
 function resolveTsconfigPathCandidate(candidate) {
@@ -358,11 +365,11 @@ function materializeTsconfigPathAliases(pathsConfig, baseUrl, projectRoot) {
 	return aliases;
 }
 function toViteAliasReplacement(absolutePath, projectRoot) {
-	const normalizedPath = absolutePath.replace(/\\/g, "/");
-	const rootCandidates = new Set([projectRoot]);
+	const normalizedPath = toSlash(absolutePath);
+	const rootCandidates = /* @__PURE__ */ new Set([projectRoot]);
 	const realRoot = tryRealpathSync(projectRoot);
 	if (realRoot) rootCandidates.add(realRoot);
-	const pathCandidates = new Set([absolutePath]);
+	const pathCandidates = /* @__PURE__ */ new Set([absolutePath]);
 	const realPath = tryRealpathSync(absolutePath);
 	if (realPath) pathCandidates.add(realPath);
 	for (const rootCandidate of rootCandidates) for (const pathCandidate of pathCandidates) {
@@ -383,7 +390,7 @@ function resolveSwcHelpersAlias(root) {
 	resolvers.push(rootRequire, createRequire(import.meta.url));
 	for (const resolver of resolvers) try {
 		const packageJsonPath = resolver.resolve("@swc/helpers/package.json");
-		return normalizePathSeparators(path.join(path.dirname(packageJsonPath), "_"));
+		return path.join(path.dirname(packageJsonPath), "_");
 	} catch {}
 }
 function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */ new Set()) {
@@ -437,7 +444,7 @@ function getVinextVersion() {
 	return _vinextVersionCache;
 }
 function mergeStringArrayValues(value, additions) {
-	return [...new Set([...value === void 0 ? [] : Array.isArray(value) ? value : [value], ...additions])];
+	return [.../* @__PURE__ */ new Set([...value === void 0 ? [] : Array.isArray(value) ? value : [value], ...additions])];
 }
 function stripAnsi(value) {
 	return value.replace(ANSI_ESCAPE_RE, "");
@@ -453,18 +460,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";
@@ -504,14 +591,14 @@ function createStaticImageAsset(imagePath) {
 	};
 }
 /**
-* Absolute path to vinext's shims directory, with a trailing slash. Normalized
-* to forward slashes because it is prefix-matched against Vite module ids (which
-* Vite always normalizes to forward slashes) in the font plugins and
-* clientManualChunks — a raw path.resolve value has backslashes on Windows and
-* the `id.startsWith(_shimsDir)` checks would never match.
+* Absolute path to vinext's shims directory, with a trailing slash. Forward
+* slashes are guaranteed by pathslash's `path.resolve`, matching the Vite
+* module ids (always forward-slash) that the `id.startsWith(_shimsDir)`
+* prefix checks in the font plugins and clientManualChunks compare against.
+* The trailing "/" keeps those prefix checks directory-exact.
 */
-const _shimsDir = normalizePathSeparators(path.resolve(__dirname, "shims")) + "/";
-const _serverDir = normalizePathSeparators(path.resolve(__dirname, "server"));
+const _shimsDir = path.resolve(__dirname, "shims") + "/";
+const _serverDir = path.resolve(__dirname, "server");
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
 const _appBrowserServerActionClientPath = resolveShimModulePath(_serverDir, "app-browser-server-action-client");
 const _appRscHandlerPath = resolveShimModulePath(_serverDir, "app-rsc-handler");
@@ -522,8 +609,8 @@ function isValidExportIdentifier(name) {
 }
 function isVirtualEntryFacade(id, virtualId) {
 	if (!id) return false;
-	const cleanId = id.startsWith("\0") ? id.slice(1) : id;
-	return cleanId === virtualId || cleanId.endsWith("/" + virtualId) || cleanId.endsWith("\\" + virtualId);
+	const cleanId = toSlash(id.startsWith("\0") ? id.slice(1) : id);
+	return cleanId === virtualId || cleanId.endsWith("/" + virtualId);
 }
 /**
 * Returns the leading React `"use client"` or `"use server"` directive after
@@ -594,29 +681,26 @@ function generateRootParamsModule(rootParamNames) {
 *   1. Create `<name>.react-server.ts` in src/shims/
 *   2. Add entries here for each import specifier.
 */
-const _reactServerShims = new Map([
+const _reactServerShims = /* @__PURE__ */ new Map([
 	["next/navigation", "navigation"],
 	["next/navigation.js", "navigation"],
 	["next/dist/client/components/navigation", "navigation"],
 	["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 = {}) {
+	const { supportsNativeTypeofWindowFolding: useNativeTypeofWindowFolding } = assertSupportedViteVersion();
 	const prerenderConfig = normalizeVinextPrerenderConfig(options.prerender);
-	const viteMajorVersion = getViteMajorVersion();
 	let root;
 	let pagesDir;
 	let canonicalPagesDir;
@@ -634,17 +718,18 @@ function vinext(options = {}) {
 	let hasCloudflarePlugin = false;
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
+	let nitroTraceDepsFromServerExternals = [];
 	let isServeCommand = false;
 	let pagesOptimizeEntries = [];
 	const pagesClientAssetsOutputDirs = /* @__PURE__ */ new Set();
 	let pagesClientAssetsModule = null;
 	let rscCompatibilityId;
-	const draftModeSecret = randomUUID();
+	let draftModeSecret = getPagesPreviewModeId();
+	let previewBuildCredentials;
 	const sassComposesLoader = createSassAwareFileSystemLoader();
-	const typeofWindowIdFilter = { exclude: /(?!)/ };
 	let rscClassificationManifest = null;
-	const shimsDir = normalizePathSeparators(path.resolve(__dirname, "shims"));
-	const canonicalize = (p) => normalizePathSeparators(tryRealpathSync(p) ?? p);
+	const shimsDir = path.resolve(__dirname, "shims");
+	const canonicalize = (p) => toSlash(tryRealpathSync(p) ?? p);
 	const pageTransformCanonicalPaths = /* @__PURE__ */ new Map();
 	const canonicalizePageTransformPath = (modulePath) => {
 		const cached = pageTransformCanonicalPaths.get(modulePath);
@@ -729,11 +814,32 @@ function vinext(options = {}) {
 		if (!pluginApi || pluginApi.manager.isScanBuild) return true;
 		return Object.keys(pluginApi.manager.serverReferenceMetaMap).length > 0;
 	}
-	const reactOptions = options.react && options.react !== true ? options.react : void 0;
+	const configuredReactOptions = options.react && options.react !== true ? options.react : void 0;
+	const reactOptions = configuredReactOptions;
 	let reactPluginPromise = null;
 	if (options.react !== false) {
 		if (!resolvedReactPath) throw new Error("vinext: @vitejs/plugin-react is not installed.\nRun: " + detectPackageManager(process.cwd()) + " @vitejs/plugin-react");
-		reactPluginPromise = import(pathToFileURL(resolvedReactPath).href).then((mod) => mod.default(reactOptions)).catch((cause) => {
+		reactPluginPromise = import(pathToFileURL(resolvedReactPath).href).then((mod) => {
+			const react = mod.default;
+			const limitToCommand = (plugin, command) => {
+				const originalApply = plugin.apply;
+				return {
+					...plugin,
+					apply(config, env) {
+						if (env.command !== command) return false;
+						if (!originalApply) return true;
+						if (typeof originalApply === "function") return originalApply(config, env);
+						return originalApply === env.command;
+					}
+				};
+			};
+			const buildPlugins = react(reactOptions).map((plugin) => limitToCommand(plugin, "build"));
+			const servePlugins = react(configuredReactOptions !== void 0 && Object.prototype.hasOwnProperty.call(configuredReactOptions, "include") ? reactOptions : {
+				...reactOptions,
+				include: /\.(?:[tj]sx?|mdx)$/i
+			}).map((plugin) => limitToCommand(plugin, "serve"));
+			return [...buildPlugins, ...servePlugins];
+		}).catch((cause) => {
 			throw new Error("vinext: Failed to load @vitejs/plugin-react.", { cause });
 		});
 	}
@@ -773,9 +879,36 @@ function vinext(options = {}) {
 		})();
 		return mdxDelegatePromise;
 	}
+	const mdxProxyPlugin = {
+		name: "vinext:mdx",
+		enforce: "pre",
+		transform: {
+			filter: { id: {
+				include: /\.mdx$/i,
+				exclude: /\?/
+			} },
+			async handler(code, id, options) {
+				const delegate = mdxDelegate ?? await ensureMdxDelegate("on-demand");
+				if (delegate?.transform) {
+					const hook = delegate.transform;
+					return (typeof hook === "function" ? hook : hook.handler).call(this, code, id, options);
+				}
+				if (!hasUserMdxPlugin) throw new Error(`[vinext] Encountered MDX module ${id} but no MDX plugin is configured. Install @mdx-js/rollup or register an MDX plugin manually.`);
+			}
+		}
+	};
+	const mdxConfigProxyPlugin = {
+		name: "vinext:mdx-config",
+		enforce: "pre",
+		config(config, env) {
+			if (!mdxDelegate?.config) return;
+			const hook = mdxDelegate.config;
+			return (typeof hook === "function" ? hook : hook.handler).call(this, config, env);
+		}
+	};
 	const plugins = [
-		...viteMajorVersion >= 8 ? [] : [loadVite7TsconfigPathsPlugin(earlyBaseDir)],
 		createStyledJsxPlugin(earlyBaseDir),
+		mdxProxyPlugin,
 		reactPluginPromise,
 		createIgnoreDynamicRequestsPlugin(() => nextConfig?.turbopackTranspilePackages ?? []),
 		commonjs({ filter: skipCommonjsForLocalCjs }),
@@ -789,13 +922,13 @@ function vinext(options = {}) {
 					code: /\.(?:css|scss|sass)['"]/
 				},
 				handler(code, id) {
-					const cleanId = normalizePathSeparators(stripViteModuleQuery(id));
+					const cleanId = toSlash(stripViteModuleQuery(id));
 					if (!globalNotFoundCssIsolationPath || canonicalize(cleanId) !== canonicalize(globalNotFoundCssIsolationPath)) return null;
 					return isolateGlobalNotFoundStylesheetImports(code, cleanId);
 				}
 			}
 		},
-		...viteMajorVersion >= 8 ? [{
+		{
 			name: "vinext:jsx-in-js",
 			enforce: "pre",
 			transform: {
@@ -818,7 +951,7 @@ function vinext(options = {}) {
 					};
 				}
 			}
-		}] : [],
+		},
 		createMiddlewareServerOnlyPlugin({
 			getMiddlewarePath: () => middlewarePath,
 			getCanonicalMiddlewarePath: () => middlewarePath ? tryRealpathSync(middlewarePath) ?? middlewarePath : null,
@@ -834,13 +967,21 @@ function vinext(options = {}) {
 			name: "vinext:config",
 			enforce: "pre",
 			[VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY]: prerenderConfig,
+			[VINEXT_NEXT_CONFIG_PLUGIN_PROPERTY]: options.nextConfig ?? null,
+			[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;
+				root = toSlash(config.root ?? process.cwd());
+				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;
@@ -849,20 +990,22 @@ function vinext(options = {}) {
 				else if (env?.command === "build" || env?.isPreview === true) resolvedNodeEnv = "production";
 				else resolvedNodeEnv = "development";
 				if (process.env.NODE_ENV !== resolvedNodeEnv) process.env.NODE_ENV = resolvedNodeEnv;
+				if (env?.command === "build") previewBuildCredentials = getPreviewBuildCredentials() ?? createPreviewBuildCredentials();
+				draftModeSecret = previewBuildCredentials?.id ?? getPagesPreviewModeId();
 				let baseDir;
-				if (options.appDir) baseDir = normalizePathSeparators(path.isAbsolute(options.appDir) ? options.appDir : path.resolve(root, options.appDir));
+				if (options.appDir) baseDir = toSlash(path.isAbsolute(options.appDir) ? options.appDir : path.resolve(root, options.appDir));
 				else {
-					const hasRootApp = fs.existsSync(path.posix.join(root, "app"));
-					const hasRootPages = fs.existsSync(path.posix.join(root, "pages"));
-					const hasSrcApp = fs.existsSync(path.posix.join(root, "src", "app"));
-					const hasSrcPages = fs.existsSync(path.posix.join(root, "src", "pages"));
+					const hasRootApp = fs.existsSync(path.join(root, "app"));
+					const hasRootPages = fs.existsSync(path.join(root, "pages"));
+					const hasSrcApp = fs.existsSync(path.join(root, "src", "app"));
+					const hasSrcPages = fs.existsSync(path.join(root, "src", "pages"));
 					if (hasRootApp || hasRootPages) baseDir = root;
-					else if (hasSrcApp || hasSrcPages) baseDir = path.posix.join(root, "src");
+					else if (hasSrcApp || hasSrcPages) baseDir = path.join(root, "src");
 					else baseDir = root;
 				}
-				pagesDir = path.posix.join(baseDir, "pages");
+				pagesDir = path.join(baseDir, "pages");
 				canonicalPagesDir = canonicalize(pagesDir);
-				appDir = path.posix.join(baseDir, "app");
+				appDir = path.join(baseDir, "app");
 				hasPagesDir = fs.existsSync(pagesDir);
 				hasAppDir = !options.disableAppRouter && fs.existsSync(appDir);
 				if (!nextConfig) {
@@ -891,7 +1034,7 @@ function vinext(options = {}) {
 				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;
+				const middlewareConventionDir = canonicalize(baseDir) === canonicalize(path.join(root, "src")) ? path.join(root, "src") : root;
 				middlewarePath = findMiddlewareFile(root, fileMatcher, middlewareConventionDir);
 				const instrumentationClientInjects = nextConfig.instrumentationClientInject.map((spec) => spec.startsWith("./") || spec.startsWith("../") ? path.resolve(root, spec) : spec);
 				clientInjectModule = instrumentationClientInjects.length ? generateInstrumentationClientInjectModule(instrumentationClientInjects, instrumentationClientPath, INSTRUMENTATION_CLIENT_EMPTY_MODULE) : null;
@@ -958,55 +1101,55 @@ function vinext(options = {}) {
 				}
 				for (const key of Object.keys(nextConfig.compilerDefineServer)) if (key in defines) throw new Error(`The \`compiler.defineServer\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
 				nextShimMap = Object.fromEntries(Object.entries({
-					"next/link": path.posix.join(shimsDir, "link"),
-					"next/head": path.posix.join(shimsDir, "head"),
-					"next/router": path.posix.join(shimsDir, "router"),
-					"next/compat/router": path.posix.join(shimsDir, "compat-router"),
-					"next/image": path.posix.join(shimsDir, "image"),
-					"next/legacy/image": path.posix.join(shimsDir, "legacy-image"),
-					"next/dynamic": path.posix.join(shimsDir, "dynamic"),
-					"next/app": path.posix.join(shimsDir, "app"),
-					"next/document": path.posix.join(shimsDir, "document"),
-					"next/config": path.posix.join(shimsDir, "config"),
-					"next/script": path.posix.join(shimsDir, "script"),
-					"next/server": path.posix.join(shimsDir, "server"),
-					"next/headers": path.posix.join(shimsDir, "headers"),
-					"next/font/google": path.posix.join(shimsDir, "font-google"),
-					"next/font/local": path.posix.join(shimsDir, "font-local"),
-					"next/cache": path.posix.join(shimsDir, "cache"),
-					"next/form": path.posix.join(shimsDir, "form"),
-					"next/og": path.posix.join(shimsDir, "og"),
-					"next/web-vitals": path.posix.join(shimsDir, "web-vitals"),
-					"next/amp": path.posix.join(shimsDir, "amp"),
-					"next/offline": path.posix.join(shimsDir, "offline"),
-					"next/constants": path.posix.join(shimsDir, "constants"),
-					"next/dist/shared/lib/app-router-context.shared-runtime": path.posix.join(shimsDir, "internal", "app-router-context"),
-					"next/dist/shared/lib/app-router-context": path.posix.join(shimsDir, "internal", "app-router-context"),
-					"next/dist/shared/lib/router-context.shared-runtime": path.posix.join(shimsDir, "internal", "router-context"),
-					"next/dist/shared/lib/utils": path.posix.join(shimsDir, "internal", "utils"),
-					"next/dist/server/api-utils": path.posix.join(shimsDir, "internal", "api-utils"),
-					"next/dist/server/web/spec-extension/cookies": path.posix.join(shimsDir, "internal", "cookies"),
-					"next/dist/compiled/@edge-runtime/cookies": path.posix.join(shimsDir, "internal", "cookies"),
-					"next/dist/server/app-render/work-unit-async-storage.external": path.posix.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/client/components/work-unit-async-storage.external": path.posix.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/client/components/request-async-storage.external": path.posix.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/client/components/request-async-storage": path.posix.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/server/request/root-params": path.posix.join(shimsDir, "root-params"),
-					"next/dist/server/config-shared": path.posix.join(shimsDir, "internal", "utils"),
-					"server-only": path.posix.join(shimsDir, "server-only"),
-					"client-only": path.posix.join(shimsDir, "client-only"),
-					"vinext/error-boundary": path.posix.join(shimsDir, "error-boundary"),
-					"vinext/layout-segment-context": path.posix.join(shimsDir, "layout-segment-context"),
-					"vinext/metadata": path.posix.join(shimsDir, "metadata"),
-					"vinext/fetch-cache": path.posix.join(shimsDir, "fetch-cache"),
-					"vinext/cache-runtime": path.posix.join(shimsDir, "cache-runtime"),
-					"vinext/navigation-state": path.posix.join(shimsDir, "navigation-state"),
-					"vinext/unified-request-context": path.posix.join(shimsDir, "unified-request-context"),
-					"vinext/pages-router-runtime": path.posix.join(shimsDir, "pages-router-runtime"),
-					"vinext/router-state": path.posix.join(shimsDir, "router-state"),
-					"vinext/head-state": path.posix.join(shimsDir, "head-state"),
-					"vinext/i18n-state": path.posix.join(shimsDir, "i18n-state"),
-					"vinext/i18n-context": path.posix.join(shimsDir, "i18n-context"),
+					"next/link": path.join(shimsDir, "link"),
+					"next/head": path.join(shimsDir, "head"),
+					"next/router": path.join(shimsDir, "router"),
+					"next/compat/router": path.join(shimsDir, "compat-router"),
+					"next/image": path.join(shimsDir, "image"),
+					"next/legacy/image": path.join(shimsDir, "legacy-image"),
+					"next/dynamic": path.join(shimsDir, "dynamic"),
+					"next/app": path.join(shimsDir, "app"),
+					"next/document": path.join(shimsDir, "document"),
+					"next/config": path.join(shimsDir, "config"),
+					"next/script": path.join(shimsDir, "script"),
+					"next/server": path.join(shimsDir, "server"),
+					"next/headers": path.join(shimsDir, "headers"),
+					"next/font/google": path.join(shimsDir, "font-google"),
+					"next/font/local": path.join(shimsDir, "font-local"),
+					"next/cache": path.join(shimsDir, "cache"),
+					"next/form": path.join(shimsDir, "form"),
+					"next/og": path.join(shimsDir, "og"),
+					"next/web-vitals": path.join(shimsDir, "web-vitals"),
+					"next/amp": path.join(shimsDir, "amp"),
+					"next/offline": path.join(shimsDir, "offline"),
+					"next/constants": path.join(shimsDir, "constants"),
+					"next/dist/shared/lib/app-router-context.shared-runtime": path.join(shimsDir, "internal", "app-router-context"),
+					"next/dist/shared/lib/app-router-context": path.join(shimsDir, "internal", "app-router-context"),
+					"next/dist/shared/lib/router-context.shared-runtime": path.join(shimsDir, "internal", "router-context"),
+					"next/dist/shared/lib/utils": path.join(shimsDir, "internal", "utils"),
+					"next/dist/server/api-utils": path.join(shimsDir, "internal", "api-utils"),
+					"next/dist/server/web/spec-extension/cookies": path.join(shimsDir, "internal", "cookies"),
+					"next/dist/compiled/@edge-runtime/cookies": path.join(shimsDir, "internal", "cookies"),
+					"next/dist/server/app-render/work-unit-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/client/components/work-unit-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/client/components/request-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/client/components/request-async-storage": path.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/server/request/root-params": path.join(shimsDir, "root-params"),
+					"next/dist/server/config-shared": path.join(shimsDir, "internal", "utils"),
+					"server-only": path.join(shimsDir, "server-only"),
+					"client-only": path.join(shimsDir, "client-only"),
+					"vinext/error-boundary": path.join(shimsDir, "error-boundary"),
+					"vinext/layout-segment-context": path.join(shimsDir, "layout-segment-context"),
+					"vinext/metadata": path.join(shimsDir, "metadata"),
+					"vinext/fetch-cache": path.join(shimsDir, "fetch-cache"),
+					"vinext/cache-runtime": path.join(shimsDir, "cache-runtime"),
+					"vinext/navigation-state": path.join(shimsDir, "navigation-state"),
+					"vinext/unified-request-context": path.join(shimsDir, "unified-request-context"),
+					"vinext/pages-router-runtime": path.join(shimsDir, "pages-router-runtime"),
+					"vinext/router-state": path.join(shimsDir, "router-state"),
+					"vinext/head-state": path.join(shimsDir, "head-state"),
+					"vinext/i18n-state": path.join(shimsDir, "i18n-state"),
+					"vinext/i18n-context": path.join(shimsDir, "i18n-context"),
 					"vinext/cache": path.resolve(__dirname, "cache"),
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
 					"vinext/instrumentation-client": path.resolve(__dirname, "client", "instrumentation-client"),
@@ -1030,6 +1173,7 @@ function vinext(options = {}) {
 				const isSSR = !!config.build?.ssr;
 				const serverTranspilePackages = [...nextConfig?.turbopackTranspilePackages ?? [], ...nextConfig?.optimizePackageImports ?? []];
 				const nextServerExternal = mergeServerExternalPackages(nextConfig?.serverExternalPackages, serverTranspilePackages);
+				nitroTraceDepsFromServerExternals = nextServerExternal;
 				const isMultiEnv = hasAppDir || hasCloudflarePlugin || hasNitroPlugin;
 				const hasBuildInput = getBuildBundlerOptions(config.build)?.input !== void 0;
 				const shouldInjectPlainPagesEnvironments = !hasAppDir && !hasCloudflarePlugin && !isSSR && !hasBuildInput;
@@ -1053,7 +1197,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 +1208,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 +1231,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 +1246,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 +1297,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 } : {},
@@ -1170,7 +1311,7 @@ function vinext(options = {}) {
 				if (hasAppDir) {
 					const appEntries = [`${path.relative(root, appDir)}/**/*.{tsx,ts,jsx,js}`];
 					const explicitInstrumentationEntries = [instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : []);
-					const optimizeEntries = [...new Set([...appEntries, ...explicitInstrumentationEntries])];
+					const optimizeEntries = [.../* @__PURE__ */ new Set([...appEntries, ...explicitInstrumentationEntries])];
 					const appClientInput = { index: VIRTUAL_APP_BROWSER_ENTRY };
 					if (hasPagesDir) appClientInput["vinext-client-entry"] = VIRTUAL_CLIENT_ENTRY;
 					viteConfig.environments = {
@@ -1188,14 +1329,14 @@ function vinext(options = {}) {
 							optimizeDeps: {
 								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE),
 								entries: optimizeEntries,
-								include: [...new Set([...incomingInclude, "react-server-dom-webpack/static.edge"])],
+								include: [.../* @__PURE__ */ new Set([...incomingInclude, "react-server-dom-webpack/static.edge"])],
 								...depOptimizeNodeEnvOptions
 							},
 							build: {
 								outDir: options.rscOutDir ?? "dist/server",
-								...withBuildBundlerOptions(viteMajorVersion, {
+								...withBuildBundlerOptions({
 									input: { index: VIRTUAL_RSC_ENTRY },
-									output: createRscFrameworkChunkOutputConfig(viteMajorVersion)
+									output: createRscFrameworkChunkOutputConfig()
 								})
 							}
 						},
@@ -1215,7 +1356,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: {
@@ -1223,7 +1364,7 @@ function vinext(options = {}) {
 							optimizeDeps: {
 								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, nextServerExternal),
 								entries: optimizeEntries,
-								include: [...new Set([
+								include: [.../* @__PURE__ */ new Set([
 									...incomingInclude,
 									"react",
 									"react-dom",
@@ -1237,10 +1378,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 +1396,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 +1415,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 +1439,7 @@ function vinext(options = {}) {
 						},
 						build: {
 							outDir: "dist/server",
-							...withBuildBundlerOptions(viteMajorVersion, {
+							...withBuildBundlerOptions({
 								input: { index: VIRTUAL_SERVER_ENTRY },
 								output: { entryFileNames: "entry.js" }
 							})
@@ -1325,8 +1466,6 @@ function vinext(options = {}) {
 				return null;
 			},
 			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) {
@@ -1366,7 +1505,7 @@ function vinext(options = {}) {
 			resolveId: {
 				filter: { id: /(?:next\/|vinext\/(?:shims\/|server\/app-rsc-handler)|virtual:vinext-|@vercel\/og(?:\.js)?$)/ },
 				handler(id, importer) {
-					const cleanId = normalizePathSeparators(id.startsWith("\0") ? id.slice(1) : id);
+					const cleanId = toSlash(id.startsWith("\0") ? id.slice(1) : id);
 					if (cleanId === "vinext/server/app-rsc-handler") {
 						if (_canExternalizeAppRscHandler && this.environment?.name === "rsc" && this.environment.config?.command === "serve") return {
 							id: _appRscHandlerPath,
@@ -1398,94 +1537,101 @@ function vinext(options = {}) {
 						return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(queryIndex + VIRTUAL_GOOGLE_FONTS.length);
 					}
 					const reactServerShim = _reactServerShims.get(cleanId);
-					if (reactServerShim !== void 0) return resolveShimModulePath(_shimsDir, this.environment?.name === "rsc" ? `${reactServerShim}.react-server` : reactServerShim);
+					if (reactServerShim !== void 0) {
+						const shimName = this.environment?.name === "rsc" ? `${reactServerShim}.react-server` : reactServerShim;
+						return resolveShimModulePath(_shimsDir, shimName);
+					}
 				}
 			},
-			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)];
+						const getModuleDependencies = createDevPagesModuleDependencyReader(root, this.resolve.bind(this));
+						for (const moduleFilePath of moduleFilePaths) {
+							const stylesheetAssets = await collectDevPagesAppStylesheetAssets(moduleFilePath, getModuleDependencies);
+							if (stylesheetAssets.length > 0) ssrManifest[toSlash(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: {
@@ -1528,13 +1674,13 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			resolveId: {
 				filter: { id: /virtual:vinext-pages-client-assets$/ },
 				handler(id) {
-					const cleanId = normalizePathSeparators(id.startsWith("\0") ? id.slice(1) : id);
+					const cleanId = toSlash(id.startsWith("\0") ? id.slice(1) : id);
 					if (cleanId !== VIRTUAL_PAGES_CLIENT_ASSETS && !cleanId.endsWith("/virtual:vinext-pages-client-assets")) return;
 					if (this.environment?.config.command !== "build") return RESOLVED_PAGES_CLIENT_ASSETS;
 					const buildRoot = this.environment.config.root ?? process.cwd();
 					const environmentOutDir = path.resolve(buildRoot, this.environment.config.build.outDir);
 					const sidecarDir = !hasAppDir && this.environment.name === "ssr" ? path.dirname(environmentOutDir) : environmentOutDir;
-					let externalId = normalizePathSeparators(path.relative(environmentOutDir, path.join(sidecarDir, PAGES_CLIENT_ASSETS_MODULE)));
+					let externalId = path.relative(environmentOutDir, path.join(sidecarDir, PAGES_CLIENT_ASSETS_MODULE));
 					if (!externalId.startsWith(".")) externalId = `./${externalId}`;
 					pagesClientAssetsOutputDirs.add(sidecarDir);
 					return {
@@ -1571,7 +1717,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,54 +1767,44 @@ 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;
-			},
-			load(id) {
-				if (id !== RESOLVED_INSTRUMENTATION_CLIENT) return null;
-				return clientInjectModule;
-			}
-		},
-		...options.experimental?.clientReferenceDedup ? [clientReferenceDedupPlugin()] : [],
-		{
-			name: "vinext:mdx",
-			enforce: "pre",
-			config(config, env) {
-				if (!mdxDelegate?.config) return;
-				const hook = mdxDelegate.config;
-				return (typeof hook === "function" ? hook : hook.handler).call(this, config, env);
+			resolveId: {
+				filter: { id: /^private-next-instrumentation-client$/ },
+				handler(id) {
+					if (id !== VIRTUAL_INSTRUMENTATION_CLIENT) return null;
+					return clientInjectModule !== null ? RESOLVED_INSTRUMENTATION_CLIENT : null;
+				}
 			},
-			transform: {
-				filter: { id: {
-					include: /\.mdx$/i,
-					exclude: /\?/
-				} },
-				async handler(code, id, options) {
-					const delegate = mdxDelegate ?? await ensureMdxDelegate("on-demand");
-					if (delegate?.transform) {
-						const hook = delegate.transform;
-						return (typeof hook === "function" ? hook : hook.handler).call(this, code, id, options);
-					}
-					if (!hasUserMdxPlugin) throw new Error(`[vinext] Encountered MDX module ${id} but no MDX plugin is configured. Install @mdx-js/rollup or register an MDX plugin manually.`);
+			load: {
+				filter: { id: /private-next-instrumentation-client\.mjs$/ },
+				handler(id) {
+					if (id !== RESOLVED_INSTRUMENTATION_CLIENT) return null;
+					return clientInjectModule;
 				}
 			}
 		},
+		...options.experimental?.clientReferenceDedup ? [clientReferenceDedupPlugin()] : [],
+		mdxConfigProxyPlugin,
 		createCssModuleImportCompatibilityPlugin({ compiledMdx: true }),
 		{
 			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: {
@@ -1688,36 +1824,35 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		},
 		{
 			name: "vinext:pages-router",
-			hotUpdate(options) {
-				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 [];
+			// @vitejs/plugin-react to handle normal module updates. Next.js preserves
+			hotUpdate: {
+				order: "post",
+				handler(options) {
+					if (!hasPagesDir) return;
+					const isPagesAppFile = (filePath) => {
+						const relativePath = 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 = 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 = 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 (this.environment?.name === "ssr" && pagesAssetGraphScriptChanged) {
+						for (const mod of options.modules) this.environment.moduleGraph.invalidateModule(mod, /* @__PURE__ */ new Set(), options.timestamp, true);
+						return [];
+					}
 				}
 			},
 			configureServer(server) {
@@ -1767,13 +1902,12 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					pagesRunner?.clearCache();
 				}
-				function invalidatePagesClientAssetsModule(reloadDocument = false) {
+				function invalidatePagesClientAssetsModule() {
 					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();
@@ -1823,17 +1957,17 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				let appRouteTypeGeneration = null;
 				let appRouteTypeGenerationPending = false;
 				function isPagesAppFile(filePath) {
-					const relativePath = normalizePathSeparators(path.relative(pagesDir, filePath));
+					const relativePath = 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));
+					const relativeRootPath = 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));
+					const relativeAppPath = path.relative(appDir, cleanPath);
 					return relativeAppPath.startsWith("..") || path.isAbsolute(relativeAppPath);
 				}
 				function warnRouteTypeGenerationFailure(error) {
@@ -1866,8 +2000,8 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					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)) {
+					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule();
+					if (hasPagesDir && toSlash(filePath).startsWith(pagesDir) && pageExtensions.test(filePath)) {
 						invalidateRouteCache(pagesDir);
 						routeChanged = true;
 					}
@@ -1878,6 +2012,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					if (routeChanged) {
 						invalidatePagesServerEntry();
+						if (!hasAppDir) server.ws.send({ type: "full-reload" });
 						invalidateHybridClientEntries();
 						revalidateHybridRoutes();
 					}
@@ -1885,14 +2020,14 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				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);
+					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule();
 				});
 				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)) {
+					if (hasPagesDir && (pagesAppChanged || STYLESHEET_FILE_RE.test(filePath) || pagesAssetGraphScriptChanged)) invalidatePagesClientAssetsModule();
+					if (hasPagesDir && toSlash(filePath).startsWith(pagesDir) && pageExtensions.test(filePath)) {
 						invalidateRouteCache(pagesDir);
 						routeChanged = true;
 					}
@@ -1903,6 +2038,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					if (routeChanged) {
 						invalidatePagesServerEntry();
+						if (!hasAppDir) server.ws.send({ type: "full-reload" });
 						invalidateHybridClientEntries();
 						revalidateHybridRoutes();
 					}
@@ -2384,15 +2520,23 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		},
 		{
 			name: "vinext:typeof-window",
+			configEnvironment(_name, environment) {
+				if (!useNativeTypeofWindowFolding) return null;
+				return { define: { "typeof window": environment.consumer === "client" ? "\"object\"" : "\"undefined\"" } };
+			}
+		},
+		{
+			name: "vinext:typeof-window-scan",
+			apply(_config, environment) {
+				return !useNativeTypeofWindowFolding || environment.command === "build";
+			},
 			enforce: "post",
 			transform: {
-				filter: {
-					id: typeofWindowIdFilter,
-					code: /typeof\s+window/
-				},
+				filter: { code: /\btypeof\s+window\b/ },
 				handler(code, id) {
-					const cacheDirPrefix = getCacheDirPrefix(this.environment.config.cacheDir);
-					if (normalizePathSeparators(id).startsWith(cacheDirPrefix)) return null;
+					if (useNativeTypeofWindowFolding && this.environment.config.build.write !== false) return null;
+					const cacheDir = `${toSlash(this.environment.config.cacheDir).replace(/\/$/, "")}/`;
+					if (toSlash(id).startsWith(cacheDir)) return null;
 					return replaceTypeofWindow(code, getTypeofWindowReplacement(this.environment), id);
 				}
 			}
@@ -2405,9 +2549,26 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				serverDefines["process.env.NEXT_RUNTIME"] = JSON.stringify("nodejs");
 				const sharedRevalidateSecret = process.env.__VINEXT_SHARED_REVALIDATE_SECRET;
 				if (sharedRevalidateSecret) serverDefines["process.env.__VINEXT_REVALIDATE_SECRET"] = JSON.stringify(sharedRevalidateSecret);
+				if (previewBuildCredentials) {
+					serverDefines["process.env.__VINEXT_PREVIEW_MODE_ID"] = JSON.stringify(previewBuildCredentials.id);
+					serverDefines["process.env.__VINEXT_PREVIEW_MODE_SIGNING_KEY"] = JSON.stringify(previewBuildCredentials.signingKey);
+					serverDefines["process.env.__VINEXT_PREVIEW_MODE_ENCRYPTION_KEY"] = JSON.stringify(previewBuildCredentials.encryptionKey);
+				}
 				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",
@@ -2417,7 +2578,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 				staticImageAssets.clear();
 			},
 			watchChange(id) {
-				const key = normalizePathSeparators(id);
+				const key = toSlash(id);
 				imageImportDimCache.delete(key);
 				staticImageAssets.delete(key);
 				staticImageImportsByModule.delete(key);
@@ -2495,7 +2656,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 						const dir = path.dirname(id);
 						const resolvedImage = importPath.startsWith(".") ? path.resolve(dir, importPath) : (await this.resolve(importPath, id, { skipSelf: true }))?.id;
 						if (!resolvedImage) continue;
-						const absImagePath = normalizePathSeparators(resolvedImage.split("?", 1)[0]);
+						const absImagePath = toSlash(resolvedImage.split("?", 1)[0]);
 						if (!fs.existsSync(absImagePath)) continue;
 						imageImports.add(absImagePath);
 						const urlVar = `__vinext_img_url_${varName}`;
@@ -2698,9 +2859,10 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 		{
 			name: "vinext:nitro-route-rules",
 			nitro: { setup: async (nitro) => {
-				if (nitro.options.dev) return;
 				if (!nextConfig) return;
 				if (!hasAppDir && !hasPagesDir) return;
+				if (nitroTraceDepsFromServerExternals.length > 0) nitro.options.traceDeps = [.../* @__PURE__ */ new Set([...nitro.options.traceDeps ?? [], ...nitroTraceDepsFromServerExternals])];
+				if (nitro.options.dev) return;
 				const { collectNitroRouteRules, mergeNitroRouteRules } = await import("./build/nitro-route-rules.js");
 				const generatedRouteRules = await collectNitroRouteRules({
 					appDir: hasAppDir ? appDir : null,