diff --git a/.cargo/config.toml b/.cargo/config.toml index 9f2f0965b0174..aed6b4bfce1a7 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -3,12 +3,21 @@ CARGO_WORKSPACE_DIR = { value = "", relative = true } TURBO_PNPM_WORKSPACE_DIR = { value = "", relative = true } [build] -rustflags = ["--cfg", "tokio_unstable"] +rustflags = [ + "--cfg", + "tokio_unstable", + "-Zshare-generics=y", # make the current crate share its generic instantiations + "-Zthreads=8", # parallel frontend https://blog.rust-lang.org/2023/11/09/parallel-rustc.html + "-Csymbol-mangling-version=v0", +] rustdocflags = ["-Znormalize-docs"] [target.x86_64-pc-windows-msvc] linker = "rust-lld" +[target.aarch64-apple-darwin] +linker = "rust-lld" + [alias] xtask = "run --package xtask --" tr-build = "build -p turbo" @@ -21,11 +30,3 @@ tp-test = "nextest run --workspace --release --no-fail-fast --exclude turbo --ex tp-bench-test = "test --benches --workspace --release --no-fail-fast --exclude turbopack-bench --exclude turbo --exclude turborepo-* --exclude turbopath --exclude wax --exclude globwalk --exclude globwatch --exclude pidlock" tp-check = "check --workspace --exclude turbo --exclude turborepo-* --exclude turbopath --exclude wax --exclude globwalk --exclude globwatch --exclude pidlock" tp-clippy = "clippy --workspace --exclude turbo --exclude turborepo-* --exclude turbopath --exclude wax --exclude globwalk --exclude globwatch --exclude pidlock" - -[target.'cfg(all())'] -rustflags = [ - "--cfg", - "tokio_unstable", - "-Zshare-generics=y", - "-Csymbol-mangling-version=v0", -] diff --git a/Cargo.lock b/Cargo.lock index 7fd1dd5350e3b..443116879afe3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -637,18 +637,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "axum-macros" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb524613be645939e280b7279f7b017f98cf7f5ef084ec374df373530e73277" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.32", -] - [[package]] name = "axum-server" version = "0.4.7" @@ -3360,13 +3348,10 @@ dependencies = [ name = "globwatch" version = "0.1.0" dependencies = [ - "camino", "futures 0.3.28", "itertools 0.10.5", "merge-streams", "notify 5.1.0", - "notify-debouncer-mini", - "pin-project", "stop-token", "test-case", "thiserror", @@ -3377,7 +3362,6 @@ dependencies = [ "tracing-test", "turbopath", "unic-segment", - "walkdir", ] [[package]] @@ -4180,12 +4164,6 @@ dependencies = [ "serde", ] -[[package]] -name = "json_comments" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ee439ee368ba4a77ac70d04f14015415af8600d6c894dc1f11bd79758c57d5" - [[package]] name = "jsonc-parser" version = "0.21.0" @@ -5266,15 +5244,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "notify-debouncer-mini" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e23e9fa24f094b143c1eb61f90ac6457de87be6987bc70746e0179f7dbc9007b" -dependencies = [ - "notify 5.1.0", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -6321,15 +6290,6 @@ dependencies = [ "unicase 2.6.0", ] -[[package]] -name = "qstring" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" -dependencies = [ - "percent-encoding 2.3.0", -] - [[package]] name = "quick-error" version = "2.0.1" @@ -6991,16 +6951,6 @@ dependencies = [ "semver 0.9.0", ] -[[package]] -name = "rustc_version_runtime" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd18cd2bae1820af0b6ad5e54f4a51d0f3fcc53b05f845675074efcc7af071d" -dependencies = [ - "rustc_version 0.4.0", - "semver 1.0.18", -] - [[package]] name = "rustix" version = "0.37.23" @@ -10188,20 +10138,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "tonic-reflection" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67494bad4dda4c9bffae901dfe14e2b2c0f760adb4706dc10beeb81799f7f7b2" -dependencies = [ - "bytes 1.5.0", - "prost", - "prost-types", - "tokio", - "tokio-stream", - "tonic", -] - [[package]] name = "tower" version = "0.4.13" @@ -10273,7 +10209,6 @@ name = "tower-uds" version = "0.1.0" dependencies = [ "async-io", - "http", "tokio", "tokio-util", "tower", @@ -10465,20 +10400,10 @@ dependencies = [ "anyhow", "assert_cmd", "build-target", - "clap 4.4.2", - "clap_complete", - "command-group", - "dunce", "human-panic", "itertools 0.10.5", "miette 5.10.0", "pretty_assertions", - "serde", - "serde_json", - "serde_yaml 0.9.27", - "tiny-gradient", - "tokio-util", - "tracing", "turborepo-lib", "winapi 0.3.9", ] @@ -10506,7 +10431,6 @@ dependencies = [ "serde_json", "serde_regex", "serde_test", - "stable_deref_trait", "thiserror", "tokio", "tracing", @@ -10536,7 +10460,6 @@ dependencies = [ "serde", "serde_bytes", "serde_test", - "tokio", "turbo-tasks", "turbo-tasks-build", ] @@ -10560,7 +10483,6 @@ version = "0.1.0" dependencies = [ "anyhow", "httpmock", - "indexmap 1.9.3", "lazy_static", "reqwest", "serde", @@ -10625,7 +10547,6 @@ name = "turbo-tasks-macros" version = "0.1.0" dependencies = [ "anyhow", - "convert_case 0.6.0", "proc-macro-error", "proc-macro2", "quote", @@ -10743,9 +10664,7 @@ dependencies = [ "turbopack-core", "turbopack-css", "turbopack-ecmascript", - "turbopack-ecmascript-plugins", "turbopack-env", - "turbopack-image", "turbopack-json", "turbopack-mdx", "turbopack-node", @@ -10759,12 +10678,8 @@ version = "0.1.0" dependencies = [ "anyhow", "chromiumoxide", - "clap 4.4.2", - "console-subscriber", "criterion", - "dunce", "futures 0.3.28", - "mime 0.3.17", "nix 0.26.2", "once_cell", "owo-colors", @@ -10772,7 +10687,6 @@ dependencies = [ "portpicker", "rand 0.8.5", "regex", - "serde", "serde_json", "tempfile", "tokio", @@ -10781,7 +10695,6 @@ dependencies = [ "turbo-tasks-testing", "turbopack-create-test-app", "url 2.4.1", - "webbrowser", ] [[package]] @@ -10846,9 +10759,6 @@ dependencies = [ "indexmap 1.9.3", "indoc", "serde", - "serde_json", - "serde_qs", - "sourcemap", "swc_core", "tracing", "turbo-tasks", @@ -10856,7 +10766,6 @@ dependencies = [ "turbo-tasks-fs", "turbo-tasks-hash", "turbopack-core", - "turbopack-css", "turbopack-ecmascript", "turbopack-ecmascript-runtime", "urlencoding", @@ -10873,13 +10782,10 @@ dependencies = [ "dunce", "futures 0.3.28", "mime 0.3.17", - "once_cell", "owo-colors", "regex", "serde", - "serde_json", "tokio", - "tracing", "tracing-signpost", "tracing-subscriber", "turbo-tasks", @@ -10911,7 +10817,6 @@ dependencies = [ "anyhow", "clap 4.4.2", "crossterm 0.26.1", - "once_cell", "owo-colors", "serde", "turbo-tasks", @@ -10925,15 +10830,9 @@ dependencies = [ name = "turbopack-convert-trace" version = "0.1.0" dependencies = [ - "anyhow", - "clap 4.4.2", - "futures 0.3.28", "indexmap 1.9.3", "intervaltree", - "itertools 0.10.5", - "owo-colors", "postcard", - "serde", "serde_json", "turbopack-trace-utils", ] @@ -10952,13 +10851,11 @@ dependencies = [ "lazy_static", "once_cell", "patricia_tree", - "qstring", "ref-cast", "regex", "rstest", "serde", "serde_json", - "serde_qs", "sourcemap", "swc_core", "tokio", @@ -10989,12 +10886,10 @@ name = "turbopack-css" version = "0.1.0" dependencies = [ "anyhow", - "async-trait", "indexmap 1.9.3", "indoc", "lightningcss", "once_cell", - "parcel_selectors", "parcel_sourcemap", "regex", "serde", @@ -11021,7 +10916,6 @@ dependencies = [ "serde", "serde_json", "serde_qs", - "swc_core", "tracing", "turbo-tasks", "turbo-tasks-build", @@ -11029,7 +10923,6 @@ dependencies = [ "turbo-tasks-hash", "turbopack", "turbopack-core", - "turbopack-css", "turbopack-ecmascript", "turbopack-ecmascript-runtime", "urlencoding", @@ -11048,7 +10941,6 @@ dependencies = [ "indexmap 1.9.3", "mime 0.3.17", "mime_guess", - "once_cell", "parking_lot 0.12.1", "pin-project-lite", "serde", @@ -11079,7 +10971,6 @@ dependencies = [ "async-trait", "criterion", "either", - "futures 0.3.28", "indexmap 1.9.3", "indoc", "lazy_static", @@ -11088,13 +10979,11 @@ dependencies = [ "once_cell", "parking_lot 0.12.1", "petgraph", - "pin-project-lite", "regex", "rstest", "rustc-hash", "serde", "serde_json", - "serde_qs", "sourcemap", "swc_core", "tokio", @@ -11129,7 +11018,6 @@ dependencies = [ "indexmap 1.9.3", "lightningcss", "modularize_imports", - "parcel_selectors", "serde", "serde_json", "styled_components", @@ -11151,7 +11039,6 @@ dependencies = [ "anyhow", "indoc", "serde", - "swc_core", "turbo-tasks", "turbo-tasks-build", "turbo-tasks-fs", @@ -11182,7 +11069,6 @@ dependencies = [ "anyhow", "base64 0.21.4", "image", - "indexmap 1.9.3", "mime 0.3.17", "once_cell", "regex", @@ -11228,7 +11114,6 @@ version = "0.1.0" dependencies = [ "anyhow", "async-stream", - "bytes 1.5.0", "const_format", "futures 0.3.28", "futures-retry", @@ -11333,13 +11218,9 @@ name = "turbopack-trace-server" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.4.2", "either", - "futures 0.3.28", "indexmap 1.9.3", - "intervaltree", "itertools 0.10.5", - "owo-colors", "postcard", "serde", "serde_json", @@ -11373,7 +11254,6 @@ dependencies = [ "turbo-tasks", "turbo-tasks-build", "turbo-tasks-fs", - "turbo-tasks-hash", "turbopack-core", "turbopack-ecmascript", "wasmparser 0.110.0", @@ -11424,7 +11304,7 @@ dependencies = [ "port_scanner", "regex", "reqwest", - "rustc_version_runtime 0.2.1", + "rustc_version_runtime", "serde", "serde_json", "test-case", @@ -11453,7 +11333,6 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tempfile", "thiserror", "tokio", "tracing", @@ -11472,14 +11351,9 @@ version = "0.1.0" dependencies = [ "anyhow", "base64 0.21.4", - "bytes 1.5.0", "camino", - "chrono", - "dunce", "futures 0.3.28", - "hex", "hmac", - "lazy_static", "libc", "os_str_bytes", "path-clean 1.0.1", @@ -11498,7 +11372,6 @@ dependencies = [ "turbopath", "turborepo-analytics", "turborepo-api-client", - "turborepo-ui", "turborepo-vercel-api-mock", "zstd", ] @@ -11524,7 +11397,6 @@ name = "turborepo-env" version = "0.1.0" dependencies = [ "hex", - "lazy_static", "regex", "serde", "sha2", @@ -11547,9 +11419,7 @@ dependencies = [ name = "turborepo-filewatch" version = "0.1.0" dependencies = [ - "anyhow", "bitflags 1.3.2", - "dashmap", "fsevent-sys", "futures 0.3.28", "itertools 0.10.5", @@ -11600,9 +11470,6 @@ dependencies = [ "async-io", "async-stream", "atty", - "axum", - "axum-server", - "biome_console", "biome_deserialize", "biome_diagnostics", "biome_json_parser", @@ -11628,19 +11495,13 @@ dependencies = [ "globwatch", "go-parse-duration", "hex", - "hostname", "humantime", - "indicatif", - "is-terminal", "itertools 0.10.5", - "json_comments", "jsonc-parser 0.21.0", - "lazy-regex", "lazy_static", "libc", "miette 5.10.0", "nix 0.26.2", - "node-semver", "notify 5.1.0", "num_cpus", "owo-colors", @@ -11656,7 +11517,6 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustc_version_runtime 0.2.1", "semver 1.0.18", "serde", "serde_json", @@ -11678,7 +11538,6 @@ dependencies = [ "tokio-util", "tonic", "tonic-build", - "tonic-reflection", "tower", "tracing", "tracing-appender", @@ -11707,7 +11566,6 @@ dependencies = [ "turborepo-vercel-api-mock", "twox-hash", "uds_windows", - "url 2.4.1", "wax", "webbrowser", "which", @@ -11739,19 +11597,13 @@ name = "turborepo-lsp" version = "0.1.0" dependencies = [ "crop", - "futures 0.3.28", "itertools 0.10.5", "jsonc-parser 0.23.0", "pidlock", "serde_json", "tokio", "tokio-retry", - "tokio-util", - "tower", "tower-lsp", - "tower-uds", - "tracing", - "tracing-subscriber", "turbopath", "turborepo-lib", "turborepo-repository", @@ -11829,12 +11681,10 @@ dependencies = [ "async-trait", "chrono", "config", - "dirs-next", "futures 0.3.28", "hex", "once_cell", "reqwest", - "rustc_version_runtime 0.3.0", "serde", "serde_json", "sha2", @@ -11865,7 +11715,6 @@ dependencies = [ "thiserror", "tracing", "turbopath", - "turborepo-ci", ] [[package]] @@ -11886,7 +11735,6 @@ version = "0.1.0" dependencies = [ "anyhow", "axum", - "axum-macros", "axum-server", "futures-util", "port_scanner", diff --git a/crates/tower-uds/Cargo.toml b/crates/tower-uds/Cargo.toml index 35b12062e32c3..451fea5c71a18 100644 --- a/crates/tower-uds/Cargo.toml +++ b/crates/tower-uds/Cargo.toml @@ -7,7 +7,6 @@ license = "MPL-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -http = "0.2.11" tokio = { workspace = true, features = ["net"] } tower = { version = "0.4.13", features = ["util"] } diff --git a/crates/turbo-tasks-bytes/Cargo.toml b/crates/turbo-tasks-bytes/Cargo.toml index 2985b22142753..657a9ebcdca38 100644 --- a/crates/turbo-tasks-bytes/Cargo.toml +++ b/crates/turbo-tasks-bytes/Cargo.toml @@ -17,7 +17,6 @@ bytes = { workspace = true } futures = { workspace = true } serde = { workspace = true } serde_bytes = "0.11.9" -tokio = { workspace = true } turbo-tasks = { workspace = true } [dev-dependencies] diff --git a/crates/turbo-tasks-fetch/Cargo.toml b/crates/turbo-tasks-fetch/Cargo.toml index 1fa1a5f58dd6c..a26f541154e2b 100644 --- a/crates/turbo-tasks-fetch/Cargo.toml +++ b/crates/turbo-tasks-fetch/Cargo.toml @@ -20,7 +20,6 @@ workspace = true [dependencies] anyhow = { workspace = true } -indexmap = { workspace = true } lazy_static = { workspace = true } reqwest = { workspace = true } serde = { workspace = true } diff --git a/crates/turbo-tasks-macros/Cargo.toml b/crates/turbo-tasks-macros/Cargo.toml index d21b91e151f09..984ad25fbe8d3 100644 --- a/crates/turbo-tasks-macros/Cargo.toml +++ b/crates/turbo-tasks-macros/Cargo.toml @@ -14,7 +14,6 @@ workspace = true [dependencies] anyhow = { workspace = true } -convert_case = "0.6.0" proc-macro-error = "1.0.4" proc-macro2 = { workspace = true } quote = { workspace = true } diff --git a/crates/turbo-tasks/Cargo.toml b/crates/turbo-tasks/Cargo.toml index 6ceccb0af21da..330affe279574 100644 --- a/crates/turbo-tasks/Cargo.toml +++ b/crates/turbo-tasks/Cargo.toml @@ -37,7 +37,6 @@ regex = { workspace = true } serde = { workspace = true, features = ["rc", "derive"] } serde_json = { workspace = true } serde_regex = "1.1.0" -stable_deref_trait = "1.2.0" thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } tracing = { workspace = true } diff --git a/crates/turbopack-bench/Cargo.toml b/crates/turbopack-bench/Cargo.toml index 3ecb2495619f7..3646b0bba790e 100644 --- a/crates/turbopack-bench/Cargo.toml +++ b/crates/turbopack-bench/Cargo.toml @@ -21,19 +21,14 @@ anyhow = { workspace = true, features = ["backtrace"] } chromiumoxide = { workspace = true, features = [ "tokio-runtime", ], default-features = false } -clap = { workspace = true, features = ["derive", "env"], optional = true } -console-subscriber = { workspace = true, optional = true } criterion = { workspace = true, features = ["async_tokio"] } -dunce = { workspace = true } futures = { workspace = true } -mime = { workspace = true } once_cell = { workspace = true } owo-colors = { workspace = true } parking_lot = { workspace = true } portpicker = "0.1.1" rand = { workspace = true } regex = { workspace = true } -serde = { workspace = true } serde_json = { workspace = true } tempfile = { workspace = true } tokio = { workspace = true, features = ["full"] } @@ -42,7 +37,6 @@ turbo-tasks = { workspace = true } turbo-tasks-testing = { workspace = true } turbopack-create-test-app = { workspace = true } url = { workspace = true } -webbrowser = { workspace = true } [target.'cfg(unix)'.dependencies] nix = "0.26.1" diff --git a/crates/turbopack-build/Cargo.toml b/crates/turbopack-build/Cargo.toml index 608cdbc7de3c1..dcef6ee0d0046 100644 --- a/crates/turbopack-build/Cargo.toml +++ b/crates/turbopack-build/Cargo.toml @@ -23,9 +23,6 @@ anyhow = { workspace = true } indexmap = { workspace = true } indoc = { workspace = true } serde = { workspace = true } -serde_json = { workspace = true } -serde_qs = { workspace = true } -sourcemap = { workspace = true } swc_core = { workspace = true, features = [ "__parser", "ecma_minifier", @@ -38,7 +35,6 @@ turbo-tasks = { workspace = true } turbo-tasks-fs = { workspace = true } turbo-tasks-hash = { workspace = true } turbopack-core = { workspace = true } -turbopack-css = { workspace = true } turbopack-ecmascript = { workspace = true } turbopack-ecmascript-runtime = { workspace = true } diff --git a/crates/turbopack-cli-utils/Cargo.toml b/crates/turbopack-cli-utils/Cargo.toml index 925ab37954b07..e6394b5f2e629 100644 --- a/crates/turbopack-cli-utils/Cargo.toml +++ b/crates/turbopack-cli-utils/Cargo.toml @@ -18,7 +18,6 @@ workspace = true anyhow = { workspace = true } clap = { workspace = true, features = ["derive"] } crossterm = "0.26.0" -once_cell = { workspace = true } owo-colors = { workspace = true } serde = { workspace = true, features = ["derive"] } turbo-tasks = { workspace = true } diff --git a/crates/turbopack-cli/Cargo.toml b/crates/turbopack-cli/Cargo.toml index d2f98506ee966..2d6477cac0f3d 100644 --- a/crates/turbopack-cli/Cargo.toml +++ b/crates/turbopack-cli/Cargo.toml @@ -42,16 +42,12 @@ workspace = true anyhow = { workspace = true, features = ["backtrace"] } clap = { workspace = true, features = ["derive", "env"] } console-subscriber = { workspace = true, optional = true } -criterion = { workspace = true, features = ["async_tokio"] } dunce = { workspace = true } futures = { workspace = true } mime = { workspace = true } -once_cell = { workspace = true } owo-colors = { workspace = true } serde = { workspace = true } -serde_json = { workspace = true } tokio = { workspace = true, features = ["full"] } -tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter", "json"] } turbo-tasks = { workspace = true } turbo-tasks-env = { workspace = true } @@ -75,6 +71,7 @@ turbopack-trace-utils = { workspace = true } webbrowser = { workspace = true } [dev-dependencies] +criterion = { workspace = true, features = ["async_tokio"] } regex = { workspace = true } turbopack-bench = { workspace = true } diff --git a/crates/turbopack-convert-trace/Cargo.toml b/crates/turbopack-convert-trace/Cargo.toml index 3dc21d88ddcdf..6e6fec4938994 100644 --- a/crates/turbopack-convert-trace/Cargo.toml +++ b/crates/turbopack-convert-trace/Cargo.toml @@ -15,14 +15,8 @@ bench = false workspace = true [dependencies] -anyhow = { workspace = true, features = ["backtrace"] } -clap = { workspace = true, features = ["derive", "env"] } -futures = { workspace = true } indexmap = { workspace = true, features = ["serde"] } intervaltree = "0.2.7" -itertools = { workspace = true } -owo-colors = { workspace = true } postcard = { workspace = true } -serde = { workspace = true } serde_json = { workspace = true } turbopack-trace-utils = { workspace = true } diff --git a/crates/turbopack-core/Cargo.toml b/crates/turbopack-core/Cargo.toml index 5173ed6177317..a5d30aae00ee5 100644 --- a/crates/turbopack-core/Cargo.toml +++ b/crates/turbopack-core/Cargo.toml @@ -23,12 +23,10 @@ indexmap = { workspace = true } lazy_static = { workspace = true } once_cell = { workspace = true } patricia_tree = "0.5.5" -qstring = { workspace = true } ref-cast = "1.0.20" regex = { workspace = true } serde = { workspace = true, features = ["rc"] } serde_json = { workspace = true, features = ["preserve_order"] } -serde_qs = { workspace = true } sourcemap = { workspace = true } swc_core = { workspace = true, features = ["ecma_preset_env", "common"] } tracing = { workspace = true } diff --git a/crates/turbopack-css/Cargo.toml b/crates/turbopack-css/Cargo.toml index f6f3c6dd45f32..dfab81efe800c 100644 --- a/crates/turbopack-css/Cargo.toml +++ b/crates/turbopack-css/Cargo.toml @@ -14,12 +14,10 @@ workspace = true [dependencies] anyhow = { workspace = true } -async-trait = { workspace = true } indexmap = { workspace = true } indoc = { workspace = true } lightningcss = { workspace = true } once_cell = { workspace = true } -parcel_selectors = { workspace = true } regex = { workspace = true } serde = { workspace = true } urlencoding = { workspace = true } diff --git a/crates/turbopack-dev-server/Cargo.toml b/crates/turbopack-dev-server/Cargo.toml index 24be925ba4625..99d581864d192 100644 --- a/crates/turbopack-dev-server/Cargo.toml +++ b/crates/turbopack-dev-server/Cargo.toml @@ -25,7 +25,6 @@ hyper-tungstenite = "0.9.0" indexmap = { workspace = true, features = ["serde"] } mime = { workspace = true } mime_guess = "2.0.4" -once_cell = { workspace = true } parking_lot = { workspace = true } pin-project-lite = { workspace = true } serde = { workspace = true } diff --git a/crates/turbopack-dev/Cargo.toml b/crates/turbopack-dev/Cargo.toml index 8f2a26c6a8a38..75ba06687a144 100644 --- a/crates/turbopack-dev/Cargo.toml +++ b/crates/turbopack-dev/Cargo.toml @@ -33,11 +33,8 @@ turbo-tasks-fs = { workspace = true } turbo-tasks-hash = { workspace = true } turbopack = { workspace = true } turbopack-core = { workspace = true } -turbopack-css = { workspace = true } turbopack-ecmascript = { workspace = true } turbopack-ecmascript-runtime = { workspace = true } -swc_core = { workspace = true } - [build-dependencies] turbo-tasks-build = { workspace = true } diff --git a/crates/turbopack-ecmascript-plugins/Cargo.toml b/crates/turbopack-ecmascript-plugins/Cargo.toml index dccd8a3664c4d..d55d6586cae28 100644 --- a/crates/turbopack-ecmascript-plugins/Cargo.toml +++ b/crates/turbopack-ecmascript-plugins/Cargo.toml @@ -26,7 +26,6 @@ anyhow = { workspace = true } async-trait = { workspace = true } indexmap = { workspace = true } lightningcss = { workspace = true } -parcel_selectors = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/crates/turbopack-ecmascript-runtime/Cargo.toml b/crates/turbopack-ecmascript-runtime/Cargo.toml index 0a2dd0da02109..a9899deabda2c 100644 --- a/crates/turbopack-ecmascript-runtime/Cargo.toml +++ b/crates/turbopack-ecmascript-runtime/Cargo.toml @@ -29,7 +29,5 @@ turbopack = { workspace = true } turbopack-core = { workspace = true } turbopack-ecmascript = { workspace = true } -swc_core = { workspace = true } - [build-dependencies] turbo-tasks-build = { workspace = true } diff --git a/crates/turbopack-ecmascript/Cargo.toml b/crates/turbopack-ecmascript/Cargo.toml index cbfc991f679e4..353e3561fded1 100644 --- a/crates/turbopack-ecmascript/Cargo.toml +++ b/crates/turbopack-ecmascript/Cargo.toml @@ -16,7 +16,6 @@ workspace = true anyhow = { workspace = true } async-trait = { workspace = true } either = { workspace = true } -futures = { workspace = true } indexmap = { workspace = true } indoc = { workspace = true } lazy_static = { workspace = true } @@ -25,12 +24,10 @@ num-traits = "0.2.15" once_cell = { workspace = true } parking_lot = { workspace = true } petgraph = { workspace = true } -pin-project-lite = { workspace = true } regex = { workspace = true } rustc-hash = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -serde_qs = { workspace = true } sourcemap = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } diff --git a/crates/turbopack-ecmascript/src/tree_shake/tests.rs b/crates/turbopack-ecmascript/src/tree_shake/tests.rs index 0ac58b17f910a..443016552df60 100644 --- a/crates/turbopack-ecmascript/src/tree_shake/tests.rs +++ b/crates/turbopack-ecmascript/src/tree_shake/tests.rs @@ -283,7 +283,7 @@ fn print(cm: &Arc, nodes: &[&N]) -> fn render_graph(item_ids: &[ItemId], g: &mut DepGraph) -> String { let mut mermaid = String::from("graph TD\n"); - for (_, id) in item_ids.iter().enumerate() { + for id in item_ids.iter() { let i = g.g.node(id); writeln!(mermaid, " Item{};", i + 1).unwrap(); diff --git a/crates/turbopack-image/Cargo.toml b/crates/turbopack-image/Cargo.toml index ae99707d6baac..0c19f99a5ef8b 100644 --- a/crates/turbopack-image/Cargo.toml +++ b/crates/turbopack-image/Cargo.toml @@ -29,7 +29,6 @@ image = { workspace = true, default-features = false, features = [ "bmp", "tga", ] } -indexmap = { workspace = true } mime = { workspace = true } once_cell = { workspace = true } regex = { workspace = true } diff --git a/crates/turbopack-node/Cargo.toml b/crates/turbopack-node/Cargo.toml index f1870d3aa982f..2b85e75e771c7 100644 --- a/crates/turbopack-node/Cargo.toml +++ b/crates/turbopack-node/Cargo.toml @@ -19,7 +19,6 @@ workspace = true [dependencies] anyhow = { workspace = true } async-stream = "0.3.4" -bytes = { workspace = true } const_format = "0.2.30" futures = { workspace = true } futures-retry = { workspace = true } diff --git a/crates/turbopack-trace-server/Cargo.toml b/crates/turbopack-trace-server/Cargo.toml index 01dd9323d4978..1ae28df1e05d4 100644 --- a/crates/turbopack-trace-server/Cargo.toml +++ b/crates/turbopack-trace-server/Cargo.toml @@ -13,13 +13,9 @@ bench = false [dependencies] anyhow = { workspace = true, features = ["backtrace"] } -clap = { workspace = true, features = ["derive", "env"] } either = { workspace = true } -futures = { workspace = true } indexmap = { workspace = true } -intervaltree = "0.2.7" itertools = { workspace = true } -owo-colors = { workspace = true } postcard = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/crates/turbopack-wasm/Cargo.toml b/crates/turbopack-wasm/Cargo.toml index dc30eafd076a2..5628920ad32cb 100644 --- a/crates/turbopack-wasm/Cargo.toml +++ b/crates/turbopack-wasm/Cargo.toml @@ -19,7 +19,6 @@ indoc = { workspace = true } serde = { workspace = true } turbo-tasks = { workspace = true } turbo-tasks-fs = { workspace = true } -turbo-tasks-hash = { workspace = true } turbopack-core = { workspace = true } turbopack-ecmascript = { workspace = true } wasmparser = "0.110.0" diff --git a/crates/turbopack/Cargo.toml b/crates/turbopack/Cargo.toml index 11b6120ec315a..28cb1f2788417 100644 --- a/crates/turbopack/Cargo.toml +++ b/crates/turbopack/Cargo.toml @@ -34,9 +34,7 @@ turbo-tasks-fs = { workspace = true } turbopack-core = { workspace = true } turbopack-css = { workspace = true } turbopack-ecmascript = { workspace = true } -turbopack-ecmascript-plugins = { workspace = true } turbopack-env = { workspace = true } -turbopack-image = { workspace = true } turbopack-json = { workspace = true } turbopack-mdx = { workspace = true } turbopack-node = { workspace = true } diff --git a/crates/turbopack/tests/node-file-trace.rs b/crates/turbopack/tests/node-file-trace.rs index 9c050adff889e..7335630410ba6 100644 --- a/crates/turbopack/tests/node-file-trace.rs +++ b/crates/turbopack/tests/node-file-trace.rs @@ -740,7 +740,7 @@ impl std::str::FromStr for CaseInput { async fn print_graph(asset: Vc>) -> Result<()> { let mut visited = HashSet::new(); let mut queue = Vec::new(); - queue.push((0, asset.clone())); + queue.push((0, asset)); while let Some((depth, asset)) = queue.pop() { let references = asset.references().await?; let mut indent = String::new(); diff --git a/crates/turborepo-auth/Cargo.toml b/crates/turborepo-auth/Cargo.toml index 7f468bea47aee..8860a14ae6f1e 100644 --- a/crates/turborepo-auth/Cargo.toml +++ b/crates/turborepo-auth/Cargo.toml @@ -18,7 +18,6 @@ lazy_static.workspace = true reqwest.workspace = true serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -tempfile.workspace = true thiserror = "1.0.38" tokio.workspace = true tracing.workspace = true diff --git a/crates/turborepo-cache/Cargo.toml b/crates/turborepo-cache/Cargo.toml index 8f59991e60ad1..39db432bcf79d 100644 --- a/crates/turborepo-cache/Cargo.toml +++ b/crates/turborepo-cache/Cargo.toml @@ -24,14 +24,9 @@ workspace = true [dependencies] base64 = "0.21.0" -bytes.workspace = true camino = { workspace = true } -chrono = { workspace = true } -dunce = { workspace = true } futures = { workspace = true } -hex = { workspace = true } hmac = "0.12.1" -lazy_static = { workspace = true } os_str_bytes = "6.5.0" path-clean = { workspace = true } petgraph = "0.6.3" @@ -46,5 +41,4 @@ tracing = { workspace = true } turbopath = { workspace = true } turborepo-analytics = { workspace = true } turborepo-api-client = { workspace = true } -turborepo-ui = { workspace = true } zstd = "0.12.3" diff --git a/crates/turborepo-env/Cargo.toml b/crates/turborepo-env/Cargo.toml index c3260512a37cf..eff52b2121c88 100644 --- a/crates/turborepo-env/Cargo.toml +++ b/crates/turborepo-env/Cargo.toml @@ -11,7 +11,6 @@ workspace = true [dependencies] hex = { workspace = true } -lazy_static = { workspace = true } regex = { workspace = true } serde = { workspace = true } sha2 = { workspace = true } diff --git a/crates/turborepo-filewatch/Cargo.toml b/crates/turborepo-filewatch/Cargo.toml index 4bee1f236901f..ac85323019f4c 100644 --- a/crates/turborepo-filewatch/Cargo.toml +++ b/crates/turborepo-filewatch/Cargo.toml @@ -10,8 +10,6 @@ license = "MPL-2.0" workspace = true [dependencies] -anyhow = { workspace = true } -dashmap = { workspace = true } futures = { version = "0.3.26" } itertools = { workspace = true } notify = "6.0.1" diff --git a/crates/turborepo-globwatch/Cargo.toml b/crates/turborepo-globwatch/Cargo.toml index dc0556949736a..c38c5e66d04c3 100644 --- a/crates/turborepo-globwatch/Cargo.toml +++ b/crates/turborepo-globwatch/Cargo.toml @@ -9,13 +9,10 @@ license = "MIT OR Apache-2.0" workspace = true [dependencies] -camino = "1.1.4" futures = { version = "0.3.26" } itertools.workspace = true merge-streams = "0.1.2" notify = "5.1" -notify-debouncer-mini = { version = "0.2.1", default-features = false } -pin-project = "1.0.12" stop-token = "0.7.0" thiserror = { workspace = true } tokio = { version = "1.25.0", features = ["sync"] } @@ -23,7 +20,6 @@ tokio-stream = "0.1.12" tracing = "0.1.37" turbopath = { workspace = true } unic-segment = "0.9.0" -walkdir = "2.3.2" [dev-dependencies] test-case = "3.0.0" diff --git a/crates/turborepo-lib/Cargo.toml b/crates/turborepo-lib/Cargo.toml index cb65941f4347d..c68da5ec44463 100644 --- a/crates/turborepo-lib/Cargo.toml +++ b/crates/turborepo-lib/Cargo.toml @@ -11,9 +11,6 @@ default = ["rustls-tls"] native-tls = ["turborepo-api-client/native-tls", "turbo-updater/native-tls"] rustls-tls = ["turborepo-api-client/rustls-tls", "turbo-updater/rustls-tls"] -# serve the daemon over a port (useful for testing) -http = ["tonic-reflection"] - go-daemon = [] daemon-package-discovery = [] @@ -37,13 +34,19 @@ workspace = true [dependencies] atty = { workspace = true } -axum = { workspace = true } -axum-server = { workspace = true } +biome_deserialize = { workspace = true } +biome_diagnostics = { workspace = true } +biome_json_parser = { workspace = true } +biome_json_syntax = { workspace = true } +camino = "1.1.4" +capnp = "0.17.2" chrono = { workspace = true, features = ["serde"] } clap = { workspace = true, features = ["derive", "env"] } clap_complete = { workspace = true } command-group = { version = "2.1.0", features = ["with-tokio"] } console = { workspace = true } +const_format = "0.2.30" +convert_case = "0.6.0" crossterm = "0.26" ctrlc = { version = "3.4.0", features = ["termination"] } dialoguer = { workspace = true, features = ["fuzzy-select"] } @@ -51,33 +54,43 @@ directories = "4.0.1" dirs-next = "2.0.0" dunce = { workspace = true } futures = "0.3.26" +globwalk = { version = "0.1.0", path = "../turborepo-globwalk" } globwatch = { path = "../turborepo-globwatch" } +go-parse-duration = "0.1.1" hex = "0.4.3" -hostname = "0.3.1" humantime = "2.1.0" -indicatif = { workspace = true } itertools = { workspace = true } -json_comments = "0.2.1" jsonc-parser = { version = "0.21.0" } lazy_static = { workspace = true } libc = "0.2.140" +miette = { workspace = true, features = ["fancy"] } nix = "0.26.2" notify = "5.1" +num_cpus = "1.15.0" +owo-colors.workspace = true path-clean = "1.0.1" petgraph = { workspace = true } pidlock = { path = "../turborepo-pidlock" } portable-pty = "0.8.1" +pprof = { version = "0.12.1", features = [ + "prost-codec", + "frame-pointer", +], optional = true } prost = "0.11.6" rand = { workspace = true } +rayon = "1.7.0" +regex.workspace = true reqwest = { workspace = true, default-features = false, features = ["json"] } -rustc_version_runtime = "0.2.1" semver = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } serde_yaml = { workspace = true } sha2 = { workspace = true } shared_child = "1.0.0" +struct_iterable = "0.1.1" +svix-ksuid = { version = "0.7.0", features = ["serde"] } sysinfo = "0.27.7" +tabwriter = "1.3.0" thiserror = "1.0.38" time = "0.3.20" tiny-gradient = { workspace = true } @@ -85,63 +98,32 @@ tokio = { workspace = true, features = ["full", "time"] } tokio-stream = { version = "0.1.12", features = ["net"] } tokio-util = { version = "0.7.7", features = ["compat"] } tonic = { version = "0.8.3", features = ["transport"] } -tonic-reflection = { version = "0.6.0", optional = true } tower = "0.4.13" -turborepo-analytics = { path = "../turborepo-analytics" } -turborepo-auth = { path = "../turborepo-auth" } -turborepo-dirs = { path = "../turborepo-dirs" } - -turborepo-fs = { path = "../turborepo-fs" } -turborepo-graph-utils = { path = "../turborepo-graph-utils" } -turborepo-repository = { path = "../turborepo-repository" } -turborepo-vercel-api = { path = "../turborepo-vercel-api" } -uds_windows = "1.0.2" -url = "2.3.1" - -biome_console = { workspace = true } -biome_deserialize = { workspace = true } -biome_diagnostics = { workspace = true } -biome_json_parser = { workspace = true } -biome_json_syntax = { workspace = true } - -camino = "1.1.4" -capnp = "0.17.2" -const_format = "0.2.30" -convert_case = "0.6.0" -globwalk = { version = "0.1.0", path = "../turborepo-globwalk" } -go-parse-duration = "0.1.1" -is-terminal = "0.4.7" -lazy-regex = "2.5.0" -miette = { workspace = true, features = ["fancy"] } -node-semver = "2.1.0" -num_cpus = "1.15.0" -owo-colors.workspace = true -pprof = { version = "0.12.1", features = [ - "prost-codec", - "frame-pointer", -], optional = true } -rayon = "1.7.0" -regex.workspace = true -struct_iterable = "0.1.1" -svix-ksuid = { version = "0.7.0", features = ["serde"] } -tabwriter = "1.3.0" tracing-appender = "0.2.2" tracing-chrome = "0.7.1" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } tracing.workspace = true turbo-updater = { workspace = true } turbopath = { workspace = true } +turborepo-analytics = { path = "../turborepo-analytics" } turborepo-api-client = { workspace = true } +turborepo-auth = { path = "../turborepo-auth" } turborepo-cache = { workspace = true } turborepo-ci = { workspace = true } +turborepo-dirs = { path = "../turborepo-dirs" } turborepo-env = { workspace = true } turborepo-errors = { workspace = true } turborepo-filewatch = { path = "../turborepo-filewatch" } +turborepo-fs = { path = "../turborepo-fs" } +turborepo-graph-utils = { path = "../turborepo-graph-utils" } turborepo-lockfiles = { workspace = true } +turborepo-repository = { path = "../turborepo-repository" } turborepo-scm = { workspace = true } turborepo-telemetry = { path = "../turborepo-telemetry" } turborepo-ui = { workspace = true } +turborepo-vercel-api = { path = "../turborepo-vercel-api" } twox-hash = "1.6.3" +uds_windows = "1.0.2" wax = { workspace = true } webbrowser = { workspace = true } which = { workspace = true } diff --git a/crates/turborepo-lsp/Cargo.toml b/crates/turborepo-lsp/Cargo.toml index 4d5e45bf32d1a..9d37dd517fcfe 100644 --- a/crates/turborepo-lsp/Cargo.toml +++ b/crates/turborepo-lsp/Cargo.toml @@ -13,19 +13,13 @@ rustls-tls = ["turborepo-lib/rustls-tls"] [dependencies] crop = "0.4.0" -futures.workspace = true itertools.workspace = true jsonc-parser = "0.23.0" pidlock = { version = "0.1.4", path = "../turborepo-pidlock" } serde_json.workspace = true tokio = { workspace = true, features = ["rt-multi-thread", "macros", "io-std"] } tokio-retry = "0.3.0" -tokio-util = { version = "0.7.10", features = ["codec"] } -tower = "0.4.13" tower-lsp = "0.20.0" -tower-uds = { version = "0.1.0", path = "../tower-uds" } -tracing-subscriber = "0.3.18" -tracing.workspace = true turbopath = { version = "0.1.0", path = "../turborepo-paths" } turborepo-lib = { version = "0.1.0", path = "../turborepo-lib" } turborepo-repository = { version = "0.1.0", path = "../turborepo-repository" } diff --git a/crates/turborepo-telemetry/Cargo.toml b/crates/turborepo-telemetry/Cargo.toml index fba910fd1ed42..f78ef8ca0b6d3 100644 --- a/crates/turborepo-telemetry/Cargo.toml +++ b/crates/turborepo-telemetry/Cargo.toml @@ -18,12 +18,10 @@ turborepo-vercel-api-mock = { workspace = true } async-trait = { workspace = true } chrono = { workspace = true, features = ["serde"] } config = "0.13.4" -dirs-next = "2.0.0" futures = { workspace = true } hex = "0.4.3" once_cell = "1.18.0" reqwest = { workspace = true, features = ["json"] } -rustc_version_runtime = "0.3.0" serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } sha2 = "0.10.8" diff --git a/crates/turborepo-ui/Cargo.toml b/crates/turborepo-ui/Cargo.toml index d2501593f8513..0e932f3ecba27 100644 --- a/crates/turborepo-ui/Cargo.toml +++ b/crates/turborepo-ui/Cargo.toml @@ -21,4 +21,3 @@ lazy_static = { workspace = true } thiserror = { workspace = true } tracing = { workspace = true } turbopath = { workspace = true } -turborepo-ci = { workspace = true } diff --git a/crates/turborepo-vercel-api-mock/Cargo.toml b/crates/turborepo-vercel-api-mock/Cargo.toml index c4a4dab01e5f9..920ad4be42ff3 100644 --- a/crates/turborepo-vercel-api-mock/Cargo.toml +++ b/crates/turborepo-vercel-api-mock/Cargo.toml @@ -12,7 +12,6 @@ workspace = true [dependencies] anyhow = { workspace = true } axum = { workspace = true } -axum-macros = "0.3.7" axum-server = "0.4.7" futures-util = "0.3.28" port_scanner = { workspace = true } diff --git a/crates/turborepo-wax/src/walk/mod.rs b/crates/turborepo-wax/src/walk/mod.rs index 3ee4611685928..d7fd66858dd7c 100644 --- a/crates/turborepo-wax/src/walk/mod.rs +++ b/crates/turborepo-wax/src/walk/mod.rs @@ -1084,7 +1084,6 @@ mod tests { use build_fs_tree::{dir, file, Build, FileSystemTree}; use path_slash::PathBufExt; - use regex::Regex; use tempfile::{self, TempDir}; use crate::{ diff --git a/crates/turborepo/Cargo.toml b/crates/turborepo/Cargo.toml index 32ad9ca8ebc25..5630f210eb31b 100644 --- a/crates/turborepo/Cargo.toml +++ b/crates/turborepo/Cargo.toml @@ -12,7 +12,6 @@ license = "MPL-2.0" default = ["rustls-tls"] native-tls = ["turborepo-lib/native-tls"] rustls-tls = ["turborepo-lib/rustls-tls"] -http = ["turborepo-lib/http"] go-daemon = ["turborepo-lib/go-daemon"] pprof = ["turborepo-lib/pprof"] @@ -30,18 +29,8 @@ workspace = true [dependencies] anyhow = { workspace = true, features = ["backtrace"] } -clap = { workspace = true, features = ["derive"] } -clap_complete = { workspace = true } -command-group = { version = "2.0.1", features = ["with-tokio"] } -dunce = { workspace = true } human-panic = "1.2.1" miette.workspace = true -serde = { workspace = true, features = ["derive"] } -serde_json = { workspace = true } -serde_yaml = { workspace = true } -tiny-gradient = { workspace = true } -tokio-util = { version = "0.7.7", features = ["io"] } -tracing = { workspace = true } turborepo-lib = { workspace = true, default-features = false } [target.'cfg(target_os = "windows")'.dependencies] diff --git a/packages/turbo-repository/rust/src/lib.rs b/packages/turbo-repository/rust/src/lib.rs index f57a7ce44191e..cd4cc2ad94c69 100644 --- a/packages/turbo-repository/rust/src/lib.rs +++ b/packages/turbo-repository/rust/src/lib.rs @@ -183,7 +183,7 @@ impl Workspace { }) .map(|p| { let package_path = workspace_root.resolve(&p.path); - Package::new(p.name.to_string(), &workspace_root, &package_path) + Package::new(p.name.to_string(), workspace_root, &package_path) }) .collect();