Unverified Commit 3f1b9178 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: move references() to specific traits (#52822)

### What?

refactoring

see https://github.com/vercel/turbo/pull/5555

### Turbopack Changes

* https://github.com/vercel/turbo/pull/5544 <!-- Tobias Koppers - add
direct cycle detection -->
* https://github.com/vercel/turbo/pull/5547 <!-- Alex Kirszenberg - Add
missing feature to syn -->
* https://github.com/vercel/turbo/pull/5555 <!-- Tobias Koppers - move
references() to specific traits -->
parent 6705c803
This diff is collapsed.
......@@ -44,11 +44,11 @@ swc_core = { version = "0.79.13" }
testing = { version = "0.33.20" }
# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230717.3" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230718.2" }
# [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-230717.3" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230718.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230717.3" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230718.2" }
# General Deps
......
......@@ -10,8 +10,8 @@
"check": "tsc --noEmit"
},
"dependencies": {
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230717.3",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230717.3",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.2",
"@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.2",
"anser": "^2.1.1",
"css.escape": "^1.5.1",
"next": "*",
......
......@@ -31,6 +31,11 @@ impl Module for InChunkingContextAsset {
fn ident(&self) -> Vc<AssetIdent> {
self.asset.ident().with_modifier(modifier())
}
#[turbo_tasks::function]
fn references(&self) -> Vc<AssetReferences> {
self.asset.references()
}
}
#[turbo_tasks::value_impl]
......@@ -39,11 +44,6 @@ impl Asset for InChunkingContextAsset {
fn content(&self) -> Vc<AssetContent> {
self.asset.content()
}
#[turbo_tasks::function]
fn references(&self) -> Vc<AssetReferences> {
self.asset.references()
}
}
#[turbo_tasks::value_impl]
......
......@@ -80,14 +80,6 @@ impl Module for WithChunksAsset {
fn ident(&self) -> Vc<AssetIdent> {
self.asset.ident().with_modifier(modifier())
}
}
#[turbo_tasks::value_impl]
impl Asset for WithChunksAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
unimplemented!()
}
#[turbo_tasks::function]
async fn references(self: Vc<Self>) -> Result<Vc<AssetReferences>> {
......@@ -101,6 +93,14 @@ impl Asset for WithChunksAsset {
}
}
#[turbo_tasks::value_impl]
impl Asset for WithChunksAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
unimplemented!()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for WithChunksAsset {
#[turbo_tasks::function]
......
......@@ -31,6 +31,11 @@ impl Module for WithChunkingContextScopeAsset {
fn ident(&self) -> Vc<AssetIdent> {
self.asset.ident().with_modifier(modifier())
}
#[turbo_tasks::function]
fn references(&self) -> Vc<AssetReferences> {
self.asset.references()
}
}
#[turbo_tasks::value_impl]
......@@ -39,11 +44,6 @@ impl Asset for WithChunkingContextScopeAsset {
fn content(&self) -> Vc<AssetContent> {
self.asset.content()
}
#[turbo_tasks::function]
fn references(&self) -> Vc<AssetReferences> {
self.asset.references()
}
}
#[turbo_tasks::value_impl]
......
......@@ -46,14 +46,6 @@ impl Module for WithClientChunksAsset {
fn ident(&self) -> Vc<AssetIdent> {
self.asset.ident().with_modifier(modifier())
}
}
#[turbo_tasks::value_impl]
impl Asset for WithClientChunksAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
unimplemented!()
}
#[turbo_tasks::function]
fn references(&self) -> Vc<AssetReferences> {
......@@ -66,6 +58,14 @@ impl Asset for WithClientChunksAsset {
}
}
#[turbo_tasks::value_impl]
impl Asset for WithClientChunksAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
unimplemented!()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for WithClientChunksAsset {
#[turbo_tasks::function]
......
......@@ -40,6 +40,11 @@ impl Module for CssClientReferenceModule {
.ident()
.with_modifier(css_client_reference_modifier())
}
#[turbo_tasks::function]
fn references(self: Vc<Self>) -> Vc<AssetReferences> {
AssetReferences::empty()
}
}
#[turbo_tasks::value_impl]
......@@ -49,11 +54,6 @@ impl Asset for CssClientReferenceModule {
// The client reference asset only serves as a marker asset.
bail!("CssClientReferenceModule has no content")
}
#[turbo_tasks::function]
fn references(self: Vc<Self>) -> Vc<AssetReferences> {
AssetReferences::empty()
}
}
#[turbo_tasks::value_impl]
......
......@@ -57,6 +57,11 @@ impl Module for EcmascriptClientReferenceModule {
self.server_ident
.with_modifier(ecmascript_client_reference_modifier())
}
#[turbo_tasks::function]
fn references(self: Vc<Self>) -> Vc<AssetReferences> {
AssetReferences::empty()
}
}
#[turbo_tasks::value_impl]
......@@ -66,9 +71,4 @@ impl Asset for EcmascriptClientReferenceModule {
// The ES client reference asset only serves as a marker asset.
bail!("EcmascriptClientReferenceModule has no content")
}
#[turbo_tasks::function]
fn references(self: Vc<Self>) -> Vc<AssetReferences> {
AssetReferences::empty()
}
}
......@@ -123,14 +123,6 @@ impl Module for EcmascriptClientReferenceProxyModule {
self.server_module_ident
.with_modifier(client_proxy_modifier())
}
}
#[turbo_tasks::value_impl]
impl Asset for EcmascriptClientReferenceProxyModule {
#[turbo_tasks::function]
fn content(&self) -> Result<Vc<AssetContent>> {
bail!("proxy module asset has no content")
}
#[turbo_tasks::function]
async fn references(self: Vc<Self>) -> Result<Vc<AssetReferences>> {
......@@ -161,6 +153,14 @@ impl Asset for EcmascriptClientReferenceProxyModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for EcmascriptClientReferenceProxyModule {
#[turbo_tasks::function]
fn content(&self) -> Result<Vc<AssetContent>> {
bail!("proxy module asset has no content")
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for EcmascriptClientReferenceProxyModule {
#[turbo_tasks::function]
......
......@@ -10,7 +10,7 @@ use turbo_tasks::{
TryJoinIterExt, Vc,
};
use turbopack_binding::turbopack::core::{
asset::{Asset, Assets},
module::{convert_asset_to_module, Module, Modules},
reference::AssetReference,
};
......@@ -60,7 +60,7 @@ pub struct ClientReferenceGraph {
#[turbo_tasks::value_impl]
impl ClientReferenceGraph {
#[turbo_tasks::function]
pub async fn new(entries: Vc<Assets>) -> Result<Vc<Self>> {
pub async fn new(entries: Vc<Modules>) -> Result<Vc<Self>> {
let entries = entries.await?;
let graph = AdjacencyMap::new()
......@@ -69,9 +69,9 @@ impl ClientReferenceGraph {
entries
.iter()
.copied()
.map(|asset| VisitClientReferenceNode {
.map(|module| VisitClientReferenceNode {
server_component: None,
ty: VisitClientReferenceNodeType::Internal(asset),
ty: VisitClientReferenceNodeType::Internal(module),
})
.collect::<Vec<_>>(),
VisitClientReference,
......@@ -104,7 +104,7 @@ impl ClientReferenceGraph {
}
#[turbo_tasks::function]
pub async fn entry(self: Vc<Self>, entry: Vc<Box<dyn Asset>>) -> Result<Vc<ClientReferences>> {
pub async fn entry(self: Vc<Self>, entry: Vc<Box<dyn Module>>) -> Result<Vc<ClientReferences>> {
let this = self.await?;
let mut entry_client_references = vec![];
......@@ -145,7 +145,7 @@ struct VisitClientReferenceNode {
)]
enum VisitClientReferenceNodeType {
ClientReference(ClientReference),
Internal(Vc<Box<dyn Asset>>),
Internal(Vc<Box<dyn Module>>),
}
impl Visit<VisitClientReferenceNode> for VisitClientReference {
......@@ -167,24 +167,29 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
// This should never occur since we always skip visiting these
// nodes' edges.
VisitClientReferenceNodeType::ClientReference(_) => Ok(vec![]),
VisitClientReferenceNodeType::Internal(asset) => {
let references = asset.references().await?;
VisitClientReferenceNodeType::Internal(module) => {
let references = module.references().await?;
let referenced_assets = references
let referenced_modules = references
.iter()
.copied()
.map(|reference| async move {
let resolve_result = reference.resolve_reference();
let assets = resolve_result.primary_assets().await?;
Ok(assets.iter().copied().collect::<Vec<_>>())
Ok(assets
.iter()
.copied()
.map(convert_asset_to_module)
.collect::<Vec<_>>())
})
.try_join()
.await?;
let referenced_assets = referenced_assets.into_iter().flatten();
let referenced_modules = referenced_modules.into_iter().flatten();
let referenced_assets = referenced_assets.map(|asset| async move {
if let Some(client_reference_asset) =
Vc::try_resolve_downcast_type::<EcmascriptClientReferenceModule>(asset)
let referenced_modules = referenced_modules.map(|module| async move {
let module = module.resolve().await?;
if let Some(client_reference_module) =
Vc::try_resolve_downcast_type::<EcmascriptClientReferenceModule>(module)
.await?
{
return Ok(VisitClientReferenceNode {
......@@ -193,7 +198,7 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
ClientReference {
server_component: node.server_component,
ty: ClientReferenceType::EcmascriptClientReference(
client_reference_asset,
client_reference_module,
),
},
),
......@@ -201,7 +206,8 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
}
if let Some(css_client_reference_asset) =
Vc::try_resolve_downcast_type::<CssClientReferenceModule>(asset).await?
Vc::try_resolve_downcast_type::<CssClientReferenceModule>(module)
.await?
{
return Ok(VisitClientReferenceNode {
server_component: node.server_component,
......@@ -217,22 +223,22 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
}
if let Some(server_component_asset) =
Vc::try_resolve_downcast_type::<NextServerComponentModule>(asset)
Vc::try_resolve_downcast_type::<NextServerComponentModule>(module)
.await?
{
return Ok(VisitClientReferenceNode {
server_component: Some(server_component_asset),
ty: VisitClientReferenceNodeType::Internal(asset),
ty: VisitClientReferenceNodeType::Internal(module),
});
}
Ok(VisitClientReferenceNode {
server_component: node.server_component,
ty: VisitClientReferenceNodeType::Internal(asset),
ty: VisitClientReferenceNodeType::Internal(module),
})
});
let assets = referenced_assets.try_join().await?;
let assets = referenced_modules.try_join().await?;
Ok(assets)
}
......
......@@ -8,7 +8,7 @@ use turbopack_binding::{
turbo::{tasks_env::EnvMap, tasks_fs::FileSystemPath},
turbopack::{
core::{
changed::any_content_changed,
changed::any_content_changed_of_module,
chunk::ChunkingContext,
context::AssetContext,
file_source::FileSource,
......@@ -722,7 +722,7 @@ async fn load_next_config_and_custom_routes_internal(
Vc::upcast(config_asset),
Value::new(ReferenceType::Internal(InnerAssets::empty())),
);
any_content_changed(Vc::upcast(config_asset))
any_content_changed_of_module(config_asset)
});
let load_next_config_asset = context.process(
next_asset("entry/config/next.js".to_string()),
......
......@@ -59,6 +59,11 @@ impl Module for NextDynamicEntryModule {
.ident()
.with_modifier(dynamic_modifier())
}
#[turbo_tasks::function]
fn references(self: Vc<Self>) -> Vc<AssetReferences> {
AssetReferences::empty()
}
}
#[turbo_tasks::value_impl]
......@@ -68,9 +73,4 @@ impl Asset for NextDynamicEntryModule {
// The client reference asset only serves as a marker asset.
bail!("NextDynamicEntryModule has no content")
}
#[turbo_tasks::function]
fn references(self: Vc<Self>) -> Vc<AssetReferences> {
AssetReferences::empty()
}
}
......@@ -6,7 +6,7 @@ use turbo_tasks::{
TryJoinIterExt, Vc,
};
use turbopack_binding::turbopack::core::{
asset::{Asset, Assets},
module::{convert_asset_to_module, Module, Modules},
reference::AssetReference,
};
......@@ -18,7 +18,7 @@ pub struct NextDynamicEntries(Vec<Vc<NextDynamicEntryModule>>);
#[turbo_tasks::value_impl]
impl NextDynamicEntries {
#[turbo_tasks::function]
pub async fn from_entries(entries: Vc<Assets>) -> Result<Vc<NextDynamicEntries>> {
pub async fn from_entries(entries: Vc<Modules>) -> Result<Vc<NextDynamicEntries>> {
let nodes: Vec<_> = AdjacencyMap::new()
.skip_duplicates()
.visit(
......@@ -59,7 +59,7 @@ struct VisitDynamic;
#[derive(Clone, Eq, PartialEq, Hash)]
enum VisitDynamicNode {
Dynamic(Vc<NextDynamicEntryModule>),
Internal(Vc<Box<dyn Asset>>),
Internal(Vc<Box<dyn Module>>),
}
impl Visit<VisitDynamicNode> for VisitDynamic {
......@@ -76,38 +76,43 @@ impl Visit<VisitDynamicNode> for VisitDynamic {
fn edges(&mut self, node: &VisitDynamicNode) -> Self::EdgesFuture {
let node = node.clone();
async move {
let asset = match node {
VisitDynamicNode::Dynamic(dynamic_asset) => Vc::upcast(dynamic_asset),
VisitDynamicNode::Internal(asset) => asset,
let module = match node {
VisitDynamicNode::Dynamic(dynamic_module) => Vc::upcast(dynamic_module),
VisitDynamicNode::Internal(module) => module,
};
let references = asset.references().await?;
let references = module.references().await?;
let referenced_assets = references
let referenced_modules = references
.iter()
.copied()
.map(|reference| async move {
let resolve_result = reference.resolve_reference();
let assets = resolve_result.primary_assets().await?;
Ok(assets.iter().copied().collect::<Vec<_>>())
Ok(assets
.iter()
.copied()
.map(convert_asset_to_module)
.collect::<Vec<_>>())
})
.try_join()
.await?;
let referenced_assets = referenced_assets.into_iter().flatten();
let referenced_modules = referenced_modules.into_iter().flatten();
let referenced_assets = referenced_assets.map(|asset| async move {
if let Some(next_dynamic_asset) =
Vc::try_resolve_downcast_type::<NextDynamicEntryModule>(asset).await?
let referenced_modules = referenced_modules.map(|module| async move {
let module = module.resolve().await?;
if let Some(next_dynamic_module) =
Vc::try_resolve_downcast_type::<NextDynamicEntryModule>(module).await?
{
return Ok(VisitDynamicNode::Dynamic(next_dynamic_asset));
return Ok(VisitDynamicNode::Dynamic(next_dynamic_module));
}
Ok(VisitDynamicNode::Internal(asset))
Ok(VisitDynamicNode::Internal(module))
});
let assets = referenced_assets.try_join().await?;
let nodes = referenced_modules.try_join().await?;
Ok(assets)
Ok(nodes)
}
}
}
......@@ -54,14 +54,6 @@ impl Module for NextServerComponentModule {
fn ident(&self) -> Vc<AssetIdent> {
self.module.ident().with_modifier(modifier())
}
}
#[turbo_tasks::value_impl]
impl Asset for NextServerComponentModule {
#[turbo_tasks::function]
fn content(&self) -> Result<Vc<AssetContent>> {
bail!("Next.js server component module has no content")
}
#[turbo_tasks::function]
fn references(&self) -> Vc<AssetReferences> {
......@@ -72,6 +64,14 @@ impl Asset for NextServerComponentModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for NextServerComponentModule {
#[turbo_tasks::function]
fn content(&self) -> Result<Vc<AssetContent>> {
bail!("Next.js server component module has no content")
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for NextServerComponentModule {
#[turbo_tasks::function]
......
......@@ -144,6 +144,25 @@ impl OutputAsset for PageLoaderAsset {
get_asset_path_from_pathname(&self.pathname.await?, ".js")
))))
}
#[turbo_tasks::function]
async fn references(self: Vc<Self>) -> Result<Vc<AssetReferences>> {
let chunks = self.get_page_chunks().await?;
let mut references = Vec::with_capacity(chunks.len());
for &chunk in chunks.iter() {
references.push(Vc::upcast(SingleAssetReference::new(
Vc::upcast(chunk),
page_loader_chunk_reference_description(),
)));
}
for chunk_data in &*self.chunks_data().await? {
references.extend(chunk_data.references().await?.iter().copied());
}
Ok(Vc::cell(references))
}
}
#[turbo_tasks::value_impl]
......@@ -167,23 +186,4 @@ impl Asset for PageLoaderAsset {
Ok(AssetContent::file(File::from(content).into()))
}
#[turbo_tasks::function]
async fn references(self: Vc<Self>) -> Result<Vc<AssetReferences>> {
let chunks = self.get_page_chunks().await?;
let mut references = Vec::with_capacity(chunks.len());
for &chunk in chunks.iter() {
references.push(Vc::upcast(SingleAssetReference::new(
Vc::upcast(chunk),
page_loader_chunk_reference_description(),
)));
}
for chunk_data in &*self.chunks_data().await? {
references.extend(chunk_data.references().await?.iter().copied());
}
Ok(Vc::cell(references))
}
}
......@@ -13,7 +13,7 @@ use turbopack_binding::{
turbopack::{
core::{
asset::AssetContent,
changed::any_content_changed,
changed::any_content_changed_of_module,
chunk::ChunkingContext,
context::AssetContext,
environment::{ServerAddr, ServerInfo},
......@@ -144,7 +144,7 @@ async fn next_config_changed(
Vc::upcast(FileSource::new(config_path)),
Value::new(ReferenceType::Internal(InnerAssets::empty())),
);
any_content_changed(Vc::upcast(module))
any_content_changed_of_module(module)
}
FindContextFileResult::NotFound(_) => Completion::immutable(),
})
......
......@@ -992,8 +992,8 @@ importers:
'@types/react': 18.2.7
'@types/react-dom': 18.2.4
'@vercel/ncc': ^0.36.0
'@vercel/turbopack-ecmascript-runtime': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230717.3
'@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230717.3
'@vercel/turbopack-ecmascript-runtime': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.2
'@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.2
anser: ^2.1.1
css.escape: ^1.5.1
find-up: ^6.3.0
......@@ -1005,8 +1005,8 @@ importers:
stacktrace-parser: ^0.1.10
strip-ansi: ^7.0.1
dependencies:
'@vercel/turbopack-ecmascript-runtime': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230717.3_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230717.3'
'@vercel/turbopack-ecmascript-runtime': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.2_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.2'
anser: 2.1.1
css.escape: 1.5.1
next: link:../../../../next
......@@ -25498,9 +25498,9 @@ packages:
/zwitch/2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230717.3_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230717.3}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230717.3'
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.2_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.2}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230718.2'
name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0
dependencies:
......@@ -25511,8 +25511,8 @@ packages:
- webpack
dev: false
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230717.3':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230717.3}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.2':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230718.2}
name: '@vercel/turbopack-node'
version: 0.0.0
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