Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
d72e46c3
Commit
d72e46c3
authored
Feb 26, 2026
by
Zack Tanner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove action forwarding logic
parent
299e1ff3
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
144 additions
and
162 deletions
+144
-162
action-client-wrapper.ts
...bpack/loaders/next-flight-loader/action-client-wrapper.ts
+4
-1
next-flight-server-reference-proxy-loader.ts
...pack/loaders/next-flight-server-reference-proxy-loader.ts
+2
-2
app-call-server.ts
packages/next/src/client/app-call-server.ts
+20
-1
server-action-reducer.ts
...mponents/router-reducer/reducers/server-action-reducer.ts
+25
-2
router-reducer-types.ts
.../client/components/router-reducer/router-reducer-types.ts
+1
-0
action-handler.ts
packages/next/src/server/app-render/action-handler.ts
+13
-128
manifests-singleton.ts
packages/next/src/server/app-render/manifests-singleton.ts
+4
-24
app-action.test.ts
test/e2e/app-dir/actions/app-action.test.ts
+75
-4
No files found.
packages/next/src/build/webpack/loaders/next-flight-loader/action-client-wrapper.ts
View file @
d72e46c3
// This file must be bundled in the app's client layer, it shouldn't be directly
// This file must be bundled in the app's client layer, it shouldn't be directly
// imported by the server.
// imported by the server.
export
{
callServer
}
from
'next/dist/client/app-call-server'
export
{
callServer
,
createBoundActionCallServer
,
}
from
'next/dist/client/app-call-server'
export
{
findSourceMapURL
}
from
'next/dist/client/app-find-source-map-url'
export
{
findSourceMapURL
}
from
'next/dist/client/app-find-source-map-url'
// A noop wrapper to let the Flight client create the server reference.
// A noop wrapper to let the Flight client create the server reference.
...
...
packages/next/src/build/webpack/loaders/next-flight-server-reference-proxy-loader.ts
View file @
d72e46c3
...
@@ -18,10 +18,10 @@ const flightServerReferenceProxyLoader: webpack.LoaderDefinitionFunction<{
...
@@ -18,10 +18,10 @@ const flightServerReferenceProxyLoader: webpack.LoaderDefinitionFunction<{
// Because of that, Webpack is able to concatenate the modules and inline the
// Because of that, Webpack is able to concatenate the modules and inline the
// reference IDs recursively directly into the module that uses them.
// reference IDs recursively directly into the module that uses them.
return
`\
return
`\
import { createServerReference, callServer, findSourceMapURL } from 'private-next-rsc-action-client-wrapper'
import { createServerReference, c
reateBoundActionC
allServer, findSourceMapURL } from 'private-next-rsc-action-client-wrapper'
export
${
export
${
name
===
'default'
?
'default'
:
`const
${
name
}
=`
name
===
'default'
?
'default'
:
`const
${
name
}
=`
}
/*#__PURE__*/createServerReference(
${
JSON
.
stringify
(
id
)}
,
callServer
, undefined, findSourceMapURL,
${
JSON
.
stringify
(
name
)}
)`
}
/*#__PURE__*/createServerReference(
${
JSON
.
stringify
(
id
)}
,
/*#__PURE__*/createBoundActionCallServer()
, undefined, findSourceMapURL,
${
JSON
.
stringify
(
name
)}
)`
}
}
export
default
flightServerReferenceProxyLoader
export
default
flightServerReferenceProxyLoader
packages/next/src/client/app-call-server.ts
View file @
d72e46c3
...
@@ -2,13 +2,32 @@ import { startTransition } from 'react'
...
@@ -2,13 +2,32 @@ import { startTransition } from 'react'
import
{
ACTION_SERVER_ACTION
}
from
'./components/router-reducer/router-reducer-types'
import
{
ACTION_SERVER_ACTION
}
from
'./components/router-reducer/router-reducer-types'
import
{
dispatchAppRouterAction
}
from
'./components/use-action-queue'
import
{
dispatchAppRouterAction
}
from
'./components/use-action-queue'
export
async
function
callServer
(
actionId
:
string
,
actionArgs
:
any
[])
{
function
getCurrentActionDispatchPath
()
{
if
(
typeof
window
===
'undefined'
)
{
return
undefined
}
return
window
.
location
.
pathname
+
window
.
location
.
search
}
export
function
createBoundActionCallServer
(
actionDispatchPath
=
getCurrentActionDispatchPath
()
)
{
return
(
actionId
:
string
,
actionArgs
:
any
[])
=>
callServer
(
actionId
,
actionArgs
,
actionDispatchPath
)
}
export
async
function
callServer
(
actionId
:
string
,
actionArgs
:
any
[],
actionDispatchPath
=
getCurrentActionDispatchPath
()
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
startTransition
(()
=>
{
startTransition
(()
=>
{
dispatchAppRouterAction
({
dispatchAppRouterAction
({
type
:
ACTION_SERVER_ACTION
,
type
:
ACTION_SERVER_ACTION
,
actionId
,
actionId
,
actionArgs
,
actionArgs
,
actionDispatchPath
,
resolve
,
resolve
,
reject
,
reject
,
})
})
...
...
packages/next/src/client/components/router-reducer/reducers/server-action-reducer.ts
View file @
d72e46c3
...
@@ -91,13 +91,22 @@ type FetchServerActionResult = {
...
@@ -91,13 +91,22 @@ type FetchServerActionResult = {
actionFlightDataRenderedSearch
:
NormalizedSearch
|
undefined
actionFlightDataRenderedSearch
:
NormalizedSearch
|
undefined
isPrerender
:
boolean
isPrerender
:
boolean
couldBeIntercepted
:
boolean
couldBeIntercepted
:
boolean
isCrossRouteDispatch
:
boolean
}
}
async
function
fetchServerAction
(
async
function
fetchServerAction
(
state
:
ReadonlyReducerState
,
state
:
ReadonlyReducerState
,
nextUrl
:
ReadonlyReducerState
[
'nextUrl'
],
nextUrl
:
ReadonlyReducerState
[
'nextUrl'
],
{
actionId
,
actionArgs
}:
ServerActionAction
{
actionId
,
actionArgs
,
actionDispatchPath
}:
ServerActionAction
):
Promise
<
FetchServerActionResult
>
{
):
Promise
<
FetchServerActionResult
>
{
const
currentRequestUrl
=
new
URL
(
state
.
canonicalUrl
,
window
.
location
.
href
)
const
actionRequestUrl
=
actionDispatchPath
?
new
URL
(
actionDispatchPath
,
window
.
location
.
href
)
:
currentRequestUrl
const
isCrossRouteDispatch
=
actionRequestUrl
.
pathname
!==
currentRequestUrl
.
pathname
||
actionRequestUrl
.
search
!==
currentRequestUrl
.
search
const
temporaryReferences
=
createTemporaryReferenceSet
()
const
temporaryReferences
=
createTemporaryReferenceSet
()
const
info
=
extractInfoFromServerReferenceId
(
actionId
)
const
info
=
extractInfoFromServerReferenceId
(
actionId
)
const
usedArgs
=
omitUnusedArgs
(
actionArgs
,
info
)
const
usedArgs
=
omitUnusedArgs
(
actionArgs
,
info
)
...
@@ -133,7 +142,11 @@ async function fetchServerAction(
...
@@ -133,7 +142,11 @@ async function fetchServerAction(
.
toString
(
16
)
.
toString
(
16
)
}
}
const
res
=
await
fetch
(
state
.
canonicalUrl
,
{
method
:
'POST'
,
headers
,
body
})
const
res
=
await
fetch
(
createHrefFromUrl
(
actionRequestUrl
),
{
method
:
'POST'
,
headers
,
body
,
})
// Handle server actions that the server didn't recognize.
// Handle server actions that the server didn't recognize.
const
unrecognizedActionHeader
=
res
.
headers
.
get
(
NEXT_ACTION_NOT_FOUND_HEADER
)
const
unrecognizedActionHeader
=
res
.
headers
.
get
(
NEXT_ACTION_NOT_FOUND_HEADER
)
...
@@ -239,6 +252,7 @@ async function fetchServerAction(
...
@@ -239,6 +252,7 @@ async function fetchServerAction(
revalidationKind
,
revalidationKind
,
isPrerender
,
isPrerender
,
couldBeIntercepted
,
couldBeIntercepted
,
isCrossRouteDispatch
,
}
}
}
}
...
@@ -277,7 +291,16 @@ export function serverActionReducer(
...
@@ -277,7 +291,16 @@ export function serverActionReducer(
redirectType
,
redirectType
,
isPrerender
,
isPrerender
,
couldBeIntercepted
,
couldBeIntercepted
,
isCrossRouteDispatch
,
})
=>
{
})
=>
{
// A delayed action might be dispatched to a different route than the one
// currently rendered. In that case, don't apply the seeded response tree
// to the current route.
if
(
isCrossRouteDispatch
&&
redirectLocation
===
undefined
)
{
flightData
=
undefined
flightDataRenderedSearch
=
undefined
}
if
(
revalidationKind
!==
ActionDidNotRevalidate
)
{
if
(
revalidationKind
!==
ActionDidNotRevalidate
)
{
// There was either a revalidation or a refresh, or maybe both.
// There was either a revalidation or a refresh, or maybe both.
...
...
packages/next/src/client/components/router-reducer/router-reducer-types.ts
View file @
d72e46c3
...
@@ -53,6 +53,7 @@ export interface ServerActionAction {
...
@@ -53,6 +53,7 @@ export interface ServerActionAction {
type
:
typeof
ACTION_SERVER_ACTION
type
:
typeof
ACTION_SERVER_ACTION
actionId
:
string
actionId
:
string
actionArgs
:
any
[]
actionArgs
:
any
[]
actionDispatchPath
?:
string
resolve
:
(
value
:
any
)
=>
void
resolve
:
(
value
:
any
)
=>
void
reject
:
(
reason
?:
any
)
=>
void
reject
:
(
reason
?:
any
)
=>
void
didRevalidate
?:
boolean
didRevalidate
?:
boolean
...
...
packages/next/src/server/app-render/action-handler.ts
View file @
d72e46c3
...
@@ -40,7 +40,6 @@ import {
...
@@ -40,7 +40,6 @@ import {
import
{
getModifiedCookieValues
}
from
'../web/spec-extension/adapters/request-cookies'
import
{
getModifiedCookieValues
}
from
'../web/spec-extension/adapters/request-cookies'
import
{
import
{
JSON_CONTENT_TYPE_HEADER
,
NEXT_CACHE_REVALIDATED_TAGS_HEADER
,
NEXT_CACHE_REVALIDATED_TAGS_HEADER
,
NEXT_CACHE_REVALIDATE_TAG_TOKEN_HEADER
,
NEXT_CACHE_REVALIDATE_TAG_TOKEN_HEADER
,
}
from
'../../lib/constants'
}
from
'../../lib/constants'
...
@@ -51,7 +50,7 @@ import { RequestCookies, ResponseCookies } from '../web/spec-extension/cookies'
...
@@ -51,7 +50,7 @@ import { RequestCookies, ResponseCookies } from '../web/spec-extension/cookies'
import
{
HeadersAdapter
}
from
'../web/spec-extension/adapters/headers'
import
{
HeadersAdapter
}
from
'../web/spec-extension/adapters/headers'
import
{
fromNodeOutgoingHttpHeaders
}
from
'../web/utils'
import
{
fromNodeOutgoingHttpHeaders
}
from
'../web/utils'
import
{
import
{
selectWorkerForForwarding
,
hasActionWorkerForPage
,
type
ServerModuleMap
,
type
ServerModuleMap
,
getServerActionsManifest
,
getServerActionsManifest
,
getServerModuleMap
,
getServerModuleMap
,
...
@@ -197,98 +196,6 @@ function addRevalidationHeader(
...
@@ -197,98 +196,6 @@ function addRevalidationHeader(
}
}
}
}
/**
* Forwards a server action request to a separate worker. Used when the requested action is not available in the current worker.
*/
async
function
createForwardedActionResponse
(
req
:
BaseNextRequest
,
res
:
BaseNextResponse
,
host
:
Host
,
workerPathname
:
string
,
basePath
:
string
)
{
if
(
!
host
)
{
throw
new
Error
(
'Invariant: Missing `host` header from a forwarded Server Actions request.'
)
}
const
forwardedHeaders
=
getForwardedHeaders
(
req
,
res
)
// indicate that this action request was forwarded from another worker
// we use this to skip rendering the flight tree so that we don't update the UI
// with the response from the forwarded worker
forwardedHeaders
.
set
(
'x-action-forwarded'
,
'1'
)
const
proto
=
getRequestMeta
(
req
,
'initProtocol'
)?.
replace
(
/:+$/
,
''
)
||
'https'
// For standalone or the serverful mode, use the internal origin directly
// other than the host headers from the request.
const
origin
=
process
.
env
.
__NEXT_PRIVATE_ORIGIN
||
`
${
proto
}
://
${
host
.
value
}
`
const
fetchUrl
=
new
URL
(
`
${
origin
}${
basePath
}${
workerPathname
}
`
)
try
{
let
body
:
BodyInit
|
ReadableStream
<
Uint8Array
>
|
undefined
if
(
// The type check here ensures that `req` is correctly typed, and the
// environment variable check provides dead code elimination.
process
.
env
.
NEXT_RUNTIME
===
'edge'
&&
isWebNextRequest
(
req
)
)
{
if
(
!
req
.
body
)
{
throw
new
Error
(
'Invariant: missing request body.'
)
}
body
=
req
.
body
}
else
if
(
// The type check here ensures that `req` is correctly typed, and the
// environment variable check provides dead code elimination.
process
.
env
.
NEXT_RUNTIME
!==
'edge'
&&
isNodeNextRequest
(
req
)
)
{
body
=
req
.
stream
()
}
else
{
throw
new
Error
(
'Invariant: Unknown request type.'
)
}
// Forward the request to the new worker
const
response
=
await
fetch
(
fetchUrl
,
{
method
:
'POST'
,
body
,
duplex
:
'half'
,
headers
:
forwardedHeaders
,
redirect
:
'manual'
,
next
:
{
// @ts-ignore
internal
:
1
,
},
})
if
(
response
.
headers
.
get
(
'content-type'
)?.
startsWith
(
RSC_CONTENT_TYPE_HEADER
)
)
{
// copy the headers from the redirect response to the response we're sending
for
(
const
[
key
,
value
]
of
response
.
headers
)
{
if
(
!
actionsForbiddenHeaders
.
includes
(
key
))
{
res
.
setHeader
(
key
,
value
)
}
}
return
new
FlightRenderResult
(
response
.
body
!
)
}
else
{
// Since we aren't consuming the response body, we cancel it to avoid memory leaks
response
.
body
?.
cancel
()
}
}
catch
(
err
)
{
// we couldn't stream the forwarded response, so we'll just return an empty response
console
.
error
(
`failed to forward action response`
,
err
)
}
return
RenderResult
.
fromStatic
(
'{}'
,
JSON_CONTENT_TYPE_HEADER
)
}
/**
/**
* Returns the parsed redirect URL if we deem that it is hosted by us.
* Returns the parsed redirect URL if we deem that it is hosted by us.
*
*
...
@@ -701,25 +608,10 @@ export async function handleAction({
...
@@ -701,25 +608,10 @@ export async function handleAction({
const
{
actionAsyncStorage
}
=
ComponentMod
const
{
actionAsyncStorage
}
=
ComponentMod
const
actionWasForwarded
=
Boolean
(
req
.
headers
[
'x-action-forwarded'
])
// Server Actions fetch requests are only valid on routes that bundle the
// action. Reject invalid route/action combinations before reading the body.
if
(
actionId
)
{
if
(
actionId
&&
isFetchAction
&&
!
hasActionWorkerForPage
(
actionId
,
page
))
{
const
forwardedWorker
=
selectWorkerForForwarding
(
actionId
,
page
)
return
handleUnrecognizedFetchAction
(
getActionNotFoundError
(
actionId
))
// If forwardedWorker is truthy, it means there isn't a worker for the action
// in the current handler, so we forward the request to a worker that has the action.
if
(
forwardedWorker
)
{
return
{
type
:
'done'
,
result
:
await
createForwardedActionResponse
(
req
,
res
,
host
,
forwardedWorker
,
ctx
.
renderOpts
.
basePath
),
}
}
}
}
try
{
try
{
...
@@ -791,8 +683,7 @@ export async function handleAction({
...
@@ -791,8 +683,7 @@ export async function handleAction({
action
as
()
=>
Promise
<
unknown
>
,
action
as
()
=>
Promise
<
unknown
>
,
[],
[],
workStore
,
workStore
,
requestStore
,
requestStore
actionWasForwarded
)
)
const
formState
=
await
decodeFormState
(
const
formState
=
await
decodeFormState
(
...
@@ -999,8 +890,7 @@ export async function handleAction({
...
@@ -999,8 +890,7 @@ export async function handleAction({
action
as
()
=>
Promise
<
unknown
>
,
action
as
()
=>
Promise
<
unknown
>
,
[],
[],
workStore
,
workStore
,
requestStore
,
requestStore
actionWasForwarded
)
)
const
formState
=
await
decodeFormState
(
const
formState
=
await
decodeFormState
(
...
@@ -1128,8 +1018,7 @@ export async function handleAction({
...
@@ -1128,8 +1018,7 @@ export async function handleAction({
actionHandler
,
actionHandler
,
boundActionArguments
,
boundActionArguments
,
workStore
,
workStore
,
requestStore
,
requestStore
actionWasForwarded
).
finally
(()
=>
{
).
finally
(()
=>
{
addRevalidationHeader
(
res
,
{
workStore
,
requestStore
})
addRevalidationHeader
(
res
,
{
workStore
,
requestStore
})
if
(
logInfo
)
{
if
(
logInfo
)
{
...
@@ -1259,12 +1148,10 @@ export async function handleAction({
...
@@ -1259,12 +1148,10 @@ export async function handleAction({
type
:
'done'
,
type
:
'done'
,
result
:
await
generateFlight
(
req
,
ctx
,
requestStore
,
{
result
:
await
generateFlight
(
req
,
ctx
,
requestStore
,
{
actionResult
:
promise
,
actionResult
:
promise
,
// If the page was not revalidated, or if the action was forwarded
// If the page was not revalidated, we can skip rendering the page.
// from another worker, we can skip rendering the page.
skipPageRendering
:
skipPageRendering
:
workStore
.
pathWasRevalidated
===
undefined
||
workStore
.
pathWasRevalidated
===
undefined
||
workStore
.
pathWasRevalidated
===
ActionDidNotRevalidate
||
workStore
.
pathWasRevalidated
===
ActionDidNotRevalidate
,
actionWasForwarded
,
temporaryReferences
,
temporaryReferences
,
}),
}),
}
}
...
@@ -1287,14 +1174,13 @@ async function executeActionAndPrepareForRender<
...
@@ -1287,14 +1174,13 @@ async function executeActionAndPrepareForRender<
action
:
TFn
,
action
:
TFn
,
args
:
Parameters
<
TFn
>
,
args
:
Parameters
<
TFn
>
,
workStore
:
WorkStore
,
workStore
:
WorkStore
,
requestStore
:
RequestStore
,
requestStore
:
RequestStore
actionWasForwarded
:
boolean
):
Promise
<
{
):
Promise
<
{
actionResult
:
Awaited
<
ReturnType
<
TFn
>>
actionResult
:
Awaited
<
ReturnType
<
TFn
>>
skipPageRendering
:
boolean
skipPageRendering
:
boolean
}
>
{
}
>
{
requestStore
.
phase
=
'action'
requestStore
.
phase
=
'action'
let
skipPageRendering
=
actionWasForwarded
let
skipPageRendering
=
false
if
(
args
.
length
>
SERVER_ACTION_ARGS_LIMIT
)
{
if
(
args
.
length
>
SERVER_ACTION_ARGS_LIMIT
)
{
throw
new
Error
(
throw
new
Error
(
...
@@ -1307,8 +1193,7 @@ async function executeActionAndPrepareForRender<
...
@@ -1307,8 +1193,7 @@ async function executeActionAndPrepareForRender<
action
.
apply
(
null
,
args
)
action
.
apply
(
null
,
args
)
)
)
// If the page was not revalidated, or if the action was forwarded from
// If the page was not revalidated, we can skip rendering the page.
// another worker, we can skip rendering the page.
skipPageRendering
||=
skipPageRendering
||=
workStore
.
pathWasRevalidated
===
undefined
||
workStore
.
pathWasRevalidated
===
undefined
||
workStore
.
pathWasRevalidated
===
ActionDidNotRevalidate
workStore
.
pathWasRevalidated
===
ActionDidNotRevalidate
...
...
packages/next/src/server/app-render/manifests-singleton.ts
View file @
d72e46c3
...
@@ -4,7 +4,6 @@ import type { DeepReadonly } from '../../shared/lib/deep-readonly'
...
@@ -4,7 +4,6 @@ import type { DeepReadonly } from '../../shared/lib/deep-readonly'
import
{
InvariantError
}
from
'../../shared/lib/invariant-error'
import
{
InvariantError
}
from
'../../shared/lib/invariant-error'
import
{
normalizeAppPath
}
from
'../../shared/lib/router/utils/app-paths'
import
{
normalizeAppPath
}
from
'../../shared/lib/router/utils/app-paths'
import
{
pathHasPrefix
}
from
'../../shared/lib/router/utils/path-has-prefix'
import
{
pathHasPrefix
}
from
'../../shared/lib/router/utils/path-has-prefix'
import
{
removePathPrefix
}
from
'../../shared/lib/router/utils/remove-path-prefix'
import
{
workAsyncStorage
}
from
'./work-async-storage.external'
import
{
workAsyncStorage
}
from
'./work-async-storage.external'
export
interface
ServerModuleMap
{
export
interface
ServerModuleMap
{
...
@@ -235,40 +234,21 @@ function normalizeWorkerPageName(pageName: string) {
...
@@ -235,40 +234,21 @@ function normalizeWorkerPageName(pageName: string) {
return
'app'
+
pageName
return
'app'
+
pageName
}
}
/**
export
function
hasActionWorkerForPage
(
* Converts a bundlePath (relative path to the entrypoint) to a routable page
* name.
*/
function
denormalizeWorkerPageName
(
bundlePath
:
string
)
{
return
normalizeAppPath
(
removePathPrefix
(
bundlePath
,
'app'
))
}
/**
* Checks if the requested action has a worker for the current page.
* If not, it returns the first worker that has a handler for the action.
*/
export
function
selectWorkerForForwarding
(
actionId
:
string
,
actionId
:
string
,
pageName
:
string
pageName
:
string
):
string
|
undefined
{
):
boolean
{
const
serverActionsManifest
=
getServerActionsManifest
()
const
serverActionsManifest
=
getServerActionsManifest
()
const
workers
=
const
workers
=
serverActionsManifest
[
serverActionsManifest
[
process
.
env
.
NEXT_RUNTIME
===
'edge'
?
'edge'
:
'node'
process
.
env
.
NEXT_RUNTIME
===
'edge'
?
'edge'
:
'node'
][
actionId
]?.
workers
][
actionId
]?.
workers
// There are no workers to handle this action, nothing to forward to.
if
(
!
workers
)
{
if
(
!
workers
)
{
return
return
false
}
// If there is an entry for the current page, we don't need to forward.
if
(
workers
[
normalizeWorkerPageName
(
pageName
)])
{
return
}
}
// Otherwise, grab the first worker that has a handler for this action id.
return
Boolean
(
workers
[
normalizeWorkerPageName
(
pageName
)])
return
denormalizeWorkerPageName
(
Object
.
keys
(
workers
)[
0
])
}
}
export
function
setManifestsSingleton
({
export
function
setManifestsSingleton
({
...
...
test/e2e/app-dir/actions/app-action.test.ts
View file @
d72e46c3
...
@@ -897,10 +897,23 @@ describe('app-dir action handling', () => {
...
@@ -897,10 +897,23 @@ describe('app-dir action handling', () => {
}
}
it
.
each
([
'node'
,
'edge'
])(
it
.
each
([
'node'
,
'edge'
])(
'should
forward action request to a worker
that contains the action handler (%s)'
,
'should
dispatch delayed action request to a route
that contains the action handler (%s)'
,
async
(
runtime
)
=>
{
async
(
runtime
)
=>
{
const
cliOutputIndex
=
next
.
cliOutput
.
length
const
cliOutputIndex
=
next
.
cliOutput
.
length
const
browser
=
await
next
.
browser
(
`/delayed-action/
${
runtime
}
`
)
let
actionRequestPathname
:
string
|
undefined
const
browser
=
await
next
.
browser
(
`/delayed-action/
${
runtime
}
`
,
{
beforePageLoad
(
page
)
{
page
.
on
(
'request'
,
async
(
request
)
=>
{
if
(
request
.
method
()
!==
'POST'
)
return
const
headers
=
await
request
.
allHeaders
().
catch
(()
=>
({}))
if
(
!
headers
[
'next-action'
])
return
actionRequestPathname
=
new
URL
(
request
.
url
()).
pathname
})
},
})
// confirm there's no data yet
// confirm there's no data yet
expect
(
await
browser
.
elementById
(
'delayed-action-result'
).
text
()).
toBe
(
expect
(
await
browser
.
elementById
(
'delayed-action-result'
).
text
()).
toBe
(
...
@@ -929,6 +942,9 @@ describe('app-dir action handling', () => {
...
@@ -929,6 +942,9 @@ describe('app-dir action handling', () => {
// make sure that we still are rendering other-page content
// make sure that we still are rendering other-page content
expect
(
await
browser
.
hasElementByCssSelector
(
'#other-page'
)).
toBe
(
true
)
expect
(
await
browser
.
hasElementByCssSelector
(
'#other-page'
)).
toBe
(
true
)
// delayed actions should dispatch against the original route that has the action
expect
(
actionRequestPathname
).
toBe
(
`/delayed-action/
${
runtime
}
`
)
// make sure we didn't get any errors in the console
// make sure we didn't get any errors in the console
expect
(
next
.
cliOutput
.
slice
(
cliOutputIndex
)).
not
.
toContain
(
expect
(
next
.
cliOutput
.
slice
(
cliOutputIndex
)).
not
.
toContain
(
'Failed to find Server Action'
'Failed to find Server Action'
...
@@ -937,11 +953,21 @@ describe('app-dir action handling', () => {
...
@@ -937,11 +953,21 @@ describe('app-dir action handling', () => {
)
)
it
.
each
([
'node'
,
'edge'
])(
it
.
each
([
'node'
,
'edge'
])(
'should not error when a
forward
ed action triggers a redirect (%s)'
,
'should not error when a
delay
ed action triggers a redirect (%s)'
,
async
(
runtime
)
=>
{
async
(
runtime
)
=>
{
let
redirectResponseCode
let
redirectResponseCode
let
actionRequestPathname
:
string
|
undefined
const
browser
=
await
next
.
browser
(
`/delayed-action/
${
runtime
}
`
,
{
const
browser
=
await
next
.
browser
(
`/delayed-action/
${
runtime
}
`
,
{
beforePageLoad
(
page
)
{
beforePageLoad
(
page
)
{
page
.
on
(
'request'
,
async
(
request
)
=>
{
if
(
request
.
method
()
!==
'POST'
)
return
const
headers
=
await
request
.
allHeaders
().
catch
(()
=>
({}))
if
(
!
headers
[
'next-action'
])
return
actionRequestPathname
=
new
URL
(
request
.
url
()).
pathname
})
page
.
on
(
'response'
,
async
(
res
)
=>
{
page
.
on
(
'response'
,
async
(
res
)
=>
{
const
headers
=
await
res
.
allHeaders
().
catch
(()
=>
({}))
const
headers
=
await
res
.
allHeaders
().
catch
(()
=>
({}))
if
(
headers
[
'x-action-redirect'
])
{
if
(
headers
[
'x-action-redirect'
])
{
...
@@ -962,14 +988,59 @@ describe('app-dir action handling', () => {
...
@@ -962,14 +988,59 @@ describe('app-dir action handling', () => {
// confirm a successful response code on the redirected action
// confirm a successful response code on the redirected action
await
retry
(
async
()
=>
{
await
retry
(
async
()
=>
{
expect
(
redirectResponseCode
).
toBe
(
200
)
expect
(
[
200
,
303
]).
toContain
(
redirectResponseCode
)
})
})
// delayed redirects should dispatch against the original route that has the action
expect
(
actionRequestPathname
).
toBe
(
`/delayed-action/
${
runtime
}
`
)
// confirm that the redirect was handled
// confirm that the redirect was handled
await
browser
.
waitForElementByCss
(
'#run-action-redirect'
)
await
browser
.
waitForElementByCss
(
'#run-action-redirect'
)
}
}
)
)
it
.
each
([
'node'
,
'edge'
])(
'should reject action requests posted to a route that does not bundle the action (%s)'
,
async
(
runtime
)
=>
{
let
actionId
:
string
|
undefined
const
browser
=
await
next
.
browser
(
`/delayed-action/
${
runtime
}
`
,
{
beforePageLoad
(
page
)
{
page
.
on
(
'request'
,
async
(
request
)
=>
{
if
(
request
.
method
()
!==
'POST'
)
return
const
headers
=
await
request
.
allHeaders
().
catch
(()
=>
({}))
if
(
!
headers
[
'next-action'
])
return
actionId
=
headers
[
'next-action'
]
})
},
})
await
browser
.
elementById
(
'run-action'
).
click
()
await
retry
(
async
()
=>
{
expect
(
actionId
).
toBeDefined
()
})
if
(
!
actionId
)
{
throw
new
Error
(
'Failed to capture action ID'
)
}
const
res
=
await
next
.
fetch
(
`/delayed-action/
${
runtime
}
/other`
,
{
method
:
'POST'
,
headers
:
{
'next-action'
:
actionId
,
'next-resume'
:
'1'
,
'content-type'
:
'text/plain'
,
},
body
:
'test'
,
signal
:
AbortSignal
.
timeout
(
3
_000
),
})
expect
(
res
.
status
).
toBe
(
404
)
expect
(
res
.
headers
.
get
(
'x-nextjs-action-not-found'
)).
toBe
(
'1'
)
}
)
if
(
isNextStart
)
{
if
(
isNextStart
)
{
it
(
'should not expose action content in sourcemaps'
,
async
()
=>
{
it
(
'should not expose action content in sourcemaps'
,
async
()
=>
{
// We check all sourcemaps in the `static` folder for sensitive information given that chunking
// We check all sourcemaps in the `static` folder for sensitive information given that chunking
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment