From 1454c85d3be39ba94d1633e0004ef8bf76fd9840 Mon Sep 17 00:00:00 2001
From: Ethan Girouard <mr.egirouard@gmail.com>
Date: Sun, 31 Mar 2024 01:21:13 -0400
Subject: [PATCH] Update to leptos_axum 0.6

---
 Cargo.lock | 613 +++++++++++------------------------------------------
 Cargo.toml |   2 +-
 2 files changed, 125 insertions(+), 490 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 28a9dfc..60853bd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -424,13 +424,12 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
 dependencies = [
  "async-trait",
  "axum-core 0.3.4",
- "axum-macros",
  "bitflags 1.3.2",
  "bytes",
  "futures-util",
  "http 0.2.11",
  "http-body 0.4.6",
- "hyper",
+ "hyper 0.14.28",
  "itoa",
  "matchit",
  "memchr",
@@ -442,13 +441,41 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
  "tokio",
  "tower",
  "tower-layer",
  "tower-service",
 ]
 
+[[package]]
+name = "axum"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
+dependencies = [
+ "async-trait",
+ "axum-core 0.4.3",
+ "bytes",
+ "futures-util",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "multer",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper 1.0.0",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "axum-core"
 version = "0.3.4"
@@ -481,23 +508,11 @@ dependencies = [
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
  "tower-layer",
  "tower-service",
 ]
 
-[[package]]
-name = "axum-macros"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
 [[package]]
 name = "backtrace"
 version = "0.3.69"
@@ -746,20 +761,6 @@ dependencies = [
  "tokio-util",
 ]
 
-[[package]]
-name = "config"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca"
-dependencies = [
- "async-trait",
- "lazy_static",
- "nom",
- "pathdiff",
- "serde",
- "toml 0.5.11",
-]
-
 [[package]]
 name = "config"
 version = "0.14.0"
@@ -847,22 +848,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.11"
@@ -1365,18 +1350,6 @@ dependencies = [
  "allocator-api2",
 ]
 
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
 [[package]]
 name = "hkdf"
 version = "0.12.4"
@@ -1494,7 +1467,6 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
  "http 0.2.11",
  "http-body 0.4.6",
  "httparse",
@@ -1508,6 +1480,18 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
+dependencies = [
+ "bytes",
+ "http 1.0.0",
+ "http-body 1.0.0",
+ "tokio",
+]
+
 [[package]]
 name = "icondata"
 version = "0.3.0"
@@ -1759,30 +1743,6 @@ version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8573b2b1fb643a372c73b23f4da5f888677feef3305146d68a539250a9bccc7"
 
-[[package]]
-name = "ipnet"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -1828,25 +1788,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
-[[package]]
-name = "leptos"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d02b78d6e38acf8199426058a0d8c4030835d84a4ee16147df25be7fed707e0"
-dependencies = [
- "cfg-if",
- "leptos_config 0.5.4",
- "leptos_dom 0.5.4",
- "leptos_macro 0.5.4",
- "leptos_reactive 0.5.4",
- "leptos_server 0.5.4",
- "server_fn 0.5.4",
- "tracing",
- "typed-builder",
- "typed-builder-macro",
- "web-sys",
-]
-
 [[package]]
 name = "leptos"
 version = "0.6.9"
@@ -1854,12 +1795,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56d079555ff18158a1ed28d2a8ac529b4cb5904490384064346eb2d321addde6"
 dependencies = [
  "cfg-if",
- "leptos_config 0.6.9",
- "leptos_dom 0.6.9",
- "leptos_macro 0.6.9",
- "leptos_reactive 0.6.9",
- "leptos_server 0.6.9",
- "server_fn 0.6.9",
+ "leptos_config",
+ "leptos_dom",
+ "leptos_macro",
+ "leptos_reactive",
+ "leptos_server",
+ "server_fn",
  "tracing",
  "typed-builder",
  "typed-builder-macro",
@@ -1876,98 +1817,56 @@ dependencies = [
  "actix-http",
  "actix-web",
  "futures",
- "leptos 0.6.9",
- "leptos_integration_utils 0.6.9",
- "leptos_macro 0.6.9",
- "leptos_meta 0.6.9",
- "leptos_router 0.6.9",
+ "leptos",
+ "leptos_integration_utils",
+ "leptos_macro",
+ "leptos_meta",
+ "leptos_router",
  "parking_lot",
  "regex",
  "serde_json",
- "server_fn 0.6.9",
+ "server_fn",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "leptos_axum"
-version = "0.5.4"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6283fd19b98f4f7535b80a32064747028fbf4f88ceac4e2a24e9a7d5ed6caf5a"
+checksum = "2276bb8b97638d67c7b704a1351ef88ff3b41a286fc46d48aa59da9f1916bd3c"
 dependencies = [
- "axum",
+ "axum 0.7.5",
  "cfg-if",
  "futures",
- "http 0.2.11",
- "hyper",
- "leptos 0.5.4",
- "leptos_integration_utils 0.5.4",
- "leptos_meta 0.5.4",
- "leptos_router 0.5.4",
+ "http-body-util",
+ "leptos",
+ "leptos_integration_utils",
+ "leptos_macro",
+ "leptos_meta",
+ "leptos_router",
  "once_cell",
  "parking_lot",
  "serde_json",
+ "server_fn",
  "tokio",
  "tokio-util",
  "tracing",
 ]
 
-[[package]]
-name = "leptos_config"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afcaa5db5b22b794b624e14ffe2aefae215b2d21c60a230ae2d06fe21ae5da64"
-dependencies = [
- "config 0.13.4",
- "regex",
- "serde",
- "thiserror",
- "typed-builder",
-]
-
 [[package]]
 name = "leptos_config"
 version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d80b4ed5f0447996b9a28879002f995d3770687630f568be41307f362f84cb7"
 dependencies = [
- "config 0.14.0",
+ "config",
  "regex",
  "serde",
  "thiserror",
  "typed-builder",
 ]
 
-[[package]]
-name = "leptos_dom"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af459b63567e8e9c921ecbe7863732dc8dcb7874eaad6826b7d3778a53ec0ea6"
-dependencies = [
- "async-recursion",
- "cfg-if",
- "drain_filter_polyfill",
- "futures",
- "getrandom",
- "html-escape",
- "indexmap",
- "itertools 0.10.5",
- "js-sys",
- "leptos_reactive 0.5.4",
- "once_cell",
- "pad-adapter",
- "paste",
- "rustc-hash",
- "serde",
- "serde_json",
- "server_fn 0.5.4",
- "smallvec",
- "tracing",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "leptos_dom"
 version = "0.6.9"
@@ -1981,16 +1880,16 @@ dependencies = [
  "getrandom",
  "html-escape",
  "indexmap",
- "itertools 0.12.1",
+ "itertools",
  "js-sys",
- "leptos_reactive 0.6.9",
+ "leptos_reactive",
  "once_cell",
  "pad-adapter",
  "paste",
  "rustc-hash",
  "serde",
  "serde_json",
- "server_fn 0.6.9",
+ "server_fn",
  "smallvec",
  "tracing",
  "wasm-bindgen",
@@ -1998,24 +1897,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "leptos_hot_reload"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea60376eb80a24b3ab082612d62211e3ea0fc4dee132f7ff34d5fa5a5108cd2"
-dependencies = [
- "anyhow",
- "camino",
- "indexmap",
- "parking_lot",
- "proc-macro2",
- "quote",
- "rstml",
- "serde",
- "syn 2.0.48",
- "walkdir",
-]
-
 [[package]]
 name = "leptos_hot_reload"
 version = "0.6.9"
@@ -2044,25 +1925,11 @@ dependencies = [
  "encoding_rs",
  "icondata_core",
  "lazy_static",
- "leptos 0.6.9",
+ "leptos",
  "log",
  "paste",
 ]
 
-[[package]]
-name = "leptos_integration_utils"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dbbd7d721bcdd9aa7b20987063de41314c836a3ac67e263ca489857e337dec"
-dependencies = [
- "futures",
- "leptos 0.5.4",
- "leptos_config 0.5.4",
- "leptos_hot_reload 0.5.4",
- "leptos_meta 0.5.4",
- "tracing",
-]
-
 [[package]]
 name = "leptos_integration_utils"
 version = "0.6.9"
@@ -2070,36 +1937,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff00799857159434d31b6bd1898e21c63f69f39289621da5a554fcab1c3e7300"
 dependencies = [
  "futures",
- "leptos 0.6.9",
- "leptos_config 0.6.9",
- "leptos_hot_reload 0.6.9",
- "leptos_meta 0.6.9",
+ "leptos",
+ "leptos_config",
+ "leptos_hot_reload",
+ "leptos_meta",
  "tracing",
 ]
 
-[[package]]
-name = "leptos_macro"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7e96f4c450f4b5e2ccb135c2b1328890f911ca4ee89da9ed6d582df929e6cb5"
-dependencies = [
- "attribute-derive",
- "cfg-if",
- "convert_case 0.6.0",
- "html-escape",
- "itertools 0.11.0",
- "leptos_hot_reload 0.5.4",
- "prettyplease",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "rstml",
- "server_fn_macro 0.5.4",
- "syn 2.0.48",
- "tracing",
- "uuid",
-]
-
 [[package]]
 name = "leptos_macro"
 version = "0.6.9"
@@ -2110,33 +1954,19 @@ dependencies = [
  "cfg-if",
  "convert_case 0.6.0",
  "html-escape",
- "itertools 0.12.1",
- "leptos_hot_reload 0.6.9",
+ "itertools",
+ "leptos_hot_reload",
  "prettyplease",
  "proc-macro-error",
  "proc-macro2",
  "quote",
  "rstml",
- "server_fn_macro 0.6.9",
+ "server_fn_macro",
  "syn 2.0.48",
  "tracing",
  "uuid",
 ]
 
-[[package]]
-name = "leptos_meta"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "983bbf829598d275b01e96bd9fca71e4739dd7b9fdf69cb8898b30ebfb124332"
-dependencies = [
- "cfg-if",
- "indexmap",
- "leptos 0.5.4",
- "tracing",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "leptos_meta"
 version = "0.6.9"
@@ -2145,36 +1975,12 @@ checksum = "12b9dac59a2f88f5235dbe17cfa81b738a6f47238a64e4f23b921f1a90a9bf11"
 dependencies = [
  "cfg-if",
  "indexmap",
- "leptos 0.6.9",
+ "leptos",
  "tracing",
  "wasm-bindgen",
  "web-sys",
 ]
 
-[[package]]
-name = "leptos_reactive"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22207568e096ac153ba8da68635e3136c1ec614ea9012736fa861c05bfb2eeff"
-dependencies = [
- "base64 0.21.7",
- "cfg-if",
- "futures",
- "indexmap",
- "paste",
- "pin-project",
- "rustc-hash",
- "self_cell",
- "serde",
- "serde-wasm-bindgen 0.5.0",
- "serde_json",
- "slotmap",
- "thiserror",
- "tokio",
- "tracing",
- "wasm-bindgen-futures",
-]
-
 [[package]]
 name = "leptos_reactive"
 version = "0.6.9"
@@ -2192,7 +1998,7 @@ dependencies = [
  "rustc-hash",
  "self_cell",
  "serde",
- "serde-wasm-bindgen 0.6.5",
+ "serde-wasm-bindgen",
  "serde_json",
  "slotmap",
  "thiserror",
@@ -2203,37 +2009,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "leptos_router"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1a2ff8b8e8ae8b17efd8be2a407f7f83ed57c5243f70f2d03e6635f9ff61848"
-dependencies = [
- "cached",
- "cfg-if",
- "gloo-net 0.2.6",
- "itertools 0.11.0",
- "js-sys",
- "lazy_static",
- "leptos 0.5.4",
- "leptos_integration_utils 0.5.4",
- "leptos_meta 0.5.4",
- "linear-map",
- "lru",
- "once_cell",
- "percent-encoding",
- "regex",
- "serde",
- "serde_json",
- "serde_qs",
- "thiserror",
- "tracing",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "leptos_router"
 version = "0.6.9"
@@ -2243,12 +2018,12 @@ dependencies = [
  "cached",
  "cfg-if",
  "gloo-net 0.2.6",
- "itertools 0.12.1",
+ "itertools",
  "js-sys",
  "lazy_static",
- "leptos 0.6.9",
- "leptos_integration_utils 0.6.9",
- "leptos_meta 0.6.9",
+ "leptos",
+ "leptos_integration_utils",
+ "leptos_meta",
  "linear-map",
  "lru",
  "once_cell",
@@ -2266,22 +2041,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "leptos_server"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "272d018a5adf33d10ee57e6f0f83dccc305c68613cd207e8a653aeebd4cd5b4f"
-dependencies = [
- "inventory",
- "lazy_static",
- "leptos_macro 0.5.4",
- "leptos_reactive 0.5.4",
- "serde",
- "server_fn 0.5.4",
- "thiserror",
- "tracing",
-]
-
 [[package]]
 name = "leptos_server"
 version = "0.6.9"
@@ -2290,10 +2049,10 @@ checksum = "654b6ff6a24e79977641b5214452373b1e12fdf4c8a563fadf656c139694b4b9"
 dependencies = [
  "inventory",
  "lazy_static",
- "leptos_macro 0.6.9",
- "leptos_reactive 0.6.9",
+ "leptos_macro",
+ "leptos_reactive",
  "serde",
- "server_fn 0.6.9",
+ "server_fn",
  "thiserror",
  "tracing",
 ]
@@ -2312,7 +2071,7 @@ dependencies = [
  "actix-identity",
  "actix-session",
  "actix-web",
- "axum",
+ "axum 0.6.20",
  "cfg-if",
  "console_error_panic_hook",
  "diesel",
@@ -2322,12 +2081,12 @@ dependencies = [
  "http 0.2.11",
  "icondata",
  "lazy_static",
- "leptos 0.6.9",
+ "leptos",
  "leptos_actix",
  "leptos_axum",
  "leptos_icons",
- "leptos_meta 0.6.9",
- "leptos_router 0.6.9",
+ "leptos_meta",
+ "leptos_router",
  "openssl",
  "pbkdf2",
  "serde",
@@ -2492,6 +2251,24 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "multer"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a15d522be0a9c3e46fd2632e272d178f56387bdb5c9fbb3a36c649062e9b5219"
+dependencies = [
+ "bytes",
+ "encoding_rs",
+ "futures-util",
+ "http 1.0.0",
+ "httparse",
+ "log",
+ "memchr",
+ "mime",
+ "spin",
+ "version_check",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2508,16 +2285,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
-[[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.32.2"
@@ -2952,41 +2719,6 @@ dependencies = [
  "bytecheck",
 ]
 
-[[package]]
-name = "reqwest"
-version = "0.11.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http 0.2.11",
- "http-body 0.4.6",
- "hyper",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "system-configuration",
- "tokio",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
 [[package]]
 name = "rkyv"
 version = "0.7.43"
@@ -3123,17 +2855,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde-wasm-bindgen"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e"
-dependencies = [
- "js-sys",
- "serde",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "serde-wasm-bindgen"
 version = "0.6.5"
@@ -3218,31 +2939,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "server_fn"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfed18dfcc8d9004579c40482c3419c07f60ffb9c5b250542edca99f508b0ce9"
-dependencies = [
- "ciborium",
- "const_format",
- "gloo-net 0.2.6",
- "inventory",
- "js-sys",
- "lazy_static",
- "once_cell",
- "proc-macro2",
- "quote",
- "reqwest",
- "serde",
- "serde_json",
- "serde_qs",
- "server_fn_macro_default 0.5.4",
- "syn 2.0.48",
- "thiserror",
- "xxhash-rust",
-]
-
 [[package]]
 name = "server_fn"
 version = "0.6.9"
@@ -3250,6 +2946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2955da1dc5fcd970c182ebf1089af6c5f19051e1f286a21f7b96490a49b7a531"
 dependencies = [
  "actix-web",
+ "axum 0.7.5",
  "bytes",
  "ciborium",
  "const_format",
@@ -3257,6 +2954,8 @@ dependencies = [
  "futures",
  "gloo-net 0.5.0",
  "http 1.0.0",
+ "http-body-util",
+ "hyper 1.2.0",
  "inventory",
  "js-sys",
  "once_cell",
@@ -3264,8 +2963,10 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_qs",
- "server_fn_macro_default 0.6.9",
+ "server_fn_macro_default",
  "thiserror",
+ "tower",
+ "tower-layer",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -3274,21 +2975,6 @@ dependencies = [
  "xxhash-rust",
 ]
 
-[[package]]
-name = "server_fn_macro"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b70ae8e22546ba85500391b36c08e3fba64871be8a26557a3663a8e08acb56f"
-dependencies = [
- "const_format",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "serde",
- "syn 2.0.48",
- "xxhash-rust",
-]
-
 [[package]]
 name = "server_fn_macro"
 version = "0.6.9"
@@ -3303,23 +2989,13 @@ dependencies = [
  "xxhash-rust",
 ]
 
-[[package]]
-name = "server_fn_macro_default"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7256ba61dfadb220598db418376e7bc2a34b96df36c4dc48f24ffe161810fc0b"
-dependencies = [
- "server_fn_macro 0.5.4",
- "syn 2.0.48",
-]
-
 [[package]]
 name = "server_fn_macro_default"
 version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "060af1def72353a779fcc184c53e1965d3055a38b9e827f2259b2bff2d9c371e"
 dependencies = [
- "server_fn_macro 0.6.9",
+ "server_fn_macro",
  "syn 2.0.48",
 ]
 
@@ -3395,6 +3071,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -3448,25 +3130,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
 [[package]]
-name = "system-configuration"
-version = "0.5.1"
+name = "sync_wrapper"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
+checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c"
 
 [[package]]
 name = "tap"
@@ -3550,26 +3217,13 @@ dependencies = [
  "bytes",
  "libc",
  "mio",
- "num_cpus",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
- "tokio-macros",
  "windows-sys",
 ]
 
-[[package]]
-name = "tokio-macros"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
 [[package]]
 name = "tokio-retry"
 version = "0.3.0"
@@ -3597,15 +3251,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml"
 version = "0.7.8"
@@ -4155,16 +3800,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys",
-]
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
diff --git a/Cargo.toml b/Cargo.toml
index ce1a54f..1bb8091 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@ http = "0.2"
 leptos = { version = "0.6", features = ["nightly"] }
 leptos_meta = { version = "0.6", features = ["nightly"] }
 leptos_actix = { version = "0.6", optional = true }
-leptos_axum = { version = "0.5", optional = true }
+leptos_axum = { version = "0.6", optional = true }
 leptos_router = { version = "0.6", features = ["nightly"] }
 wasm-bindgen = "=0.2.89"
 leptos_icons = { version = "0.3.0" }