From 458332d3a41c1453cbb557aeb54260b9dcd7a221 Mon Sep 17 00:00:00 2001
From: Nico Burns <nico@nicoburns.com>
Date: Fri, 4 Oct 2024 03:23:02 +0100
Subject: [PATCH] Organise workspace deps

---
 Cargo.toml                | 17 ++++++++++++-----
 packages/blitz/Cargo.toml |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3a9afca1..bbf401c4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,23 +7,30 @@ members = ["packages/blitz", "packages/dom", "packages/dioxus-blitz", "packages/
 resolver = "2"
 
 [workspace.dependencies]
+# Servo dependencies
 style = { git = "https://github.com/dioxuslabs/stylo", branch = "blitz" }
 style_config = { git = "https://github.com/dioxuslabs/stylo", branch = "blitz" }
 style_traits = { git = "https://github.com/dioxuslabs/stylo", branch = "blitz" }
 style_dom = { git = "https://github.com/dioxuslabs/stylo", package = "dom", branch = "blitz" }
 selectors = { git = "https://github.com/dioxuslabs/stylo", branch = "blitz" }
 html5ever = "0.29" # needs to match stylo markup5ever version
-taffy = { git = "https://github.com/dioxuslabs/taffy", rev = "950a0eb1322f15e5d1083f4793b55d52061718de" }
-parley = { git = "https://github.com/nicoburns/parley", rev = "186b6e991d08731c0588dc0b247564cbba1c0435" }
+
+# DioxusLabs dependencies
 dioxus = { git = "https://github.com/dioxuslabs/dioxus", rev = "9ffd4b816b8ce291b6ca66cb5c871e107a964f6b" }
 dioxus-ssr = { git = "https://github.com/dioxuslabs/dioxus", rev = "9ffd4b816b8ce291b6ca66cb5c871e107a964f6b" }
 dioxus-cli-config = { git = "https://github.com/dioxuslabs/dioxus", rev = "9ffd4b816b8ce291b6ca66cb5c871e107a964f6b" }
 dioxus-devtools = { git = "https://github.com/dioxuslabs/dioxus", rev = "9ffd4b816b8ce291b6ca66cb5c871e107a964f6b" }
+taffy = { git = "https://github.com/dioxuslabs/taffy", rev = "950a0eb1322f15e5d1083f4793b55d52061718de" }
+
+# Linebender dependencies
+peniko = { version = "0.1" }
+vello = { git = "https://github.com/linebender/vello", rev = "aaa9f5f2d0f21f3d038501ea0cf32c989d97aab3", package = "vello", features = [ "wgpu" ] }
+vello_svg = { git = "https://github.com/cfraz89/vello_svg", rev = "fc29d4ebf8d6aaee980b203f39ef2c73fe43c017" }
+parley = { git = "https://github.com/nicoburns/parley", rev = "186b6e991d08731c0588dc0b247564cbba1c0435" }
+
+# Other dependencies
 tokio = { version = "1.25.0", features = ["full"] }
 tracing = "0.1.40"
-vello = { git = "https://github.com/linebender/vello", rev = "aaa9f5f2d0f21f3d038501ea0cf32c989d97aab3", package = "vello", features = [ "wgpu" ] }
-peniko = { version = "0.1" }
-# fello = { git = "https://github.com/linebender/vello" }
 wgpu = "22.1.0"
 
 # This is a "virtual package"
diff --git a/packages/blitz/Cargo.toml b/packages/blitz/Cargo.toml
index 924893a4..9858f263 100644
--- a/packages/blitz/Cargo.toml
+++ b/packages/blitz/Cargo.toml
@@ -14,8 +14,8 @@ taffy = { workspace = true }
 parley = { workspace = true }
 tracing = { workspace = true, optional = true }
 vello = { workspace = true }
+vello_svg = { workspace = true }
 wgpu = { workspace = true }
 raw-window-handle = "0.6.0"
 image = "0.25"
-vello_svg = { git = "https://github.com/cfraz89/vello_svg", rev = "fc29d4ebf8d6aaee980b203f39ef2c73fe43c017" }
 futures-intrusive = "0.5.0"