From 980e8c2620b50a765f0ed6ecea3675ac219d6783 Mon Sep 17 00:00:00 2001 From: Sam Sartor Date: Tue, 11 Feb 2025 20:24:42 -0700 Subject: [PATCH] bump dioxus version --- .gitignore | 1 + Cargo.lock | 236 +++++++++++++++++++++++++------------------------ Cargo.toml | 12 +++ README.md | 4 +- gui/Cargo.toml | 6 +- 5 files changed, 140 insertions(+), 119 deletions(-) diff --git a/.gitignore b/.gitignore index 56fa846..c13fb1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /target dist/ server_hash.txt +.aider* diff --git a/Cargo.lock b/Cargo.lock index fdd6f6e..983f6af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -101,12 +101,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "anyhow" -version = "1.0.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" - [[package]] name = "arc-swap" version = "1.7.1" @@ -730,6 +724,27 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "const-serialize" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08259976d62c715c4826cb4a3d64a3a9e5c5f68f964ff6087319857f569f93a6" +dependencies = [ + "const-serialize-macro", + "serde", +] + +[[package]] +name = "const-serialize-macro" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04382d0d9df7434af6b1b49ea1a026ef39df1b0738b1cc373368cf175354f6eb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "const_format" version = "0.2.33" @@ -1106,10 +1121,11 @@ dependencies = [ [[package]] name = "dioxus" -version = "0.6.0-alpha.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f345989a3d92adf2814167135a9ebd99f706a43549a173add035f34c8a378d8a" +checksum = "60a247114500f1a78e87022defa8173de847accfada8e8809dfae23a118a580c" dependencies = [ + "dioxus-cli-config", "dioxus-config-macro", "dioxus-core", "dioxus-core-macro", @@ -1120,23 +1136,27 @@ dependencies = [ "dioxus-history", "dioxus-hooks", "dioxus-html", + "dioxus-logger", "dioxus-signals", - "dioxus-static-site-generation", "dioxus-web", "manganis", + "warnings", ] [[package]] name = "dioxus-cli-config" -version = "0.6.0-alpha.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b56b3e9e48017e7e3a32752ff5211fdad7081d0ce19576f1dc2ef5e42effbe1" +checksum = "cdd16948f1ffdb068dd9a64812158073a4250e2af4e98ea31fdac0312e6bce86" +dependencies = [ + "wasm-bindgen", +] [[package]] name = "dioxus-config-macro" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8db6e384709505b8de6e3ec5e79fc55f62421b86f1c6f98bedbd0c30bfe58404" +checksum = "75cbf582fbb1c32d34a1042ea675469065574109c95154468710a4d73ee98b49" dependencies = [ "proc-macro2", "quote", @@ -1144,9 +1164,9 @@ dependencies = [ [[package]] name = "dioxus-core" -version = "0.6.0-alpha.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25c550435f124c2fbf9c476146bab63ed4d99f1e53a16caa86f98954399fa824" +checksum = "9c03f451a119e47433c16e2d8eb5b15bf7d6e6734eb1a4c47574e6711dadff8d" dependencies = [ "const_format", "dioxus-core-types", @@ -1165,9 +1185,9 @@ dependencies = [ [[package]] name = "dioxus-core-macro" -version = "0.6.0-alpha.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b90de0d77080f8505bdb29c804415d6ad44ccf8ee5621f04be1d7f879ff3dea5" +checksum = "105c954caaaedf8cd10f3d1ba576b01e18aa8d33ad435182125eefe488cf0064" dependencies = [ "convert_case 0.6.0", "dioxus-rsx", @@ -1178,20 +1198,21 @@ dependencies = [ [[package]] name = "dioxus-core-types" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfa74cda93aa6456d8570d538797bf8ee4d0b85cb6de7cddd87c1db52379c50" +checksum = "91a82fccfa48574eb7aa183e297769540904694844598433a9eb55896ad9f93b" dependencies = [ "once_cell", ] [[package]] name = "dioxus-desktop" -version = "0.6.0-alpha.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4322b2ce1fbb3e82d728e1bf1801acb55cf57fe933c78aef0b7e33fa766b01" +checksum = "b5b0cca3e7a10a4a3df37ea52c4cc7a53e5c9233489e03ee3f2829471fc3099a" dependencies = [ "async-trait", + "base64 0.22.1", "cocoa 0.25.0", "core-foundation 0.9.4", "dioxus-cli-config", @@ -1209,8 +1230,12 @@ dependencies = [ "generational-box", "global-hotkey", "infer", + "jni", "lazy-js-bundle", "muda 0.11.5", + "ndk 0.9.0", + "ndk-context", + "ndk-sys 0.6.0+11769913", "objc", "objc_id", "once_cell", @@ -1232,9 +1257,9 @@ dependencies = [ [[package]] name = "dioxus-devtools" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a05516cf8b2ee1e477d64763208c4d55928671accefd1c3249f433f058b965" +checksum = "712a7300f1e8181218187b03502044157eef04e0a25b518117c5ef9ae1096880" dependencies = [ "dioxus-core", "dioxus-devtools-types", @@ -1248,9 +1273,9 @@ dependencies = [ [[package]] name = "dioxus-devtools-types" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd8b9610d9961bdfa4c45e958111f03aa981bcdf0d580289a50ff39b7d1eb1ba" +checksum = "f62434973c0c9c5a3bc42e9cd5e7070401c2062a437fb5528f318c3e42ebf4ff" dependencies = [ "dioxus-core", "serde", @@ -1258,9 +1283,9 @@ dependencies = [ [[package]] name = "dioxus-document" -version = "0.6.0-alpha.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6aad01ed9161b0e9ce084eaa0a15d1e5de6a182d3b8ea2e6bd1cc4906eec98" +checksum = "802a2014d1662b6615eec0a275745822ee4fc66aacd9d0f2fb33d6c8da79b8f2" dependencies = [ "dioxus-core", "dioxus-core-macro", @@ -1277,9 +1302,9 @@ dependencies = [ [[package]] name = "dioxus-fullstack" -version = "0.6.0-alpha.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ba85a5afb4a2bacf9b752ff7015b31c711eb830d0e52e0a828c26e76c09ed5" +checksum = "fe99b48a1348eec385b5c4bd3e80fd863b0d3b47257d34e2ddc58754dec5d128" dependencies = [ "base64 0.22.1", "bytes", @@ -1302,9 +1327,9 @@ dependencies = [ [[package]] name = "dioxus-history" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d02ed207147911d6039a0b9245899338176c552b2e90aabe2155b26237da5df" +checksum = "5ae4e22616c698f35b60727313134955d885de2d32e83689258e586ebc9b7909" dependencies = [ "dioxus-core", "tracing", @@ -1312,9 +1337,9 @@ dependencies = [ [[package]] name = "dioxus-hooks" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fef470483f137a6b16015c39a97a34ea69de27b8a5fdba6c840e228ff23f80" +checksum = "948e2b3f20d9d4b2c300aaa60281b1755f3298684448920b27106da5841896d0" dependencies = [ "dioxus-core", "dioxus-signals", @@ -1329,9 +1354,9 @@ dependencies = [ [[package]] name = "dioxus-html" -version = "0.6.0-alpha.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e67318ff8a6ff2e649552994bd138f1ac088f7cd886b407d6b3fc110922ca06" +checksum = "59c9a40e6fee20ce7990095492dedb6a753eebe05e67d28271a249de74dc796d" dependencies = [ "async-trait", "dioxus-core", @@ -1354,9 +1379,9 @@ dependencies = [ [[package]] name = "dioxus-html-internal-macro" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d663e2e8554fd3d671a4815b3ead5be6691ecd81e8417411488ce70f3e8562e" +checksum = "43ba87b53688a2c9f619ecdf4b3b955bc1f08bd0570a80a0d626c405f6d14a76" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -1366,9 +1391,9 @@ dependencies = [ [[package]] name = "dioxus-interpreter-js" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ace04aa7fa6cadc7cc6aed4ae54b951d5fc0e802fd421e725cf3ebfbd21cf4" +checksum = "330707b10ca75cb0eb05f9e5f8d80217cd0d7e62116a8277ae363c1a09b57a22" dependencies = [ "dioxus-core", "dioxus-core-types", @@ -1386,9 +1411,9 @@ dependencies = [ [[package]] name = "dioxus-lib" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c5b85ed63fb1b66c990ff53a517902329603a3a0c1ece640c2c499171ce53f" +checksum = "5405b71aa9b8b0c3e0d22728f12f34217ca5277792bd315878cc6ecab7301b72" dependencies = [ "dioxus-config-macro", "dioxus-core", @@ -1399,41 +1424,27 @@ dependencies = [ "dioxus-html", "dioxus-rsx", "dioxus-signals", + "warnings", ] [[package]] -name = "dioxus-router" -version = "0.6.0-alpha.4" +name = "dioxus-logger" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "735ac3e384c9b1ce514889633e0317112af13930e20dbaad45b76337a386ad80" +checksum = "545961e752f6c8bf59c274951b3c8b18a106db6ad2f9e2035b29e1f2a3e899b1" dependencies = [ + "console_error_panic_hook", "dioxus-cli-config", - "dioxus-history", - "dioxus-lib", - "dioxus-router-macro", - "rustversion", "tracing", - "url", - "urlencoding", -] - -[[package]] -name = "dioxus-router-macro" -version = "0.6.0-alpha.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36c1954bee1ee5b0d1042e3da4f966a8e92beb39f19309383a8419e4010a66f" -dependencies = [ - "proc-macro2", - "quote", - "slab", - "syn 2.0.87", + "tracing-subscriber", + "tracing-wasm", ] [[package]] name = "dioxus-rsx" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3a186b32891d7b0c9a30c4d6b1c85caef86da1df54eb527e902d44e3f07fd7" +checksum = "3eb588e05800b5a7eb90b2f40fca5bbd7626e823fb5e1ba21e011de649b45aa1" dependencies = [ "proc-macro2", "proc-macro2-diagnostics", @@ -1443,9 +1454,9 @@ dependencies = [ [[package]] name = "dioxus-signals" -version = "0.6.0-alpha.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c506eaff5a5f10f09fbd898abf789661ce210aaff700d8ab555887469b5d678" +checksum = "10e032dbb3a2c0386ec8b8ee59bc20b5aeb67038147c855801237b45b13d72ac" dependencies = [ "dioxus-core", "futures-channel", @@ -1458,28 +1469,14 @@ dependencies = [ "warnings", ] -[[package]] -name = "dioxus-static-site-generation" -version = "0.6.0-alpha.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8434bbaf91620d4b5f18d90b3318e6447f26c49c8afca91fd7a100aa24fb0300" -dependencies = [ - "dioxus-fullstack", - "dioxus-lib", - "dioxus-router", - "dioxus-web", - "tracing", -] - [[package]] name = "dioxus-web" -version = "0.6.0-alpha.4" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3414f41b8cf7330629d865c66de1751c9e9166e08c363475a7d0412531a33bc0" +checksum = "7e7c12475c3d360058b8afe1b68eb6dfc9cbb7dcd760aed37c5f85c561c83ed1" dependencies = [ "async-trait", "ciborium", - "console_error_panic_hook", "dioxus-cli-config", "dioxus-core", "dioxus-core-types", @@ -1506,9 +1503,9 @@ dependencies = [ [[package]] name = "dioxus_server_macro" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f079a870b773f3da703a8073b8a0099675db36cdf9f82b29ce58d69d1f9c8e63" +checksum = "371a5b21989a06b53c5092e977b3f75d0e60a65a4c15a2aa1d07014c3b2dda97" dependencies = [ "proc-macro2", "quote", @@ -2054,9 +2051,9 @@ dependencies = [ [[package]] name = "generational-box" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0497cf28d76aac4d7f340cebd53f97bd5e72aad1f5489d0dee554788e601ce39" +checksum = "a673cf4fb0ea6a91aa86c08695756dfe875277a912cdbf33db9a9f62d47ed82b" dependencies = [ "parking_lot", "tracing", @@ -2924,9 +2921,9 @@ dependencies = [ [[package]] name = "lazy-js-bundle" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9073c4d86b2876ae49f73251a325c835c28acb4170b9a89c67179af514c0863b" +checksum = "e49596223b9d9d4947a14a25c142a6e7d8ab3f27eb3ade269d238bb8b5c267e2" [[package]] name = "lazy_static" @@ -3107,40 +3104,37 @@ dependencies = [ [[package]] name = "manganis" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12549773fb7d8e0c93ca92be0b709e0240761bbb19a6baff14bca9b4d2a3f9bf" +checksum = "317af44b15e7605b85f04525449a3bb631753040156c9b318e6cba8a3ea4ef73" dependencies = [ - "anyhow", - "base64 0.22.1", - "dioxus-core-types", - "dunce", + "const-serialize", + "manganis-core", "manganis-macro", - "once_cell", - "serde", ] [[package]] name = "manganis-core" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb113fb77317e501b49a2f45525fa4031747bfb463e4b51470482ede860d184" +checksum = "c38bee65cc725b2bba23b5dbb290f57c8be8fadbe2043fb7e2ce73022ea06519" dependencies = [ + "const-serialize", + "dioxus-cli-config", + "dioxus-core-types", "serde", - "serde_json", ] [[package]] name = "manganis-macro" -version = "0.6.0-alpha.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f80170642e929a9cfb6c67009f87d9493765defd649c0bb0ef8e5d38214a033a" +checksum = "d9f4f71310913c40174d9f0cfcbcb127dad0329ecdb3945678a120db22d3d065" dependencies = [ + "dunce", "manganis-core", "proc-macro2", "quote", - "serde", - "serde_json", "syn 2.0.87", ] @@ -5961,6 +5955,17 @@ dependencies = [ "tracing-log", ] +[[package]] +name = "tracing-wasm" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07" +dependencies = [ + "tracing", + "tracing-subscriber", + "wasm-bindgen", +] + [[package]] name = "tracing-web" version = "0.1.3" @@ -6221,24 +6226,24 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.87", @@ -6259,9 +6264,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6269,9 +6274,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -6282,9 +6287,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "wasm-streams" diff --git a/Cargo.toml b/Cargo.toml index 38f04aa..c168cd0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,3 +14,15 @@ default-features = false features = [ "asynchronous-codec", ] + +[profile] + +[profile.wasm-dev] +inherits = "dev" +opt-level = 1 + +[profile.server-dev] +inherits = "dev" + +[profile.android-dev] +inherits = "dev" diff --git a/README.md b/README.md index 29a383f..7b98e5b 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # GUI Development ## Running Desktop -1. `cargo install dioxus-cli --version 0.6.0-alpha.4` +1. `cargo install dioxus-cli --version 0.6.3` 2. `dx build -p mumble-web2-gui --platform desktop` ## Running Web -1. `cargo install dioxus-cli --version 0.6.0-alpha.4` +1. `cargo install dioxus-cli --version 0.6.3` 2. `cargo install cargo install wtransport --example gencert` 3. in the proxy directory: 1. `cp config.toml.example config.toml` diff --git a/gui/Cargo.toml b/gui/Cargo.toml index 4992bae..25dcd2e 100644 --- a/gui/Cargo.toml +++ b/gui/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] # Web Dependencies # ================ -dioxus-web = { version = "0.6.0-alpha.4", optional = true } +dioxus-web = { version = "0.6.3", optional = true } wasm-bindgen = { version = "0.2.92", optional = true } wasm-bindgen-futures = { version = "0.4.42", optional = true } wasm-streams = { version = "0.4.0", optional = true } @@ -59,7 +59,7 @@ tracing-web = { version = "0.1.3", optional = true } # Desktop Dependecies # =================== -dioxus-desktop = { version = "0.6.0-alpha.4", optional = true} +dioxus-desktop = { version = "0.6.3", optional = true} tokio = { version = "1.41.1", features = ["net", "rt"], optional = true } tokio-rustls = { version = "0.26.0", optional = true } opus = { version = "0.3.0", optional = true } @@ -68,7 +68,7 @@ dasp_ring_buffer = { version = "0.11.0", optional = true } # Base Dependencies # ================ -dioxus = { version = "0.6.0-alpha.4" } +dioxus = { version = "0.6.3" } once_cell = "1.19.0" asynchronous-codec = { workspace = true } futures = "0.3.30"