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

update turbopack (#61187)

Browse source 
### What?

* https://github.com/vercel/turbo/pull/7302 <!-- Tobias Koppers -
support exporting undefined -->
* https://github.com/vercel/turbo/pull/7303 <!-- Tobias Koppers -
improve HMR performance -->
* https://github.com/vercel/turbo/pull/7306 <!-- OJ Kwon - ci(test): add
wasi target check for the supported packages -->
* https://github.com/vercel/turbo/pull/7308 <!-- OJ Kwon - build(cargo):
apply formatting -->
* https://github.com/vercel/turbo/pull/7117 <!-- Tobias Koppers - track
RequestKey during resolving and avoid duplicate keys -->



Closes PACK-2299
This commit is contained in:
Tobias Koppers 2024-02-09 18:57:15 +01:00 committed by GitHub
parent d894303a02
commit 5c74ed9258
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

69
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-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"serde",
"smallvec",
@ -3513,7 +3513,7 @@ dependencies = [
[[package]]
name = "node-file-trace"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"serde",
@ -7557,7 +7557,7 @@ dependencies = [
[[package]]
name = "turbo-tasks"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"async-trait",
@ -7589,7 +7589,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-build"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"cargo-lock",
@ -7601,7 +7601,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-bytes"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"bytes",
@ -7616,7 +7616,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-env"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"dotenvs",
@ -7630,7 +7630,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-fetch"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -7647,7 +7647,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-fs"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"auto-hash-map",
@ -7678,7 +7678,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-hash"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"base16",
"hex",
@ -7690,7 +7690,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-macros"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"convert_case 0.6.0",
@ -7704,7 +7704,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-macros-shared"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"proc-macro2",
"quote",
@ -7714,7 +7714,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-malloc"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"mimalloc",
]
@ -7722,7 +7722,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-memory"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"auto-hash-map",
@ -7747,7 +7747,7 @@ dependencies = [
[[package]]
name = "turbopack"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"async-recursion",
@ -7779,7 +7779,7 @@ dependencies = [
[[package]]
name = "turbopack-binding"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"auto-hash-map",
"mdxjs",
@ -7820,7 +7820,7 @@ dependencies = [
[[package]]
name = "turbopack-build"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -7845,7 +7845,7 @@ dependencies = [
[[package]]
name = "turbopack-cli-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"clap 4.4.2",
@ -7863,7 +7863,7 @@ dependencies = [
[[package]]
name = "turbopack-core"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"async-recursion",
@ -7894,7 +7894,7 @@ dependencies = [
[[package]]
name = "turbopack-css"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"async-trait",
@ -7922,7 +7922,7 @@ dependencies = [
[[package]]
name = "turbopack-dev"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -7947,7 +7947,7 @@ dependencies = [
[[package]]
name = "turbopack-dev-server"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"async-compression",
@ -7984,10 +7984,11 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"async-trait",
"either",
"futures",
"indexmap 1.9.3",
"indoc",
@ -8019,7 +8020,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-hmr-protocol"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"serde",
"serde_json",
@ -8030,7 +8031,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-plugins"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"async-trait",
@ -8055,7 +8056,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-runtime"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"indoc",
@ -8072,7 +8073,7 @@ dependencies = [
[[package]]
name = "turbopack-env"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"indexmap 1.9.3",
@ -8088,7 +8089,7 @@ dependencies = [
[[package]]
name = "turbopack-image"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"base64 0.21.4",
@ -8108,7 +8109,7 @@ dependencies = [
[[package]]
name = "turbopack-json"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"serde",
@ -8123,7 +8124,7 @@ dependencies = [
[[package]]
name = "turbopack-mdx"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"mdxjs",
@ -8138,7 +8139,7 @@ dependencies = [
[[package]]
name = "turbopack-node"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"async-stream",
@ -8173,7 +8174,7 @@ dependencies = [
[[package]]
name = "turbopack-static"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"serde",
@ -8189,7 +8190,7 @@ dependencies = [
[[package]]
name = "turbopack-swc-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"swc_core",
"turbo-tasks",
@ -8200,7 +8201,7 @@ dependencies = [
[[package]]
name = "turbopack-trace-utils"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"crossbeam-channel",
@ -8216,7 +8217,7 @@ dependencies = [
[[package]]
name = "turbopack-wasm"
version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240207.1#ea7eea84c72222af8986dd0e802ffa5754b7e357"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240209.2#d9639a4ad4f0d95de7aa71599c332cd06350b3f5"
dependencies = [
"anyhow",
"indexmap 1.9.3",

6
Cargo.toml
View file

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

2
packages/next/package.json
View file

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

10
pnpm-lock.yaml
View file

@ -1077,8 +1077,8 @@ importers:
specifier: 0.26.3
version: 0.26.3
'@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240207.1
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240207.1(react-refresh@0.12.0)(webpack@5.90.0)'
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240209.2
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240209.2(react-refresh@0.12.0)(webpack@5.90.0)'
acorn:
specifier: 8.5.0
version: 8.5.0
@ -25655,9 +25655,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-240207.1(react-refresh@0.12.0)(webpack@5.90.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240207.1}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240207.1'
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240209.2(react-refresh@0.12.0)(webpack@5.90.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240209.2}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240209.2'
name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0
dependencies: