From 1b8e30a0fe0570b6fca0094ec7af924fef67b5c0 Mon Sep 17 00:00:00 2001 From: Tim Neutkens Date: Sat, 25 May 2024 20:00:56 +0200 Subject: [PATCH] Upgrade Turbopack --- Cargo.lock | 80 +++++++++++++++++--------------------- Cargo.toml | 6 +-- packages/next/package.json | 2 +- pnpm-lock.yaml | 8 ++-- 4 files changed, 44 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 20e33b068aada3..012e9697dceeaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -321,7 +321,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "serde", "smallvec", @@ -399,12 +399,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base16" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27c3610c36aee21ce8ac510e6224498de4228ad772a171ed65643a24693a5a8" - [[package]] name = "base64" version = "0.13.1" @@ -3098,7 +3092,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "serde", @@ -6944,7 +6938,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "async-trait", @@ -6976,7 +6970,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "cargo-lock", @@ -6988,7 +6982,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "bytes", @@ -7002,7 +6996,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "dotenvs", @@ -7016,7 +7010,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "lazy_static", @@ -7032,7 +7026,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "auto-hash-map", @@ -7064,10 +7058,8 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ - "base16", - "hex", "md4", "turbo-tasks-macros", "twox-hash", @@ -7076,7 +7068,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "proc-macro-error", @@ -7090,7 +7082,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "proc-macro2", "quote", @@ -7100,7 +7092,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "mimalloc", ] @@ -7108,7 +7100,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "auto-hash-map", @@ -7134,7 +7126,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "async-recursion", @@ -7164,7 +7156,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "auto-hash-map", "mdxjs", @@ -7205,7 +7197,7 @@ dependencies = [ [[package]] name = "turbopack-browser" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7228,7 +7220,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "clap", @@ -7245,7 +7237,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "async-recursion", @@ -7274,7 +7266,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7301,7 +7293,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "async-compression", @@ -7337,7 +7329,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "async-trait", @@ -7372,7 +7364,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "serde", "serde_json", @@ -7383,7 +7375,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "async-trait", @@ -7407,7 +7399,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "indoc", @@ -7423,7 +7415,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7439,7 +7431,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "base64 0.21.4", @@ -7458,7 +7450,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "serde", @@ -7473,7 +7465,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "mdxjs", @@ -7488,7 +7480,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "async-stream", @@ -7522,7 +7514,7 @@ dependencies = [ [[package]] name = "turbopack-nodejs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7542,7 +7534,7 @@ dependencies = [ [[package]] name = "turbopack-resolve" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7560,7 +7552,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "serde", @@ -7576,7 +7568,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "swc_core", "turbo-tasks", @@ -7587,7 +7579,7 @@ dependencies = [ [[package]] name = "turbopack-trace-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "either", @@ -7607,7 +7599,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "crossbeam-channel", @@ -7623,7 +7615,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240521.2#2af6b12b3dc142316a2ba882ea5332c9a847f2a4" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240525.2#9004d1bfd30f7e113e839662be4d552d45163c60" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index d0e16eed056a1c..5fb9ba3c882c96 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.92.5", features = [ testing = { version = "0.35.24" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240521.2" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240525.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-240521.2" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240525.2" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240521.2" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240525.2" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 66b3f518dfe0f4..4fbcc73fd86f32 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -206,7 +206,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.27.1", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240521.2", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240525.2", "acorn": "8.11.3", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5bc5b42b35dcc5..6b87dc4597ce5d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1085,8 +1085,8 @@ importers: specifier: 0.27.1 version: 0.27.1 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240521.2 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240521.2' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240525.2 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240525.2' acorn: specifier: 8.11.3 version: 8.11.3 @@ -25800,8 +25800,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-240521.2': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240521.2} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240525.2': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240525.2} name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: