diff --git a/Cargo.lock b/Cargo.lock index cdc98a9..fb1b24c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,23 +44,23 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.10.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa882656b67966045e4152c634051e70346939fced7117d5f0b52146a7c74c9" +checksum = "d48f96fc3003717aeb9856ca3d02a8c7de502667ad76eeacd830b48d2e91fac4" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", + "ahash 0.8.11", "base64 0.22.1", "bitflags", "brotli", "bytes", "bytestring", - "derive_more 2.0.1", + "derive_more 0.99.18", "encoding_rs", "flate2", - "foldhash", "futures-core", "h2", "http 0.2.12", @@ -72,7 +72,7 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", - "rand 0.9.0", + "rand 0.8.5", "sha1", "smallvec", "tokio", @@ -173,9 +173,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.10.2" +version = "4.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2e3b15b3dc6c6ed996e4032389e9849d4ab002b1e92fbfe85b5f307d1479b4d" +checksum = "9180d76e5cc7ccbc4d60a506f2c727730b154010262df5b910eb17dbe4b8cb38" dependencies = [ "actix-codec", "actix-http", @@ -186,13 +186,13 @@ dependencies = [ "actix-service", "actix-utils", "actix-web-codegen", + "ahash 0.8.11", "bytes", "bytestring", "cfg-if", "cookie 0.16.2", - "derive_more 2.0.1", + "derive_more 0.99.18", "encoding_rs", - "foldhash", "futures-core", "futures-util", "impl-more", @@ -210,7 +210,6 @@ dependencies = [ "smallvec", "socket2", "time", - "tracing", "url", ] @@ -226,6 +225,20 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "actix-ws" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3a1fb4f9f2794b0aadaf2ba5f14a6f034c7e86957b458c506a8cb75953f2d99" +dependencies = [ + "actix-codec", + "actix-http", + "actix-web", + "bytestring", + "futures-core", + "tokio", +] + [[package]] name = "addr2line" version = "0.24.2" @@ -287,6 +300,19 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom 0.2.15", + "once_cell", + "version_check", + "zerocopy 0.7.35", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -395,7 +421,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41058deaa38c9d9dd933d6d238d825227cffa668e2839b52879f6619c63eee3b" dependencies = [ "futures", - "thiserror 2.0.12", + "thiserror 2.0.11", "tokio", "wasm-bindgen-futures", ] @@ -421,125 +447,17 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" -[[package]] -name = "async-attributes" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-global-executor" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" -dependencies = [ - "async-channel 2.3.1", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", - "tokio", -] - -[[package]] -name = "async-io" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" -dependencies = [ - "async-lock", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix", - "slab", - "tracing", - "windows-sys 0.59.0", -] - [[package]] name = "async-lock" version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 5.4.0", + "event-listener", "event-listener-strategy", "pin-project-lite", ] -[[package]] -name = "async-std" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24" -dependencies = [ - "async-attributes", - "async-channel 1.9.0", - "async-global-executor", - "async-io", - "async-lock", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - [[package]] name = "async-stream" version = "0.3.6" @@ -562,17 +480,11 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - [[package]] name = "async-trait" -version = "0.1.88" +version = "0.1.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", @@ -588,12 +500,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - [[package]] name = "attribute-derive" version = "0.10.3" @@ -632,15 +538,16 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.7.9" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" dependencies = [ - "async-trait", "axum-core", + "base64 0.22.1", "bytes", + "form_urlencoded", "futures-util", - "http 1.3.1", + "http 1.2.0", "http-body", "http-body-util", "hyper", @@ -657,8 +564,10 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", + "sha1", "sync_wrapper", "tokio", + "tokio-tungstenite", "tower", "tower-layer", "tower-service", @@ -667,14 +576,13 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" dependencies = [ - "async-trait", "bytes", "futures-util", - "http 1.3.1", + "http 1.2.0", "http-body", "http-body-util", "mime", @@ -775,24 +683,11 @@ dependencies = [ "generic-array", ] -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel 2.3.1", - "async-task", - "futures-io", - "futures-lite", - "piper", -] - [[package]] name = "bon" -version = "3.5.0" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625e90403736670c971aad50573b7db42e131970d60a14f215b61fdf24e0aa84" +checksum = "fe7acc34ff59877422326db7d6f2d845a582b16396b6b08194942bf34c6528ab" dependencies = [ "bon-macros", "rustversion", @@ -800,9 +695,9 @@ dependencies = [ [[package]] name = "bon-macros" -version = "3.5.0" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa915c54d505ca9b9b7ac056df7797508c3b817e51609d0ed19949dd0925b872" +checksum = "4159dd617a7fbc9be6a692fe69dc2954f8e6bb6bb5e4d7578467441390d77fd0" dependencies = [ "darling", "ident_case", @@ -838,9 +733,9 @@ dependencies = [ [[package]] name = "brotli" -version = "7.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -937,9 +832,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.40" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -947,7 +842,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-link", + "windows-targets 0.52.6", ] [[package]] @@ -1008,7 +903,7 @@ checksum = "0f18d705321923b1a9358e3fc3c57c3b50171196827fc7f5f10b053242aca627" dependencies = [ "serde", "serde_json", - "thiserror 2.0.12", + "thiserror 2.0.11", ] [[package]] @@ -1034,15 +929,15 @@ dependencies = [ [[package]] name = "config" -version = "0.14.1" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68578f196d2a33ff61b27fae256c3164f65e36382648e30666dde05b8cc9dfdf" +checksum = "595aae20e65c3be792d05818e8c63025294ac3cb7e200f11459063a352a6ef80" dependencies = [ "convert_case 0.6.0", - "nom", "pathdiff", "serde", "toml", + "winnow 0.7.4", ] [[package]] @@ -1061,6 +956,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-str" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3618cccc083bb987a415d85c02ca6c9994ea5b44731ec28b9ecf09658655fba9" + [[package]] name = "const_format" version = "0.2.34" @@ -1102,6 +1003,15 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "convert_case" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "cookie" version = "0.16.2" @@ -1303,6 +1213,12 @@ dependencies = [ "parking_lot_core", ] +[[package]] +name = "data-encoding" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010" + [[package]] name = "der" version = "0.7.9" @@ -1365,16 +1281,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" dependencies = [ - "derive_more-impl 1.0.0", -] - -[[package]] -name = "derive_more" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" -dependencies = [ - "derive_more-impl 2.0.1", + "derive_more-impl", ] [[package]] @@ -1389,18 +1296,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "derive_more-impl" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", - "unicode-xid", -] - [[package]] name = "digest" version = "0.10.7" @@ -1535,6 +1430,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "erased" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1731451909bde27714eacba19c2566362a7f35224f52b153d3f42cf60f72472" + [[package]] name = "errno" version = "0.3.10" @@ -1556,12 +1457,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - [[package]] name = "event-listener" version = "5.4.0" @@ -1579,7 +1474,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ - "event-listener 5.4.0", + "event-listener", "pin-project-lite", ] @@ -1728,19 +1623,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" -[[package]] -name = "futures-lite" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - [[package]] name = "futures-macro" version = "0.3.31" @@ -1850,7 +1732,7 @@ dependencies = [ "futures-core", "futures-sink", "gloo-utils", - "http 1.3.1", + "http 1.2.0", "js-sys", "pin-project", "serde", @@ -1861,18 +1743,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-timers" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "gloo-utils" version = "0.2.0" @@ -1928,7 +1798,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.8", ] [[package]] @@ -1975,12 +1845,6 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - [[package]] name = "hex" version = "0.4.3" @@ -2036,9 +1900,9 @@ dependencies = [ [[package]] name = "http" -version = "1.3.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -2052,7 +1916,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.3.1", + "http 1.2.0", ] [[package]] @@ -2063,7 +1927,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.3.1", + "http 1.2.0", "http-body", "pin-project-lite", ] @@ -2094,9 +1958,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hydration_context" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d35485b3dcbf7e044b8f28c73f04f13e7b509c2466fd10cb2a8a447e38f8a93a" +checksum = "e8714ae4adeaa846d838f380fbd72f049197de629948f91bf045329e0cf0a283" dependencies = [ "futures", "js-sys", @@ -2117,7 +1981,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.3.1", + "http 1.2.0", "http-body", "httparse", "httpdate", @@ -2135,7 +1999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", - "http 1.3.1", + "http 1.2.0", "hyper", "hyper-util", "rustls", @@ -2171,7 +2035,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.3.1", + "http 1.2.0", "http-body", "hyper", "pin-project-lite", @@ -2435,9 +2299,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] @@ -2467,15 +2331,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - [[package]] name = "language-tags" version = "0.3.2" @@ -2493,16 +2348,15 @@ dependencies = [ [[package]] name = "leptos" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88613d81f70f4e267473b2ee107e1ee70cf765a3c3dfee945929c8e9c520b957" +checksum = "52ce9bd03a04fb96fc9840c8e77c4c988180facb53b465c494be80a05c816ab7" dependencies = [ "any_spawner", "base64 0.22.1", "cfg-if", "either_of", "futures", - "getrandom 0.2.15", "hydration_context", "leptos_config", "leptos_dom", @@ -2521,7 +2375,7 @@ dependencies = [ "server_fn", "slotmap", "tachys", - "thiserror 2.0.12", + "thiserror 2.0.11", "throw_error", "typed-builder", "typed-builder-macro", @@ -2531,9 +2385,9 @@ dependencies = [ [[package]] name = "leptos_actix" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4711602d6fdb95765fffb5873a831729591a53ae57b05a8e319ed21fce06d3d3" +checksum = "d47f4a803568f6002e8a47ad7441078aff7eabb479b18a4a3bedf858f2fe3329" dependencies = [ "actix-files", "actix-http", @@ -2552,14 +2406,15 @@ dependencies = [ "send_wrapper", "serde_json", "server_fn", + "tachys", "tokio", ] [[package]] name = "leptos_axum" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5f7e98cbafa64b6dc0201557d912c39621a324f7bca4d6d069a154e78d3458" +checksum = "00f948791b406c58470581386eafa704f31d0c3083670339d139f66f1b865247" dependencies = [ "any_spawner", "axum", @@ -2574,6 +2429,7 @@ dependencies = [ "once_cell", "parking_lot", "server_fn", + "tachys", "tokio", "tower", "tower-http", @@ -2581,22 +2437,22 @@ dependencies = [ [[package]] name = "leptos_config" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4172cfee12576224775ccfbb9d3e76625017a8b4207c4641a2f9b96a70e6d524" +checksum = "1cfd1daba84873ae380630958bf4525601840896ec697c6ee65beb69a12bf59a" dependencies = [ "config", "regex", "serde", - "thiserror 2.0.12", + "thiserror 2.0.11", "typed-builder", ] [[package]] name = "leptos_dom" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41f6dc3ddaa09d876d7015f08f4f3905787da4ea5460cef130c365419483a89" +checksum = "88e60f167a3abac2804f069413fc075d2125469696edc6cad1018b0e1ad63348" dependencies = [ "js-sys", "or_poisoned", @@ -2609,9 +2465,9 @@ dependencies = [ [[package]] name = "leptos_hot_reload" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f5c961e5d9b2aa6deab39d5d842272e8b1b165744b5caf674770d5cf0daa04" +checksum = "14674d5aa860afa6a008ab5e8289f432c46bcd8df296e0a3ffa36753ddf4d2be" dependencies = [ "anyhow", "camino", @@ -2627,9 +2483,9 @@ dependencies = [ [[package]] name = "leptos_integration_utils" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d2c530c10566744f1e2c88e7a30d0ebfb971cf609223bb204a2291537b411b" +checksum = "ebf7839c289cb80c141aa68a26e88f0e34011883235fe0398b04cb6d3a24464b" dependencies = [ "futures", "hydration_context", @@ -2642,15 +2498,15 @@ dependencies = [ [[package]] name = "leptos_macro" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b9165909eabb02188a4b33b0ab6acff408bdf440018bf65b30bba0d38d61b19" +checksum = "cd3b663838c7a745159cbe64218036634c997dcbafabca8daa0854d3162d324d" dependencies = [ "attribute-derive", "cfg-if", - "convert_case 0.6.0", + "convert_case 0.7.1", "html-escape", - "itertools 0.13.0", + "itertools 0.14.0", "leptos_hot_reload", "prettyplease", "proc-macro-error2", @@ -2664,9 +2520,9 @@ dependencies = [ [[package]] name = "leptos_meta" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4566969810e3f29cfdafd6dd430382e42f72f4cdebfbfa263bd98f75feaf166d" +checksum = "b51f28850c913c6377296a6ad0d63476e8ca1f3fdef0011b98c2936748d84858" dependencies = [ "futures", "indexmap 2.7.0", @@ -2680,9 +2536,9 @@ dependencies = [ [[package]] name = "leptos_router" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83cf6033f987f366be6ffa556ee22fa6f9f433cbffd173826fd67327c3ae7ed" +checksum = "3c129ed9c739b173b6d88975d3aee91c8734ecfc514753d958c849c81218c7f7" dependencies = [ "any_spawner", "either_of", @@ -2697,7 +2553,7 @@ dependencies = [ "reactive_graph", "send_wrapper", "tachys", - "thiserror 2.0.12", + "thiserror 2.0.11", "url", "wasm-bindgen", "web-sys", @@ -2705,9 +2561,9 @@ dependencies = [ [[package]] name = "leptos_router_macro" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f580227933b49028cd3b6d7cd29ab7c6d30f9777cf0ac774eda2aab000a912" +checksum = "9576dbbe87fecd8c09a67ca32d4255831f5b551d30a48f36a9220fb9cc25a975" dependencies = [ "proc-macro-error2", "proc-macro2", @@ -2717,9 +2573,9 @@ dependencies = [ [[package]] name = "leptos_server" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee9ed4526484b17561bc8ce1532c613e37be2c01788fed3d1c4104db674dd9" +checksum = "e59be72c057dfff57b20150160593619b148a475078701797a0c89bf0e55ca67" dependencies = [ "any_spawner", "base64 0.22.1", @@ -2815,9 +2671,6 @@ name = "log" version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" -dependencies = [ - "value-bag", -] [[package]] name = "manyhow" @@ -2853,9 +2706,9 @@ dependencies = [ [[package]] name = "matchit" -version = "0.7.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "md-5" @@ -2889,12 +2742,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.8.3" @@ -2925,7 +2772,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 1.3.1", + "http 1.2.0", "httparse", "memchr", "mime", @@ -2956,16 +2803,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60993920e071b0c9b66f14e2b32740a4e27ffc82854dcd72035887f336a09a28" -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -3045,7 +2882,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", ] @@ -3055,10 +2892,10 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "getrandom 0.2.15", - "http 1.3.1", + "http 1.2.0", "rand 0.8.5", "reqwest", "serde", @@ -3111,7 +2948,7 @@ dependencies = [ "dyn-clone", "ed25519-dalek", "hmac", - "http 1.3.1", + "http 1.2.0", "itertools 0.10.5", "log", "oauth2", @@ -3133,9 +2970,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd" dependencies = [ "bitflags", "cfg-if", @@ -3165,9 +3002,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.104" +version = "0.9.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd" dependencies = [ "cc", "libc", @@ -3350,17 +3187,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "piper" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - [[package]] name = "pkcs1" version = "0.7.5" @@ -3388,21 +3214,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" -[[package]] -name = "polling" -version = "3.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi 0.4.0", - "pin-project-lite", - "rustix", - "tracing", - "windows-sys 0.59.0", -] - [[package]] name = "polyval" version = "0.6.2" @@ -3569,7 +3380,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.12", + "thiserror 2.0.11", "tokio", "tracing", ] @@ -3588,7 +3399,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.12", + "thiserror 2.0.11", "tinyvec", "tracing", "web-time", @@ -3707,9 +3518,9 @@ dependencies = [ [[package]] name = "reactive_graph" -version = "0.1.7" +version = "0.2.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9996b4c0f501d64a755ff3dfbe9276e9f834d105d7d45059ad4bd6d2a56477d0" +checksum = "3f7381d64e86a5ef9f5be26821c4be2111420a49e786163b0efbdfc399f2d7c3" dependencies = [ "any_spawner", "async-lock", @@ -3722,18 +3533,18 @@ dependencies = [ "send_wrapper", "serde", "slotmap", - "thiserror 2.0.12", + "thiserror 2.0.11", "web-sys", ] [[package]] name = "reactive_stores" -version = "0.1.7" +version = "0.2.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c3d2a20d8edd8ac6628718209f743da86349d7f10a4458304666c2ddfc082e" +checksum = "0a3121eef8f715c57adcc3469a8af511d7db4f533406f91a599fca4f761214af" dependencies = [ "guardian", - "itertools 0.13.0", + "itertools 0.14.0", "or_poisoned", "paste", "reactive_graph", @@ -3743,11 +3554,11 @@ dependencies = [ [[package]] name = "reactive_stores_macro" -version = "0.1.7" +version = "0.2.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d4d8e40112b8ee1424e5ec636fcbc9764c1a099e81f8fa818f6762b43cc10cd" +checksum = "4a7417cb8fa7a49425bc1a0942b4bd7bbba4161c46e53099968e6fcb9d9c8a0b" dependencies = [ - "convert_case 0.6.0", + "convert_case 0.7.1", "proc-macro-error2", "proc-macro2", "quote", @@ -3832,7 +3643,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http 1.3.1", + "http 1.2.0", "http-body", "http-body-util", "hyper", @@ -3924,9 +3735,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" +checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" dependencies = [ "const-oid", "digest", @@ -4135,9 +3946,9 @@ dependencies = [ [[package]] name = "sea-orm" -version = "1.1.7" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3417812d38049e8ec3d588c03570f8c60de811d2453fb48e424045a1600ffd86" +checksum = "13fba7b2c749b2d0a00303d5cb13e6761e39a4172554bdf930852cac4e7aeabd" dependencies = [ "async-stream", "async-trait", @@ -4164,9 +3975,9 @@ dependencies = [ [[package]] name = "sea-orm-cli" -version = "1.1.7" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf2a390d6528f8e5c9ecd327bbb1a4c6cd7ab8333ef0da97010d5dc8f83f01c4" +checksum = "75ee4e47ca95a6100c875a6066f367a5f9713f04a714f589493b46b6fd7ae4d9" dependencies = [ "chrono", "clap", @@ -4181,9 +3992,9 @@ dependencies = [ [[package]] name = "sea-orm-macros" -version = "1.1.7" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d705ba84e1c74c8ac27784e4ac6f21584058c1dc0cadb9d39b43e109fcf8139c" +checksum = "2568cff8d35d5150b4276cc0dd766192a587f64b6ece60ae3706e0872c4eb209" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -4195,9 +4006,9 @@ dependencies = [ [[package]] name = "sea-orm-migration" -version = "1.1.7" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c38451d5112e3a518a02251b5e6d3bc72e626957a44a79264716808a4c28ee0" +checksum = "a5a341919106dee5aae393293d922b23a33e99eda7bfe6871d822f3e157d9b09" dependencies = [ "async-trait", "clap", @@ -4339,9 +4150,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.219" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" dependencies = [ "serde_derive", ] @@ -4358,9 +4169,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" dependencies = [ "proc-macro2", "quote", @@ -4369,9 +4180,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" dependencies = [ "itoa", "memchr", @@ -4462,18 +4273,21 @@ dependencies = [ [[package]] name = "server_fn" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055476c2a42c9a98a69e3f0ce29b86aa3acbdef19a84e0523330f095097defcf" +checksum = "a3a6794e429718b09d4c79b667330b0a7c7412a70d64f9300e31447fd9210caa" dependencies = [ "actix-web", + "actix-ws", "axum", + "base64 0.22.1", "bytes", + "const-str", "const_format", "dashmap", "futures", "gloo-net", - "http 1.3.1", + "http 1.2.0", "http-body-util", "hyper", "inventory", @@ -4485,8 +4299,9 @@ dependencies = [ "serde_json", "serde_qs", "server_fn_macro_default", - "thiserror 2.0.12", + "thiserror 2.0.11", "throw_error", + "tokio", "tower", "tower-layer", "url", @@ -4499,9 +4314,9 @@ dependencies = [ [[package]] name = "server_fn_macro" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e65737414a9583ce3b43dddd4e5dfb33fe385a6933ed79a9b539b8eb0767cd07" +checksum = "0d13c6a6d935eafd25c9e6732e8728ea1a4a7d699b40b7d8eec58f1fde05c2b2" dependencies = [ "const_format", "convert_case 0.6.0", @@ -4513,9 +4328,9 @@ dependencies = [ [[package]] name = "server_fn_macro_default" -version = "0.7.7" +version = "0.8.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "563909a43390341403ab76fbc33fde306712613da02244e692eabeae8ffde949" +checksum = "b6df77237d3bd48227f9c48e6ff18f3bde7eb92e30bc9f75c890bfb6d0b6a70a" dependencies = [ "server_fn_macro", "syn 2.0.96", @@ -4562,8 +4377,7 @@ dependencies = [ "futures", "serde", "serde_json", - "thiserror 2.0.12", - "tracing", + "thiserror 2.0.11", "utoipa", ] @@ -4581,7 +4395,6 @@ dependencies = [ name = "shield-axum" version = "0.0.4" dependencies = [ - "async-trait", "axum", "serde", "serde_json", @@ -4598,7 +4411,7 @@ dependencies = [ ] [[package]] -name = "shield-disel" +name = "shield-diesel" version = "0.0.4" dependencies = [ "shield", @@ -4664,10 +4477,10 @@ dependencies = [ name = "shield-examples-seaorm" version = "0.0.4" dependencies = [ - "async-std", "sea-orm", "sea-orm-migration", "shield-sea-orm", + "tokio", ] [[package]] @@ -4763,12 +4576,11 @@ name = "shield-tower" version = "0.0.4" dependencies = [ "async-trait", - "http 1.3.1", + "http 1.2.0", "shield", "tower-layer", "tower-service", "tower-sessions", - "tracing", ] [[package]] @@ -4896,7 +4708,7 @@ dependencies = [ "crc", "crossbeam-queue", "either", - "event-listener 5.4.0", + "event-listener", "futures-core", "futures-intrusive", "futures-io", @@ -4914,7 +4726,7 @@ dependencies = [ "serde_json", "sha2", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.11", "time", "tokio", "tokio-stream", @@ -5002,7 +4814,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.12", + "thiserror 2.0.11", "time", "tracing", "uuid", @@ -5045,7 +4857,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.12", + "thiserror 2.0.11", "time", "tracing", "uuid", @@ -5175,20 +4987,20 @@ dependencies = [ [[package]] name = "tachys" -version = "0.1.7" +version = "0.2.0-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c05fed41ed4e334257090500510df21bb1611680c0cfd3be14acec7ffdf3d95" +checksum = "61294b3f019afe959ff0604a4227f003c02fba1abeb39b9e4490e6dd44b385e7" dependencies = [ "any_spawner", "async-trait", "const_str_slice_concat", "drain_filter_polyfill", - "dyn-clone", "either_of", + "erased", "futures", "html-escape", "indexmap 2.7.0", - "itertools 0.13.0", + "itertools 0.14.0", "js-sys", "linear-map", "next_tuple", @@ -5238,11 +5050,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.12" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" dependencies = [ - "thiserror-impl 2.0.12", + "thiserror-impl 2.0.11", ] [[package]] @@ -5258,9 +5070,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.12" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", @@ -5279,9 +5091,9 @@ dependencies = [ [[package]] name = "throw_error" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ef8bf264c6ae02a065a4a16553283f0656bd6266fc1fcb09fd2e6b5e91427b" +checksum = "41e42a6afdde94f3e656fae18f837cb9bbe500a5ac5de325b09f3ec05b9c28e3" dependencies = [ "pin-project-lite", ] @@ -5344,9 +5156,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.44.1" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -5402,6 +5214,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-tungstenite" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + [[package]] name = "tokio-util" version = "0.7.13" @@ -5446,7 +5270,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.24", ] [[package]] @@ -5467,15 +5291,14 @@ dependencies = [ [[package]] name = "tower-cookies" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fd0118512cf0b3768f7fcccf0bef1ae41d68f2b45edc1e77432b36c97c56c6d" +checksum = "151b5a3e3c45df17466454bb74e9ecedecc955269bdedbf4d150dfa393b55a36" dependencies = [ - "async-trait", "axum-core", "cookie 0.18.1", "futures-util", - "http 1.3.1", + "http 1.2.0", "parking_lot", "pin-project-lite", "tower-layer", @@ -5491,7 +5314,7 @@ dependencies = [ "bitflags", "bytes", "futures-util", - "http 1.3.1", + "http 1.2.0", "http-body", "http-body-util", "http-range-header", @@ -5521,12 +5344,12 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tower-sessions" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65856c81ee244e0f8a55ab0f7b769b72fbde387c235f0a73cd97c579818d05eb" +checksum = "43a05911f23e8fae446005fe9b7b97e66d95b6db589dc1c4d59f6a2d4d4927d3" dependencies = [ "async-trait", - "http 1.3.1", + "http 1.2.0", "time", "tokio", "tower-cookies", @@ -5539,20 +5362,20 @@ dependencies = [ [[package]] name = "tower-sessions-core" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb6abbfcaf6436ec5a772cd9f965401da12db793e404ae6134eac066fa5a04f3" +checksum = "ce8cce604865576b7751b7a6bc3058f754569a60d689328bb74c52b1d87e355b" dependencies = [ "async-trait", "axum-core", "base64 0.22.1", "futures", - "http 1.3.1", + "http 1.2.0", "parking_lot", "rand 0.8.5", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.11", "time", "tokio", "tracing", @@ -5560,9 +5383,9 @@ dependencies = [ [[package]] name = "tower-sessions-memory-store" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fad75660c8afbe74f4e7cbbe8e9090171a056b57370ea4d7d5e9eb3e4af3092" +checksum = "fb05909f2e1420135a831dd5df9f5596d69196d0a64c3499ca474c4bd3d33242" dependencies = [ "async-trait", "time", @@ -5638,6 +5461,23 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "tungstenite" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" +dependencies = [ + "bytes", + "data-encoding", + "http 1.2.0", + "httparse", + "log", + "rand 0.9.0", + "sha1", + "thiserror 2.0.11", + "utf-8", +] + [[package]] name = "typed-builder" version = "0.20.0" @@ -5737,6 +5577,12 @@ dependencies = [ "serde", ] +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf16_iter" version = "1.0.5" @@ -5788,9 +5634,9 @@ dependencies = [ [[package]] name = "utoipa-swagger-ui" -version = "8.1.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4b5ac679cc6dfc5ea3f2823b0291c777750ffd5e13b21137e0f7ac0e8f9617" +checksum = "161166ec520c50144922a625d8bc4925cc801b2dda958ab69878527c0e5c5d61" dependencies = [ "axum", "base64 0.22.1", @@ -5813,9 +5659,9 @@ checksum = "e2eebbbfe4093922c2b6734d7c679ebfebd704a0d7e56dfcb0d05818ce28977d" [[package]] name = "uuid" -version = "1.16.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" +checksum = "93d59ca99a559661b96bf898d8fce28ed87935fd2bea9f05983c1464dd6c71b1" dependencies = [ "getrandom 0.3.1", "serde", @@ -5833,12 +5679,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "value-bag" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2" - [[package]] name = "vcpkg" version = "0.2.15" @@ -6047,7 +5887,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -6065,12 +5905,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-link" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" - [[package]] name = "windows-registry" version = "0.2.0" @@ -6258,6 +6092,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" +dependencies = [ + "memchr", +] + [[package]] name = "wit-bindgen-rt" version = "0.33.0" @@ -6416,9 +6259,9 @@ dependencies = [ [[package]] name = "zip" -version = "2.2.2" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9c1ea7b3a5e1f4b922ff856a129881167511563dc219869afe3787fc0c1a45" +checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50" dependencies = [ "arbitrary", "crc32fast", @@ -6427,7 +6270,7 @@ dependencies = [ "flate2", "indexmap 2.7.0", "memchr", - "thiserror 2.0.12", + "thiserror 2.0.11", "zopfli", ] diff --git a/Cargo.toml b/Cargo.toml index 1e943e3..35d13f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,17 +16,17 @@ actix-utils = "3.0.1" actix-web = "4.9.0" async-std = "1.13.0" async-trait = "0.1.83" -axum = "0.7.9" +axum = "0.8.1" bon = "3.3.2" chrono = "0.4.39" console_error_panic_hook = "0.1.2" futures = "0.3.31" http = "1.2.0" -leptos = "0.7.4" -leptos_actix = "0.7.4" -leptos_axum = "0.7.4" -leptos_meta = "0.7.4" -leptos_router = "0.7.4" +leptos = "0.8.0-beta" +leptos_actix = "0.8.0-beta" +leptos_axum = "0.8.0-beta" +leptos_meta = "0.8.0-beta" +leptos_router = "0.8.0-beta" thiserror = "2.0.7" sea-orm = "1.1.2" sea-orm-migration = "1.1.2" @@ -35,7 +35,7 @@ serde_json = "1.0.133" tokio = "1.42.0" tower-layer = "0.3.3" tower-service = "0.3.3" -tower-sessions = "0.13.0" +tower-sessions = "0.14.0" tracing = "0.1.41" tracing-subscriber = "0.3.19" utoipa = { version = "5.3.1", features = ["chrono", "uuid"] } diff --git a/examples/leptos-axum/Cargo.toml b/examples/leptos-axum/Cargo.toml index 19b86f6..dbce6fc 100644 --- a/examples/leptos-axum/Cargo.toml +++ b/examples/leptos-axum/Cargo.toml @@ -36,7 +36,7 @@ tracing-subscriber.workspace = true wasm-bindgen.workspace = true wasm-tracing.workspace = true utoipa.workspace = true -utoipa-swagger-ui = { version = "=8.1.0", features = ["axum", "vendored"] } +utoipa-swagger-ui = { version = "9.0.0", features = ["axum", "vendored"] } [features] default = ["ssr"] diff --git a/examples/sea-orm/Cargo.toml b/examples/sea-orm/Cargo.toml index 2f9aed7..9bf0975 100644 --- a/examples/sea-orm/Cargo.toml +++ b/examples/sea-orm/Cargo.toml @@ -10,7 +10,6 @@ repository.workspace = true version.workspace = true [dependencies] -async-std = { workspace = true, features = ["attributes", "tokio1"] } sea-orm = { workspace = true, features = [ "macros", "runtime-tokio-native-tls", @@ -27,3 +26,4 @@ sea-orm-migration = { workspace = true, features = [ shield-sea-orm = { path = "../../packages/storage/shield-sea-orm", features = [ "all-providers", ] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } diff --git a/examples/sea-orm/src/main.rs b/examples/sea-orm/src/main.rs index fe44d5b..fee6fd6 100644 --- a/examples/sea-orm/src/main.rs +++ b/examples/sea-orm/src/main.rs @@ -1,7 +1,7 @@ use sea_orm_migration::prelude::*; use shield_sea_orm::migrations::Migrator; -#[async_std::main] +#[tokio::main] async fn main() { cli::run_cli(Migrator).await; } diff --git a/packages/core/shield/Cargo.toml b/packages/core/shield/Cargo.toml index e280cca..1a7495b 100644 --- a/packages/core/shield/Cargo.toml +++ b/packages/core/shield/Cargo.toml @@ -16,7 +16,6 @@ futures.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true thiserror.workspace = true -tracing.workspace = true utoipa = { workspace = true, optional = true } [features] diff --git a/packages/core/shield/src/shield.rs b/packages/core/shield/src/shield.rs index 1f10715..11b80fb 100644 --- a/packages/core/shield/src/shield.rs +++ b/packages/core/shield/src/shield.rs @@ -1,7 +1,6 @@ use std::{collections::HashMap, sync::Arc}; use futures::future::try_join_all; -use tracing::debug; use crate::{ error::{ProviderError, SessionError, ShieldError}, @@ -105,8 +104,6 @@ impl Shield { request: SignInRequest, session: Session, ) -> Result { - debug!("sign in {:?}", request); - let provider = match self.providers.get(&request.provider_id) { Some(provider) => provider, None => return Err(ProviderError::ProviderNotFound(request.provider_id).into()), @@ -137,8 +134,6 @@ impl Shield { request: SignInCallbackRequest, session: Session, ) -> Result { - debug!("sign in callback {:?}", request); - let provider = match self.providers.get(&request.provider_id) { Some(provider) => provider, None => return Err(ProviderError::ProviderNotFound(request.provider_id).into()), @@ -170,8 +165,6 @@ impl Shield { } pub async fn sign_out(&self, session: Session) -> Result { - debug!("sign out"); - let authenticated = { let session_data = session.data(); let session_data = session_data diff --git a/packages/integrations/shield-axum/Cargo.toml b/packages/integrations/shield-axum/Cargo.toml index 8c732bd..ca44ecd 100644 --- a/packages/integrations/shield-axum/Cargo.toml +++ b/packages/integrations/shield-axum/Cargo.toml @@ -9,7 +9,6 @@ repository.workspace = true version.workspace = true [dependencies] -async-trait.workspace = true axum.workspace = true serde.workspace = true serde_json.workspace = true diff --git a/packages/integrations/shield-axum/src/extract.rs b/packages/integrations/shield-axum/src/extract.rs index e713107..a832f58 100644 --- a/packages/integrations/shield-axum/src/extract.rs +++ b/packages/integrations/shield-axum/src/extract.rs @@ -1,4 +1,3 @@ -use async_trait::async_trait; use axum::{extract::FromRequestParts, http::request::Parts}; use shield::{ConfigurationError, Session, Shield, ShieldError, User}; @@ -6,7 +5,6 @@ use crate::error::RouteError; pub struct ExtractShield(pub Shield); -#[async_trait] impl FromRequestParts for ExtractShield { type Rejection = RouteError; @@ -25,7 +23,6 @@ impl FromRequestParts for ExtractS pub struct ExtractSession(pub Session); -#[async_trait] impl FromRequestParts for ExtractSession { type Rejection = RouteError; @@ -44,7 +41,6 @@ impl FromRequestParts for ExtractSession { pub struct ExtractUser(pub Option); -#[async_trait] impl FromRequestParts for ExtractUser { type Rejection = RouteError; @@ -63,7 +59,6 @@ impl FromRequestParts for ExtractU pub struct UserRequired(pub U); -#[async_trait] impl FromRequestParts for UserRequired { type Rejection = RouteError; diff --git a/packages/integrations/shield-axum/src/router.rs b/packages/integrations/shield-axum/src/router.rs index f431e31..37419d9 100644 --- a/packages/integrations/shield-axum/src/router.rs +++ b/packages/integrations/shield-axum/src/router.rs @@ -17,11 +17,11 @@ impl AuthRoutes { pub fn router() -> Router { Router::new() .route("/subproviders", get(subproviders::)) - .route("/sign-in/:providerId", post(sign_in::)) - .route("/sign-in/:providerId/:subproviderId", post(sign_in::)) - .route("/sign-in/callback/:providerId", get(sign_in_callback::)) + .route("/sign-in/{providerId}", post(sign_in::)) + .route("/sign-in/{providerId}/{subproviderId}", post(sign_in::)) + .route("/sign-in/callback/{providerId}", get(sign_in_callback::)) .route( - "/sign-in/callback/:providerId/:subproviderId", + "/sign-in/callback/{providerId}/{subproviderId}", get(sign_in_callback::), ) .route("/sign-out", post(sign_out::)) diff --git a/packages/integrations/shield-tower/Cargo.toml b/packages/integrations/shield-tower/Cargo.toml index 63c5d0a..ac2e339 100644 --- a/packages/integrations/shield-tower/Cargo.toml +++ b/packages/integrations/shield-tower/Cargo.toml @@ -15,4 +15,3 @@ shield = { path = "../../core/shield", version = "0.0.4" } tower-layer.workspace = true tower-service.workspace = true tower-sessions.workspace = true -tracing.workspace = true diff --git a/packages/integrations/shield-tower/src/service.rs b/packages/integrations/shield-tower/src/service.rs index 1b9a9c9..a0b40f4 100644 --- a/packages/integrations/shield-tower/src/service.rs +++ b/packages/integrations/shield-tower/src/service.rs @@ -7,7 +7,6 @@ use std::{ use http::{Request, Response}; use shield::{Session, Shield, User}; use tower_service::Service; -use tracing::debug; use crate::session::TowerSessionStorage; @@ -80,8 +79,6 @@ where Err(_err) => return Ok(Self::internal_server_error()), }; - debug!("{:?}", user.as_ref().map(|user| user.id())); - req.extensions_mut().insert(shield); req.extensions_mut().insert(shield_session); req.extensions_mut().insert(user); diff --git a/packages/providers/shield-oidc/src/provider.rs b/packages/providers/shield-oidc/src/provider.rs index bab4da7..2d604df 100644 --- a/packages/providers/shield-oidc/src/provider.rs +++ b/packages/providers/shield-oidc/src/provider.rs @@ -389,8 +389,6 @@ impl Provider for OidcProvider { } }; - debug!("signed in {:?} {:?}", user.id(), connection); - session.renew().await?; { diff --git a/packages/storage/shield-diesel/Cargo.toml b/packages/storage/shield-diesel/Cargo.toml index 37ccef9..4f0a9a1 100644 --- a/packages/storage/shield-diesel/Cargo.toml +++ b/packages/storage/shield-diesel/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "shield-disel" +name = "shield-diesel" description = "Diesel storage for Shield." authors.workspace = true