From 9b6ede295ccbfeeefe6b3d27022953d2c41b6eeb Mon Sep 17 00:00:00 2001 From: Justin Ridgewell Date: Wed, 1 Mar 2023 00:36:17 -0500 Subject: [PATCH] build(cargo): update turbopack (#46581) # New Features - https://github.com/vercel/turbo/pull/3930 # Misc Changes - https://github.com/vercel/turbo/pull/3944 - https://github.com/vercel/turbo/pull/3774 --- packages/next-swc/Cargo.lock | 72 ++++++++++++++---------- packages/next-swc/crates/core/Cargo.toml | 4 +- packages/next-swc/crates/napi/Cargo.toml | 8 +-- packages/next-swc/crates/wasm/Cargo.toml | 2 +- 4 files changed, 49 insertions(+), 37 deletions(-) diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock index b75831c12a5c1..0b126103c3cc6 100644 --- a/packages/next-swc/Cargo.lock +++ b/packages/next-swc/Cargo.lock @@ -101,6 +101,17 @@ dependencies = [ "syn", ] +[[package]] +name = "async-recursion" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b015a331cc64ebd1774ba119538573603427eaace0a1950c423ab971f903796" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "async-trait" version = "0.1.64" @@ -126,7 +137,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "serde", ] @@ -2285,7 +2296,7 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "next-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "mdxjs", "modularize_imports", @@ -2301,7 +2312,7 @@ dependencies = [ [[package]] name = "next-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "auto-hash-map", @@ -2331,7 +2342,7 @@ dependencies = [ [[package]] name = "next-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "dunce", @@ -2357,7 +2368,7 @@ dependencies = [ [[package]] name = "next-font" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "fxhash", "serde", @@ -2411,7 +2422,7 @@ dependencies = [ [[package]] name = "next-transform-dynamic" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "pathdiff", "swc_core", @@ -2420,7 +2431,7 @@ dependencies = [ [[package]] name = "next-transform-strip-page-exports" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "fxhash", "swc_core", @@ -2430,7 +2441,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "clap", @@ -5458,7 +5469,7 @@ dependencies = [ [[package]] name = "turbo-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "mimalloc", ] @@ -5466,7 +5477,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "auto-hash-map", @@ -5496,7 +5507,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "cargo-lock", @@ -5508,7 +5519,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "dotenvy", @@ -5522,7 +5533,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "indexmap", @@ -5539,7 +5550,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "auto-hash-map", @@ -5566,7 +5577,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "base16", "hex", @@ -5578,7 +5589,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "convert_case 0.5.0", @@ -5592,7 +5603,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "proc-macro2", "quote", @@ -5602,7 +5613,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "auto-hash-map", @@ -5624,9 +5635,10 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", + "async-recursion", "indexmap", "lazy_static", "regex", @@ -5649,7 +5661,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "clap", @@ -5665,7 +5677,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "async-trait", @@ -5691,7 +5703,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "async-trait", @@ -5713,7 +5725,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "futures", @@ -5743,7 +5755,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "async-trait", @@ -5782,7 +5794,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "serde", @@ -5797,7 +5809,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "serde", @@ -5812,7 +5824,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "mdxjs", @@ -5827,7 +5839,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "futures", @@ -5851,7 +5863,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "anyhow", "serde", @@ -5867,7 +5879,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230223.3#6df2b781cc90133387e0002888e3c03b59b5d389" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230228.1#ec742f70e150381d094636eff815f40f22c5d168" dependencies = [ "swc_core", "turbo-tasks", diff --git a/packages/next-swc/crates/core/Cargo.toml b/packages/next-swc/crates/core/Cargo.toml index 1175dd0bc2e71..6c3e0ad5efba6 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", tag = "turbopack-230223.3", features = [ +next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230228.1", features = [ "__swc_core", "__swc_core_next_core", "__swc_transform_styled_jsx", @@ -29,7 +29,7 @@ next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-2 ] } [dev-dependencies] -next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230223.3", features = [ +next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230228.1", 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 85e0d7f5eddca..bd4ffa65e76f1 100644 --- a/packages/next-swc/crates/napi/Cargo.toml +++ b/packages/next-swc/crates/napi/Cargo.toml @@ -39,10 +39,10 @@ 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" -turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230223.3" } -turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230223.3" } -turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230223.3" } -next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230223.3", features = [ +turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230228.1" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230228.1" } +turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230228.1" } +next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230228.1", 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 3e272ea84b8f2..ccfa221ca2fb1 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", tag = "turbopack-230223.3", features = [ +next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230228.1", features = [ "__swc_core_binding_wasm", "__feature_mdx_rs", ] }