vinext 0.1.4 → 0.1.6

package/dist/index.js

@@ -1,13 +1,15 @@
 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 { matchesRewriteSource, proxyExternalRequest } from "./config/config-matchers.js";
-import { filterInternalHeaders, isOpenRedirectShaped, normalizeTrailingSlash } from "./server/request-pipeline.js";
-import { findMiddlewareFile, runMiddleware } from "./server/middleware.js";
+import { isOpenRedirectShaped } from "./server/open-redirect.js";
+import { filterInternalHeaders, normalizeTrailingSlash } from "./server/request-pipeline.js";
+import { findMiddlewareFile, isProxyFile, 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, matchAppRoute } from "./routing/app-router.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";
@@ -49,6 +52,7 @@ import { createRscClientReferenceLoadersPlugin } from "./plugins/rsc-client-refe
 import { createInstrumentationClientTransformPlugin } from "./plugins/instrumentation-client.js";
 import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
 import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
+import { validateMiddlewareModuleExports } from "./plugins/middleware-export-validation.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
 import { createDynamicPreloadMetadataPlugin } from "./plugins/dynamic-preload-metadata.js";
@@ -63,7 +67,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 { hasExportAllCandidate, hasServerExportCandidate, stripServerExports, validatePageExports } 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";
@@ -84,6 +88,10 @@ 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);
@@ -300,10 +308,13 @@ 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);
@@ -321,6 +332,8 @@ function createStaticImageAsset(imagePath) {
 */
 const _shimsDir = normalizePathSeparators(path.resolve(__dirname, "shims")) + "/";
 const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
+const _appRscHandlerPath = resolveShimModulePath(normalizePathSeparators(path.resolve(__dirname, "server")), "app-rsc-handler");
+const _canExternalizeAppRscHandler = _appRscHandlerPath.endsWith(".js");
 function isValidExportIdentifier(name) {
 	return /^[$A-Z_a-z][$\w]*$/.test(name);
 }
@@ -435,9 +448,10 @@ 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 shimsDir = normalizePathSeparators(path.resolve(__dirname, "shims"));
+	const canonicalize = (p) => normalizePathSeparators(tryRealpathSync(p) ?? p);
 	const pageTransformCanonicalPaths = /* @__PURE__ */ new Map();
 	const canonicalizePageTransformPath = (modulePath) => {
 		const cached = pageTransformCanonicalPaths.get(modulePath);
@@ -561,22 +575,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({
@@ -642,7 +659,8 @@ function vinext(options = {}) {
 				fileMatcher = createValidFileMatcher(nextConfig.pageExtensions);
 				instrumentationPath = findInstrumentationFile(root, fileMatcher);
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
-				middlewarePath = findMiddlewareFile(root, fileMatcher);
+				const middlewareConventionDir = canonicalize(baseDir) === canonicalize(path.posix.join(root, "src")) ? path.posix.join(root, "src") : root;
+				middlewarePath = findMiddlewareFile(root, fileMatcher, middlewareConventionDir);
 				const instrumentationClientInjects = nextConfig.instrumentationClientInject.map((spec) => spec.startsWith("./") || spec.startsWith("../") ? path.resolve(root, spec) : spec);
 				clientInjectModule = instrumentationClientInjects.length ? generateInstrumentationClientInjectModule(instrumentationClientInjects, instrumentationClientPath, INSTRUMENTATION_CLIENT_EMPTY_MODULE) : null;
 				if (env?.command === "build") await writeRouteTypes();
@@ -705,55 +723,55 @@ function vinext(options = {}) {
 				}
 				for (const key of Object.keys(nextConfig.compilerDefineServer)) if (key in defines) throw new Error(`The \`compiler.defineServer\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
 				nextShimMap = Object.fromEntries(Object.entries({
-					"next/link": path.join(shimsDir, "link"),
-					"next/head": path.join(shimsDir, "head"),
-					"next/router": path.join(shimsDir, "router"),
-					"next/compat/router": path.join(shimsDir, "compat-router"),
-					"next/image": path.join(shimsDir, "image"),
-					"next/legacy/image": path.join(shimsDir, "legacy-image"),
-					"next/dynamic": path.join(shimsDir, "dynamic"),
-					"next/app": path.join(shimsDir, "app"),
-					"next/document": path.join(shimsDir, "document"),
-					"next/config": path.join(shimsDir, "config"),
-					"next/script": path.join(shimsDir, "script"),
-					"next/server": path.join(shimsDir, "server"),
-					"next/headers": path.join(shimsDir, "headers"),
-					"next/font/google": path.join(shimsDir, "font-google"),
-					"next/font/local": path.join(shimsDir, "font-local"),
-					"next/cache": path.join(shimsDir, "cache"),
-					"next/form": path.join(shimsDir, "form"),
-					"next/og": path.join(shimsDir, "og"),
-					"next/web-vitals": path.join(shimsDir, "web-vitals"),
-					"next/amp": path.join(shimsDir, "amp"),
-					"next/offline": path.join(shimsDir, "offline"),
-					"next/constants": path.join(shimsDir, "constants"),
-					"next/dist/shared/lib/app-router-context.shared-runtime": path.join(shimsDir, "internal", "app-router-context"),
-					"next/dist/shared/lib/app-router-context": path.join(shimsDir, "internal", "app-router-context"),
-					"next/dist/shared/lib/router-context.shared-runtime": path.join(shimsDir, "internal", "router-context"),
-					"next/dist/shared/lib/utils": path.join(shimsDir, "internal", "utils"),
-					"next/dist/server/api-utils": path.join(shimsDir, "internal", "api-utils"),
-					"next/dist/server/web/spec-extension/cookies": path.join(shimsDir, "internal", "cookies"),
-					"next/dist/compiled/@edge-runtime/cookies": path.join(shimsDir, "internal", "cookies"),
-					"next/dist/server/app-render/work-unit-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/client/components/work-unit-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/client/components/request-async-storage.external": path.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/client/components/request-async-storage": path.join(shimsDir, "internal", "work-unit-async-storage"),
-					"next/dist/server/request/root-params": path.join(shimsDir, "root-params"),
-					"next/dist/server/config-shared": path.join(shimsDir, "internal", "utils"),
-					"server-only": path.join(shimsDir, "server-only"),
-					"client-only": path.join(shimsDir, "client-only"),
-					"vinext/error-boundary": path.join(shimsDir, "error-boundary"),
-					"vinext/layout-segment-context": path.join(shimsDir, "layout-segment-context"),
-					"vinext/metadata": path.join(shimsDir, "metadata"),
-					"vinext/fetch-cache": path.join(shimsDir, "fetch-cache"),
-					"vinext/cache-runtime": path.join(shimsDir, "cache-runtime"),
-					"vinext/navigation-state": path.join(shimsDir, "navigation-state"),
-					"vinext/unified-request-context": path.join(shimsDir, "unified-request-context"),
-					"vinext/pages-router-runtime": path.join(shimsDir, "pages-router-runtime"),
-					"vinext/router-state": path.join(shimsDir, "router-state"),
-					"vinext/head-state": path.join(shimsDir, "head-state"),
-					"vinext/i18n-state": path.join(shimsDir, "i18n-state"),
-					"vinext/i18n-context": path.join(shimsDir, "i18n-context"),
+					"next/link": path.posix.join(shimsDir, "link"),
+					"next/head": path.posix.join(shimsDir, "head"),
+					"next/router": path.posix.join(shimsDir, "router"),
+					"next/compat/router": path.posix.join(shimsDir, "compat-router"),
+					"next/image": path.posix.join(shimsDir, "image"),
+					"next/legacy/image": path.posix.join(shimsDir, "legacy-image"),
+					"next/dynamic": path.posix.join(shimsDir, "dynamic"),
+					"next/app": path.posix.join(shimsDir, "app"),
+					"next/document": path.posix.join(shimsDir, "document"),
+					"next/config": path.posix.join(shimsDir, "config"),
+					"next/script": path.posix.join(shimsDir, "script"),
+					"next/server": path.posix.join(shimsDir, "server"),
+					"next/headers": path.posix.join(shimsDir, "headers"),
+					"next/font/google": path.posix.join(shimsDir, "font-google"),
+					"next/font/local": path.posix.join(shimsDir, "font-local"),
+					"next/cache": path.posix.join(shimsDir, "cache"),
+					"next/form": path.posix.join(shimsDir, "form"),
+					"next/og": path.posix.join(shimsDir, "og"),
+					"next/web-vitals": path.posix.join(shimsDir, "web-vitals"),
+					"next/amp": path.posix.join(shimsDir, "amp"),
+					"next/offline": path.posix.join(shimsDir, "offline"),
+					"next/constants": path.posix.join(shimsDir, "constants"),
+					"next/dist/shared/lib/app-router-context.shared-runtime": path.posix.join(shimsDir, "internal", "app-router-context"),
+					"next/dist/shared/lib/app-router-context": path.posix.join(shimsDir, "internal", "app-router-context"),
+					"next/dist/shared/lib/router-context.shared-runtime": path.posix.join(shimsDir, "internal", "router-context"),
+					"next/dist/shared/lib/utils": path.posix.join(shimsDir, "internal", "utils"),
+					"next/dist/server/api-utils": path.posix.join(shimsDir, "internal", "api-utils"),
+					"next/dist/server/web/spec-extension/cookies": path.posix.join(shimsDir, "internal", "cookies"),
+					"next/dist/compiled/@edge-runtime/cookies": path.posix.join(shimsDir, "internal", "cookies"),
+					"next/dist/server/app-render/work-unit-async-storage.external": path.posix.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/client/components/work-unit-async-storage.external": path.posix.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/client/components/request-async-storage.external": path.posix.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/client/components/request-async-storage": path.posix.join(shimsDir, "internal", "work-unit-async-storage"),
+					"next/dist/server/request/root-params": path.posix.join(shimsDir, "root-params"),
+					"next/dist/server/config-shared": path.posix.join(shimsDir, "internal", "utils"),
+					"server-only": path.posix.join(shimsDir, "server-only"),
+					"client-only": path.posix.join(shimsDir, "client-only"),
+					"vinext/error-boundary": path.posix.join(shimsDir, "error-boundary"),
+					"vinext/layout-segment-context": path.posix.join(shimsDir, "layout-segment-context"),
+					"vinext/metadata": path.posix.join(shimsDir, "metadata"),
+					"vinext/fetch-cache": path.posix.join(shimsDir, "fetch-cache"),
+					"vinext/cache-runtime": path.posix.join(shimsDir, "cache-runtime"),
+					"vinext/navigation-state": path.posix.join(shimsDir, "navigation-state"),
+					"vinext/unified-request-context": path.posix.join(shimsDir, "unified-request-context"),
+					"vinext/pages-router-runtime": path.posix.join(shimsDir, "pages-router-runtime"),
+					"vinext/router-state": path.posix.join(shimsDir, "router-state"),
+					"vinext/head-state": path.posix.join(shimsDir, "head-state"),
+					"vinext/i18n-state": path.posix.join(shimsDir, "i18n-state"),
+					"vinext/i18n-context": path.posix.join(shimsDir, "i18n-context"),
 					"vinext/cache": path.resolve(__dirname, "cache"),
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
 					"vinext/instrumentation-client": path.resolve(__dirname, "client", "instrumentation-client"),
@@ -905,6 +923,7 @@ function vinext(options = {}) {
 									"satori",
 									"@resvg/resvg-js",
 									"yoga-wasm-web",
+									...env?.command === "serve" && _canExternalizeAppRscHandler ? ["vinext/server/app-rsc-handler"] : [],
 									...userSsrExternal
 								],
 								...userSsrExternal === true ? {} : { noExternal: true }
@@ -1031,6 +1050,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([
@@ -1067,9 +1088,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;
@@ -1188,14 +1216,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
+					};
+				}
 			}
 		},
 		{
@@ -1220,7 +1253,6 @@ function vinext(options = {}) {
 			enforce: "post",
 			apply: "build",
 			generateBundle(_options, bundle) {
-				if (this.environment?.name !== "client") return;
 				restoreDedupedCssAssetReferences(bundle, (asset) => {
 					this.emitFile({
 						type: "asset",
@@ -1298,18 +1330,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
+					};
+				}
 			}
 		},
 		{
@@ -1827,51 +1861,71 @@ 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;
+			name: "vinext:validate-middleware-exports",
+			enforce: "pre",
+			transform(code, id) {
+				if (!middlewarePath) 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);
+				if (canonicalize(modulePath) !== canonicalize(middlewarePath)) return null;
+				validateMiddlewareModuleExports(code, modulePath, middlewarePath, isProxyFile(middlewarePath));
 				return null;
-			} }
+			}
+		},
+		{
+			name: "vinext:validate-page-exports",
+			transform: {
+				filter: {
+					id: { exclude: VIRTUAL_MODULE_ID_RE },
+					code: /\bexport\b[\s\S]*\*/
+				},
+				handler(code, id) {
+					if (this.environment?.name !== "client") return null;
+					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: { 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
-				};
-			} }
+			transform: {
+				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;
+					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: /\.(tsx?|jsx?|mjs)$/,
+					id: {
+						include: /\.(tsx?|jsx?|mjs)$/,
+						exclude: VIRTUAL_MODULE_ID_RE
+					},
 					code: "server-only"
 				},
-				handler(code, id) {
+				handler(code) {
 					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.`);
@@ -1882,17 +1936,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);
 				}
 			}
 		},
@@ -1900,8 +1954,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));
 				}
 			}
