vinext 0.1.3 → 0.1.5

package/dist/index.js

@@ -1,12 +1,14 @@
 import { detectPackageManager } from "./utils/project.js";
 import { normalizePathSeparators, stripJsExtension, stripViteModuleQuery } from "./utils/path.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
+import { escapeRegExp } from "./utils/regex.js";
 import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts, normalizeViteResolveExtensions } from "./routing/file-matcher.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
 import { 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 { filterInternalHeaders, isOpenRedirectShaped, normalizeTrailingSlash } from "./server/request-pipeline.js";
+import { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
+import { isOpenRedirectShaped } from "./server/open-redirect.js";
+import { filterInternalHeaders, 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";
@@ -31,7 +33,7 @@ import { planRouteClassificationInjection } from "./build/route-classification-i
 import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/constants.js";
 import { resolveAssetsDir } from "./utils/asset-prefix.js";
 import { RESOLVED_VIRTUAL_GOOGLE_FONTS, VIRTUAL_GOOGLE_FONTS, createGoogleFontsPlugin, createLocalFontsPlugin, generateGoogleFontsVirtualModule, parseStaticObjectLiteral } from "./plugins/fonts.js";
-import { 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";
@@ -41,6 +43,7 @@ import { collectInlineCssManifest, injectInlineCssManifestGlobal } from "./build
 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 { VIRTUAL_MODULE_ID_RE } from "./utils/virtual-module.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";
@@ -63,7 +66,7 @@ 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, 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";
@@ -78,12 +81,16 @@ 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";
 //#region src/index.ts
 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);
@@ -162,6 +169,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));
@@ -221,9 +241,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;
@@ -284,10 +307,21 @@ const RESOLVED_ROOT_PARAMS = "\0virtual:vinext-root-params";
 const RESOLVED_CACHE_ADAPTERS = "\0" + VIRTUAL_CACHE_ADAPTERS;
 /** Virtual module for composed instrumentation-client bootstrap. */
 const VIRTUAL_INSTRUMENTATION_CLIENT = "private-next-instrumentation-client";
-const RESOLVED_INSTRUMENTATION_CLIENT = `\0${VIRTUAL_INSTRUMENTATION_CLIENT}.mjs`;
+const RESOLVED_INSTRUMENTATION_CLIENT = `${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?";
+/** Matches a trailing image extension on an import path. Built once: `IMAGE_EXTS`
+*  is constant, so there is no need to recompile this per transform invocation. */
+const IMAGE_EXT_RE = new RegExp(`\\.(${IMAGE_EXTS})$`);
+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
@@ -297,6 +331,8 @@ const IMAGE_EXTS = "png|jpe?g|gif|webp|avif|svg|ico|bmp|tiff?";
 */
 const _shimsDir = normalizePathSeparators(path.resolve(__dirname, "shims")) + "/";
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
+const _appRscHandlerPath = resolveShimModulePath(path.resolve(__dirname, "server"), "app-rsc-handler");
+const _canExternalizeAppRscHandler = _appRscHandlerPath.endsWith(".js");
 function isValidExportIdentifier(name) {
 	return /^[$A-Z_a-z][$\w]*$/.test(name);
 }
@@ -394,6 +430,7 @@ function vinext(options = {}) {
 	const viteMajorVersion = getViteMajorVersion();
 	let root;
 	let pagesDir;
+	let canonicalPagesDir;
 	let appDir;
 	let hasAppDir = false;
 	let hasPagesDir = false;
@@ -410,9 +447,23 @@ function vinext(options = {}) {
 	let rscCompatibilityId;
 	const draftModeSecret = randomUUID();
 	const sassComposesLoader = createSassAwareFileSystemLoader();
+	const typeofWindowIdFilter = { exclude: /(?!)/ };
 	let rscClassificationManifest = null;
 	const shimsDir = path.resolve(__dirname, "shims");
-	const canonicalize = (p) => tryRealpathSync(p) ?? p;
+	const canonicalize = (p) => normalizePathSeparators(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"),
@@ -481,6 +532,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;
@@ -520,22 +574,25 @@ function vinext(options = {}) {
 		...viteMajorVersion >= 8 ? [{
 			name: "vinext:jsx-in-js",
 			enforce: "pre",
-			async transform(code, id) {
-				const cleanId = id.split("?")[0];
-				if (!/\.(m?js)$/.test(cleanId)) return;
-				if (cleanId.includes("/node_modules/")) {
-					if (!code.includes("use client") && !code.includes("use server")) return;
-					if (!hasReactDirective(code)) return;
+			transform: {
+				filter: { id: /\.m?js(?:\?.*)?$/ },
+				async handler(code, id) {
+					const cleanId = id.split("?")[0];
+					if (isInsideDirectory(__dirname, cleanId)) return;
+					if (cleanId.includes("/node_modules/")) {
+						if (!code.includes("use client") && !code.includes("use server")) return;
+						if (!hasReactDirective(code)) return;
+					}
+					const result = await transformWithOxc(code, id, {
+						lang: "jsx",
+						jsx: { runtime: "automatic" },
+						sourcemap: true
+					});
+					return {
+						code: result.code,
+						map: result.map
+					};
 				}
-				const result = await transformWithOxc(code, id, {
-					lang: "jsx",
-					jsx: { runtime: "automatic" },
-					sourcemap: true
-				});
-				return {
-					code: result.code,
-					map: result.map
-				};
 			}
 		}] : [],
 		createMiddlewareServerOnlyPlugin({
@@ -572,6 +629,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);
@@ -605,7 +663,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);
@@ -836,10 +897,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) {
@@ -855,13 +921,16 @@ function vinext(options = {}) {
 									"satori",
 									"@resvg/resvg-js",
 									"yoga-wasm-web",
+									...env?.command === "serve" && _canExternalizeAppRscHandler ? ["vinext/server/app-rsc-handler"] : [],
 									...userSsrExternal
 								],
 								...userSsrExternal === true ? {} : { noExternal: true }
 							} },
 							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",
@@ -878,7 +947,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",
@@ -951,7 +1021,10 @@ function vinext(options = {}) {
 							],
 							noExternal: true
 						},
-						optimizeDeps: { exclude: ["ipaddr.js"] },
+						optimizeDeps: {
+							exclude: ["ipaddr.js"],
+							...depOptimizeNodeEnvOptions
+						},
 						build: {
 							outDir: "dist/server",
 							...withBuildBundlerOptions(viteMajorVersion, {
@@ -975,6 +1048,8 @@ function vinext(options = {}) {
 				return null;
 			},
 			async configResolved(config) {
+				const cacheDirPrefix = getCacheDirPrefix(config.cacheDir);
+				typeofWindowIdFilter.exclude = new RegExp(`^${escapeRegExp(cacheDirPrefix)}`);
 				sassComposesLoader.setResolvedConfig(config);
 				if (config.command === "build" && hasAppDir && hasPagesDir) {
 					const [appRoutes, pageRoutes, apiRoutes] = await Promise.all([
@@ -1011,9 +1086,16 @@ function vinext(options = {}) {
 				}));
 			},
 			resolveId: {
-				filter: { id: /(?:next\/|vinext\/shims\/|virtual:vinext-|@vercel\/og(?:\.js)?$)/ },
+				filter: { id: /(?:next\/|vinext\/(?:shims\/|server\/app-rsc-handler)|virtual:vinext-|@vercel\/og(?:\.js)?$)/ },
 				handler(id, importer) {
 					const cleanId = 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,
+							external: true
+						};
+						return _appRscHandlerPath;
+					}
 					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;
@@ -1132,14 +1214,19 @@ function vinext(options = {}) {
 			name: "vinext:css-url-assets-mark",
 			enforce: "pre",
 			apply: "build",
-			transform(code, id) {
-				if (this.environment?.name !== "client") return null;
-				const marked = markCssUrlAssetReferences(code, id);
-				if (marked === null) return null;
-				return {
-					code: marked,
-					map: null
-				};
+			transform: {
+				filter: {
+					id: /\.(?:css|scss|sass|less|styl|stylus)(?:\?|$)/i,
+					code: "url("
+				},
+				handler(code, id) {
+					const marked = markCssUrlAssetReferences(code, id);
+					if (marked === null) return null;
+					return {
+						code: marked,
+						map: null
+					};
+				}
 			}
 		},
 		{
@@ -1164,7 +1251,6 @@ function vinext(options = {}) {
 			enforce: "post",
 			apply: "build",
 			generateBundle(_options, bundle) {
-				if (this.environment?.name !== "client") return;
 				restoreDedupedCssAssetReferences(bundle, (asset) => {
 					this.emitFile({
 						type: "asset",
@@ -1242,18 +1328,20 @@ function vinext(options = {}) {
 					`export const addTransitionType = _React.addTransitionType || function addTransitionType() {};`
 				].join("\n");
 			},
-			transform(code, id) {
-				if (id.includes("node_modules")) return null;
-				if (id.startsWith("\0")) return null;
-				if (!/\.(tsx?|jsx?|mjs)$/.test(id)) return null;
-				if (!(code.includes("ViewTransition") || code.includes("addTransitionType")) || !/from\s+['"]react['"]/.test(code)) return null;
-				if (!/import\s*\{[^}]*(ViewTransition|addTransitionType)[^}]*\}\s*from\s*['"]react['"]/.test(code)) return null;
-				const result = code.replace(/from\s*['"]react['"]/g, "from \"virtual:vinext-react-canary\"");
-				if (result !== code) return {
-					code: result,
-					map: null
-				};
-				return null;
+			transform: {
+				filter: {
+					id: {
+						include: /\.(tsx?|jsx?|mjs)$/,
+						exclude: [/node_modules/, VIRTUAL_MODULE_ID_RE]
+					},
+					code: /import\s*\{[^}]*(ViewTransition|addTransitionType)[^}]*\}\s*from\s*['"]react['"]/
+				},
+				handler(code) {
+					return {
+						code: code.replace(/from\s*['"]react['"]/g, "from \"virtual:vinext-react-canary\""),
+						map: null
+					};
+				}
 			}
 		},
 		{
@@ -1435,6 +1523,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);
 					});
@@ -1556,6 +1689,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";
@@ -1575,10 +1709,17 @@ function vinext(options = {}) {
 									return;
 								}
 							}
-							if (pathname.includes(".") && !pathname.endsWith(".html")) return next();
-							if (hasCloudflarePlugin) return next();
+							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 = rawHeaders.get("x-nextjs-data") === "1";
+							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];
@@ -1649,6 +1790,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") {
@@ -1714,38 +1859,63 @@ function vinext(options = {}) {
 			}
 		},
 		{
-			name: "vinext:validate-server-only-client-imports",
+			name: "vinext:validate-page-exports",
 			transform: {
 				filter: {
-					id: /\.(tsx?|jsx?|mjs)$/,
-					code: "server-only"
+					id: { exclude: VIRTUAL_MODULE_ID_RE },
+					code: /\bexport\b[\s\S]*\*/
 				},
 				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.`);
