Skip to content

[Turbopack] Remove ssr-data module context #83626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 12, 2025
Merged

[Turbopack] Remove ssr-data module context #83626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f743ae
Remove RuntimeEntries this is a complicated and expensive way to pass…
lukesandberg Sep 9, 2025
0b1b0ed
change how pagesdata entrypoints are created
lukesandberg Sep 9, 2025
f43a38b
Attempt #3 at code review feedback
lukesandberg Sep 12, 2025
64cfab9
Simplify the conditions a bit and remove a redundant flatten
lukesandberg Sep 12, 2025
3b341b4
Propagate the query parameter to all the inner processed assets
lukesandberg Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 5 additions & 34 deletions crates/next-api/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ use next_core::{
get_app_page_entry, get_app_route_entry, metadata::route::get_app_metadata_route_entry,
},
next_client::{
ClientContextType, RuntimeEntries, get_client_module_options_context,
get_client_resolve_options_context, get_client_runtime_entries,
ClientContextType, get_client_module_options_context, get_client_resolve_options_context,
get_client_runtime_entries,
},
next_client_reference::{
ClientReferenceGraphResult, NextCssClientReferenceTransition,
Expand All @@ -29,7 +29,6 @@ use next_core::{
},
next_server::{
ServerContextType, get_server_module_options_context, get_server_resolve_options_context,
get_server_runtime_entries,
},
next_server_utility::{NEXT_SERVER_UTILITY_MERGE_TAG, NextServerUtilityTransition},
parse_segment_config_from_source,
Expand Down Expand Up @@ -778,26 +777,6 @@ impl AppProject {
))
}

#[turbo_tasks::function]
async fn runtime_entries(self: Vc<Self>) -> Result<Vc<RuntimeEntries>> {
Ok(get_server_runtime_entries(
self.rsc_ty().owned().await?,
self.project().next_mode(),
))
}

#[turbo_tasks::function]
fn rsc_runtime_entries(self: Vc<Self>) -> Vc<EvaluatableAssets> {
self.runtime_entries()
.resolve_entries(Vc::upcast(self.rsc_module_context()))
}

#[turbo_tasks::function]
fn edge_rsc_runtime_entries(self: Vc<Self>) -> Vc<EvaluatableAssets> {
self.runtime_entries()
.resolve_entries(Vc::upcast(self.edge_rsc_module_context()))
}

