vinext 0.0.26 → 0.0.28

package/dist/index.js

@@ -1,5 +1,5 @@
 import { loadEnv, parseAst } from "vite";
-import { pagesRouter, apiRouter, invalidateRouteCache, matchRoute } from "./routing/pages-router.js";
+import { pagesRouter, apiRouter, invalidateRouteCache, matchRoute, } from "./routing/pages-router.js";
 import { generateServerEntry as _generateServerEntry } from "./entries/pages-server-entry.js";
 import { generateClientEntry as _generateClientEntry } from "./entries/pages-client-entry.js";
 import { appRouter, invalidateAppRouteCache } from "./routing/app-router.js";
@@ -19,8 +19,12 @@ import { PHASE_PRODUCTION_BUILD, PHASE_DEVELOPMENT_SERVER } from "./shims/consta
 import { validateDevRequest } from "./server/dev-origin-check.js";
 import { isExternalUrl, proxyExternalRequest, matchHeaders, matchRedirect, matchRewrite, requestContextFromRequest, sanitizeDestination, } from "./config/config-matchers.js";
 import { scanMetadataFiles } from "./server/metadata-routes.js";
+import { buildRequestHeadersFromMiddlewareResponse } from "./server/middleware-request-headers.js";
 import { detectPackageManager } from "./utils/project.js";
+import { manifestFileWithBase, manifestFilesWithBase, normalizeManifestFile, } from "./utils/manifest-paths.js";
+import { hasBasePath } from "./utils/base-path.js";
 import { asyncHooksStubPlugin } from "./plugins/async-hooks-stub.js";
+import { clientReferenceDedupPlugin } from "./plugins/client-reference-dedup.js";
 import { hasWranglerConfig, formatMissingCloudflarePluginError } from "./deploy.js";
 import tsconfigPaths from "vite-tsconfig-paths";
 import react from "@vitejs/plugin-react";
