DioxusLabs · nicoburns · Oct 6, 2024 · Oct 6, 2024
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,9 +1,12 @@
 
 [workspace]
-# members = ["packages/dom"]
-# members = ["packages/blitz", "packages/dom", "packages/dioxus-blitz"]
-# exclude = ["packages/blitz", "packages/dioxus-blitz"]
-members = ["packages/blitz", "packages/dom", "packages/dioxus-blitz", "packages/net", "packages/traits"]
+members = [
+  "packages/blitz-traits",
+  "packages/blitz-dom", 
+  "packages/blitz-net",
+  "packages/blitz-renderer-vello",
+  "packages/dioxus-blitz"
+]
 resolver = "2"
 
 [workspace.dependencies]
@@ -62,13 +65,13 @@ incremental = false
 [dev-dependencies]
 # webrender = "0.61.0"
 # mozbuild = "0.1.0"
-blitz = { path = "./packages/blitz" }
-blitz-dom = { path = "./packages/dom" }
-blitz-net = { path = "./packages/net" }
-blitz-traits = { path = "./packages/traits" }
+blitz-dom = { path = "./packages/blitz-dom" }
+blitz-net = { path = "./packages/blitz-net" }
+blitz-traits = { path = "./packages/blitz-traits" }
+blitz-renderer-vello = { path = "./packages/blitz-renderer-vello" }
+dioxus-blitz = { path = "./packages/dioxus-blitz", features = ["tracing"] }
 comrak = { git = "https://github.com/nicoburns/comrak", branch = "tasklist-class", default-features = false, features = ["syntect"] }
 png = { version = "0.17" }
-dioxus-blitz = { path = "./packages/dioxus-blitz", features = ["tracing"] }
 dioxus = { workspace = true }
 euclid = { version = "0.22", features = ["serde"] }
 reqwest = "0.11.24"

diff --git a/examples/screenshot.rs b/examples/screenshot.rs
@@ -1,9 +1,9 @@
 //! Load first CLI argument as a url. Fallback to google.com if no CLI argument is provided.
 
-use blitz::render_to_buffer;
 use blitz_dom::util::Resource;
 use blitz_dom::{HtmlDocument, Viewport};
 use blitz_net::{MpscCallback, Provider};
+use blitz_renderer_vello::render_to_buffer;
 use blitz_traits::net::{SharedCallback, SharedProvider};
 use reqwest::Url;
 use std::sync::Arc;

diff --git a/packages/dom/Cargo.toml → packages/blitz-dom/Cargo.toml b/packages/dom/Cargo.toml → packages/blitz-dom/Cargo.toml
@@ -8,7 +8,7 @@ default = ["tracing"]
 tracing = ["dep:tracing"]
 
 [dependencies]
-blitz-traits = { path = "../traits" }
+blitz-traits = { path = "../blitz-traits" }
 style = { workspace = true, features = ["servo"] }
 selectors = { workspace = true }
 style_config = { workspace = true }

diff --git a/packages/dom/README.md → packages/blitz-dom/README.md b/packages/dom/README.md → packages/blitz-dom/README.md
diff --git a/packages/dom/src/debug.rs → packages/blitz-dom/src/debug.rs b/packages/dom/src/debug.rs → packages/blitz-dom/src/debug.rs
diff --git a/packages/dom/src/default.css → packages/blitz-dom/src/default.css b/packages/dom/src/default.css → packages/blitz-dom/src/default.css
diff --git a/packages/dom/src/document.rs → packages/blitz-dom/src/document.rs b/packages/dom/src/document.rs → packages/blitz-dom/src/document.rs
diff --git a/packages/dom/src/events.rs → packages/blitz-dom/src/events.rs b/packages/dom/src/events.rs → packages/blitz-dom/src/events.rs
diff --git a/packages/dom/src/html_document.rs → packages/blitz-dom/src/html_document.rs b/packages/dom/src/html_document.rs → packages/blitz-dom/src/html_document.rs
diff --git a/packages/dom/src/htmlsink.rs → packages/blitz-dom/src/htmlsink.rs b/packages/dom/src/htmlsink.rs → packages/blitz-dom/src/htmlsink.rs
diff --git a/packages/dom/src/image.rs → packages/blitz-dom/src/image.rs b/packages/dom/src/image.rs → packages/blitz-dom/src/image.rs
diff --git a/packages/dom/src/layout/construct.rs → packages/blitz-dom/src/layout/construct.rs b/packages/dom/src/layout/construct.rs → packages/blitz-dom/src/layout/construct.rs
diff --git a/packages/dom/src/layout/mod.rs → packages/blitz-dom/src/layout/mod.rs b/packages/dom/src/layout/mod.rs → packages/blitz-dom/src/layout/mod.rs
diff --git a/packages/dom/src/layout/table.rs → packages/blitz-dom/src/layout/table.rs b/packages/dom/src/layout/table.rs → packages/blitz-dom/src/layout/table.rs
diff --git a/packages/dom/src/lib.rs → packages/blitz-dom/src/lib.rs b/packages/dom/src/lib.rs → packages/blitz-dom/src/lib.rs
diff --git a/packages/dom/src/moz-bullet-font.otf → packages/blitz-dom/src/moz-bullet-font.otf b/packages/dom/src/moz-bullet-font.otf → packages/blitz-dom/src/moz-bullet-font.otf
diff --git a/packages/dom/src/mutation.rs → packages/blitz-dom/src/mutation.rs b/packages/dom/src/mutation.rs → packages/blitz-dom/src/mutation.rs
diff --git a/packages/dom/src/node.rs → packages/blitz-dom/src/node.rs b/packages/dom/src/node.rs → packages/blitz-dom/src/node.rs
diff --git a/packages/dom/src/stylo.rs → packages/blitz-dom/src/stylo.rs b/packages/dom/src/stylo.rs → packages/blitz-dom/src/stylo.rs
diff --git a/packages/dom/src/stylo_to_parley.rs → packages/blitz-dom/src/stylo_to_parley.rs b/packages/dom/src/stylo_to_parley.rs → packages/blitz-dom/src/stylo_to_parley.rs
diff --git a/packages/dom/src/stylo_to_taffy.rs → packages/blitz-dom/src/stylo_to_taffy.rs b/packages/dom/src/stylo_to_taffy.rs → packages/blitz-dom/src/stylo_to_taffy.rs
diff --git a/packages/dom/src/util.rs → packages/blitz-dom/src/util.rs b/packages/dom/src/util.rs → packages/blitz-dom/src/util.rs
diff --git a/packages/dom/src/viewport.rs → packages/blitz-dom/src/viewport.rs b/packages/dom/src/viewport.rs → packages/blitz-dom/src/viewport.rs
diff --git a/packages/net/Cargo.toml → packages/blitz-net/Cargo.toml b/packages/net/Cargo.toml → packages/blitz-net/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-blitz-traits = { path = "../traits" }
+blitz-traits = { path = "../blitz-traits" }
 tokio = { workspace = true }
 reqwest = { version = "0.12.7" }
 data-url = "0.3.1"

