From 9b23685a31a0dc314ba97373f36af3c549544996 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 14 Feb 2025 13:11:19 +0100 Subject: [PATCH] make `make_chunks` a non-turbo-tasks-function --- .../crates/turbopack-core/src/chunk/chunk_group.rs | 3 +-- .../crates/turbopack-core/src/chunk/chunking/mod.rs | 12 +++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/turbopack/crates/turbopack-core/src/chunk/chunk_group.rs b/turbopack/crates/turbopack-core/src/chunk/chunk_group.rs index 9fb86bb01e487..f2287176a7dfb 100644 --- a/turbopack/crates/turbopack-core/src/chunk/chunk_group.rs +++ b/turbopack/crates/turbopack-core/src/chunk/chunk_group.rs @@ -229,11 +229,10 @@ pub async fn make_chunk_group( let chunks = make_chunks( module_graph, *chunking_context, - Vc::cell(chunk_items), + chunk_items, "".into(), Vc::cell(referenced_output_assets), ) - .owned() .await?; Ok(MakeChunkGroupResult { diff --git a/turbopack/crates/turbopack-core/src/chunk/chunking/mod.rs b/turbopack/crates/turbopack-core/src/chunk/chunking/mod.rs index ba434be8214b5..0ca2c4f54814d 100644 --- a/turbopack/crates/turbopack-core/src/chunk/chunking/mod.rs +++ b/turbopack/crates/turbopack-core/src/chunk/chunking/mod.rs @@ -9,8 +9,8 @@ use turbo_rcstr::RcStr; use turbo_tasks::{FxIndexMap, ReadRef, ResolvedVc, TryJoinIterExt, ValueToString, Vc}; use super::{ - AsyncModuleInfo, Chunk, ChunkItem, ChunkItemTy, ChunkItemWithAsyncModuleInfo, - ChunkItemsWithAsyncModuleInfo, ChunkType, ChunkingContext, Chunks, + AsyncModuleInfo, Chunk, ChunkItem, ChunkItemTy, ChunkItemWithAsyncModuleInfo, ChunkType, + ChunkingContext, }; use crate::{ chunk::{ @@ -47,17 +47,15 @@ async fn chunk_item_info( /// Creates chunks based on heuristics for the passed `chunk_items`. Also /// attaches `referenced_output_assets` to the first chunk. -#[turbo_tasks::function] pub async fn make_chunks( module_graph: Vc, chunking_context: Vc>, - chunk_items: Vc, + chunk_items: Vec, key_prefix: RcStr, mut referenced_output_assets: Vc, -) -> Result> { +) -> Result>>> { let chunking_configs = &*chunking_context.chunking_configs().await?; - let chunk_items = chunk_items.await?; let chunk_items = chunk_items .iter() .map(|c| async move { @@ -154,7 +152,7 @@ pub async fn make_chunks( .try_join() .await?; - Ok(Vc::cell(resolved_chunks)) + Ok(resolved_chunks) } struct ChunkItemWithInfo {