fix: handle Pages Router middleware redirects

packages/vinext/src/client/vinext-next-data.ts

@@ -21,6 +21,8 @@ export type VinextNextData = {
     pageModuleUrl?: string;
     /** Absolute URL of the `_app` module for dynamic import. */
     appModuleUrl?: string;
+    /** True when the Pages Router server has middleware/proxy configured. */
+    hasMiddleware?: boolean;
   };
 } & NEXT_DATA;
 

packages/vinext/src/entries/pages-server-entry.ts

@@ -253,6 +253,7 @@ const i18nConfig = ${i18nConfigJson};
 // match _next/data requests against the embedded buildId without needing
 // to load next.config.js at runtime.
 export const buildId = ${buildIdJson};
+const __hasMiddleware = ${JSON.stringify(Boolean(middlewarePath))};
 
 // Full resolved config for production server (embedded at build time)
 export const vinextConfig = ${vinextConfigJson};
@@ -675,6 +676,7 @@ async function _renderPage(request, url, manifest, middlewareHeaders, options) {
         safeJsonStringify,
         sanitizeDestination: sanitizeDestinationLocal,
         scriptNonce,
+        vinext: { hasMiddleware: __hasMiddleware },
         triggerBackgroundRegeneration,
       });
       if (pageDataResult.kind === "response") {
@@ -795,6 +797,7 @@ async function _renderPage(request, url, manifest, middlewareHeaders, options) {
         routeUrl,
         safeJsonStringify,
         scriptNonce,
+        vinext: { hasMiddleware: __hasMiddleware },
       });
     } catch (e) {
       console.error("[vinext] SSR error:", e);

packages/vinext/src/global.d.ts

@@ -60,7 +60,10 @@ declare global {
      * client-side navigation.
      */
     __VINEXT_APP__:
-      | React.ComponentType<{ Component: React.ComponentType<unknown>; pageProps: unknown }>
+      | React.ComponentType<{
+          Component: React.ComponentType<Record<string, unknown>>;
+          pageProps: unknown;
+        }>
       | undefined;
 
     /**

packages/vinext/src/index.ts

@@ -3317,6 +3317,7 @@ export default function vinext(options: VinextOptions = {}): PluginOption[] {
                 fileMatcher,
                 nextConfig?.basePath ?? "",
                 nextConfig?.trailingSlash ?? false,
+                middlewarePath !== null,
               );
               const mwStatus = req.__vinextMiddlewareStatus;
 

packages/vinext/src/server/dev-server.ts

@@ -252,6 +252,7 @@ export function createSSRHandler(
   fileMatcher?: ValidFileMatcher,
   basePath = "",
   trailingSlash = false,
+  hasMiddleware = false,
 ) {
   const matcher = fileMatcher ?? createValidFileMatcher();
 
@@ -758,6 +759,7 @@ export function createSSRHandler(
                         __vinext: {
                           pageModuleUrl: regenPageUrl,
                           appModuleUrl: regenAppUrl,
+                          hasMiddleware,
                         },
                       })}${i18nConfig ? `;window.__VINEXT_LOCALE__=${safeJsonStringify(locale ?? currentDefaultLocale)};window.__VINEXT_LOCALES__=${safeJsonStringify(i18nConfig.locales)};window.__VINEXT_DEFAULT_LOCALE__=${safeJsonStringify(currentDefaultLocale)}` : ""}</script>`;
 
@@ -1032,6 +1034,7 @@ hydrate();
             __vinext: {
               pageModuleUrl,
               appModuleUrl,
+              hasMiddleware,
             },
           })}${i18nConfig ? `;window.__VINEXT_LOCALE__=${safeJsonStringify(locale ?? currentDefaultLocale)};window.__VINEXT_LOCALES__=${safeJsonStringify(i18nConfig.locales)};window.__VINEXT_DEFAULT_LOCALE__=${safeJsonStringify(currentDefaultLocale)}` : ""}`,
           scriptNonce,

packages/vinext/src/server/pages-page-data.ts

@@ -1,5 +1,6 @@
 import type { ReactNode } from "react";
 import type { Route } from "../routing/pages-router.js";
+import type { VinextNextData } from "../client/vinext-next-data.js";
 import { normalizeStaticPathname } from "../routing/route-pattern.js";
 import type { CachedPagesValue, CacheControlMetadata } from "vinext/shims/cache";
 import { buildCachedRevalidateCacheControl } from "./cache-control.js";
@@ -93,6 +94,7 @@ type RenderPagesIsrHtmlOptions = {
   renderIsrPassToStringAsync: (element: ReactNode) => Promise<string>;
   routePattern: string;
   safeJsonStringify: (value: unknown) => string;
+  vinext?: VinextNextData["__vinext"];
 };
 
 export type ResolvePagesPageDataOptions = {
@@ -131,6 +133,7 @@ export type ResolvePagesPageDataOptions = {
   safeJsonStringify: (value: unknown) => string;
   sanitizeDestination: (destination: string) => string;
   scriptNonce?: string;
+  vinext?: VinextNextData["__vinext"];
   triggerBackgroundRegeneration: (
     key: string,
     renderFn: () => Promise<void>,
@@ -297,6 +300,7 @@ export async function renderPagesIsrHtml(options: RenderPagesIsrHtmlOptions): Pr
     params: options.params,
     routePattern: options.routePattern,
     safeJsonStringify: options.safeJsonStringify,
+    vinext: options.vinext,
   });
 
   return rewritePagesCachedHtml(options.cachedHtml, freshBody, nextDataScript);
@@ -475,6 +479,7 @@ export async function resolvePagesPageData(
                 renderIsrPassToStringAsync: options.renderIsrPassToStringAsync,
                 routePattern: options.routePattern,
                 safeJsonStringify: options.safeJsonStringify,
+                vinext: options.vinext,
               });
 
               await options.isrSet(

packages/vinext/src/server/pages-page-response.ts

@@ -70,6 +70,7 @@ type RenderPagesPageResponseOptions = {
   routeUrl: string;
   safeJsonStringify: (value: unknown) => string;
   scriptNonce?: string;
+  vinext?: VinextNextData["__vinext"];
 };
 
 function buildPagesFontHeadHtml(
@@ -318,6 +319,7 @@ export async function renderPagesPageResponse(
     routePattern: options.routePattern,
     safeJsonStringify: options.safeJsonStringify,
     scriptNonce: options.scriptNonce,
+    vinext: options.vinext,
   });
   const bodyMarker = "<!--VINEXT_STREAM_BODY-->";
   // Render the page FIRST so that <Head> and other SSR state collectors