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
1ed81f73
Unverified
Commit
1ed81f73
authored
Dec 10, 2024
by
Niklas Mischkulnig
Committed by
GitHub
Dec 10, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turbopack: migrate server actions to single-graph-traversal (#73260)
Closes PACK-3537
parent
bf1b6a65
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
207 additions
and
155 deletions
+207
-155
app.rs
crates/next-api/src/app.rs
+14
-1
module_graph.rs
crates/next-api/src/module_graph.rs
+144
-2
server_actions.rs
crates/next-api/src/server_actions.rs
+49
-152
No files found.
crates/next-api/src/app.rs
View file @
1ed81f73
...
@@ -1120,8 +1120,21 @@ impl AppEndpoint {
...
@@ -1120,8 +1120,21 @@ impl AppEndpoint {
};
};
let
server_action_manifest_loader
=
if
process_client_components
{
let
server_action_manifest_loader
=
if
process_client_components
{
let
reduced_graphs
=
get_reduced_graphs_for_endpoint
(
this
.app_project
.project
(),
*
rsc_entry
,
Vc
::
upcast
(
this
.app_project
.client_module_context
()),
);
let
actions
=
reduced_graphs
.get_server_actions_for_endpoint
(
*
rsc_entry
,
match
runtime
{
NextRuntime
::
Edge
=>
Vc
::
upcast
(
this
.app_project
.edge_rsc_module_context
()),
NextRuntime
::
NodeJs
=>
Vc
::
upcast
(
this
.app_project
.rsc_module_context
()),
},
);
let
server_action_manifest
=
create_server_actions_manifest
(
let
server_action_manifest
=
create_server_actions_manifest
(
*
ResolvedVc
::
upcast
(
app_entry
.rsc_entry
)
,
actions
,
this
.app_project
.project
()
.project_path
(),
this
.app_project
.project
()
.project_path
(),
node_root
,
node_root
,
app_entry
.original_name
.clone
(),
app_entry
.original_name
.clone
(),
...
...
crates/next-api/src/module_graph.rs
View file @
1ed81f73
use
std
::{
use
std
::{
borrow
::
Cow
,
collections
::{
HashMap
,
HashSet
},
collections
::{
HashMap
,
HashSet
},
future
::
Future
,
future
::
Future
,
hash
::
Hash
,
hash
::
Hash
,
...
@@ -9,6 +10,7 @@ use anyhow::{Context, Result};
...
@@ -9,6 +10,7 @@ use anyhow::{Context, Result};
use
next_core
::{
use
next_core
::{
mode
::
NextMode
,
mode
::
NextMode
,
next_client_reference
::{
find_server_entries
,
ServerEntries
},
next_client_reference
::{
find_server_entries
,
ServerEntries
},
next_manifests
::
ActionLayer
,
};
};
use
petgraph
::{
use
petgraph
::{
graph
::{
DiGraph
,
NodeIndex
},
graph
::{
DiGraph
,
NodeIndex
},
...
@@ -35,6 +37,7 @@ use turbopack_core::{
...
@@ -35,6 +37,7 @@ use turbopack_core::{
use
crate
::{
use
crate
::{
dynamic_imports
::{
map_next_dynamic
,
DynamicImports
},
dynamic_imports
::{
map_next_dynamic
,
DynamicImports
},
project
::
Project
,
project
::
Project
,
server_actions
::{
map_server_actions
,
to_rsc_context
,
AllActions
,
AllModuleActions
},
};
};
#[turbo_tasks
::
value(transparent)]
#[turbo_tasks
::
value(transparent)]
...
@@ -316,6 +319,12 @@ impl SingleModuleGraph {
...
@@ -316,6 +319,12 @@ impl SingleModuleGraph {
.context
(
"Couldn't find entry module in graph"
)
.context
(
"Couldn't find entry module in graph"
)
}
}
/// Iterate over all nodes in the graph (potentially in the whole app!).
pub
fn
iter_nodes
(
&
self
)
->
impl
Iterator
<
Item
=
&
'_
SingleModuleGraphNode
>
+
'_
{
self
.graph
.node_weights
()
}
/// Enumerate over all nodes in the graph (potentially in the whole app!).
pub
fn
enumerate_nodes
(
pub
fn
enumerate_nodes
(
&
self
,
&
self
,
)
->
impl
Iterator
<
Item
=
(
NodeIndex
,
&
'_
SingleModuleGraphNode
)
>
+
'_
{
)
->
impl
Iterator
<
Item
=
(
NodeIndex
,
&
'_
SingleModuleGraphNode
)
>
+
'_
{
...
@@ -533,6 +542,90 @@ impl NextDynamicGraph {
...
@@ -533,6 +542,90 @@ impl NextDynamicGraph {
}
}
}
}
#[turbo_tasks
::
value]
pub
struct
ServerActionsGraph
{
is_single_page
:
bool
,
graph
:
ResolvedVc
<
SingleModuleGraph
>
,
/// (Layer, RSC or Browser module) -> list of actions
data
:
ResolvedVc
<
AllModuleActions
>
,
}
#[turbo_tasks
::
value_impl]
impl
ServerActionsGraph
{
#[turbo_tasks
::
function]
pub
async
fn
new_with_entries
(
graph
:
ResolvedVc
<
SingleModuleGraph
>
,
is_single_page
:
bool
,
)
->
Result
<
Vc
<
Self
>>
{
let
mapped
=
map_server_actions
(
*
graph
);
// TODO shrink graph here
Ok
(
ServerActionsGraph
{
is_single_page
,
graph
,
data
:
mapped
.to_resolved
()
.await
?
,
}
.cell
())
}
#[turbo_tasks
::
function]
pub
async
fn
get_server_actions_for_endpoint
(
&
self
,
entry
:
ResolvedVc
<
Box
<
dyn
Module
>>
,
rsc_asset_context
:
Vc
<
Box
<
dyn
AssetContext
>>
,
)
->
Result
<
Vc
<
AllActions
>>
{
let
span
=
tracing
::
info_span!
(
"collect server actions for endpoint"
);
async
move
{
let
data
=
&*
self
.data.await
?
;
let
data
=
if
self
.is_single_page
{
// The graph contains the page (= `entry`) only, no need to filter.
Cow
::
Borrowed
(
data
)
}
else
{
// The graph contains the whole app, traverse and collect all reachable imports.
let
graph
=
&*
self
.graph.await
?
;
let
mut
result
=
HashMap
::
new
();
graph
.traverse_from_entry
(
entry
,
|
node
|
{
if
let
Some
(
node_data
)
=
data
.get
(
&
node
.module
)
{
result
.insert
(
node
.module
,
*
node_data
);
}
})
?
;
Cow
::
Owned
(
result
)
};
let
actions
=
data
.iter
()
.map
(|(
module
,
(
layer
,
actions
))|
async
move
{
actions
.await
?
.iter
()
.map
(|(
hash
,
name
)|
async
move
{
Ok
((
hash
.to_string
(),
(
*
layer
,
name
.to_string
(),
if
*
layer
==
ActionLayer
::
Rsc
{
*
module
}
else
{
to_rsc_context
(
**
module
,
rsc_asset_context
)
.await
?
},
),
))
})
.try_join
()
.await
})
.try_flat_join
()
.await
?
;
Ok
(
Vc
::
cell
(
actions
.into_iter
()
.collect
()))
}
.instrument
(
span
)
.await
}
}
/// The consumers of this shouldn't need to care about the exact contents since it's abstracted away
/// The consumers of this shouldn't need to care about the exact contents since it's abstracted away
/// by the accessor functions, but
/// by the accessor functions, but
/// - In dev, contains information about the modules of the current endpoint only
/// - In dev, contains information about the modules of the current endpoint only
...
@@ -540,6 +633,7 @@ impl NextDynamicGraph {
...
@@ -540,6 +633,7 @@ impl NextDynamicGraph {
#[turbo_tasks
::
value]
#[turbo_tasks
::
value]
pub
struct
ReducedGraphs
{
pub
struct
ReducedGraphs
{
next_dynamic
:
Vec
<
ResolvedVc
<
NextDynamicGraph
>>
,
next_dynamic
:
Vec
<
ResolvedVc
<
NextDynamicGraph
>>
,
server_actions
:
Vec
<
ResolvedVc
<
ServerActionsGraph
>>
,
// TODO add other graphs
// TODO add other graphs
}
}
...
@@ -578,6 +672,38 @@ impl ReducedGraphs {
...
@@ -578,6 +672,38 @@ impl ReducedGraphs {
.instrument
(
span
)
.instrument
(
span
)
.await
.await
}
}
/// Returns the server actions for the given page.
#[turbo_tasks
::
function]
pub
async
fn
get_server_actions_for_endpoint
(
&
self
,
entry
:
Vc
<
Box
<
dyn
Module
>>
,
rsc_asset_context
:
Vc
<
Box
<
dyn
AssetContext
>>
,
)
->
Result
<
Vc
<
AllActions
>>
{
let
span
=
tracing
::
info_span!
(
"collect all server actions for endpoint"
);
async
move
{
if
let
[
graph
]
=
&
self
.server_actions
[
..
]
{
// Just a single graph, no need to merge results
Ok
(
graph
.get_server_actions_for_endpoint
(
entry
,
rsc_asset_context
))
}
else
{
let
result
=
self
.server_actions
.iter
()
.map
(|
graph
|
async
move
{
Ok
(
graph
.get_server_actions_for_endpoint
(
entry
,
rsc_asset_context
)
.await
?
.clone_value
())
})
.try_flat_join
()
.await
?
;
Ok
(
Vc
::
cell
(
result
.into_iter
()
.collect
()))
}
}
.instrument
(
span
)
.await
}
}
}
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
...
@@ -609,7 +735,7 @@ async fn get_reduced_graphs_for_endpoint_inner(
...
@@ -609,7 +735,7 @@ async fn get_reduced_graphs_for_endpoint_inner(
),
),
};
};
let
next_dynamic
=
async
move
{
let
next_dynamic
=
async
{
graphs
graphs
.iter
()
.iter
()
.map
(|
graph
|
{
.map
(|
graph
|
{
...
@@ -622,7 +748,23 @@ async fn get_reduced_graphs_for_endpoint_inner(
...
@@ -622,7 +748,23 @@ async fn get_reduced_graphs_for_endpoint_inner(
.instrument
(
tracing
::
info_span!
(
"generating next/dynamic graphs"
))
.instrument
(
tracing
::
info_span!
(
"generating next/dynamic graphs"
))
.await
?
;
.await
?
;
Ok
(
ReducedGraphs
{
next_dynamic
}
.cell
())
let
server_actions
=
async
{
graphs
.iter
()
.map
(|
graph
|
{
ServerActionsGraph
::
new_with_entries
(
**
graph
,
is_single_page
)
.to_resolved
()
})
.try_join
()
.await
}
.instrument
(
tracing
::
info_span!
(
"generating server actions graphs"
))
.await
?
;
Ok
(
ReducedGraphs
{
next_dynamic
,
server_actions
,
}
.cell
())
}
}
/// Generates a [ReducedGraph] for the given project and endpoint containing information that is
/// Generates a [ReducedGraph] for the given project and endpoint containing information that is
...
...
crates/next-api/src/server_actions.rs
View file @
1ed81f73
This diff is collapsed.
Click to expand it.
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