Unverified Commit cd9372c1 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Reland "ReverseTopological -> AdjacencyMap"" (#52142)

Reverts vercel/next.js#52139
parent b4a875eb
This diff is collapsed.
...@@ -42,11 +42,11 @@ swc_core = { version = "0.78.24" } ...@@ -42,11 +42,11 @@ swc_core = { version = "0.78.24" }
testing = { version = "0.33.19" } testing = { version = "0.33.19" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230702.1" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230703.2" }
# [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-230702.1" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230703.2" }
# [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-230702.1" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230703.2" }
# General Deps # General Deps
......
...@@ -12,7 +12,7 @@ use next_core::{ ...@@ -12,7 +12,7 @@ use next_core::{
}; };
use serde::Serialize; use serde::Serialize;
use turbo_tasks::{ use turbo_tasks::{
graph::{GraphTraversal, ReverseTopological}, graph::{AdjacencyMap, GraphTraversal},
CollectiblesSource, CompletionVc, RawVc, TransientInstance, TransientValue, TryJoinIterExt, CollectiblesSource, CompletionVc, RawVc, TransientInstance, TransientValue, TryJoinIterExt,
ValueToString, ValueToString,
}; };
...@@ -519,13 +519,13 @@ async fn handle_issues<T: Into<RawVc> + CollectiblesSource + Copy>( ...@@ -519,13 +519,13 @@ async fn handle_issues<T: Into<RawVc> + CollectiblesSource + Copy>(
#[turbo_tasks::function] #[turbo_tasks::function]
async fn all_assets_from_entry(entry: AssetVc) -> Result<AssetsVc> { async fn all_assets_from_entry(entry: AssetVc) -> Result<AssetsVc> {
Ok(AssetsVc::cell( Ok(AssetsVc::cell(
ReverseTopological::new() AdjacencyMap::new()
.skip_duplicates() .skip_duplicates()
.visit([entry], get_referenced_assets) .visit([entry], get_referenced_assets)
.await .await
.completed()? .completed()?
.into_inner() .into_inner()
.into_iter() .into_reverse_topological()
.collect(), .collect(),
)) ))
} }
...@@ -535,13 +535,13 @@ async fn all_assets_from_entry(entry: AssetVc) -> Result<AssetsVc> { ...@@ -535,13 +535,13 @@ async fn all_assets_from_entry(entry: AssetVc) -> Result<AssetsVc> {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn all_assets_from_entries(entries: AssetsVc) -> Result<AssetsVc> { async fn all_assets_from_entries(entries: AssetsVc) -> Result<AssetsVc> {
Ok(AssetsVc::cell( Ok(AssetsVc::cell(
ReverseTopological::new() AdjacencyMap::new()
.skip_duplicates() .skip_duplicates()
.visit(entries.await?.iter().copied(), get_referenced_assets) .visit(entries.await?.iter().copied(), get_referenced_assets)
.await .await
.completed()? .completed()?
.into_inner() .into_inner()
.into_iter() .into_reverse_topological()
.collect(), .collect(),
)) ))
} }
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
"check": "tsc --noEmit" "check": "tsc --noEmit"
}, },
"dependencies": { "dependencies": {
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230702.1", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230703.2",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230702.1", "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230703.2",
"anser": "^2.1.1", "anser": "^2.1.1",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"next": "*", "next": "*",
......
...@@ -992,8 +992,8 @@ importers: ...@@ -992,8 +992,8 @@ importers:
'@types/react': 18.2.7 '@types/react': 18.2.7
'@types/react-dom': 18.2.4 '@types/react-dom': 18.2.4
'@vercel/ncc': ^0.36.0 '@vercel/ncc': ^0.36.0
'@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230702.1 '@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230703.2
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230702.1 '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230703.2
anser: ^2.1.1 anser: ^2.1.1
css.escape: ^1.5.1 css.escape: ^1.5.1
find-up: ^6.3.0 find-up: ^6.3.0
...@@ -1005,8 +1005,8 @@ importers: ...@@ -1005,8 +1005,8 @@ importers:
stacktrace-parser: ^0.1.10 stacktrace-parser: ^0.1.10
strip-ansi: ^7.0.1 strip-ansi: ^7.0.1
dependencies: dependencies:
'@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230702.1_react-refresh@0.12.0' '@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230703.2_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230702.1' '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230703.2'
anser: 2.1.1 anser: 2.1.1
css.escape: 1.5.1 css.escape: 1.5.1
next: link:../../../../next next: link:../../../../next
...@@ -25586,9 +25586,9 @@ packages: ...@@ -25586,9 +25586,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.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230702.1_react-refresh@0.12.0': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230703.2_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230702.1} resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230703.2}
id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230702.1' id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230703.2'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
...@@ -25599,8 +25599,8 @@ packages: ...@@ -25599,8 +25599,8 @@ packages:
- webpack - webpack
dev: false dev: false
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230702.1': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230703.2':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230702.1} resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230703.2}
name: '@vercel/turbopack-node' name: '@vercel/turbopack-node'
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