diff --git a/Cargo.lock b/Cargo.lock index 00f6046..0b2ea81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -170,9 +170,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "attribute-derive" -version = "0.9.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f1ee502851995027b06f99f5ffbeffa1406b38d0b318a1ebfa469332c6cbafd" +checksum = "0053e96dd3bec5b4879c23a138d6ef26f2cb936c9cdc96274ac2b9ed44b5bb54" dependencies = [ "attribute-derive-macro", "derive-where", @@ -184,14 +184,14 @@ dependencies = [ [[package]] name = "attribute-derive-macro" -version = "0.9.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3601467f634cfe36c4780ca9c75dea9a5b34529c1f2810676a337e7e0997f954" +checksum = "463b53ad0fd5b460af4b1915fe045ff4d946d025fb6c4dc3337752eaa980f71b" dependencies = [ "collection_literals", "interpolator", "manyhow", - "proc-macro-utils 0.8.0", + "proc-macro-utils", "proc-macro2", "quote", "quote-use", @@ -206,9 +206,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.7.7" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", @@ -1352,6 +1352,7 @@ dependencies = [ "futures-core", "futures-task", "futures-util", + "num_cpus", ] [[package]] @@ -1643,9 +1644,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hydration_context" -version = "0.2.0-rc1" +version = "0.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571a2756b518de368146ba56d4feeba265b0b555d176d49b8debd9ce9b69a6fa" +checksum = "8e578296c79066cdf7325259d8259b48adc311e324beecd801c43d953532c51b" dependencies = [ "futures", "js-sys", @@ -1810,7 +1811,7 @@ dependencies = [ "time", "tokio", "tower 0.5.1", - "tower-http 0.6.1", + "tower-http", "tower-layer", "tracing", "url", @@ -2096,9 +2097,9 @@ dependencies = [ [[package]] name = "leptos" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a99b3ca2611376257a8b29466dc5ebf22c6bbed8715f86847808c269844785" +checksum = "cc41e5764d7476efb929db94c1039752ccde5bea2ad40fddaaeeb9b94493fb0d" dependencies = [ "any_spawner", "base64 0.22.1", @@ -2123,7 +2124,7 @@ dependencies = [ "server_fn", "slotmap", "tachys", - "thiserror 1.0.69", + "thiserror 2.0.3", "throw_error", "typed-builder", "typed-builder-macro", @@ -2159,9 +2160,9 @@ dependencies = [ [[package]] name = "leptos_axum" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f62374846ed04ab8b4e1ed27e0f276f692ef4f4955e0ba62509bc25fa392987" +checksum = "15a7318603b14939a7332555ce8fd24a043047780dc6c9820359472ec4db6251" dependencies = [ "any_spawner", "axum", @@ -2177,28 +2178,28 @@ dependencies = [ "parking_lot", "server_fn", "tokio", - "tower 0.4.13", - "tower-http 0.5.2", + "tower 0.5.1", + "tower-http", ] [[package]] name = "leptos_config" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c89503f59940cef245827075362107d4d53f9a710db31bfc361151866ba39e" +checksum = "fe8f7f58ee40b2c0d7e1f0abdbf51ffd2343d281b3f16c1854c0218c152fbad8" dependencies = [ "config", "regex", "serde", - "thiserror 1.0.69", + "thiserror 2.0.3", "typed-builder", ] [[package]] name = "leptos_dom" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b108dc3960fac70b98d2302e568cd51c4d09255f1925bb797eba95575acc69b8" +checksum = "3dccedefe9054b9ca09e027801557dc82cad64cb1f1a8061b114e7f6203bbe51" dependencies = [ "js-sys", "or_poisoned", @@ -2211,9 +2212,9 @@ dependencies = [ [[package]] name = "leptos_hot_reload" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10230c3b99bffd7490f192c54e02f0b35411d08089aba7f662d78be2adfbb736" +checksum = "754d861dbdaf20b6da328112b68e1b2ea2da9a157aef748f53b15fd118972b85" dependencies = [ "anyhow", "camino", @@ -2229,9 +2230,9 @@ dependencies = [ [[package]] name = "leptos_integration_utils" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66a88bbaf3f6689f7878c2a40bb80af84a9e23acfde483b34c811cdcc975a40" +checksum = "30224324686ef508bc4a08fcfc16451410823b7d11b83325d2444221880bbbaa" dependencies = [ "futures", "hydration_context", @@ -2244,9 +2245,9 @@ dependencies = [ [[package]] name = "leptos_macro" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e948a21600d13a6e91d9a0fb56de9c58692f79890caeaec7dabb1cd63e8ec92" +checksum = "9c592d8e91148c73ee562f6d4b867d84d1995a5adb10d5a723f538b3dc173dfc" dependencies = [ "attribute-derive", "cfg-if", @@ -2266,9 +2267,9 @@ dependencies = [ [[package]] name = "leptos_meta" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15ad116cab8a1073bb6556d65c153d4c951ff06fa84387f723289ee16bb6a7b4" +checksum = "7d95aec94d2c28120fe702182ec83e5402b9ad2c6fccaf3dbb98d0d94bf9f908" dependencies = [ "futures", "indexmap", @@ -2282,9 +2283,9 @@ dependencies = [ [[package]] name = "leptos_router" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9924f84cfc4dbe4440c2e58bf54694471e96b21557cb1e693e5bd73f3acae355" +checksum = "123f2c0df5b3fd3025d1c26bc0dce1abd236409d9f031112ab5a0f871cfa6cbb" dependencies = [ "any_spawner", "either_of", @@ -2299,7 +2300,7 @@ dependencies = [ "reactive_graph", "send_wrapper", "tachys", - "thiserror 1.0.69", + "thiserror 2.0.3", "url", "wasm-bindgen", "web-sys", @@ -2307,9 +2308,9 @@ dependencies = [ [[package]] name = "leptos_router_macro" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf8fc6fbb1d1f8f3656b8e33265a2e92319fb877b38014407767d85362f528cb" +checksum = "f84e0d92a7d6973682f02539b8de1f37651e72f557b1fd3f2d55460662669926" dependencies = [ "proc-macro-error2", "proc-macro2", @@ -2318,9 +2319,9 @@ dependencies = [ [[package]] name = "leptos_server" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd1abdb945660f19f7510bdf208069d3bc391aa9bb7183aa58e4af5429e6115" +checksum = "a1387314dcb7f9547394a61b0cb41cdbd09e6c5dd5e154e304123f3d9b5b747b" dependencies = [ "any_spawner", "base64 0.22.1", @@ -2405,9 +2406,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "manyhow" -version = "0.10.4" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91ea592d76c0b6471965708ccff7e6a5d277f676b90ab31f4d3f3fc77fade64" +checksum = "b33efb3ca6d3b07393750d4030418d594ab1139cee518f0dc88db70fec873587" dependencies = [ "manyhow-macros", "proc-macro2", @@ -2417,11 +2418,11 @@ dependencies = [ [[package]] name = "manyhow-macros" -version = "0.10.4" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64621e2c08f2576e4194ea8be11daf24ac01249a4f53cd8befcbb7077120ead" +checksum = "46fce34d199b78b6e6073abf984c9cf5fd3e9330145a93ee0738a7443e371495" dependencies = [ - "proc-macro-utils 0.8.0", + "proc-macro-utils", "proc-macro2", "quote", ] @@ -2643,9 +2644,9 @@ dependencies = [ [[package]] name = "next_tuple" -version = "0.1.0-rc1" +version = "0.1.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3615947b64839fe27e9ee557f282b04ad13ead564a543a6548b0cfd17457ff4" +checksum = "cc6989c5af5a391cdc1c25aad10c6fb881b6e7ebd8df7c6fb29188acb5cba576" [[package]] name = "nom" @@ -2729,6 +2730,16 @@ dependencies = [ "libm", ] +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + [[package]] name = "object" version = "0.36.5" @@ -3086,17 +3097,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "proc-macro-utils" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f59e109e2f795a5070e69578c4dc101068139f74616778025ae1011d4cd41a8" -dependencies = [ - "proc-macro2", - "quote", - "smallvec", -] - [[package]] name = "proc-macro-utils" version = "0.10.0" @@ -3256,7 +3256,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82ebfb7faafadc06a7ab141a6f67bcfb24cb8beb158c6fe933f2f035afa99f35" dependencies = [ - "proc-macro-utils 0.10.0", + "proc-macro-utils", "proc-macro2", "quote", "syn 2.0.87", @@ -3314,9 +3314,9 @@ dependencies = [ [[package]] name = "reactive_graph" -version = "0.1.0-rc1" +version = "0.1.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cdfe96bdf3d95c9bdd15af1cfc82252ef85c026ea960f83df53feca9fec61a" +checksum = "49131fcf9733a991f3485f9a0d0c9b9f65f55df4bb9f9d37203d1f82efa9513c" dependencies = [ "any_spawner", "async-lock", @@ -3329,15 +3329,15 @@ dependencies = [ "send_wrapper", "serde", "slotmap", - "thiserror 1.0.69", + "thiserror 2.0.3", "web-sys", ] [[package]] name = "reactive_stores" -version = "0.1.0-rc1" +version = "0.1.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa994eaec6638c22faeedd4524cbd5a3653e7f32a67e130a60a0c8c9e1ee81" +checksum = "2e722a72d10534f7613291bd2ef44cd2473ad70b2aa965d4bb7b940afb6f7257" dependencies = [ "guardian", "itertools 0.13.0", @@ -3350,9 +3350,9 @@ dependencies = [ [[package]] name = "reactive_stores_macro" -version = "0.1.0-rc1" +version = "0.1.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d7cfe1c6d9f1005605ac7c928aef7e037d6808d6eda0429e73f0ca90cb9cb5" +checksum = "b37fc52b98f16d437cdf5541cf60f661596b6e84a708e02b216a7bf864fe699b" dependencies = [ "convert_case 0.6.0", "proc-macro-error2", @@ -3798,9 +3798,9 @@ dependencies = [ [[package]] name = "server_fn" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166689e862d227e838f359cce92681cf338e60a8cbcbd029bae03548d5a6d785" +checksum = "bed94ec81d1b9ef2b28325bcf715461d861e90f41d249b70b561c6eefcb96afe" dependencies = [ "axum", "bytes", @@ -3820,9 +3820,9 @@ dependencies = [ "serde_json", "serde_qs", "server_fn_macro_default", - "thiserror 1.0.69", + "thiserror 2.0.3", "throw_error", - "tower 0.4.13", + "tower 0.5.1", "tower-layer", "url", "wasm-bindgen", @@ -3834,9 +3834,9 @@ dependencies = [ [[package]] name = "server_fn_macro" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4230cd52992681cc370885a613a5aad9fb56d61995b789de5c42dc55ff628e98" +checksum = "4b7e77dd4f15d19a65019d24700963e40294b5a30c42c32bce2e532fbfe00b49" dependencies = [ "const_format", "convert_case 0.6.0", @@ -3848,9 +3848,9 @@ dependencies = [ [[package]] name = "server_fn_macro_default" -version = "0.7.0-rc1" +version = "0.7.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d4b8ee78096ff2b09c64afacb83f023f4edfdace60c00590b2aea215fea8a4" +checksum = "295a3c3d01be1cf17d0c8b25a48b963a747f6ccdba0f62f657e8df37df4afaac" dependencies = [ "server_fn_macro", "syn 2.0.87", @@ -4107,9 +4107,9 @@ dependencies = [ [[package]] name = "tachys" -version = "0.1.0-rc1" +version = "0.1.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b24784a27f391dedcc8160ea4b2ba7a6ad0f5484ca89ff88a10494f960aee270" +checksum = "231b9e7ce516683c062dd2c8e4d30b81ae8d9a6d05f1e2a9c898e0b84ad728fe" dependencies = [ "any_spawner", "const_str_slice_concat", @@ -4198,9 +4198,9 @@ dependencies = [ [[package]] name = "throw_error" -version = "0.2.0-rc1" +version = "0.2.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84bf87b0433891f1029e5868d4de3a11e794a206899082ebb4e82fca139b0d70" +checksum = "0240909e3ad4ed2dab72b2861fc9a7930110c1d3a9a0a32c6dee0a747591d10a" dependencies = [ "pin-project-lite", ] @@ -4373,10 +4373,6 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", "tower-layer", "tower-service", "tracing", @@ -4400,34 +4396,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.5.2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" -dependencies = [ - "bitflags 2.6.0", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "http-range-header", - "httpdate", - "mime", - "mime_guess", - "percent-encoding", - "pin-project-lite", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97" +checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" dependencies = [ "bitflags 2.6.0", "bytes", @@ -4506,18 +4477,18 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typed-builder" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06fbd5b8de54c5f7c91f6fe4cebb949be2125d7758e630bb58b1d831dbce600" +checksum = "7e14ed59dc8b7b26cacb2a92bad2e8b1f098806063898ab42a3bd121d7d45e75" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" +checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index e50ddf2..fa34605 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,9 +56,9 @@ unwrap_used = "deny" [dependencies] anyhow = "1.0.93" -leptos = "0.7.0-rc1" -leptos_meta = "0.7.0-rc1" -leptos_router = "0.7.0-rc1" +leptos = "0.7.0-rc2" +leptos_meta = "0.7.0-rc2" +leptos_router = "0.7.0-rc2" chrono = { version = "0.4.38", features = ["serde"] } env_logger = { version = "0.11.5", default-features = false } futures = "0.3.31" @@ -111,7 +111,7 @@ diesel-derive-newtype = { version = "2.1.2", optional = true } diesel_migrations = { version = "2.2.0", optional = true } doku = { version = "0.21.1", optional = true } jsonwebtoken = { version = "9.3.0", optional = true } -leptos_axum = { version = "0.7.0-rc1", optional = true } +leptos_axum = { version = "0.7.0-rc2", optional = true } bcrypt = { version = "0.15.1", optional = true } diffy = { version = "0.4.0", optional = true } enum_delegate = { version = "0.2.0", optional = true } diff --git a/src/frontend/components/protected_route.rs b/src/frontend/components/protected_route.rs index 1135d44..d3182a7 100644 --- a/src/frontend/components/protected_route.rs +++ b/src/frontend/components/protected_route.rs @@ -24,6 +24,7 @@ where condition, redirect_path, ssr, + fallback: Default::default(), }; ProtectedRoute(props) }