diff --git a/Cargo.toml b/Cargo.toml index f7b57dca..4f664ebb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,6 +17,10 @@ style_traits = { git = "https://github.com/dioxuslabs/stylo", rev = "8f9898c7766 style_dom = { git = "https://github.com/dioxuslabs/stylo", package = "dom", rev = "8f9898c7766b8f8abe14ab81051fda057f9fcda3" } # Branch: blitz selectors = { git = "https://github.com/dioxuslabs/stylo", rev = "8f9898c7766b8f8abe14ab81051fda057f9fcda3" } # Branch: blitz html5ever = "0.29" # needs to match stylo markup5ever version +euclid = "0.22" +string_cache = "0.8.7" +atomic_refcell = "0.1.13" +app_units = "0.7.5" # DioxusLabs dependencies dioxus = { git = "https://github.com/dioxuslabs/dioxus", rev = "9ffd4b816b8ce291b6ca66cb5c871e107a964f6b" } @@ -25,17 +29,45 @@ dioxus-cli-config = { git = "https://github.com/dioxuslabs/dioxus", rev = "9ffd4 dioxus-devtools = { git = "https://github.com/dioxuslabs/dioxus", rev = "9ffd4b816b8ce291b6ca66cb5c871e107a964f6b" } taffy = { version = "0.6" } -# Linebender dependencies -peniko = { version = "0.2" } +# Linebender + WGPU + SVG dependencies +peniko = "0.2" vello = { version = "0.3", features = [ "wgpu" ] } -vello_svg = { version = "0.4" } -parley = { version = "0.2" } +vello_svg = "0.4" +parley = "0.2" +wgpu = "22.1.0" +usvg = "0.43.0" + +# Windowing & Input +raw-window-handle = "0.6.0" +winit = { version = "0.30.2", features = ["rwh_06"] } +accesskit_winit = "0.21.1" +accesskit = "0.15.0" +muda = "0.11.5" +clipboard-rs = "0.2.1" +keyboard-types = "0.7" + +# IO & Networking +url = "2.5.0" +http = "1.1.0" +data-url = "0.3.1" +tokio = "1.25.0" +reqwest = "0.12.7" +ureq = "2.9" + +# Media & Decoding +image = "0.25" +woff = "0.3.3" +html-escape = "0.2.13" # Other dependencies -tokio = { version = "1.25.0", features = ["full"] } -clipboard-rs = { version = "0.2.1" } +rustc-hash = "1.1.0" +bytes = "1.7.1" +slab = "0.4.9" tracing = "0.1.40" -wgpu = "22.1.0" +futures-util = "0.3.30" +futures-intrusive = "0.5.0" +thiserror = "1.0.63" + # This is a "virtual package" # It is not meant to be published, but is used so "cargo run --example XYZ" works properly diff --git a/packages/blitz-dom/Cargo.toml b/packages/blitz-dom/Cargo.toml index b15b5c36..36051e31 100644 --- a/packages/blitz-dom/Cargo.toml +++ b/packages/blitz-dom/Cargo.toml @@ -8,27 +8,40 @@ default = ["tracing"] tracing = ["dep:tracing"] [dependencies] +# Blitz dependencies blitz-traits = { path = "../blitz-traits" } + +# Servo dependencies style = { workspace = true, features = ["servo"] } selectors = { workspace = true } style_config = { workspace = true } style_traits = { workspace = true } style_dom = { workspace = true } +app_units = { workspace = true } +euclid = { workspace = true, features = ["serde"] } +atomic_refcell = { workspace = true, features = ["serde"] } +html5ever = { workspace = true } +string_cache ={ workspace = true } + +# DioxusLabs dependencies taffy = { workspace = true } + +# Linebender dependencies parley = { workspace = true } peniko = { workspace = true } clipboard-rs = { workspace = true } tracing = { workspace = true, optional = true } -slab = "0.4.9" -app_units = "0.7.5" -euclid = { version = "0.22", features = ["serde"] } -atomic_refcell = { version = "0.1.13", features = ["serde"] } -html5ever = { workspace = true } -string_cache = "0.8.7" -html-escape = "0.2.13" -url = { version = "2.5.0", features = ["serde"] } -data-url = "0.3.1" -image = "0.25.2" -winit = { version = "0.30.4", default-features = false } -usvg = "0.43.0" -woff = "0.3.3" \ No newline at end of file +slab = { workspace = true } + +# Media & Decoding +image = { workspace = true } +usvg = { workspace = true } +woff = { workspace = true } +html-escape = { workspace = true } + +# IO & Networking +url = { workspace = true, features = ["serde"] } +data-url = { workspace = true } + +# Input +winit = { workspace = true } \ No newline at end of file diff --git a/packages/blitz-net/Cargo.toml b/packages/blitz-net/Cargo.toml index 27bbd9d9..50c690d5 100644 --- a/packages/blitz-net/Cargo.toml +++ b/packages/blitz-net/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" [dependencies] blitz-traits = { path = "../blitz-traits" } tokio = { workspace = true } -reqwest = { version = "0.12.7" } -data-url = "0.3.1" -thiserror = "1.0.63" +reqwest = { workspace = true } +data-url = { workspace = true } +thiserror = { workspace = true } diff --git a/packages/blitz-renderer-vello/Cargo.toml b/packages/blitz-renderer-vello/Cargo.toml index f96a1d50..36391ac8 100644 --- a/packages/blitz-renderer-vello/Cargo.toml +++ b/packages/blitz-renderer-vello/Cargo.toml @@ -16,6 +16,6 @@ tracing = { workspace = true, optional = true } vello = { workspace = true } vello_svg = { workspace = true } wgpu = { workspace = true } -raw-window-handle = "0.6.0" -image = "0.25" -futures-intrusive = "0.5.0" +raw-window-handle = { workspace = true } +image = { workspace = true } +futures-intrusive = { workspace = true } diff --git a/packages/blitz-traits/Cargo.toml b/packages/blitz-traits/Cargo.toml index e450a140..2d59abea 100644 --- a/packages/blitz-traits/Cargo.toml +++ b/packages/blitz-traits/Cargo.toml @@ -4,6 +4,6 @@ version = "0.1.0" edition = "2021" [dependencies] -http = "1.1.0" -url = "2.5.2" -bytes = "1.7.1" \ No newline at end of file +http = { workspace = true } +url = { workspace = true } +bytes = { workspace = true } \ No newline at end of file diff --git a/packages/dioxus-blitz/Cargo.toml b/packages/dioxus-blitz/Cargo.toml index c8e4a085..b5255cbd 100644 --- a/packages/dioxus-blitz/Cargo.toml +++ b/packages/dioxus-blitz/Cargo.toml @@ -11,28 +11,39 @@ tracing = ["dep:tracing"] default = ["accessibility", "hot-reload", "menu", "tracing"] [dependencies] +# Blitz dependencies blitz-renderer-vello = { path = "../blitz-renderer-vello" } blitz-dom = { path = "../blitz-dom" } blitz-net = { path = "../blitz-net" } blitz-traits = { path = "../blitz-traits" } -accesskit = { version = "0.15.0", optional = true } -accesskit_winit = { version = "0.21.1", optional = true } -winit = { version = "0.30.2", features = ["rwh_06"] } -muda = { version = "0.11.5", features = ["serde"], optional = true } -tokio = { workspace = true, features = ["full"] } + +# Servo dependencies +style = { workspace = true } + +# DioxusLabs dependencies dioxus = { workspace = true } dioxus-cli-config = { workspace = true, optional = true } dioxus-devtools = { workspace = true, optional = true } -futures-util = "0.3.30" -vello = { workspace = true } + +# Linebender dependencies parley = { workspace = true } -wgpu = { workspace = true } -style = { workspace = true } + +# Windowing & Input +winit = { workspace = true } +muda = { workspace = true, features = ["serde"], optional = true } +accesskit = { workspace = true, optional = true } +accesskit_winit = {workspace = true, optional = true } +keyboard-types = { workspace = true } + +# IO & Networking +url = { workspace = true, features = ["serde"] } +tokio = { workspace = true, features = ["full"] } +ureq = { workspace = true } + +# Other dependencies tracing = { workspace = true, optional = true } -url = { version = "2.5.0", features = ["serde"] } -ureq = "2.9" -rustc-hash = "1.1.0" -keyboard-types = "0.7" +rustc-hash = { workspace = true } +futures-util = { workspace = true } [target.'cfg(target_os = "android")'.dependencies] android-activity = { version = "0.6.0", features = ["native-activity"] } diff --git a/packages/dioxus-blitz/src/window.rs b/packages/dioxus-blitz/src/window.rs index a6b4f14f..37725efb 100644 --- a/packages/dioxus-blitz/src/window.rs +++ b/packages/dioxus-blitz/src/window.rs @@ -6,9 +6,6 @@ use blitz_dom::{DocumentLike, Viewport}; use blitz_renderer_vello::{Devtools, Renderer}; use winit::keyboard::PhysicalKey; -#[allow(unused)] -use wgpu::rwh::HasWindowHandle; - use std::sync::Arc; use std::task::Waker; use winit::event::{ElementState, MouseButton};