Unverified Commit fda8a605 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

ServerActionsGraph: pass ModuleGraphLayer as OperationVc (#94141)

### What?

Threads the layer module graph through `ServerActionsGraph` and
`map_server_actions` as an `OperationVc` instead of a resolved `Vc`,
calling `connect()` at each consumer.

### Why?

Fixes the invalidation priority of `map_server_actions` so it is
executed after the module graph on incremental builds. Previously,
because the graph was resolved at construction time, the dependency
ordering caused `map_server_actions` to be re-run before the module
graph on incremental rebuilds.

### How?

By passing the layer graph as an `OperationVc` and calling `connect()`
within each consumer task, the graph is resolved within the consuming
task rather than at construction time. This restores the intended
invalidation/scheduling order between the module graph and
`map_server_actions`.

<!-- NEXT_JS_LLM_PR -->
parent 616dab89
...@@ -17,7 +17,8 @@ use rustc_hash::FxHashMap; ...@@ -17,7 +17,8 @@ use rustc_hash::FxHashMap;
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
CollectiblesSource, FxIndexMap, FxIndexSet, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, Vc, CollectiblesSource, FxIndexMap, FxIndexSet, OperationVc, ResolvedVc, TryFlatJoinIterExt,
TryJoinIterExt, Vc,
}; };
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
...@@ -256,9 +257,8 @@ impl ServerActionsGraphs { ...@@ -256,9 +257,8 @@ impl ServerActionsGraphs {
let server_actions = async { let server_actions = async {
graphs_ref graphs_ref
.iter() .iter()
.map(|graph| { .map(|&graph| {
ServerActionsGraph::new_with_entries(graph.connect(), is_single_page) ServerActionsGraph::new_with_entries(graph, is_single_page).to_resolved()
.to_resolved()
}) })
.try_join() .try_join()
.await .await
...@@ -320,14 +320,14 @@ impl ServerActionsGraphs { ...@@ -320,14 +320,14 @@ impl ServerActionsGraphs {
impl ServerActionsGraph { impl ServerActionsGraph {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn new_with_entries( pub async fn new_with_entries(
graph: ResolvedVc<ModuleGraphLayer>, graph: OperationVc<ModuleGraphLayer>,
is_single_page: bool, is_single_page: bool,
) -> Result<Vc<Self>> { ) -> Result<Vc<Self>> {
let mapped = map_server_actions(*graph); let mapped = map_server_actions(graph);
Ok(ServerActionsGraph { Ok(ServerActionsGraph {
is_single_page, is_single_page,
graph, graph: graph.connect().to_resolved().await?,
data: mapped.to_resolved().await?, data: mapped.to_resolved().await?,
} }
.cell()) .cell())
......
...@@ -21,7 +21,7 @@ use swc_core::{ ...@@ -21,7 +21,7 @@ use swc_core::{
}; };
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ use turbo_tasks::{
FxIndexMap, NonLocalValue, ResolvedVc, TryFlatJoinIterExt, Vc, trace::TraceRawVcs, FxIndexMap, NonLocalValue, OperationVc, ResolvedVc, TryFlatJoinIterExt, Vc, trace::TraceRawVcs,
}; };
use turbo_tasks_fs::{self, File, FileContent, FileSystemPath, rope::RopeBuilder}; use turbo_tasks_fs::{self, File, FileContent, FileSystemPath, rope::RopeBuilder};
use turbopack_core::{ use turbopack_core::{
...@@ -524,8 +524,9 @@ pub struct AllModuleActions( ...@@ -524,8 +524,9 @@ pub struct AllModuleActions(
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn map_server_actions( pub async fn map_server_actions(
graph: ResolvedVc<ModuleGraphLayer>, graph: OperationVc<ModuleGraphLayer>,
) -> Result<Vc<AllModuleActions>> { ) -> Result<Vc<AllModuleActions>> {
let graph = graph.connect();
let actions = graph let actions = graph
.await? .await?
.iter_reachable_modules()? .iter_reachable_modules()?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment