vinext 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/index.js

@@ -1,17 +1,18 @@
+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 { hasBasePath, stripBasePath } from "./utils/base-path.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { VINEXT_MW_CTX_HEADER } from "./utils/protocol-headers.js";
 import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
 import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
+import { validateMiddlewareMatcherPatterns } from "./server/middleware-matcher-pattern.js";
 import { isOpenRedirectShaped } from "./server/open-redirect.js";
-import { filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
+import { canonicalizeRequestUrlPathname, filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { findMiddlewareFile, isProxyFile, runMiddleware } from "./server/middleware.js";
-import { extractMiddlewareMatcherConfig, hasExportedName } from "./build/report.js";
+import { extractMiddlewareMatcherConfig, extractMiddlewareMatcherConfigValue, hasExportedName } from "./build/report.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
 import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
@@ -19,8 +20,9 @@ import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentat
 import { isUnknownRecord } from "./utils/record.js";
 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 { encodeUrlParserIgnoredCharacters, isNextDataPathname, normalizeNextDataPagePathname, parseNextDataPathname, urlParserCreatesPagesDataPath } 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";
@@ -38,7 +40,7 @@ import { collectRouteClassificationManifest } from "./build/route-classification
 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 { 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";
@@ -59,6 +61,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";
@@ -67,9 +70,12 @@ import { createOgAssetsPlugin, createOgInlineFetchAssetsPlugin } from "./plugins
 import { generateRouteTypes } from "./typegen.js";
 import { SSR_EXTERNAL_REACT_ENTRIES, VINEXT_OPTIMIZE_DEPS_EXCLUDE, mergeOptimizeDepsExclude } from "./plugins/rsc-client-shim-excludes.js";
 import { createServerExternalsManifestPlugin } from "./plugins/server-externals-manifest.js";
+import public_shim_map_default from "./shims/public-shim-map.json.js";
 import { VINEXT_CLIENT_ENTRY_MANIFEST } from "./utils/client-entry-manifest.js";
 import { computeClientRuntimeMetadata } from "./utils/client-runtime-metadata.js";
 import { 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";
@@ -89,10 +95,9 @@ import { VINEXT_PRERENDER_CONFIG_PLUGIN_PROPERTY, VINEXT_ROUTE_ROOT_CONFIG_PLUGI
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
 import { createRequire } from "node:module";
 import fs from "node:fs";
-import path from "node:path";
 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 +114,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);
@@ -165,21 +166,22 @@ function resolveShimModulePath(shimsDir, moduleName) {
 		".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;
@@ -243,7 +245,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) {
@@ -255,24 +257,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;
@@ -285,17 +300,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) {
@@ -353,11 +368,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) {
@@ -378,7 +393,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()) {
@@ -432,7 +447,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, "");
@@ -579,14 +594,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");
@@ -597,8 +612,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
@@ -655,27 +670,14 @@ function generateRootParamsModule(rootParamNames) {
 	const exports = names.map((name) => `export function ${name}() { return getRootParam(${JSON.stringify(name)}); }`).join("\n");
 	return `import { getRootParam } from ${JSON.stringify(rootParamsShimPath)};\n${exports}\n`;
 }
-/**
-* Shims with a `.react-server.ts` variant for the RSC environment.
-* Maps import specifier → base shim name. In the RSC env, resolveId
-* appends `.react-server`; in other envs it resolves to the base.
-*
-* These MUST NOT appear in `nextShimMap` (resolve.alias) because Vite's
-* alias plugin runs before user `enforce:"pre"` plugins — aliases are
-* unoverridable. Keeping them out of the alias lets the resolveId hook
-* control resolution per-environment.
-*
-* To add a new react-server shim:
-*   1. Create `<name>.react-server.ts` in src/shims/
-*   2. Add entries here for each import specifier.
-*/
-const _reactServerShims = new Map([
-	["next/navigation", "navigation"],
-	["next/navigation.js", "navigation"],
-	["next/dist/client/components/navigation", "navigation"],
-	["next/error", "error"],
-	["next/error.js", "error"]
-]);
+const _publicNextShimMap = public_shim_map_default;
+const _reactServerShims = /* @__PURE__ */ new Map();
+for (const [specifier, definition] of Object.entries(_publicNextShimMap)) {
+	if (!definition.reactServer) continue;
+	_reactServerShims.set(specifier, definition.shim);
+	_reactServerShims.set(`${specifier}.js`, definition.shim);
+}
+_reactServerShims.set("next/dist/client/components/navigation", "navigation");
 const clientCodeSplittingConfig = createClientCodeSplittingConfig(createClientManualChunks(_shimsDir));
 const appClientCodeSplittingConfig = createClientCodeSplittingConfig(createClientManualChunks(_shimsDir, true));
 function getClientOutputConfig(assetsDir, preserveAppRouteBoundaries = false) {
@@ -687,7 +689,7 @@ function getClientOutputConfig(assetsDir, preserveAppRouteBoundaries = false) {
 	};
 }
 function vinext(options = {}) {
-	assertSupportedViteVersion();
+	const { supportsNativeTypeofWindowFolding: useNativeTypeofWindowFolding } = assertSupportedViteVersion();
 	const prerenderConfig = normalizeVinextPrerenderConfig(options.prerender);
 	let root;
 	let pagesDir;
@@ -706,17 +708,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);
@@ -761,10 +764,9 @@ function vinext(options = {}) {
 		});
 	}
 	async function writeRouteTypes() {
-		if (!hasAppDir) return;
 		await generateRouteTypes({
 			root,
-			appDir,
+			appDir: hasAppDir ? appDir : null,
 			pageExtensions: nextConfig.pageExtensions
 		});
 	}
@@ -801,11 +803,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 });
 		});
 	}
