Unverified Commit 4597ff35 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

allow to pass available chunk items when creating a chunk group (#60554)

### What?

api changes for https://github.com/vercel/turbo/pull/6988

### Turbopack Changes

* https://github.com/vercel/turbo/pull/6886 <!-- Tobias Koppers -
improve nesting of tracing for invalidations -->
* https://github.com/vercel/turbo/pull/6866 <!-- Tobias Koppers - trace
memory allocations and show in tracing -->
* https://github.com/vercel/turbo/pull/6988 <!-- Tobias Koppers - allow
to pass available chunk items when creating a chunk group -->
* https://github.com/vercel/turbo/pull/7013 <!-- Leah - fix: make CSS
reloading work on firefox -->
* https://github.com/vercel/turbo/pull/7004 <!-- Tobias Koppers -
improve error message when no config is exported from postcss.config.js
-->




Closes PACK-2231
parent 056b675b
This diff is collapsed.
...@@ -37,11 +37,11 @@ swc_core = { version = "0.87.16", features = [ ...@@ -37,11 +37,11 @@ swc_core = { version = "0.87.16", features = [
testing = { version = "0.35.14" } testing = { version = "0.35.14" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.4" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.1" }
# [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-240110.4" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.1" }
# [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-240110.4" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.1" }
# General Deps # General Deps
......
...@@ -44,9 +44,10 @@ use turbopack_binding::{ ...@@ -44,9 +44,10 @@ use turbopack_binding::{
tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPath}, tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPath},
}, },
turbopack::{ turbopack::{
build::EntryChunkGroupResult,
core::{ core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
chunk::{availability_info::AvailabilityInfo, ChunkingContext, EvaluatableAssets}, chunk::{availability_info::AvailabilityInfo, ChunkingContextExt, EvaluatableAssets},
file_source::FileSource, file_source::FileSource,
module::Module, module::Module,
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
...@@ -844,9 +845,10 @@ impl AppEndpoint { ...@@ -844,9 +845,10 @@ impl AppEndpoint {
server_assets.push(manifest); server_assets.push(manifest);
evaluatable_assets.push(loader); evaluatable_assets.push(loader);
let files = chunking_context.evaluated_chunk_group( let files = chunking_context.evaluated_chunk_group_assets(
app_entry.rsc_entry.ident(), app_entry.rsc_entry.ident(),
Vc::cell(evaluatable_assets.clone()), Vc::cell(evaluatable_assets.clone()),
Value::new(AvailabilityInfo::Root),
); );
let files_value = files.await?; let files_value = files.await?;
...@@ -976,7 +978,9 @@ impl AppEndpoint { ...@@ -976,7 +978,9 @@ impl AppEndpoint {
server_assets.push(manifest); server_assets.push(manifest);
evaluatable_assets.push(loader); evaluatable_assets.push(loader);
let rsc_chunk = this let EntryChunkGroupResult {
asset: rsc_chunk, ..
} = *this
.app_project .app_project
.project() .project()
.server_chunking_context() .server_chunking_context()
...@@ -987,7 +991,9 @@ impl AppEndpoint { ...@@ -987,7 +991,9 @@ impl AppEndpoint {
)), )),
app_entry.rsc_entry, app_entry.rsc_entry,
Vc::cell(evaluatable_assets), Vc::cell(evaluatable_assets),
); Value::new(AvailabilityInfo::Root),
)
.await?;
server_assets.push(rsc_chunk); server_assets.push(rsc_chunk);
let app_paths_manifest_output = create_app_paths_manifest( let app_paths_manifest_output = create_app_paths_manifest(
......
...@@ -15,7 +15,7 @@ use turbopack_binding::{ ...@@ -15,7 +15,7 @@ use turbopack_binding::{
build::BuildChunkingContext, build::BuildChunkingContext,
core::{ core::{
chunk::{ chunk::{
availability_info::AvailabilityInfo, ChunkableModule, ChunkingContext, availability_info::AvailabilityInfo, ChunkableModule, ChunkingContextExt,
EvaluatableAssets, EvaluatableAssets,
}, },
issue::IssueSeverity, issue::IssueSeverity,
...@@ -84,7 +84,7 @@ pub(crate) async fn collect_chunk_group( ...@@ -84,7 +84,7 @@ pub(crate) async fn collect_chunk_group(
availability_info: Value<AvailabilityInfo>, availability_info: Value<AvailabilityInfo>,
) -> Result<Vc<DynamicImportedChunks>> { ) -> Result<Vc<DynamicImportedChunks>> {
collect_chunk_group_inner(dynamic_import_entries, |chunk_item| { collect_chunk_group_inner(dynamic_import_entries, |chunk_item| {
chunking_context.chunk_group(chunk_item, availability_info) chunking_context.chunk_group_assets(chunk_item, availability_info)
}) })
.await .await
} }
...@@ -95,7 +95,11 @@ pub(crate) async fn collect_evaluated_chunk_group( ...@@ -95,7 +95,11 @@ pub(crate) async fn collect_evaluated_chunk_group(
evaluatable_assets: Vc<EvaluatableAssets>, evaluatable_assets: Vc<EvaluatableAssets>,
) -> Result<Vc<DynamicImportedChunks>> { ) -> Result<Vc<DynamicImportedChunks>> {
collect_chunk_group_inner(dynamic_import_entries, |chunk_item| { collect_chunk_group_inner(dynamic_import_entries, |chunk_item| {
chunking_context.evaluated_chunk_group(chunk_item.ident(), evaluatable_assets) chunking_context.evaluated_chunk_group_assets(
chunk_item.ident(),
evaluatable_assets,
Value::new(AvailabilityInfo::Root),
)
}) })
.await .await
} }
......
...@@ -11,9 +11,10 @@ use turbo_tasks::{Completion, Value, Vc}; ...@@ -11,9 +11,10 @@ use turbo_tasks::{Completion, Value, Vc};
use turbopack_binding::{ use turbopack_binding::{
turbo::tasks_fs::{File, FileContent}, turbo::tasks_fs::{File, FileContent},
turbopack::{ turbopack::{
build::EntryChunkGroupResult,
core::{ core::{
asset::AssetContent, asset::AssetContent,
chunk::ChunkingContext, chunk::{availability_info::AvailabilityInfo, ChunkingContextExt},
context::AssetContext, context::AssetContext,
module::Module, module::Module,
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
...@@ -96,8 +97,11 @@ impl InstrumentationEndpoint { ...@@ -96,8 +97,11 @@ impl InstrumentationEndpoint {
let edge_chunking_context = self.project.edge_chunking_context(); let edge_chunking_context = self.project.edge_chunking_context();
let edge_files = edge_chunking_context let edge_files = edge_chunking_context.evaluated_chunk_group_assets(
.evaluated_chunk_group(module.ident(), Vc::cell(evaluatable_assets)); module.ident(),
Vc::cell(evaluatable_assets),
Value::new(AvailabilityInfo::Root),
);
Ok(edge_files) Ok(edge_files)
} }
...@@ -124,7 +128,8 @@ impl InstrumentationEndpoint { ...@@ -124,7 +128,8 @@ impl InstrumentationEndpoint {
bail!("Entry module must be evaluatable"); bail!("Entry module must be evaluatable");
}; };
let chunk = chunking_context.entry_chunk_group( let EntryChunkGroupResult { asset: chunk, .. } = *chunking_context
.entry_chunk_group(
self.project self.project
.node_root() .node_root()
.join("server/instrumentation.js".to_string()), .join("server/instrumentation.js".to_string()),
...@@ -134,7 +139,9 @@ impl InstrumentationEndpoint { ...@@ -134,7 +139,9 @@ impl InstrumentationEndpoint {
NextMode::Development, NextMode::Development,
) )
.resolve_entries(self.context), .resolve_entries(self.context),
); Value::new(AvailabilityInfo::Root),
)
.await?;
Ok(chunk) Ok(chunk)
} }
......
...@@ -17,7 +17,7 @@ use turbopack_binding::{ ...@@ -17,7 +17,7 @@ use turbopack_binding::{
turbopack::{ turbopack::{
core::{ core::{
asset::AssetContent, asset::AssetContent,
chunk::ChunkingContext, chunk::{availability_info::AvailabilityInfo, ChunkingContextExt},
context::AssetContext, context::AssetContext,
module::Module, module::Module,
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
...@@ -99,8 +99,11 @@ impl MiddlewareEndpoint { ...@@ -99,8 +99,11 @@ impl MiddlewareEndpoint {
let edge_chunking_context = self.project.edge_chunking_context(); let edge_chunking_context = self.project.edge_chunking_context();
let edge_files = edge_chunking_context let edge_files = edge_chunking_context.evaluated_chunk_group_assets(
.evaluated_chunk_group(module.ident(), Vc::cell(evaluatable_assets)); module.ident(),
Vc::cell(evaluatable_assets),
Value::new(AvailabilityInfo::Root),
);
Ok(edge_files) Ok(edge_files)
} }
......
...@@ -37,10 +37,10 @@ use turbopack_binding::{ ...@@ -37,10 +37,10 @@ use turbopack_binding::{
File, FileContent, FileSystem, FileSystemPath, FileSystemPathOption, VirtualFileSystem, File, FileContent, FileSystem, FileSystemPath, FileSystemPathOption, VirtualFileSystem,
}, },
turbopack::{ turbopack::{
build::BuildChunkingContext, build::{BuildChunkingContext, EntryChunkGroupResult},
core::{ core::{
asset::AssetContent, asset::AssetContent,
chunk::{availability_info::AvailabilityInfo, ChunkingContext, EvaluatableAssets}, chunk::{availability_info::AvailabilityInfo, ChunkingContextExt, EvaluatableAssets},
context::AssetContext, context::AssetContext,
file_source::FileSource, file_source::FileSource,
issue::IssueSeverity, issue::IssueSeverity,
...@@ -606,12 +606,13 @@ impl PageEndpoint { ...@@ -606,12 +606,13 @@ impl PageEndpoint {
let client_chunking_context = this.pages_project.project().client_chunking_context(); let client_chunking_context = this.pages_project.project().client_chunking_context();
let mut client_chunks = client_chunking_context let mut client_chunks = client_chunking_context
.evaluated_chunk_group( .evaluated_chunk_group_assets(
client_module.ident(), client_module.ident(),
this.pages_project this.pages_project
.client_runtime_entries() .client_runtime_entries()
.with_entry(Vc::upcast(client_main_module)) .with_entry(Vc::upcast(client_main_module))
.with_entry(Vc::upcast(client_module)), .with_entry(Vc::upcast(client_module)),
Value::new(AvailabilityInfo::Root),
) )
.await? .await?
.clone_value(); .clone_value();
...@@ -670,9 +671,10 @@ impl PageEndpoint { ...@@ -670,9 +671,10 @@ impl PageEndpoint {
.context("could not process page loader entry module")?; .context("could not process page loader entry module")?;
evaluatable_assets.push(evaluatable); evaluatable_assets.push(evaluatable);
let edge_files = edge_chunking_context.evaluated_chunk_group( let edge_files = edge_chunking_context.evaluated_chunk_group_assets(
ssr_module.ident(), ssr_module.ident(),
Vc::cell(evaluatable_assets.clone()), Vc::cell(evaluatable_assets.clone()),
Value::new(AvailabilityInfo::Root),
); );
let dynamic_import_modules = collect_next_dynamic_imports(ssr_module).await?; let dynamic_import_modules = collect_next_dynamic_imports(ssr_module).await?;
...@@ -704,11 +706,17 @@ impl PageEndpoint { ...@@ -704,11 +706,17 @@ impl PageEndpoint {
let ssr_entry_chunk_path_string = format!("pages{asset_path}"); let ssr_entry_chunk_path_string = format!("pages{asset_path}");
let ssr_entry_chunk_path = node_path.join(ssr_entry_chunk_path_string); let ssr_entry_chunk_path = node_path.join(ssr_entry_chunk_path_string);
let ssr_entry_chunk = chunking_context.entry_chunk_group( let EntryChunkGroupResult {
asset: ssr_entry_chunk,
..
} = *chunking_context
.entry_chunk_group(
ssr_entry_chunk_path, ssr_entry_chunk_path,
ssr_module, ssr_module,
runtime_entries, runtime_entries,
); Value::new(AvailabilityInfo::Root),
)
.await?;
let availability_info = Value::new(AvailabilityInfo::Root); let availability_info = Value::new(AvailabilityInfo::Root);
let dynamic_import_modules = collect_next_dynamic_imports(ssr_module).await?; let dynamic_import_modules = collect_next_dynamic_imports(ssr_module).await?;
......
...@@ -55,18 +55,18 @@ pub async fn get_app_client_references_chunks( ...@@ -55,18 +55,18 @@ pub async fn get_app_client_references_chunks(
let ecmascript_client_reference_ref = let ecmascript_client_reference_ref =
ecmascript_client_reference.await?; ecmascript_client_reference.await?;
ClientReferenceChunks { ClientReferenceChunks {
client_chunks: client_chunking_context.root_chunk_group( client_chunks: client_chunking_context.root_chunk_group_assets(
Vc::upcast(ecmascript_client_reference_ref.client_module), Vc::upcast(ecmascript_client_reference_ref.client_module),
), ),
ssr_chunks: ssr_chunking_context.root_chunk_group(Vc::upcast( ssr_chunks: ssr_chunking_context.root_chunk_group_assets(
ecmascript_client_reference_ref.ssr_module, Vc::upcast(ecmascript_client_reference_ref.ssr_module),
)), ),
} }
} }
ClientReferenceType::CssClientReference(css_client_reference) => { ClientReferenceType::CssClientReference(css_client_reference) => {
let css_client_reference_ref = css_client_reference.await?; let css_client_reference_ref = css_client_reference.await?;
ClientReferenceChunks { ClientReferenceChunks {
client_chunks: client_chunking_context.root_chunk_group( client_chunks: client_chunking_context.root_chunk_group_assets(
Vc::upcast(css_client_reference_ref.client_module), Vc::upcast(css_client_reference_ref.client_module),
), ),
ssr_chunks: OutputAssets::empty(), ssr_chunks: OutputAssets::empty(),
...@@ -128,11 +128,11 @@ pub async fn get_app_client_references_chunks( ...@@ -128,11 +128,11 @@ pub async fn get_app_client_references_chunks(
let global_entry_module = ClientReferenceChunks { let global_entry_module = ClientReferenceChunks {
client_chunks: { client_chunks: {
let _span = tracing::info_span!("client side rendering").entered(); let _span = tracing::info_span!("client side rendering").entered();
client_chunking_context.root_chunk_group(Vc::upcast(client_entry_module)) client_chunking_context.root_chunk_group_assets(Vc::upcast(client_entry_module))
}, },
ssr_chunks: { ssr_chunks: {
let _span = tracing::info_span!("server side rendering").entered(); let _span = tracing::info_span!("server side rendering").entered();
ssr_chunking_context.root_chunk_group(Vc::upcast(ssr_entry_module)) ssr_chunking_context.root_chunk_group_assets(Vc::upcast(ssr_entry_module))
}, },
}; };
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::Vc; use turbo_tasks::{Value, Vc};
use turbopack_binding::turbopack::{ use turbopack_binding::turbopack::{
core::{ core::{
chunk::{ChunkingContext, EvaluatableAssets}, chunk::{availability_info::AvailabilityInfo, ChunkingContextExt, EvaluatableAssets},
ident::AssetIdent, ident::AssetIdent,
output::OutputAssets, output::OutputAssets,
}, },
...@@ -19,8 +19,11 @@ pub async fn get_app_client_shared_chunks( ...@@ -19,8 +19,11 @@ pub async fn get_app_client_shared_chunks(
return Ok(OutputAssets::empty()); return Ok(OutputAssets::empty());
} }
let app_client_shared_chunks = let app_client_shared_chunks = client_chunking_context.evaluated_chunk_group_assets(
client_chunking_context.evaluated_chunk_group(ident, app_client_runtime_entries); ident,
app_client_runtime_entries,
Value::new(AvailabilityInfo::Root),
);
Ok(app_client_shared_chunks) Ok(app_client_shared_chunks)
} }
...@@ -41,7 +41,7 @@ impl NextDynamicEntryModule { ...@@ -41,7 +41,7 @@ impl NextDynamicEntryModule {
bail!("dynamic client asset must be chunkable"); bail!("dynamic client asset must be chunkable");
}; };
Ok(client_chunking_context.root_chunk_group(client_entry_module)) Ok(client_chunking_context.root_chunk_group_assets(client_entry_module))
} }
} }
......
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
"@types/ws": "8.2.0", "@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0", "@vercel/ncc": "0.34.0",
"@vercel/nft": "0.26.2", "@vercel/nft": "0.26.2",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.4", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.1",
"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",
......
...@@ -1077,8 +1077,8 @@ importers: ...@@ -1077,8 +1077,8 @@ importers:
specifier: 0.26.2 specifier: 0.26.2
version: 0.26.2 version: 0.26.2
'@vercel/turbopack-ecmascript-runtime': '@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.4 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.1
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.4(react-refresh@0.12.0)(webpack@5.86.0)' version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.1(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
...@@ -25649,9 +25649,9 @@ packages: ...@@ -25649,9 +25649,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-240110.4(react-refresh@0.12.0)(webpack@5.86.0)': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.1(react-refresh@0.12.0)(webpack@5.86.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.4} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.1}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240110.4' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.1'
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