diff --git a/Cargo.toml b/Cargo.toml index b017ee36a..3c837a89f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,14 +13,14 @@ use_camera = ["freya/use_camera"] hot-reload = ["freya/hot-reload"] [patch.crates-io] -dioxus = { git = "https://github.com/DioxusLabs/dioxus", rev = "46b0eeb12cf2b388d29a9061b74e9470a8487679" } -dioxus-rsx = { git = "https://github.com/DioxusLabs/dioxus", rev = "46b0eeb12cf2b388d29a9061b74e9470a8487679" } -dioxus-core-macro = { git = "https://github.com/DioxusLabs/dioxus", rev = "46b0eeb12cf2b388d29a9061b74e9470a8487679" } -dioxus-hooks = { git = "https://github.com/DioxusLabs/dioxus", rev = "46b0eeb12cf2b388d29a9061b74e9470a8487679" } -dioxus-signals = { git = "https://github.com/DioxusLabs/dioxus", rev = "46b0eeb12cf2b388d29a9061b74e9470a8487679" } -dioxus-core = { git = "https://github.com/DioxusLabs/dioxus", rev = "46b0eeb12cf2b388d29a9061b74e9470a8487679" } -dioxus-hot-reload = { git = "https://github.com/DioxusLabs/dioxus", rev = "46b0eeb12cf2b388d29a9061b74e9470a8487679" } -dioxus-router = { git = "https://github.com/DioxusLabs/dioxus", rev = "46b0eeb12cf2b388d29a9061b74e9470a8487679" } +# dioxus = { git = "https://github.com/DioxusLabs/dioxus", rev = "7beacdf9c76ae5412d3c2bcd55f7c5d87f486a0f" } +# dioxus-rsx = { git = "https://github.com/DioxusLabs/dioxus", rev = "7beacdf9c76ae5412d3c2bcd55f7c5d87f486a0f" } +# dioxus-core-macro = { git = "https://github.com/DioxusLabs/dioxus", rev = "7beacdf9c76ae5412d3c2bcd55f7c5d87f486a0f" } +# dioxus-hooks = { git = "https://github.com/DioxusLabs/dioxus", rev = "7beacdf9c76ae5412d3c2bcd55f7c5d87f486a0f" } +# dioxus-signals = { git = "https://github.com/DioxusLabs/dioxus", rev = "7beacdf9c76ae5412d3c2bcd55f7c5d87f486a0f" } +# dioxus-core = { git = "https://github.com/DioxusLabs/dioxus", rev = "7beacdf9c76ae5412d3c2bcd55f7c5d87f486a0f" } +# dioxus-hot-reload = { git = "https://github.com/DioxusLabs/dioxus", rev = "7beacdf9c76ae5412d3c2bcd55f7c5d87f486a0f" } +# dioxus-router = { git = "https://github.com/DioxusLabs/dioxus", rev = "7beacdf9c76ae5412d3c2bcd55f7c5d87f486a0f" } [workspace.dependencies] freya = { path = "crates/freya", version = "0.1" } @@ -39,15 +39,15 @@ torin = { path = "crates/torin", version = "0.1" } dioxus-native-core-macro = { path = "crates/native-core-macro", version = "0.1" } dioxus-native-core = { path = "crates/native-core", version = "0.1" } -dioxus = { version = "0.5.0-alpha.0", default-features = false, features = ["macro", "signals", "hooks"]} -dioxus-rsx = { version = "0.5.0-alpha.0", features = ["hot_reload"] } -dioxus-core-macro = { version = "0.5.0-alpha.0" } -dioxus-hooks = { version = "0.5.0-alpha.0" } -dioxus-signals = { version = "0.5.0-alpha.0" } -dioxus-core = { version = "0.5.0-alpha.0" } -dioxus-hot-reload = { version = "0.5.0-alpha.0", features = ["file_watcher"], default-features = false } -dioxus-router = { version = "0.5.0-alpha.0", default-features = false } -dioxus-std = { git = "https://github.com/marc2332/dioxus-std", rev = "4d8ae33b94537d54471cd924c32f03c1d949430f", features = ["clipboard"]} +dioxus = { version = "0.5", default-features = false, features = ["macro", "signals", "hooks"]} +dioxus-rsx = { version = "0.5", features = ["hot_reload"] } +dioxus-core-macro = { version = "0.5" } +dioxus-hooks = { version = "0.5" } +dioxus-signals = { version = "0.5" } +dioxus-core = { version = "0.5" } +dioxus-hot-reload = { version = "0.5", features = ["file_watcher"], default-features = false } +dioxus-router = { version = "0.5", default-features = false } +dioxus-sdk = { version = "0.5", features = ["clipboard"]} skia-safe = { version = "0.72.0", features = ["gl", "textlayout", "svg"] } @@ -78,7 +78,7 @@ freya = { workspace = true } freya-core = { workspace = true } reqwest = { version = "0.11.22", features = ["json"] } serde = "1.0.189" -dioxus-std = { git = "https://github.com/marc2332/dioxus-std", rev = "4d8ae33b94537d54471cd924c32f03c1d949430f", features = ["i18n"] } +dioxus-sdk = { version = "0.5", features = ["i18n"] } rand = "0.8.5" dioxus-router = { workspace = true } itertools = "0.11.0" diff --git a/README.md b/README.md index b014a23c8..ed9b7f630 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ dioxus = { version = "0.4", features = ["macro", "hooks"], default-features = fa - 🔄️ Dioxus **Hot-reload** support - 📒 Multi-line **text editing** (experimental ⚠️) - 🦾 Basic **Accessibility** Support (experimental ⚠️) -- 🧩Compatible with dioxus-std and other Dioxus renderer-agnostic libraries +- 🧩Compatible with dioxus-sdk and other Dioxus renderer-agnostic libraries ### Goals 😁 - Performant and low memory usage diff --git a/book/src/what_is_freya.md b/book/src/what_is_freya.md index b91d2dc6f..9651faed5 100644 --- a/book/src/what_is_freya.md +++ b/book/src/what_is_freya.md @@ -13,7 +13,7 @@ - 🔄️ Dioxus **Hot-reload** support - 📒 Multi-line **text editing** (experimental ⚠️) - 🦾 Basic **Accessibility** Support (experimental ⚠️) -- 🧩Compatible with dioxus-std and other Dioxus renderer-agnostic libraries +- 🧩Compatible with dioxus-sdk and other Dioxus renderer-agnostic libraries ### Why 🧬 Dioxus? diff --git a/crates/hooks/Cargo.toml b/crates/hooks/Cargo.toml index c147c5f2c..06f87d949 100644 --- a/crates/hooks/Cargo.toml +++ b/crates/hooks/Cargo.toml @@ -29,7 +29,7 @@ torin = { workspace = true } dioxus-hooks = { workspace = true } dioxus-signals = { workspace = true } dioxus-core = { workspace = true } -dioxus-std = { workspace = true } +dioxus-sdk = { workspace = true } tokio = { workspace = true } winit = { workspace = true } diff --git a/crates/hooks/src/rope_editor.rs b/crates/hooks/src/rope_editor.rs index f12bee05f..090e105ba 100644 --- a/crates/hooks/src/rope_editor.rs +++ b/crates/hooks/src/rope_editor.rs @@ -1,6 +1,6 @@ use std::{cmp::Ordering, fmt::Display, ops::Range}; -use dioxus_std::clipboard::UseClipboard; +use dioxus_sdk::clipboard::UseClipboard; use ropey::iter::Lines; pub use ropey::Rope; diff --git a/crates/hooks/src/text_editor.rs b/crates/hooks/src/text_editor.rs index 5c7d06d21..f8905f990 100644 --- a/crates/hooks/src/text_editor.rs +++ b/crates/hooks/src/text_editor.rs @@ -1,6 +1,6 @@ use std::{borrow::Cow, cmp::Ordering, fmt::Display, ops::Range}; -use dioxus_std::clipboard::UseClipboard; +use dioxus_sdk::clipboard::UseClipboard; use freya_elements::events::keyboard::{Code, Key, Modifiers}; /// Holds the position of a cursor in a text diff --git a/crates/hooks/src/use_editable.rs b/crates/hooks/src/use_editable.rs index 31840f10d..a2e0fd0c5 100644 --- a/crates/hooks/src/use_editable.rs +++ b/crates/hooks/src/use_editable.rs @@ -5,8 +5,8 @@ use std::{ use dioxus_core::{prelude::spawn, use_hook, AttributeValue}; use dioxus_hooks::to_owned; +use dioxus_sdk::clipboard::use_clipboard; use dioxus_signals::{Readable, Signal, Writable}; -use dioxus_std::clipboard::use_clipboard; use freya_common::{CursorLayoutResponse, EventMessage}; use freya_elements::events::{KeyboardData, MouseData}; use freya_node_state::{CursorReference, CustomAttributeValues}; diff --git a/examples/i18n.rs b/examples/i18n.rs index f6a658070..4390f8c05 100644 --- a/examples/i18n.rs +++ b/examples/i18n.rs @@ -3,7 +3,7 @@ windows_subsystem = "windows" )] -use dioxus_std::{ +use dioxus_sdk::{ i18n::{use_i18, use_init_i18n, Language}, translate, };