diff --git a/Cargo.toml b/Cargo.toml index e46e08d9..1fa15bb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = [ "packages/blitz-dom", "packages/blitz-net", "packages/blitz-renderer-vello", - "packages/dioxus-blitz" + "packages/dioxus-native" ] resolver = "2" @@ -105,7 +105,7 @@ 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"] } +dioxus-native = { path = "./packages/dioxus-native", features = ["tracing"] } comrak = { git = "https://github.com/kivikakk/comrak", rev = "96a64d1befcaa8715098bf617e836c2ef70cb692", default-features = false, features = ["syntect"] } png = { version = "0.17" } dioxus = { workspace = true } diff --git a/README.md b/README.md index d683004c..b52a2e68 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ We don't yet have Blitz bindings for other languages (JavaScript, Python, etc) b Blitz is split into several pieces: - `blitz-dom`: The core DOM abstraction that includes style resolution and layout but not drawing/painting. Combines the best of Stylo and Taffy that allows you to build extendable dom-like structures. - `blitz`: Adds a Vello/WGPU based renderer to `blitz-dom` -- `dioxus-blitz`: A dioxus integration layer for blitz. Render your Dioxus app using Blitz. Currently `dioxus-blitz` also contains the HTML renderer but this will likely be split out into it's own package in future. +- `dioxus-native`: A dioxus integration layer for blitz. Render your Dioxus app using Blitz. Currently `dioxus-native` also contains the HTML renderer but this will likely be split out into it's own package in future. ## Status diff --git a/examples/accessibility.rs b/examples/accessibility.rs index 3ffa387f..24cfce92 100644 --- a/examples/accessibility.rs +++ b/examples/accessibility.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; fn main() { - dioxus_blitz::launch(app); + dioxus_native::launch(app); } fn app() -> Element { diff --git a/examples/bare_style.rs b/examples/bare_style.rs index 253338db..c5c420f7 100644 --- a/examples/bare_style.rs +++ b/examples/bare_style.rs @@ -33,7 +33,7 @@ fn root() -> Element { } fn main() { - dioxus_blitz::launch(root); + dioxus_native::launch(root); // let document = blitz_dom::Document::new(); diff --git a/examples/border.rs b/examples/border.rs index 03308eb6..91b6053e 100644 --- a/examples/border.rs +++ b/examples/border.rs @@ -4,7 +4,7 @@ use dioxus::prelude::*; fn main() { - dioxus_blitz::launch(app); + dioxus_native::launch(app); } fn app() -> Element { diff --git a/examples/flex.rs b/examples/flex.rs index 1e8536d6..8c1e76c6 100644 --- a/examples/flex.rs +++ b/examples/flex.rs @@ -7,7 +7,7 @@ Servo doesn't have: use dioxus::prelude::*; fn main() { - dioxus_blitz::launch(app); + dioxus_native::launch(app); } fn app() -> Element { diff --git a/examples/flex_order.rs b/examples/flex_order.rs index 8f333a09..7235b377 100644 --- a/examples/flex_order.rs +++ b/examples/flex_order.rs @@ -7,7 +7,7 @@ Servo doesn't have: use dioxus::prelude::*; fn main() { - dioxus_blitz::launch(app); + dioxus_native::launch(app); } fn app() -> Element { diff --git a/examples/form.rs b/examples/form.rs index 22610dc7..5e7b7e7a 100644 --- a/examples/form.rs +++ b/examples/form.rs @@ -3,7 +3,7 @@ use dioxus::prelude::*; fn main() { - dioxus_blitz::launch(app); + dioxus_native::launch(app); } fn app() -> Element { diff --git a/examples/google.rs b/examples/google.rs index 35d40bfc..f2f08c0f 100644 --- a/examples/google.rs +++ b/examples/google.rs @@ -1,9 +1,9 @@ //! Render google.com! -use dioxus_blitz::Config; +use dioxus_native::Config; fn main() { - dioxus_blitz::launch_static_html_cfg( + dioxus_native::launch_static_html_cfg( &get_html(), Config { stylesheets: Vec::new(), diff --git a/examples/gosub.rs b/examples/gosub.rs index 04f07b04..7baca3e7 100644 --- a/examples/gosub.rs +++ b/examples/gosub.rs @@ -1,7 +1,7 @@ -use dioxus_blitz::Config; +use dioxus_native::Config; fn main() { - dioxus_blitz::launch_static_html_cfg( + dioxus_native::launch_static_html_cfg( include_str!("./assets/gosub_reduced.html"), Config { stylesheets: Vec::new(), diff --git a/examples/gradient.rs b/examples/gradient.rs index a2d99f9d..7d85d894 100644 --- a/examples/gradient.rs +++ b/examples/gradient.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; fn main() { - dioxus_blitz::launch(app); + dioxus_native::launch(app); } fn app() -> Element { diff --git a/examples/html.rs b/examples/html.rs index 27e05d23..4cd941ca 100644 --- a/examples/html.rs +++ b/examples/html.rs @@ -1,4 +1,4 @@ -use dioxus_blitz::Config; +use dioxus_native::Config; fn main() { let local_file_path = std::env::args() @@ -8,7 +8,7 @@ fn main() { let file_content = std::fs::read_to_string(local_file_path).unwrap(); - dioxus_blitz::launch_static_html_cfg( + dioxus_native::launch_static_html_cfg( &file_content, Config { stylesheets: Vec::new(), diff --git a/examples/inline_block.rs b/examples/inline_block.rs index 66379e46..3fed7961 100644 --- a/examples/inline_block.rs +++ b/examples/inline_block.rs @@ -3,7 +3,7 @@ use dioxus::prelude::*; fn main() { - dioxus_blitz::launch(app); + dioxus_native::launch(app); } fn app() -> Element { diff --git a/examples/interactive.rs b/examples/interactive.rs index 8bd901ae..e981ecb4 100644 --- a/examples/interactive.rs +++ b/examples/interactive.rs @@ -4,7 +4,7 @@ use dioxus::prelude::*; fn main() { tracing_subscriber::fmt::init(); - dioxus_blitz::launch(app); + dioxus_native::launch(app); } fn app() -> Element { diff --git a/examples/layout_debug.rs b/examples/layout_debug.rs index 78e7d3e5..b90c1d82 100644 --- a/examples/layout_debug.rs +++ b/examples/layout_debug.rs @@ -4,7 +4,7 @@ use dioxus::prelude::*; fn main() { - dioxus_blitz::launch(app); + dioxus_native::launch(app); } fn app() -> Element { diff --git a/examples/markdown.rs b/examples/markdown.rs index e9466204..500d6601 100644 --- a/examples/markdown.rs +++ b/examples/markdown.rs @@ -7,7 +7,7 @@ use comrak::{ plugins::syntect::SyntectAdapter, ExtensionOptionsBuilder, Options, Plugins, RenderOptionsBuilder, }; -use dioxus_blitz::Config; +use dioxus_native::Config; fn main() { let (base_url, contents) = std::env::args() @@ -72,7 +72,7 @@ fn main() { println!("{html}"); - dioxus_blitz::launch_static_html_cfg( + dioxus_native::launch_static_html_cfg( &html, Config { stylesheets: vec![String::from(stylesheet)], diff --git a/examples/outline.rs b/examples/outline.rs index b7cb3f89..f9699fde 100644 --- a/examples/outline.rs +++ b/examples/outline.rs @@ -4,7 +4,7 @@ use dioxus::prelude::*; fn main() { - dioxus_blitz::launch(app); + dioxus_native::launch(app); } fn app() -> Element { diff --git a/examples/parse_debug.rs b/examples/parse_debug.rs index 4cf633a0..21ba50fb 100644 --- a/examples/parse_debug.rs +++ b/examples/parse_debug.rs @@ -1,5 +1,5 @@ //! Render minimal html5 page fn main() { - dioxus_blitz::launch_static_html(include_str!("./assets/google_reduced.html")); + dioxus_native::launch_static_html(include_str!("./assets/google_reduced.html")); } diff --git a/examples/scroll.rs b/examples/scroll.rs index 7e8cd2e1..33f3e670 100644 --- a/examples/scroll.rs +++ b/examples/scroll.rs @@ -51,5 +51,5 @@ fn root() -> Element { } fn main() { - dioxus_blitz::launch(root); + dioxus_native::launch(root); } diff --git a/examples/servo.rs b/examples/servo.rs index 6f5a73ef..c5addf32 100644 --- a/examples/servo.rs +++ b/examples/servo.rs @@ -1,7 +1,7 @@ -use dioxus_blitz::Config; +use dioxus_native::Config; fn main() { - dioxus_blitz::launch_static_html_cfg( + dioxus_native::launch_static_html_cfg( include_str!("./assets/servo.html"), Config { stylesheets: Vec::new(), diff --git a/examples/tailwind.rs b/examples/tailwind.rs index 5a783194..0854b909 100644 --- a/examples/tailwind.rs +++ b/examples/tailwind.rs @@ -7,7 +7,7 @@ use dioxus::prelude::*; fn main() { - dioxus_blitz::launch(app); + dioxus_native::launch(app); } fn app() -> Element { diff --git a/examples/text.rs b/examples/text.rs index ffc97194..e2af5952 100644 --- a/examples/text.rs +++ b/examples/text.rs @@ -3,7 +3,7 @@ use dioxus::prelude::*; fn main() { tracing_subscriber::fmt::init(); - dioxus_blitz::launch(app); + dioxus_native::launch(app); } fn app() -> Element { diff --git a/examples/todomvc.rs b/examples/todomvc.rs index 9d5afc0b..4ba78072 100644 --- a/examples/todomvc.rs +++ b/examples/todomvc.rs @@ -5,7 +5,7 @@ use std::collections::HashMap; fn main() { tracing_subscriber::fmt::init(); - dioxus_blitz::launch(app) + dioxus_native::launch(app) } #[derive(PartialEq, Eq, Clone, Copy)] diff --git a/examples/url.rs b/examples/url.rs index 7c498257..51dd55ac 100644 --- a/examples/url.rs +++ b/examples/url.rs @@ -5,5 +5,5 @@ fn main() { .skip(1) .next() .unwrap_or_else(|| "https://www.google.com".into()); - dioxus_blitz::launch_url(&url); + dioxus_native::launch_url(&url); } diff --git a/packages/dioxus-blitz/Cargo.toml b/packages/dioxus-native/Cargo.toml similarity index 98% rename from packages/dioxus-blitz/Cargo.toml rename to packages/dioxus-native/Cargo.toml index 01ad6896..c0f61512 100644 --- a/packages/dioxus-blitz/Cargo.toml +++ b/packages/dioxus-native/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "dioxus-blitz" +name = "dioxus-native" version = "0.0.0" license.workspace = true edition = "2021" diff --git a/packages/dioxus-blitz/src/accessibility.rs b/packages/dioxus-native/src/accessibility.rs similarity index 100% rename from packages/dioxus-blitz/src/accessibility.rs rename to packages/dioxus-native/src/accessibility.rs diff --git a/packages/dioxus-blitz/src/application.rs b/packages/dioxus-native/src/application.rs similarity index 100% rename from packages/dioxus-blitz/src/application.rs rename to packages/dioxus-native/src/application.rs diff --git a/packages/dioxus-blitz/src/documents/dioxus_document.rs b/packages/dioxus-native/src/documents/dioxus_document.rs similarity index 100% rename from packages/dioxus-blitz/src/documents/dioxus_document.rs rename to packages/dioxus-native/src/documents/dioxus_document.rs diff --git a/packages/dioxus-blitz/src/documents/event_handler.rs b/packages/dioxus-native/src/documents/event_handler.rs similarity index 100% rename from packages/dioxus-blitz/src/documents/event_handler.rs rename to packages/dioxus-native/src/documents/event_handler.rs diff --git a/packages/dioxus-blitz/src/documents/keyboard_event.rs b/packages/dioxus-native/src/documents/keyboard_event.rs similarity index 100% rename from packages/dioxus-blitz/src/documents/keyboard_event.rs rename to packages/dioxus-native/src/documents/keyboard_event.rs diff --git a/packages/dioxus-blitz/src/documents/mod.rs b/packages/dioxus-native/src/documents/mod.rs similarity index 100% rename from packages/dioxus-blitz/src/documents/mod.rs rename to packages/dioxus-native/src/documents/mod.rs diff --git a/packages/dioxus-blitz/src/lib.rs b/packages/dioxus-native/src/lib.rs similarity index 100% rename from packages/dioxus-blitz/src/lib.rs rename to packages/dioxus-native/src/lib.rs diff --git a/packages/dioxus-blitz/src/menu.rs b/packages/dioxus-native/src/menu.rs similarity index 100% rename from packages/dioxus-blitz/src/menu.rs rename to packages/dioxus-native/src/menu.rs diff --git a/packages/dioxus-blitz/src/stylo_to_winit.rs b/packages/dioxus-native/src/stylo_to_winit.rs similarity index 100% rename from packages/dioxus-blitz/src/stylo_to_winit.rs rename to packages/dioxus-native/src/stylo_to_winit.rs diff --git a/packages/dioxus-blitz/src/waker.rs b/packages/dioxus-native/src/waker.rs similarity index 100% rename from packages/dioxus-blitz/src/waker.rs rename to packages/dioxus-native/src/waker.rs diff --git a/packages/dioxus-blitz/src/window.rs b/packages/dioxus-native/src/window.rs similarity index 100% rename from packages/dioxus-blitz/src/window.rs rename to packages/dioxus-native/src/window.rs