@@ -845,8 +868,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 = [
 		createStyledJsxPlugin(earlyBaseDir),
+		mdxProxyPlugin,
 		reactPluginPromise,
 		createIgnoreDynamicRequestsPlugin(() => nextConfig?.turbopackTranspilePackages ?? []),
 		commonjs({ filter: skipCommonjsForLocalCjs }),
@@ -860,7 +911,7 @@ 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);
 				}
@@ -905,6 +956,7 @@ 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,
@@ -914,7 +966,7 @@ function vinext(options = {}) {
 			[VINEXT_CACHE_CONFIG_PLUGIN_PROPERTY]: options.cache ?? null,
 			async config(config, env) {
 				isServeCommand = env.command === "serve";
-				root = normalizePathSeparators(config.root ?? process.cwd());
+				root = toSlash(config.root ?? process.cwd());
 				const shouldEnableNativeTsconfigPaths = config.resolve?.tsconfigPaths === void 0;
 				const tsconfigPathAliases = resolveTsconfigAliases(root);
 				const swcHelpersAlias = resolveSwcHelpersAlias(root);
@@ -926,23 +978,27 @@ function vinext(options = {}) {
 				if (mode === "test") resolvedNodeEnv = "test";
 				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 (process.env.NODE_ENV !== resolvedNodeEnv) Reflect.set(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);
+				invalidateRouteCache(pagesDir);
+				invalidateAppRouteCache();
 				if (!nextConfig) {
 					const phase = env?.command === "build" ? PHASE_PRODUCTION_BUILD : PHASE_DEVELOPMENT_SERVER;
 					let rawConfig;
@@ -969,8 +1025,12 @@ 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);
+				if (middlewarePath) {
+					const staticMatcher = extractMiddlewareMatcherConfigValue(middlewarePath);
+					if (staticMatcher !== void 0) validateMiddlewareMatcherPatterns(staticMatcher);
+				}
 				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;
 				if (env?.command === "build") await writeRouteTypes();
@@ -985,6 +1045,10 @@ function vinext(options = {}) {
 				}
 				defines["process.env.__NEXT_ROUTER_BASEPATH"] = JSON.stringify(nextConfig.basePath);
 				defines["process.env.__VINEXT_HAS_PAGES_ROUTER"] = JSON.stringify(String(hasPagesDir));
+				defines["process.env.__VINEXT_HAS_CLIENT_REWRITES"] = JSON.stringify(String(nextConfig.rewrites.beforeFiles.length > 0 || nextConfig.rewrites.afterFiles.length > 0 || nextConfig.rewrites.fallback.length > 0));
+				defines["process.env.__VINEXT_HAS_CONFIG_HEADERS"] = JSON.stringify(String(nextConfig.headers.length > 0));
+				defines["process.env.__VINEXT_HAS_CONFIG_REDIRECTS"] = JSON.stringify(String(nextConfig.redirects.length > 0));
+				defines["process.env.__VINEXT_HAS_CONFIG_REWRITES"] = JSON.stringify(String(nextConfig.rewrites.beforeFiles.length > 0 || nextConfig.rewrites.afterFiles.length > 0 || nextConfig.rewrites.fallback.length > 0));
 				defines["process.env.__NEXT_CLIENT_ROUTER_DYNAMIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.dynamic));
 				defines["process.env.__NEXT_CLIENT_ROUTER_STATIC_STALETIME"] = JSON.stringify(String(nextConfig.staleTimes.static));
 				defines["process.env.__VINEXT_PREFETCH_INLINING"] = JSON.stringify(nextConfig.prefetchInlining ? "true" : "false");
@@ -1036,55 +1100,34 @@ 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"),
+					...Object.fromEntries(Object.entries(_publicNextShimMap).filter(([, definition]) => !definition.reactServer).map(([specifier, definition]) => [specifier, path.join(shimsDir, definition.shim)])),
+					"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"),
@@ -1108,6 +1151,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;
@@ -1245,7 +1289,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 = {
@@ -1263,7 +1307,7 @@ 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: {
@@ -1298,7 +1342,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",
@@ -1394,14 +1438,12 @@ function vinext(options = {}) {
 					config.optimizeDeps.exclude = mergeOptimizeDepsExclude(config.optimizeDeps.exclude ?? [], VINEXT_OPTIMIZE_DEPS_EXCLUDE, PAGES_CLOUDFLARE_WORKER_OPTIMIZE_DEPS_EXCLUDE);
 				}
 				const configuredExtensions = name === "client" ? nextConfig.resolveExtensions : nextConfig.serverResolveExtensions;
-				const extensions = configuredExtensions === null ? buildViteResolveExtensions(nextConfig.pageExtensions, config.resolve?.extensions) : normalizeViteResolveExtensions(configuredExtensions);
+				const extensions = configuredExtensions === null ? buildViteResolveExtensions(config.resolve?.extensions) : normalizeViteResolveExtensions(configuredExtensions);
 				config.resolve ??= {};
 				config.resolve.extensions = extensions;
 				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) {
@@ -1441,7 +1483,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,
@@ -1473,7 +1515,10 @@ 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);
+					}
 				}
 			},
 			load: {
@@ -1488,9 +1533,10 @@ function vinext(options = {}) {
 						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(root, moduleFilePath, this.resolve.bind(this));
-							if (stylesheetAssets.length > 0) ssrManifest[normalizePathSeparators(moduleFilePath)] = stylesheetAssets;
+							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)};`;
@@ -1606,13 +1652,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 {
@@ -1715,29 +1761,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 			}
 		},
 		...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);
-			},
-			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.`);
-				}
-			}
-		},
+		mdxConfigProxyPlugin,
 		createCssModuleImportCompatibilityPlugin({ compiledMdx: true }),
 		{
 			name: "vinext:react-canary",
@@ -1778,39 +1802,42 @@ 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) {
+				server.middlewares.use((req, _res, next) => {
+					req.__vinextOriginalEncodedUrl ??= req.url;
+					next();
+				});
 				const pageExtensions = fileMatcher.extensionRegex;
 				let pagesRunner = null;
 				let cachedSSRHandler = null;
@@ -1857,13 +1884,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();
@@ -1913,17 +1939,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) {
@@ -1956,8 +1982,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;
 					}