+					if (!hasPagesDir || !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: {
-				filter: { id: /\.(tsx?|jsx?|mjs)$/ },
+				filter: {
+					id: { exclude: VIRTUAL_MODULE_ID_RE },
+					code: /getServerSideProps|getStaticProps|getStaticPaths|unstable_getServerProps|unstable_getServerSideProps|unstable_getStaticProps|unstable_getStaticPaths/
+				},
 				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
-					};
+					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;
+					return stripServerExports(code);
+				}
+			}
+		},
+		{
+			name: "vinext:validate-server-only-client-imports",
+			transform: {
+				filter: {
+					id: {
+						include: /\.(tsx?|jsx?|mjs)$/,
+						exclude: VIRTUAL_MODULE_ID_RE
+					},
+					code: "server-only"
+				},
+				handler(code) {
+					if (this.environment?.name !== "client") 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.`);
 				}
 			}
 		},
@@ -1753,17 +1923,17 @@ function vinext(options = {}) {
 			name: "vinext:remove-console",
 			apply: "build",
 			transform: {
-				filter: { id: /\.(tsx?|jsx?|mjs)$/ },
-				handler(code, id) {
+				filter: {
+					id: {
+						include: /\.(tsx?|jsx?|mjs)$/,
+						exclude: /\/node_modules\//
+					},
+					code: /\bconsole\b/
+				},
+				handler(code) {
 					if (this.environment?.name !== "client") return null;
 					if (!nextConfig.removeConsole) return null;
-					if (id.includes("/node_modules/")) return null;
-					const result = removeConsoleCalls(code, nextConfig.removeConsole);
-					if (!result) return null;
-					return {
-						code: result,
-						map: null
-					};
+					return removeConsoleCalls(code, nextConfig.removeConsole);
 				}
 			}
 		},
@@ -1771,8 +1941,13 @@ function vinext(options = {}) {
 			name: "vinext:typeof-window",
 			enforce: "post",
 			transform: {
-				filter: { code: /typeof\s+window/ },
-				handler(code) {
+				filter: {
+					id: typeofWindowIdFilter,
+					code: /typeof\s+window/
+				},
+				handler(code, id) {
+					const cacheDirPrefix = getCacheDirPrefix(this.environment.config.cacheDir);
+					if (normalizePathSeparators(id).startsWith(cacheDirPrefix)) return null;
 					return replaceTypeofWindow(code, getTypeofWindowReplacement(this.environment));
 				}
 			}
@@ -1792,16 +1967,37 @@ function vinext(options = {}) {
 			name: "vinext:image-imports",
 			enforce: "pre",
 			_dimCache: imageImportDimCache,
+			buildStart() {
+				imageImportDimCache.clear();
+				staticImageAssets.clear();
+			},
+			watchChange(id) {
+				const key = normalizePathSeparators(id);
+				imageImportDimCache.delete(key);
+				staticImageAssets.delete(key);
+				staticImageImportsByModule.delete(key);
+			},
 			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 {
@@ -1824,15 +2020,11 @@ function vinext(options = {}) {
 				filter: {
 					id: {
 						include: /\.(tsx?|jsx?|mjs)$/,
-						exclude: /node_modules/
+						exclude: [/node_modules/, VIRTUAL_MODULE_ID_RE]
 					},
 					code: new RegExp(`import\\s+\\w+\\s+from\\s+['"][^'"]+\\.(${IMAGE_EXTS})['"]`)
 				},
 				async handler(code, id) {
-					if (id.includes("node_modules")) return null;
-					if (id.startsWith("\0")) return null;
-					if (!id.match(/\.(tsx?|jsx?|mjs)$/)) return null;
-					const imageExtRe = new RegExp(`\\.(${IMAGE_EXTS})$`);
 					const lang = id.endsWith(".ts") ? "ts" : "tsx";
 					let ast;
 					try {
@@ -1842,12 +2034,13 @@ 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;
 						const importPath = importNode.source?.value;
 						if (typeof importPath !== "string") continue;
-						if (!imageExtRe.test(importPath)) continue;
+						if (!IMAGE_EXT_RE.test(importPath)) continue;
 						const specifiers = importNode.specifiers ?? [];
 						if (specifiers.length !== 1) continue;
 						const specifier = specifiers[0];
@@ -1857,18 +2050,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),
@@ -1881,15 +2101,11 @@ function vinext(options = {}) {
 				filter: {
 					id: {
 						include: /\.(tsx?|jsx?|mjs)$/,
-						exclude: /node_modules/
+						exclude: [/node_modules/, VIRTUAL_MODULE_ID_RE]
 					},
 					code: "use cache"
 				},
 				async handler(code, id) {
-					if (id.includes("node_modules")) return null;
-					if (id.startsWith("\0")) return null;
-					if (!id.match(/\.(tsx?|jsx?|mjs)$/)) return null;
-					if (!code.includes("use cache")) return null;
 					const ast = parseAst(code);
 					const cacheDirective = ast.body.find((node) => node.type === "ExpressionStatement" && node.expression?.type === "Literal" && typeof node.expression.value === "string" && node.expression.value.startsWith("use cache"));
 					function nodeHasInlineCacheDirective(node) {
@@ -2286,54 +2502,56 @@ function vinext(options = {}) {
 		{
 			name: "vinext:og-font-patch",
 			enforce: "pre",
-			transform(code, id) {
-				if (!id.includes("@vercel/og") || !id.includes("index.edge.js")) return null;
-				let result = code;
-				const yogaMatch = /H = "data:application\/octet-stream;base64,([A-Za-z0-9+/]+=*)";/.exec(result);
-				if (yogaMatch) {
-					const yogaBase64 = yogaMatch[1];
-					const distDir = path.dirname(id);
-					const yogaWasmPath = path.join(distDir, "yoga.wasm");
-					if (!fs.existsSync(yogaWasmPath)) fs.writeFileSync(yogaWasmPath, Buffer.from(yogaBase64, "base64"));
-					result = result.replace(yogaMatch[0], `H = "";`);
-					const YOGA_CALL = `yoga_wasm_base64_esm_default()`;
-					const YOGA_CALL_PATCHED = [
-						`yoga_wasm_base64_esm_default({ instantiateWasm: function(imports, callback) {`,
-						`  __vi_yoga_mod.then(function(mod) {`,
-						`    if (mod) {`,
-						`      WebAssembly.instantiate(mod, imports).then(function(inst) { callback(inst); });`,
-						`    } else {`,
-						`      Promise.all([import("node:fs"), import("node:url")]).then(function(mods) {`,
-						`        var p = mods[1].fileURLToPath(new URL("./yoga.wasm", import.meta.url));`,
-						`        return mods[0].promises.readFile(p).then(function(bytes) {`,
-						`          return WebAssembly.instantiate(bytes, imports).then(function(r) { callback(r.instance); });`,
-						`        });`,
-						`      });`,
-						`    }`,
-						`  });`,
-						`  return {};`,
-						`} })`
-					].join("\n");
-					result = result.replace(YOGA_CALL, YOGA_CALL_PATCHED);
-					result = [`var __vi_yoga_mod = import("./yoga.wasm?module").then(function(m) { return m.default; }).catch(function() { return null; });`].join("\n") + "\n" + result;
-				}
-				const resvgMatch = /import\s+resvg_wasm\s+from\s+["']\.\/resvg\.wasm\?module["']\s*;?/.exec(result);
-				if (resvgMatch) {
-					const resvgLoader = [
-						`var resvg_wasm = import("./resvg.wasm?module").then(function(m) { return m.default; }).catch(function() {`,
-						`  return Promise.all([import("node:fs"), import("node:url")]).then(function(mods) {`,
-						`    var p = mods[1].fileURLToPath(new URL("./resvg.wasm", import.meta.url));`,
-						`    return mods[0].promises.readFile(p).then(function(buf) { return WebAssembly.compile(buf); });`,
-						`  });`,
-						`});`
-					].join("\n");
-					result = result.replace(resvgMatch[0], resvgLoader);
+			transform: {
+				filter: { id: /@vercel\/og.*index\.edge\.js/ },
+				handler(code, id) {
+					let result = code;
+					const yogaMatch = /H = "data:application\/octet-stream;base64,([A-Za-z0-9+/]+=*)";/.exec(result);
+					if (yogaMatch) {
+						const yogaBase64 = yogaMatch[1];
+						const distDir = path.dirname(id);
+						const yogaWasmPath = path.join(distDir, "yoga.wasm");
+						if (!fs.existsSync(yogaWasmPath)) fs.writeFileSync(yogaWasmPath, Buffer.from(yogaBase64, "base64"));
+						result = result.replace(yogaMatch[0], `H = "";`);
+						const YOGA_CALL = `yoga_wasm_base64_esm_default()`;
+						const YOGA_CALL_PATCHED = [
+							`yoga_wasm_base64_esm_default({ instantiateWasm: function(imports, callback) {`,
+							`  __vi_yoga_mod.then(function(mod) {`,
+							`    if (mod) {`,
+							`      WebAssembly.instantiate(mod, imports).then(function(inst) { callback(inst); });`,
+							`    } else {`,
+							`      Promise.all([import("node:fs"), import("node:url")]).then(function(mods) {`,
+							`        var p = mods[1].fileURLToPath(new URL("./yoga.wasm", import.meta.url));`,
+							`        return mods[0].promises.readFile(p).then(function(bytes) {`,
+							`          return WebAssembly.instantiate(bytes, imports).then(function(r) { callback(r.instance); });`,
+							`        });`,
+							`      });`,
+							`    }`,
+							`  });`,
+							`  return {};`,
+							`} })`
+						].join("\n");
+						result = result.replace(YOGA_CALL, YOGA_CALL_PATCHED);
+						result = [`var __vi_yoga_mod = import("./yoga.wasm?module").then(function(m) { return m.default; }).catch(function() { return null; });`].join("\n") + "\n" + result;
+					}
+					const resvgMatch = /import\s+resvg_wasm\s+from\s+["']\.\/resvg\.wasm\?module["']\s*;?/.exec(result);
+					if (resvgMatch) {
+						const resvgLoader = [
+							`var resvg_wasm = import("./resvg.wasm?module").then(function(m) { return m.default; }).catch(function() {`,
+							`  return Promise.all([import("node:fs"), import("node:url")]).then(function(mods) {`,
+							`    var p = mods[1].fileURLToPath(new URL("./resvg.wasm", import.meta.url));`,
+							`    return mods[0].promises.readFile(p).then(function(buf) { return WebAssembly.compile(buf); });`,
+							`  });`,
+							`});`
+						].join("\n");
+						result = result.replace(resvgMatch[0], resvgLoader);
+					}
+					if (result === code) return null;
+					return {
+						code: result,
+						map: null
+					};
 				}
-				if (result === code) return null;
-				return {
-					code: result,
-					map: null
-				};
 			}
 		}
 	];