archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Turbopack: new graph aggregation (#65206)

Browse source 
* https://github.com/vercel/turbo/pull/8082 <!-- Tobias Koppers - Graph
aggregation refactoring -->
This commit is contained in:
Tobias Koppers 2024-05-08 21:18:09 +02:00 committed by GitHub
parent 78507bcf69
commit a7ebbdef7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 44 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
Cargo.lock generated
View file

@ -321,7 +321,7 @@ dependencies = [
[[package]]
name = "auto-hash-map"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"serde",
"smallvec",
@ -3086,7 +3086,7 @@ dependencies = [
[[package]]
name = "node-file-trace"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"serde",
@ -6935,7 +6935,7 @@ dependencies = [
[[package]]
name = "turbo-tasks"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"async-trait",
@ -6966,7 +6966,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-build"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"cargo-lock",
@ -6978,7 +6978,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-bytes"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"bytes",
@ -6992,7 +6992,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-env"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"dotenvs",
@ -7006,7 +7006,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-fetch"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"lazy_static",
@ -7022,7 +7022,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-fs"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"auto-hash-map",
@ -7054,7 +7054,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-hash"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"base16",
"hex",
@ -7066,7 +7066,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-macros"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"proc-macro-error",
@ -7079,7 +7079,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-macros-shared"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"proc-macro2",
"quote",
@ -7089,7 +7089,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-malloc"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"mimalloc",
]
@ -7097,12 +7097,13 @@ dependencies = [
[[package]]
name = "turbo-tasks-memory"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"auto-hash-map",
"concurrent-queue",
"dashmap",
"indexmap 1.9.3",
"nohash-hasher",
"num_cpus",
"once_cell",
@ -7122,7 +7123,7 @@ dependencies = [
[[package]]
name = "turbopack"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"async-recursion",
@ -7152,7 +7153,7 @@ dependencies = [
[[package]]
name = "turbopack-binding"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"auto-hash-map",
"mdxjs",
@ -7192,7 +7193,7 @@ dependencies = [
[[package]]
name = "turbopack-browser"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -7215,7 +7216,7 @@ dependencies = [
[[package]]
name = "turbopack-cli-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"clap",
@ -7232,7 +7233,7 @@ dependencies = [
[[package]]
name = "turbopack-core"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"async-recursion",
@ -7261,7 +7262,7 @@ dependencies = [
[[package]]
name = "turbopack-css"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -7288,7 +7289,7 @@ dependencies = [
[[package]]
name = "turbopack-dev-server"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"async-compression",
@ -7324,7 +7325,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"async-trait",
@ -7359,7 +7360,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-hmr-protocol"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"serde",
"serde_json",
@ -7370,7 +7371,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-plugins"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"async-trait",
@ -7394,7 +7395,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-runtime"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"indoc",
@ -7410,7 +7411,7 @@ dependencies = [
[[package]]
name = "turbopack-env"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -7426,7 +7427,7 @@ dependencies = [
[[package]]
name = "turbopack-image"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"base64 0.21.4",
@ -7445,7 +7446,7 @@ dependencies = [
[[package]]
name = "turbopack-json"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"serde",
@ -7460,7 +7461,7 @@ dependencies = [
[[package]]
name = "turbopack-mdx"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"mdxjs",
@ -7475,7 +7476,7 @@ dependencies = [
[[package]]
name = "turbopack-node"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"async-stream",
@ -7509,7 +7510,7 @@ dependencies = [
[[package]]
name = "turbopack-nodejs"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -7529,7 +7530,7 @@ dependencies = [
[[package]]
name = "turbopack-resolve"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -7547,7 +7548,7 @@ dependencies = [
[[package]]
name = "turbopack-static"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"serde",
@ -7563,7 +7564,7 @@ dependencies = [
[[package]]
name = "turbopack-swc-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"swc_core",
"turbo-tasks",
@ -7574,7 +7575,7 @@ dependencies = [
[[package]]
name = "turbopack-trace-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"crossbeam-channel",
@ -7590,7 +7591,7 @@ dependencies = [
[[package]]
name = "turbopack-wasm"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.2#fdf21e050b271309fe247628c0c8d22c51c1e065"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240508.4#adfb5990c9c65e831d8c064337f25d96bf51d1a8"
dependencies = [
"anyhow",
"indexmap 1.9.3",

6
Cargo.toml
View file

@ -37,11 +37,11 @@ swc_core = { version = "0.90.33", features = [
testing = { version = "0.35.22" }
# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240508.2" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240508.4" }
# [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-240508.2" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240508.4" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240508.2" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240508.4" }
# General Deps

2
packages/next/package.json
View file

@ -200,7 +200,7 @@
"@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0",
"@vercel/nft": "0.26.4",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240508.2",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240508.4",
"acorn": "8.5.0",
"amphtml-validator": "1.0.35",
"anser": "1.4.9",

8
pnpm-lock.yaml
View file

@ -1076,8 +1076,8 @@ importers:
specifier: 0.26.4
version: 0.26.4
'@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240508.2
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240508.2'
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240508.4
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240508.4'
acorn:
specifier: 8.5.0
version: 8.5.0
@ -25749,8 +25749,8 @@ 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-240508.2':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240508.2}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240508.4':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240508.4}
name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0
dependencies: