Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
cd9372c1
Unverified
Commit
cd9372c1
authored
Jul 03, 2023
by
Jiachi Liu
Committed by
GitHub
Jul 03, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reland "ReverseTopological -> AdjacencyMap"" (#52142)
Reverts vercel/next.js#52139
parent
b4a875eb
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
54 additions
and
54 deletions
+54
-54
Cargo.lock
Cargo.lock
+35
-35
Cargo.toml
Cargo.toml
+3
-3
next_build.rs
packages/next-swc/crates/next-build/src/next_build.rs
+5
-5
package.json
packages/next-swc/crates/next-core/js/package.json
+2
-2
pnpm-lock.yaml
pnpm-lock.yaml
+9
-9
No files found.
Cargo.lock
View file @
cd9372c1
This diff is collapsed.
Click to expand it.
Cargo.toml
View file @
cd9372c1
...
...
@@ -42,11 +42,11 @@ swc_core = { version = "0.78.24" }
testing
=
{
version
=
"0.33.19"
}
# Turbo crates
turbopack-binding
=
{
git
=
"https://github.com/vercel/turbo.git"
,
tag
=
"turbopack-23070
2.1
"
}
turbopack-binding
=
{
git
=
"https://github.com/vercel/turbo.git"
,
tag
=
"turbopack-23070
3.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-23070
2.1
"
}
turbo-tasks
=
{
git
=
"https://github.com/vercel/turbo.git"
,
tag
=
"turbopack-23070
3.2
"
}
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs
=
{
git
=
"https://github.com/vercel/turbo.git"
,
tag
=
"turbopack-23070
2.1
"
}
turbo-tasks-fs
=
{
git
=
"https://github.com/vercel/turbo.git"
,
tag
=
"turbopack-23070
3.2
"
}
# General Deps
...
...
packages/next-swc/crates/next-build/src/next_build.rs
View file @
cd9372c1
...
...
@@ -12,7 +12,7 @@ use next_core::{
};
use
serde
::
Serialize
;
use
turbo_tasks
::{
graph
::{
GraphTraversal
,
ReverseTopologic
al
},
graph
::{
AdjacencyMap
,
GraphTravers
al
},
CollectiblesSource
,
CompletionVc
,
RawVc
,
TransientInstance
,
TransientValue
,
TryJoinIterExt
,
ValueToString
,
};
...
...
@@ -519,13 +519,13 @@ async fn handle_issues<T: Into<RawVc> + CollectiblesSource + Copy>(
#[turbo_tasks
::
function]
async
fn
all_assets_from_entry
(
entry
:
AssetVc
)
->
Result
<
AssetsVc
>
{
Ok
(
AssetsVc
::
cell
(
ReverseTopological
::
new
()
AdjacencyMap
::
new
()
.skip_duplicates
()
.visit
([
entry
],
get_referenced_assets
)
.await
.completed
()
?
.into_inner
()
.into_
iter
()
.into_
reverse_topological
()
.collect
(),
))
}
...
...
@@ -535,13 +535,13 @@ async fn all_assets_from_entry(entry: AssetVc) -> Result<AssetsVc> {
#[turbo_tasks
::
function]
async
fn
all_assets_from_entries
(
entries
:
AssetsVc
)
->
Result
<
AssetsVc
>
{
Ok
(
AssetsVc
::
cell
(
ReverseTopological
::
new
()
AdjacencyMap
::
new
()
.skip_duplicates
()
.visit
(
entries
.await
?
.iter
()
.copied
(),
get_referenced_assets
)
.await
.completed
()
?
.into_inner
()
.into_
iter
()
.into_
reverse_topological
()
.collect
(),
))
}
...
...
packages/next-swc/crates/next-core/js/package.json
View file @
cd9372c1
...
...
@@ -10,8 +10,8 @@
"check"
:
"tsc --noEmit"
},
"dependencies"
:
{
"@vercel/turbopack-ecmascript-runtime"
:
"https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-23070
2.1
"
,
"@vercel/turbopack-node"
:
"https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-23070
2.1
"
,
"@vercel/turbopack-ecmascript-runtime"
:
"https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-23070
3.2
"
,
"@vercel/turbopack-node"
:
"https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-23070
3.2
"
,
"anser"
:
"^2.1.1"
,
"css.escape"
:
"^1.5.1"
,
"next"
:
"*"
,
...
...
pnpm-lock.yaml
View file @
cd9372c1
...
...
@@ -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.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-23070
2.1
'
@vercel/turbopack-node'
:
https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-23070
2.1
'
@vercel/turbopack-ecmascript-runtime'
:
https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-23070
3.2
'
@vercel/turbopack-node'
:
https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-23070
3.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.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-23070
2.1
_react-refresh@0.12.0'
'
@vercel/turbopack-node'
:
'
@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-23070
2.1
'
'
@vercel/turbopack-ecmascript-runtime'
:
'
@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-23070
3.2
_react-refresh@0.12.0'
'
@vercel/turbopack-node'
:
'
@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-23070
3.2
'
anser
:
2.1.1
css.escape
:
1.5.1
next
:
link:../../../../next
...
...
@@ -25586,9 +25586,9 @@ packages:
/zwitch/2.0.4
:
resolution
:
{
integrity
:
sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==
}
'
@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-23070
2.1
_react-refresh@0.12.0'
:
resolution
:
{
tarball
:
https
:
//gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js
?
turbopack-23070
2.1
}
id
:
'
@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-23070
2.1
'
'
@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-23070
3.2
_react-refresh@0.12.0'
:
resolution
:
{
tarball
:
https
:
//gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js
?
turbopack-23070
3.2
}
id
:
'
@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-23070
3.2
'
name
:
'
@vercel/turbopack-ecmascript-runtime'
version
:
0.0.0
dependencies
:
...
...
@@ -25599,8 +25599,8 @@ packages:
-
webpack
dev
:
false
'
@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-23070
2.1
'
:
resolution
:
{
tarball
:
https
:
//gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js
?
turbopack-23070
2.1
}
'
@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-23070
3.2
'
:
resolution
:
{
tarball
:
https
:
//gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js
?
turbopack-23070
3.2
}
name
:
'
@vercel/turbopack-node'
version
:
0.0.0
dependencies
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment