diff --git a/Cargo.lock b/Cargo.lock index 4a428455f582..595fa930be74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "allsorts" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e926a9819dcf2211da0c19f5ca06a8f5c883e3bdb5ccc51afead3a7d995f023" +checksum = "256467e8518f46b4ddbebd7cb8df2add04a720e3a6bdd0800c3896a5fc97ae3a" dependencies = [ "bitflags 1.3.2", "bitreader", @@ -486,7 +486,6 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "serde", ] @@ -4246,7 +4245,6 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "serde", @@ -4508,25 +4506,26 @@ checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] name = "ouroboros" -version = "0.15.6" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" dependencies = [ "aliasable", "ouroboros_macro", + "static_assertions", ] [[package]] name = "ouroboros_macro" -version = "0.15.6" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" dependencies = [ - "Inflector", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.32", ] [[package]] @@ -4651,11 +4650,11 @@ dependencies = [ [[package]] name = "pathfinder_simd" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39fe46acc5503595e5949c17b818714d26fdf9b4920eacf3b2947f0199f4a6ff" +checksum = "0444332826c70dc47be74a7c6a5fc44e23a7905ad6858d4162b658320455ef93" dependencies = [ - "rustc_version 0.3.3", + "rustc_version 0.4.0", ] [[package]] @@ -5551,15 +5550,6 @@ dependencies = [ "semver 0.9.0", ] -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - [[package]] name = "rustc_version" version = "0.4.0" @@ -5722,16 +5712,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] @@ -5749,15 +5730,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "send-trace-to-jaeger" version = "0.1.0" @@ -8267,7 +8239,6 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "async-trait", @@ -8299,7 +8270,6 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "cargo-lock", @@ -8311,7 +8281,6 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "bytes", @@ -8326,7 +8295,6 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "dotenvs", @@ -8340,7 +8308,6 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8357,7 +8324,6 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "auto-hash-map", @@ -8387,7 +8353,6 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "base16", "hex", @@ -8399,7 +8364,6 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -8413,7 +8377,6 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "proc-macro2", "quote", @@ -8423,7 +8386,6 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "mimalloc", ] @@ -8431,7 +8393,6 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "auto-hash-map", @@ -8454,7 +8415,6 @@ dependencies = [ [[package]] name = "turbo-tasks-testing" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "auto-hash-map", @@ -8467,7 +8427,6 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "async-recursion", @@ -8498,7 +8457,6 @@ dependencies = [ [[package]] name = "turbopack-bench" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "chromiumoxide", @@ -8528,7 +8486,6 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "auto-hash-map", "mdxjs", @@ -8571,7 +8528,6 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8593,7 +8549,6 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "clap 4.4.2", @@ -8617,7 +8572,6 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "async-recursion", @@ -8646,7 +8600,6 @@ dependencies = [ [[package]] name = "turbopack-create-test-app" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "clap 4.4.2", @@ -8659,7 +8612,6 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "async-trait", @@ -8681,7 +8633,6 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8705,7 +8656,6 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "async-compression", @@ -8742,7 +8692,6 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "async-trait", @@ -8776,7 +8725,6 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "serde", "serde_json", @@ -8787,7 +8735,6 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "async-trait", @@ -8810,7 +8757,6 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "indoc", @@ -8827,7 +8773,6 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8843,7 +8788,6 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "base64 0.21.4", @@ -8863,7 +8807,6 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "serde", @@ -8878,7 +8821,6 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "mdxjs", @@ -8893,7 +8835,6 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "async-stream", @@ -8928,7 +8869,6 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "serde", @@ -8944,7 +8884,6 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "swc_core", "turbo-tasks", @@ -8955,7 +8894,6 @@ dependencies = [ [[package]] name = "turbopack-test-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "once_cell", @@ -8973,7 +8911,6 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230918.2#10799c6a4e57552a58bd57a1f6b4b4e89e249320" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8995,8 +8932,8 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", - "rand 0.4.6", + "cfg-if 1.0.0", + "rand 0.8.5", "static_assertions", ] diff --git a/Cargo.toml b/Cargo.toml index 2a9f1766c07b..762532a0a9e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,11 +45,11 @@ swc_core = { version = "0.83.12", features = [ testing = { version = "0.34.1" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230918.2" } +turbopack-binding = { path = "../turbo/crates/turbopack-binding" } # [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-230918.2" } +turbo-tasks= { path = "../turbo/crates/turbo-tasks" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230918.2" } +turbo-tasks-fs= { path = "../turbo/crates/turbo-tasks-fs" } # General Deps diff --git a/rust-toolchain b/rust-toolchain index cd9bf832ae2a..fe109472d242 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2023-07-21 +nightly-2023-09-21