@@ -66,7 +70,11 @@ async function fetchAndCacheFont(cssUrl, family, cacheDir) {
     while ((urlMatch = urlRe.exec(css)) !== null) {
         const fontUrl = urlMatch[1];
         if (!urls.has(fontUrl)) {
-            const ext = fontUrl.includes(".woff2") ? ".woff2" : fontUrl.includes(".woff") ? ".woff" : ".ttf";
+            const ext = fontUrl.includes(".woff2")
+                ? ".woff2"
+                : fontUrl.includes(".woff")
+                    ? ".woff"
+                    : ".ttf";
             const fileHash = createHash("md5").update(fontUrl).digest("hex").slice(0, 8);
             urls.set(fontUrl, `${family.toLowerCase().replace(/\s+/g, "-")}-${fileHash}${ext}`);
         }
@@ -133,7 +141,9 @@ function extractStaticValue(node) {
             return node.value;
         case "UnaryExpression":
             // Handle negative numbers: -1, -3.14
-            if (node.operator === "-" && node.argument?.type === "Literal" && typeof node.argument.value === "number") {
+            if (node.operator === "-" &&
+                node.argument?.type === "Literal" &&
+                typeof node.argument.value === "number") {
                 return -node.argument.value;
             }
             return undefined;
@@ -244,7 +254,9 @@ async function resolvePostcssStringPlugins(projectRoot) {
     // Load the config file
     let config;
     try {
-        if (configPath.endsWith(".json") || configPath.endsWith(".yaml") || configPath.endsWith(".yml")) {
+        if (configPath.endsWith(".json") ||
+            configPath.endsWith(".yaml") ||
+            configPath.endsWith(".yml")) {
             // JSON/YAML configs use object form — postcss-load-config handles these fine
             return undefined;
         }
@@ -267,8 +279,7 @@ async function resolvePostcssStringPlugins(projectRoot) {
     // (either bare strings or tuple form ["plugin-name", { options }])
     if (!config || !Array.isArray(config.plugins))
         return undefined;
-    const hasStringPlugins = config.plugins.some((p) => typeof p === "string" ||
-        (Array.isArray(p) && typeof p[0] === "string"));
+    const hasStringPlugins = config.plugins.some((p) => typeof p === "string" || (Array.isArray(p) && typeof p[0] === "string"));
     if (!hasStringPlugins)
         return undefined;
     // Resolve string plugin names to actual plugin functions
@@ -366,9 +377,7 @@ function clientManualChunks(id) {
         const pkg = getPackageName(id);
         if (!pkg)
             return undefined;
-        if (pkg === "react" ||
-            pkg === "react-dom" ||
-            pkg === "scheduler") {
+        if (pkg === "react" || pkg === "react-dom" || pkg === "scheduler") {
             return "framework";
         }
         // Let Rollup handle all other vendor code via its default
@@ -495,6 +504,57 @@ function computeLazyChunks(buildManifest) {
     }
     return lazyChunks;
 }
+function normalizeManifestModuleId(moduleId, root) {
+    const normalizedId = moduleId.replace(/\\/g, "/");
+    const isWindowsAbsolute = /^[a-zA-Z]:[\\/]/.test(moduleId) || moduleId.startsWith("\\\\");
+    if (isWindowsAbsolute) {
+        const relativeId = path.win32.relative(root, moduleId).replace(/\\/g, "/");
+        if (!relativeId || relativeId.startsWith("../"))
+            return normalizedId;
+        return relativeId;
+    }
+    if (!path.isAbsolute(moduleId))
+        return normalizedId;
+    const relativeId = path.relative(root, moduleId).replace(/\\/g, "/");
+    if (!relativeId || relativeId.startsWith("../"))
+        return normalizedId;
+    return relativeId;
+}
+function augmentSsrManifestFromBundle(ssrManifest, bundle, root, base = "/") {
+    const nextManifest = Object.fromEntries(Object.entries(ssrManifest).map(([key, files]) => [
+        key,
+        new Set(files.map((file) => normalizeManifestFile(file))),
+    ]));
+    for (const item of Object.values(bundle)) {
+        if (item.type !== "chunk")
+            continue;
+        const chunk = item;
+        const files = new Set();
+        files.add(manifestFileWithBase(chunk.fileName, base));
+        for (const importedFile of chunk.imports ?? []) {
+            files.add(manifestFileWithBase(importedFile, base));
+        }
+        for (const cssFile of chunk.viteMetadata?.importedCss ?? []) {
+            files.add(manifestFileWithBase(cssFile, base));
+        }
+        for (const assetFile of chunk.viteMetadata?.importedAssets ?? []) {
+            files.add(manifestFileWithBase(assetFile, base));
+        }
+        for (const moduleId of Object.keys(chunk.modules ?? {})) {
+            const key = normalizeManifestModuleId(moduleId, root);
+            if (key.startsWith("node_modules/") || key.includes("/node_modules/"))
+                continue;
+            if (key.startsWith("\0"))
+                continue;
+            if (!nextManifest[key])
+                nextManifest[key] = new Set();
+            for (const file of files) {
+                nextManifest[key].add(file);
+            }
+        }
+    }
+    return Object.fromEntries(Object.entries(nextManifest).map(([key, files]) => [key, [...files]]));
+}
 export default function vinext(options = {}) {
     let root;
     let pagesDir;
@@ -566,11 +626,12 @@ export default function vinext(options = {}) {
     if (earlyAppDirExists && autoRsc) {
         if (!resolvedRscPath) {
             throw new Error("vinext: App Router detected but @vitejs/plugin-rsc is not installed.\n" +
-                "Run: " + detectPackageManager(process.cwd()) + " @vitejs/plugin-rsc");
+                "Run: " +
+                detectPackageManager(process.cwd()) +
+                " @vitejs/plugin-rsc");
         }
         const rscImport = import(pathToFileURL(resolvedRscPath).href);
-        rscPluginPromise = rscImport
-            .then((mod) => {
+        rscPluginPromise = rscImport.then((mod) => {
             const rsc = mod.default;
             return rsc({
                 entries: {
@@ -585,9 +646,7 @@ export default function vinext(options = {}) {
     // Shared state for the MDX proxy plugin. Populated during config() if MDX
     // files are detected and @mdx-js/rollup is installed.
     let mdxDelegate = null;
-    const reactPlugin = options.react === false
-        ? false
-        : react(options.react === true ? undefined : options.react);
+    const reactPlugin = options.react === false ? false : react(options.react === true ? undefined : options.react);
     const plugins = [
         // Resolve tsconfig paths/baseUrl aliases so real-world Next.js repos
         // that use @/*, #/*, or baseUrl imports work out of the box.
@@ -689,7 +748,9 @@ export default function vinext(options = {}) {
                 // server-side validation. Matches Next.js behavior: only configured
                 // sizes are accepted by the image optimization endpoint.
                 {
-                    const deviceSizes = nextConfig.images?.deviceSizes ?? [640, 750, 828, 1080, 1200, 1920, 2048, 3840];
+                    const deviceSizes = nextConfig.images?.deviceSizes ?? [
+                        640, 750, 828, 1080, 1200, 1920, 2048, 3840,
+                    ];
                     const imageSizes = nextConfig.images?.imageSizes ?? [16, 32, 48, 64, 96, 128, 256, 384];
                     defines["process.env.__VINEXT_IMAGE_DEVICE_SIZES"] = JSON.stringify(JSON.stringify(deviceSizes));
                     defines["process.env.__VINEXT_IMAGE_SIZES"] = JSON.stringify(JSON.stringify(imageSizes));
@@ -701,6 +762,11 @@ export default function vinext(options = {}) {
                 // __prerender_bypass cookie is consistent across all server
                 // instances (e.g. multiple Cloudflare Workers isolates).
                 defines["process.env.__VINEXT_DRAFT_SECRET"] = JSON.stringify(crypto.randomUUID());
+                // Build ID — resolved from next.config generateBuildId() or random UUID.
+                // Exposed so server entries and the next/server shim can inject it.
+                // Also used to namespace ISR cache keys so old cached entries from a
+                // previous deploy are never served by the new one.
+                defines["process.env.__VINEXT_BUILD_ID"] = JSON.stringify(nextConfig.buildId);
                 // Build the shim alias map — used by both resolve.alias and resolveId
                 // (resolveId handles .js extension variants for libraries like nuqs)
                 nextShimMap = {
@@ -770,8 +836,14 @@ export default function vinext(options = {}) {
                     }
                 }
                 flattenPlugins(config.plugins ?? []);
-                hasCloudflarePlugin = pluginsFlat.some((p) => p && typeof p === "object" && typeof p.name === "string" && (p.name === "vite-plugin-cloudflare" || p.name.startsWith("vite-plugin-cloudflare:")));
-                hasNitroPlugin = pluginsFlat.some((p) => p && typeof p === "object" && typeof p.name === "string" && (p.name === "nitro" || p.name.startsWith("nitro:")));
+                hasCloudflarePlugin = pluginsFlat.some((p) => p &&
+                    typeof p === "object" &&
+                    typeof p.name === "string" &&
+                    (p.name === "vite-plugin-cloudflare" || p.name.startsWith("vite-plugin-cloudflare:")));
+                hasNitroPlugin = pluginsFlat.some((p) => p &&
+                    typeof p === "object" &&
+                    typeof p.name === "string" &&
+                    (p.name === "nitro" || p.name.startsWith("nitro:")));
                 // Resolve PostCSS string plugin names that Vite can't handle.
                 // Next.js projects commonly use array-form plugins like
                 // `plugins: ["@tailwindcss/postcss"]` which postcss-load-config
@@ -785,9 +857,12 @@ export default function vinext(options = {}) {
                 }
                 // Auto-inject @mdx-js/rollup when MDX files exist and no MDX plugin is
                 // already configured. Applies remark/rehype plugins from next.config.
-                const hasMdxPlugin = pluginsFlat.some((p) => p && typeof p === "object" && typeof p.name === "string" &&
+                const hasMdxPlugin = pluginsFlat.some((p) => p &&
+                    typeof p === "object" &&
+                    typeof p.name === "string" &&
                     (p.name === "@mdx-js/rollup" || p.name === "mdx"));
-                if (!hasMdxPlugin && hasMdxFiles(root, hasAppDir ? appDir : null, hasPagesDir ? pagesDir : null)) {
+                if (!hasMdxPlugin &&
+                    hasMdxFiles(root, hasAppDir ? appDir : null, hasPagesDir ? pagesDir : null)) {
                     try {
                         const mdxRollup = await import("@mdx-js/rollup");
                         const mdxFactory = mdxRollup.default ?? mdxRollup;
@@ -811,7 +886,9 @@ export default function vinext(options = {}) {
                     catch {
                         // @mdx-js/rollup not installed — warn but don't fail
                         console.warn("[vinext] MDX files detected but @mdx-js/rollup is not installed. " +
-                            "Install it with: " + detectPackageManager(process.cwd()) + " @mdx-js/rollup");
+                            "Install it with: " +
+                            detectPackageManager(process.cwd()) +
+                            " @mdx-js/rollup");
                     }
                 }
                 // Detect if this is a standalone SSR build (set by `vite build --ssr`
@@ -893,12 +970,14 @@ export default function vinext(options = {}) {
                     // Skip when targeting bundled runtimes (Cloudflare/Nitro bundle everything).
                     // This also resolves extensionless-import issues in packages like
                     // `validator` (see #189) by routing them through Vite's resolver.
-                    ...(hasCloudflarePlugin || hasNitroPlugin ? {} : {
-                        ssr: {
-                            external: ["react", "react-dom", "react-dom/server"],
-                            noExternal: true,
-                        },
-                    }),
+                    ...(hasCloudflarePlugin || hasNitroPlugin
+                        ? {}
+                        : {
+                            ssr: {
+                                external: ["react", "react-dom", "react-dom/server"],
+                                noExternal: true,
+                            },
+                        }),
                     resolve: {
                         alias: nextShimMap,
                         // Dedupe React packages to prevent dual-instance errors.
@@ -906,12 +985,7 @@ export default function vinext(options = {}) {
                         // brings its own React copy, multiple React instances can load,
                         // causing cryptic "Invalid hook call" errors. This is a no-op
                         // when only one copy exists.
-                        dedupe: [
-                            "react",
-                            "react-dom",
-                            "react/jsx-runtime",
-                            "react/jsx-dev-runtime",
-                        ],
+                        dedupe: ["react", "react-dom", "react/jsx-runtime", "react/jsx-dev-runtime"],
                     },
                     // Exclude vinext from dependency optimization so esbuild doesn't
                     // scan dist files containing virtual module imports (virtual:vinext-*)
@@ -954,34 +1028,31 @@ export default function vinext(options = {}) {
                     // "Invalid hook call" from duplicate React instances).
                     // The entries must be relative to the project root.
                     const relAppDir = path.relative(root, appDir);
-                    const appEntries = [
-                        `${relAppDir}/**/*.{tsx,ts,jsx,js}`,
-                    ];
+                    const appEntries = [`${relAppDir}/**/*.{tsx,ts,jsx,js}`];
                     viteConfig.environments = {
                         rsc: {
-                            ...(hasCloudflarePlugin || hasNitroPlugin ? {} : {
-                                resolve: {
-                                    // Externalize native/heavy packages so the RSC environment
-                                    // loads them natively via Node rather than through Vite's
-                                    // ESM module evaluator (which can't handle native addons).
-                                    // Note: Do NOT externalize react/react-dom here — they must
-                                    // be bundled with the "react-server" condition for RSC.
-                                    // Skip when targeting bundled runtimes (Cloudflare/Nitro).
-                                    external: userSsrExternal === true ? true : [
-                                        "satori",
-                                        "@resvg/resvg-js",
-                                        "yoga-wasm-web",
-                                        ...userSsrExternal,
-                                    ],
-                                    // Force all node_modules through Vite's transform pipeline
-                                    // so non-JS imports (CSS, images) don't hit Node's native
-                                    // ESM loader. Matches Next.js behavior of bundling everything.
-                                    // Packages in `external` above take precedence per Vite rules.
-                                    // When user sets `ssr.external: true`, skip noExternal since
-                                    // everything is already externalized.
-                                    ...(userSsrExternal === true ? {} : { noExternal: true }),
-                                },
-                            }),
+                            ...(hasCloudflarePlugin || hasNitroPlugin
+                                ? {}
+                                : {
+                                    resolve: {
+                                        // Externalize native/heavy packages so the RSC environment
+                                        // loads them natively via Node rather than through Vite's
+                                        // ESM module evaluator (which can't handle native addons).
+                                        // Note: Do NOT externalize react/react-dom here — they must
+                                        // be bundled with the "react-server" condition for RSC.
+                                        // Skip when targeting bundled runtimes (Cloudflare/Nitro).
+                                        external: userSsrExternal === true
+                                            ? true
+                                            : ["satori", "@resvg/resvg-js", "yoga-wasm-web", ...userSsrExternal],
+                                        // Force all node_modules through Vite's transform pipeline
+                                        // so non-JS imports (CSS, images) don't hit Node's native
+                                        // ESM loader. Matches Next.js behavior of bundling everything.
+                                        // Packages in `external` above take precedence per Vite rules.
+                                        // When user sets `ssr.external: true`, skip noExternal since
+                                        // everything is already externalized.
+                                        ...(userSsrExternal === true ? {} : { noExternal: true }),
+                                    },
+                                }),
                             optimizeDeps: {
                                 exclude: ["vinext", "@vercel/og"],
                                 entries: appEntries,
@@ -994,17 +1065,19 @@ export default function vinext(options = {}) {
                             },
                         },
                         ssr: {
-                            ...(hasCloudflarePlugin || hasNitroPlugin ? {} : {
-                                resolve: {
-                                    external: userSsrExternal === true ? true : [...userSsrExternal],
-                                    // Force all node_modules through Vite's transform pipeline
-                                    // so non-JS imports (CSS, images) don't hit Node's native
-                                    // ESM loader. Matches Next.js behavior of bundling everything.
-                                    // When user sets `ssr.external: true`, skip noExternal since
-                                    // everything is already externalized.
-                                    ...(userSsrExternal === true ? {} : { noExternal: true }),
-                                },
-                            }),
+                            ...(hasCloudflarePlugin || hasNitroPlugin
+                                ? {}
+                                : {
+                                    resolve: {
+                                        external: userSsrExternal === true ? true : [...userSsrExternal],
+                                        // Force all node_modules through Vite's transform pipeline
+                                        // so non-JS imports (CSS, images) don't hit Node's native
+                                        // ESM loader. Matches Next.js behavior of bundling everything.
+                                        // When user sets `ssr.external: true`, skip noExternal since
+                                        // everything is already externalized.
+                                        ...(userSsrExternal === true ? {} : { noExternal: true }),
+                                    },
+                                }),
                             optimizeDeps: {
                                 exclude: ["vinext", "@vercel/og"],
                                 entries: appEntries,
@@ -1137,10 +1210,12 @@ export default function vinext(options = {}) {
                         return RESOLVED_SERVER_ENTRY;
                     if (cleanId === VIRTUAL_CLIENT_ENTRY)
                         return RESOLVED_CLIENT_ENTRY;
-                    if (cleanId.endsWith("/" + VIRTUAL_SERVER_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_SERVER_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)) {
+                    if (cleanId.endsWith("/" + VIRTUAL_CLIENT_ENTRY) ||
+                        cleanId.endsWith("\\" + VIRTUAL_CLIENT_ENTRY)) {
                         return RESOLVED_CLIENT_ENTRY;
                     }
                     // App Router virtual modules
@@ -1150,13 +1225,16 @@ export default function vinext(options = {}) {
                         return RESOLVED_APP_SSR_ENTRY;
                     if (cleanId === VIRTUAL_APP_BROWSER_ENTRY)
                         return RESOLVED_APP_BROWSER_ENTRY;
-                    if (cleanId.endsWith("/" + VIRTUAL_RSC_ENTRY) || cleanId.endsWith("\\" + VIRTUAL_RSC_ENTRY)) {
+                    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)) {
+                    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)) {
+                    if (cleanId.endsWith("/" + VIRTUAL_APP_BROWSER_ENTRY) ||
+                        cleanId.endsWith("\\" + VIRTUAL_APP_BROWSER_ENTRY)) {
                         return RESOLVED_APP_BROWSER_ENTRY;
                     }
                 },
@@ -1182,6 +1260,7 @@ export default function vinext(options = {}) {
                         allowedOrigins: nextConfig?.serverActionsAllowedOrigins,
                         allowedDevOrigins: nextConfig?.allowedDevOrigins,
                         bodySizeLimit: nextConfig?.serverActionsBodySizeLimit,
+                        i18n: nextConfig?.i18n,
                     }, instrumentationPath);
                 }
                 if (id === RESOLVED_APP_SSR_ENTRY && hasAppDir) {
@@ -1194,6 +1273,8 @@ export default function vinext(options = {}) {
         },
         // Stub node:async_hooks in client builds — see src/plugins/async-hooks-stub.ts
         asyncHooksStubPlugin,
+        // Dedup client references from RSC proxy modules — see src/plugins/client-reference-dedup.ts
+        clientReferenceDedupPlugin(),
         // Proxy plugin for @mdx-js/rollup. The real MDX plugin is created lazily
         // during vinext:config's config() (when MDX files are detected), but
         // plugins returned from config() hooks run too late in the pipeline —
@@ -1448,9 +1529,14 @@ export default function vinext(options = {}) {
                             // loads the module. The gap between them is exactly the Vite
                             // compile/transform cost.
                             function _parseTiming(raw) {
-                                const [handlerStart, inHandlerCompileMs, renderMs] = String(raw).split(",").map((v) => Number(v));
-                                if (!Number.isNaN(handlerStart) && !Number.isNaN(inHandlerCompileMs) && inHandlerCompileMs !== -1) {
-                                    _compileMs = Math.max(0, Math.round(handlerStart - _reqStart)) + inHandlerCompileMs;
+                                const [handlerStart, inHandlerCompileMs, renderMs] = String(raw)
+                                    .split(",")
+                                    .map((v) => Number(v));
+                                if (!Number.isNaN(handlerStart) &&
+                                    !Number.isNaN(inHandlerCompileMs) &&
+                                    inHandlerCompileMs !== -1) {
+                                    _compileMs =
+                                        Math.max(0, Math.round(handlerStart - _reqStart)) + inHandlerCompileMs;
                                 }
                                 if (!Number.isNaN(renderMs) && renderMs !== -1) {
                                     _renderMs = renderMs;
@@ -1496,7 +1582,9 @@ export default function vinext(options = {}) {
                                 // matching what Next.js shows for soft navigations.
                                 const resolvedRenderMs = _renderMs !== undefined
                                     ? _renderMs
-                                    : (_compileMs !== undefined ? Math.max(0, Math.round(totalMs - _compileMs)) : undefined);
+                                    : _compileMs !== undefined
+                                        ? Math.max(0, Math.round(totalMs - _compileMs))
+                                        : undefined;
                                 logRequest({
                                     method: req.method ?? "GET",
                                     url: logUrl,
@@ -1633,7 +1721,10 @@ export default function vinext(options = {}) {
                             }
                             // Normalize trailing slash based on next.config.js trailingSlash setting.
                             // Redirect to the canonical form if needed.
-                            if (nextConfig && pathname !== "/" && pathname !== "/api" && !pathname.startsWith("/api/")) {
+                            if (nextConfig &&
+                                pathname !== "/" &&
+                                pathname !== "/api" &&
+                                !pathname.startsWith("/api/")) {
                                 const hasTrailing = pathname.endsWith("/");
                                 if (nextConfig.trailingSlash && !hasTrailing) {
                                     // trailingSlash: true — redirect /about → /about/
@@ -1652,25 +1743,61 @@ export default function vinext(options = {}) {
                                     return;
                                 }
                             }
+                            // When @cloudflare/vite-plugin is present, delegate the entire
+                            // Pages Router request pipeline to the Worker/miniflare side.
+                            // That keeps middleware, headers, redirects, rewrites, API
+                            // routes, and rendering in one place instead of mutating the
+                            // host request and forwarding post-middleware state downstream.
+                            if (hasCloudflarePlugin)
+                                return next();
+                            // Snapshot of req.headers before middleware runs. Used for both
+                            // preMiddlewareReqCtx and the middleware Request itself. Intentionally
+                            // captured once here — applyRequestHeadersToNodeRequest() mutates
+                            // req.headers later, but by then this Headers object is no longer read.
+                            const nodeRequestHeaders = new Headers(Object.fromEntries(Object.entries(req.headers)
+                                .filter(([, v]) => v !== undefined)
+                                .map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
+                            const requestOrigin = `http://${req.headers.host || "localhost"}`;
+                            const preMiddlewareReqUrl = new URL(url, requestOrigin);
+                            const preMiddlewareReqCtx = requestContextFromRequest(new Request(preMiddlewareReqUrl, { headers: nodeRequestHeaders }));
+                            // Config redirects run before middleware, but still match against
+                            // the original normalized pathname and request headers/cookies.
+                            if (nextConfig?.redirects.length) {
+                                const redirected = applyRedirects(pathname, res, nextConfig.redirects, preMiddlewareReqCtx, nextConfig.basePath ?? "");
+                                if (redirected)
+                                    return;
+                            }
+                            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;
                             // Run middleware.ts if present
                             if (middlewarePath) {
                                 // Only trust X-Forwarded-Proto when behind a trusted proxy
-                                const devTrustProxy = process.env.VINEXT_TRUST_PROXY === "1" || (process.env.VINEXT_TRUSTED_HOSTS ?? "").split(",").some(h => h.trim());
+                                const devTrustProxy = process.env.VINEXT_TRUST_PROXY === "1" ||
+                                    (process.env.VINEXT_TRUSTED_HOSTS ?? "").split(",").some((h) => h.trim());
                                 const rawProto = devTrustProxy
-                                    ? String(req.headers["x-forwarded-proto"] || "").split(",")[0].trim()
+                                    ? String(req.headers["x-forwarded-proto"] || "")
+                                        .split(",")[0]
+                                        .trim()
                                     : "";
                                 const mwProto = rawProto === "https" || rawProto === "http" ? rawProto : "http";
                                 const origin = `${mwProto}://${req.headers.host || "localhost"}`;
                                 const middlewareRequest = new Request(new URL(url, origin), {
                                     method: req.method,
-                                    headers: Object.fromEntries(Object.entries(req.headers)
-                                        .filter(([, v]) => v !== undefined)
-                                        .map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])),
+                                    headers: nodeRequestHeaders,
                                 });
-                                const result = await runMiddleware(getPagesRunner(), middlewarePath, middlewareRequest);
+                                const result = await runMiddleware(getPagesRunner(), middlewarePath, middlewareRequest, nextConfig?.i18n);
                                 if (!result.continue) {
                                     if (result.redirectUrl) {
-                                        const redirectHeaders = { Location: result.redirectUrl };
+                                        const redirectHeaders = {
+                                            Location: result.redirectUrl,
+                                        };
                                         if (result.responseHeaders) {
                                             for (const [key, value] of result.responseHeaders) {
                                                 const existing = redirectHeaders[key];
@@ -1704,13 +1831,21 @@ export default function vinext(options = {}) {
                                 // config has/missing conditions and downstream handlers
                                 // see middleware-modified cookies and headers.
                                 if (result.responseHeaders) {
-                                    const mwReqPrefix = "x-middleware-request-";
-                                    for (const [key, value] of result.responseHeaders) {
-                                        if (key.startsWith(mwReqPrefix)) {
-                                            const realName = key.slice(mwReqPrefix.length);
-                                            req.headers[realName] = value;
+                                    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 !== undefined) {
+                                            currentRequestHeaders.set(key, value);
                                         }
-                                        else if (!key.startsWith("x-middleware-")) {
+                                    }
+                                    middlewareRequestHeaders = buildRequestHeadersFromMiddlewareResponse(currentRequestHeaders, result.responseHeaders);
+                                    if (middlewareRequestHeaders && !hasAppDir) {
+                                        applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
+                                    }
+                                    for (const [key, value] of result.responseHeaders) {
+                                        if (!key.startsWith("x-middleware-")) {
                                             res.appendHeader(key, value);
                                         }
                                     }
@@ -1732,52 +1867,25 @@ export default function vinext(options = {}) {
                                     req.__vinextRewriteStatus = result.rewriteStatus;
                                 }
                             }
-                            // ── Cloudflare Workers dev mode ────────────────────────────
-                            // When @cloudflare/vite-plugin is present, ALL rendering runs
-                            // inside the miniflare Worker subprocess — both App Router (via
-                            // virtual:vinext-rsc-entry) and Pages Router (via
-                            // virtual:vinext-server-entry → renderPage/handleApiRoute).
-                            //
-                            // The Worker entry already handles config redirects, rewrites,
-                            // headers, and all routing internally. Running them here too
-                            // would duplicate that logic and produce incorrect behaviour
-                            // (double redirects, headers set on the wrong object, etc.).
-                            //
-                            // Middleware.ts is the only thing that belongs in the host connect
-                            // handler — it has already run above. Any terminal middleware
-                            // result (redirect, block response) has already been sent.
-                            // Any rewrite has been written back to req.url above so the
-                            // Cloudflare plugin's handler sees the correct path.
-                            //
-                            // Call next() to hand off to the Cloudflare plugin's connect
-                            // handler, which dispatches the request to miniflare.
-                            if (hasCloudflarePlugin)
-                                return next();
                             // Build request context once for has/missing condition checks
-                            // across headers, redirects, and rewrites.
+                            // for config rules that execute after middleware (rewrites).
                             // Convert Node.js IncomingMessage headers to a Web Request for
                             // requestContextFromRequest(), which uses the standard Web API.
-                            const reqUrl = new URL(url, `http://${req.headers.host || "localhost"}`);
-                            const reqCtxHeaders = new Headers(Object.fromEntries(Object.entries(req.headers)
-                                .filter(([, v]) => v !== undefined)
-                                .map(([k, v]) => [k, Array.isArray(v) ? v.join(", ") : String(v)])));
+                            const reqUrl = new URL(url, requestOrigin);
+                            const reqCtxHeaders = middlewareRequestHeaders ?? nodeRequestHeaders;
                             const reqCtx = requestContextFromRequest(new Request(reqUrl, { headers: reqCtxHeaders }));
                             // Apply custom headers from next.config.js
+                            // Header matching still uses the original normalized pathname and
+                            // pre-middleware request state; middleware response headers win
+                            // later because they are already on the outgoing response.
                             if (nextConfig?.headers.length) {
-                                applyHeaders(pathname, res, nextConfig.headers, reqCtx);
-                            }
-                            // Apply redirects from next.config.js
-                            if (nextConfig?.redirects.length) {
-                                const redirected = applyRedirects(pathname, res, nextConfig.redirects, reqCtx);
-                                if (redirected)
-                                    return;
+                                applyHeaders(pathname, res, nextConfig.headers, preMiddlewareReqCtx);
                             }
                             // Apply rewrites from next.config.js (beforeFiles)
                             let resolvedUrl = url;
                             if (nextConfig?.rewrites.beforeFiles.length) {
                                 resolvedUrl =
-                                    applyRewrites(pathname, nextConfig.rewrites.beforeFiles, reqCtx) ??
-                                        url;
+                                    applyRewrites(pathname, nextConfig.rewrites.beforeFiles, reqCtx) ?? url;
                             }
                             // External rewrite from beforeFiles — proxy to external URL
                             if (isExternalUrl(resolvedUrl)) {
@@ -1786,9 +1894,12 @@ export default function vinext(options = {}) {
                             }
                             // Handle API routes first (pages/api/*)
                             const resolvedPathname = resolvedUrl.split("?")[0];
-                            if (resolvedPathname.startsWith("/api/") ||
-                                resolvedPathname === "/api") {
+                            if (resolvedPathname.startsWith("/api/") || resolvedPathname === "/api") {
                                 const apiRoutes = await apiRouter(pagesDir, nextConfig?.pageExtensions, fileMatcher);
+                                const apiMatch = matchRoute(resolvedUrl, apiRoutes);
+                                if (apiMatch && middlewareRequestHeaders) {
+                                    applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
+                                }
                                 const handled = await handleApiRoute(server, req, res, resolvedUrl, apiRoutes);
                                 if (handled)
                                     return;
@@ -1820,6 +1931,9 @@ export default function vinext(options = {}) {
                             // Try rendering the resolved URL
                             const match = matchRoute(resolvedUrl.split("?")[0], routes);
                             if (match) {
+                                if (middlewareRequestHeaders) {
+                                    applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
+                                }
                                 await handler(req, res, resolvedUrl, mwStatus);
                                 return;
                             }
@@ -1832,6 +1946,13 @@ export default function vinext(options = {}) {
                                         await proxyExternalRewriteNode(req, res, fallbackRewrite);
                                         return;
                                     }
+                                    const fallbackMatch = matchRoute(fallbackRewrite.split("?")[0], routes);
+                                    if (!fallbackMatch && hasAppDir) {
+                                        return next();
+                                    }
+                                    if (middlewareRequestHeaders) {
+                                        applyRequestHeadersToNodeRequest(middlewareRequestHeaders);
+                                    }
                                     await handler(req, res, fallbackRewrite, mwStatus);
                                     return;
                                 }
@@ -2032,7 +2153,10 @@ export default function vinext(options = {}) {
                     const importMatch = code.match(importRe);
                     if (!importMatch)
                         return null;
-                    const importedNames = new Set(importMatch[1].split(",").map((s) => s.trim()).filter(Boolean));
+                    const importedNames = new Set(importMatch[1]
+                        .split(",")
+                        .map((s) => s.trim())
+                        .filter(Boolean));
                     const s = new MagicString(code);
                     let hasChanges = false;
                     const cacheDir = this._cacheDir;
@@ -2058,10 +2182,14 @@ export default function vinext(options = {}) {
                         }
                         // Build the Google Fonts CSS URL
                         const weights = options.weight
-                            ? Array.isArray(options.weight) ? options.weight : [options.weight]
+                            ? Array.isArray(options.weight)
+                                ? options.weight
+                                : [options.weight]
                             : [];
                         const styles = options.style
-                            ? Array.isArray(options.style) ? options.style : [options.style]
+                            ? Array.isArray(options.style)
+                                ? options.style
+                                : [options.style]
                             : [];
                         const display = options.display ?? "swap";
                         let spec = family.replace(/\s+/g, "+");
@@ -2217,7 +2345,9 @@ export default function vinext(options = {}) {
                         return null;
                     if (!resolvedRscTransformsPath) {
                         throw new Error("vinext: 'use cache' requires @vitejs/plugin-rsc to be installed.\n" +
-                            "Run: " + detectPackageManager(process.cwd()) + " @vitejs/plugin-rsc");
+                            "Run: " +
+                            detectPackageManager(process.cwd()) +
+                            " @vitejs/plugin-rsc");
                     }
                     const { transformWrapExport, transformHoistInlineDirective } = await import(pathToFileURL(resolvedRscTransformsPath).href);
                     const ast = parseAst(code);
@@ -2232,7 +2362,9 @@ export default function vinext(options = {}) {
                         // (they're leaf components). Layout/template defaults are excluded
                         // because they receive {children} from the framework.
                         const directiveValue = cacheDirective.expression.value;
-                        const variant = directiveValue === "use cache" ? "" : directiveValue.replace("use cache:", "").replace("use cache: ", "").trim();
+                        const variant = directiveValue === "use cache"
+                            ? ""
+                            : directiveValue.replace("use cache:", "").replace("use cache: ", "").trim();
                         // Only skip default export wrapping for layouts and templates —
                         // they receive {children} from the framework which requires
                         // temporary reference handling that registerCachedFunction doesn't
@@ -2284,7 +2416,9 @@ export default function vinext(options = {}) {
                                 directive: /^use cache(:\s*\w+)?$/,
                                 runtime: (value, name, meta) => {
                                     const directiveMatch = meta.directiveMatch[0];
-                                    const variant = directiveMatch === "use cache" ? "" : directiveMatch.replace("use cache:", "").replace("use cache: ", "").trim();
+                                    const variant = directiveMatch === "use cache"
+                                        ? ""
+                                        : directiveMatch.replace("use cache:", "").replace("use cache: ", "").trim();
                                     return `(await import(${JSON.stringify(runtimeModuleUrl2)})).registerCachedFunction(${value}, ${JSON.stringify(id + ":" + name)}, ${JSON.stringify(variant)})`;
                                 },
                                 rejectNonAsyncFunction: false,
@@ -2429,11 +2563,9 @@ export default function vinext(options = {}) {
                     const content = fs.readFileSync(indexPath, "utf-8");
                     // The font is inlined as base64 by vinext:og-inline-fetch-assets, so only
                     // the WASM needs to be present as a file alongside the bundle.
-                    const ogAssets = [
-                        "resvg.wasm",
-                    ];
+                    const ogAssets = ["resvg.wasm"];
                     // Only copy if the bundle actually references these files
-                    const referencedAssets = ogAssets.filter(asset => content.includes(asset));
+                    const referencedAssets = ogAssets.filter((asset) => content.includes(asset));
                     if (referencedAssets.length === 0)
                         return;
                     // Find @vercel/og in node_modules
@@ -2482,6 +2614,38 @@ export default function vinext(options = {}) {
                 },
             },
         },
+        // Vite can emit empty SSR manifest entries for modules that Rollup inlines
+        // into another chunk. Pages Router looks up assets by page module path at
+        // runtime, so rebuild those mappings from the emitted client bundle.
+        {
+            name: "vinext:ssr-manifest-backfill",
+            apply: "build",
+            enforce: "post",
+            writeBundle: {
+                sequential: true,
+                order: "post",
+                handler(options, bundle) {
+                    const outDir = options.dir;
+                    if (!outDir)
+                        return;
+                    const viteDir = path.join(outDir, ".vite");
+                    const ssrManifestPath = path.join(viteDir, "ssr-manifest.json");
+                    if (!fs.existsSync(ssrManifestPath))
+                        return;
+                    try {
+                        const ssrManifest = JSON.parse(fs.readFileSync(ssrManifestPath, "utf-8"));
+                        const buildRoot = this.environment?.config.root ?? process.cwd();
+                        const buildBase = this.environment?.config.base ?? "/";
+                        const augmentedManifest = augmentSsrManifestFromBundle(ssrManifest, bundle, buildRoot, buildBase);
+                        fs.writeFileSync(ssrManifestPath, JSON.stringify(augmentedManifest, null, 2));
+                    }
+                    catch (err) {
+                        // Leave Vite's manifest untouched if parsing fails.
+                        console.warn("[vinext] Failed to augment SSR manifest:", err);
+                    }
+                },
+            },
+        },
         // Cloudflare Workers production build integration:
         // After all environments are built, compute lazy chunks from the client
         // build manifest and inject globals into the worker entry.
@@ -2513,6 +2677,7 @@ export default function vinext(options = {}) {
                     if (!fs.existsSync(distDir))
                         return;
                     const clientDir = path.resolve(buildRoot, "dist", "client");
+                    const clientBase = envConfig.base ?? "/";
                     // Read build manifest and compute lazy chunks (only reachable via
                     // dynamic imports). This runs for BOTH App Router and Pages Router.
                     // clientEntryFile is only used by the Pages Router path below —
@@ -2525,15 +2690,17 @@ export default function vinext(options = {}) {
                             const buildManifest = JSON.parse(fs.readFileSync(buildManifestPath, "utf-8"));
                             for (const [, value] of Object.entries(buildManifest)) {
                                 if (value && value.isEntry && value.file) {
-                                    clientEntryFile = value.file;
+                                    clientEntryFile = manifestFileWithBase(value.file, clientBase);
                                     break;
                                 }
                             }
-                            const lazy = computeLazyChunks(buildManifest);
+                            const lazy = manifestFilesWithBase(computeLazyChunks(buildManifest), clientBase);
                             if (lazy.length > 0)
                                 lazyChunksData = lazy;
                         }
-                        catch { /* ignore parse errors */ }
+                        catch {
+                            /* ignore parse errors */
+                        }
                     }
                     // Read SSR manifest for per-page CSS/JS injection
                     let ssrManifestData = null;
@@ -2542,7 +2709,9 @@ export default function vinext(options = {}) {
                         try {
                             ssrManifestData = JSON.parse(fs.readFileSync(ssrManifestPath, "utf-8"));
                         }
-                        catch { /* ignore parse errors */ }
+                        catch {
+                            /* ignore parse errors */
+                        }
                     }
                     if (hasAppDir) {
                         // App Router: the RSC plugin handles __VINEXT_CLIENT_ENTRY__
@@ -2589,9 +2758,10 @@ export default function vinext(options = {}) {
                             const assetsDir = path.join(clientDir, "assets");
                             if (fs.existsSync(assetsDir)) {
                                 const files = fs.readdirSync(assetsDir);
-                                const entry = files.find((f) => (f.includes("vinext-client-entry") || f.includes("vinext-app-browser-entry")) && f.endsWith(".js"));
+                                const entry = files.find((f) => (f.includes("vinext-client-entry") || f.includes("vinext-app-browser-entry")) &&
+                                    f.endsWith(".js"));
                                 if (entry)
-                                    clientEntryFile = "assets/" + entry;
+                                    clientEntryFile = manifestFileWithBase("assets/" + entry, clientBase);
                             }
                         }
                         // Prepend globals to worker entry
@@ -2722,7 +2892,7 @@ export { matchConfigPattern } from "./config/config-matchers.js";
  */
 function stripServerExports(code) {
     const SERVER_EXPORTS = new Set(["getServerSideProps", "getStaticProps", "getStaticPaths"]);
-    if (![...SERVER_EXPORTS].some(name => code.includes(name)))
+    if (![...SERVER_EXPORTS].some((name) => code.includes(name)))
         return null;
     let ast;
     try {
@@ -2773,11 +2943,13 @@ function stripServerExports(code) {
                 // Build replacement: keep non-server specifiers, add stubs for stripped ones
                 const parts = [];
                 if (kept.length > 0) {
-                    const keptStr = kept.map((sp) => {
+                    const keptStr = kept
+                        .map((sp) => {
                         const local = sp.local.name;
                         const exported = sp.exported?.name ?? sp.exported?.value;
                         return local === exported ? local : `${local} as ${exported}`;
-                    }).join(", ");
+                    })
+                        .join(", ");
                     parts.push(`export { ${keptStr} };`);
                 }
                 for (const name of stripped) {
@@ -2796,11 +2968,13 @@ function stripServerExports(code) {
  * Apply redirect rules from next.config.js.
  * Returns true if a redirect was applied.
  */
-function applyRedirects(pathname, res, redirects, ctx) {
+function applyRedirects(pathname, res, redirects, ctx, basePath = "") {
     const result = matchRedirect(pathname, redirects, ctx);
     if (result) {
         // Sanitize to prevent open redirect via protocol-relative URLs
-        const dest = sanitizeDestination(result.destination);
+        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;
@@ -2838,9 +3012,7 @@ async function proxyExternalRewriteNode(req, res, externalUrl) {
         proxyResponse.headers.forEach((value, key) => {
             const existing = nodeHeaders[key];
             if (existing !== undefined) {
-                nodeHeaders[key] = Array.isArray(existing)
-                    ? [...existing, value]
-                    : [existing, value];
+                nodeHeaders[key] = Array.isArray(existing) ? [...existing, value] : [existing, value];
             }
             else {
                 nodeHeaders[key] = value;
@@ -2968,6 +3140,7 @@ function scanDirForMdx(dir) {
 export { staticExportPages, staticExportApp } from "./build/static-export.js";
 // Exported for CLI and testing
 export { clientManualChunks, clientOutputConfig, clientTreeshakeConfig, computeLazyChunks };
+export { augmentSsrManifestFromBundle as _augmentSsrManifestFromBundle };
 export { resolvePostcssStringPlugins as _resolvePostcssStringPlugins };
 export { parseStaticObjectLiteral as _parseStaticObjectLiteral };
 export { stripServerExports as _stripServerExports };