#[turbo_tasks::function]
fn client_env(self: Vc<Self>) -> Vc<Box<dyn ProcessEnv>> {
Vc::upcast(CustomProcessEnv::new(
Expand Down Expand Up @@ -1780,17 +1759,11 @@ impl AppEndpoint {
)
.await?;

let edge_rsc_runtime_entries = this.app_project.edge_rsc_runtime_entries().await?;
let evaluatable_assets = edge_rsc_runtime_entries
.iter()
.map(|m| ResolvedVc::upcast(*m))
.chain(std::iter::once(app_entry.rsc_entry));

assets.concatenate(
chunking_context
.evaluated_chunk_group_assets(
app_entry.rsc_entry.ident(),
ChunkGroup::Entry(evaluatable_assets.collect()),
ChunkGroup::Entry(vec![app_entry.rsc_entry]),
module_graph,
availability_info,
)
Expand All @@ -1799,13 +1772,11 @@ impl AppEndpoint {
)
}
NextRuntime::NodeJs => {
let mut evaluatable_assets = this.app_project.rsc_runtime_entries().owned().await?;

let Some(rsc_entry) = ResolvedVc::try_downcast(app_entry.rsc_entry) else {
bail!("rsc_entry must be evaluatable");
};

evaluatable_assets.push(rsc_entry);
let evaluatable_assets = Vc::cell(vec![rsc_entry]);

async {
let mut current_chunks = OutputAssets::empty();
Expand Down Expand Up @@ -1909,7 +1880,7 @@ impl AppEndpoint {
"app{original_name}.js",
original_name = app_entry.original_name
))?,
Vc::cell(evaluatable_assets),
evaluatable_assets,
module_graph,
current_chunks,
current_availability_info,
Expand Down
31 changes: 2 additions & 29 deletions crates/next-api/src/instrumentation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use next_core::{
all_assets_from_entries,
next_edge::entry::wrap_edge_entry,
next_manifests::{InstrumentationDefinition, MiddlewaresManifestV2},
next_server::{ServerContextType, get_server_runtime_entries},
};
use tracing::Instrument;
use turbo_rcstr::{RcStr, rcstr};
Expand Down Expand Up @@ -104,26 +103,10 @@ impl InstrumentationEndpoint {

let module_graph = this.project.module_graph(*module);

let evaluatable_assets = get_server_runtime_entries(
ServerContextType::Instrumentation {
app_dir: this.app_dir.clone(),
ecmascript_client_reference_transition_name: this
.ecmascript_client_reference_transition_name
.clone(),
},
this.project.next_mode(),
)
.resolve_entries(*this.asset_context)
.await?
.iter()
.map(|m| ResolvedVc::upcast(*m))
.chain(std::iter::once(module))
.collect();

let edge_chunking_context = this.project.edge_chunking_context(false);
let edge_files: Vc<OutputAssets> = edge_chunking_context.evaluated_chunk_group_assets(
module.ident(),
ChunkGroup::Entry(evaluatable_assets),
ChunkGroup::Entry(vec![module]),
module_graph,
AvailabilityInfo::Root,
);
Expand All @@ -150,17 +133,7 @@ impl InstrumentationEndpoint {
.node_root()
.await?
.join("server/instrumentation.js")?,
get_server_runtime_entries(
ServerContextType::Instrumentation {
app_dir: this.app_dir.clone(),
ecmascript_client_reference_transition_name: this
.ecmascript_client_reference_transition_name
.clone(),
},
this.project.next_mode(),
)
.resolve_entries(*this.asset_context)
.with_entry(*module),
Vc::cell(vec![module]),
module_graph,
OutputAssets::empty(),
AvailabilityInfo::Root,
Expand Down
31 changes: 2 additions & 29 deletions crates/next-api/src/middleware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use next_core::{
middleware::get_middleware_module,
next_edge::entry::wrap_edge_entry,
next_manifests::{EdgeFunctionDefinition, MiddlewareMatcher, MiddlewaresManifestV2, Regions},
next_server::{ServerContextType, get_server_runtime_entries},
parse_segment_config_from_source,
segment_config::ParseSegmentMode,
util::{MiddlewareMatcherKind, NextRuntime},
Expand Down Expand Up @@ -111,26 +110,10 @@ impl MiddlewareEndpoint {

let module_graph = this.project.module_graph(*module);

let evaluatable_assets = get_server_runtime_entries(
ServerContextType::Middleware {
app_dir: this.app_dir.clone(),
ecmascript_client_reference_transition_name: this
.ecmascript_client_reference_transition_name
.clone(),
},
this.project.next_mode(),
)
.resolve_entries(*this.asset_context)
.await?
.iter()
.map(|m| ResolvedVc::upcast(*m))
.chain(std::iter::once(module))
.collect();

let edge_chunking_context = this.project.edge_chunking_context(false);
let edge_files = edge_chunking_context.evaluated_chunk_group_assets(
module.ident(),
ChunkGroup::Entry(evaluatable_assets),
ChunkGroup::Entry(vec![module]),
module_graph,
AvailabilityInfo::Root,
);
Expand All @@ -156,17 +139,7 @@ impl MiddlewareEndpoint {
.node_root()
.await?
.join("server/middleware.js")?,
get_server_runtime_entries(
ServerContextType::Middleware {
app_dir: this.app_dir.clone(),
ecmascript_client_reference_transition_name: this
.ecmascript_client_reference_transition_name
.clone(),
},
this.project.next_mode(),
)
.resolve_entries(*this.asset_context)
.with_entry(*module),
Vc::cell(vec![module]),
module_graph,
OutputAssets::empty(),
AvailabilityInfo::Root,
Expand Down
Loading
Loading