Author: gnoff

packages/next/src/server/app-render/action-handler.ts

@@ -4,6 +4,7 @@ import type { RequestStore } from '../../client/components/request-async-storage
 import type { AppRenderContext, GenerateFlight } from './app-render'
 import type { AppPageModule } from '../../server/route-modules/app-page/module'
 import type { BaseNextRequest, BaseNextResponse } from '../base-http'
+import type { RequestErrorContext } from '../instrumentation/types'
 
 import {
   RSC_HEADER,
@@ -403,6 +404,7 @@ type ServerActionsConfig = {
 export async function handleAction({
   req,
   res,
+  errorContext,
   ComponentMod,
   serverModuleMap,
   generateFlight,
@@ -413,6 +415,10 @@ export async function handleAction({
 }: {
   req: BaseNextRequest
   res: BaseNextResponse
+  errorContext: Pick<
+    RequestErrorContext,
+    'routerKind' | 'routePath' | 'routeType'
+  >
   ComponentMod: AppPageModule
   serverModuleMap: ServerModuleMap
   generateFlight: GenerateFlight
@@ -539,7 +545,7 @@ export async function handleAction({
 
         return {
           type: 'done',
-          result: await generateFlight(ctx, {
+          result: await generateFlight(req, ctx, errorContext, {
             actionResult: promise,
             // if the page was not revalidated, we can skip the rendering the flight tree
             skipFlight: !staticGenerationStore.pathWasRevalidated,
@@ -817,7 +823,7 @@ export async function handleAction({
           requestStore,
         })
 
-        actionResult = await generateFlight(ctx, {
+        actionResult = await generateFlight(req, ctx, errorContext, {
           actionResult: Promise.resolve(returnVal),
           // if the page was not revalidated, or if the action was forwarded from another worker, we can skip the rendering the flight tree
           skipFlight:
@@ -895,7 +901,7 @@ export async function handleAction({
         }
         return {
           type: 'done',
-          result: await generateFlight(ctx, {
+          result: await generateFlight(req, ctx, errorContext, {
             skipFlight: false,
             actionResult: promise,
             asNotFound: true,
@@ -928,7 +934,7 @@ export async function handleAction({
 
       return {
         type: 'done',
-        result: await generateFlight(ctx, {
+        result: await generateFlight(req, ctx, errorContext, {
           actionResult: promise,
           // if the page was not revalidated, or if the action was forwarded from another worker, we can skip the rendering the flight tree
           skipFlight: