diff --git a/Cargo.lock b/Cargo.lock index 88dce30..902d601 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -392,9 +392,9 @@ dependencies = [ "hmac", "http 1.0.0", "jwt", - "leptos", + "leptos 0.5.7", "leptos_actix", - "leptos_meta", + "leptos_meta 0.6.11", "leptos_router", "lettre", "serde", @@ -536,7 +536,21 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c94f43ede6f25dab1dea046bff84d85dea61bd49aba7a9011ad66c0d449077b" dependencies = [ - "attribute-derive-macro", + "attribute-derive-macro 0.8.1", + "proc-macro2", + "quote", + "syn 2.0.46", +] + +[[package]] +name = "attribute-derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b48808b337d6b74c15ff9becfc0e139fe2b4e2b224d670a0ecdb46b0b2d3d9b" +dependencies = [ + "attribute-derive-macro 0.9.1", + "derive-where", + "manyhow 0.10.4", "proc-macro2", "quote", "syn 2.0.46", @@ -550,11 +564,27 @@ checksum = "b409e2b2d2dc206d2c0ad3575a93f001ae21a1593e2d0c69b69c308e63f3b422" dependencies = [ "collection_literals", "interpolator", - "manyhow", + "manyhow 0.8.1", + "proc-macro-utils", + "proc-macro2", + "quote", + "quote-use 0.7.2", + "syn 2.0.46", +] + +[[package]] +name = "attribute-derive-macro" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b19cbd63850ecff821c413e12846a67ec9f4ce7309c70959b94ecf9b2575ee2" +dependencies = [ + "collection_literals", + "interpolator", + "manyhow 0.10.4", "proc-macro-utils", "proc-macro2", "quote", - "quote-use", + "quote-use 0.8.0", "syn 2.0.46", ] @@ -597,6 +627,12 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -1013,7 +1049,21 @@ dependencies = [ "nom", "pathdiff", "serde", - "toml", + "toml 0.5.11", +] + +[[package]] +name = "config" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" +dependencies = [ + "convert_case 0.6.0", + "lazy_static", + "nom", + "pathdiff", + "serde", + "toml 0.8.12", ] [[package]] @@ -1230,6 +1280,19 @@ dependencies = [ "syn 2.0.46", ] +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.2", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "der" version = "0.7.8" @@ -1727,7 +1790,28 @@ dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils", + "gloo-utils 0.1.7", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-net" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils 0.2.0", + "http 0.2.11", "js-sys", "pin-project", "serde", @@ -1751,6 +1835,19 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "h2" version = "0.3.24" @@ -2203,12 +2300,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "269ba4ba91ffa73d9559c975e0be17bd4eb34c6b6abd7fdd5704106132d89d2a" dependencies = [ "cfg-if", - "leptos_config", - "leptos_dom", - "leptos_macro", - "leptos_reactive", - "leptos_server", - "server_fn", + "leptos_config 0.5.7", + "leptos_dom 0.5.7", + "leptos_macro 0.5.7", + "leptos_reactive 0.5.7", + "leptos_server 0.5.7", + "server_fn 0.5.7", + "tracing", + "typed-builder", + "typed-builder-macro", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "leptos" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20f79fe71c41f5a0506c273f6698a1971bb994ef52a88aeaf4eccb159fcd1e11" +dependencies = [ + "cfg-if", + "leptos_config 0.6.11", + "leptos_dom 0.6.11", + "leptos_macro 0.6.11", + "leptos_reactive 0.6.11", + "leptos_server 0.6.11", + "server_fn 0.6.11", "tracing", "typed-builder", "typed-builder-macro", @@ -2225,9 +2342,9 @@ dependencies = [ "actix-http", "actix-web", "futures", - "leptos", + "leptos 0.5.7", "leptos_integration_utils", - "leptos_meta", + "leptos_meta 0.5.7", "leptos_router", "parking_lot", "regex", @@ -2242,7 +2359,20 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e72d8689d54737991831e9b279bb4fba36d27a93aa975c75cd4241d9a4a425ec" dependencies = [ - "config", + "config 0.13.3", + "regex", + "serde", + "thiserror", + "typed-builder", +] + +[[package]] +name = "leptos_config" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3caa62f62e8e575051305ed6ac5648dc695f202c7220a98aca21cf4e9a978cf" +dependencies = [ + "config 0.14.0", "regex", "serde", "thiserror", @@ -2264,14 +2394,44 @@ dependencies = [ "indexmap 2.1.0", "itertools 0.12.0", "js-sys", - "leptos_reactive", + "leptos_reactive 0.5.7", "once_cell", "pad-adapter", "paste", "rustc-hash", "serde", "serde_json", - "server_fn", + "server_fn 0.5.7", + "smallvec", + "tracing", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "leptos_dom" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96e84abb02efd711f0842ff3e444292bfa9963811c37e7be3980a052628ed63b" +dependencies = [ + "async-recursion", + "cfg-if", + "drain_filter_polyfill", + "futures", + "getrandom", + "html-escape", + "indexmap 2.1.0", + "itertools 0.12.0", + "js-sys", + "leptos_reactive 0.6.11", + "once_cell", + "pad-adapter", + "paste", + "rustc-hash", + "serde", + "serde_json", + "server_fn 0.6.11", "smallvec", "tracing", "wasm-bindgen", @@ -2297,6 +2457,24 @@ dependencies = [ "walkdir", ] +[[package]] +name = "leptos_hot_reload" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4ee917deba2522a7f22ca826df84a8800d66ac918e58b489875e1f4fb8bc6b8" +dependencies = [ + "anyhow", + "camino", + "indexmap 2.1.0", + "parking_lot", + "proc-macro2", + "quote", + "rstml", + "serde", + "syn 2.0.46", + "walkdir", +] + [[package]] name = "leptos_integration_utils" version = "0.5.7" @@ -2304,10 +2482,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fddda3a3b768dad90f80fb56ac6e250bc5c60755f8e3df225913aba4364ed7ee" dependencies = [ "futures", - "leptos", - "leptos_config", - "leptos_hot_reload", - "leptos_meta", + "leptos 0.5.7", + "leptos_config 0.5.7", + "leptos_hot_reload 0.5.7", + "leptos_meta 0.5.7", "tracing", ] @@ -2317,18 +2495,41 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57955d66f624265222444a5c565fea38efa5b0152a1dfc7c060a78e5fb62a852" dependencies = [ - "attribute-derive", + "attribute-derive 0.8.1", "cfg-if", "convert_case 0.6.0", "html-escape", "itertools 0.12.0", - "leptos_hot_reload", + "leptos_hot_reload 0.5.7", "prettyplease", "proc-macro-error", "proc-macro2", "quote", "rstml", - "server_fn_macro", + "server_fn_macro 0.5.7", + "syn 2.0.46", + "tracing", + "uuid", +] + +[[package]] +name = "leptos_macro" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31197c2c624c405bec5f1dc8dd5d903a6030d1f0b8e362a01a3a215fcbad5051" +dependencies = [ + "attribute-derive 0.9.1", + "cfg-if", + "convert_case 0.6.0", + "html-escape", + "itertools 0.12.0", + "leptos_hot_reload 0.6.11", + "prettyplease", + "proc-macro-error", + "proc-macro2", + "quote", + "rstml", + "server_fn_macro 0.6.11", "syn 2.0.46", "tracing", "uuid", @@ -2342,7 +2543,21 @@ checksum = "1bc25c0f7f14ed5daf42b8d0d273ed790b0449e8ba8cff1c2fa800dc90a75acb" dependencies = [ "cfg-if", "indexmap 2.1.0", - "leptos", + "leptos 0.5.7", + "tracing", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "leptos_meta" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00900e82a4ca892828db93fce1d4c009480ff3959406e6965aa937c8bab7403" +dependencies = [ + "cfg-if", + "indexmap 2.1.0", + "leptos 0.6.11", "tracing", "wasm-bindgen", "web-sys", @@ -2365,7 +2580,34 @@ dependencies = [ "rustc-hash", "self_cell", "serde", - "serde-wasm-bindgen", + "serde-wasm-bindgen 0.5.0", + "serde_json", + "slotmap", + "thiserror", + "tokio", + "tracing", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "leptos_reactive" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "057de706568ce8f1f223ae69f796c10ad0563ad270d10717e70c2b2d22eefa60" +dependencies = [ + "base64 0.22.0", + "cfg-if", + "futures", + "indexmap 2.1.0", + "js-sys", + "paste", + "pin-project", + "rustc-hash", + "self_cell", + "serde", + "serde-wasm-bindgen 0.6.5", "serde_json", "slotmap", "thiserror", @@ -2384,13 +2626,13 @@ checksum = "b31087173c60e25c329a1c6786756dd9ee97750b378622df4d780db160a09040" dependencies = [ "cached", "cfg-if", - "gloo-net", + "gloo-net 0.2.6", "itertools 0.12.0", "js-sys", "lazy_static", - "leptos", + "leptos 0.5.7", "leptos_integration_utils", - "leptos_meta", + "leptos_meta 0.5.7", "linear-map", "lru 0.11.1", "once_cell", @@ -2415,10 +2657,26 @@ checksum = "2fd1517c2024bc47d764e96053e55b927f8a2159e735a0cc47232542b493df9d" dependencies = [ "inventory", "lazy_static", - "leptos_macro", - "leptos_reactive", + "leptos_macro 0.5.7", + "leptos_reactive 0.5.7", "serde", - "server_fn", + "server_fn 0.5.7", + "thiserror", + "tracing", +] + +[[package]] +name = "leptos_server" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f197d9cbf7db3a09a5d6c561ad0547ad6bf4326bc6bc454171d5f6ee94f745a" +dependencies = [ + "inventory", + "lazy_static", + "leptos_macro 0.6.11", + "leptos_reactive 0.6.11", + "serde", + "server_fn 0.6.11", "thiserror", "tracing", ] @@ -2552,7 +2810,19 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "516b76546495d933baa165075b95c0a15e8f7ef75e53f56b19b7144d80fd52bd" dependencies = [ - "manyhow-macros", + "manyhow-macros 0.8.1", + "proc-macro2", + "quote", + "syn 2.0.46", +] + +[[package]] +name = "manyhow" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91ea592d76c0b6471965708ccff7e6a5d277f676b90ab31f4d3f3fc77fade64" +dependencies = [ + "manyhow-macros 0.10.4", "proc-macro2", "quote", "syn 2.0.46", @@ -2569,6 +2839,17 @@ dependencies = [ "quote", ] +[[package]] +name = "manyhow-macros" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c64621e2c08f2576e4194ea8be11daf24ac01249a4f53cd8befcbb7077120ead" +dependencies = [ + "proc-macro-utils", + "proc-macro2", + "quote", +] + [[package]] name = "match_cfg" version = "0.1.0" @@ -3103,7 +3384,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ - "toml", + "toml 0.5.11", ] [[package]] @@ -3214,10 +3495,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7b5abe3fe82fdeeb93f44d66a7b444dedf2e4827defb0a8e69c437b2de2ef94" dependencies = [ "quote", - "quote-use-macros", + "quote-use-macros 0.7.2", "syn 2.0.46", ] +[[package]] +name = "quote-use" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b393938dcaab992375d7b3df7887fa98cc91c2f3590598251e7c609e2b788139" +dependencies = [ + "quote", + "quote-use-macros 0.8.0", +] + [[package]] name = "quote-use-macros" version = "0.7.2" @@ -3230,6 +3521,19 @@ dependencies = [ "syn 2.0.46", ] +[[package]] +name = "quote-use-macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d8772387900c205780e2c240cfe4dd01355ab4f96a503d99bdf34ad73180ef" +dependencies = [ + "derive-where", + "proc-macro-utils", + "proc-macro2", + "quote", + "syn 2.0.46", +] + [[package]] name = "quoted_printable" version = "0.5.0" @@ -3404,7 +3708,7 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams", + "wasm-streams 0.3.0", "web-sys", "webpki-roots 0.25.2", "winreg", @@ -3812,6 +4116,9 @@ name = "send_wrapper" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" +dependencies = [ + "futures-core", +] [[package]] name = "serde" @@ -3833,6 +4140,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + [[package]] name = "serde_derive" version = "1.0.196" @@ -3867,6 +4185,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + [[package]] name = "serde_test" version = "1.0.176" @@ -3925,7 +4252,7 @@ checksum = "6c265de965fe48e09ad8899d0ab1ffebdfa1a9914e4de5ff107b07bd94cf7541" dependencies = [ "ciborium", "const_format", - "gloo-net", + "gloo-net 0.2.6", "inventory", "js-sys", "lazy_static", @@ -3936,12 +4263,42 @@ dependencies = [ "serde", "serde_json", "serde_qs", - "server_fn_macro_default", + "server_fn_macro_default 0.5.7", "syn 2.0.46", "thiserror", "xxhash-rust", ] +[[package]] +name = "server_fn" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "536a5b959673643ee01e59ae41bf01425482c8070dee95d7061ee2d45296b59c" +dependencies = [ + "bytes", + "ciborium", + "const_format", + "dashmap", + "futures", + "gloo-net 0.5.0", + "http 1.0.0", + "inventory", + "js-sys", + "once_cell", + "send_wrapper", + "serde", + "serde_json", + "serde_qs", + "server_fn_macro_default 0.6.11", + "thiserror", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams 0.4.0", + "web-sys", + "xxhash-rust", +] + [[package]] name = "server_fn_macro" version = "0.5.7" @@ -3957,13 +4314,37 @@ dependencies = [ "xxhash-rust", ] +[[package]] +name = "server_fn_macro" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "064dd9b256e78bf2886774f265cc34d2aefdd05b430c58c78a69eceef21b5e60" +dependencies = [ + "const_format", + "convert_case 0.6.0", + "proc-macro2", + "quote", + "syn 2.0.46", + "xxhash-rust", +] + [[package]] name = "server_fn_macro_default" version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a3353f22e2bcc451074d4feaa37317d9d17dff11d4311928384734ea17ab9ca" dependencies = [ - "server_fn_macro", + "server_fn_macro 0.5.7", + "syn 2.0.46", +] + +[[package]] +name = "server_fn_macro_default" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ad11700cbccdbd313703916eb8c97301ee423c4a06e5421b77956fdcb36a9f" +dependencies = [ + "server_fn_macro 0.6.11", "syn 2.0.46", ] @@ -4550,6 +4931,40 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" version = "0.3.2" @@ -4943,6 +5358,19 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wasmtimer" version = "0.2.0" @@ -5154,6 +5582,15 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" diff --git a/Cargo.toml b/Cargo.toml index b4d5092..1c4e45d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ console_error_panic_hook = "0.1" cfg-if = "1" http = { version = "1.0", optional = true } leptos = { version = "0.5.6", features = ["nightly"] } -leptos_meta = { version = "0.5.7", features = ["nightly"] } +leptos_meta = { version = "0.6.11", features = ["nightly"] } leptos_actix = { version = "0.5.6", optional = true } leptos_router = { version = "0.5.7", features = ["nightly"] } wasm-bindgen = "=0.2.90"