Unverified Commit 6b0724ba authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: less turbo tasks for `chunk_item.id()` (#76110)

- Every `EcmascriptChunkItem` already had a `chunking_context()` getter via the `ChunkItem` supertrait.
- Produce less turbo tasks for `chunk_item.id()`
- In the future, we really want to move `chunking_context.chunk_item_id()` to the module graph, (or split it out and instead pass a `Vc<ModuleIdStrategy>`). That is however a refactoring we don't need to do right now.

This showed up in the traces, but overall it doesn't seem to have an effect on perf.
Before:
![Bildschirmfoto 2025-02-17 um 09 34 05](https://github.com/user-attachments/assets/99b4816e-9056-418c-8d69-4d6535b9d296)

After:
![Bildschirmfoto 2025-02-17 um 13 43 04](https://github.com/user-attachments/assets/e4409ef6-831e-464f-900c-ec071b916a88)
parent f0887fa0
......@@ -1365,7 +1365,6 @@ impl AppEndpoint {
client_references_chunks,
rsc_app_entry_chunks: **app_entry_chunks,
rsc_app_entry_chunks_availability: Value::new(*app_entry_chunks_availability),
module_graph: *module_graphs.full,
client_chunking_context,
ssr_chunking_context,
next_config: project.next_config(),
......
......@@ -31,8 +31,8 @@ use turbo_tasks::{
};
use turbopack_core::{
chunk::{
availability_info::AvailabilityInfo, ChunkItem, ChunkItemExt, ChunkableModule,
ChunkingContext, ModuleId,
availability_info::AvailabilityInfo, ChunkItem, ChunkableModule, ChunkingContext,
ModuleChunkItemIdExt, ModuleId,
},
module::Module,
module_graph::{ModuleGraph, SingleModuleGraph, SingleModuleGraphModuleNode},
......@@ -83,8 +83,7 @@ pub(crate) async fn collect_next_dynamic_chunks(
let async_chunk_group = async_loader.references().to_resolved().await?;
let module_id = dynamic_entry
.as_chunk_item(module_graph, Vc::upcast(chunking_context))
.id()
.chunk_item_id(Vc::upcast(chunking_context))
.to_resolved()
.await?;
......
......@@ -1647,8 +1647,6 @@ async fn whole_app_module_graph_operation(
let base = ModuleGraph::from_single_graph(base_single_module_graph);
let additional_entries = project.get_all_additional_entries(base);
base.chunk_group_info().await?;
let additional_module_graph = SingleModuleGraph::new_with_entries_visited(
additional_entries.await?.into_iter().map(|m| **m).collect(),
base_visited_modules,
......
......@@ -172,11 +172,6 @@ impl ChunkItem for HmrEntryChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for HmrEntryChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<EcmascriptChunkItemContent>> {
let this = self.module.await?;
......
......@@ -126,11 +126,6 @@ impl ChunkItem for IncludeModulesChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for IncludeModulesChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
fn content(&self) -> Vc<EcmascriptChunkItemContent> {
EcmascriptChunkItemContent {
......
......@@ -336,11 +336,6 @@ impl EcmascriptChunkItem for EcmascriptClientReferenceProxyChunkItem {
self.inner_chunk_item
.content_with_async_module_info(async_module_info)
}
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
EcmascriptChunkItem::chunking_context(*self.inner_chunk_item)
}
}
#[turbo_tasks::value]
......
......@@ -6,7 +6,7 @@ use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkItem, ChunkItemExt, ChunkType, ChunkableModule, ChunkingContext},
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
ident::AssetIdent,
module::Module,
module_graph::ModuleGraph,
......@@ -133,19 +133,13 @@ struct NextDynamicEntryChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for NextDynamicEntryChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<EcmascriptChunkItemContent>> {
let inner = self.inner.await?;
let module_id = inner
.module
.as_chunk_item(*self.module_graph, Vc::upcast(*self.chunking_context))
.id()
.chunk_item_id(Vc::upcast(*self.chunking_context))
.await?;
Ok(EcmascriptChunkItemContent {
inner_code: formatdoc!(
......
......@@ -12,10 +12,9 @@ use turbo_tasks_fs::{File, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
availability_info::AvailabilityInfo, ChunkItemExt, ChunkableModule, ChunkingContext,
ModuleId as TurbopackModuleId,
availability_info::AvailabilityInfo, ChunkableModule, ChunkingContext,
ModuleChunkItemIdExt, ModuleId as TurbopackModuleId,
},
module_graph::ModuleGraph,
output::{OutputAsset, OutputAssets},
virtual_output::VirtualOutputAsset,
};
......@@ -39,7 +38,6 @@ pub struct ClientReferenceManifestOptions {
pub client_references_chunks: Vc<ClientReferencesChunks>,
pub rsc_app_entry_chunks: Vc<OutputAssets>,
pub rsc_app_entry_chunks_availability: Value<AvailabilityInfo>,
pub module_graph: Vc<ModuleGraph>,
pub client_chunking_context: Vc<Box<dyn ChunkingContext>>,
pub ssr_chunking_context: Option<Vc<Box<dyn ChunkingContext>>>,
pub next_config: Vc<NextConfig>,
......@@ -61,7 +59,6 @@ impl ClientReferenceManifest {
client_references_chunks,
rsc_app_entry_chunks,
rsc_app_entry_chunks_availability,
module_graph,
client_chunking_context,
ssr_chunking_context,
next_config,
......@@ -149,13 +146,10 @@ impl ClientReferenceManifest {
let server_path = client_reference_module_ref.server_ident.to_string().await?;
let client_module = client_reference_module_ref.client_module;
let client_chunk_item = client_module
.as_chunk_item(module_graph, Vc::upcast(client_chunking_context))
.to_resolved()
let client_chunk_item_id = client_module
.chunk_item_id(Vc::upcast(client_chunking_context))
.await?;
let client_module_id = client_chunk_item.id().await?;
let (client_chunks_paths, client_is_async) =
if let Some((client_chunks, client_availability_info)) =
client_component_client_chunks.get(&app_client_reference_ty)
......@@ -193,17 +187,13 @@ impl ClientReferenceManifest {
if let Some(ssr_chunking_context) = ssr_chunking_context {
let ssr_module = client_reference_module_ref.ssr_module;
let ssr_chunk_item = ssr_module
.as_chunk_item(module_graph, Vc::upcast(ssr_chunking_context))
.to_resolved()
let ssr_chunk_item_id = ssr_module
.chunk_item_id(Vc::upcast(ssr_chunking_context))
.await?;
let ssr_module_id = ssr_chunk_item.id().await?;
let rsc_chunk_item = client_reference_module
.as_chunk_item(module_graph, Vc::upcast(ssr_chunking_context))
.to_resolved()
let rsc_chunk_item_id = client_reference_module
.chunk_item_id(Vc::upcast(ssr_chunking_context))
.await?;
let rsc_module_id = rsc_chunk_item.id().await?;
let (ssr_chunks_paths, ssr_is_async) = if runtime == NextRuntime::Edge {
// the chunks get added to the middleware-manifest.json instead
......@@ -277,7 +267,7 @@ impl ClientReferenceManifest {
get_client_reference_module_key(&server_path, "*"),
ManifestNodeEntry {
name: "*".into(),
id: (&*client_module_id).into(),
id: (&*client_chunk_item_id).into(),
chunks: client_chunks_paths,
// This should of course be client_is_async, but SSR can become
// async due to ESM externals, and
......@@ -292,7 +282,7 @@ impl ClientReferenceManifest {
"*".into(),
ManifestNodeEntry {
name: "*".into(),
id: (&*ssr_module_id).into(),
id: (&*ssr_chunk_item_id).into(),
chunks: ssr_chunks_paths,
// See above
r#async: client_is_async || ssr_is_async,
......@@ -304,7 +294,7 @@ impl ClientReferenceManifest {
"*".into(),
ManifestNodeEntry {
name: "*".into(),
id: (&*rsc_module_id).into(),
id: (&*rsc_chunk_item_id).into(),
chunks: rsc_chunks_paths,
r#async: rsc_is_async,
},
......@@ -314,18 +304,18 @@ impl ClientReferenceManifest {
NextRuntime::NodeJs => {
entry_manifest
.ssr_module_mapping
.insert((&*client_module_id).into(), ssr_manifest_node);
.insert((&*client_chunk_item_id).into(), ssr_manifest_node);
entry_manifest
.rsc_module_mapping
.insert((&*client_module_id).into(), rsc_manifest_node);
.insert((&*client_chunk_item_id).into(), rsc_manifest_node);
}
NextRuntime::Edge => {
entry_manifest
.edge_ssr_module_mapping
.insert((&*client_module_id).into(), ssr_manifest_node);
.insert((&*client_chunk_item_id).into(), ssr_manifest_node);
entry_manifest
.edge_rsc_module_mapping
.insert((&*client_module_id).into(), rsc_manifest_node);
.insert((&*client_chunk_item_id).into(), rsc_manifest_node);
}
}
}
......
......@@ -7,7 +7,7 @@ use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkItem, ChunkItemExt, ChunkType, ChunkableModule, ChunkingContext},
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
ident::AssetIdent,
module::Module,
module_graph::ModuleGraph,
......@@ -128,19 +128,13 @@ struct NextServerComponentChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for NextServerComponentChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<EcmascriptChunkItemContent>> {
let inner = self.inner.await?;
let module_id = inner
.module
.as_chunk_item(*self.module_graph, Vc::upcast(*self.chunking_context))
.id()
.chunk_item_id(Vc::upcast(*self.chunking_context))
.await?;
Ok(EcmascriptChunkItemContent {
inner_code: formatdoc!(
......
......@@ -7,7 +7,7 @@ use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkItem, ChunkItemExt, ChunkType, ChunkableModule, ChunkingContext},
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
ident::AssetIdent,
module::Module,
module_graph::ModuleGraph,
......@@ -128,19 +128,13 @@ struct NextServerComponentChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for NextServerComponentChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<EcmascriptChunkItemContent>> {
let inner = self.inner.await?;
let module_id = inner
.module
.as_chunk_item(*self.module_graph, Vc::upcast(*self.chunking_context))
.id()
.chunk_item_id(Vc::upcast(*self.chunking_context))
.await?;
Ok(EcmascriptChunkItemContent {
inner_code: formatdoc!(
......
......@@ -9,8 +9,8 @@ use turbo_tasks_fs::{File, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
ChunkData, ChunkItemExt, ChunkableModule, ChunkingContext, ChunksData, EvaluatableAssets,
MinifyType, ModuleId,
ChunkData, ChunkingContext, ChunksData, EvaluatableAssets, MinifyType,
ModuleChunkItemIdExt, ModuleId,
},
code_builder::{Code, CodeBuilder},
ident::AssetIdent,
......@@ -104,15 +104,13 @@ impl EcmascriptDevEvaluateChunk {
.iter()
.map({
let chunking_context = this.chunking_context;
let module_graph = this.module_graph;
move |entry| async move {
if let Some(placeable) =
ResolvedVc::try_sidecast::<Box<dyn EcmascriptChunkPlaceable>>(*entry)
{
Ok(Some(
placeable
.as_chunk_item(*module_graph, Vc::upcast(*chunking_context))
.id()
.chunk_item_id(Vc::upcast(*chunking_context))
.await?,
))
} else {
......
......@@ -224,8 +224,11 @@ pub trait ChunkingContext {
ident: Vc<AssetIdent>,
) -> Result<Vc<ModuleId>>;
fn chunk_item_id(self: Vc<Self>, chunk_item: Vc<Box<dyn ChunkItem>>) -> Vc<ModuleId> {
self.chunk_item_id_from_ident(chunk_item.asset_ident())
fn chunk_item_id(self: Vc<Self>, module: Vc<Box<dyn ChunkItem>>) -> Vc<ModuleId> {
self.chunk_item_id_from_ident(module.asset_ident())
}
fn chunk_item_id_from_module(self: Vc<Self>, module: Vc<Box<dyn Module>>) -> Vc<ModuleId> {
self.chunk_item_id_from_ident(module.ident())
}
}
......
......@@ -347,6 +347,25 @@ where
}
}
pub trait ModuleChunkItemIdExt {
/// Returns the chunk item id of this module.
fn chunk_item_id(
self: Vc<Self>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Vc<ModuleId>;
}
impl<T> ModuleChunkItemIdExt for T
where
T: Upcast<Box<dyn Module>>,
{
fn chunk_item_id(
self: Vc<Self>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Vc<ModuleId> {
chunking_context.chunk_item_id_from_module(Vc::upcast(self))
}
}
#[cfg(test)]
mod tests {
use super::*;
......
......@@ -9,7 +9,7 @@ use turbo_tasks::{FxIndexMap, ResolvedVc, Value, ValueToString, Vc};
use turbo_tasks_fs::{rope::Rope, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkItem, ChunkItemExt, ChunkType, ChunkableModule, ChunkingContext},
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
context::{AssetContext, ProcessResult},
ident::AssetIdent,
issue::{Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString, StyledString},
......@@ -320,11 +320,6 @@ impl ChunkItem for ModuleChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for ModuleChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<EcmascriptChunkItemContent>> {
let classes = self.module.classes().await?;
......@@ -378,8 +373,7 @@ impl EcmascriptChunkItem for ModuleChunkItem {
ResolvedVc::upcast(css_module);
let module_id = placeable
.as_chunk_item(*self.module_graph, Vc::upcast(*self.chunking_context))
.id()
.chunk_item_id(Vc::upcast(*self.chunking_context))
.await?;
let module_id = StringifyJs(&*module_id);
let original_name = StringifyJs(&original_name);
......
......@@ -4,8 +4,8 @@ use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, TryJoinIterExt, Value, Vc};
use turbopack_core::{
chunk::{
ChunkData, ChunkItem, ChunkItemExt, ChunkType, ChunkableModule, ChunkingContext,
ChunkingContextExt, ChunksData,
ChunkData, ChunkItem, ChunkType, ChunkingContext, ChunkingContextExt, ChunksData,
ModuleChunkItemIdExt,
},
ident::AssetIdent,
module::Module,
......@@ -59,11 +59,6 @@ impl AsyncLoaderChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for AsyncLoaderChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(self: Vc<Self>) -> Result<Vc<EcmascriptChunkItemContent>> {
let this = self.await?;
......@@ -74,11 +69,7 @@ impl EcmascriptChunkItem for AsyncLoaderChunkItem {
{
Some(
placeable
.as_chunk_item(
*this.module_graph,
*ResolvedVc::upcast(this.chunking_context),
)
.id()
.chunk_item_id(*ResolvedVc::upcast(this.chunking_context))
.await?,
)
} else {
......
......@@ -7,7 +7,7 @@ use turbo_tasks::{
};
use turbo_tasks_fs::{rope::Rope, FileSystemPath};
use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkItem, ChunkItemExt, ChunkItemTy, ChunkingContext},
chunk::{AsyncModuleInfo, ChunkItem, ChunkItemTy, ChunkingContext},
code_builder::{Code, CodeBuilder},
error::PrettyPrintError,
issue::{code_gen::CodeGenerationIssue, IssueExt, IssueSeverity, StyledString},
......@@ -202,7 +202,6 @@ pub trait EcmascriptChunkItem: ChunkItem {
) -> Vc<EcmascriptChunkItemContent> {
self.content()
}
fn chunking_context(self: Vc<Self>) -> Vc<Box<dyn ChunkingContext>>;
/// Specifies which availablility information the chunk item needs for code
/// generation
......@@ -240,7 +239,11 @@ async fn module_factory_with_code_generation_issue(
{
Ok(factory) => factory,
Err(error) => {
let id = chunk_item.id().to_string().await;
let id = chunk_item
.chunking_context()
.chunk_item_id(Vc::upcast(chunk_item))
.to_string()
.await;
let id = id.as_ref().map_or_else(|_| "unknown", |id| &**id);
let error = error.context(format!(
"An error occurred while generating the chunk item {}",
......
......@@ -167,11 +167,6 @@ impl ChunkGroupFilesChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for ChunkGroupFilesChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(self: Vc<Self>) -> Result<Vc<EcmascriptChunkItemContent>> {
let chunks = self.chunks();
......
......@@ -58,6 +58,7 @@ use swc_core::{
visit::{VisitMutWith, VisitMutWithAstPath},
},
};
use tracing::Instrument;
pub use transform::{
CustomTransformer, EcmascriptInputTransform, EcmascriptInputTransforms, TransformContext,
TransformPlugin, UnsupportedServerActionIssue,
......@@ -709,11 +710,6 @@ impl ChunkItem for ModuleChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for ModuleChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
fn content(self: Vc<Self>) -> Vc<EcmascriptChunkItemContent> {
panic!("content() should not be called");
......@@ -798,49 +794,51 @@ impl EcmascriptModuleContent {
async_module_info,
} = input;
let additional_code_gens = [
if let Some(async_module) = &*async_module.await? {
Some(
async_module
.code_generation(
async_module_info,
references,
module_graph,
chunking_context,
)
.await?,
)
} else {
None
},
if let EcmascriptExports::EsmExports(exports) = *exports.await? {
Some(
exports
.code_generation(module_graph, chunking_context)
.await?,
)
} else {
None
},
];
let (esm_code_gens, additional_code_gens, code_gens) = async {
let additional_code_gens = [
if let Some(async_module) = &*async_module.await? {
Some(
async_module
.code_generation(async_module_info, references, chunking_context)
.await?,
)
} else {
None
},
if let EcmascriptExports::EsmExports(exports) = *exports.await? {
Some(
exports
.code_generation(module_graph, chunking_context)
.await?,
)
} else {
None
},
];
let esm_code_gens = esm_references
.await?
.iter()
.map(|r| r.code_generation(module_graph, chunking_context))
.try_join()
.await?;
let code_gens = code_generation
.await?
.iter()
.map(|c| c.code_generation(module_graph, chunking_context))
.try_join()
.await?;
let esm_code_gens = esm_references
.await?
.iter()
.map(|r| r.code_generation(chunking_context))
.try_join()
.await?;
let code_gens = code_generation
.await?
.iter()
.map(|c| c.code_generation(module_graph, chunking_context))
.try_join()
.await?;
anyhow::Ok((esm_code_gens, additional_code_gens, code_gens))
}
.instrument(tracing::info_span!("precompute code generation"))
.await?;
let code_gens = esm_code_gens
.iter()
.chain(additional_code_gens.iter().flatten())
.chain(code_gens.iter());
gen_content_with_code_gens(
parsed,
ident,
......@@ -849,6 +847,7 @@ impl EcmascriptModuleContent {
generate_source_map,
original_source_map,
)
.instrument(tracing::info_span!("gen content with code gens"))
.await
}
......
......@@ -37,11 +37,6 @@ impl ManifestChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for ManifestChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(self: Vc<Self>) -> Result<Vc<EcmascriptChunkItemContent>> {
let chunks_data = self.chunks_data().await?;
......
......@@ -6,7 +6,8 @@ use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc};
use turbopack_core::{
chunk::{
ChunkData, ChunkItem, ChunkItemExt, ChunkType, ChunkableModule, ChunkingContext, ChunksData,
ChunkData, ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ChunksData,
ModuleChunkItemIdExt,
},
ident::AssetIdent,
module::Module,
......@@ -130,11 +131,6 @@ impl ChunkItem for ManifestLoaderChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for ManifestLoaderChunkItem {
#[turbo_tasks::function]
async fn chunking_context(&self) -> Result<Vc<Box<dyn ChunkingContext>>> {
Ok(*self.manifest.await?.chunking_context)
}
#[turbo_tasks::function]
async fn content(self: Vc<Self>) -> Result<Vc<EcmascriptChunkItemContent>> {
let this = &*self.await?;
......@@ -152,11 +148,7 @@ impl EcmascriptChunkItem for ManifestLoaderChunkItem {
// exports a promise for all of the necessary chunk loads.
let item_id = &*this
.manifest
.as_chunk_item(
*this.module_graph,
*ResolvedVc::upcast(manifest.chunking_context),
)
.id()
.chunk_item_id(*ResolvedVc::upcast(manifest.chunking_context))
.await?;
// Finally, we need the id of the module that we're actually trying to
......@@ -165,11 +157,7 @@ impl EcmascriptChunkItem for ManifestLoaderChunkItem {
ResolvedVc::try_downcast::<Box<dyn EcmascriptChunkPlaceable>>(manifest.inner)
.ok_or_else(|| anyhow!("asset is not placeable in ecmascript chunk"))?;
let dynamic_id = &*placeable
.as_chunk_item(
*this.module_graph,
*ResolvedVc::upcast(manifest.chunking_context),
)
.id()
.chunk_item_id(*ResolvedVc::upcast(manifest.chunking_context))
.await?;
// This is the code that will be executed when the dynamic import is reached.
......
......@@ -157,7 +157,7 @@ impl AmdDefineWithDependenciesCodeGen {
pub async fn code_generation(
&self,
module_graph: Vc<ModuleGraph>,
_module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<CodeGeneration> {
let mut visitors = Vec::new();
......@@ -174,7 +174,6 @@ impl AmdDefineWithDependenciesCodeGen {
pattern_mapping: PatternMapping::resolve_request(
**request,
*self.origin,
module_graph,
Vc::upcast(chunking_context),
cjs_resolve(
*self.origin,
......
......@@ -11,7 +11,6 @@ use turbo_tasks::{
};
use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkableModuleReference, ChunkingContext, ChunkingType},
module_graph::ModuleGraph,
reference::{ModuleReference, ModuleReferences},
resolve::ExternalType,
};
......@@ -103,7 +102,6 @@ impl AsyncModule {
&self,
async_module_info: Vc<AsyncModuleInfo>,
references: Vc<ModuleReferences>,
module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Vc<AsyncModuleIdents>> {
let async_module_info = async_module_info.await?;
......@@ -118,9 +116,7 @@ impl AsyncModule {
Ok(match &*referenced_asset {
ReferencedAsset::External(_, ExternalType::EcmaScriptModule) => {
if self.import_externals {
referenced_asset
.get_ident(module_graph, chunking_context)
.await?
referenced_asset.get_ident(chunking_context).await?
} else {
None
}
......@@ -130,9 +126,7 @@ impl AsyncModule {
.referenced_async_modules
.contains(&ResolvedVc::upcast(*placeable))
{
referenced_asset
.get_ident(module_graph, chunking_context)
.await?
referenced_asset.get_ident(chunking_context).await?
} else {
None
}
......@@ -197,17 +191,11 @@ impl AsyncModule {
self: Vc<Self>,
async_module_info: Option<Vc<AsyncModuleInfo>>,
references: Vc<ModuleReferences>,
module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<CodeGeneration> {
if let Some(async_module_info) = async_module_info {
let async_idents = self
.get_async_idents(
async_module_info,
references,
module_graph,
chunking_context,
)
.get_async_idents(async_module_info, references, chunking_context)
.await?;
if !async_idents.is_empty() {
......
......@@ -157,7 +157,7 @@ pub struct CjsRequireAssetReferenceCodeGen {
impl CjsRequireAssetReferenceCodeGen {
pub async fn code_generation(
&self,
module_graph: Vc<ModuleGraph>,
_module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<CodeGeneration> {
let reference = self.reference.await?;
......@@ -165,7 +165,6 @@ impl CjsRequireAssetReferenceCodeGen {
let pm = PatternMapping::resolve_request(
*reference.request,
*reference.origin,
module_graph,
Vc::upcast(chunking_context),
self.reference.resolve_reference(),
ResolveType::ChunkItem,
......@@ -276,7 +275,7 @@ pub struct CjsRequireResolveAssetReferenceCodeGen {
impl CjsRequireResolveAssetReferenceCodeGen {
pub async fn code_generation(
&self,
module_graph: Vc<ModuleGraph>,
_module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<CodeGeneration> {
let reference = self.reference.await?;
......@@ -284,7 +283,6 @@ impl CjsRequireResolveAssetReferenceCodeGen {
let pm = PatternMapping::resolve_request(
*reference.request,
*reference.origin,
module_graph,
Vc::upcast(chunking_context),
self.reference.resolve_reference(),
ResolveType::ChunkItem,
......
......@@ -10,15 +10,14 @@ use turbo_tasks::{ResolvedVc, Value, ValueToString, Vc};
use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
chunk::{
ChunkItemExt, ChunkableModule, ChunkableModuleReference, ChunkingContext, ChunkingType,
ChunkingTypeOption,
ChunkableModuleReference, ChunkingContext, ChunkingType, ChunkingTypeOption,
ModuleChunkItemIdExt,
},
issue::{
Issue, IssueExt, IssueSeverity, IssueSource, IssueStage, OptionIssueSource,
OptionStyledString, StyledString,
},
module::Module,
module_graph::ModuleGraph,
reference::ModuleReference,
reference_type::{EcmaScriptModulesReferenceSubType, ImportWithType},
resolve::{
......@@ -52,12 +51,11 @@ pub enum ReferencedAsset {
impl ReferencedAsset {
pub async fn get_ident(
&self,
module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<Option<String>> {
Ok(match self {
ReferencedAsset::Some(asset) => {
Some(Self::get_ident_from_placeable(asset, module_graph, chunking_context).await?)
Some(Self::get_ident_from_placeable(asset, chunking_context).await?)
}
ReferencedAsset::External(request, ty) => Some(magic_identifier::mangle(&format!(
"{ty} external {request}"
......@@ -68,13 +66,9 @@ impl ReferencedAsset {
pub(crate) async fn get_ident_from_placeable(
asset: &Vc<Box<dyn EcmascriptChunkPlaceable>>,
module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<String> {
let id = asset
.as_chunk_item(module_graph, Vc::upcast(chunking_context))
.id()
.await?;
let id = asset.chunk_item_id(Vc::upcast(chunking_context)).await?;
Ok(magic_identifier::mangle(&format!("imported module {}", id)))
}
}
......@@ -258,7 +252,6 @@ impl ChunkableModuleReference for EsmAssetReference {
impl EsmAssetReference {
pub async fn code_generation(
self: Vc<Self>,
module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<CodeGeneration> {
let this = &*self.await?;
......@@ -276,10 +269,7 @@ impl EsmAssetReference {
span: DUMMY_SP,
});
Some((format!("throw {request}").into(), stmt))
} else if let Some(ident) = referenced_asset
.get_ident(module_graph, chunking_context)
.await?
{
} else if let Some(ident) = referenced_asset.get_ident(chunking_context).await? {
let span = this
.issue_source
.to_swc_offsets()
......@@ -292,10 +282,7 @@ impl EsmAssetReference {
unreachable!()
}
ReferencedAsset::Some(asset) => {
let id = asset
.as_chunk_item(module_graph, Vc::upcast(chunking_context))
.id()
.await?;
let id = asset.chunk_item_id(Vc::upcast(chunking_context)).await?;
let name = ident;
Some((
id.to_string().into(),
......
......@@ -43,17 +43,14 @@ impl EsmBinding {
pub async fn code_generation(
&self,
module_graph: Vc<ModuleGraph>,
_module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<CodeGeneration> {
let mut visitors = vec![];
let export = self.export.clone();
let imported_module = self.reference.get_referenced_asset();
let imported_module = imported_module
.await?
.get_ident(module_graph, chunking_context)
.await?;
let imported_module = imported_module.await?.get_ident(chunking_context).await?;
let mut ast_path = self.ast_path.0.clone();
loop {
......
......@@ -132,7 +132,7 @@ pub struct EsmAsyncAssetReferenceCodeGen {
impl EsmAsyncAssetReferenceCodeGen {
pub async fn code_generation(
&self,
module_graph: Vc<ModuleGraph>,
_module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<CodeGeneration> {
let reference = self.reference.await?;
......@@ -140,7 +140,6 @@ impl EsmAsyncAssetReferenceCodeGen {
let pm = PatternMapping::resolve_request(
*reference.request,
*reference.origin,
module_graph,
Vc::upcast(chunking_context),
self.reference.resolve_reference(),
if matches!(
......
......@@ -492,19 +492,16 @@ impl EsmExports {
impl EsmExports {
pub async fn code_generation(
self: Vc<Self>,
module_graph: Vc<ModuleGraph>,
_module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<CodeGeneration> {
let expanded = self.expand_exports().await?;
let mut dynamic_exports = Vec::<Box<Expr>>::new();
for dynamic_export_asset in &expanded.dynamic_exports {
let ident = ReferencedAsset::get_ident_from_placeable(
dynamic_export_asset,
module_graph,
chunking_context,
)
.await?;
let ident =
ReferencedAsset::get_ident_from_placeable(dynamic_export_asset, chunking_context)
.await?;
dynamic_exports.push(quote_expr!(
"$turbopack_dynamic($arg)",
......@@ -546,7 +543,6 @@ impl EsmExports {
let referenced_asset =
ReferencedAsset::from_resolve_result(esm_ref.resolve_reference()).await?;
referenced_asset.get_ident(
module_graph,
chunking_context
).await?.map(|ident| {
let expr = MemberExpr {
......@@ -588,7 +584,7 @@ impl EsmExports {
let referenced_asset =
ReferencedAsset::from_resolve_result(esm_ref.resolve_reference()).await?;
referenced_asset
.get_ident(module_graph, chunking_context)
.get_ident(chunking_context)
.await?
.map(|ident| {
quote!(
......
......@@ -6,10 +6,7 @@ use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ResolvedVc, ValueToString, Vc,
};
use turbopack_core::{
chunk::{
ChunkItemExt, ChunkableModule, ChunkableModuleReference, ChunkingContext,
ChunkingTypeOption,
},
chunk::{ChunkableModuleReference, ChunkingContext, ChunkingTypeOption, ModuleChunkItemIdExt},
module_graph::ModuleGraph,
reference::ModuleReference,
resolve::ModuleResolveResult,
......@@ -86,7 +83,7 @@ pub struct EsmModuleIdAssetReferenceCodeGen {
impl EsmModuleIdAssetReferenceCodeGen {
pub async fn code_generation(
&self,
module_graph: Vc<ModuleGraph>,
_module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<CodeGeneration> {
let mut visitors = Vec::new();
......@@ -94,10 +91,7 @@ impl EsmModuleIdAssetReferenceCodeGen {
if let ReferencedAsset::Some(asset) =
&*self.reference.await?.inner.get_referenced_asset().await?
{
let id = asset
.as_chunk_item(module_graph, Vc::upcast(chunking_context))
.id()
.await?;
let id = asset.chunk_item_id(Vc::upcast(chunking_context)).await?;
let id = module_id_to_lit(&id);
visitors.push(create_visitor!(self.path, visit_mut_expr(expr: &mut Expr) {
*expr = id.clone()
......
......@@ -11,8 +11,8 @@ use turbo_tasks::{
};
use turbopack_core::{
chunk::{
ChunkItemExt, ChunkableModule, ChunkableModuleReference, ChunkingContext, ChunkingType,
ChunkingTypeOption,
ChunkableModuleReference, ChunkingContext, ChunkingType, ChunkingTypeOption,
ModuleChunkItemIdExt,
},
environment::Rendering,
issue::IssueSource,
......@@ -170,7 +170,7 @@ impl UrlAssetReferenceCodeGen {
*/
pub async fn code_generation(
&self,
module_graph: Vc<ModuleGraph>,
_module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<CodeGeneration> {
let mut visitors = vec![];
......@@ -191,10 +191,7 @@ impl UrlAssetReferenceCodeGen {
ReferencedAsset::Some(asset) => {
// We rewrite the first `new URL()` arguments to be a require() of the chunk
// item, which exports the static asset path to the linked file.
let id = asset
.as_chunk_item(module_graph, Vc::upcast(chunking_context))
.id()
.await?;
let id = asset.chunk_item_id(Vc::upcast(chunking_context)).await?;
visitors.push(create_visitor!(self.path, visit_mut_expr(new_expr: &mut Expr) {
let should_rewrite_to_relative = if let Expr::New(NewExpr { args: Some(args), .. }) = new_expr {
......@@ -259,10 +256,7 @@ impl UrlAssetReferenceCodeGen {
ReferencedAsset::Some(asset) => {
// We rewrite the first `new URL()` arguments to be a require() of the
// chunk item, which returns the asset path as its exports.
let id = asset
.as_chunk_item(module_graph, Vc::upcast(chunking_context))
.id()
.await?;
let id = asset.chunk_item_id(Vc::upcast(chunking_context)).await?;
// If there's a rewrite to the base url, then the current rendering
// environment should able to resolve the asset path
......
......@@ -245,11 +245,6 @@ impl ChunkItem for CachedExternalModuleChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for CachedExternalModuleChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
fn content(self: Vc<Self>) -> Vc<EcmascriptChunkItemContent> {
panic!("content() should not be called");
......
......@@ -16,12 +16,11 @@ use turbo_tasks::{
TryJoinIterExt, Vc,
};
use turbopack_core::{
chunk::{ChunkItemExt, ChunkableModule, ChunkingContext, ModuleId},
chunk::{ChunkableModule, ChunkingContext, ModuleChunkItemIdExt, ModuleId},
issue::{
code_gen::CodeGenerationIssue, module::emit_unknown_module_type_error, IssueExt,
IssueSeverity, StyledString,
},
module_graph::ModuleGraph,
resolve::{
origin::ResolveOrigin, parse::Request, ExternalType, ModuleResolveResult,
ModuleResolveResultItem,
......@@ -321,7 +320,6 @@ impl PatternMapping {
async fn to_single_pattern_mapping(
origin: Vc<Box<dyn ResolveOrigin>>,
module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
resolve_item: &ModuleResolveResultItem,
resolve_type: ResolveType,
......@@ -374,8 +372,8 @@ async fn to_single_pattern_mapping(
return Ok(SinglePatternMapping::ModuleLoader(loader_id.owned().await?));
}
ResolveType::ChunkItem => {
let chunk_item = chunkable.as_chunk_item(module_graph, chunking_context);
return Ok(SinglePatternMapping::Module(chunk_item.id().owned().await?));
let item_id = chunkable.chunk_item_id(chunking_context);
return Ok(SinglePatternMapping::Module(item_id.owned().await?));
}
}
}
......@@ -402,7 +400,6 @@ impl PatternMapping {
pub async fn resolve_request(
request: Vc<Request>,
origin: Vc<Box<dyn ResolveOrigin>>,
module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
resolve_result: Vc<ModuleResolveResult>,
resolve_type: ResolveType,
......@@ -415,14 +412,9 @@ impl PatternMapping {
.cell()),
1 => {
let resolve_item = result.primary.first().unwrap().1;
let single_pattern_mapping = to_single_pattern_mapping(
origin,
module_graph,
chunking_context,
resolve_item,
resolve_type,
)
.await?;
let single_pattern_mapping =
to_single_pattern_mapping(origin, chunking_context, resolve_item, resolve_type)
.await?;
Ok(PatternMapping::Single(single_pattern_mapping).cell())
}
_ => {
......@@ -435,14 +427,9 @@ impl PatternMapping {
set.insert(request).then(|| (request.to_string(), v))
})
.map(|(k, v)| async move {
let single_pattern_mapping = to_single_pattern_mapping(
origin,
module_graph,
chunking_context,
v,
resolve_type,
)
.await?;
let single_pattern_mapping =
to_single_pattern_mapping(origin, chunking_context, v, resolve_type)
.await?;
Ok((k, single_pattern_mapping))
})
.try_join()
......
......@@ -22,8 +22,8 @@ use turbo_tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
ChunkItem, ChunkItemExt, ChunkType, ChunkableModule, ChunkableModuleReference,
ChunkingContext,
ChunkItem, ChunkType, ChunkableModule, ChunkableModuleReference, ChunkingContext,
ModuleChunkItemIdExt,
},
ident::AssetIdent,
issue::IssueSource,
......@@ -311,15 +311,15 @@ pub struct RequireContextAssetReferenceCodeGen {
impl RequireContextAssetReferenceCodeGen {
pub async fn code_generation(
&self,
module_graph: Vc<ModuleGraph>,
_module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<CodeGeneration> {
let chunk_item = self
let module_id = self
.reference
.await?
.inner
.as_chunk_item(module_graph, Vc::upcast(chunking_context));
let module_id = chunk_item.id().owned().await?;
.chunk_item_id(Vc::upcast(chunking_context))
.await?;
let mut visitors = Vec::new();
......@@ -457,11 +457,6 @@ pub struct RequireContextChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for RequireContextChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<EcmascriptChunkItemContent>> {
let map = &*self.map.await?;
......@@ -475,7 +470,6 @@ impl EcmascriptChunkItem for RequireContextChunkItem {
let pm = PatternMapping::resolve_request(
*entry.request,
*self.origin,
*self.module_graph,
*ResolvedVc::upcast(self.chunking_context),
*entry.result,
ResolveType::ChunkItem,
......
......@@ -76,7 +76,6 @@ impl EcmascriptChunkItem for EcmascriptModuleFacadeChunkItem {
.code_generation(
async_module_info,
self.module.references(),
*self.module_graph,
*chunking_context,
)
.await?,
......@@ -117,11 +116,6 @@ impl EcmascriptChunkItem for EcmascriptModuleFacadeChunkItem {
}
.cell())
}
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
}
#[turbo_tasks::value_impl]
......
......@@ -82,7 +82,7 @@ impl EcmascriptModuleFacadeModule {
.esm_evaluation_references
.await?
.iter()
.map(|r| r.code_generation(module_graph, chunking_context))
.map(|r| r.code_generation(chunking_context))
.try_join()
.await?;
code_gens.push(
......@@ -106,7 +106,7 @@ impl EcmascriptModuleFacadeModule {
.esm_reexport_references
.await?
.iter()
.map(|r| r.code_generation(module_graph, chunking_context))
.map(|r| r.code_generation(chunking_context))
.try_join()
.await?;
code_gens.push(
......
......@@ -76,11 +76,6 @@ impl EcmascriptChunkItem for EcmascriptModuleLocalsChunkItem {
async_module_options,
))
}
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
}
#[turbo_tasks::value_impl]
......
......@@ -4,8 +4,8 @@ use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbopack_core::{
chunk::{
ChunkItemExt, ChunkableModule, ChunkableModuleReference, ChunkingContext, ChunkingType,
ChunkingTypeOption,
ChunkableModuleReference, ChunkingContext, ChunkingType, ChunkingTypeOption,
ModuleChunkItemIdExt,
},
module::Module,
module_graph::ModuleGraph,
......@@ -112,23 +112,20 @@ impl ChunkableModuleReference for EcmascriptModulePartReference {
impl EcmascriptModulePartReference {
pub async fn code_generation(
self: Vc<Self>,
module_graph: Vc<ModuleGraph>,
_module_graph: Vc<ModuleGraph>,
chunking_context: Vc<Box<dyn ChunkingContext>>,
) -> Result<CodeGeneration> {
let referenced_asset = ReferencedAsset::from_resolve_result(self.resolve_reference());
let referenced_asset = referenced_asset.await?;
let ident = referenced_asset
.get_ident(module_graph, chunking_context)
.get_ident(chunking_context)
.await?
.context("part module reference should have an ident")?;
let ReferencedAsset::Some(module) = *referenced_asset else {
bail!("part module reference should have an module reference");
};
let id = module
.as_chunk_item(module_graph, Vc::upcast(chunking_context))
.id()
.await?;
let id = module.chunk_item_id(Vc::upcast(chunking_context)).await?;
Ok(CodeGeneration::hoisted_stmt(
ident.clone().into(),
......
......@@ -2,9 +2,7 @@ use anyhow::Result;
use turbo_tasks::{ResolvedVc, ValueDefault, Vc};
use turbo_tasks_fs::rope::RopeBuilder;
use turbopack_core::{
chunk::{
AsyncModuleInfo, ChunkItem, ChunkItemExt, ChunkType, ChunkableModule, ChunkingContext,
},
chunk::{AsyncModuleInfo, ChunkItem, ChunkType, ChunkingContext, ModuleChunkItemIdExt},
ident::AssetIdent,
module::Module,
module_graph::ModuleGraph,
......@@ -85,11 +83,6 @@ impl EcmascriptChunkItem for EcmascriptModulePartChunkItem {
async_module_options,
))
}
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
}
#[turbo_tasks::value_impl]
......@@ -175,12 +168,7 @@ impl EcmascriptChunkItem for SideEffectsModuleChunkItem {
format!(
"{}{TURBOPACK_IMPORT}({});\n",
if need_await { "await " } else { "" },
StringifyModuleId(
&*side_effect
.as_chunk_item(*self.module_graph, *self.chunking_context)
.id()
.await?
)
StringifyModuleId(&*side_effect.chunk_item_id(*self.chunking_context).await?)
)
.as_bytes(),
);
......@@ -192,8 +180,7 @@ impl EcmascriptChunkItem for SideEffectsModuleChunkItem {
StringifyModuleId(
&*module
.resolved_as
.as_chunk_item(*self.module_graph, *self.chunking_context)
.id()
.chunk_item_id(*self.chunking_context)
.await?
)
)
......@@ -222,9 +209,4 @@ impl EcmascriptChunkItem for SideEffectsModuleChunkItem {
}
.cell())
}
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
}
......@@ -73,11 +73,6 @@ impl WorkerLoaderChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for WorkerLoaderChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(self: Vc<Self>) -> Result<Vc<EcmascriptChunkItemContent>> {
let chunks_data = self.chunks_data().await?;
......
......@@ -121,11 +121,6 @@ impl ChunkItem for JsonChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for JsonChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<EcmascriptChunkItemContent>> {
// We parse to JSON and then stringify again to ensure that the
......
......@@ -7,7 +7,7 @@ use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{File, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkItemExt, ChunkableModule, ChunkingContext, EvaluatableAssets},
chunk::{ChunkingContext, EvaluatableAssets, ModuleChunkItemIdExt},
code_builder::{Code, CodeBuilder},
module_graph::ModuleGraph,
output::{OutputAsset, OutputAssets},
......@@ -115,8 +115,7 @@ impl EcmascriptBuildNodeEntryChunk {
ResolvedVc::try_sidecast::<Box<dyn EcmascriptChunkPlaceable>>(*evaluatable_asset)
{
let runtime_module_id = placeable
.as_chunk_item(*this.module_graph, Vc::upcast(*this.chunking_context))
.id()
.chunk_item_id(Vc::upcast(*this.chunking_context))
.await?;
writedoc!(
......@@ -131,8 +130,7 @@ impl EcmascriptBuildNodeEntryChunk {
let runtime_module_id = this
.exported_module
.as_chunk_item(*this.module_graph, Vc::upcast(*this.chunking_context))
.id()
.chunk_item_id(Vc::upcast(*this.chunking_context))
.await?;
writedoc!(
......
......@@ -148,11 +148,6 @@ impl ChunkItem for ModuleChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for ModuleChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<EcmascriptChunkItemContent>> {
Ok(EcmascriptChunkItemContent {
......
......@@ -242,11 +242,6 @@ impl ChunkItem for ModuleChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for ModuleChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
fn content(self: Vc<Self>) -> Vc<EcmascriptChunkItemContent> {
panic!("content() should not be called");
......
......@@ -142,11 +142,6 @@ impl ChunkItem for RawModuleChunkItem {
#[turbo_tasks::value_impl]
impl EcmascriptChunkItem for RawModuleChunkItem {
#[turbo_tasks::function]
fn chunking_context(&self) -> Vc<Box<dyn ChunkingContext>> {
*self.chunking_context
}
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<EcmascriptChunkItemContent>> {
let path = self.wasm_asset.path().await?;
......
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