Unverified Commit c6f5089e authored by Justin Ridgewell's avatar Justin Ridgewell Committed by GitHub

turbopack: Extract as_chunk into shared ChunkType trait (#56506)

### What?

Step 3 in our chunking refactors extracts ChunkItem::as_chunk into a new ChunkType trait. This new trait isn't useful yet, but will eventually allow us to collect ChunkItems of a similar type into a lists, and perform chunking over all similar items at once.

### 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?

https://github.com/vercel/turbo/pull/6123

Re: https://github.com/vercel/next.js/pull/56504

Closes WEB-1724
Co-authored-by: 's avatarTobias Koppers <1365881+sokra@users.noreply.github.com>
parent bc15b580
This diff is collapsed.
...@@ -40,11 +40,11 @@ swc_core = { version = "0.83.28", features = [ ...@@ -40,11 +40,11 @@ swc_core = { version = "0.83.28", features = [
testing = { version = "0.34.1" } testing = { version = "0.34.1" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.2" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.4" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. # [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-231006.2" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.4" }
# [TODO]: need to refactor embed_directory! macro usage in next-core # [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.2" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231006.4" }
# General Deps # General Deps
......
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use indoc::formatdoc; use indoc::formatdoc;
use turbo_tasks::{TryJoinIterExt, Value, ValueToString, Vc}; use turbo_tasks::{TryJoinIterExt, ValueToString, Vc};
use turbopack_binding::{ use turbopack_binding::{
turbo::tasks_fs::FileSystemPath, turbo::tasks_fs::FileSystemPath,
turbopack::{ turbopack::{
core::{ core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
chunk::{ chunk::{
availability_info::AvailabilityInfo, Chunk, ChunkData, ChunkItem, ChunkItemExt, ChunkData, ChunkItem, ChunkItemExt, ChunkType, ChunkableModule,
ChunkableModule, ChunkableModuleReference, ChunkingContext, ChunkingContextExt, ChunkableModuleReference, ChunkingContext, ChunkingContextExt, ChunkingType,
ChunkingType, ChunkingTypeOption, ChunksData, ChunkingTypeOption, ChunksData,
}, },
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
...@@ -18,11 +18,11 @@ use turbopack_binding::{ ...@@ -18,11 +18,11 @@ use turbopack_binding::{
reference::{ModuleReference, ModuleReferences, SingleOutputAssetReference}, reference::{ModuleReference, ModuleReferences, SingleOutputAssetReference},
resolve::ModuleResolveResult, resolve::ModuleResolveResult,
}, },
ecmascript::chunk::EcmascriptChunkData, ecmascript::chunk::{EcmascriptChunkData, EcmascriptChunkType},
turbopack::ecmascript::{ turbopack::ecmascript::{
chunk::{ chunk::{
EcmascriptChunk, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable,
EcmascriptChunkPlaceable, EcmascriptChunkingContext, EcmascriptExports, EcmascriptChunkingContext, EcmascriptExports,
}, },
utils::StringifyJs, utils::StringifyJs,
}, },
...@@ -239,12 +239,13 @@ impl ChunkItem for WithClientChunksChunkItem { ...@@ -239,12 +239,13 @@ impl ChunkItem for WithClientChunksChunkItem {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn as_chunk(&self, availability_info: Value<AvailabilityInfo>) -> Vc<Box<dyn Chunk>> { fn ty(&self) -> Vc<Box<dyn ChunkType>> {
Vc::upcast(EcmascriptChunk::new( Vc::upcast(Vc::<EcmascriptChunkType>::default())
Vc::upcast(self.context.with_layer("rsc".to_string())), }
Vc::upcast(self.inner),
availability_info, #[turbo_tasks::function]
)) fn module(&self) -> Vc<Box<dyn Module>> {
Vc::upcast(self.inner)
} }
} }
......
...@@ -8,7 +8,8 @@ use turbopack_binding::turbopack::{ ...@@ -8,7 +8,8 @@ use turbopack_binding::turbopack::{
core::{ core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
chunk::{ chunk::{
availability_info::AvailabilityInfo, Chunk, ChunkItem, ChunkableModule, ChunkingContext, availability_info::AvailabilityInfo, ChunkItem, ChunkType, ChunkableModule,
ChunkingContext,
}, },
code_builder::CodeBuilder, code_builder::CodeBuilder,
context::AssetContext, context::AssetContext,
...@@ -20,8 +21,8 @@ use turbopack_binding::turbopack::{ ...@@ -20,8 +21,8 @@ use turbopack_binding::turbopack::{
}, },
ecmascript::{ ecmascript::{
chunk::{ chunk::{
EcmascriptChunk, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable,
EcmascriptChunkPlaceable, EcmascriptChunkingContext, EcmascriptExports, EcmascriptChunkType, EcmascriptChunkingContext, EcmascriptExports,
}, },
utils::StringifyJs, utils::StringifyJs,
EcmascriptModuleAsset, EcmascriptModuleAsset,
...@@ -238,12 +239,13 @@ impl ChunkItem for ProxyModuleChunkItem { ...@@ -238,12 +239,13 @@ impl ChunkItem for ProxyModuleChunkItem {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn as_chunk(&self, availability_info: Value<AvailabilityInfo>) -> Vc<Box<dyn Chunk>> { fn ty(&self) -> Vc<Box<dyn ChunkType>> {
Vc::upcast(EcmascriptChunk::new( Vc::upcast(Vc::<EcmascriptChunkType>::default())
Vc::upcast(self.chunking_context), }
Vc::upcast(self.client_proxy_asset),
availability_info, #[turbo_tasks::function]
)) fn module(&self) -> Vc<Box<dyn Module>> {
Vc::upcast(self.client_proxy_asset)
} }
} }
......
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use indoc::formatdoc; use indoc::formatdoc;
use turbo_tasks::{Value, Vc}; use turbo_tasks::Vc;
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_binding::turbopack::{ use turbopack_binding::turbopack::{
core::{ core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
chunk::{ chunk::{ChunkItem, ChunkItemExt, ChunkType, ChunkableModule, ChunkingContext},
availability_info::AvailabilityInfo, Chunk, ChunkItem, ChunkItemExt, ChunkableModule,
ChunkingContext,
},
ident::AssetIdent, ident::AssetIdent,
module::Module, module::Module,
reference::ModuleReferences, reference::ModuleReferences,
}, },
ecmascript::chunk::EcmascriptChunkType,
turbopack::ecmascript::{ turbopack::ecmascript::{
chunk::{ chunk::{
EcmascriptChunk, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkPlaceable,
EcmascriptChunkPlaceable, EcmascriptChunkingContext, EcmascriptExports, EcmascriptChunkingContext, EcmascriptExports,
}, },
utils::StringifyJs, utils::StringifyJs,
}, },
...@@ -161,11 +159,12 @@ impl ChunkItem for BuildServerComponentChunkItem { ...@@ -161,11 +159,12 @@ impl ChunkItem for BuildServerComponentChunkItem {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
fn as_chunk(&self, availability_info: Value<AvailabilityInfo>) -> Vc<Box<dyn Chunk>> { fn ty(&self) -> Vc<Box<dyn ChunkType>> {
Vc::upcast(EcmascriptChunk::new( Vc::upcast(Vc::<EcmascriptChunkType>::default())
Vc::upcast(self.context), }
Vc::upcast(self.inner),
availability_info, #[turbo_tasks::function]
)) fn module(&self) -> Vc<Box<dyn Module>> {
Vc::upcast(self.inner)
} }
} }
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
"@types/ws": "8.2.0", "@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0", "@vercel/ncc": "0.34.0",
"@vercel/nft": "0.22.6", "@vercel/nft": "0.22.6",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.2", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.4",
"acorn": "8.5.0", "acorn": "8.5.0",
"amphtml-validator": "1.0.35", "amphtml-validator": "1.0.35",
"anser": "1.4.9", "anser": "1.4.9",
......
...@@ -1058,8 +1058,8 @@ importers: ...@@ -1058,8 +1058,8 @@ importers:
specifier: 0.22.6 specifier: 0.22.6
version: 0.22.6 version: 0.22.6
'@vercel/turbopack-ecmascript-runtime': '@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.2 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.4
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.2(react-refresh@0.12.0)(webpack@5.86.0)' version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.4(react-refresh@0.12.0)(webpack@5.86.0)'
acorn: acorn:
specifier: 8.5.0 specifier: 8.5.0
version: 8.5.0 version: 8.5.0
...@@ -26757,9 +26757,9 @@ packages: ...@@ -26757,9 +26757,9 @@ packages:
/zwitch@2.0.4: /zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.2(react-refresh@0.12.0)(webpack@5.86.0)': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.4(react-refresh@0.12.0)(webpack@5.86.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.2} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.4}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.2' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231006.4'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
......
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