vinext 0.0.43 → 0.0.45

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

@@ -21,6 +21,7 @@ const normalizePathModulePath = resolveEntryPath("../server/normalize-path.js",
 const appRouteHandlerRuntimePath = resolveEntryPath("../server/app-route-handler-runtime.js", import.meta.url);
 const appRouteHandlerPolicyPath = resolveEntryPath("../server/app-route-handler-policy.js", import.meta.url);
 const appRouteHandlerExecutionPath = resolveEntryPath("../server/app-route-handler-execution.js", import.meta.url);
+const appServerActionExecutionPath = resolveEntryPath("../server/app-server-action-execution.js", import.meta.url);
 const appRouteHandlerCachePath = resolveEntryPath("../server/app-route-handler-cache.js", import.meta.url);
 const appPageCachePath = resolveEntryPath("../server/app-page-cache.js", import.meta.url);
 const appPageExecutionPath = resolveEntryPath("../server/app-page-execution.js", import.meta.url);
@@ -34,6 +35,7 @@ const appPageRequestPath = resolveEntryPath("../server/app-page-request.js", imp
 const appRouteHandlerResponsePath = resolveEntryPath("../server/app-route-handler-response.js", import.meta.url);
 const routeTriePath = resolveEntryPath("../routing/route-trie.js", import.meta.url);
 const metadataRoutesPath = resolveEntryPath("../server/metadata-routes.js", import.meta.url);
+const errorCausePath = resolveEntryPath("../utils/error-cause.js", import.meta.url);
 /**
 * Generate the virtual RSC entry module.
 *
@@ -87,7 +89,10 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 			if (slot.layoutPath) getImportVar(slot.layoutPath);
 			if (slot.loadingPath) getImportVar(slot.loadingPath);
 			if (slot.errorPath) getImportVar(slot.errorPath);
-			for (const ir of slot.interceptingRoutes) getImportVar(ir.pagePath);
+			for (const ir of slot.interceptingRoutes) {
+				getImportVar(ir.pagePath);
+				for (const layoutPath of ir.layoutPaths) getImportVar(layoutPath);
+			}
 		}
 	}
 	const routeEntries = routes.map((route, routeIdx) => {
@@ -98,6 +103,7 @@ function generateRscEntry(appDir, routes, middlewarePath, metadataRoutes, global
 			const interceptEntries = slot.interceptingRoutes.map((ir) => `        {
           convention: ${JSON.stringify(ir.convention)},
           targetPattern: ${JSON.stringify(ir.targetPattern)},
+          interceptLayouts: [${ir.layoutPaths.map((layoutPath) => getImportVar(layoutPath)).join(", ")}],
           page: ${getImportVar(ir.pagePath)},
           params: ${JSON.stringify(ir.params)},
         }`);
@@ -180,6 +186,7 @@ ${slotEntries.join(",\n")}
 	return `
 import {
   renderToReadableStream as _renderToReadableStream,
+  decodeAction,
   decodeReply,
   loadServerAction,
   createTemporaryReferenceSet,
@@ -239,6 +246,9 @@ import {
 import {
   executeAppRouteHandler as __executeAppRouteHandler,
 } from ${JSON.stringify(appRouteHandlerExecutionPath)};
+import {
+  handleProgressiveServerActionRequest as __handleProgressiveServerActionRequest,
+} from ${JSON.stringify(appServerActionExecutionPath)};
 import { readAppRouteHandlerCacheResponse as __readAppRouteHandlerCacheResponse } from ${JSON.stringify(appRouteHandlerCachePath)};
 import { readAppPageCacheResponse as __readAppPageCacheResponse } from ${JSON.stringify(appPageCachePath)};
 import {
@@ -279,12 +289,13 @@ import {
 } from ${JSON.stringify(appRouteHandlerResponsePath)};
 import { _consumeRequestScopedCacheLife, getCacheHandler } from "next/cache";
 import { getRequestExecutionContext as _getRequestExecutionContext } from ${JSON.stringify(requestContextShimPath)};
-import { ensureFetchPatch as _ensureFetchPatch, getCollectedFetchTags } from "vinext/fetch-cache";
+import { ensureFetchPatch as _ensureFetchPatch, getCollectedFetchTags, setCurrentFetchSoftTags } from "vinext/fetch-cache";
 import { buildRouteTrie as _buildRouteTrie, trieMatch as _trieMatch } from ${JSON.stringify(routeTriePath)};
 // Import server-only state module to register ALS-backed accessors.
 import "vinext/navigation-state";
 import { runWithRequestContext as _runWithUnifiedCtx, createRequestContext as _createUnifiedCtx } from "vinext/unified-request-context";
 import { reportRequestError as _reportRequestError } from "vinext/instrumentation";
+import { flattenErrorCauses as __flattenErrorCauses } from ${JSON.stringify(errorCausePath)};
 import { getSSRFontLinks as _getSSRFontLinks, getSSRFontStyles as _getSSRFontStylesGoogle, getSSRFontPreloads as _getSSRFontPreloadsGoogle } from "next/font/google";
 import { getSSRFontStyles as _getSSRFontStylesLocal, getSSRFontPreloads as _getSSRFontPreloadsLocal } from "next/font/local";
 function _getSSRFontStyles() { return [..._getSSRFontStylesGoogle(), ..._getSSRFontStylesLocal()]; }
@@ -642,6 +653,7 @@ const rootNotFoundModule = ${rootNotFoundVar ? rootNotFoundVar : "null"};
 const rootForbiddenModule = ${rootForbiddenVar ? rootForbiddenVar : "null"};
 const rootUnauthorizedModule = ${rootUnauthorizedVar ? rootUnauthorizedVar : "null"};
 const rootLayouts = [${rootLayoutVars.join(", ")}];
+const __APP_PAGE_EMPTY_MW_CTX = { headers: null, status: null };
 
 /**
  * Render an HTTP access fallback page (not-found/forbidden/unauthorized) with layouts and noindex meta.
@@ -650,7 +662,7 @@ const rootLayouts = [${rootLayoutVars.join(", ")}];
  * @param opts.boundaryComponent - Override the boundary component (for layout-level notFound)
  * @param opts.layouts - Override the layouts to wrap with (for layout-level notFound, excludes the throwing layout)
  */
-async function renderHTTPAccessFallbackPage(route, statusCode, isRscRequest, request, opts, scriptNonce) {
+async function renderHTTPAccessFallbackPage(route, statusCode, isRscRequest, request, opts, scriptNonce, middlewareContext) {
   return __renderAppPageHttpAccessFallback({
     boundaryComponent: opts?.boundaryComponent ?? null,
     buildFontLinkHeader: __buildAppPageFontLinkHeader,
@@ -673,6 +685,7 @@ async function renderHTTPAccessFallbackPage(route, statusCode, isRscRequest, req
     },
     makeThenableParams,
     matchedParams: opts?.matchedParams ?? route?.params ?? {},
+    middlewareContext: middlewareContext ?? __APP_PAGE_EMPTY_MW_CTX,
     requestUrl: request.url,
     resolveChildSegments: __resolveAppPageChildSegments,
     rootForbiddenModule: rootForbiddenModule,
@@ -687,8 +700,8 @@ async function renderHTTPAccessFallbackPage(route, statusCode, isRscRequest, req
 }
 
 /** Convenience: render a not-found page (404) */
-async function renderNotFoundPage(route, isRscRequest, request, matchedParams, scriptNonce) {
-  return renderHTTPAccessFallbackPage(route, 404, isRscRequest, request, { matchedParams }, scriptNonce);
+async function renderNotFoundPage(route, isRscRequest, request, matchedParams, scriptNonce, middlewareContext) {
+  return renderHTTPAccessFallbackPage(route, 404, isRscRequest, request, { matchedParams }, scriptNonce, middlewareContext);
 }
 
 /**
@@ -698,7 +711,7 @@ async function renderNotFoundPage(route, isRscRequest, request, matchedParams, s
  * Next.js returns HTTP 200 when error.tsx catches an error (the error is "handled"
  * by the boundary). This matches that behavior intentionally.
  */
-async function renderErrorBoundaryPage(route, error, isRscRequest, request, matchedParams, scriptNonce) {
+async function renderErrorBoundaryPage(route, error, isRscRequest, request, matchedParams, scriptNonce, middlewareContext) {
   return __renderAppPageErrorBoundary({
     buildFontLinkHeader: __buildAppPageFontLinkHeader,
     clearRequestContext() {
@@ -720,6 +733,7 @@ async function renderErrorBoundaryPage(route, error, isRscRequest, request, matc
     },
     makeThenableParams,
     matchedParams: matchedParams ?? route?.params ?? {},
+    middlewareContext: middlewareContext ?? __APP_PAGE_EMPTY_MW_CTX,
     requestUrl: request.url,
     resolveChildSegments: __resolveAppPageChildSegments,
     rootLayouts: rootLayouts,
@@ -790,7 +804,7 @@ function mergeMatchedParams(sourceParams, targetParams) {
 }
 
 // Build a global intercepting route lookup for RSC navigation.
-// Maps target URL patterns to { sourceRouteIndex, slotKey, interceptPage, params }.
+// Maps target URL patterns to { sourceRouteIndex, slotKey, interceptPage, interceptLayouts, params }.
 const interceptLookup = [];
 for (let ri = 0; ri < routes.length; ri++) {
   const r = routes[ri];
@@ -803,6 +817,7 @@ for (let ri = 0; ri < routes.length; ri++) {
         slotKey,
         targetPattern: intercept.targetPattern,
         targetPatternParts: intercept.targetPattern.split("/").filter(Boolean),
+        interceptLayouts: intercept.interceptLayouts,
         page: intercept.page,
         params: intercept.params,
       });
@@ -986,6 +1001,7 @@ async function buildPageElements(route, params, routePath, pageRequest) {
       opts && opts.interceptSlotKey && opts.interceptPage
         ? {
             [opts.interceptSlotKey]: {
+              layoutModules: opts.interceptLayouts || null,
               pageModule: opts.interceptPage,
               params: opts.interceptParams || params,
             },
@@ -1133,6 +1149,7 @@ export default async function handler(request, ctx) {
   const __uCtx = _createUnifiedCtx({
     headersContext: headersCtx,
     executionContext: ctx ?? _getRequestExecutionContext() ?? null,
+    unstableCacheRevalidation: "background",
   });
   return _runWithUnifiedCtx(__uCtx, async () => {
     _ensureFetchPatch();
@@ -1141,7 +1158,23 @@ export default async function handler(request, ctx) {
     // _handleRequest which fills in .headers and .status;
     // avoids module-level variables that race on Workers.
     const _mwCtx = { headers: null, requestHeaders: null, status: null };
-    const response = await _handleRequest(request, __reqCtx, _mwCtx);
+    let response;
+    try {
+      response = await _handleRequest(request, __reqCtx, _mwCtx);
+    } catch (err) {
+      // Dev only: embed err.cause chain into err.message/err.stack so Vite's
+      // dev-server "Internal server error:" logger (which builds output from
+      // message + stack only) reveals the underlying root cause (ECONNREFUSED,
+      // role missing, workerd socket error, etc.) instead of dropping it.
+      // Skipped in production because Node's util.inspect / workerd's logger
+      // already render .cause natively, so flattening would double-print it.
+      // NODE_ENV is build-time-replaced by Vite, so the prod bundle compiles
+      // this branch out entirely.
+      if (process.env.NODE_ENV !== "production") {
+        __flattenErrorCauses(err);
+      }
+      throw err;
+    }
     // Apply custom headers from next.config.js to non-redirect responses.
     // Skip redirects (3xx) because Response.redirect() creates immutable headers,
     // and Next.js doesn't apply custom headers to redirects anyway.
@@ -1585,7 +1618,29 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
   });
 
   // Handle server action POST requests
-  const actionId = request.headers.get("x-rsc-action");
+  const actionId = request.headers.get("x-rsc-action") ?? request.headers.get("next-action");
+  const actionContentType = request.headers.get("content-type") || "";
+  const progressiveActionResponse = await __handleProgressiveServerActionRequest({
+    actionId,
+    allowedOrigins: __allowedOrigins,
+    cleanPathname,
+    clearRequestContext() {
+      setHeadersContext(null);
+      setNavigationContext(null);
+    },
+    contentType: actionContentType,
+    decodeAction,
+    getAndClearPendingCookies,
+    getDraftModeCookieHeader,
+    maxActionBodySize: __MAX_ACTION_BODY_SIZE,
+    middlewareHeaders: _mwCtx.headers,
+    readFormDataWithLimit: __readFormDataWithLimit,
+    reportRequestError: _reportRequestError,
+    request,
+    setHeadersAccessPhase,
+  });
+  if (progressiveActionResponse) return progressiveActionResponse;
+
   if (request.method === "POST" && actionId) {
     // ── CSRF protection ─────────────────────────────────────────────────
     // Verify that the Origin header matches the Host header to prevent
@@ -1605,10 +1660,9 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
     }
 
     try {
-      const contentType = request.headers.get("content-type") || "";
       let body;
       try {
-        body = contentType.startsWith("multipart/form-data")
+        body = actionContentType.startsWith("multipart/form-data")
           ? await __readFormDataWithLimit(request, __MAX_ACTION_BODY_SIZE)
           : await __readBodyWithLimit(request, __MAX_ACTION_BODY_SIZE);
       } catch (sizeErr) {
@@ -1725,6 +1779,7 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
           toInterceptOpts(intercept) {
             return {
               interceptionContext: interceptionContextHeader,
+              interceptLayouts: intercept.interceptLayouts,
               interceptSlotKey: intercept.slotKey,
               interceptPage: intercept.page,
               interceptParams: intercept.matchedParams,
@@ -1883,14 +1938,17 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
     }
     ` : ""}
     // Render custom not-found page if available, otherwise plain 404
-    const notFoundResponse = await renderNotFoundPage(null, isRscRequest, request, undefined, _scriptNonce);
+    const notFoundResponse = await renderNotFoundPage(null, isRscRequest, request, undefined, _scriptNonce, _mwCtx);
     if (notFoundResponse) return notFoundResponse;
     setHeadersContext(null);
     setNavigationContext(null);
-    return new Response("Not Found", { status: 404 });
+    const notFoundHeaders = new Headers();
+    __mergeMiddlewareResponseHeaders(notFoundHeaders, _mwCtx.headers);
+    return new Response("Not Found", { status: 404, headers: notFoundHeaders });
   }
 
   const { route, params } = match;
+  setCurrentFetchSoftTags(__pageCacheTags(cleanPathname, []));
 
   // Update navigation context with matched params
   setNavigationContext({
@@ -1974,9 +2032,11 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
           const __revalUCtx = _createUnifiedCtx({
             headersContext: __revalHeadCtx,
             executionContext: _getRequestExecutionContext(),
+            unstableCacheRevalidation: "foreground",
           });
           await _runWithUnifiedCtx(__revalUCtx, async () => {
             _ensureFetchPatch();
+            setCurrentFetchSoftTags(__pageCacheTags(cleanPathname, []));
             await renderFn();
           });
         },
@@ -2124,9 +2184,11 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
         const __revalUCtx = _createUnifiedCtx({
           headersContext: __revalHeadCtx,
           executionContext: _getRequestExecutionContext(),
+          unstableCacheRevalidation: "foreground",
         });
         return _runWithUnifiedCtx(__revalUCtx, async () => {
           _ensureFetchPatch();
+          setCurrentFetchSoftTags(__pageCacheTags(cleanPathname, []));
           setNavigationContext({ pathname: cleanPathname, searchParams: new URLSearchParams(), params });
           // Slot context (X-Vinext-Mounted-Slots) is inherited from the
           // triggering request so the regen result is cached under the
@@ -2245,6 +2307,7 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
     toInterceptOpts(intercept) {
       return {
         interceptionContext: interceptionContextHeader,
+        interceptLayouts: intercept.interceptLayouts,
         interceptSlotKey: intercept.slotKey,
         interceptPage: intercept.page,
         interceptParams: intercept.matchedParams,
@@ -2267,7 +2330,7 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
       });
     },
     renderErrorBoundaryPage(buildErr) {
-      return renderErrorBoundaryPage(route, buildErr, isRscRequest, request, params, _scriptNonce);
+      return renderErrorBoundaryPage(route, buildErr, isRscRequest, request, params, _scriptNonce, _mwCtx);
     },
     renderSpecialError(__buildSpecialError) {
       return __buildAppPageSpecialErrorResponse({
@@ -2275,6 +2338,7 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
           setHeadersContext(null);
           setNavigationContext(null);
         },
+        middlewareContext: _mwCtx,
         renderFallbackPage(statusCode) {
           return renderHTTPAccessFallbackPage(
             route,
@@ -2285,6 +2349,10 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
               matchedParams: params,
             },
             _scriptNonce,
+            // buildAppPageSpecialErrorResponse merges _mwCtx onto this returned
+            // fallback response; keep this inner boundary render unmerged so
+            // additive headers like Set-Cookie and Vary are not duplicated.
+            null,
           );
         },
         requestUrl: request.url,
@@ -2384,7 +2452,7 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
     revalidateSeconds,
     mountedSlotsHeader: __mountedSlotsHeader,
     renderErrorBoundaryResponse(renderErr) {
-      return renderErrorBoundaryPage(route, renderErr, isRscRequest, request, params, _scriptNonce);
+      return renderErrorBoundaryPage(route, renderErr, isRscRequest, request, params, _scriptNonce, _mwCtx);
     },
     async renderLayoutSpecialError(__layoutSpecialError, li) {
       return __buildAppPageSpecialErrorResponse({
@@ -2392,6 +2460,7 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
           setHeadersContext(null);
           setNavigationContext(null);
         },
+        middlewareContext: _mwCtx,
         renderFallbackPage(statusCode) {
           // Find the not-found component from the parent level (the boundary that
           // would catch this in Next.js). Walk up from the throwing layout to find
@@ -2418,6 +2487,10 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
               matchedParams: params,
             },
             _scriptNonce,
+            // buildAppPageSpecialErrorResponse merges _mwCtx onto this returned
+            // fallback response; keep this inner boundary render unmerged so
+            // additive headers like Set-Cookie and Vary are not duplicated.
+            null,
           );
         },
         requestUrl: request.url,
@@ -2430,6 +2503,7 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
           setHeadersContext(null);
           setNavigationContext(null);
         },
+        middlewareContext: _mwCtx,
         renderFallbackPage(statusCode) {
           return renderHTTPAccessFallbackPage(
             route,
@@ -2440,6 +2514,10 @@ async function _handleRequest(request, __reqCtx, _mwCtx) {
               matchedParams: params,
             },
             _scriptNonce,
+            // buildAppPageSpecialErrorResponse merges _mwCtx onto this returned
+            // fallback response; keep this inner boundary render unmerged so
+            // additive headers like Set-Cookie and Vary are not duplicated.
+            null,
           );
         },
         requestUrl: request.url,