@@ -1926,9 +1985,10 @@ function vinext(options = {}) {
 				staticImageAssets.clear();
 			},
 			watchChange(id) {
-				imageImportDimCache.delete(id);
-				staticImageAssets.delete(id);
-				staticImageImportsByModule.delete(id);
+				const key = normalizePathSeparators(id);
+				imageImportDimCache.delete(key);
+				staticImageAssets.delete(key);
+				staticImageImportsByModule.delete(key);
 			},
 			resolveId: {
 				filter: { id: /\?vinext-(?:image-url|meta)$/ },
@@ -1973,15 +2033,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 {
@@ -1997,7 +2053,7 @@ function vinext(options = {}) {
 						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];
@@ -2005,7 +2061,9 @@ function vinext(options = {}) {
 						const varName = specifier.local?.name;
 						if (!varName) continue;
 						const dir = path.dirname(id);
-						const absImagePath = normalizePathSeparators(path.resolve(dir, importPath));
+						const resolvedImage = importPath.startsWith(".") ? path.resolve(dir, importPath) : (await this.resolve(importPath, id, { skipSelf: true }))?.id;
+						if (!resolvedImage) continue;
+						const absImagePath = normalizePathSeparators(resolvedImage.split("?", 1)[0]);
 						if (!fs.existsSync(absImagePath)) continue;
 						imageImports.add(absImagePath);
 						const urlVar = `__vinext_img_url_${varName}`;
@@ -2058,15 +2116,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) {
@@ -2463,54 +2517,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
-				};
 			}
 		}
 	];