turbopack: Chunking Refactor Step 2 (vercel#56504)

### What?

The second step in our chunking refactoring, this removes our use of Module::as_chunk and Module::as_root_chunk. Instead, the only way to generate a chunk is directly from a root ChunkItem.

### Why?

In the end we want to avoid creating chunks from modules directly, but enforce everything going through the ChunkingContext to be chunked. This allows us to replace the existing chunking algorithm with a much more efficient one that avoid duplication between chunks in first place and doesn't require a post-chunking optimization.

### How?

vercel/turborepo#6120

Re: vercel#56467
Closes WEB-1721

Co-authored-by: Tobias Koppers <1365881+sokra@users.noreply.github.com>

Author: jridgewell

Cargo.lock

@@ -40,11 +40,11 @@ swc_core = { version = "0.83.28", features = [
 testing = { version = "0.34.1" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231005.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.1" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231005.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.1" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231005.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.1" }
 
 # General Deps
 

Cargo.toml

@@ -39,8 +39,9 @@ use turbopack_binding::{
     turbopack::{
         core::{
             asset::{Asset, AssetContent},
-            chunk::{ChunkableModuleExt, ChunkingContext, EvaluatableAssets},
+            chunk::{ChunkingContext, EvaluatableAssets},
             file_source::FileSource,
+            module::Module,
             output::{OutputAsset, OutputAssets},
             virtual_output::VirtualOutputAsset,
         },
@@ -507,7 +508,13 @@ impl AppEndpoint {
         let mut server_assets = vec![];
         let mut client_assets = vec![];
 
+        let app_entry = app_entry.await?;
+
         let client_shared_chunks = get_app_client_shared_chunks(
+            app_entry
+                .rsc_entry
+                .ident()
+                .with_modifier(Vc::cell("client_shared_chunks".to_string())),
             this.app_project.client_runtime_entries(),
             this.app_project.project().client_chunking_context(),
         );
@@ -524,7 +531,6 @@ impl AppEndpoint {
             }
         }
 
-        let app_entry = app_entry.await?;
         let rsc_entry = app_entry.rsc_entry;
 
         let rsc_entry_asset = Vc::upcast(rsc_entry);
@@ -707,9 +713,7 @@ impl AppEndpoint {
                 }
 
                 let files = chunking_context.evaluated_chunk_group(
-                    app_entry
-                        .rsc_entry
-                        .as_root_chunk(Vc::upcast(chunking_context)),
+                    app_entry.rsc_entry.ident(),
                     Vc::cell(evaluatable_assets),
                 );
                 server_assets.extend(files.await?.iter().copied());

packages/next-swc/crates/next-api/src/app.rs

@@ -13,7 +13,7 @@ use turbopack_binding::{
     turbopack::{
         core::{
             asset::AssetContent,
-            chunk::{ChunkableModuleExt, ChunkingContext},
+            chunk::ChunkingContext,
             context::AssetContext,
             module::Module,
             output::{OutputAsset, OutputAssets},
@@ -88,10 +88,8 @@ impl MiddlewareEndpoint {
 
         let edge_chunking_context = self.project.edge_middleware_chunking_context();
 
-        let edge_files = edge_chunking_context.evaluated_chunk_group(
-            module.as_root_chunk(Vc::upcast(edge_chunking_context)),
-            Vc::cell(evaluatable_assets),
-        );
+        let edge_files = edge_chunking_context
+            .evaluated_chunk_group(module.ident(), Vc::cell(evaluatable_assets));
 
         Ok(edge_files)
     }