diff --git a/Cargo.lock b/Cargo.lock index 3b6da0588..741b9e15b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1951,11 +1951,11 @@ dependencies = [ [[package]] name = "dioxus" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "criterion 0.3.6", "dioxus-config-macro", - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "dioxus-core-macro", "dioxus-desktop", "dioxus-fullstack", @@ -1979,7 +1979,7 @@ dependencies = [ [[package]] name = "dioxus-autofmt" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "dioxus-rsx", "prettier-please", @@ -1992,7 +1992,7 @@ dependencies = [ [[package]] name = "dioxus-check" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "indoc", "owo-colors", @@ -2004,7 +2004,7 @@ dependencies = [ [[package]] name = "dioxus-cli" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "anyhow", "atty", @@ -2021,7 +2021,7 @@ dependencies = [ "dioxus-autofmt", "dioxus-check", "dioxus-cli-config", - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "dioxus-hot-reload", "dioxus-html", "dioxus-rsx", @@ -2069,7 +2069,7 @@ dependencies = [ [[package]] name = "dioxus-cli-config" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "cargo_toml 0.18.0", "clap 4.4.18", @@ -2084,7 +2084,7 @@ dependencies = [ [[package]] name = "dioxus-config-macro" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "proc-macro2", "quote", @@ -2093,6 +2093,20 @@ dependencies = [ [[package]] name = "dioxus-core" version = "0.5.0-alpha.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f39bef0484998f724622964f04468ddfde7fd550f5f0f1aef9394306e9caba44" +dependencies = [ + "futures-channel", + "futures-util", + "longest-increasing-subsequence", + "rustc-hash", + "slab", + "tracing", +] + +[[package]] +name = "dioxus-core" +version = "0.5.0-alpha.1" dependencies = [ "dioxus", "dioxus-ssr", @@ -2111,23 +2125,9 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "dioxus-core" -version = "0.5.0-alpha.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f39bef0484998f724622964f04468ddfde7fd550f5f0f1aef9394306e9caba44" -dependencies = [ - "futures-channel", - "futures-util", - "longest-increasing-subsequence", - "rustc-hash", - "slab", - "tracing", -] - [[package]] name = "dioxus-core-macro" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "constcat", "convert_case 0.6.0", @@ -2149,13 +2149,13 @@ checksum = "2ea539174bb236e0e7dc9c12b19b88eae3cb574dedbd0252a2d43ea7e6de13e2" [[package]] name = "dioxus-desktop" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "async-trait", "core-foundation", "dioxus", "dioxus-cli-config", - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "dioxus-hooks", "dioxus-hot-reload", "dioxus-html", @@ -2186,7 +2186,7 @@ dependencies = [ [[package]] name = "dioxus-examples" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "dioxus", "dioxus-ssr", @@ -2205,7 +2205,7 @@ dependencies = [ [[package]] name = "dioxus-ext" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "dioxus-autofmt", "html_parser", @@ -2215,7 +2215,7 @@ dependencies = [ [[package]] name = "dioxus-fullstack" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "anymap", "async-trait", @@ -2253,10 +2253,10 @@ dependencies = [ [[package]] name = "dioxus-hooks" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "dioxus", - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "dioxus-debug-cell", "dioxus-signals", "futures-channel", @@ -2271,10 +2271,10 @@ dependencies = [ [[package]] name = "dioxus-hot-reload" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "chrono", - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "dioxus-html", "dioxus-rsx", "execute", @@ -2288,10 +2288,10 @@ dependencies = [ [[package]] name = "dioxus-html" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "async-trait", - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "dioxus-html-internal-macro", "dioxus-rsx", "enumset", @@ -2311,7 +2311,7 @@ dependencies = [ [[package]] name = "dioxus-html-internal-macro" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -2322,9 +2322,9 @@ dependencies = [ [[package]] name = "dioxus-interpreter-js" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "dioxus-html", "js-sys", "md5", @@ -2337,10 +2337,10 @@ dependencies = [ [[package]] name = "dioxus-lib" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "dioxus-config-macro", - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "dioxus-core-macro", "dioxus-hooks", "dioxus-html", @@ -2350,12 +2350,12 @@ dependencies = [ [[package]] name = "dioxus-liveview" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "axum", "dioxus", "dioxus-cli-config", - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "dioxus-hot-reload", "dioxus-html", "dioxus-interpreter-js", @@ -2377,7 +2377,7 @@ dependencies = [ [[package]] name = "dioxus-mobile" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "dioxus-desktop", ] @@ -2423,17 +2423,15 @@ dependencies = [ [[package]] name = "dioxus-router" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "axum", - "console_error_panic_hook", "criterion 0.5.1", "dioxus", "dioxus-cli-config", "dioxus-fullstack", "dioxus-lib", "dioxus-liveview", - "dioxus-router", "dioxus-router-macro", "dioxus-ssr", "gloo", @@ -2446,13 +2444,12 @@ dependencies = [ "url", "urlencoding", "wasm-bindgen", - "wasm-bindgen-test", "web-sys", ] [[package]] name = "dioxus-router-macro" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "proc-macro2", "quote", @@ -2462,9 +2459,9 @@ dependencies = [ [[package]] name = "dioxus-rsx" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "internment", "krates", "proc-macro2", @@ -2476,10 +2473,10 @@ dependencies = [ [[package]] name = "dioxus-signals" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "dioxus", - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "futures-channel", "futures-util", "generational-box", @@ -2495,7 +2492,7 @@ dependencies = [ [[package]] name = "dioxus-ssr" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "anyhow", "argh", @@ -2503,7 +2500,7 @@ dependencies = [ "async-trait", "chrono", "dioxus", - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "dioxus-html", "dioxus-signals", "fern", @@ -2529,12 +2526,12 @@ dependencies = [ [[package]] name = "dioxus-web" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "async-trait", "console_error_panic_hook", "dioxus", - "dioxus-core 0.5.0-alpha.0", + "dioxus-core 0.5.0-alpha.1", "dioxus-html", "dioxus-interpreter-js", "dioxus-ssr", @@ -2559,7 +2556,7 @@ dependencies = [ [[package]] name = "dioxus_server_macro" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -3351,7 +3348,7 @@ dependencies = [ [[package]] name = "generational-box" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "criterion 0.3.6", "parking_lot", @@ -5395,7 +5392,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a42db80aa639f70d6bf1d2ef93612d2ffbb33f6ea17d473b91bfeb3f67bc24bc" dependencies = [ - "dioxus-core 0.5.0-alpha.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dioxus-core 0.5.0-alpha.0", "manganis-macro", ] @@ -7322,7 +7319,7 @@ dependencies = [ [[package]] name = "rsx-rosetta" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" dependencies = [ "convert_case 0.5.0", "dioxus-autofmt", diff --git a/Cargo.toml b/Cargo.toml index fe2e7bfd0..2061f005a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,36 +47,36 @@ members = [ exclude = ["examples/mobile_demo", "examples/openid_connect_demo"] [workspace.package] -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.2" # dependencies that are shared across packages [workspace.dependencies] -dioxus = { path = "packages/dioxus", version = "0.5.0-alpha.0" } -dioxus-lib = { path = "packages/dioxus-lib", version = "0.5.0-alpha.0" } -dioxus-core = { path = "packages/core", version = "0.5.0-alpha.0" } -dioxus-core-macro = { path = "packages/core-macro", version = "0.5.0-alpha.0" } -dioxus-config-macro = { path = "packages/config-macro", version = "0.5.0-alpha.0" } -dioxus-router = { path = "packages/router", version = "0.5.0-alpha.0" } -dioxus-router-macro = { path = "packages/router-macro", version = "0.5.0-alpha.0" } -dioxus-html = { path = "packages/html", version = "0.5.0-alpha.0" } -dioxus-html-internal-macro = { path = "packages/html-internal-macro", version = "0.5.0-alpha.0" } -dioxus-hooks = { path = "packages/hooks", version = "0.5.0-alpha.0" } -dioxus-web = { path = "packages/web", version = "0.5.0-alpha.0" } -dioxus-ssr = { path = "packages/ssr", version = "0.5.0-alpha.0", default-features = false } -dioxus-desktop = { path = "packages/desktop", version = "0.5.0-alpha.0" } -dioxus-mobile = { path = "packages/mobile", version = "0.5.0-alpha.0" } -dioxus-interpreter-js = { path = "packages/interpreter", version = "0.5.0-alpha.0" } -dioxus-liveview = { path = "packages/liveview", version = "0.5.0-alpha.0" } -dioxus-autofmt = { path = "packages/autofmt", version = "0.5.0-alpha.0" } -dioxus-check = { path = "packages/check", version = "0.5.0-alpha.0" } -dioxus-rsx = { path = "packages/rsx", version = "0.5.0-alpha.0" } -rsx-rosetta = { path = "packages/rsx-rosetta", version = "0.5.0-alpha.0" } -dioxus-signals = { path = "packages/signals", version = "0.5.0-alpha.0" } -dioxus-cli-config = { path = "packages/cli-config", version = "0.5.0-alpha.0" } -generational-box = { path = "packages/generational-box", version = "0.5.0-alpha.0" } -dioxus-hot-reload = { path = "packages/hot-reload", version = "0.5.0-alpha.0" } -dioxus-fullstack = { path = "packages/fullstack", version = "0.5.0-alpha.0" } -dioxus_server_macro = { path = "packages/server-macro", version = "0.5.0-alpha.0", default-features = false } +dioxus = { path = "packages/dioxus", version = "0.5.0-alpha.2" } +dioxus-lib = { path = "packages/dioxus-lib", version = "0.5.0-alpha.2" } +dioxus-core = { path = "packages/core", version = "0.5.0-alpha.2" } +dioxus-core-macro = { path = "packages/core-macro", version = "0.5.0-alpha.2" } +dioxus-config-macro = { path = "packages/config-macro", version = "0.5.0-alpha.2" } +dioxus-router = { path = "packages/router", version = "0.5.0-alpha.2" } +dioxus-router-macro = { path = "packages/router-macro", version = "0.5.0-alpha.2" } +dioxus-html = { path = "packages/html", version = "0.5.0-alpha.2" } +dioxus-html-internal-macro = { path = "packages/html-internal-macro", version = "0.5.0-alpha.2" } +dioxus-hooks = { path = "packages/hooks", version = "0.5.0-alpha.2" } +dioxus-web = { path = "packages/web", version = "0.5.0-alpha.2" } +dioxus-ssr = { path = "packages/ssr", version = "0.5.0-alpha.2", default-features = false } +dioxus-desktop = { path = "packages/desktop", version = "0.5.0-alpha.2" } +dioxus-mobile = { path = "packages/mobile", version = "0.5.0-alpha.2" } +dioxus-interpreter-js = { path = "packages/interpreter", version = "0.5.0-alpha.2" } +dioxus-liveview = { path = "packages/liveview", version = "0.5.0-alpha.2" } +dioxus-autofmt = { path = "packages/autofmt", version = "0.5.0-alpha.2" } +dioxus-check = { path = "packages/check", version = "0.5.0-alpha.2" } +dioxus-rsx = { path = "packages/rsx", version = "0.5.0-alpha.2" } +rsx-rosetta = { path = "packages/rsx-rosetta", version = "0.5.0-alpha.2" } +dioxus-signals = { path = "packages/signals", version = "0.5.0-alpha.2" } +dioxus-cli-config = { path = "packages/cli-config", version = "0.5.0-alpha.2" } +generational-box = { path = "packages/generational-box", version = "0.5.0-alpha.2" } +dioxus-hot-reload = { path = "packages/hot-reload", version = "0.5.0-alpha.2" } +dioxus-fullstack = { path = "packages/fullstack", version = "0.5.0-alpha.2" } +dioxus_server_macro = { path = "packages/server-macro", version = "0.5.0-alpha.2", default-features = false } dioxus-ext = { path = "packages/extension", version = "0.4.0" } tracing = "0.1.37" tracing-futures = "0.2.5" @@ -134,7 +134,7 @@ opt-level = 3 # It is not meant to be published, but is used so "cargo run --example XYZ" works properly [package] name = "dioxus-examples" -version = "0.5.0-alpha.0" +version = "0.5.0-alpha.1" authors = ["Jonathan Kelley"] edition = "2021" description = "Top level crate for the Dioxus repository" diff --git a/packages/router/Cargo.toml b/packages/router/Cargo.toml index 57065726d..d34376237 100644 --- a/packages/router/Cargo.toml +++ b/packages/router/Cargo.toml @@ -40,9 +40,9 @@ fullstack = ["dioxus-fullstack"] [dev-dependencies] axum = { workspace = true, features = ["ws"] } -dioxus = { workspace = true, features = ["router" ]} +dioxus = { workspace = true, features = ["router"] } # dioxus-liveview = { workspace = true, features = ["axum"] } -dioxus-ssr = { path = "../ssr" } +dioxus-ssr = { workspace = true } criterion = { version = "0.5", features = ["async_tokio", "html_reports"] } [[example]] @@ -54,12 +54,12 @@ name = "incremental" required-features = ["ssr"] harness = false -# [target.'cfg(not(target_family = "wasm"))'.dev-dependencies] -# dioxus-desktop = { path = "../desktop" } +# you need to comment this out when publishing since cargo workspaces is not smart enough to wipe this when dropping +# dev-dependncey crates [target.'cfg(target_family = "wasm")'.dev-dependencies] console_error_panic_hook = "0.1.7" -dioxus-router = { path = ".", features = ["web"] } +dioxus-router = { workspace = true, features = ["web"] } # dioxus-web = { workspace = true } gloo = "0.8.0" wasm-bindgen-test = "0.3.33"