diff --git a/packages/net/src/lib.rs → packages/blitz-net/src/lib.rs b/packages/net/src/lib.rs → packages/blitz-net/src/lib.rs
diff --git a/packages/blitz/Cargo.toml → packages/blitz-renderer-vello/Cargo.toml b/packages/blitz/Cargo.toml → packages/blitz-renderer-vello/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "blitz"
+name = "blitz-renderer-vello"
 version = "0.1.0"
 edition = "2021"
 
@@ -8,7 +8,7 @@ default = ["tracing"]
 tracing = ["dep:tracing"]
 
 [dependencies]
-blitz-dom = { path = "../dom" }
+blitz-dom = { path = "../blitz-dom" }
 style = { workspace = true, features = ["servo"] }
 taffy = { workspace = true }
 parley = { workspace = true }

diff --git a/packages/blitz/src/devtools.rs → ...ages/blitz-renderer-vello/src/devtools.rs b/packages/blitz/src/devtools.rs → ...ages/blitz-renderer-vello/src/devtools.rs
diff --git a/packages/blitz/src/lib.rs → packages/blitz-renderer-vello/src/lib.rs b/packages/blitz/src/lib.rs → packages/blitz-renderer-vello/src/lib.rs
diff --git a/packages/blitz/src/renderer.rs → ...ages/blitz-renderer-vello/src/renderer.rs b/packages/blitz/src/renderer.rs → ...ages/blitz-renderer-vello/src/renderer.rs
diff --git a/...z/src/renderer/multicolor_rounded_rect.rs → ...o/src/renderer/multicolor_rounded_rect.rs b/...z/src/renderer/multicolor_rounded_rect.rs → ...o/src/renderer/multicolor_rounded_rect.rs
diff --git a/packages/blitz/src/renderer/render.rs → ...itz-renderer-vello/src/renderer/render.rs b/packages/blitz/src/renderer/render.rs → ...itz-renderer-vello/src/renderer/render.rs
diff --git a/packages/blitz/src/util.rs → packages/blitz-renderer-vello/src/util.rs b/packages/blitz/src/util.rs → packages/blitz-renderer-vello/src/util.rs
diff --git a/packages/traits/Cargo.toml → packages/blitz-traits/Cargo.toml b/packages/traits/Cargo.toml → packages/blitz-traits/Cargo.toml
diff --git a/packages/traits/src/lib.rs → packages/blitz-traits/src/lib.rs b/packages/traits/src/lib.rs → packages/blitz-traits/src/lib.rs
diff --git a/packages/traits/src/net.rs → packages/blitz-traits/src/net.rs b/packages/traits/src/net.rs → packages/blitz-traits/src/net.rs
diff --git a/packages/dioxus-blitz/Cargo.toml b/packages/dioxus-blitz/Cargo.toml
@@ -11,23 +11,23 @@ tracing = ["dep:tracing"]
 default = ["accessibility", "hot-reload", "menu", "tracing"]
 
 [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"] }
 dioxus = { workspace = true }
 dioxus-cli-config = { workspace = true, optional = true }
-dioxus-devtools = { workspace = true, package = "dioxus-devtools", optional = true }
+dioxus-devtools = { workspace = true, optional = true }
 futures-util = "0.3.30"
 vello = { workspace = true }
 wgpu = { workspace = true }
 style = { workspace = true }
 tracing = { workspace = true, optional = true }
-blitz = { path = "../blitz" }
-blitz-dom = { path = "../dom" }
-blitz-net = { path = "../net" }
-blitz-traits = { path = "../traits" }
 url = { version = "2.5.0", features = ["serde"] }
 ureq = "2.9"
 rustc-hash = "1.1.0"

diff --git a/packages/dioxus-blitz/src/window.rs b/packages/dioxus-blitz/src/window.rs
@@ -1,9 +1,9 @@
 use crate::accessibility::AccessibilityState;
 use crate::waker::{create_waker, BlitzEvent, BlitzWindowEvent};
 use crate::{stylo_to_winit, Callback};
-use blitz::{Devtools, Renderer};
 use blitz_dom::events::{EventData, RendererEvent};
 use blitz_dom::{DocumentLike, Viewport};
+use blitz_renderer_vello::{Devtools, Renderer};
 use winit::keyboard::PhysicalKey;
 
 #[allow(unused)]

diff --git a/packages/dom/Cargo.lock b/packages/dom/Cargo.lock