diff --git a/Cargo.lock b/Cargo.lock index dcc3500bcd..35d9749d59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -564,7 +564,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" dependencies = [ "memchr", - "regex-automata", "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 657374589d..dd812cd54f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,21 +32,39 @@ cargo = { level = "warn", priority = -1 } cargo_common_metadata = "allow" [workspace.dependencies] +allocator-api2 = { version = "0.2.21", default-features = false, features = ["alloc", "std"] } anyhow = "1.0.98" +arrayvec = "0.7.6" +assert2 = "0.3.16" +assertables = "9.8.1" +attohttpc = "0.29.2" backon = "1.3.0" +backtrace = "0.3.75" +base64 = "0.22.1" bincode = "2.0.1" +bindgen = "0.72.1" +blink-alloc = { version = "0.3.1", features = ["sync"] } brush-parser = "0.2.18" -bstr = "1.12.0" +bstr = { version = "1.12.0", default-features = false, features = ["alloc", "std"] } +bumpalo = { version = "3.17.0", features = ["allocator-api2"] } +bytemuck = { version = "1.23.0", features = ["extern_crate_alloc", "must_cast"] } +bytes = "1.10.1" cc = "1.2.39" clap = "4.5.40" color-eyre = "0.6.5" compact_str = "0.9.0" +const_format = "0.2.34" +constcat = "0.6.1" criterion = { version = "0.7", features = ["html_reports"] } crossterm = { version = "0.29.0", features = ["event-stream"] } +csv-async = { version = "1.3.1", features = ["tokio"] } +ctor = "0.4.2" dashmap = "6.1.0" +derive-where = "1.4.0" diff-struct = "0.5.3" directories = "6.0.0" edit = "0.1.5" +elf = { version = "0.8.0", default-features = false } flate2 = "1.0.35" fspy = { path = "crates/fspy" } fspy_detours_sys = { path = "crates/fspy_detours_sys" } @@ -62,19 +80,28 @@ hex = "0.4.3" httpmock = "0.7" indoc = "2.0.5" itertools = "0.14.0" +libc = "0.2.172" +libc-print = "0.1.23" +memmap2 = "0.9.7" nix = { version = "0.30.1", features = ["dir"] } +ntapi = "0.4.1" os_str_bytes = "7.1.1" +ouroboros = "0.18.5" owo-colors = "4.1.0" passfd = { git = "https://github.com/polachok/passfd", rev = "d55881752c16aced1a49a75f9c428d38d3767213", default-features = false } +path-dedot = "3.1.1" pathdiff = "0.2.3" petgraph = "0.8.2" +phf = { version = "0.11.3", features = ["macros"] } portable-pty = "0.9.0" +rand = "0.9.1" ratatui = "0.29.0" rayon = "1.10.0" ref-cast = "1.0.24" reqwest = { version = "0.12", features = ["stream", "native-tls", "json"], default-features = false } rusqlite = "0.37.0" rustc-hash = "2.1.1" +seccompiler = { git = "https://github.com/branchseer/seccompiler", branch = "seccomp-action-raw" } semver = "1.0.26" serde = "1.0.219" serde_json = "1.0.140" @@ -83,14 +110,22 @@ serial_test = "3.2.0" sha1 = "0.10.6" sha2 = "0.10.9" shell-escape = "0.1.5" +slab = "0.4.9" +smallvec = { version = "2.0.0-alpha.11", features = ["std"] } +socket2 = "0.5.10" +stackalloc = "1.2.1" supports-color = "3.0.1" +syscalls = { version = "0.6.18", default-features = false } tar = "0.4.43" tempfile = "3.14.0" test-log = { version = "0.2.18", features = ["trace"] } thiserror = "2" +thread_local = "1.1.9" tokio = "1.46.1" +tokio-seqpacket = "0.8.0" tokio-test = "0.4.4" tokio-util = "0.7.15" +toml = "0.9.5" tracing = "0.1.41" tracing-error = "0.2.1" tracing-subscriber = { version = "0.3.19", features = ["env-filter", "serde"] } @@ -104,7 +139,11 @@ vite_path = { path = "crates/vite_path" } vite_str = { path = "crates/vite_str" } vite_task = { path = "crates/vite_task" } wax = "0.6.0" +which = "7.0.3" +widestring = "1.2.0" winapi = "0.3.9" +winsafe = { version = "0.0.24", features = ["kernel"] } +xxhash-rust = { version = "0.8.15", features = ["const_xxh3"] } napi = { version = "3.0.0", default-features = false, features = ["async", "error_anyhow"] } napi-build = "2" diff --git a/crates/fspy/Cargo.toml b/crates/fspy/Cargo.toml index bfa2c7c284..e4efb36cd5 100644 --- a/crates/fspy/Cargo.toml +++ b/crates/fspy/Cargo.toml @@ -5,77 +5,61 @@ edition = "2024" publish = false [dependencies] -rand = "0.9.1" -bincode = "2.0.1" -futures-util = "0.3.31" -libc = "0.2.171" -tempfile = "3.19.1" -# async-send-fd = { version = "1.2.0", features = ["tokio"] } -# passfd = "0.1.6" -tokio = { version = "1.44.2", features = ["net", "process", "io-util", "sync"] } -bumpalo = { version = "3.17.0", features = ["allocator-api2"] } -ouroboros = "0.18.5" -bstr = { version = "1.12.0", default-features = false } -which = "7.0.3" +allocator-api2 = { workspace = true, features = ["alloc"] } +bincode = { workspace = true } +bstr = { workspace = true, default-features = false } +bumpalo = { workspace = true } fspy_shared = { workspace = true } -slab = "0.4.9" -allocator-api2 = { version = "0.2.21", default-features = false, features = [ - "alloc", -] } +futures-util = { workspace = true } +libc = { workspace = true } +ouroboros = { workspace = true } +rand = { workspace = true } +slab = { workspace = true } +tempfile = { workspace = true } +tokio = { workspace = true, features = ["net", "process", "io-util", "sync"] } +which = { workspace = true } [target.'cfg(target_os = "linux")'.dependencies] -tokio-seqpacket = "0.8.0" -arrayvec = "0.7.6" -nix = { version = "0.30.1", features = ["uio"] } +arrayvec = { workspace = true } +blink-alloc = { workspace = true } fspy_seccomp_unotify = { workspace = true, features = ["supervisor"] } -blink-alloc = { version = "0.3.1", features = ["sync"] } -thread_local = "1.1.9" -tokio = { version = "1.44.2", features = ["bytes"] } -syscalls = { version = "0.6.18", default-features = false, features = ["std"] } +nix = { workspace = true, features = ["uio"] } +syscalls = { workspace = true, features = ["std"] } +thread_local = { workspace = true } +tokio = { workspace = true, features = ["bytes"] } +tokio-seqpacket = { workspace = true } [target.'cfg(unix)'.dependencies] -fspy_shared_unix = { workspace = true } fspy_preload_unix = { workspace = true } -nix = { version = "0.30.1", features = ["fs", "process", "socket", "feature"] } +fspy_shared_unix = { workspace = true } +memmap2 = { workspace = true } +nix = { workspace = true, features = ["fs", "process", "socket", "feature"] } passfd = { git = "https://github.com/polachok/passfd", features = ["async"] } -memmap2 = "0.9.7" -# asyncfd = "0.1.2" [target.'cfg(target_os = "macos")'.dependencies] -phf = { version = "0.11.3", features = ["macros"] } - +phf = { workspace = true } [target.'cfg(any(target_os = "macos", windows))'.dependencies] -xxhash-rust = { version = "0.8.15", features = ["const_xxh3"] } -const_format = { version = "0.2.34", features = ["fmt"] } - +const_format = { workspace = true, features = ["fmt"] } +xxhash-rust = { workspace = true } [target.'cfg(target_os = "windows")'.dependencies] -winsafe = { version = "0.0.24", features = ["kernel"] } -winapi = { workspace = true, features = [ - "winbase", - "securitybaseapi", - "handleapi", -] } -fspy_preload_windows = { workspace = true } fspy_detours_sys = { workspace = true } +fspy_preload_windows = { workspace = true } +winapi = { workspace = true, features = ["winbase", "securitybaseapi", "handleapi"] } +winsafe = { workspace = true } [target.'cfg(target_os = "macos")'.dev-dependencies] -tempfile = "3.19.1" +tempfile = { workspace = true } [dev-dependencies] -tokio = { version = "1.44.2", features = [ - "rt-multi-thread", - "macros", - "fs", - "io-std", -] } -csv-async = { version = "1.3.1", features = ["tokio"] } -ctor = "0.4.3" +csv-async = { workspace = true } +ctor = { workspace = true } +tokio = { workspace = true, features = ["rt-multi-thread", "macros", "fs", "io-std"] } [build-dependencies] -attohttpc = "0.29.2" -xxhash-rust = { version = "0.8.15", features = ["xxh3"] } -flate2 = "1.1.1" -tar = "0.4.44" -anyhow = "1.0.98" +anyhow = { workspace = true } +attohttpc = { workspace = true } +flate2 = { workspace = true } +tar = { workspace = true } +xxhash-rust = { workspace = true, features = ["xxh3"] } diff --git a/crates/fspy_detours_sys/Cargo.toml b/crates/fspy_detours_sys/Cargo.toml index 87301eb0dd..f2c8b5b705 100644 --- a/crates/fspy_detours_sys/Cargo.toml +++ b/crates/fspy_detours_sys/Cargo.toml @@ -16,4 +16,4 @@ winapi = { workspace = true, features = ["minwindef", "libloaderapi", "processth workspace = true [dev-dependencies] -bindgen = "0.72.1" +bindgen = { workspace = true } diff --git a/crates/fspy_e2e/Cargo.toml b/crates/fspy_e2e/Cargo.toml index 8c53e25e11..6253df7c66 100644 --- a/crates/fspy_e2e/Cargo.toml +++ b/crates/fspy_e2e/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "fspy_e2e" version = "0.0.0" -publish = false edition.workspace = true +publish = false [dependencies] fspy = { workspace = true } -serde = { version = "1.0.219", features = ["derive"] } -toml = "0.9.5" -tokio = { version = "1.47.1", features = ["full"] } -futures-util = "0.3.31" +futures-util = { workspace = true } +serde = { workspace = true, features = ["derive"] } +tokio = { workspace = true, features = ["full"] } +toml = { workspace = true } diff --git a/crates/fspy_preload_unix/Cargo.toml b/crates/fspy_preload_unix/Cargo.toml index 4dd16e6b7f..5847bfb755 100644 --- a/crates/fspy_preload_unix/Cargo.toml +++ b/crates/fspy_preload_unix/Cargo.toml @@ -7,28 +7,28 @@ publish = false crate-type = ["cdylib"] [target.'cfg(target_os = "linux")'.dependencies] -arrayvec = "0.7.6" -syscalls = { version = "0.6.18", default-features = false } +arrayvec = { workspace = true } +const_format = { workspace = true } fspy_seccomp_unotify = { workspace = true, features = ["target"] } -libc-print = "0.1.23" -const_format = "0.2.34" +libc-print = { workspace = true } +syscalls = { workspace = true } [target.'cfg(unix)'.dependencies] -libc = "0.2.172" -bstr = { version = "1.12.0", default-features = false } -socket2 = "0.5.10" -ctor = "0.4.2" -thread_local = "1.1.9" -arrayvec = "0.7.6" -bincode = "2.0.1" -bytemuck = { version = "1.23.0", features = ["extern_crate_alloc"] } -derive-where = "1.4.0" -path-dedot = "3.1.1" -ref-cast = "1.0.24" -which = "7.0.3" -fspy_shared_unix = { workspace = true } +anyhow = { workspace = true } +arrayvec = { workspace = true } +bincode = { workspace = true } +bstr = { workspace = true, default-features = false } +bytemuck = { workspace = true } +ctor = { workspace = true } +derive-where = { workspace = true } fspy_shared = { workspace = true } -nix = { version = "0.30.1", features = ["signal", "fs", "socket", "mman", "time"] } -memmap2 = "0.9.7" -anyhow = "1.0.98" +fspy_shared_unix = { workspace = true } +libc = { workspace = true } +memmap2 = { workspace = true } +nix = { workspace = true, features = ["signal", "fs", "socket", "mman", "time"] } passfd = { workspace = true } +path-dedot = { workspace = true } +ref-cast = { workspace = true } +socket2 = { workspace = true } +thread_local = { workspace = true } +which = { workspace = true } diff --git a/crates/fspy_preload_windows/Cargo.toml b/crates/fspy_preload_windows/Cargo.toml index 4023c3df3d..77b2819fce 100644 --- a/crates/fspy_preload_windows/Cargo.toml +++ b/crates/fspy_preload_windows/Cargo.toml @@ -7,33 +7,25 @@ edition.workspace = true crate-type = ["cdylib"] [target.'cfg(target_os = "windows")'.dependencies] -# windows-sys = { version = "0.59.0", features = ["Win32_Foundation", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_Security", "Win32_System_LibraryLoader"] } -winsafe = { version = "0.0.24", features = ["kernel"] } -winapi = { workspace = true, features = [ - "winerror", - "winbase", - "namedpipeapi", - "memoryapi", - "std", -] } -smallvec = { version = "2.0.0-alpha.11", features = ["std"] } -widestring = "1.2.0" -constcat = "0.6.1" -backtrace = "0.3.75" -arrayvec = "0.7.6" -bincode = "2.0.1" -bytemuck = { version = "1.23.0", features = ["extern_crate_alloc"] } -derive-where = "1.4.0" -path-dedot = "3.1.1" -ref-cast = "1.0.24" -which = "7.0.3" -fspy_shared = { workspace = true } +arrayvec = { workspace = true } +backtrace = { workspace = true } +bincode = { workspace = true } +bytemuck = { workspace = true } +constcat = { workspace = true } +derive-where = { workspace = true } fspy_detours_sys = { workspace = true } -ntapi = "0.4.1" - +fspy_shared = { workspace = true } +ntapi = { workspace = true } +path-dedot = { workspace = true } +ref-cast = { workspace = true } +smallvec = { workspace = true } +which = { workspace = true } +widestring = { workspace = true } +winapi = { workspace = true, features = ["winerror", "winbase", "namedpipeapi", "memoryapi", "std"] } +winsafe = { workspace = true } [target.'cfg(target_os = "windows")'.dev-dependencies] -tempfile = "3.20.0" +tempfile = { workspace = true } [dependencies] -dashmap = "6.1.0" +dashmap = { workspace = true } diff --git a/crates/fspy_seccomp_unotify/Cargo.toml b/crates/fspy_seccomp_unotify/Cargo.toml index 7a7f7f3873..6261fc2bb6 100644 --- a/crates/fspy_seccomp_unotify/Cargo.toml +++ b/crates/fspy_seccomp_unotify/Cargo.toml @@ -5,23 +5,23 @@ edition = "2024" publish = false [target.'cfg(target_os = "linux")'.dependencies] -seccompiler = { git = "https://github.com/branchseer/seccompiler", branch = "seccomp-action-raw" } -arrayvec = "0.7.6" -libc = "0.2.174" -syscalls = { version = "0.6.18", default-features = false, features = ["std"] } -tokio = { version = "1.46.1", features = [ "net", "process", "io-util", "rt" ] } -nix = { version = "0.30.1", features = [ "process", "fs", "poll", "socket", "uio" ] } -bytes = "1.10.1" -tracing = "0.1.41" -bincode = "2.0.1" +arrayvec = { workspace = true } +bincode = { workspace = true } +bytes = { workspace = true } +libc = { workspace = true } +nix = { workspace = true, features = ["process", "fs", "poll", "socket", "uio"] } passfd = { workspace = true, default-features = false, optional = true } +seccompiler = { workspace = true } +syscalls = { workspace = true, features = ["std"] } +tokio = { workspace = true, features = ["net", "process", "io-util", "rt"] } +tracing = { workspace = true } [target.'cfg(target_os = "linux")'.dev-dependencies] -tokio = { version = "1.46.1", features = [ "macros", "time" ] } -nix = { version = "0.30.1", features = [ "fs" ] } -assertables = "9.8.1" -test-log = { version = "0.2.18", features = ["trace"] } -futures-util = "0.3.31" +assertables = { workspace = true } +futures-util = { workspace = true } +nix = { workspace = true, features = ["fs"] } +test-log = { workspace = true } +tokio = { workspace = true, features = ["macros", "time"] } [features] supervisor = ["dep:passfd", "passfd/async"] diff --git a/crates/fspy_shared/Cargo.toml b/crates/fspy_shared/Cargo.toml index 1fa383f34e..1c19b84da6 100644 --- a/crates/fspy_shared/Cargo.toml +++ b/crates/fspy_shared/Cargo.toml @@ -5,27 +5,24 @@ edition = "2024" publish = false [dependencies] -bincode = "2.0.1" -bstr = "1.12.0" -allocator-api2 = { version = "0.2.21", default-features = false, features = ["std"] } -# stable_deref_trait = { version = "1.2.0", optional = true } +allocator-api2 = { workspace = true } +bincode = { workspace = true } +bstr = { workspace = true } [target.'cfg(target_os = "windows")'.dependencies] -winapi = { workspace = true, features = ["std"] } -bytemuck = { version = "1.23.0", features = ["must_cast", "extern_crate_alloc"] } -winsafe = { version = "0.0.24", features = ["kernel"] } +bytemuck = { workspace = true } os_str_bytes = { workspace = true } +winapi = { workspace = true, features = ["std"] } +winsafe = { workspace = true } [target.'cfg(target_os = "macos")'.dependencies] -phf = { version = "0.11.3", features = ["macros"] } +phf = { workspace = true } [target.'cfg(unix)'.dependencies] -nix = "0.30.1" -libc = "0.2.174" -base64 = { version = "0.22.1" } -derive-where = "1.4.0" -# tokio = { version = "1.46.1", optional = true, default-features = false } -# passfd = { git = "https://github.com/polachok/passfd", optional = true, features = [ "async" ] } +base64 = { workspace = true } +derive-where = { workspace = true } +libc = { workspace = true } +nix = { workspace = true } # [features] # supervisor = ["dep:tokio", "dep:passfd"] diff --git a/crates/fspy_shared_unix/Cargo.toml b/crates/fspy_shared_unix/Cargo.toml index caca84426d..ae0c6589ee 100644 --- a/crates/fspy_shared_unix/Cargo.toml +++ b/crates/fspy_shared_unix/Cargo.toml @@ -5,20 +5,20 @@ edition.workspace = true publish = false [target.'cfg(unix)'.dependencies] -nix = { version = "0.30.1", features = ["fs"] } -base64 = { version = "0.22.1" } -bincode = "2.0.1" -bstr = "1.12.0" -anyhow = "1.0.98" +anyhow = { workspace = true } +base64 = { workspace = true } +bincode = { workspace = true } +bstr = { workspace = true } fspy_shared = { workspace = true } -stackalloc = "1.2.1" +nix = { workspace = true, features = ["fs"] } +stackalloc = { workspace = true } [dev-dependencies] [target.'cfg(target_os = "linux")'.dependencies] +elf = { workspace = true } fspy_seccomp_unotify = { workspace = true, features = ["target"] } -memmap2 = "0.9.7" -elf = { version = "0.8.0", default-features = false } +memmap2 = { workspace = true } [target.'cfg(target_os = "macos")'.dependencies] -phf = { version = "0.11.3", features = ["macros"] } +phf = { workspace = true } diff --git a/crates/vite_path/Cargo.toml b/crates/vite_path/Cargo.toml index 4cc8cfaabe..01d161106f 100644 --- a/crates/vite_path/Cargo.toml +++ b/crates/vite_path/Cargo.toml @@ -18,4 +18,4 @@ vite_str = { workspace = true } workspace = true [dev-dependencies] -assert2 = "0.3.16" +assert2 = { workspace = true }