@@ -1968,6 +1994,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					if (routeChanged) {
 						invalidatePagesServerEntry();
+						if (!hasAppDir) server.ws.send({ type: "full-reload" });
 						invalidateHybridClientEntries();
 						revalidateHybridRoutes();
 					}
@@ -1975,14 +2002,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;
 					}
@@ -1993,6 +2020,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 					}
 					if (routeChanged) {
 						invalidatePagesServerEntry();
+						if (!hasAppDir) server.ws.send({ type: "full-reload" });
 						invalidateHybridClientEntries();
 						revalidateHybridRoutes();
 					}
@@ -2147,9 +2175,25 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								res.end();
 								return;
 							}
+							const originalEncodedUrl = req.__vinextOriginalEncodedUrl ?? url;
+							const originalEncodedPathname = originalEncodedUrl.split("?")[0];
+							if (isOpenRedirectShaped(originalEncodedPathname)) {
+								res.writeHead(404);
+								res.end("This page could not be found");
+								return;
+							}
+							const canonicalOriginalUrl = canonicalizeRequestUrlPathname(originalEncodedUrl);
+							url = canonicalizeRequestUrlPathname(url);
 							const rawPathname = url.split("?")[0];
 							if (rawPathname.endsWith("/index.html")) url = url.replace("/index.html", "/");
 							else if (rawPathname.endsWith(".html")) url = url.replace(/\.html(?=\?|$)/, "");
