From 9a2eb11ca5e03700a1cc023960e61fa41d9da540 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Sat, 16 Nov 2024 12:55:20 -0500 Subject: [PATCH] clean up descriptions and hoist some dependencies --- Cargo.lock | 2 -- Cargo.toml | 1 + examples/pwa/src/main.rs | 2 +- packages/autofmt/Cargo.toml | 3 +-- packages/check/Cargo.toml | 3 +-- packages/cli-config/Cargo.toml | 2 +- packages/cli/Cargo.toml | 4 ++-- packages/config-macro/Cargo.toml | 2 +- packages/core/Cargo.toml | 4 ++-- packages/dioxus-lib/Cargo.toml | 2 +- packages/dioxus/Cargo.toml | 15 +++++++++++---- packages/fullstack/Cargo.toml | 6 +++--- packages/generational-box/Cargo.toml | 4 ++-- packages/signals/Cargo.toml | 10 ++++------ packages/web/Cargo.toml | 4 ++-- 15 files changed, 33 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5e255b308..6dbda3f48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3829,8 +3829,6 @@ dependencies = [ "generational-box", "once_cell", "parking_lot", - "rand 0.8.5", - "reqwest 0.12.9", "rustc-hash 1.1.0", "serde", "simple_logger", diff --git a/Cargo.toml b/Cargo.toml index 346927630..9cb5de0f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -216,6 +216,7 @@ cargo-config2 = "0.1.26" criterion = { version = "0.5" } walrus = "0.22.0" cargo_metadata = "0.18.1" +parking_lot = "0.12.1" # desktop wry = { version = "0.45.0", default-features = false } diff --git a/examples/pwa/src/main.rs b/examples/pwa/src/main.rs index 581395e3d..0839f7e83 100644 --- a/examples/pwa/src/main.rs +++ b/examples/pwa/src/main.rs @@ -14,7 +14,7 @@ fn app() -> Element { h1 { "🌗 Dioxus 🚀" } h3 { "Frontend that scales." } p { - "Dioxus is a portable, performant, and ergonomic framework for building cross-platform user interfaces in Rust." + "Dioxus is a Build fullstack web, desktop, and mobile apps with a single codebase.." } } ) diff --git a/packages/autofmt/Cargo.toml b/packages/autofmt/Cargo.toml index 1e6d6e6d3..29ae2d99c 100644 --- a/packages/autofmt/Cargo.toml +++ b/packages/autofmt/Cargo.toml @@ -7,8 +7,7 @@ description = "Autofomatter for Dioxus RSX" license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com" -keywords = ["dom", "ui", "gui", "react"] -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +keywords = ["web", "desktop", "mobile", "gui", "wasm"] [dependencies] dioxus-rsx = { workspace = true } diff --git a/packages/check/Cargo.toml b/packages/check/Cargo.toml index 9877ed27c..a61b59948 100644 --- a/packages/check/Cargo.toml +++ b/packages/check/Cargo.toml @@ -7,8 +7,7 @@ description = "Checks Dioxus RSX files for issues" license = "MIT/Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com" -keywords = ["dom", "ui", "gui", "react"] -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +keywords = ["web", "desktop", "mobile", "gui", "wasm"] [dependencies] proc-macro2 = { workspace = true, features = ["span-locations"] } diff --git a/packages/cli-config/Cargo.toml b/packages/cli-config/Cargo.toml index a0c5fdfdf..f790326b5 100644 --- a/packages/cli-config/Cargo.toml +++ b/packages/cli-config/Cargo.toml @@ -7,6 +7,6 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com" description = "CLI Configuration for dioxus-cli" -keywords = ["dom", "ui", "gui", "react", ] +keywords = ["web", "desktop", "mobile", "gui", "wasm"] [dependencies] diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index 4174fdded..d761cbae4 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -3,10 +3,10 @@ name = "dioxus-cli" version = { workspace = true } authors = ["Jonathan Kelley"] edition = "2021" -description = "CLI tool for developing, testing, and publishing Dioxus apps" +description = "CLI for building fullstack web, desktop, and mobile apps with a single codebase." repository = "https://github.com/DioxusLabs/dioxus/" license = "MIT OR Apache-2.0" -keywords = ["react", "gui", "cli", "dioxus", "wasm"] +keywords = ["mobile", "gui", "cli", "dioxus", "wasm"] rust-version = "1.79.0" [dependencies] diff --git a/packages/config-macro/Cargo.toml b/packages/config-macro/Cargo.toml index b75558880..d233fd90e 100644 --- a/packages/config-macro/Cargo.toml +++ b/packages/config-macro/Cargo.toml @@ -7,7 +7,7 @@ description = "Configuration macros for Dioxus" license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com" -keywords = ["dom", "ui", "gui", "react"] +keywords = ["web", "desktop", "mobile", "gui", "wasm"] [lib] proc-macro = true diff --git a/packages/core/Cargo.toml b/packages/core/Cargo.toml index 9ba11ad46..93ce0f4f2 100644 --- a/packages/core/Cargo.toml +++ b/packages/core/Cargo.toml @@ -3,11 +3,11 @@ name = "dioxus-core" version = { workspace = true } authors = ["Jonathan Kelley"] edition = "2021" -description = "Core functionality for Dioxus - a concurrent renderer-agnostic Virtual DOM for interactive user experiences" +description = "Build fullstack web, desktop, and mobile apps with a single codebase." license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com" -keywords = ["dom", "ui", "gui", "react"] +keywords = ["web", "desktop", "mobile", "gui", "wasm"] [dependencies] dioxus-core-types = { workspace = true } diff --git a/packages/dioxus-lib/Cargo.toml b/packages/dioxus-lib/Cargo.toml index 50d0a6fa2..0f09048e3 100644 --- a/packages/dioxus-lib/Cargo.toml +++ b/packages/dioxus-lib/Cargo.toml @@ -3,7 +3,7 @@ name = "dioxus-lib" version = { workspace = true } authors = ["Jonathan Kelley", "Dioxus Labs", "ealmloff"] edition = "2021" -description = "Portable, performant, and ergonomic framework for building cross-platform user interfaces in Rust" +description = "Build fullstack web, desktop, and mobile apps with a single codebase." license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com/learn/0.5/" diff --git a/packages/dioxus/Cargo.toml b/packages/dioxus/Cargo.toml index 2806ae114..ea4229bc4 100644 --- a/packages/dioxus/Cargo.toml +++ b/packages/dioxus/Cargo.toml @@ -3,11 +3,11 @@ name = "dioxus" version = { workspace = true } authors = ["Jonathan Kelley", "Dioxus Labs", "ealmloff"] edition = "2021" -description = "Portable, performant, and ergonomic framework for building cross-platform user interfaces in Rust" +description = "Build fullstack web, desktop, and mobile apps with a single codebase." license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" -homepage = "https://dioxuslabs.com/learn/0.5/" -keywords = ["dom", "ui", "gui", "react", "wasm"] +homepage = "https://dioxuslabs.com" +keywords = ["web", "desktop", "mobile", "gui", "wasm"] rust-version = "1.79.0" [dependencies] @@ -28,7 +28,7 @@ dioxus-liveview = { workspace = true, optional = true } dioxus-ssr = { workspace = true, optional = true } manganis = { workspace = true, optional = true } -serde = { version = "1.0.136", optional = true } +serde = { workspace = true, optional = true } [target.'cfg(not(any(target_arch = "wasm32", target_os = "ios", target_os = "android")))'.dependencies] dioxus-devtools = { workspace = true, optional = true } @@ -88,3 +88,10 @@ features = [ "liveview", "server" ] +targets = [ + "wasm32-unknown-unknown", + "aarch64-apple-darwin", + "x86_64-unknown-linux-gnu", + "x86_64-pc-windows-msvc", + "aarch64-linux-android", +] diff --git a/packages/fullstack/Cargo.toml b/packages/fullstack/Cargo.toml index 212cb84c7..b5f55de11 100644 --- a/packages/fullstack/Cargo.toml +++ b/packages/fullstack/Cargo.toml @@ -3,11 +3,11 @@ name = "dioxus-fullstack" authors = ["Jonathan Kelley", "Evan Almloff"] version = { workspace = true } edition = "2021" -description = "Fullstack Dioxus Utilities" +description = "Fullstack utilities for Dioxus: Build fullstack web, desktop, and mobile apps with a single codebase." license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com" -keywords = ["ui", "gui", "react", "server", "fullstack"] +keywords = ["web", "desktop", "mobile", "gui", "server"] resolver = "2" [dependencies] @@ -58,7 +58,7 @@ thiserror = { workspace = true, optional = true } bytes = "1.4.0" tower = { workspace = true, features = ["util"], optional = true } tower-layer = { version = "0.3.2", optional = true } -parking_lot = { version = "0.12.1", features = ["send_guard"], optional = true } +parking_lot = { workspace = true, features = ["send_guard"], optional = true } web-sys = { version = "0.3.61", optional = true, features = ["Window", "Document", "Element", "HtmlDocument", "Storage", "console"] } dioxus-cli-config = { workspace = true, optional = true } diff --git a/packages/generational-box/Cargo.toml b/packages/generational-box/Cargo.toml index 68d607aee..f8e8f767b 100644 --- a/packages/generational-box/Cargo.toml +++ b/packages/generational-box/Cargo.toml @@ -10,8 +10,8 @@ keywords = ["generational", "box", "memory", "allocator"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -parking_lot = "0.12.1" -tracing.workspace = true +parking_lot = { workspace = true } +tracing = { workspace = true } [dev-dependencies] rand = { workspace = true } diff --git a/packages/signals/Cargo.toml b/packages/signals/Cargo.toml index 1d952b71d..2ca24c692 100644 --- a/packages/signals/Cargo.toml +++ b/packages/signals/Cargo.toml @@ -3,7 +3,7 @@ name = "dioxus-signals" authors = ["Jonathan Kelley", "Evan Almloff"] version = { workspace = true } edition = "2021" -description = "Signals for Dioxus" +description = "Reactivie signals for Dioxus: Build fullstack web, desktop, and mobile apps with a single codebase." license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com" @@ -16,9 +16,9 @@ rust-version = "1.79.0" dioxus-core = { workspace = true } generational-box = { workspace = true } tracing = { workspace = true } -serde = { version = "1", features = ["derive"], optional = true } -parking_lot = "0.12.1" -once_cell = "1.18.0" +serde = { workspace = true, features = ["derive"], optional = true } +parking_lot = { workspace = true} +once_cell = { workspace = true} rustc-hash = { workspace = true } futures-channel = { workspace = true } futures-util = { workspace = true } @@ -29,8 +29,6 @@ dioxus = { workspace = true } tokio = { workspace = true, features = ["full"] } tracing-subscriber = "0.3.17" simple_logger = "4.2.0" -reqwest = { workspace = true } -rand = { workspace = true } [features] default = [] diff --git a/packages/web/Cargo.toml b/packages/web/Cargo.toml index 9aed05f93..4e1eeb302 100644 --- a/packages/web/Cargo.toml +++ b/packages/web/Cargo.toml @@ -3,11 +3,11 @@ name = "dioxus-web" version = { workspace = true } authors = ["Jonathan Kelley"] edition = "2021" -description = "Web renderer for Dioxus using websys" +description = "Web-sys renderer for Dioxus: Build fullstack web, desktop, and mobile apps with a single codebase." license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com/learn/0.5/getting_started" -keywords = ["dom", "ui", "gui", "react", "wasm"] +keywords = ["dom", "ui", "gui", "web", "wasm"] [dependencies] dioxus-core = { workspace = true }