From 152411ca6c7f186240f19375ddb5b44a856f1ff6 Mon Sep 17 00:00:00 2001 From: OJ Kwon <1210596+kwonoj@users.noreply.github.com> Date: Wed, 21 Dec 2022 13:26:49 -0800 Subject: [PATCH] build(cargo): update turbopack (#44241) This PR bumps up turbopack to latest release candidate. Requires https://github.com/vercel/next.js/pull/44223. ## Bug - [ ] Related issues linked using `fixes #number` - [ ] Integration tests added - [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md) ## Feature - [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. - [ ] Related issues linked using `fixes #number` - [ ] [e2e](https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) tests added - [ ] Documentation added - [ ] Telemetry added. In case of a feature if it's used or not. - [ ] Errors have a helpful link attached, see [`contributing.md`](https://github.com/vercel/next.js/blob/canary/contributing.md) ## Documentation / Examples - [ ] Make sure the linting passes by running `pnpm build && pnpm lint` - [ ] The "examples guidelines" are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md) --- packages/next-swc/Cargo.lock | 56 ++++++++++++------------ packages/next-swc/crates/core/Cargo.toml | 4 +- packages/next-swc/crates/napi/Cargo.toml | 2 +- packages/next-swc/crates/wasm/Cargo.toml | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock index 2946c0bbfe462..cbe0b888068d9 100644 --- a/packages/next-swc/Cargo.lock +++ b/packages/next-swc/Cargo.lock @@ -123,7 +123,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "serde", ] @@ -2224,7 +2224,7 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "next-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "mdxjs", "modularize_imports", @@ -2240,7 +2240,7 @@ dependencies = [ [[package]] name = "next-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "auto-hash-map", @@ -2268,7 +2268,7 @@ dependencies = [ [[package]] name = "next-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "futures", @@ -2293,7 +2293,7 @@ dependencies = [ [[package]] name = "next-font" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "fxhash", "serde", @@ -2344,7 +2344,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "clap", @@ -5334,7 +5334,7 @@ dependencies = [ [[package]] name = "turbo-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "mimalloc", ] @@ -5342,7 +5342,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "auto-hash-map", @@ -5371,7 +5371,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "cargo-lock", @@ -5383,7 +5383,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "dotenvy", @@ -5397,7 +5397,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "indexmap", @@ -5415,7 +5415,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "auto-hash-map", @@ -5440,7 +5440,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "base16", "hex", @@ -5452,7 +5452,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "convert_case 0.5.0", @@ -5466,7 +5466,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "proc-macro2", "quote", @@ -5476,7 +5476,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "auto-hash-map", @@ -5497,7 +5497,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "lazy_static", @@ -5521,7 +5521,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "clap", @@ -5537,7 +5537,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "async-trait", @@ -5563,7 +5563,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "async-trait", @@ -5582,7 +5582,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "futures", @@ -5611,7 +5611,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "async-trait", @@ -5645,7 +5645,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "serde", @@ -5660,7 +5660,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "serde", @@ -5675,7 +5675,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "mdxjs", @@ -5690,7 +5690,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "futures", @@ -5713,7 +5713,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "anyhow", "serde", @@ -5729,7 +5729,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=e60d88cd25d0ee2a2873151c3311abc32099c26a#e60d88cd25d0ee2a2873151c3311abc32099c26a" +source = "git+https://github.com/vercel/turbo.git?rev=d5deacebc4294f1bf4e77fea62a99309bef2c517#d5deacebc4294f1bf4e77fea62a99309bef2c517" dependencies = [ "swc_core", "turbo-tasks", diff --git a/packages/next-swc/crates/core/Cargo.toml b/packages/next-swc/crates/core/Cargo.toml index f0620d1847fd6..9f99d9c793cef 100644 --- a/packages/next-swc/crates/core/Cargo.toml +++ b/packages/next-swc/crates/core/Cargo.toml @@ -19,7 +19,7 @@ serde = "1" serde_json = "1" tracing = { version = "0.1.37", features = ["release_max_level_info"] } -next-binding = { git = "https://github.com/vercel/turbo.git", rev = "e60d88cd25d0ee2a2873151c3311abc32099c26a", features = [ +next-binding = { git = "https://github.com/vercel/turbo.git", rev = "d5deacebc4294f1bf4e77fea62a99309bef2c517", features = [ "__swc_core", "__swc_core_next_core", "__swc_transform_styled_jsx", @@ -29,7 +29,7 @@ next-binding = { git = "https://github.com/vercel/turbo.git", rev = "e60d88cd25d ] } [dev-dependencies] -next-binding = { git = "https://github.com/vercel/turbo.git", rev = "e60d88cd25d0ee2a2873151c3311abc32099c26a", features = [ +next-binding = { git = "https://github.com/vercel/turbo.git", rev = "d5deacebc4294f1bf4e77fea62a99309bef2c517", features = [ "__swc_core_testing_transform", "__swc_testing", ] } diff --git a/packages/next-swc/crates/napi/Cargo.toml b/packages/next-swc/crates/napi/Cargo.toml index a41bb685a2d55..8deeffe31fbf5 100644 --- a/packages/next-swc/crates/napi/Cargo.toml +++ b/packages/next-swc/crates/napi/Cargo.toml @@ -39,7 +39,7 @@ tracing = { version = "0.1.37", features = ["release_max_level_info"] } tracing-futures = "0.2.5" tracing-subscriber = "0.3.9" tracing-chrome = "0.5.0" -next-binding = { git = "https://github.com/vercel/turbo.git", rev = "e60d88cd25d0ee2a2873151c3311abc32099c26a", features = [ +next-binding = { git = "https://github.com/vercel/turbo.git", rev = "d5deacebc4294f1bf4e77fea62a99309bef2c517", features = [ "__swc_core_binding_napi", "__turbo_next_dev_server", "__turbo_node_file_trace", diff --git a/packages/next-swc/crates/wasm/Cargo.toml b/packages/next-swc/crates/wasm/Cargo.toml index c2c26e76ae280..288f4f2fc683b 100644 --- a/packages/next-swc/crates/wasm/Cargo.toml +++ b/packages/next-swc/crates/wasm/Cargo.toml @@ -31,7 +31,7 @@ wasm-bindgen-futures = "0.4.8" getrandom = { version = "0.2.5", optional = true, default-features = false } js-sys = "0.3.59" serde-wasm-bindgen = "0.4.3" -next-binding = { git = "https://github.com/vercel/turbo.git", rev = "e60d88cd25d0ee2a2873151c3311abc32099c26a", features = [ +next-binding = { git = "https://github.com/vercel/turbo.git", rev = "d5deacebc4294f1bf4e77fea62a99309bef2c517", features = [ "__swc_core_binding_wasm", "__feature_mdx_rs", ] }