+							let middlewareUrl = canonicalOriginalUrl;
+							let routeUrl = middlewareUrl;
+							{
+								const routePathname = routeUrl.split("?")[0];
+								if (routePathname.endsWith("/index.html")) routeUrl = routeUrl.replace("/index.html", "/");
+								else if (routePathname.endsWith(".html")) routeUrl = routeUrl.replace(/\.html(?=\?|$)/, "");
+							}
 							let pathname = url.split("?")[0];
 							if (isOpenRedirectShaped(pathname)) {
 								res.writeHead(404);
@@ -2164,20 +2208,42 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								res.end("Bad Request");
 								return;
 							}
+							if (urlParserCreatesPagesDataPath(pathname)) {
+								res.writeHead(404);
+								res.end("This page could not be found");
+								return;
+							}
+							pathname = encodeUrlParserIgnoredCharacters(pathname);
 							{
 								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
 								url = pathname + qs;
 							}
 							const capturedMiddlewarePath = middlewarePath;
 							const bp = nextConfig?.basePath ?? "";
-							if (bp && pathname.startsWith(bp)) {
-								const stripped = pathname.slice(bp.length) || "/";
-								url = stripped + (url.includes("?") ? url.slice(url.indexOf("?")) : "");
-								pathname = stripped;
+							const viteBase = server.config.base;
+							const viteBasePath = viteBase.startsWith("/") && viteBase !== "/" ? viteBase.replace(/\/+$/, "") : "";
+							const routingBasePath = bp || viteBasePath;
+							if (routingBasePath) {
+								if (hasBasePath(pathname, routingBasePath)) {
+									const stripped = stripBasePath(pathname, routingBasePath);
+									url = stripped + (url.includes("?") ? url.slice(url.indexOf("?")) : "");
+									pathname = stripped;
+								}
+								const middlewarePathname = middlewareUrl.split("?")[0];
+								if (hasBasePath(middlewarePathname, routingBasePath)) {
+									const middlewareQs = middlewareUrl.includes("?") ? middlewareUrl.slice(middlewareUrl.indexOf("?")) : "";
+									middlewareUrl = stripBasePath(middlewarePathname, routingBasePath) + middlewareQs;
+								}
+								const routePathname = routeUrl.split("?")[0];
+								if (hasBasePath(routePathname, routingBasePath)) {
+									const routeQs = routeUrl.includes("?") ? routeUrl.slice(routeUrl.indexOf("?")) : "";
+									routeUrl = stripBasePath(routePathname, routingBasePath) + routeQs;
+								}
 							}
+							let configMatchPathname = stripBasePath(middlewareUrl.split("?")[0], routingBasePath);
 							if (nextConfig) {
 								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
-								const trailingSlashRedirect = normalizeTrailingSlash(pathname, bp, nextConfig.trailingSlash, qs);
+								const trailingSlashRedirect = normalizeTrailingSlash(routeUrl.split("?")[0], bp, nextConfig.trailingSlash, qs);
 								if (trailingSlashRedirect) {
 									const location = trailingSlashRedirect.headers.get("Location");
 									res.writeHead(trailingSlashRedirect.status, location ? { Location: location } : void 0);
@@ -2195,7 +2261,10 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 									const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
 									const pagePathname = normalizeNextDataPagePathname(dataMatch.pagePathname, capturedMiddlewarePath !== null && nextConfig?.trailingSlash === true);
 									url = pagePathname + qs;
+									middlewareUrl = url;
+									routeUrl = url;
 									pathname = pagePathname;
+									configMatchPathname = pagePathname;
 									req.url = url;
 								} else {
 									const deploymentId = process.env.__VINEXT_DEPLOYMENT_ID || process.env.NEXT_DEPLOYMENT_ID;
@@ -2230,7 +2299,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							for (const header of INTERNAL_HEADERS) delete req.headers[header];
 							for (const header of VINEXT_INTERNAL_HEADERS) delete req.headers[header];
 							const method = req.method ?? "GET";
-							const webRequest = new Request(new URL(url, requestOrigin), {
+							const webRequest = new Request(new URL(routeUrl, requestOrigin), {
 								method,
 								headers: nodeRequestHeaders
 							});
@@ -2241,11 +2310,11 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 							const devRunMiddlewareAdapter = capturedMiddlewarePath ? async (_request, _ctx, opts) => {
 								const rawProto = process.env.VINEXT_TRUST_PROXY === "1" || (process.env.VINEXT_TRUSTED_HOSTS ?? "").split(",").some((h) => h.trim()) ? String(req.headers["x-forwarded-proto"] || "").split(",")[0].trim() : "";
 								const mwOrigin = `${rawProto === "https" || rawProto === "http" ? rawProto : "http"}://${requestHost}`;
-								const middlewareRequest = new Request(new URL(url, mwOrigin), {
+								const middlewareRequest = new Request(new URL(middlewareUrl, mwOrigin), {
 									method: req.method,
 									headers: nodeRequestHeaders
 								});
-								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest);
+								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest, pathname);
 								if (hasAppDir && result.continue) {
 									const mwCtxEntries = [];
 									if (result.responseHeaders) {
@@ -2289,6 +2358,7 @@ export const loadServerActionClient = ${hasServerActions ? `() => import(${JSON.
 								isDataRequest,
 								hasMiddleware: capturedMiddlewarePath !== null,
 								rawSearch: url.includes("?") ? url.slice(url.indexOf("?")) : "",
+								configMatchPathname,
 								runMiddleware: devRunMiddlewareAdapter,
 								matchPageRoute: (resolvedPathname, request) => {
 									const m = matchRoute(nextConfig?.i18n ? resolvePagesI18nRequest(resolvedPathname, nextConfig.i18n, request.headers, getUrlHostname(request.url), bp, nextConfig.trailingSlash ?? false).url : resolvedPathname, devPageRoutes);
@@ -2474,15 +2544,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);
 				}
 			}
@@ -2495,6 +2573,11 @@ 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 };
 			}
 		},
@@ -2519,7 +2602,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);
@@ -2597,7 +2680,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}`;
@@ -2800,9 +2883,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,