From 9c7c92bcab1d356a7d0a18e2c90822a0da6ae1a6 Mon Sep 17 00:00:00 2001 From: Will Binns-Smith Date: Thu, 6 Jun 2024 14:31:48 -0700 Subject: [PATCH] Update to turbopack-240606.2 (#66606) Includes: - https://github.com/vercel/turbo/pull/8346 - https://github.com/vercel/turbo/pull/8344 --- Cargo.lock | 75 +++++++++++++++++++------------------- Cargo.toml | 6 +-- packages/next/package.json | 2 +- pnpm-lock.yaml | 8 ++-- 4 files changed, 46 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 27edc5353c..97ea41a5cc 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-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "serde", "smallvec", @@ -3092,7 +3092,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "serde", @@ -6948,12 +6948,12 @@ dependencies = [ [[package]] name = "turbo-prehash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "async-trait", @@ -6985,7 +6985,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "cargo-lock", @@ -6997,7 +6997,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "bytes", @@ -7011,7 +7011,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "dotenvs", @@ -7025,7 +7025,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "lazy_static", @@ -7041,7 +7041,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "auto-hash-map", @@ -7073,7 +7073,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "md4", "turbo-tasks-macros", @@ -7083,7 +7083,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "proc-macro-error", @@ -7097,7 +7097,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "proc-macro2", "quote", @@ -7107,7 +7107,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "mimalloc", ] @@ -7115,7 +7115,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "auto-hash-map", @@ -7142,7 +7142,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "async-recursion", @@ -7172,7 +7172,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "auto-hash-map", "mdxjs", @@ -7213,7 +7213,7 @@ dependencies = [ [[package]] name = "turbopack-browser" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7236,7 +7236,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "clap", @@ -7253,7 +7253,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "async-recursion", @@ -7282,7 +7282,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7309,7 +7309,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "async-compression", @@ -7345,7 +7345,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "async-trait", @@ -7380,7 +7380,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "serde", "serde_json", @@ -7391,7 +7391,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "async-trait", @@ -7405,6 +7405,7 @@ dependencies = [ "swc_core", "swc_emotion", "swc_relay", + "tracing", "turbo-tasks", "turbo-tasks-build", "turbo-tasks-fs", @@ -7415,7 +7416,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "indoc", @@ -7431,7 +7432,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7447,7 +7448,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "base64 0.21.4", @@ -7466,7 +7467,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "serde", @@ -7481,7 +7482,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "mdxjs", @@ -7496,7 +7497,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "async-stream", @@ -7530,7 +7531,7 @@ dependencies = [ [[package]] name = "turbopack-nodejs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7550,7 +7551,7 @@ dependencies = [ [[package]] name = "turbopack-resolve" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7568,7 +7569,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "serde", @@ -7584,7 +7585,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "swc_core", "turbo-tasks", @@ -7595,7 +7596,7 @@ dependencies = [ [[package]] name = "turbopack-trace-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "either", @@ -7615,7 +7616,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "crossbeam-channel", @@ -7631,7 +7632,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240605.3#fb3a61a579a1c656c53fedb038a2b2299c08bb75" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240606.2#8a792a1d6b391c429e745835396c836e97cceb79" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 523d1410c4..a4c0be6c41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.92.10", features = [ testing = { version = "0.35.25" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240605.3" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240606.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-240605.3" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240606.2" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240605.3" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240606.2" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 20acdea7a7..a5bd5518d6 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-240605.3", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240606.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 ff8980715c..7b76abbc60 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1090,8 +1090,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-240605.3 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240605.3' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240606.2 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240606.2' acorn: specifier: 8.11.3 version: 8.11.3 @@ -25838,8 +25838,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-240605.3': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240605.3} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240606.2': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240606.2} name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: