vinext 0.0.55 → 0.1.1

package/dist/index.js

@@ -1,21 +1,19 @@
 import { detectPackageManager } from "./utils/project.js";
 import { normalizePathnameForRouteMatchStrict } from "./routing/utils.js";
-import { buildViteResolveExtensions, createValidFileMatcher } from "./routing/file-matcher.js";
-import { hasBasePath } from "./utils/base-path.js";
+import { buildViteResolveExtensions, createValidFileMatcher, findFileWithExts } from "./routing/file-matcher.js";
 import { apiRouter, invalidateRouteCache, matchRoute, pagesRouter } from "./routing/pages-router.js";
+import { normalizePathSeparators } from "./utils/path.js";
 import { INTERNAL_HEADERS, VINEXT_INTERNAL_HEADERS, VINEXT_MW_CTX_HEADER, VINEXT_TIMING_HEADER } from "./server/headers.js";
-import { buildRequestHeadersFromMiddlewareResponse } from "./server/middleware-request-headers.js";
 import { normalizePath as normalizePath$1 } from "./server/normalize-path.js";
-import { isExternalUrl, matchHeaders, matchRedirect, matchRewrite, proxyExternalRequest, requestContextFromRequest, sanitizeDestination } from "./config/config-matchers.js";
+import { 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 { findInstrumentationClientFile, findInstrumentationFile, runInstrumentation } from "./server/instrumentation.js";
-import { mergeRewriteQuery } from "./utils/query.js";
+import { isUnknownRecord } from "./utils/record.js";
 import { logRequest, now } from "./server/request-log.js";
-import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "./server/pages-i18n.js";
 import { createSSRHandler } from "./server/dev-server.js";
 import { handleApiRoute } from "./server/api-handler.js";
 import { isImageOptimizationPath } from "./server/image-optimization.js";
@@ -26,6 +24,7 @@ import { createDirectRunner } from "./server/dev-module-runner.js";
 import { validateDevRequest } from "./server/dev-origin-check.js";
 import { generateRscEntry } from "./entries/app-rsc-entry.js";
 import { generateSsrEntry } from "./entries/app-ssr-entry.js";
+import { VIRTUAL_CACHE_ADAPTERS, generateCacheAdaptersModule } from "./cache/cache-adapters-virtual.js";
 import { generateBrowserEntry, isLinkPrefetchRoute, toLinkPrefetchRoute } from "./entries/app-browser-entry.js";
 import { collectRouteClassificationManifest } from "./build/route-classification-manifest.js";
 import { planRouteClassificationInjection } from "./build/route-classification-injector.js";
@@ -33,10 +32,14 @@ import { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_BUILD } from "./shims/consta
 import { ASSET_PREFIX_URL_DIR, resolveAssetUrlPrefix, 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 { findNextConfigPath, loadNextConfig, resolveNextConfig, resolveNextConfigInput } from "./config/next-config.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";
+import { ensureAssetsIgnore } from "./build/assets-ignore.js";
+import { emitNextClientRuntimeManifests } from "./build/next-client-runtime-manifests.js";
 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 { manifestFilesWithBase } from "./utils/manifest-paths.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
 import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
@@ -46,20 +49,23 @@ import { createInstrumentationClientTransformPlugin } from "./plugins/instrument
 import { INSTRUMENTATION_CLIENT_EMPTY_MODULE, generateInstrumentationClientInjectModule } from "./client/instrumentation-client-inject.js";
 import { createMiddlewareServerOnlyPlugin } from "./plugins/middleware-server-only.js";
 import { createOptimizeImportsPlugin } from "./plugins/optimize-imports.js";
-import { createOgInlineFetchAssetsPlugin, ogAssetsPlugin } from "./plugins/og-assets.js";
+import { createOgAssetsPlugin, createOgInlineFetchAssetsPlugin } from "./plugins/og-assets.js";
 import { generateRouteTypes } from "./typegen.js";
 import { SSR_EXTERNAL_REACT_ENTRIES, VINEXT_OPTIMIZE_DEPS_EXCLUDE, mergeOptimizeDepsExclude } from "./plugins/rsc-client-shim-excludes.js";
 import { createServerExternalsManifestPlugin } from "./plugins/server-externals-manifest.js";
 import { computeLazyChunks } from "./utils/lazy-chunks.js";
-import { findClientEntryFile, readClientBuildManifest } from "./utils/client-build-manifest.js";
+import { findClientEntryFile, findPagesClientEntryFile, readClientBuildManifest } from "./utils/client-build-manifest.js";
+import { VINEXT_CLIENT_ENTRY_MANIFEST, findClientEntryFileFromVinextManifest, findPagesClientEntryFileFromVinextManifest, readClientEntryManifest } from "./utils/client-entry-manifest.js";
 import { formatMissingCloudflarePluginError, hasWranglerConfig } from "./deploy.js";
 import { resolvePostcssStringPlugins } from "./plugins/postcss.js";
 import { buildSassPreprocessorOptions } from "./plugins/sass.js";
-import { createClientCodeSplittingConfig, createClientManualChunks, createClientOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
+import { createClientAssetFileNames, createClientCodeSplittingConfig, createClientManualChunks, createClientOutputConfig, createRscFrameworkChunkOutputConfig, getBuildBundlerOptions, getClientTreeshakeConfigForVite, withBuildBundlerOptions } from "./build/client-build-config.js";
+import { markCssUrlAssetReferences, restoreDedupedCssAssetReferences } from "./build/css-url-assets.js";
 import { augmentSsrManifestFromBundle, relativeWithinRoot, tryRealpathSync } from "./build/ssr-manifest.js";
 import { stripServerExports } 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 { hasMdxFiles } from "./utils/mdx-scan.js";
 import { scanPublicFileRoutes } from "./utils/public-routes.js";
 import { staticExportApp, staticExportPages } from "./build/static-export.js";
@@ -74,9 +80,13 @@ import MagicString from "magic-string";
 import tsconfigPaths from "vite-tsconfig-paths";
 //#region src/index.ts
 installSocketErrorBackstop();
-function createRscCompatibilityId(nextConfig) {
-	if (nextConfig.deploymentId) return nextConfig.deploymentId;
-	return randomUUID();
+function stripViteModuleQuery(id) {
+	const queryIndex = id.search(/[?#]/);
+	return queryIndex === -1 ? id : id.slice(0, queryIndex);
+}
+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) {
@@ -154,9 +164,6 @@ function isVinextOgShimImporter(importer) {
 function toRelativeFileEntry(root, absPath) {
 	return path.relative(root, absPath).split(path.sep).join("/");
 }
-function isRecord(value) {
-	return !!value && typeof value === "object" && !Array.isArray(value);
-}
 const TSCONFIG_FILES = ["tsconfig.json", "jsconfig.json"];
 function resolveTsconfigPathCandidate(candidate) {
 	const candidates = candidate.endsWith(".json") ? [candidate] : [
@@ -230,8 +237,8 @@ function loadTsconfigPathAliases(configPath, projectRoot, seen = /* @__PURE__ */
 		const extendedPath = resolveTsconfigExtends(normalizedPath, parsed.extends);
 		if (extendedPath) aliases = loadTsconfigPathAliases(extendedPath, projectRoot, seen);
 	}
-	const compilerOptions = isRecord(parsed.compilerOptions) ? parsed.compilerOptions : null;
-	const pathsConfig = compilerOptions && isRecord(compilerOptions.paths) ? compilerOptions.paths : null;
+	const compilerOptions = isUnknownRecord(parsed.compilerOptions) ? parsed.compilerOptions : null;
+	const pathsConfig = compilerOptions && isUnknownRecord(compilerOptions.paths) ? compilerOptions.paths : null;
 	if (!pathsConfig) return aliases;
 	const baseUrl = compilerOptions && typeof compilerOptions.baseUrl === "string" ? compilerOptions.baseUrl : ".";
 	const resolvedBaseUrl = path.resolve(path.dirname(normalizedPath), baseUrl);
@@ -275,16 +282,18 @@ function resolveTsconfigAliases(projectRoot) {
 	return aliases;
 }
 const VIRTUAL_SERVER_ENTRY = "virtual:vinext-server-entry";
-const RESOLVED_SERVER_ENTRY = "\0" + VIRTUAL_SERVER_ENTRY;
+const RESOLVED_SERVER_ENTRY = "\0virtual:vinext-server-entry";
 const VIRTUAL_CLIENT_ENTRY = "virtual:vinext-client-entry";
-const RESOLVED_CLIENT_ENTRY = "\0" + VIRTUAL_CLIENT_ENTRY;
+const RESOLVED_CLIENT_ENTRY = "\0virtual:vinext-client-entry";
 const VIRTUAL_RSC_ENTRY = "virtual:vinext-rsc-entry";
-const RESOLVED_RSC_ENTRY = "\0" + VIRTUAL_RSC_ENTRY;
+const RESOLVED_RSC_ENTRY = "\0virtual:vinext-rsc-entry";
 const VIRTUAL_APP_SSR_ENTRY = "virtual:vinext-app-ssr-entry";
-const RESOLVED_APP_SSR_ENTRY = "\0" + VIRTUAL_APP_SSR_ENTRY;
+const RESOLVED_APP_SSR_ENTRY = "\0virtual:vinext-app-ssr-entry";
 const VIRTUAL_APP_BROWSER_ENTRY = "virtual:vinext-app-browser-entry";
-const RESOLVED_APP_BROWSER_ENTRY = "\0" + VIRTUAL_APP_BROWSER_ENTRY;
+const RESOLVED_APP_BROWSER_ENTRY = "\0virtual:vinext-app-browser-entry";
 const RESOLVED_ROOT_PARAMS = "\0virtual:vinext-root-params";
+/** Virtual module that registers config-driven cache adapters (see VinextOptions.cache). */
+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`;
@@ -297,6 +306,11 @@ const _fontGoogleShimPath = resolveShimModulePath(_shimsDir, "font-google");
 function isValidExportIdentifier(name) {
 	return /^[$A-Z_a-z][$\w]*$/.test(name);
 }
+function isVirtualEntryFacade(id, virtualId) {
+	if (!id) return false;
+	const cleanId = id.startsWith("\0") ? id.slice(1) : id;
+	return cleanId === virtualId || cleanId.endsWith("/" + virtualId) || cleanId.endsWith("\\" + virtualId);
+}
 /**
 * Returns true when `code` starts with a React `"use client"` or `"use server"`
 * directive (after stripping leading comments, hashbang, and whitespace).
@@ -369,10 +383,12 @@ const _reactServerShims = new Map([
 	["next/dist/client/components/navigation", "navigation"]
 ]);
 const clientManualChunks = createClientManualChunks(_shimsDir);
-const clientOutputConfig = createClientOutputConfig(clientManualChunks);
 const clientCodeSplittingConfig = createClientCodeSplittingConfig(clientManualChunks);
-function getClientOutputConfigForVite(viteMajorVersion) {
-	return viteMajorVersion >= 8 ? { codeSplitting: clientCodeSplittingConfig } : clientOutputConfig;
+function getClientOutputConfigForVite(viteMajorVersion, assetsDir) {
+	return viteMajorVersion >= 8 ? {
+		assetFileNames: createClientAssetFileNames(assetsDir),
+		codeSplitting: clientCodeSplittingConfig
+	} : createClientOutputConfig(clientManualChunks, assetsDir);
 }
 function vinext(options = {}) {
 	const viteMajorVersion = getViteMajorVersion();
@@ -387,6 +403,7 @@ function vinext(options = {}) {
 	let instrumentationPath = null;
 	let instrumentationClientPath = null;
 	let clientInjectModule = null;
+	let clientAssetsInlineLimit = 0;
 	let hasCloudflarePlugin = false;
 	let warnedInlineNextConfigOverride = false;
 	let hasNitroPlugin = false;
@@ -418,7 +435,10 @@ function vinext(options = {}) {
 	*/
 	async function generateClientEntry$1() {
 		const appPrefetchRoutes = hasAppDir ? (await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher)).filter(isLinkPrefetchRoute).map(toLinkPrefetchRoute) : [];
-		return generateClientEntry(pagesDir, nextConfig, fileMatcher, { appPrefetchRoutes });
+		return generateClientEntry(pagesDir, nextConfig, fileMatcher, {
+			appPrefetchRoutes,
+			instrumentationClientPath
+		});
 	}
 	async function writeRouteTypes() {
 		if (!hasAppDir) return;
@@ -566,8 +586,16 @@ function vinext(options = {}) {
 						rawConfig = await resolveNextConfigInput(options.nextConfig, phase);
 					} else rawConfig = await loadNextConfig(root, phase);
 					nextConfig = await resolveNextConfig(rawConfig, root);
+					const sharedBuildId = process.env.__VINEXT_SHARED_BUILD_ID;
+					if (sharedBuildId && sharedBuildId.length > 0) nextConfig = {
+						...nextConfig,
+						buildId: sharedBuildId
+					};
+				}
+				if (rscCompatibilityId === void 0) {
+					const sharedRscCompatibilityId = process.env.__VINEXT_SHARED_RSC_COMPATIBILITY_ID;
+					rscCompatibilityId = sharedRscCompatibilityId && sharedRscCompatibilityId.length > 0 ? sharedRscCompatibilityId : createRscCompatibilityId(nextConfig);
 				}
-				rscCompatibilityId ??= createRscCompatibilityId(nextConfig);
 				fileMatcher = createValidFileMatcher(nextConfig.pageExtensions);
 				instrumentationPath = findInstrumentationFile(root, fileMatcher);
 				instrumentationClientPath = findInstrumentationClientFile(root, fileMatcher);
@@ -619,6 +647,7 @@ function vinext(options = {}) {
 				defines["process.env.NEXT_DEPLOYMENT_ID"] = nextConfig.deploymentId ? JSON.stringify(nextConfig.deploymentId) : "false";
 				defines["process.env.__NEXT_VERSION"] = JSON.stringify(getVinextVersion());
 				defines["process.env.__NEXT_APP_SHELLS"] = JSON.stringify(nextConfig.appShells);
+				defines["process.env.__NEXT_CACHE_COMPONENTS"] = JSON.stringify(String(nextConfig.cacheComponents ?? false));
 				for (const [key, value] of Object.entries(nextConfig.compilerDefine)) {
 					if (key in defines) throw new Error(`The \`compiler.define\` option is configured to replace the \`${key}\` variable. This variable is either part of a built-in or is already configured.`);
 					defines[key] = value;
@@ -678,6 +707,7 @@ function vinext(options = {}) {
 					"vinext/cache": path.resolve(__dirname, "cache"),
 					"vinext/instrumentation": path.resolve(__dirname, "server", "instrumentation"),
 					"vinext/instrumentation-client": path.resolve(__dirname, "client", "instrumentation-client"),
+					"vinext/dev-error-overlay": path.resolve(__dirname, "server", "dev-error-overlay"),
 					"vinext/html": path.resolve(__dirname, "server", "html"),
 					...clientInjectModule === null ? { "private-next-instrumentation-client": instrumentationClientPath ?? INSTRUMENTATION_CLIENT_EMPTY_MODULE } : {}
 				}).flatMap(([k, v]) => k.startsWith("next/") ? [[k, v], [`${k}.js`, v]] : [[k, v]]));
@@ -696,6 +726,15 @@ function vinext(options = {}) {
 				if (!hasUserMdxPlugin && hasMdxFiles(root, hasAppDir ? appDir : null, hasPagesDir ? pagesDir : null)) await ensureMdxDelegate("detected");
 				const isSSR = !!config.build?.ssr;
 				const isMultiEnv = hasAppDir || hasCloudflarePlugin || hasNitroPlugin;
+				const hasBuildInput = getBuildBundlerOptions(config.build)?.input !== void 0;
+				const shouldInjectPlainPagesEnvironments = !hasAppDir && !hasCloudflarePlugin && !isSSR && !hasBuildInput;
+				const hasClientBuildEnvironment = hasAppDir || hasCloudflarePlugin || hasNitroPlugin || shouldInjectPlainPagesEnvironments;
+				const clientAssetsDir = resolveAssetsDir(nextConfig.assetPrefix ?? "");
+				clientAssetsInlineLimit = config.build?.assetsInlineLimit ?? 0;
+				const devHmrConfig = config.server?.hmr === false ? false : {
+					...typeof config.server?.hmr === "object" ? config.server.hmr : {},
+					overlay: false
+				};
 				const viteConfig = {
 					appType: "custom",
 					build: {
@@ -706,7 +745,8 @@ function vinext(options = {}) {
 							"firefox114",
 							"safari15"
 						],
-						assetsDir: resolveAssetsDir(nextConfig.assetPrefix ?? ""),
+						assetsDir: clientAssetsDir,
+						...!isSSR && !hasClientBuildEnvironment ? { assetsInlineLimit: clientAssetsInlineLimit } : {},
 						...withBuildBundlerOptions(viteMajorVersion, {
 							onwarn: (() => {
 								const userOnwarn = getBuildBundlerOptions(config.build)?.onwarn;
@@ -719,13 +759,16 @@ function vinext(options = {}) {
 								};
 							})(),
 							...!isSSR && !isMultiEnv ? { treeshake: getClientTreeshakeConfigForVite(viteMajorVersion) } : {},
-							...!isSSR && !isMultiEnv ? { output: getClientOutputConfigForVite(viteMajorVersion) } : {}
+							...!isSSR && !isMultiEnv ? { output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir) } : {}
 						})
 					},
-					server: { cors: {
-						preflightContinue: true,
-						origin: /^https?:\/\/(?:(?:[^:]+\.)?localhost|127\.0\.0\.1|\[::1\])(?::\d+)?$/
-					} },
+					server: {
+						cors: {
+							preflightContinue: true,
+							origin: /^https?:\/\/(?:(?:[^:]+\.)?localhost|127\.0\.0\.1|\[::1\])(?::\d+)?$/
+						},
+						hmr: devHmrConfig
+					},
 					...hasCloudflarePlugin || hasNitroPlugin ? {} : config.ssr?.external === true ? { ssr: { external: true } } : { ssr: {
 						external: [
 							"react",
@@ -787,6 +830,8 @@ function vinext(options = {}) {
 					const appEntries = [`${path.relative(root, appDir)}/**/*.{tsx,ts,jsx,js}`];
 					const explicitInstrumentationEntries = [instrumentationPath, instrumentationClientPath].flatMap((entry) => entry ? [toRelativeFileEntry(root, entry)] : []);
 					const optimizeEntries = [...new Set([...appEntries, ...explicitInstrumentationEntries])];
+					const appClientInput = { index: VIRTUAL_APP_BROWSER_ENTRY };
+					if (hasPagesDir) appClientInput["vinext-client-entry"] = VIRTUAL_CLIENT_ENTRY;
 					viteConfig.environments = {
 						rsc: {
 							...hasCloudflarePlugin || hasNitroPlugin ? {} : { resolve: {
@@ -804,7 +849,10 @@ function vinext(options = {}) {
 							},
 							build: {
 								outDir: options.rscOutDir ?? "dist/server",
-								...withBuildBundlerOptions(viteMajorVersion, { input: { index: VIRTUAL_RSC_ENTRY } })
+								...withBuildBundlerOptions(viteMajorVersion, {
+									input: { index: VIRTUAL_RSC_ENTRY },
+									output: createRscFrameworkChunkOutputConfig(viteMajorVersion)
+								})
 							}
 						},
 						ssr: {
@@ -836,10 +884,12 @@ function vinext(options = {}) {
 								])]
 							},
 							build: {
-								...hasCloudflarePlugin ? { manifest: true } : {},
+								...hasCloudflarePlugin || hasPagesDir ? { manifest: true } : {},
+								...hasPagesDir ? { ssrManifest: true } : {},
+								assetsInlineLimit: clientAssetsInlineLimit,
 								...withBuildBundlerOptions(viteMajorVersion, {
-									input: { index: VIRTUAL_APP_BROWSER_ENTRY },
-									output: getClientOutputConfigForVite(viteMajorVersion),
+									input: appClientInput,
+									output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
 									treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
 								})
 							}
@@ -851,14 +901,15 @@ function vinext(options = {}) {
 					build: {
 						manifest: true,
 						ssrManifest: true,
+						assetsInlineLimit: clientAssetsInlineLimit,
 						...withBuildBundlerOptions(viteMajorVersion, {
 							input: { index: VIRTUAL_CLIENT_ENTRY },
-							output: getClientOutputConfigForVite(viteMajorVersion),
+							output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
 							treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
 						})
 					}
 				} };
-				else if (!isSSR && !getBuildBundlerOptions(config.build)?.input) viteConfig.environments = {
+				else if (shouldInjectPlainPagesEnvironments) viteConfig.environments = {
 					client: {
 						consumer: "client",
 						optimizeDeps: pagesOptimizeEntries.length > 0 ? { entries: pagesOptimizeEntries } : void 0,
@@ -866,9 +917,10 @@ function vinext(options = {}) {
 							outDir: "dist/client",
 							manifest: true,
 							ssrManifest: true,
+							assetsInlineLimit: clientAssetsInlineLimit,
 							...withBuildBundlerOptions(viteMajorVersion, {
 								input: { index: VIRTUAL_CLIENT_ENTRY },
-								output: getClientOutputConfigForVite(viteMajorVersion),
+								output: getClientOutputConfigForVite(viteMajorVersion, clientAssetsDir),
 								treeshake: getClientTreeshakeConfigForVite(viteMajorVersion)
 							})
 						}
@@ -927,16 +979,17 @@ function vinext(options = {}) {
 					if (isVercelOgImport(cleanId) && !isVinextOgShimImporter(importer)) return resolveShimModulePath(_shimsDir, "og");
 					if (cleanId === VIRTUAL_SERVER_ENTRY) return RESOLVED_SERVER_ENTRY;
 					if (cleanId === VIRTUAL_CLIENT_ENTRY) return RESOLVED_CLIENT_ENTRY;
-					if (cleanId.endsWith("/" + VIRTUAL_SERVER_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_SERVER_ENTRY)) return RESOLVED_SERVER_ENTRY;
-					if (cleanId.endsWith("/" + VIRTUAL_CLIENT_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_CLIENT_ENTRY)) return RESOLVED_CLIENT_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-server-entry") || cleanId.endsWith("\\virtual:vinext-server-entry")) return RESOLVED_SERVER_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-client-entry") || cleanId.endsWith("\\virtual:vinext-client-entry")) return RESOLVED_CLIENT_ENTRY;
 					if (cleanId === VIRTUAL_RSC_ENTRY) return RESOLVED_RSC_ENTRY;
 					if (cleanId === VIRTUAL_APP_SSR_ENTRY) return RESOLVED_APP_SSR_ENTRY;
 					if (cleanId === VIRTUAL_APP_BROWSER_ENTRY) return RESOLVED_APP_BROWSER_ENTRY;
 					if (cleanId === "next/root-params" || cleanId === "next/root-params.js") return RESOLVED_ROOT_PARAMS;
+					if (cleanId === "virtual:vinext-cache-adapters" || cleanId.endsWith("/virtual:vinext-cache-adapters") || cleanId.endsWith("\\virtual:vinext-cache-adapters")) return RESOLVED_CACHE_ADAPTERS;
 					if (cleanId.startsWith("virtual:vinext-google-fonts?")) return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(VIRTUAL_GOOGLE_FONTS.length);
-					if (cleanId.endsWith("/" + VIRTUAL_RSC_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_RSC_ENTRY)) return RESOLVED_RSC_ENTRY;
-					if (cleanId.endsWith("/" + VIRTUAL_APP_SSR_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_APP_SSR_ENTRY)) return RESOLVED_APP_SSR_ENTRY;
-					if (cleanId.endsWith("/" + VIRTUAL_APP_BROWSER_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_APP_BROWSER_ENTRY)) return RESOLVED_APP_BROWSER_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-rsc-entry") || cleanId.endsWith("\\virtual:vinext-rsc-entry")) return RESOLVED_RSC_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-app-ssr-entry") || cleanId.endsWith("\\virtual:vinext-app-ssr-entry")) return RESOLVED_APP_SSR_ENTRY;
+					if (cleanId.endsWith("/virtual:vinext-app-browser-entry") || cleanId.endsWith("\\virtual:vinext-app-browser-entry")) return RESOLVED_APP_BROWSER_ENTRY;
 					if (cleanId.includes("/virtual:vinext-google-fonts?") || cleanId.includes("\\virtual:vinext-google-fonts?")) {
 						const queryIndex = cleanId.indexOf(VIRTUAL_GOOGLE_FONTS + "?");
 						return RESOLVED_VIRTUAL_GOOGLE_FONTS + cleanId.slice(queryIndex + VIRTUAL_GOOGLE_FONTS.length);
@@ -961,10 +1014,12 @@ function vinext(options = {}) {
 						allowedOrigins: nextConfig?.serverActionsAllowedOrigins,
 						allowedDevOrigins: nextConfig?.allowedDevOrigins,
 						bodySizeLimit: nextConfig?.serverActionsBodySizeLimit,
+						bodySizeLimitLabel: nextConfig?.serverActionsBodySizeLimitLabel,
 						htmlLimitedBots: nextConfig?.htmlLimitedBots,
 						clientTraceMetadata: nextConfig?.clientTraceMetadata,
 						assetPrefix: nextConfig?.assetPrefix,
 						expireTime: nextConfig?.expireTime,
+						reactMaxHeadersLength: nextConfig?.reactMaxHeadersLength,
 						cacheMaxMemorySize: nextConfig?.cacheMaxMemorySize,
 						inlineCss: nextConfig?.inlineCss,
 						i18n: nextConfig?.i18n,
@@ -975,6 +1030,7 @@ function vinext(options = {}) {
 					}, instrumentationPath);
 				}
 				if (id === RESOLVED_ROOT_PARAMS) return generateRootParamsModule((hasAppDir ? await appRouter(appDir, nextConfig?.pageExtensions, fileMatcher) : []).flatMap((route) => route.rootParamNames ?? []));
+				if (id === RESOLVED_CACHE_ADAPTERS) return generateCacheAdaptersModule(options.cache);
 				if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) return generateSsrEntry(hasPagesDir);
 				if (id === RESOLVED_APP_BROWSER_ENTRY && hasAppDir) {
 					const graph = await appRouteGraph(appDir, nextConfig?.pageExtensions, fileMatcher);
@@ -983,41 +1039,103 @@ function vinext(options = {}) {
 				if (id.startsWith("\0virtual:vinext-google-fonts?")) return generateGoogleFontsVirtualModule(id, _fontGoogleShimPath);
 			},
 			// @vitejs/plugin-rsc runs the RSC environment build in two phases:
+			renderChunk: {
+				order: "pre",
+				handler(code, chunk) {
+					if (this.environment?.name !== "rsc") return null;
+					if (!rscClassificationManifest) return null;
+					if (!code.includes("__VINEXT_CLASS")) return null;
+					const enableClassificationDebug = Boolean(process.env.VINEXT_DEBUG_CLASSIFICATION);
+					const patchPlan = planRouteClassificationInjection({
+						canonicalizeLayoutPath: canonicalize,
+						chunks: [{
+							code,
+							fileName: chunk.fileName
+						}],
+						dynamicShimPaths,
+						enableDebugReasons: enableClassificationDebug,
+						manifest: rscClassificationManifest,
+						moduleInfo: { getModuleInfo: (moduleId) => {
+							const info = this.getModuleInfo(moduleId);
+							if (!info) return null;
+							return {
+								importedIds: info.importedIds ?? [],
+								dynamicImportedIds: info.dynamicallyImportedIds ?? []
+							};
+						} }
+					});
+					if (patchPlan.kind === "skip") return null;
+					rscClassificationManifest = null;
+					return {
+						code: patchPlan.code,
+						map: patchPlan.map
+					};
+				}
+			}
+		},
+		{
+			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
+				};
+			}
+		},
+		{
+			name: "vinext:client-css-url-assets-defaults",
+			apply: "build",
+			configEnvironment(name) {
+				if (name !== "client") return null;
+				return { build: { assetsInlineLimit: clientAssetsInlineLimit } };
+			}
+		},
+		{
+			name: "vinext:server-minify-defaults",
+			apply: "build",
+			configEnvironment(name, config) {
+				if (name === "client") return null;
+				if (config.build?.minify !== void 0) return null;
+				return { build: { minify: true } };
+			}
+		},
+		{
+			name: "vinext:css-url-assets-restore",
+			enforce: "post",
+			apply: "build",
 			generateBundle(_options, bundle) {
-				if (this.environment?.name !== "rsc") return;
-				if (!rscClassificationManifest) return;
-				const enableClassificationDebug = Boolean(process.env.VINEXT_DEBUG_CLASSIFICATION);
-				const chunks = [];
-				const chunksByFileName = /* @__PURE__ */ new Map();
-				for (const chunk of Object.values(bundle)) {
-					if (chunk.type !== "chunk") continue;
-					chunks.push({
-						code: chunk.code,
-						fileName: chunk.fileName
+				if (this.environment?.name !== "client") return;
+				restoreDedupedCssAssetReferences(bundle, (asset) => {
+					this.emitFile({
+						type: "asset",
+						fileName: asset.fileName,
+						source: asset.source
 					});
-					chunksByFileName.set(chunk.fileName, chunk);
+				});
+			}
+		},
+		{
+			name: "vinext:client-entry-manifest",
+			apply: "build",
+			generateBundle(_options, bundle) {
+				if (this.environment?.name !== "client") return;
+				const manifest = {};
+				for (const chunk of Object.values(bundle)) {
+					if (chunk.type !== "chunk" || !chunk.isEntry) continue;
+					if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_CLIENT_ENTRY)) manifest.pagesClientEntry = chunk.fileName;
+					else if (isVirtualEntryFacade(chunk.facadeModuleId, VIRTUAL_APP_BROWSER_ENTRY)) manifest.appBrowserEntry = chunk.fileName;
 				}
-				const patchPlan = planRouteClassificationInjection({
-					canonicalizeLayoutPath: canonicalize,
-					chunks,
-					dynamicShimPaths,
-					enableDebugReasons: enableClassificationDebug,
-					manifest: rscClassificationManifest,
-					moduleInfo: { getModuleInfo: (moduleId) => {
-						const info = this.getModuleInfo(moduleId);
-						if (!info) return null;
-						return {
-							importedIds: info.importedIds ?? [],
-							dynamicImportedIds: info.dynamicallyImportedIds ?? []
-						};
-					} }
+				if (!manifest.pagesClientEntry && !manifest.appBrowserEntry) return;
+				this.emitFile({
+					type: "asset",
+					fileName: VINEXT_CLIENT_ENTRY_MANIFEST,
+					source: JSON.stringify(manifest, null, 2) + "\n"
 				});
-				if (patchPlan.kind === "skip") return;
-				const target = chunksByFileName.get(patchPlan.fileName);
-				if (!target) throw new Error(`vinext: build-time classification — patch target ${patchPlan.fileName} disappeared from the RSC bundle`);
-				target.code = patchPlan.code;
-				target.map = patchPlan.map;
-				rscClassificationManifest = null;
 			}
 		},
 		asyncHooksStubPlugin,
@@ -1185,6 +1303,7 @@ function vinext(options = {}) {
 					}
 					next();
 				});
+				installDevStackSourcemapMiddleware(server);
 				return () => {
 					if (instrumentationPath && !hasAppDir) runInstrumentation(getPagesRunner(), instrumentationPath).catch((err) => {
 						console.error("[vinext] Instrumentation error:", err);
@@ -1294,6 +1413,10 @@ function vinext(options = {}) {
 								res.end("Bad Request");
 								return;
 							}
+							{
+								const qs = url.includes("?") ? url.slice(url.indexOf("?")) : "";
+								url = pathname + qs;
+							}
 							const bp = nextConfig?.basePath ?? "";
 							if (bp && pathname.startsWith(bp)) {
 								const stripped = pathname.slice(bp.length) || "/";
@@ -1334,154 +1457,110 @@ function vinext(options = {}) {
 							for (const header of INTERNAL_HEADERS) delete req.headers[header];
 							for (const header of VINEXT_INTERNAL_HEADERS) delete req.headers[header];
 							const requestOrigin = `http://${req.headers.host || "localhost"}`;
-							const preMiddlewareReqUrl = new URL(url, requestOrigin);
-							const preMiddlewareReqCtx = requestContextFromRequest(new Request(preMiddlewareReqUrl, { headers: nodeRequestHeaders }));
-							const matchPathname = nextConfig?.i18n ? normalizeDefaultLocalePathname(pathname, nextConfig.i18n, { hostname: preMiddlewareReqUrl.hostname }) : pathname;
-							const matchResolvedPathname = (p) => nextConfig?.i18n ? normalizeDefaultLocalePathname(p, nextConfig.i18n, { hostname: preMiddlewareReqUrl.hostname }) : p;
-							if (nextConfig?.redirects.length) {
-								if (applyRedirects(matchPathname, res, nextConfig.redirects, preMiddlewareReqCtx, nextConfig.basePath ?? "")) return;
-							}
+							const method = req.method ?? "GET";
+							const webRequest = new Request(new URL(url, requestOrigin), {
+								method,
+								headers: nodeRequestHeaders
+							});
 							const applyRequestHeadersToNodeRequest = (nextRequestHeaders) => {
 								for (const key of Object.keys(req.headers)) delete req.headers[key];
 								for (const [key, value] of nextRequestHeaders) req.headers[key] = value;
 							};
-							let middlewareRequestHeaders = null;
-							let deferredMwResponseHeaders = null;
-							const applyDeferredMwHeaders = () => {
-								if (deferredMwResponseHeaders) for (const [key, value] of deferredMwResponseHeaders) res.appendHeader(key, value);
-							};
-							const applyMwRequestHeadersForExternalProxy = () => {
-								if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
-								else delete req.headers[VINEXT_MW_CTX_HEADER];
-							};
-							if (middlewarePath) {
+							const capturedMiddlewarePath = middlewarePath;
+							const devRunMiddlewareAdapter = capturedMiddlewarePath ? async (_request, _ctx, opts) => {
 								const rawProto = process.env.VINEXT_TRUST_PROXY === "1" || (process.env.VINEXT_TRUSTED_HOSTS ?? "").split(",").some((h) => h.trim()) ? String(req.headers["x-forwarded-proto"] || "").split(",")[0].trim() : "";
-								const origin = `${rawProto === "https" || rawProto === "http" ? rawProto : "http"}://${req.headers.host || "localhost"}`;
-								const middlewareRequest = new Request(new URL(url, origin), {
+								const mwOrigin = `${rawProto === "https" || rawProto === "http" ? rawProto : "http"}://${req.headers.host || "localhost"}`;
+								const middlewareRequest = new Request(new URL(url, mwOrigin), {
 									method: req.method,
 									headers: nodeRequestHeaders
 								});
-								const result = await runMiddleware(getPagesRunner(), middlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, isDataRequest);
-								if (result.waitUntilPromises?.length) Promise.allSettled(result.waitUntilPromises);
-								if (!result.continue) {
-									if (result.redirectUrl) {
-										const redirectHeaders = { Location: result.redirectUrl };
-										if (result.responseHeaders) for (const [key, value] of result.responseHeaders) {
-											const existing = redirectHeaders[key];
-											if (existing === void 0) redirectHeaders[key] = value;
-											else if (Array.isArray(existing)) existing.push(value);
-											else redirectHeaders[key] = [existing, value];
-										}
-										res.writeHead(result.redirectStatus ?? 307, redirectHeaders);
-										res.end();
-										return;
-									}
-									if (result.response) {
-										res.statusCode = result.response.status;
-										for (const [key, value] of result.response.headers) res.appendHeader(key, value);
-										const body = Buffer.from(await result.response.arrayBuffer());
-										res.end(body);
-										return;
-									}
-								}
-								if (result.responseHeaders) {
-									const currentRequestHeaders = new Headers();
-									for (const [key, value] of Object.entries(req.headers)) if (Array.isArray(value)) currentRequestHeaders.set(key, value.join(", "));
-									else if (value !== void 0) currentRequestHeaders.set(key, value);
-									middlewareRequestHeaders = buildRequestHeadersFromMiddlewareResponse(currentRequestHeaders, result.responseHeaders, { preserveCredentialHeaders: Boolean(result.rewriteUrl && isExternalUrl(result.rewriteUrl)) });
-									if (middlewareRequestHeaders && !hasAppDir) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
-									if (hasAppDir) {
-										deferredMwResponseHeaders = [];
-										for (const [key, value] of result.responseHeaders) if (!key.startsWith("x-middleware-")) deferredMwResponseHeaders.push([key, value]);
-									} else for (const [key, value] of result.responseHeaders) if (!key.startsWith("x-middleware-")) res.appendHeader(key, value);
-								}
-								if (result.rewriteUrl) {
-									url = result.rewriteUrl;
-									req.url = url;
-								}
-								const middlewareStatus = result.status ?? result.rewriteStatus;
-								if (middlewareStatus !== void 0) req.__vinextMiddlewareStatus = middlewareStatus;
-								if (hasAppDir) {
+								const result = await runMiddleware(getPagesRunner(), capturedMiddlewarePath, middlewareRequest, nextConfig?.i18n, nextConfig?.basePath, nextConfig?.trailingSlash, opts.isDataRequest);
+								if (hasAppDir && result.continue) {
 									const mwCtxEntries = [];
 									if (result.responseHeaders) {
 										for (const [key, value] of result.responseHeaders) if (key !== "x-middleware-next" && key !== "x-middleware-rewrite") mwCtxEntries.push([key, value]);
 									}
+									const mwStatus = result.status ?? result.rewriteStatus;
 									req.headers[VINEXT_MW_CTX_HEADER] = JSON.stringify({
 										h: mwCtxEntries,
-										s: middlewareStatus ?? null,
+										s: mwStatus ?? null,
 										r: result.rewriteUrl ?? null
 									});
 								}
-							}
-							const reqUrl = new URL(url, requestOrigin);
-							const reqCtx = requestContextFromRequest(new Request(reqUrl, { headers: middlewareRequestHeaders ?? nodeRequestHeaders }));
-							if (nextConfig?.headers.length) applyHeaders(matchPathname, res, nextConfig.headers, preMiddlewareReqCtx, bp);
-							let resolvedUrl = url;
-							if (nextConfig?.rewrites.beforeFiles.length) {
-								const rewritten = applyRewrites(matchPathname, nextConfig.rewrites.beforeFiles, reqCtx, bp);
-								if (rewritten) resolvedUrl = mergeRewriteQuery(url, rewritten);
-							}
-							if (isExternalUrl(resolvedUrl)) {
-								applyDeferredMwHeaders();
-								applyMwRequestHeadersForExternalProxy();
-								await proxyExternalRewriteNode(req, res, resolvedUrl);
+								return result;
+							} : null;
+							const devPageRoutes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+							const pipelineResult = await runPagesRequest(webRequest, {
+								basePath: bp,
+								trailingSlash: nextConfig?.trailingSlash ?? false,
+								i18nConfig: nextConfig?.i18n ?? null,
+								configRedirects: nextConfig?.redirects ?? [],
+								configRewrites: nextConfig?.rewrites ?? {
+									beforeFiles: [],
+									afterFiles: [],
+									fallback: []
+								},
+								configHeaders: nextConfig?.headers ?? [],
+								hadBasePath: true,
+								isDataReq,
+								isDataRequest,
+								rawSearch: url.includes("?") ? url.slice(url.indexOf("?")) : "",
+								runMiddleware: devRunMiddlewareAdapter,
+								matchPageRoute: (resolvedPathname) => {
+									const m = matchRoute(resolvedPathname, devPageRoutes);
+									return m ? { route: { isDynamic: m.route.isDynamic } } : null;
+								},
+								proxyExternal: async (currentRequest, externalUrl) => {
+									const externalMethod = req.method ?? "GET";
+									const hasBody = externalMethod !== "GET" && externalMethod !== "HEAD";
+									const externalInit = {
+										method: externalMethod,
+										headers: currentRequest.headers
+									};
+									if (hasBody) {
+										const { Readable } = await import("node:stream");
+										externalInit.body = Readable.toWeb(req);
+										externalInit.duplex = "half";
+									}
+									return proxyExternalRequest(new Request(new URL(url, requestOrigin), externalInit), externalUrl);
+								}
+							});
+							if (pipelineResult.type === "response") {
+								await writeWebResponseToNodeRes(res, pipelineResult.response);
 								return;
 							}
-							const apiLookupUrl = stripI18nLocaleForApiRoute(resolvedUrl, nextConfig?.i18n);
-							const resolvedPathname = apiLookupUrl.split("?")[0];
-							if (resolvedPathname.startsWith("/api/") || resolvedPathname === "/api") {
+							if (pipelineResult.type === "next") return next();
+							if (pipelineResult.type === "handled") return;
+							const flushStagedHeaders = () => {
+								for (const [key, value] of Object.entries(pipelineResult.stagedHeaders)) if (Array.isArray(value)) for (const v of value) res.appendHeader(key, v);
+								else res.appendHeader(key, value);
+							};
+							const flushRequestHeaders = () => {
+								applyRequestHeadersToNodeRequest(pipelineResult.requestHeaders);
+							};
+							if (pipelineResult.type === "api") {
 								const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
-								if (matchRoute(apiLookupUrl, apiRoutes)) {
-									applyDeferredMwHeaders();
-									if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
+								if (matchRoute(pipelineResult.apiUrl, apiRoutes)) {
+									flushStagedHeaders();
+									flushRequestHeaders();
+									if (pipelineResult.middlewareStatus !== void 0) req.__vinextMiddlewareStatus = pipelineResult.middlewareStatus;
 								}
-								if (await handleApiRoute(getPagesRunner(), req, res, apiLookupUrl, apiRoutes)) return;
+								if (await handleApiRoute(getPagesRunner(), req, res, pipelineResult.apiUrl, apiRoutes)) return;
 								if (hasAppDir) return next();
 								res.statusCode = 404;
 								res.end("404 - API route not found");
 								return;
 							}
-							const routes = await pagesRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
-							let match = matchRoute(resolvedUrl.split("?")[0], routes);
-							if ((!match || match.route.isDynamic) && nextConfig?.rewrites.afterFiles.length) {
-								const afterRewrite = applyRewrites(matchResolvedPathname(resolvedUrl.split("?")[0]), nextConfig.rewrites.afterFiles, reqCtx, bp);
-								if (afterRewrite) {
-									resolvedUrl = mergeRewriteQuery(resolvedUrl, afterRewrite);
-									match = matchRoute(resolvedUrl.split("?")[0], routes);
-								}
-							}
-							if (isExternalUrl(resolvedUrl)) {
-								applyDeferredMwHeaders();
-								applyMwRequestHeadersForExternalProxy();
-								await proxyExternalRewriteNode(req, res, resolvedUrl);
-								return;
+							{
+								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);
+								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);
 							}
-							const handler = createSSRHandler(server, getPagesRunner(), routes, pagesDir, nextConfig?.i18n, fileMatcher, nextConfig?.basePath ?? "", nextConfig?.trailingSlash ?? false, middlewarePath !== null, nextConfig?.clientTraceMetadata);
-							const mwStatus = req.__vinextMiddlewareStatus;
-							if (match) {
-								applyDeferredMwHeaders();
-								if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
-								await handler(req, res, resolvedUrl, mwStatus, isDataReq);
-								return;
-							}
-							if (nextConfig?.rewrites.fallback.length) {
-								const fallbackRewrite = applyRewrites(matchResolvedPathname(resolvedUrl.split("?")[0]), nextConfig.rewrites.fallback, reqCtx, bp);
-								if (fallbackRewrite) {
-									if (isExternalUrl(fallbackRewrite)) {
-										applyDeferredMwHeaders();
-										applyMwRequestHeadersForExternalProxy();
-										await proxyExternalRewriteNode(req, res, fallbackRewrite);
-										return;
-									}
-									if (!matchRoute(fallbackRewrite.split("?")[0], routes) && hasAppDir) return next();
-									applyDeferredMwHeaders();
-									if (middlewareRequestHeaders) applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
-									await handler(req, res, fallbackRewrite, mwStatus, isDataReq);
-									return;
-								}
-							}
-							if (hasAppDir) return next();
-							await handler(req, res, resolvedUrl, mwStatus, isDataReq);
 						} catch (e) {
 							next(e);
 						}
@@ -1548,9 +1627,12 @@ function vinext(options = {}) {
 		{
 			name: "vinext:compiler-define-server",
 			configEnvironment(name) {
-				if (Object.keys(nextConfig.compilerDefineServer).length === 0) return null;
 				if (name === "client") return null;
-				return { define: { ...nextConfig.compilerDefineServer } };
+				const serverDefines = { ...nextConfig.compilerDefineServer };
+				const sharedRevalidateSecret = process.env.__VINEXT_SHARED_REVALIDATE_SECRET;
+				if (sharedRevalidateSecret) serverDefines["process.env.__VINEXT_REVALIDATE_SECRET"] = JSON.stringify(sharedRevalidateSecret);
+				if (Object.keys(serverDefines).length === 0) return null;
+				return { define: serverDefines };
 			}
 		},
 		{
@@ -1597,23 +1679,35 @@ function vinext(options = {}) {
 					if (id.includes("node_modules")) return null;
 					if (id.startsWith("\0")) return null;
 					if (!id.match(/\.(tsx?|jsx?|mjs)$/)) return null;
-					const imageImportRe = new RegExp(`import\\s+(\\w+)\\s+from\\s+['"]([^'"]+\\.(${IMAGE_EXTS}))['"];?`, "g");
-					if (!imageImportRe.test(code)) return null;
-					imageImportRe.lastIndex = 0;
+					const imageExtRe = new RegExp(`\\.(${IMAGE_EXTS})$`);
+					const lang = id.endsWith(".ts") ? "ts" : "tsx";
+					let ast;
+					try {
+						ast = parseAst(code, { lang });
+					} catch {
+						return null;
+					}
 					const s = new MagicString(code);
 					let hasChanges = false;
-					let match;
-					while ((match = imageImportRe.exec(code)) !== null) {
-						const [fullMatch, varName, importPath] = match;
-						const matchStart = match.index;
-						const matchEnd = matchStart + fullMatch.length;
+					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;
+						const specifiers = importNode.specifiers ?? [];
+						if (specifiers.length !== 1) continue;
+						const specifier = specifiers[0];
+						if (specifier.type !== "ImportDefaultSpecifier") continue;
+						const varName = specifier.local?.name;
+						if (!varName) continue;
 						const dir = path.dirname(id);
-						const absImagePath = path.resolve(dir, importPath);
+						const absImagePath = normalizePathSeparators(path.resolve(dir, importPath));
 						if (!fs.existsSync(absImagePath)) continue;
 						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 };`;
-						s.overwrite(matchStart, matchEnd, replacement);
+						s.overwrite(importNode.start, importNode.end, replacement);
 						hasChanges = true;
 					}
 					if (!hasChanges) return null;
@@ -1625,7 +1719,7 @@ function vinext(options = {}) {
 			}
 		},
 		createGoogleFontsPlugin(_fontGoogleShimPath, _shimsDir),
-		createLocalFontsPlugin(),
+		createLocalFontsPlugin(_shimsDir),
 		createOptimizeImportsPlugin(() => nextConfig, () => root),
 		{
 			name: "vinext:use-cache",
@@ -1677,9 +1771,15 @@ function vinext(options = {}) {
 						const directiveValue = cacheDirective.expression.value;
 						const variant = directiveValue === "use cache" ? "" : directiveValue.replace("use cache:", "").replace("use cache: ", "").trim();
 						const isLayoutOrTemplate = /\/(layout|template)\.(tsx?|jsx?|mjs)$/.test(id);
+						const modulePath = stripViteModuleQuery(id);
+						const moduleFileName = path.basename(modulePath);
+						const isAppPageModule = hasAppDir && isInsideDirectory(appDir, modulePath) && path.parse(moduleFileName).name === "page" && fileMatcher.extensionRegex.test(moduleFileName);
 						const runtimeModuleUrl = pathToFileURL(resolveShimModulePath(shimsDir, "cache-runtime")).href;
 						const result = transformWrapExport(code, ast, {
-							runtime: (value, name) => `(await import(${JSON.stringify(runtimeModuleUrl)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)})`,
+							runtime: (value, name) => {
+								const pageOptions = name === "default" && isAppPageModule ? `, { appPageDefaultExport: true }` : "";
+								return `(await import(${JSON.stringify(runtimeModuleUrl)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)}${pageOptions})`;
+							},
 							rejectNonAsyncFunction: false,
 							filter: (name, meta) => {
 								if (meta.isFunction === false) return false;
@@ -1725,8 +1825,9 @@ function vinext(options = {}) {
 			}
 		},
 		createImportMetaUrlPlugin({ getRoot: () => root }),
+		createRequireContextPlugin(),
 		createOgInlineFetchAssetsPlugin(),
-		ogAssetsPlugin,
+		createOgAssetsPlugin(),
 		createServerExternalsManifestPlugin(),
 		{
 			name: "vinext:image-config",
@@ -1754,7 +1855,7 @@ function vinext(options = {}) {
 				name: "vinext:build-id",
 				apply: "build",
 				enforce: "post",
-				closeBundle: {
+				writeBundle: {
 					sequential: true,
 					order: "post",
 					handler() {
@@ -1836,6 +1937,26 @@ function vinext(options = {}) {
 				}
 			}
 		},
+		{
+			name: "vinext:next-client-runtime-manifests",
+			apply: "build",
+			enforce: "post",
+			writeBundle: {
+				sequential: true,
+				order: "post",
+				handler(outputOptions) {
+					const clientDir = outputOptions.dir;
+					if (!clientDir) return;
+					if (!(this.environment?.name === "client")) return;
+					emitNextClientRuntimeManifests({
+						clientDir,
+						assetsSubdir: resolveAssetsDir(nextConfig.assetPrefix),
+						buildId: nextConfig.buildId,
+						rewrites: nextConfig.rewrites
+					});
+				}
+			}
+		},
 		(() => {
 			let pendingPrecompress = null;
 			let pendingPrecompressError = null;
@@ -1864,8 +1985,7 @@ function vinext(options = {}) {
 									if (!isTTY) return;
 									const pct = total > 0 ? Math.floor(completed / total * 100) : 0;
 									const bar = `[${"█".repeat(Math.floor(pct / 5))}${" ".repeat(20 - Math.floor(pct / 5))}]`;
-									const maxFile = 30;
-									const fileLabel = file.length > maxFile ? "…" + file.slice(-(maxFile - 1)) : file;
+									const fileLabel = file.length > 30 ? "…" + file.slice(-29) : file;
 									const line = `Compressing assets... ${bar} ${String(completed).padStart(String(total).length)}/${total} ${fileLabel}`;
 									const padded = line.padEnd(lastLineLen);
 									lastLineLen = line.length;
@@ -1940,9 +2060,11 @@ function vinext(options = {}) {
 					const clientBase = envConfig.base ?? "/";
 					let lazyChunksData = null;
 					let clientEntryFile = null;
+					const clientEntryManifest = readClientEntryManifest(clientDir);
+					clientEntryFile = (hasAppDir && hasPagesDir ? findPagesClientEntryFileFromVinextManifest : findClientEntryFileFromVinextManifest)(clientEntryManifest, clientBase) ?? null;
 					const buildManifest = readClientBuildManifest(path.join(clientDir, ".vite", "manifest.json"));
 					if (buildManifest) {
-						clientEntryFile = findClientEntryFile({
+						if (!clientEntryFile) clientEntryFile = (hasAppDir && hasPagesDir ? findPagesClientEntryFile : findClientEntryFile)({
 							buildManifest,
 							clientDir,
 							assetsSubdir: resolveAssetsDir(nextConfig?.assetPrefix),
@@ -1958,9 +2080,15 @@ function vinext(options = {}) {
 					} catch {}
 					if (hasAppDir) {
 						const workerEntry = path.resolve(distDir, "server", "index.js");
-						if (fs.existsSync(workerEntry) && (lazyChunksData || ssrManifestData)) {
+						if (!clientEntryFile && hasPagesDir) clientEntryFile = findPagesClientEntryFile({
+							clientDir,
+							assetsSubdir: resolveAssetsDir(nextConfig?.assetPrefix),
+							assetBase: clientBase
+						}) ?? null;
+						if (fs.existsSync(workerEntry) && (lazyChunksData || ssrManifestData || hasPagesDir && clientEntryFile)) {
 							let code = fs.readFileSync(workerEntry, "utf-8");
 							const globals = [];
+							if (hasPagesDir && clientEntryFile) globals.push(`globalThis.__VINEXT_CLIENT_ENTRY__ = ${JSON.stringify(clientEntryFile)};`);
 							if (ssrManifestData) globals.push(`globalThis.__VINEXT_SSR_MANIFEST__ = ${JSON.stringify(ssrManifestData)};`);
 							if (lazyChunksData) globals.push(`globalThis.__VINEXT_LAZY_CHUNKS__ = ${JSON.stringify(lazyChunksData)};`);
 							code = globals.join("\n") + "\n" + code;
@@ -2005,6 +2133,7 @@ function vinext(options = {}) {
 						fs.mkdirSync(clientDir, { recursive: true });
 						fs.writeFileSync(headersPath, headersContent);
 					}
+					ensureAssetsIgnore(clientDir);
 				}
 			}
 		},
@@ -2028,15 +2157,19 @@ function vinext(options = {}) {
 						`    if (mod) {`,
 						`      WebAssembly.instantiate(mod, imports).then(function(inst) { callback(inst); });`,
 						`    } else {`,
-						`      var b = Buffer.from(__vi_yoga_b64, "base64");`,
-						`      WebAssembly.instantiate(b, imports).then(function(r) { callback(r.instance); });`,
+						`      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_b64 = ${JSON.stringify(yogaBase64)};`, `var __vi_yoga_mod = import("./yoga.wasm?module").then(function(m) { return m.default; }).catch(function() { return null; });`].join("\n") + "\n" + result;
+					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) {
@@ -2074,104 +2207,31 @@ function getNextPublicEnvDefines() {
 	return defines;
 }
 /**
-* Apply redirect rules from next.config.js.
-* Returns true if a redirect was applied.
+* Write a Web API Response to a Node.js ServerResponse.
+* Handles multi-value headers (Set-Cookie) correctly.
 */
-function applyRedirects(pathname, res, redirects, ctx, basePath = "") {
-	const result = matchRedirect(pathname, redirects, ctx, {
-		basePath,
-		hadBasePath: true
+async function writeWebResponseToNodeRes(res, response) {
+	const nodeHeaders = {};
+	response.headers.forEach((value, key) => {
+		if (key === "set-cookie") return;
+		const existing = nodeHeaders[key];
+		if (existing !== void 0) nodeHeaders[key] = Array.isArray(existing) ? [...existing, value] : [existing, value];
+		else nodeHeaders[key] = value;
 	});
-	if (result) {
-		const dest = sanitizeDestination(basePath && !isExternalUrl(result.destination) && !hasBasePath(result.destination, basePath) ? basePath + result.destination : result.destination);
-		res.writeHead(result.permanent ? 308 : 307, { Location: dest });
-		res.end();
-		return true;
-	}
-	return false;
-}
-async function proxyExternalRewriteNode(req, res, externalUrl) {
-	try {
-		const origin = `http://${req.headers.host || "localhost"}`;
-		const method = req.method ?? "GET";
-		const hasBody = method !== "GET" && method !== "HEAD";
-		const init = {
-			method,
-			headers: Object.fromEntries(Object.entries(req.headers).filter(([, v]) => v !== void 0).map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)]))
-		};
-		if (hasBody) {
-			const { Readable } = await import("node:stream");
-			init.body = Readable.toWeb(req);
-			init.duplex = "half";
-		}
-		const proxyResponse = await proxyExternalRequest(new Request(new URL(req.url ?? "/", origin), init), externalUrl);
-		const nodeHeaders = {};
-		proxyResponse.headers.forEach((value, key) => {
-			const existing = nodeHeaders[key];
-			if (existing !== void 0) nodeHeaders[key] = Array.isArray(existing) ? [...existing, value] : [existing, value];
-			else nodeHeaders[key] = value;
+	const cookies = response.headers.getSetCookie?.() ?? [];
+	if (cookies.length > 0) nodeHeaders["set-cookie"] = cookies;
+	if (response.statusText) res.writeHead(response.status, response.statusText, nodeHeaders);
+	else res.writeHead(response.status, nodeHeaders);
+	if (response.body) {
+		const { Readable } = await import("node:stream");
+		const nodeStream = Readable.fromWeb(response.body);
+		await new Promise((resolve, reject) => {
+			nodeStream.on("error", reject);
+			res.on("error", reject);
+			nodeStream.pipe(res);
+			nodeStream.on("end", resolve);
 		});
-		res.writeHead(proxyResponse.status, nodeHeaders);
-		if (proxyResponse.body) {
-			const { Readable: ReadableImport } = await import("node:stream");
-			ReadableImport.fromWeb(proxyResponse.body).pipe(res);
-		} else res.end();
-	} catch (e) {
-		console.error("[vinext] External rewrite proxy error:", e);
-		if (!res.headersSent) {
-			res.writeHead(502);
-			res.end("Bad Gateway");
-		}
-	}
-}
-/**
-* Apply rewrite rules from next.config.js.
-* Returns the rewritten URL or null if no rewrite matched.
-*/
-function applyRewrites(pathname, rewrites, ctx, basePath = "") {
-	const dest = matchRewrite(pathname, rewrites, ctx, {
-		basePath,
-		hadBasePath: true
-	});
-	if (dest) return sanitizeDestination(dest);
-	return null;
-}
-/**
-* Apply custom header rules from next.config.js.
-* Middleware headers take precedence: if a header key was already set on the
-* response (by middleware), the config value is skipped for that key.
-*/
-function applyHeaders(pathname, res, headers, ctx, basePath = "") {
-	const matched = matchHeaders(pathname, headers, ctx, {
-		basePath,
-		hadBasePath: true
-	});
-	for (const header of matched) {
-		const lk = header.key.toLowerCase();
-		if (lk === "set-cookie") {
-			const existing = res.getHeader(lk);
-			if (Array.isArray(existing)) res.setHeader(header.key, [...existing, header.value]);
-			else if (existing) res.setHeader(header.key, [String(existing), header.value]);
-			else res.setHeader(header.key, header.value);
-		} else if (lk === "vary") {
-			const existing = res.getHeader(lk);
-			if (existing) res.setHeader(header.key, existing + ", " + header.value);
-			else res.setHeader(header.key, header.value);
-		} else if (!res.getHeader(lk)) res.setHeader(header.key, header.value);
-	}
-}
-/**
-* Find a file by name (without extension) in a directory.
-* Checks the configured page extensions.
-*/
-function findFileWithExts(dir, name, matcher) {
-	for (const ext of matcher.dottedExtensions) {
-		const filePath = path.join(dir, name + ext);
-		if (fs.existsSync(filePath)) return filePath;
-	}
-	return null;
+	} else res.end();
 }
 //#endregion
 export { vinext as default, staticExportApp, staticExportPages };
-
-//# sourceMappingURL=index.js.map