vinext 0.1.2 → 0.1.4

package/dist/index.js

@@ -1,22 +1,22 @@
 import { detectPackageManager } from "./utils/project.js";
-import { normalizePathSeparators, stripViteModuleQuery } from "./utils/path.js";
+import { normalizePathSeparators, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
-import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts } from "./routing/file-matcher.js";
+import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, normalizeViteResolveExtensions } from "./routing/file-matcher.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { INTERNAL_HEADERS, NEXTJS_DEPLOYMENT_ID_HEADER, VINEXT_INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
-import { proxyExternalRequest } from "./config/config-matchers.js";
+import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
 import { filterInternalHeaders, isOpenRedirectShaped, normalizeTrailingSlash } from "./server/request-pipeline.js";
 import { findMiddlewareFile, runMiddleware } from "./server/middleware.js";
 import { generateServerEntry } from "./entries/pages-server-entry.js";
 import { generateClientEntry } from "./entries/pages-client-entry.js";
-import { appRouteGraph, appRouter, invalidateAppRouteCache } from "./routing/app-router.js";
+import { appRouteGraph, appRouter, invalidateAppRouteCache, matchAppRoute } from "./routing/app-router.js";
 import { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
 import { isUnknownRecord } from "./utils/record.js";
 import { logRequest, now } from "./server/request-log.js";
 import { createSSRHandler } from "./server/dev-server.js";
 import { handleApiRoute } from "./server/api-handler.js";
-import { isImageOptimizationPath } from "./server/image-optimization.js";
+import { DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath, resolveDevImageRedirect } from "./server/image-optimization.js";
 import { installSocketErrorBackstop } from "./server/socket-error-backstop.js";
 import { scanMetadataFiles } from "./server/metadata-routes.js";
 import { shouldInvalidateAppRouteFile } from "./server/dev-route-files.js";
@@ -25,13 +25,13 @@ 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 { generateBrowserEntry, isLinkPrefetchRoute, toLinkPrefetchRoute } from "./entries/app-browser-entry.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 { ASSET_PREFIX_URL_DIR, resolveAssetUrlPrefix, resolveAssetsDir } from "./utils/asset-prefix.js";
+import { resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
-import { getViteMajorVersion } from "./utils/vite-version.js";
+import { getDepOptimizeNodeEnvOptions, getViteMajorVersion, serializeViteDefine } from "./utils/vite-version.js";
 import { createRscCompatibilityId, findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.js";
 import { isNextDataPathname, parseNextDataPathname } from "./server/pages-data-route.js";
 import { precompressAssets } from "./build/precompress.js";
@@ -40,6 +40,8 @@ import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-mani
 import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build/inline-css.js";
 import { installDevStackSourcemapMiddleware } from "./server/dev-stack-sourcemap.js";
 import { runPagesRequest } from "./server/pages-request-pipeline.js";
+import { pagesRouteHasPriorityOverAppRoute, validateHybridRouteConflicts } from "./server/hybrid-route-priority.js";
+import { renderVinextBuiltUrl } from "./utils/built-asset-url.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
 import { dataUrlCssPlugin } from "./plugins/css-data-url.js";
@@ -61,11 +63,13 @@ import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
 import { buildSassPreprocessorOptions, createSassAwareFileSystemLoader, createSassTildeImporter } from "./plugins/sass.js";
 import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientFileNameConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
 import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
-import { stripServerExports } from "./plugins/strip-server-exports.js";
+import { hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports } from "./plugins/strip-server-exports.js";
 import { removeConsoleCalls } from "./plugins/remove-console.js";
 import { createImportMetaUrlPlugin } from "./plugins/import-meta-url.js";
 import { createRequireContextPlugin } from "./plugins/require-context.js";
+import { createExtensionlessDynamicImportPlugin } from "./plugins/extensionless-dynamic-import.js";
 import { createWasmModuleImportPlugin } from "./plugins/wasm-module-import.js";
+import { getTypeofWindowReplacement, replaceTypeofWindow } from "./plugins/typeof-window.js";
 import { hasMdxFiles } from "./utils/mdx-scan.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
@@ -74,7 +78,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { loadEnv, parseAst, transformWithOxc } from "vite";
 import { pathToFileURL } from "node:url";
-import { randomBytes, randomUUID } from "node:crypto";
+import { createHash, randomBytes, randomUUID } from "node:crypto";
 import commonjs from "vite-plugin-commonjs";
 import MagicString from "magic-string";
 import tsconfigPaths from "vite-tsconfig-paths";
@@ -84,17 +88,6 @@ function isInsideDirectory(dir, filePath) {
 	const relativePath = path.relative(dir, filePath);
 	return relativePath !== "" && !relativePath.startsWith("..") && !path.isAbsolute(relativePath);
 }
-function hasModuleLevelUseServerDirective(body) {
-	for (const node of body) {
-		if (node.type !== "ExpressionStatement") break;
-		const directive = node.directive;
-		const expression = node.expression;
-		const value = typeof directive === "string" ? directive : expression?.type === "Literal" ? expression.value : void 0;
-		if (value === "use server") return true;
-		if (typeof value !== "string") break;
-	}
-	return false;
-}
 function hasServerOnlyMarkerImport(code) {
 	if (!code.includes("server-only")) return false;
 	let ast;
@@ -103,7 +96,6 @@ function hasServerOnlyMarkerImport(code) {
 	} catch {
 		return false;
 	}
-	if (hasModuleLevelUseServerDirective(ast.body)) return false;
 	function walk(node) {
 		if (!node) return false;
 		if (Array.isArray(node)) return node.some((child) => walk(child));
@@ -170,6 +162,19 @@ function resolveTsconfigPathCandidate(candidate) {
 	for (const item of candidates) if (fs.existsSync(item) && fs.statSync(item).isFile()) return item;
 	return null;
 }
+/**
+* Normalize a tsconfig `extends` field into a list of specifier strings.
+*
+* TypeScript 5.0+ allows `extends` to be either a string or an array of
+* strings. Matches Next.js's handling in
+* packages/next/src/build/next-config-ts/transpile-config.ts, where parents
+* are iterated in order and later entries override earlier ones.
+*/
+function normalizeTsconfigExtends(extendsField) {
+	if (typeof extendsField === "string") return [extendsField];
+	if (Array.isArray(extendsField)) return extendsField.filter((value) => typeof value === "string");
+	return [];
+}
 function resolveTsconfigExtends(configPath, specifier) {
 	const fromDir = path.dirname(configPath);
 	if (specifier.startsWith(".") || specifier.startsWith("/") || specifier.startsWith("\\")) return resolveTsconfigPathCandidate(path.resolve(fromDir, specifier));
@@ -229,9 +234,12 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 	}
 	if (!parsed) return {};
 	let aliases = {};
-	if (typeof parsed.extends === "string") {
-		const extendedPath = resolveTsconfigExtends(normalizedPath, parsed.extends);
-		if (extendedPath) aliases = loadTsconfigPathAliases(extendedPath, projectRoot, seen);
+	for (const extendsSpecifier of normalizeTsconfigExtends(parsed.extends)) {
+		const extendedPath = resolveTsconfigExtends(normalizedPath, extendsSpecifier);
+		if (extendedPath) aliases = {
+			...aliases,
+			...loadTsconfigPathAliases(extendedPath, projectRoot, seen)
+		};
 	}
 	const compilerOptions = isUnknownRecord(parsed.compilerOptions) ? parsed.compilerOptions : null;
 	const pathsConfig = compilerOptions && isUnknownRecord(compilerOptions.paths) ? compilerOptions.paths : null;
@@ -296,6 +304,14 @@ const RESOLVED_INSTRUMENTATION_CLIENT = `\0${VIRTUAL_INSTRUMENTATION_CLIENT}.mjs
 /** Image file extensions handled by the vinext:image-imports plugin.
 *  Shared between the Rolldown hook filter and the transform handler regex. */
 const IMAGE_EXTS = "png|jpe?g|gif|webp|avif|svg|ico|bmp|tiff?";
+function createStaticImageAsset(imagePath) {
+	const source = fs.readFileSync(imagePath);
+	const extension = path.extname(imagePath);
+	return {
+		fileName: `media/${path.basename(imagePath, extension)}.${createHash("sha256").update(source).digest("hex").slice(0, 8)}${extension}`,
+		source
+	};
+}
 /**
 * 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
@@ -314,49 +330,52 @@ function isVirtualEntryFacade(id, virtualId) {
 	return cleanId === virtualId || cleanId.endsWith("/" + virtualId) || cleanId.endsWith("\\" + virtualId);
 }
 /**
-* Returns true when `code` starts with a React `"use client"` or `"use server"`
-* directive (after stripping leading comments, hashbang, and whitespace).
+* Returns the leading React `"use client"` or `"use server"` directive after
+* stripping leading comments, hashbang, and whitespace.
 *
 * Used by `vinext:jsx-in-js` to opt `.js` files inside `node_modules` into the
 * JSX transform. We mirror `@vitejs/plugin-rsc`'s detection by looking at the
 * directive prologue rather than scanning the whole file — `code.includes`
 * alone would match incidental occurrences in template literals or comments.
 */
-function hasReactDirective(code) {
+function getLeadingReactDirective(code) {
 	let i = 0;
 	const len = code.length;
 	if (code.charCodeAt(0) === 65279) i = 1;
 	if (code[i] === "#" && code[i + 1] === "!") {
 		const nl = code.indexOf("\n", i);
-		if (nl === -1) return false;
+		if (nl === -1) return null;
 		i = nl + 1;
 	}
 	while (i < len) {
 		while (i < len && /\s/.test(code[i] ?? "")) i++;
-		if (i >= len) return false;
+		if (i >= len) return null;
 		if (code[i] === "/" && code[i + 1] === "/") {
 			const nl = code.indexOf("\n", i + 2);
-			if (nl === -1) return false;
+			if (nl === -1) return null;
 			i = nl + 1;
 			continue;
 		}
 		if (code[i] === "/" && code[i + 1] === "*") {
 			const end = code.indexOf("*/", i + 2);
-			if (end === -1) return false;
+			if (end === -1) return null;
 			i = end + 2;
 			continue;
 		}
 		const quote = code[i];
-		if (quote !== "\"" && quote !== "'") return false;
+		if (quote !== "\"" && quote !== "'") return null;
 		const closing = code.indexOf(quote, i + 1);
-		if (closing === -1) return false;
+		if (closing === -1) return null;
 		const directive = code.slice(i + 1, closing);
-		if (directive === "use client" || directive === "use server") return true;
+		if (directive === "use client" || directive === "use server") return directive;
 		i = closing + 1;
 		while (i < len && (code[i] === ";" || code[i] === " " || code[i] === "	")) i++;
 		if (code[i] === "\n") i++;
 	}
-	return false;
+	return null;
+}
+function hasReactDirective(code) {
+	return getLeadingReactDirective(code) !== null;
 }
 function generateRootParamsModule(rootParamNames) {
 	const names = Array.from(new Set(rootParamNames)).filter(isValidExportIdentifier).sort();
@@ -382,7 +401,9 @@ function generateRootParamsModule(rootParamNames) {
 const _reactServerShims = new Map([
 	["next/navigation", "navigation"],
 	["next/navigation.js", "navigation"],
-	["next/dist/client/components/navigation", "navigation"]
+	["next/dist/client/components/navigation", "navigation"],
+	["next/error", "error"],
+	["next/error.js", "error"]
 ]);
 const clientManualChunks = createClientManualChunks(_shimsDir);
 const clientCodeSplittingConfig = createClientCodeSplittingConfig(clientManualChunks);
@@ -397,6 +418,7 @@ function vinext(options = {}) {
 	const viteMajorVersion = getViteMajorVersion();
 	let root;
 	let pagesDir;
+	let canonicalPagesDir;
 	let appDir;
 	let hasAppDir = false;
 	let hasPagesDir = false;
@@ -416,6 +438,19 @@ function vinext(options = {}) {
 	let rscClassificationManifest = null;
 	const shimsDir = path.resolve(__dirname, "shims");
 	const canonicalize = (p) => tryRealpathSync(p) ?? p;
+	const pageTransformCanonicalPaths = /* @__PURE__ */ new Map();
+	const canonicalizePageTransformPath = (modulePath) => {
+		const cached = pageTransformCanonicalPaths.get(modulePath);
+		if (cached) return cached;
+		const canonicalPath = canonicalize(modulePath);
+		pageTransformCanonicalPaths.set(modulePath, canonicalPath);
+		return canonicalPath;
+	};
+	const isWithinPagesDirectory = (modulePath) => modulePath === pagesDir || modulePath.startsWith(`${pagesDir}/`) || modulePath === canonicalPagesDir || modulePath.startsWith(`${canonicalPagesDir}/`);
+	const isApiPage = (canonicalId) => {
+		const relativePath = fileMatcher.stripExtension(canonicalId.slice(canonicalPagesDir.length));
+		return relativePath === "/api" || relativePath.startsWith("/api/");
+	};
 	const dynamicShimPaths = new Set([
 		resolveShimModulePath(shimsDir, "headers"),
 		resolveShimModulePath(shimsDir, "server"),
@@ -438,7 +473,7 @@ function vinext(options = {}) {
 	* __NEXT_DATA__ to determine which page to hydrate.
 	*/
 	async function generateClientEntry$1() {
-		const appPrefetchRoutes = hasAppDir ? (await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)).filter(isLinkPrefetchRoute).map(toLinkPrefetchRoute) : [];
+		const appPrefetchRoutes = hasAppDir ? (await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)).map((route) => isLinkPrefetchRoute(route) ? toLinkPrefetchRoute(route) : toDocumentOnlyAppRoute(route)) : [];
 		return generateClientEntry(pagesDir, nextConfig, fileMatcher, {
 			appPrefetchRoutes,
 			instrumentationClientPath
@@ -484,6 +519,9 @@ function vinext(options = {}) {
 		});
 	}
 	const imageImportDimCache = /* @__PURE__ */ new Map();
+	const staticImageAssets = /* @__PURE__ */ new Map();
+	const staticImageImportsByModule = /* @__PURE__ */ new Map();
+	const writtenStaticImageFiles = /* @__PURE__ */ new Set();
 	let mdxDelegate = null;
 	let mdxDelegatePromise = null;
 	let hasUserMdxPlugin = false;
@@ -560,7 +598,7 @@ function vinext(options = {}) {
 				for (const [key, value] of Object.entries(dotenvVars)) if (process.env[key] === void 0) process.env[key] = value;
 				let resolvedNodeEnv;
 				if (mode === "test") resolvedNodeEnv = "test";
-				else if (env?.command === "build") resolvedNodeEnv = "production";
+				else if (env?.command === "build" || env?.isPreview === true) resolvedNodeEnv = "production";
 				else resolvedNodeEnv = "development";
 				if (process.env.NODE_ENV !== resolvedNodeEnv) process.env.NODE_ENV = resolvedNodeEnv;
 				let baseDir;
@@ -575,6 +613,7 @@ function vinext(options = {}) {
 					else baseDir = root;
 				}
 				pagesDir = path.posix.join(baseDir, "pages");
+				canonicalPagesDir = canonicalize(pagesDir);
 				appDir = path.posix.join(baseDir, "app");
 				hasPagesDir = fs.existsSync(pagesDir);
 				hasAppDir = !options.disableAppRouter && fs.existsSync(appDir);
@@ -589,7 +628,7 @@ function vinext(options = {}) {
 						}
 						rawConfig = await resolveNextConfigInput(options.nextConfig, phase);
 					} else rawConfig = await loadNextConfig(root, phase);
-					nextConfig = await resolveNextConfig(rawConfig, root);
+					nextConfig = await resolveNextConfig(rawConfig, root, { dev: env?.command === "serve" && env?.isPreview !== true });
 					const sharedBuildId = process.env.__VINEXT_SHARED_BUILD_ID;
 					if (sharedBuildId && sharedBuildId.length > 0) nextConfig = {
 						...nextConfig,
@@ -608,7 +647,10 @@ function vinext(options = {}) {
 				clientInjectModule = instrumentationClientInjects.length ? generateInstrumentationClientInjectModule(instrumentationClientInjects, instrumentationClientPath, INSTRUMENTATION_CLIENT_EMPTY_MODULE) : null;
 				if (env?.command === "build") await writeRouteTypes();
 				const defines = getNextPublicEnvDefines();
-				if (!config.define || typeof config.define !== "object" || !("process.env.NODE_ENV" in config.define)) defines["process.env.NODE_ENV"] = JSON.stringify(resolvedNodeEnv);
+				const userNodeEnvDefine = config.define?.["process.env.NODE_ENV"];
+				const hasUserNodeEnvDefine = Object.hasOwn(config.define ?? {}, "process.env.NODE_ENV");
+				const nodeEnvDefine = hasUserNodeEnvDefine ? serializeViteDefine(userNodeEnvDefine) : JSON.stringify(resolvedNodeEnv);
+				if (!hasUserNodeEnvDefine) defines["process.env.NODE_ENV"] = nodeEnvDefine;
 				for (const [key, value] of Object.entries(nextConfig.env)) {
 					if (key === "NODE_ENV") continue;
 					defines[`process.env.${key}`] = JSON.stringify(value);
@@ -617,6 +659,8 @@ function vinext(options = {}) {
 				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");
 				defines["process.env.__NEXT_GESTURE_TRANSITION"] = JSON.stringify(nextConfig.gestureTransition);
+				defines["process.env.__NEXT_APP_NAV_FAIL_HANDLING"] = JSON.stringify(nextConfig.appNavFailHandling);
+				defines["process.env.__NEXT_SCROLL_RESTORATION"] = JSON.stringify(nextConfig.scrollRestoration ? "true" : "false");
 				defines["process.env.__VINEXT_TRAILING_SLASH"] = JSON.stringify(nextConfig.trailingSlash ? "true" : "false");
 				defines["process.env.__VINEXT_IMAGE_REMOTE_PATTERNS"] = JSON.stringify(JSON.stringify(nextConfig.images?.remotePatterns ?? []));
 				defines["process.env.__VINEXT_IMAGE_DOMAINS"] = JSON.stringify(JSON.stringify(nextConfig.images?.domains ?? []));
@@ -643,6 +687,7 @@ function vinext(options = {}) {
 					];
 					defines["process.env.__VINEXT_IMAGE_DEVICE_SIZES"] = JSON.stringify(JSON.stringify(deviceSizes));
 					defines["process.env.__VINEXT_IMAGE_SIZES"] = JSON.stringify(JSON.stringify(imageSizes));
+					defines["process.env.__VINEXT_IMAGE_QUALITIES"] = JSON.stringify(JSON.stringify(nextConfig.images?.qualities ?? null));
 				}
 				defines["process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_SVG"] = JSON.stringify(String(nextConfig.images?.dangerouslyAllowSVG ?? false));
 				defines["process.env.__VINEXT_IMAGE_DANGEROUSLY_ALLOW_LOCAL_IP"] = JSON.stringify(String(nextConfig.images?.dangerouslyAllowLocalIP ?? false));
@@ -681,7 +726,6 @@ function vinext(options = {}) {
 					"next/web-vitals": path.join(shimsDir, "web-vitals"),
 					"next/amp": path.join(shimsDir, "amp"),
 					"next/offline": path.join(shimsDir, "offline"),
-					"next/error": path.join(shimsDir, "error"),
 					"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"),
@@ -791,7 +835,6 @@ function vinext(options = {}) {
 							...nextConfig.aliases,
 							...nextShimMap
 						},
-						extensions: buildViteResolveExtensions(nextConfig.pageExtensions),
 						dedupe: [
 							"react",
 							"react-dom",
@@ -803,12 +846,15 @@ function vinext(options = {}) {
 					...viteMajorVersion >= 8 ? { oxc: { jsx: { runtime: "automatic" } } } : { esbuild: { jsx: "automatic" } },
 					define: defines,
 					...nextConfig.basePath ? { base: nextConfig.basePath + "/" } : {},
-					...nextConfig.assetPrefix ? { experimental: { renderBuiltUrl: (filename) => {
-						const urlPrefix = resolveAssetUrlPrefix(nextConfig.assetPrefix);
-						const dirPrefix = resolveAssetsDir(nextConfig.assetPrefix) + "/";
-						return urlPrefix + (filename.startsWith(dirPrefix) ? filename.slice(dirPrefix.length) : filename.startsWith(`_next/static/`) ? filename.slice(ASSET_PREFIX_URL_DIR.length + 1) : filename);
-					} } } : {},
+					...nextConfig.assetPrefix || nextConfig.deploymentId ? { experimental: { renderBuiltUrl: (filename, context) => renderVinextBuiltUrl(filename, nextConfig.assetPrefix, nextConfig.deploymentId, context.hostType) } } : {},
 					css: {
+						...nextConfig.useLightningcss ? {
+							transformer: "lightningcss",
+							lightningcss: {
+								...nextConfig.lightningCssFeatures.include ? { include: nextConfig.lightningCssFeatures.include } : {},
+								...nextConfig.lightningCssFeatures.exclude ? { exclude: nextConfig.lightningCssFeatures.exclude } : {}
+							}
+						} : {},
 						...postcssOverride ? { postcss: postcssOverride } : {},
 						preprocessorOptions: (() => {
 							const tildeImporter = createSassTildeImporter(root);
@@ -835,10 +881,15 @@ function vinext(options = {}) {
 						if (shimBase !== void 0) return resolveShimModulePath(shimsDir, shimBase);
 					}
 				};
+				const depOptimizeNodeEnvOptions = getDepOptimizeNodeEnvOptions(viteMajorVersion, nodeEnvDefine);
 				viteConfig.optimizeDeps = {
 					exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["@tailwindcss/oxide"]),
 					...incomingInclude.length > 0 ? { include: incomingInclude } : {},
-					rolldownOptions: { plugins: [depOptimizeAliasPlugin] }
+					...depOptimizeNodeEnvOptions,
+					rolldownOptions: {
+						...depOptimizeNodeEnvOptions.rolldownOptions,
+						plugins: [depOptimizeAliasPlugin]
+					}
 				};
 				const pagesOptimizeEntries = !hasAppDir ? [...hasPagesDir ? [toRelativeFileEntry(root, pagesDir) + "/**/*.{tsx,ts,jsx,js}"] : [], ...[instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : [])] : [];
 				if (hasAppDir) {
@@ -860,7 +911,9 @@ function vinext(options = {}) {
 							} },
 							optimizeDeps: {
 								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE),
-								entries: optimizeEntries
+								entries: optimizeEntries,
+								include: [...new Set([...incomingInclude, "react-server-dom-webpack/static.edge"])],
+								...depOptimizeNodeEnvOptions
 							},
 							build: {
 								outDir: options.rscOutDir ?? "dist/server",
@@ -877,7 +930,8 @@ function vinext(options = {}) {
 							} },
 							optimizeDeps: {
 								exclude: mergeOptimizeDepsExclude(incomingExclude, VINEXT_OPTIMIZE_DEPS_EXCLUDE, ["ipaddr.js"], userSsrExternal === true ? SSR_EXTERNAL_REACT_ENTRIES : []),
-								entries: optimizeEntries
+								entries: optimizeEntries,
+								...depOptimizeNodeEnvOptions
 							},
 							build: {
 								outDir: options.ssrOutDir ?? "dist/server/ssr",
@@ -950,7 +1004,10 @@ function vinext(options = {}) {
 							],
 							noExternal: true
 						},
-						optimizeDeps: { exclude: ["ipaddr.js"] },
+						optimizeDeps: {
+							exclude: ["ipaddr.js"],
+							...depOptimizeNodeEnvOptions
+						},
 						build: {
 							outDir: "dist/server",
 							...withBuildBundlerOptions(viteMajorVersion, {
@@ -966,8 +1023,29 @@ function vinext(options = {}) {
 				};
 				return viteConfig;
 			},
-			configResolved(config) {
+			configEnvironment(name, config) {
+				const configuredExtensions = name === "client" ? nextConfig.resolveExtensions : nextConfig.serverResolveExtensions;
+				const extensions = configuredExtensions === null ? buildViteResolveExtensions(nextConfig.pageExtensions, config.resolve?.extensions) : normalizeViteResolveExtensions(configuredExtensions);
+				config.resolve ??= {};
+				config.resolve.extensions = extensions;
+				return null;
+			},
+			async configResolved(config) {
 				sassComposesLoader.setResolvedConfig(config);
+				if (config.command === "build" && hasAppDir && hasPagesDir) {
+					const [appRoutes, pageRoutes, apiRoutes] = await Promise.all([
+						appRouter(appDir, nextConfig?.pageExtensions, fileMatcher),
+						pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher),
+						apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)
+					]);
+					validateHybridRouteConflicts([...pageRoutes, ...apiRoutes].map((route) => ({
+						...route,
+						sourcePath: path.relative(root, route.filePath)
+					})), appRoutes.filter((route) => route.pagePath !== null || route.routePath !== null).map((route) => ({
+						...route,
+						sourcePath: path.relative(root, route.pagePath ?? route.routePath)
+					})));
+				}
 				if (hasAppDir) {
 					const ssrEnv = config.environments?.ssr;
 					if (ssrEnv?.resolve?.external === true && Array.isArray(ssrEnv.resolve.noExternal)) ssrEnv.resolve.noExternal = ssrEnv.resolve.noExternal.filter((entry) => typeof entry !== "string" || !SSR_EXTERNAL_REACT_ENTRIES.includes(entry));
@@ -989,10 +1067,11 @@ function vinext(options = {}) {
 				}));
 			},
 			resolveId: {
-				filter: { id: /(?:next\/|virtual:vinext-|^@vercel\/og(?:\.js)?$)/ },
+				filter: { id: /(?:next\/|vinext\/shims\/|virtual:vinext-|@vercel\/og(?:\.js)?$)/ },
 				handler(id, importer) {
 					const cleanId = id.startsWith("\0") ? id.slice(1) : id;
 					if (isVercelOgImport(cleanId) && !isVinextOgShimImporter(importer)) return resolveShimModulePath(_shimsDir, "og");
+					if (cleanId.startsWith("vinext/shims/")) return resolveShimModulePath(_shimsDir, stripJsExtension(stripViteModuleQuery(cleanId.slice(13))));
 					if (cleanId === VIRTUAL_SERVER_ENTRY) return RESOLVED_SERVER_ENTRY;
 					if (cleanId === VIRTUAL_CLIENT_ENTRY) return RESOLVED_CLIENT_ENTRY;
 					if (cleanId.endsWith("/virtual:vinext-server-entry") || cleanId.endsWith("\\virtual:vinext-server-entry")) return RESOLVED_SERVER_ENTRY;
@@ -1038,7 +1117,13 @@ function vinext(options = {}) {
 						reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
 						cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
 						inlineCss: nextConfig?.inlineCss,
+						cacheComponents: nextConfig?.cacheComponents,
 						i18n: nextConfig?.i18n,
+						imageConfig: {
+							deviceSizes: nextConfig?.images?.deviceSizes,
+							imageSizes: nextConfig?.images?.imageSizes,
+							qualities: nextConfig?.images?.qualities
+						},
 						hasPagesDir,
 						publicFiles: scanPublicFileRoutes(root),
 						globalNotFoundPath,
@@ -1050,7 +1135,17 @@ function vinext(options = {}) {
 				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);
-					return generateBrowserEntry(graph.routes, graph.routeManifest);
+					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.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
 			},
@@ -1257,11 +1352,65 @@ function vinext(options = {}) {
 						if (mod) env.moduleGraph.invalidateModule(mod);
 					}
 				}
+				function invalidateHybridClientEntries() {
+					if (!hasAppDir || !hasPagesDir) return;
+					for (const env of Object.values(server.environments)) for (const id of [RESOLVED_CLIENT_ENTRY, RESOLVED_APP_BROWSER_ENTRY]) {
+						const mod = env.moduleGraph.getModuleById(id);
+						if (mod) env.moduleGraph.invalidateModule(mod);
+					}
+					server.ws.send({ type: "full-reload" });
+				}
+				function invalidatePagesServerEntry() {
+					for (const env of Object.values(server.environments)) {
+						const mod = env.moduleGraph.getModuleById(RESOLVED_SERVER_ENTRY);
+						if (mod) env.moduleGraph.invalidateModule(mod);
+					}
+					pagesRunner?.clearCache();
+				}
 				function invalidateAppRoutingModules() {
 					invalidateAppRouteCache();
 					invalidateRscEntryModule();
 					invalidateRootParamsModule();
 				}
+				let hybridRouteValidation = Promise.resolve();
+				let hybridRouteValidationError = null;
+				function sendHybridRouteValidationError(error) {
+					server.ws.send({
+						type: "error",
+						err: {
+							message: error.message,
+							stack: error.stack ?? error.message
+						}
+					});
+				}
+				server.ws.on("connection", () => {
+					if (hybridRouteValidationError) sendHybridRouteValidationError(hybridRouteValidationError);
+				});
+				function revalidateHybridRoutes() {
+					if (!hasAppDir || !hasPagesDir) return;
+					hybridRouteValidation = hybridRouteValidation.catch(() => {}).then(async () => {
+						const [appRoutes, pageRoutes, apiRoutes] = await Promise.all([
+							appRouter(appDir, nextConfig?.pageExtensions, fileMatcher),
+							pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher),
+							apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher)
+						]);
+						validateHybridRouteConflicts([...pageRoutes, ...apiRoutes].map((route) => ({
+							...route,
+							sourcePath: path.relative(root, route.filePath)
+						})), appRoutes.filter((route) => route.pagePath !== null || route.routePath !== null).map((route) => ({
+							...route,
+							sourcePath: path.relative(root, route.pagePath ?? route.routePath)
+						})));
+						if (hybridRouteValidationError) {
+							hybridRouteValidationError = null;
+							server.ws.send({ type: "full-reload" });
+						}
+					}).catch((error) => {
+						const err = error instanceof Error ? error : new Error(String(error));
+						hybridRouteValidationError = err;
+						sendHybridRouteValidationError(err);
+					});
+				}
 				let appRouteTypeGeneration = null;
 				let appRouteTypeGenerationPending = false;
 				function warnRouteTypeGenerationFailure(error) {
@@ -1286,21 +1435,42 @@ function vinext(options = {}) {
 					});
 				}
 				regenerateAppRouteTypes();
+				revalidateHybridRoutes();
 				server.httpServer?.on("connection", (socket) => {
 					socket.on("error", () => {});
 				});
 				server.watcher.on("add", (filePath) => {
-					if (hasPagesDir && filePath.startsWith(pagesDir) && pageExtensions.test(filePath)) invalidateRouteCache(pagesDir);
+					let routeChanged = false;
+					if (hasPagesDir && filePath.startsWith(pagesDir) && pageExtensions.test(filePath)) {
+						invalidateRouteCache(pagesDir);
+						routeChanged = true;
+					}
 					if (hasAppDir && shouldInvalidateAppRouteFile(appDir, filePath, fileMatcher)) {
 						invalidateAppRoutingModules();
 						regenerateAppRouteTypes();
+						routeChanged = true;
+					}
+					if (routeChanged) {
+						invalidatePagesServerEntry();
+						invalidateHybridClientEntries();
+						revalidateHybridRoutes();
 					}
 				});
 				server.watcher.on("unlink", (filePath) => {
-					if (hasPagesDir && filePath.startsWith(pagesDir) && pageExtensions.test(filePath)) invalidateRouteCache(pagesDir);
+					let routeChanged = false;
+					if (hasPagesDir && filePath.startsWith(pagesDir) && pageExtensions.test(filePath)) {
+						invalidateRouteCache(pagesDir);
+						routeChanged = true;
+					}
 					if (hasAppDir && shouldInvalidateAppRouteFile(appDir, filePath, fileMatcher)) {
 						invalidateAppRoutingModules();
 						regenerateAppRouteTypes();
+						routeChanged = true;
+					}
+					if (routeChanged) {
+						invalidatePagesServerEntry();
+						invalidateHybridClientEntries();
+						revalidateHybridRoutes();
 					}
 				});
 				server.middlewares.use((req, res, next) => {
@@ -1321,6 +1491,51 @@ function vinext(options = {}) {
 				});
 				installDevStackSourcemapMiddleware(server);
 				return () => {
+					const viteFilesystemMiddlewares = server.middlewares.stack.filter(({ handle }) => {
+						const name = typeof handle === "function" ? handle.name : "";
+						return name === "viteServePublicMiddleware" || name === "viteServeStaticMiddleware";
+					}).map(({ handle }) => handle).filter((handle) => typeof handle === "function");
+					const serveRewrittenViteFilesystemRoute = async (req, res, requestPathname, stagedHeaders) => {
+						const originalUrl = req.url;
+						const originalStatusCode = res.statusCode;
+						const originalStatusMessage = res.statusMessage;
+						const originalHeaders = res.getHeaders();
+						req.url = requestPathname;
+						for (const [key, value] of Object.entries(stagedHeaders)) res.setHeader(key, value);
+						const restore = () => {
+							req.url = originalUrl;
+							res.statusCode = originalStatusCode;
+							res.statusMessage = originalStatusMessage;
+							for (const key of Object.keys(res.getHeaders())) res.removeHeader(key);
+							for (const [key, value] of Object.entries(originalHeaders)) if (value !== void 0) res.setHeader(key, value);
+						};
+						try {
+							for (const middleware of viteFilesystemMiddlewares) if (await new Promise((resolve, reject) => {
+								let settled = false;
+								const settle = (value, error) => {
+									if (settled) return;
+									settled = true;
+									res.off("finish", onServed);
+									res.off("close", onServed);
+									if (error) reject(error);
+									else resolve(value);
+								};
+								const onServed = () => settle("served");
+								res.once("finish", onServed);
+								res.once("close", onServed);
+								middleware(req, res, (error) => settle("next", error));
+								if (res.writableEnded) settle("served");
+							}) === "served") {
+								req.url = originalUrl;
+								return true;
+							}
+						} catch (error) {
+							restore();
+							throw error;
+						}
+						restore();
+						return false;
+					};
 					if (instrumentationPath && !hasAppDir) runInstrumentation(getPagesRunner(), instrumentationPath).catch((err) => {
 						console.error("[vinext] Instrumentation error:", err);
 					});
@@ -1377,6 +1592,7 @@ function vinext(options = {}) {
 					const handlePagesMiddleware = async (req, res, next) => {
 						try {
 							let url = req.url ?? "/";
+							const originalRequestUrl = url;
 							if (!hasPagesDir) return next();
 							if (url.startsWith("/@") || url.startsWith("/__vite") || url.startsWith("/node_modules")) return next();
 							if (url.split("?")[0].endsWith(".rsc")) return next();
@@ -1394,20 +1610,12 @@ function vinext(options = {}) {
 								return;
 							}
 							if (isImageOptimizationPath(url.split("?")[0])) {
-								const rawImgUrl = new URLSearchParams(url.split("?")[1] ?? "").get("url");
-								const imgUrl = rawImgUrl?.replaceAll("\\", "/") ?? null;
-								if (!imgUrl || !imgUrl.startsWith("/") || imgUrl.startsWith("//") || imgUrl.startsWith("/@") || imgUrl.startsWith("/__vite") || imgUrl.startsWith("/node_modules")) {
-									res.writeHead(400);
-									res.end(!rawImgUrl ? "Missing url parameter" : "Only relative URLs allowed");
-									return;
-								}
-								const resolvedImg = new URL(imgUrl, `http://${req.headers.host || "localhost"}`);
-								if (resolvedImg.origin !== `http://${req.headers.host || "localhost"}`) {
+								const encodedLocation = resolveDevImageRedirect(new URL(url, `http://${req.headers.host || "localhost"}`), [...nextConfig.images?.deviceSizes ?? DEFAULT_DEVICE_SIZES, ...nextConfig.images?.imageSizes ?? DEFAULT_IMAGE_SIZES], nextConfig.images?.qualities);
+								if (!encodedLocation) {
 									res.writeHead(400);
-									res.end("Only relative URLs allowed");
+									res.end("Invalid image optimization parameters");
 									return;
 								}
-								const encodedLocation = resolvedImg.pathname + resolvedImg.search;
 								res.writeHead(302, { Location: encodedLocation });
 								res.end();
 								return;
@@ -1449,6 +1657,7 @@ function vinext(options = {}) {
 									return;
 								}
 							}
+							if (hasCloudflarePlugin) return next();
 							let isDataReq = false;
 							if (isNextDataPathname(pathname)) {
 								const devBuildId = nextConfig?.buildId ?? process.env.__VINEXT_BUILD_ID ?? "development";
@@ -1468,10 +1677,17 @@ function vinext(options = {}) {
 									return;
 								}
 							}
-							if (pathname.includes(".") && !pathname.endsWith(".html")) return next();
-							if (hasCloudflarePlugin) return next();
-							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([, v]) => v !== void 0).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
-							const isDataRequest = rawHeaders.get("x-nextjs-data") === "1";
+							const filePathMatchesRewrite = [
+								...nextConfig?.rewrites.beforeFiles ?? [],
+								...nextConfig?.rewrites.afterFiles ?? [],
+								...nextConfig?.rewrites.fallback ?? []
+							].some((rewrite) => matchesRewriteSource(pathname, rewrite, {
+								basePath: bp,
+								hadBasePath: true
+							}));
+							if (pathname.includes(".") && !pathname.endsWith(".html") && !filePathMatchesRewrite) return next();
+							const rawHeaders = new Headers(Object.fromEntries(Object.entries(req.headers).filter(([k, v]) => v !== void 0 && !k.startsWith(":")).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
+							const isDataRequest = isDataReq;
 							const nodeRequestHeaders = filterInternalHeaders(rawHeaders);
 							for (const header of INTERNAL_HEADERS) delete req.headers[header];
 							for (const header of VINEXT_INTERNAL_HEADERS) delete req.headers[header];
@@ -1542,6 +1758,10 @@ function vinext(options = {}) {
 										externalInit.duplex = "half";
 									}
 									return proxyExternalRequest(new Request(new URL(url, requestOrigin), externalInit), externalUrl);
+								},
+								serveFilesystemRoute: async (requestPathname, stagedHeaders, phase) => {
+									if (phase === "direct" || req.method !== "GET" && req.method !== "HEAD" || requestPathname === "/" || requestPathname === "/api" || requestPathname.startsWith("/api/")) return false;
+									return serveRewrittenViteFilesystemRoute(req, res, requestPathname, stagedHeaders);
 								}
 							});
 							if (pipelineResult.type === "response") {
@@ -1559,12 +1779,22 @@ function vinext(options = {}) {
 							};
 							if (pipelineResult.type === "api") {
 								const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
-								if (matchRoute(pipelineResult.apiUrl, apiRoutes)) {
+								const apiMatch = matchRoute(pipelineResult.apiUrl, apiRoutes);
+								if (apiMatch && hasAppDir && appDir) {
+									const appRoutes = await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher);
+									const appMatch = matchAppRoute(pipelineResult.apiUrl, appRoutes);
+									if (appMatch && !pagesRouteHasPriorityOverAppRoute(apiMatch.route, appMatch.route)) return next();
+								}
+								if (apiMatch) {
 									flushStagedHeaders();
 									flushRequestHeaders();
 									if (pipelineResult.middlewareStatus !== void 0) req.__vinextMiddlewareStatus = pipelineResult.middlewareStatus;
 								}
-								if (await handleApiRoute(getPagesRunner(), req, res, pipelineResult.apiUrl, apiRoutes)) return;
+								if (await handleApiRoute(getPagesRunner(), req, res, pipelineResult.apiUrl, apiRoutes, {
+									basePath: nextConfig?.basePath,
+									i18n: nextConfig?.i18n,
+									trailingSlash: nextConfig?.trailingSlash
+								})) return;
 								if (hasAppDir) return next();
 								res.statusCode = 404;
 								res.end("404 - API route not found");
@@ -1572,13 +1802,19 @@ function vinext(options = {}) {
 							}
 							{
 								const routes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
-								if (!matchRoute(pipelineResult.resolvedUrl.split("?")[0], routes) && hasAppDir) return next();
-								const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata);
+								const resolvedPathname = pipelineResult.resolvedUrl.split("#", 1)[0].split("?", 1)[0];
+								const renderMatch = matchRoute(resolvedPathname, routes);
+								if (hasAppDir && appDir) {
+									if (!renderMatch) return next();
+									const appMatch = matchAppRoute(resolvedPathname, await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher));
+									if (appMatch && !pagesRouteHasPriorityOverAppRoute(renderMatch.route, appMatch.route)) return next();
+								}
+								const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, (nextConfig?.rewrites.beforeFiles.length ?? 0) > 0 || (nextConfig?.rewrites.afterFiles.length ?? 0) > 0 || (nextConfig?.rewrites.fallback.length ?? 0) > 0, nextConfig?.clientTraceMetadata, nextConfig?.htmlLimitedBots);
 								flushStagedHeaders();
 								flushRequestHeaders();
 								if (pipelineResult.middlewareStatus !== void 0) req.__vinextMiddlewareStatus = pipelineResult.middlewareStatus;
 								req.url = pipelineResult.resolvedUrl;
-								await handler(req, res, pipelineResult.resolvedUrl, req.__vinextMiddlewareStatus, pipelineResult.isDataReq);
+								await handler(req, res, pipelineResult.resolvedUrl, req.__vinextMiddlewareStatus, pipelineResult.isDataReq, originalRequestUrl);
 							}
 						} catch (e) {
 							next(e);
@@ -1590,6 +1826,42 @@ function vinext(options = {}) {
 				};
 			}
 		},
+		{
+			name: "vinext:validate-page-exports",
+			transform: { handler(code, id) {
+				if (this.environment?.name !== "client") return null;
+				if (!hasPagesDir || id.startsWith("\0") || !hasExportAllCandidate(code)) return null;
+				const modulePath = stripViteModuleQuery(id);
+				if (!isWithinPagesDirectory(modulePath)) return null;
+				const canonicalId = canonicalizePageTransformPath(modulePath);
+				if (!isWithinPagesDirectory(canonicalId)) return null;
+				if (!fileMatcher.isPageFile(canonicalId)) return null;
+				if (isApiPage(canonicalId)) return null;
+				validatePageExports(code);
+				return null;
+			} }
+		},
+		{
+			name: "vinext:strip-server-exports",
+			transform: { handler(code, id) {
+				if (this.environment?.name !== "client") return null;
+				if (!hasPagesDir || id.startsWith("\0") || !hasServerExportCandidate(code)) return null;
+				const modulePath = stripViteModuleQuery(id);
+				if (!isWithinPagesDirectory(modulePath)) return null;
+				const canonicalId = canonicalizePageTransformPath(modulePath);
+				if (!isWithinPagesDirectory(canonicalId)) return null;
+				if (!fileMatcher.isPageFile(canonicalId)) return null;
+				const relativePath = canonicalId.slice(canonicalPagesDir.length);
+				if (isApiPage(canonicalId)) return null;
+				if (/^\/(?:_app|_document|_error)(?:\.[^/]*)?$/.test(relativePath)) return null;
+				const result = stripServerExports(code);
+				if (!result) return null;
+				return {
+					code: result,
+					map: null
+				};
+			} }
+		},
 		{
 			name: "vinext:validate-server-only-client-imports",
 			transform: {
@@ -1600,31 +1872,12 @@ function vinext(options = {}) {
 				handler(code, id) {
 					if (this.environment?.name !== "client") return null;
 					if (id.startsWith("\0")) return null;
+					if (getLeadingReactDirective(code) === "use server") return null;
 					if (!hasServerOnlyMarkerImport(code)) return null;
 					throw new Error(`You're importing a module that depends on "server-only". This API is only available in Server Components in the App Router, but this module is reachable from a client bundle.`);
 				}
 			}
 		},
-		{
-			name: "vinext:strip-server-exports",
-			transform: {
-				filter: { id: /\.(tsx?|jsx?|mjs)$/ },
-				handler(code, id) {
-					if (this.environment?.name !== "client") return null;
-					if (!hasPagesDir) return null;
-					if (!id.startsWith(pagesDir)) return null;
-					const relativePath = id.slice(pagesDir.length);
-					if (relativePath.startsWith("/api/") || relativePath === "/api") return null;
-					if (/\/_(?:app|document|error)\b/.test(relativePath)) return null;
-					const result = stripServerExports(code);
-					if (!result) return null;
-					return {
-						code: result,
-						map: null
-					};
-				}
-			}
-		},
 		{
 			name: "vinext:remove-console",
 			apply: "build",
@@ -1643,6 +1896,16 @@ function vinext(options = {}) {
 				}
 			}
 		},
+		{
+			name: "vinext:typeof-window",
+			enforce: "post",
+			transform: {
+				filter: { code: /typeof\s+window/ },
+				handler(code) {
+					return replaceTypeofWindow(code, getTypeofWindowReplacement(this.environment));
+				}
+			}
+		},
 		{
 			name: "vinext:compiler-define-server",
 			configEnvironment(name) {
@@ -1658,16 +1921,36 @@ function vinext(options = {}) {
 			name: "vinext:image-imports",
 			enforce: "pre",
 			_dimCache: imageImportDimCache,
+			buildStart() {
+				imageImportDimCache.clear();
+				staticImageAssets.clear();
+			},
+			watchChange(id) {
+				imageImportDimCache.delete(id);
+				staticImageAssets.delete(id);
+				staticImageImportsByModule.delete(id);
+			},
 			resolveId: {
-				filter: { id: /\?vinext-meta$/ },
+				filter: { id: /\?vinext-(?:image-url|meta)$/ },
 				handler(source, _importer) {
-					if (!source.endsWith("?vinext-meta")) return null;
-					return `\0vinext-image-meta:${source.replace("?vinext-meta", "")}`;
+					if (source.endsWith("?vinext-image-url")) return `\0vinext-image-url:${source.slice(0, -17)}`;
+					if (source.endsWith("?vinext-meta")) return `\0vinext-image-meta:${source.slice(0, -12)}`;
+					return null;
 				}
 			},
 			async load(id) {
+				if (id.startsWith("\0vinext-image-url:")) {
+					const imagePath = id.replace("\0vinext-image-url:", "");
+					this.addWatchFile(imagePath);
+					if (this.environment.config.command === "serve") return `import url from ${JSON.stringify(imagePath + "?url")}; export default url;`;
+					const asset = createStaticImageAsset(imagePath);
+					staticImageAssets.set(imagePath, asset);
+					const builtFileName = `${resolveAssetsDir(nextConfig.assetPrefix)}/${asset.fileName}`;
+					return `export default ${JSON.stringify(renderVinextBuiltUrl(builtFileName, nextConfig.assetPrefix, nextConfig.deploymentId))};`;
+				}
 				if (!id.startsWith("\0vinext-image-meta:")) return null;
 				const imagePath = id.replace("\0vinext-image-meta:", "");
+				this.addWatchFile(imagePath);
 				const cache = imageImportDimCache;
 				let dims = cache.get(imagePath);
 				if (!dims) try {
@@ -1708,6 +1991,7 @@ function vinext(options = {}) {
 					}
 					const s = new MagicString(code);
 					let hasChanges = false;
+					const imageImports = /* @__PURE__ */ new Set();
 					for (const node of ast.body) {
 						if (node.type !== "ImportDeclaration") continue;
 						const importNode = node;
@@ -1723,18 +2007,45 @@ function vinext(options = {}) {
 						const dir = path.dirname(id);
 						const absImagePath = normalizePathSeparators(path.resolve(dir, importPath));
 						if (!fs.existsSync(absImagePath)) continue;
+						imageImports.add(absImagePath);
 						const urlVar = `__vinext_img_url_${varName}`;
 						const metaVar = `__vinext_img_meta_${varName}`;
-						const replacement = `import ${urlVar} from ${JSON.stringify(importPath)};\nimport ${metaVar} from ${JSON.stringify(absImagePath + "?vinext-meta")};\nconst ${varName} = { src: ${urlVar}, width: ${metaVar}.width, height: ${metaVar}.height };`;
+						const replacement = `import ${urlVar} from ${JSON.stringify(absImagePath + "?vinext-image-url")};\nimport ${metaVar} from ${JSON.stringify(absImagePath + "?vinext-meta")};\nconst ${varName} = { src: ${urlVar}, width: ${metaVar}.width, height: ${metaVar}.height };`;
 						s.overwrite(importNode.start, importNode.end, replacement);
 						hasChanges = true;
 					}
-					if (!hasChanges) return null;
+					if (!hasChanges) {
+						staticImageImportsByModule.delete(id);
+						return null;
+					}
+					staticImageImportsByModule.set(id, imageImports);
 					return {
 						code: s.toString(),
 						map: s.generateMap({ hires: "boundary" })
 					};
 				}
+			},
+			writeBundle: {
+				sequential: true,
+				order: "post",
+				handler(outputOptions) {
+					if (this.environment?.name !== "client") return;
+					const clientOutDir = outputOptions.dir ? path.resolve(root, outputOptions.dir) : path.resolve(root, options.clientOutDir ?? "dist/client");
+					const assetsDir = resolveAssetsDir(nextConfig.assetPrefix);
+					const activeImagePaths = new Set(Array.from(staticImageImportsByModule.values()).flatMap((imports) => [...imports]));
+					const nextWrittenFiles = /* @__PURE__ */ new Set();
+					for (const imagePath of activeImagePaths) {
+						if (!fs.existsSync(imagePath)) continue;
+						const asset = staticImageAssets.get(imagePath) ?? createStaticImageAsset(imagePath);
+						const outputPath = path.join(clientOutDir, assetsDir, asset.fileName);
+						fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+						fs.writeFileSync(outputPath, asset.source);
+						nextWrittenFiles.add(outputPath);
+					}
+					for (const outputPath of writtenStaticImageFiles) if (!nextWrittenFiles.has(outputPath)) fs.rmSync(outputPath, { force: true });
+					writtenStaticImageFiles.clear();
+					for (const outputPath of nextWrittenFiles) writtenStaticImageFiles.add(outputPath);
+				}
 			}
 		},
 		createGoogleFontsPlugin(_fontGoogleShimPath, _shimsDir),
@@ -1845,6 +2156,7 @@ function vinext(options = {}) {
 			}
 		},
 		createImportMetaUrlPlugin({ getRoot: () => root }),
+		createExtensionlessDynamicImportPlugin(),
 		createRequireContextPlugin(),
 		createOgInlineFetchAssetsPlugin(),
 		createOgAssetsPlugin(),
@@ -1861,6 +2173,9 @@ function vinext(options = {}) {
 					const outDir = options.dir;
 					if (!outDir) return;
 					const imageConfig = {
+						deviceSizes: nextConfig?.images?.deviceSizes,
+						imageSizes: nextConfig?.images?.imageSizes,
+						qualities: nextConfig?.images?.qualities,
 						dangerouslyAllowSVG: nextConfig?.images?.dangerouslyAllowSVG,
 						contentDispositionType: nextConfig?.images?.contentDispositionType,
 						contentSecurityPolicy: nextConfig?.images?.contentSecurityPolicy