vinext 0.1.0 → 0.1.2

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)};
@@ -271,6 +275,10 @@ ${metaRouteEntries.join(",\n")}
 // recognising /_next/static/* paths (parity with __assetPrefix below).
 export const __basePath = ${JSON.stringify(bp)};
 
+// Hoisted alongside __basePath so __fallbackRenderer / buildPageElements can
+// thread the configured trailingSlash flag through canonical URL rendering.
+const __trailingSlash = ${JSON.stringify(ts)};
+
 const rootNotFoundModule = ${rootNotFoundVar ? rootNotFoundVar : "null"};
 const rootForbiddenModule = ${rootForbiddenVar ? rootForbiddenVar : "null"};
 const rootUnauthorizedModule = ${rootUnauthorizedVar ? rootUnauthorizedVar : "null"};
@@ -294,6 +302,7 @@ const createRscOnErrorHandler = (request, pathname, routePath) =>
 
 const __fallbackRenderer = __createAppFallbackRenderer({
   basePath: __basePath,
+  trailingSlash: __trailingSlash,
   rootBoundaries: {
     rootForbiddenModule,
     rootLayouts,
@@ -337,13 +346,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"},
@@ -352,11 +362,11 @@ async function buildPageElements(route, params, routePath, pageRequest, layoutPa
     metadataRoutes,
     layoutParamAccess,
     basePath: __basePath,
+    trailingSlash: __trailingSlash,
     htmlLimitedBots: __htmlLimitedBots,
   });
 }
 
-const __trailingSlash = ${JSON.stringify(ts)};
 const __i18nConfig = ${JSON.stringify(i18nConfig)};
 const __configRedirects = ${JSON.stringify(redirects)};
 const __configRewrites = ${JSON.stringify(rewrites)};
@@ -366,11 +376,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 +409,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 +440,7 @@ export default __createAppRscHandler({
   dispatchMatchedPage({
     clientReuseManifest,
     cleanPathname,
+    displayPathname,
     formState,
     actionError,
     actionFailed,
@@ -456,6 +476,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,10 +485,11 @@ export default __createAppRscHandler({
           request,
           mountedSlotsHeader,
           renderMode,
-        }, layoutParamAccess);
+        }, layoutParamAccess, displayPathname);
       },
       clientReuseManifest,
       cleanPathname,
+      displayPathname,
       clearRequestContext() {
         __clearRequestContext();
       },
@@ -527,13 +549,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 +615,7 @@ export default __createAppRscHandler({
       },
       draftModeSecret: __draftModeSecret,
       i18n: __i18nConfig,
+      trailingSlash: __trailingSlash,
       isrDebug: __isrDebug,
       isrGet: __isrGet,
       isrRouteKey: __isrRouteKey,
@@ -610,6 +643,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 +676,7 @@ export default __createAppRscHandler({
       decodeFormState,
       getAndClearPendingCookies,
       getDraftModeCookieHeader,
+      hasPageRoute: __hasPageRoute,
       maxActionBodySize: __MAX_ACTION_BODY_SIZE,
       middlewareHeaders: middlewareContext.headers,
       readFormDataWithLimit: __readFormDataWithLimit,
@@ -713,6 +767,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 +818,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-client-entry.js

@@ -1,7 +1,7 @@
+import { normalizePathSeparators } from "../utils/path.js";
 import { findFileWithExts } from "../routing/file-matcher.js";
 import { patternToNextFormat } from "../routing/route-validation.js";
 import { pagesRouter } from "../routing/pages-router.js";
-import { normalizePathSeparators } from "../utils/path.js";
 //#region src/entries/pages-client-entry.ts
 /**
 * Pages Router client hydration entry generator.

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

@@ -1,6 +1,6 @@
+import { normalizePathSeparators } from "../utils/path.js";
 import { findFileWithExts } from "../routing/file-matcher.js";
 import { apiRouter, pagesRouter } from "../routing/pages-router.js";
-import { normalizePathSeparators } from "../utils/path.js";
 import { resolveEntryPath } from "./runtime-entry-module.js";
 import { isProxyFile } from "../server/middleware.js";
 //#region src/entries/pages-server-entry.ts
@@ -46,11 +46,11 @@ async function generateServerEntry(pagesDir, nextConfig, fileMatcher, middleware
 	const appFilePath = findFileWithExts(pagesDir, "_app", fileMatcher);
 	const docFilePath = findFileWithExts(pagesDir, "_document", fileMatcher);
 	const errorFilePath = findFileWithExts(pagesDir, "_error", fileMatcher);
-	const appAssetPathJson = appFilePath !== null ? JSON.stringify(normalizePathSeparators(appFilePath)) : "null";
-	const appImportCode = appFilePath !== null ? `import { default as AppComponent } from ${JSON.stringify(normalizePathSeparators(appFilePath))};` : `const AppComponent = null;`;
-	const docImportCode = docFilePath !== null ? `import { default as DocumentComponent } from ${JSON.stringify(normalizePathSeparators(docFilePath))};` : `const DocumentComponent = null;`;
-	const errorAssetPathJson = errorFilePath !== null ? JSON.stringify(normalizePathSeparators(errorFilePath)) : "null";
-	const errorImportCode = errorFilePath !== null ? `import * as ErrorPageModule from ${JSON.stringify(normalizePathSeparators(errorFilePath))};` : `const ErrorPageModule = null;`;
+	const appAssetPathJson = appFilePath !== null ? JSON.stringify(appFilePath) : "null";
+	const appImportCode = appFilePath !== null ? `import { default as AppComponent } from ${JSON.stringify(appFilePath)};` : `const AppComponent = null;`;
+	const docImportCode = docFilePath !== null ? `import { default as DocumentComponent } from ${JSON.stringify(docFilePath)};` : `const DocumentComponent = null;`;
+	const errorAssetPathJson = errorFilePath !== null ? JSON.stringify(errorFilePath) : "null";
+	const errorImportCode = errorFilePath !== null ? `import * as ErrorPageModule from ${JSON.stringify(errorFilePath)};` : `const ErrorPageModule = null;`;
 	const i18nConfigJson = nextConfig?.i18n ? JSON.stringify({
 		locales: nextConfig.i18n.locales,
 		defaultLocale: nextConfig.i18n.defaultLocale,
@@ -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";
@@ -279,6 +279,7 @@ const _renderPage = __createPagesPageHandler({
   i18nConfig,
   vinextConfig: {
     basePath: vinextConfig.basePath,
+    assetPrefix: vinextConfig.assetPrefix,
     trailingSlash: vinextConfig.trailingSlash,
     expireTime: vinextConfig.expireTime,
     clientTraceMetadata: vinextConfig.clientTraceMetadata,
@@ -287,9 +288,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,

package/dist/index.d.ts

@@ -88,12 +88,10 @@ type VinextOptions = {
    * need a binding — e.g. a KV namespace — can read it.
    *
    * @example
-   * import { cdnAdapter } from "@vinext/cloudflare/cache/cdn-adapter";
    * import { kvDataAdapter } from "@vinext/cloudflare/cache/kv-data-adapter";
    *
    * vinext({
    *   cache: {
-   *     cdn:  cdnAdapter(),
    *     data: kvDataAdapter({ binding: "MY_KV" }),
    *   },
    * })