vinext 0.1.0 → 0.1.1

package/dist/deploy.js

@@ -334,30 +334,14 @@ function generatePagesRouterWorkerEntry() {
  * Cloudflare Worker entry point -- auto-generated by vinext deploy.
  * Edit freely or delete to regenerate on next deploy.
  */
+import { runPagesRequest } from "vinext/server/pages-request-pipeline";
+import type { PagesPipelineDeps } from "vinext/server/pages-request-pipeline";
 import { handleImageOptimization, DEFAULT_DEVICE_SIZES, DEFAULT_IMAGE_SIZES, isImageOptimizationPath } from "vinext/server/image-optimization";
 import type { ImageConfig } from "vinext/server/image-optimization";
-import {
-  matchRedirect,
-  matchRewrite,
-  requestContextFromRequest,
-  applyMiddlewareRequestHeaders,
-  isExternalUrl,
-  proxyExternalRequest,
-  sanitizeDestination,
-} from "vinext/config/config-matchers";
-import {
-  applyConfigHeadersToHeaderRecord,
-  cloneRequestWithHeaders,
-  filterInternalHeaders,
-  isOpenRedirectShaped,
-  normalizeTrailingSlash,
-} from "vinext/server/request-pipeline";
-import { mergeHeaders } from "vinext/server/worker-utils";
+import { cloneRequestWithHeaders, filterInternalHeaders, isOpenRedirectShaped } from "vinext/server/request-pipeline";
 import { notFoundStaticAssetResponse } from "vinext/server/http-error-responses";
 import { assetPrefixPathname, isNextStaticPath } from "vinext/utils/asset-prefix";
 import { hasBasePath, stripBasePath } from "vinext/utils/base-path";
-import { normalizeDefaultLocalePathname, stripI18nLocaleForApiRoute } from "vinext/server/pages-i18n";
-import { mergeRewriteQuery } from "vinext/utils/query";
 
 // @ts-expect-error -- virtual module resolved by vinext at build time
 import { renderPage, handleApiRoute, runMiddleware, vinextConfig, matchPageRoute } from "virtual:vinext-server-entry";
@@ -402,7 +386,6 @@ export default {
     try {
       const url = new URL(request.url);
       let pathname = url.pathname;
-      let urlWithQuery = pathname + url.search;
 
       // Block protocol-relative URL open redirects in all shapes:
       //   literal  //evil.com, /\\\\evil.com
@@ -445,11 +428,12 @@ export default {
       {
         const stripped = stripBasePath(pathname, basePath);
         if (stripped !== pathname) {
-          urlWithQuery = stripped + url.search;
+          const strippedUrl = new URL(request.url);
+          strippedUrl.pathname = stripped;
+          request = new Request(strippedUrl, request);
           pathname = stripped;
         }
       }
-      const basePathState = { basePath, hadBasePath };
 
       // ── Image optimization via Cloudflare Images binding ──────────
       // Checked after basePath stripping so /<basePath>/_next/image works.
@@ -464,291 +448,43 @@ export default {
         }, allowedWidths, imageConfig);
       }
 
-      // ── 2. Trailing slash normalization ────────────────────────────
-      {
-        const trailingSlashRedirect = normalizeTrailingSlash(
-          pathname,
-          basePath,
-          trailingSlash,
-          url.search,
-        );
-        if (trailingSlashRedirect) {
-          return trailingSlashRedirect;
-        }
-      }
-
-      // Build a request with the basePath-stripped URL for middleware and
-      // downstream handlers. In Workers the incoming request URL still
-      // contains basePath; prod-server constructs its webRequest from
-      // the already-stripped URL, so we replicate that here.
-      if (basePath) {
-        const strippedUrl = new URL(request.url);
-        strippedUrl.pathname = pathname;
-        request = new Request(strippedUrl, request);
-      }
-
-      // Build request context for pre-middleware config matching. Redirects
-      // run before middleware in Next.js. Header match conditions also use the
-      // original request snapshot even though header merging happens later so
-      // middleware response headers can still take precedence.
-      // beforeFiles, afterFiles, and fallback rewrites run after middleware
-      // (App Router order), so they use postMwReqCtx created after
-      // x-middleware-request-* headers are unpacked into request.
-      const reqCtx = requestContextFromRequest(request);
-
-      // Default-locale path normalisation (issue #1336, item 4). Mirrors
-      // Next.js's resolve-routes.ts: every request without a locale prefix
-      // gets the (domain-aware) default locale prepended before config rule
-      // matching so that locale-aware rules with :locale placeholders or
-      // locale: false overrides still match default-locale URLs.
-      const matchPathname = i18nConfig
-        ? normalizeDefaultLocalePathname(pathname, i18nConfig, {
-            hostname: url.hostname,
-          })
-        : pathname;
-
-      // ── 3. Apply redirects from next.config.js ────────────────────
-      if (configRedirects.length) {
-        const redirect = matchRedirect(matchPathname, configRedirects, reqCtx, basePathState);
-        if (redirect) {
-          // Only prepend basePath when the request was actually under basePath.
-          // Opt-out rules running on out-of-basepath requests must not receive
-          // a basePath prefix.
-          const dest = sanitizeDestination(
-            basePath &&
-              hadBasePath &&
-              !isExternalUrl(redirect.destination) &&
-              !hasBasePath(redirect.destination, basePath)
-              ? basePath + redirect.destination
-              : redirect.destination,
-          );
-          return new Response(null, {
-            status: redirect.permanent ? 308 : 307,
-            headers: { Location: dest },
-          });
-        }
-      }
-
-      // ── 4. Run middleware ──────────────────────────────────────────
-      let resolvedUrl = urlWithQuery;
-      const middlewareHeaders: Record<string, string | string[]> = {};
-      let middlewareRewriteStatus: number | undefined;
-      if (typeof runMiddleware === "function") {
-        const result = await runMiddleware(request, ctx, { isDataRequest });
-
-        // Bubble up waitUntil promises (e.g. Clerk telemetry/session sync)
-        if (result.waitUntilPromises?.length) {
-          for (const p of result.waitUntilPromises) {
-            ctx.waitUntil(p);
-          }
-        }
-
-        if (!result.continue) {
-          if (result.redirectUrl) {
-            const redirectHeaders = new Headers({ Location: result.redirectUrl });
-            if (result.responseHeaders) {
-              for (const [key, value] of result.responseHeaders) {
-                redirectHeaders.append(key, value);
-              }
-            }
-            return new Response(null, {
-              status: result.redirectStatus ?? 307,
-              headers: redirectHeaders,
-            });
-          }
-          if (result.response) {
-            return result.response;
-          }
-        }
-
-        // Collect middleware response headers to merge into final response.
-        // Use an array for Set-Cookie to preserve multiple values.
-        if (result.responseHeaders) {
-          for (const [key, value] of result.responseHeaders) {
-            if (key === "set-cookie") {
-              const existing = middlewareHeaders[key];
-              if (Array.isArray(existing)) {
-                existing.push(value);
-              } else if (existing) {
-                middlewareHeaders[key] = [existing as string, value];
-              } else {
-                middlewareHeaders[key] = [value];
-              }
-            } else {
-              middlewareHeaders[key] = value;
-            }
-          }
-        }
-
-        // Apply middleware rewrite
-        if (result.rewriteUrl) {
-          resolvedUrl = result.rewriteUrl;
-        }
-
-        // Apply custom status code from middleware rewrite
-        middlewareRewriteStatus = result.rewriteStatus;
-      }
-
-      // Unpack x-middleware-request-* headers into the actual request and strip
-      // all x-middleware-* internal signals. Rebuilds postMwReqCtx for use by
-      // beforeFiles, afterFiles, and fallback config rules (which run after
-      // middleware per the Next.js execution order).
-      const { postMwReqCtx, request: postMwReq } = applyMiddlewareRequestHeaders(middlewareHeaders, request);
-      request = postMwReq;
-
-      // Config header matching must keep using the original normalized pathname
-      // even if middleware rewrites the downstream route/render target.
-      let resolvedPathname = resolvedUrl.split("?")[0];
-
-      // ── 5. Apply custom headers from next.config.js ───────────────
-      // Config headers are additive for multi-value headers (Vary,
-      // Set-Cookie) and override for everything else. Vary values are
-      // comma-joined per HTTP spec. Set-Cookie values are accumulated
-      // as arrays (RFC 6265 forbids comma-joining cookies).
-      // Middleware headers take precedence: skip config keys already set
-      // by middleware so middleware always wins for the same key.
-      if (configHeaders.length) {
-        applyConfigHeadersToHeaderRecord(middlewareHeaders, {
-          configHeaders,
-          pathname: matchPathname,
-          requestContext: reqCtx,
-          basePathState,
-        });
-      }
-
-      if (isExternalUrl(resolvedUrl)) {
-        const proxyResponse = await proxyExternalRequest(request, resolvedUrl);
-        return mergeHeaders(proxyResponse, middlewareHeaders, undefined);
-      }
-
-      // Default-locale-normalised form of resolvedPathname for matching
-      // against next.config.js rewrites (beforeFiles, afterFiles, fallback).
-      const matchResolvedPathname = (p: string): string =>
-        i18nConfig
-          ? normalizeDefaultLocalePathname(p, i18nConfig, { hostname: url.hostname })
-          : p;
-
-      // ── 6. Apply beforeFiles rewrites from next.config.js ─────────
-      let configRewriteFired = false;
-      if (configRewrites.beforeFiles?.length) {
-        const rewritten = matchRewrite(
-          matchResolvedPathname(resolvedPathname),
-          configRewrites.beforeFiles,
-          postMwReqCtx,
-          basePathState,
-        );
-        if (rewritten) {
-          if (isExternalUrl(rewritten)) {
-            return proxyExternalRequest(request, rewritten);
-          }
-          // Preserve original query params across rewrites (Next.js parity).
-          resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
-          resolvedPathname = resolvedUrl.split("?")[0];
-          configRewriteFired = true;
-        }
-      }
-
-      // Reject out-of-basePath requests that no rule rewrote. See the
-      // matching comment in prod-server.ts step 7b.
-      if (basePath && !hadBasePath && !configRewriteFired) {
-        return new Response("This page could not be found", {
-          status: 404,
-          headers: { "Content-Type": "text/html; charset=utf-8" },
-        });
-      }
-
-      // ── 7. API routes ─────────────────────────────────────────────
-      // Forward ctx so handlePagesApiRoute can wrap the user handler in
-      // runWithExecutionContext, making ctx.waitUntil() reachable from
-      // after() and other shims that schedule deferred work.
-      //
-      // Strip the i18n locale prefix before the /api/ check so
-      // /fr/api/ok resolves to the pages/api/ok handler (Next.js
-      // parity -- see base-server.ts's normalizeLocalePath call).
-      const apiLookupUrl = stripI18nLocaleForApiRoute(resolvedUrl, vinextConfig?.i18n ?? null);
-      const apiLookupPathname = apiLookupUrl.split("?")[0];
-      if (apiLookupPathname.startsWith("/api/") || apiLookupPathname === "/api") {
-        const response = typeof handleApiRoute === "function"
-          ? await handleApiRoute(request, apiLookupUrl, ctx)
-          : new Response("404 - API route not found", { status: 404 });
-        return mergeHeaders(response, middlewareHeaders, middlewareRewriteStatus);
-      }
-
-      const pageMatch =
-        typeof matchPageRoute === "function" ? matchPageRoute(resolvedPathname, request) : null;
-
-      // ── 8. Apply afterFiles rewrites from next.config.js ──────────
-      // These run after non-dynamic page routes but before dynamic routes.
-      if ((!pageMatch || pageMatch.route.isDynamic) && configRewrites.afterFiles?.length) {
-        const rewritten = matchRewrite(
-          matchResolvedPathname(resolvedPathname),
-          configRewrites.afterFiles,
-          postMwReqCtx,
-          basePathState,
-        );
-        if (rewritten) {
-          if (isExternalUrl(rewritten)) {
-            return proxyExternalRequest(request, rewritten);
-          }
-          resolvedUrl = mergeRewriteQuery(resolvedUrl, rewritten);
-          resolvedPathname = resolvedUrl.split("?")[0];
-        }
-      }
-
-      // ── 9. Page routes ────────────────────────────────────────────
-      let response: Response | undefined;
-      if (typeof renderPage === "function") {
-        const renderPageMatch =
-          typeof matchPageRoute === "function" ? matchPageRoute(resolvedPathname, request) : null;
-        const shouldDeferErrorPageOnMiss =
-          !isDataRequest && typeof matchPageRoute === "function" && !renderPageMatch;
-        const initialRenderOptions = shouldDeferErrorPageOnMiss
-          ? { renderErrorPageOnMiss: false }
-          : undefined;
-        response = await renderPage(request, resolvedUrl, null, ctx, undefined, initialRenderOptions);
-
-        // ── 10. Fallback rewrites (if SSR returned 404) ─────────────
-        let matchedFallbackRewrite = false;
-        if (
-          response &&
-          response.status === 404 &&
-          shouldDeferErrorPageOnMiss &&
-          configRewrites.fallback?.length
-        ) {
-          const fallbackRewrite = matchRewrite(
-            matchResolvedPathname(resolvedPathname),
-            configRewrites.fallback,
-            postMwReqCtx,
-            basePathState,
-          );
-          if (fallbackRewrite) {
-            if (isExternalUrl(fallbackRewrite)) {
-              return proxyExternalRequest(request, fallbackRewrite);
-            }
-            matchedFallbackRewrite = true;
-            response = await renderPage(
-              request,
-              mergeRewriteQuery(resolvedUrl, fallbackRewrite),
-              null,
-              ctx,
-            );
-          }
-        }
-        if (
-          response &&
-          response.status === 404 &&
-          shouldDeferErrorPageOnMiss &&
-          !matchedFallbackRewrite
-        ) {
-          response = await renderPage(request, resolvedUrl, null, ctx);
-        }
-      }
+      // Delegate the canonical 9-step Next.js pipeline to the shared owner.
+      // The worker adapter is responsible for: open-redirect guard, _next/static
+      // 404 short-circuit, header filtering, basePath stripping, and image
+      // optimization. runPagesRequest receives a clean, basePath-stripped request.
+      const deps: PagesPipelineDeps = {
+        basePath,
+        trailingSlash,
+        i18nConfig,
+        configRedirects,
+        configRewrites,
+        configHeaders,
+        hadBasePath,
+        // The worker adapter does not do _next/data URL normalization (no
+        // buildId available at request time). isDataReq is used by the pipeline
+        // only for renderPage options and shouldDeferErrorPageOnMiss -- false
+        // is correct here.
+        isDataReq: false,
+        isDataRequest,
+        ctx,
+        matchPageRoute: typeof matchPageRoute === "function" ? matchPageRoute : null,
+        runMiddleware: typeof runMiddleware === "function" ? runMiddleware : null,
+        renderPage: typeof renderPage === "function"
+          ? (req, resolvedUrl, options, stagedHeaders) =>
+              renderPage(req, resolvedUrl, null, ctx, stagedHeaders, options)
+          : null,
+        handleApi: typeof handleApiRoute === "function"
+          ? (req, apiUrl) => handleApiRoute(req, apiUrl, ctx)
+          : null,
+      };
 
-      if (!response) {
-        return new Response("This page could not be found", { status: 404 });
+      const result = await runPagesRequest(request, deps);
+      if (result.type === "response") {
+        return result.response;
       }
+      // Should not reach here for prod/worker (all callbacks supplied).
+      return new Response("This page could not be found", { status: 404 });
 
-      return mergeHeaders(response, middlewareHeaders, middlewareRewriteStatus);
     } catch (error) {
       console.error("[vinext] Worker error:", error);
       return new Response("Internal Server Error", { status: 500 });

package/dist/entries/app-rsc-entry.d.ts

@@ -17,7 +17,8 @@ type AppRouterConfig = {
   headers?: NextHeader[]; /** Extra origins allowed for server action CSRF checks (from experimental.serverActions.allowedOrigins). */
   allowedOrigins?: string[]; /** Extra origins allowed for dev server access (from allowedDevOrigins). */
   allowedDevOrigins?: string[]; /** Body size limit for server actions in bytes (from experimental.serverActions.bodySizeLimit). */
-  bodySizeLimit?: number; /** Serialized next.config htmlLimitedBots regexp source. */
+  bodySizeLimit?: number; /** Verbatim body size limit config value (e.g. "2mb") for the "Body exceeded {limit} limit" error. */
+  bodySizeLimitLabel?: string; /** Serialized next.config htmlLimitedBots regexp source. */
   htmlLimitedBots?: string;
   /**
    * Allow-list of keys (from `experimental.clientTraceMetadata`) to surface
@@ -34,7 +35,12 @@ type AppRouterConfig = {
    * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/assetPrefix
    */
   assetPrefix?: string; /** Route-level expire fallback in seconds for ISR entries with numeric revalidate. */
-  expireTime?: number; /** Maximum in-memory cache size in bytes. 0 disables the default memory cache. */
+  expireTime?: number;
+  /**
+   * Maximum total length (in characters) of the preload `Link` header emitted
+   * during App Router SSR. `0` disables emission. Defaults to 6000.
+   */
+  reactMaxHeadersLength?: number; /** Maximum in-memory cache size in bytes. 0 disables the default memory cache. */
   cacheMaxMemorySize?: number; /** Inline app CSS into production HTML (from experimental.inlineCss). */
   inlineCss?: boolean; /** Enables Next.js Cache Components semantics for App Router document HTML. */
   cacheComponents?: boolean; /** Internationalization routing config for middleware matcher locale handling. */

package/dist/entries/app-rsc-entry.js

@@ -15,6 +15,7 @@ import { randomUUID } from "node:crypto";
 * Previously housed in server/app-dev-server.ts.
 */
 const DEFAULT_EXPIRE_TIME = 31536e3;
+const DEFAULT_REACT_MAX_HEADERS_LENGTH = 6e3;
 const middlewareRequestHeadersPath = resolveEntryPath("../server/middleware-request-headers.js", import.meta.url);
 const normalizePathModulePath = resolveEntryPath("../server/normalize-path.js", import.meta.url);
 const appRscHandlerPath = resolveEntryPath("../server/app-rsc-handler.js", import.meta.url);
@@ -63,10 +64,12 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 	const headers = config?.headers ?? [];
 	const allowedOrigins = config?.allowedOrigins ?? [];
 	const bodySizeLimit = config?.bodySizeLimit ?? 1 * 1024 * 1024;
+	const bodySizeLimitLabel = config?.bodySizeLimitLabel ?? "1 MB";
 	const htmlLimitedBots = config?.htmlLimitedBots;
 	const clientTraceMetadata = config?.clientTraceMetadata;
 	const assetPrefix = config?.assetPrefix ?? "";
 	const expireTime = config?.expireTime ?? DEFAULT_EXPIRE_TIME;
+	const reactMaxHeadersLength = config?.reactMaxHeadersLength ?? DEFAULT_REACT_MAX_HEADERS_LENGTH;
 	const cacheMaxMemorySize = config?.cacheMaxMemorySize;
 	const inlineCss = config?.inlineCss === true;
 	const i18nConfig = config?.i18n ?? null;
@@ -119,6 +122,7 @@ import {
 import {
   handleProgressiveServerActionRequest as __handleProgressiveServerActionRequest,
   handleServerActionRscRequest as __handleServerActionRscRequest,
+  isProgressiveServerActionRequest as __isProgressiveServerActionRequest,
   readActionBodyWithLimit as __readBodyWithLimit,
   readActionFormDataWithLimit as __readFormDataWithLimit,
 } from ${JSON.stringify(appServerActionExecutionPath)};
@@ -337,13 +341,14 @@ function findIntercept(pathname, sourcePathname = null) {
   return __routeMatcher.findIntercept(pathname, sourcePathname);
 }
 
-async function buildPageElements(route, params, routePath, pageRequest, layoutParamAccess) {
+async function buildPageElements(route, params, routePath, pageRequest, layoutParamAccess, displayPathname = routePath) {
   // Hydrate lazy page/route-handler modules before any synchronous read.
   await __ensureRouteLoaded(route);
   return __buildPageElements({
     route,
     params,
     routePath,
+    displayPathname,
     pageRequest,
     globalErrorModule: ${globalErrorVar ? globalErrorVar : "null"},
     rootNotFoundModule: ${rootNotFoundVar ? rootNotFoundVar : "null"},
@@ -366,11 +371,13 @@ const __allowedOrigins = ${JSON.stringify(allowedOrigins)};
 const __expireTime = ${JSON.stringify(expireTime)};
 const __htmlLimitedBots = ${JSON.stringify(htmlLimitedBots)};
 const __clientTraceMetadata = ${JSON.stringify(clientTraceMetadata)};
+const __reactMaxHeadersLength = ${JSON.stringify(reactMaxHeadersLength)};
 // Re-exported for the App Router prod-server to consume at startup —
 // mirrors the embedded \`__basePath\` pattern (and Pages Router's
 // \`vinextConfig\` export). Empty string when unset.
 export const __assetPrefix = ${JSON.stringify(assetPrefix)};
 export const __inlineCss = ${JSON.stringify(inlineCss)};
+export const __hasPagesDir = ${JSON.stringify(hasPagesDir)};
 
 export function seedMemoryCacheFromPrerender(serverDir) {
   return __seedMemoryCacheFromPrerender(serverDir, {
@@ -397,6 +404,13 @@ ${generateDevOriginCheckCode(config?.allowedDevOrigins)}
  */
 var __MAX_ACTION_BODY_SIZE = ${JSON.stringify(bodySizeLimit)};
 
+/**
+ * Verbatim serverActions.bodySizeLimit config value (e.g. "2mb"), used in the
+ * "Body exceeded {limit} limit" error so the message matches Next.js byte-for-byte.
+ * Defaults to "1 MB" (Next.js' defaultBodySizeLimit literal).
+ */
+var __MAX_ACTION_BODY_SIZE_LABEL = ${JSON.stringify(bodySizeLimitLabel)};
+
 // Map from route pattern to generateStaticParams function.
 // Used by the prerender phase to enumerate dynamic route URLs without
 // loading route modules via the dev server.
@@ -421,6 +435,7 @@ export default __createAppRscHandler({
   dispatchMatchedPage({
     clientReuseManifest,
     cleanPathname,
+    displayPathname,
     formState,
     actionError,
     actionFailed,
@@ -456,6 +471,7 @@ export default __createAppRscHandler({
       basePath: __basePath,
       ensureRouteLoaded: __ensureRouteLoaded,
       clientTraceMetadata: __clientTraceMetadata,
+      reactMaxHeadersLength: __reactMaxHeadersLength,
       buildPageElement(targetRoute, targetParams, targetOpts, targetSearchParams, layoutParamAccess) {
         return buildPageElements(targetRoute, targetParams, cleanPathname, {
           opts: targetOpts,
@@ -464,7 +480,7 @@ export default __createAppRscHandler({
           request,
           mountedSlotsHeader,
           renderMode,
-        }, layoutParamAccess);
+        }, layoutParamAccess, displayPathname);
       },
       clientReuseManifest,
       cleanPathname,
@@ -527,13 +543,23 @@ export default __createAppRscHandler({
           route,
         });
       },
-      probePage() {
+      async probePage() {
+        const __probeIntercept = findIntercept(cleanPathname, interceptionContext);
+        // The intercepting-route page module is lazy (page: null + __pageLoader).
+        // Resolve it before probing so buildAppPageProbes inspects the real page
+        // component for dynamic bailout — matching the render path, which also
+        // awaits __pageLoader (resolveAppPageInterceptState). Without this the
+        // intercept probe branch silently inspects an undefined component and
+        // never observes the page's searchParams/headers access.
+        if (__probeIntercept && __probeIntercept.__pageLoader && __probeIntercept.page == null) {
+          __probeIntercept.page = await __probeIntercept.__pageLoader();
+        }
         return Promise.all(__buildAppPageProbes({
           route,
           pageComponent: PageComponent,
           asyncRouteParams: _asyncRouteParams,
           searchParams,
-          intercept: findIntercept(cleanPathname, interceptionContext),
+          intercept: __probeIntercept,
           isRscRequest,
           matchedParams: params,
           makeThenableParams,
@@ -583,6 +609,7 @@ export default __createAppRscHandler({
       },
       draftModeSecret: __draftModeSecret,
       i18n: __i18nConfig,
+      trailingSlash: __trailingSlash,
       isrDebug: __isrDebug,
       isrGet: __isrGet,
       isrRouteKey: __isrRouteKey,
@@ -610,6 +637,26 @@ export default __createAppRscHandler({
     middlewareContext,
     request,
   }) {
+    // A multipart form POST to a page is always a server-action attempt, so a
+    // body that decodes to no action must surface as 404 action-not-found
+    // (#1340). Route handlers run after this dispatch and accept raw multipart
+    // POSTs, so only flag actual page routes. The __loadPage / __loadRouteHandler
+    // markers are static and available before lazy module hydration.
+    //
+    // Only the progressive (multipart, no actionId) POST path consults
+    // hasPageRoute, so skip the route match entirely for every other request
+    // rather than re-matching on each App Router request.
+    const __isProgressiveAction = __isProgressiveServerActionRequest(
+      request,
+      contentType,
+      actionId,
+    );
+    const __progressiveActionMatch = __isProgressiveAction ? matchRoute(cleanPathname) : null;
+    const __hasPageRoute = Boolean(
+      __progressiveActionMatch &&
+        __progressiveActionMatch.route.__loadPage &&
+        !__progressiveActionMatch.route.__loadRouteHandler,
+    );
     return __handleProgressiveServerActionRequest({
       actionId,
       allowedOrigins: __allowedOrigins,
@@ -623,6 +670,7 @@ export default __createAppRscHandler({
       decodeFormState,
       getAndClearPendingCookies,
       getDraftModeCookieHeader,
+      hasPageRoute: __hasPageRoute,
       maxActionBodySize: __MAX_ACTION_BODY_SIZE,
       middlewareHeaders: middlewareContext.headers,
       readFormDataWithLimit: __readFormDataWithLimit,
@@ -713,6 +761,7 @@ export default __createAppRscHandler({
         return matchRoute(pathnameToMatch);
       },
       maxActionBodySize: __MAX_ACTION_BODY_SIZE,
+      maxActionBodySizeLabel: __MAX_ACTION_BODY_SIZE_LABEL,
       middlewareHeaders: middlewareContext.headers,
       middlewareStatus: middlewareContext.status,
       mountedSlotsHeader,
@@ -763,6 +812,7 @@ export default __createAppRscHandler({
         buildRequestHeaders: __buildRequestHeadersFromMiddlewareResponse,
         decodePathParams: __decodePathParams,
         applyRouteHandlerMiddlewareContext: __applyRouteHandlerMiddlewareContext,
+        getDraftModeCookieHeader,
       }
     );
   },` : ""}

package/dist/entries/app-rsc-manifest.js

@@ -77,10 +77,14 @@ function registerRouteModules(routes, imports) {
 			if (slot.loadingPath) imports.getImportVar(slot.loadingPath);
 			if (slot.errorPath) imports.getImportVar(slot.errorPath);
 			for (const ir of slot.interceptingRoutes) {
-				imports.getImportVar(ir.pagePath);
+				imports.getLazyLoaderVar(ir.pagePath);
 				for (const layoutPath of ir.layoutPaths) imports.getImportVar(layoutPath);
 			}
 		}
+		for (const ir of route.siblingIntercepts ?? []) {
+			imports.getLazyLoaderVar(ir.pagePath);
+			for (const layoutPath of ir.layoutPaths) imports.getImportVar(layoutPath);
+		}
 	}
 }
 function buildRouteEntries(routes, imports) {
@@ -91,13 +95,24 @@ function buildRouteEntries(routes, imports) {
 		const notFoundVars = (route.notFoundPaths ?? []).map((nf) => nf ? imports.getImportVar(nf) : "null");
 		const forbiddenVars = (route.forbiddenPaths ?? []).map((fp) => fp ? imports.getImportVar(fp) : "null");
 		const unauthorizedVars = (route.unauthorizedPaths ?? []).map((up) => up ? imports.getImportVar(up) : "null");
+		const siblingInterceptEntries = (route.siblingIntercepts ?? []).map((ir) => `    {
+      convention: ${JSON.stringify(ir.convention)},
+      targetPattern: ${JSON.stringify(ir.targetPattern)},
+      sourceMatchPattern: ${JSON.stringify(ir.sourceMatchPattern)},
+      slotId: ${JSON.stringify(ir.slotId ?? null)},
+      interceptLayouts: [${ir.layoutPaths.map((l) => imports.getImportVar(l)).join(", ")}],
+      page: null,
+      __pageLoader: ${imports.getLazyLoaderVar(ir.pagePath)},
+      params: ${JSON.stringify(ir.params)},
+    }`);
 		const slotEntries = route.parallelSlots.map((slot) => {
 			const interceptEntries = slot.interceptingRoutes.map((ir) => `        {
           convention: ${JSON.stringify(ir.convention)},
           targetPattern: ${JSON.stringify(ir.targetPattern)},
           sourceMatchPattern: ${JSON.stringify(ir.sourceMatchPattern)},
           interceptLayouts: [${ir.layoutPaths.map((layoutPath) => imports.getImportVar(layoutPath)).join(", ")}],
-          page: ${imports.getImportVar(ir.pagePath)},
+          page: null,
+          __pageLoader: ${imports.getLazyLoaderVar(ir.pagePath)},
           params: ${JSON.stringify(ir.params)},
         }`);
 			return `      ${JSON.stringify(slot.key)}: {
@@ -146,6 +161,9 @@ ${interceptEntries.join(",\n")}
     slots: {
 ${slotEntries.join(",\n")}
     },
+    siblingIntercepts: [
+${siblingInterceptEntries.join(",\n")}
+    ],
     loading: ${route.loadingPath ? imports.getImportVar(route.loadingPath) : "null"},
     error: ${route.errorPath ? imports.getImportVar(route.errorPath) : "null"},
     notFound: ${route.notFoundPath ? imports.getImportVar(route.notFoundPath) : "null"},

package/dist/entries/pages-server-entry.js

@@ -143,7 +143,7 @@ import React from "react";
 import { renderToReadableStream } from "react-dom/server.edge";
 import { resetSSRHead, getSSRHeadHTML, setDocumentInitialHead } from "next/head";
 import { flushPreloads } from "next/dynamic";
-import { setSSRContext, wrapWithRouterContext } from "next/router";
+import { setSSRContext, wrapWithRouterContext, getPagesNavigationIsReadyFromSerializedState } from "next/router";
 import { _runWithCacheState, configureMemoryCacheHandler as __configureMemoryCacheHandler } from "next/cache";
 import { registerConfiguredCacheAdapters as __registerConfiguredCacheAdapters } from "virtual:vinext-cache-adapters";
 import { runWithPrivateCache } from "vinext/cache-runtime";
@@ -287,9 +287,17 @@ const _renderPage = __createPagesPageHandler({
   buildId,
   hasMiddleware: __hasMiddleware,
   appAssetPath: _appAssetPath,
+  hasRewrites:
+    vinextConfig.rewrites.beforeFiles.length > 0 ||
+    vinextConfig.rewrites.afterFiles.length > 0 ||
+    vinextConfig.rewrites.fallback.length > 0,
 
   // next/*-derived closures
   setSSRContext: typeof setSSRContext === "function" ? setSSRContext : null,
+  getPagesNavigationIsReadyFromSerializedState:
+    typeof getPagesNavigationIsReadyFromSerializedState === "function"
+      ? getPagesNavigationIsReadyFromSerializedState
+      : null,
   setI18nContext: typeof setI18nContext === "function" ? setI18nContext : null,
   wrapWithRouterContext: typeof wrapWithRouterContext === "function" ? wrapWithRouterContext : null,
   resetSSRHead: typeof resetSSRHead === "function" ? resetSSRHead : undefined,