From eeccb741d3f6ef8cff8a1e16dec2d3e6982083dc Mon Sep 17 00:00:00 2001
From: Evan Almloff <evanalmloff@gmail.com>
Date: Tue, 6 Aug 2024 23:35:04 +0200
Subject: [PATCH] Re-export the axum feature flag under "server" (#2786)

* re-export the axum feature flag under "server"
* remove the axum prefix from all the fullstack examples
---
 Cargo.lock                                    | 513 +++++++++---------
 Cargo.toml                                    |  10 +-
 packages/dioxus/Cargo.toml                    |   5 +-
 packages/dioxus/build.rs                      |   8 +-
 .../examples/{axum-auth => auth}/.gitignore   |   0
 .../examples/{axum-auth => auth}/Cargo.toml   |   2 +-
 .../examples/{axum-auth => auth}/src/auth.rs  |   0
 .../examples/{axum-auth => auth}/src/main.rs  |   0
 .../{axum-desktop => desktop}/.gitignore      |   0
 .../{axum-desktop => desktop}/Cargo.toml      |   2 +-
 .../{axum-desktop => desktop}/src/client.rs   |   2 +-
 .../{axum-desktop => desktop}/src/lib.rs      |   0
 .../{axum-desktop => desktop}/src/main.rs     |   0
 .../{axum-desktop => desktop}/src/server.rs   |   2 +-
 .../fullstack/examples/hackernews/Cargo.toml  |   2 +-
 .../.gitignore                                |   0
 .../Cargo.toml                                |   2 +-
 .../src/main.rs                               |   0
 .../{axum-router => router}/.gitignore        |   0
 .../{axum-router => router}/Cargo.toml        |   2 +-
 .../{axum-router => router}/src/main.rs       |   0
 .../{axum-streaming => streaming}/.gitignore  |   0
 .../{axum-streaming => streaming}/Cargo.toml  |   2 +-
 .../{axum-streaming => streaming}/src/main.rs |   0
 24 files changed, 269 insertions(+), 283 deletions(-)
 rename packages/fullstack/examples/{axum-auth => auth}/.gitignore (100%)
 rename packages/fullstack/examples/{axum-auth => auth}/Cargo.toml (97%)
 rename packages/fullstack/examples/{axum-auth => auth}/src/auth.rs (100%)
 rename packages/fullstack/examples/{axum-auth => auth}/src/main.rs (100%)
 rename packages/fullstack/examples/{axum-desktop => desktop}/.gitignore (100%)
 rename packages/fullstack/examples/{axum-desktop => desktop}/Cargo.toml (93%)
 rename packages/fullstack/examples/{axum-desktop => desktop}/src/client.rs (91%)
 rename packages/fullstack/examples/{axum-desktop => desktop}/src/lib.rs (100%)
 rename packages/fullstack/examples/{axum-desktop => desktop}/src/main.rs (100%)
 rename packages/fullstack/examples/{axum-desktop => desktop}/src/server.rs (94%)
 rename packages/fullstack/examples/{axum-hello-world => hello-world}/.gitignore (100%)
 rename packages/fullstack/examples/{axum-hello-world => hello-world}/Cargo.toml (92%)
 rename packages/fullstack/examples/{axum-hello-world => hello-world}/src/main.rs (100%)
 rename packages/fullstack/examples/{axum-router => router}/.gitignore (100%)
 rename packages/fullstack/examples/{axum-router => router}/Cargo.toml (93%)
 rename packages/fullstack/examples/{axum-router => router}/src/main.rs (100%)
 rename packages/fullstack/examples/{axum-streaming => streaming}/.gitignore (100%)
 rename packages/fullstack/examples/{axum-streaming => streaming}/Cargo.toml (93%)
 rename packages/fullstack/examples/{axum-streaming => streaming}/src/main.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index a2779e0a6..8b5415db4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -91,7 +91,7 @@ dependencies = [
  "once_cell",
  "serde",
  "version_check",
- "zerocopy 0.7.35",
+ "zerocopy",
 ]
 
 [[package]]
@@ -185,9 +185,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -200,33 +200,33 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -801,28 +801,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "axum-auth"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "axum 0.7.5",
- "axum_session",
- "axum_session_auth",
- "dioxus",
- "dioxus-fullstack",
- "dioxus-web",
- "execute",
- "http 1.1.0",
- "serde",
- "simple_logger",
- "sqlx",
- "tokio",
- "tower",
- "tower-http",
-]
-
 [[package]]
 name = "axum-core"
 version = "0.3.4"
@@ -861,16 +839,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "axum-desktop"
-version = "0.1.0"
-dependencies = [
- "axum 0.7.5",
- "dioxus",
- "serde",
- "tokio",
-]
-
 [[package]]
 name = "axum-extra"
 version = "0.9.3"
@@ -894,19 +862,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "axum-hello-world"
-version = "0.1.0"
-dependencies = [
- "dioxus",
- "reqwest 0.12.5",
- "serde",
- "simple_logger",
- "tracing",
- "tracing-subscriber",
- "tracing-wasm",
-]
-
 [[package]]
 name = "axum-macros"
 version = "0.4.1"
@@ -919,16 +874,6 @@ dependencies = [
  "syn 2.0.72",
 ]
 
-[[package]]
-name = "axum-router"
-version = "0.1.0"
-dependencies = [
- "axum 0.7.5",
- "dioxus",
- "serde",
- "tokio",
-]
-
 [[package]]
 name = "axum-server"
 version = "0.7.1"
@@ -953,22 +898,6 @@ dependencies = [
  "tower-service",
 ]
 
-[[package]]
-name = "axum-streaming"
-version = "0.1.0"
-dependencies = [
- "dioxus",
- "futures",
- "futures-util",
- "once_cell",
- "serde",
- "simple_logger",
- "tokio",
- "tracing",
- "tracing-subscriber",
- "tracing-wasm",
-]
-
 [[package]]
 name = "axum_session"
 version = "0.12.4"
@@ -1246,7 +1175,7 @@ dependencies = [
  "ahash 0.8.11",
  "chrono",
  "either",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "itertools 0.13.0",
  "nom",
  "once_cell",
@@ -1257,9 +1186,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.10.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
+checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
 dependencies = [
  "memchr",
  "regex-automata 0.4.7",
@@ -1308,9 +1237,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.16.3"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
 
 [[package]]
 name = "byteorder"
@@ -1326,9 +1255,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
 
 [[package]]
 name = "bzip2"
@@ -1396,14 +1325,14 @@ dependencies = [
  "clap",
  "console",
  "dialoguer",
- "env_logger 0.11.5",
+ "env_logger 0.11.4",
  "fs-err",
  "git2",
  "gix-config",
  "heck 0.5.0",
  "home",
  "ignore",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "indicatif",
  "liquid",
  "liquid-core",
@@ -1422,7 +1351,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "time",
- "toml 0.8.19",
+ "toml 0.8.15",
  "walkdir",
 ]
 
@@ -1456,7 +1385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad639525b1c67b6a298f378417b060fbc04618bea559482a8484381cce27d965"
 dependencies = [
  "serde",
- "toml 0.8.19",
+ "toml 0.8.15",
 ]
 
 [[package]]
@@ -1482,9 +1411,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.7"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
+checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
 dependencies = [
  "jobserver",
  "libc",
@@ -1609,9 +1538,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.13"
+version = "4.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
+checksum = "8f6b81fb3c84f5563d509c59b5a48d935f689e993afa90fe39047f05adef9142"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1619,9 +1548,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.13"
+version = "4.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
+checksum = "5ca6706fd5224857d9ac5eb9355f6683563cc0541c7cd9d014043b57cbec78ac"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1631,9 +1560,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -1643,9 +1572,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
 [[package]]
 name = "cmake"
@@ -1704,9 +1633,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "colored"
@@ -2493,7 +2422,7 @@ dependencies = [
  "dioxus-html",
  "dioxus-rsx",
  "dirs",
- "env_logger 0.11.5",
+ "env_logger 0.11.4",
  "fern",
  "flate2",
  "fs_extra",
@@ -2528,8 +2457,8 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-stream",
- "toml 0.8.19",
- "toml_edit 0.22.20",
+ "toml 0.8.15",
+ "toml_edit 0.22.16",
  "tower",
  "tower-http",
  "tracing",
@@ -2554,7 +2483,7 @@ dependencies = [
  "serde_json",
  "tauri-bundler",
  "tauri-utils",
- "toml 0.8.19",
+ "toml 0.8.15",
  "tracing",
 ]
 
@@ -2736,19 +2665,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "dioxus-hackernews"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "dioxus",
- "reqwest 0.12.5",
- "serde",
- "tracing",
- "tracing-subscriber",
- "tracing-wasm",
-]
-
 [[package]]
 name = "dioxus-hooks"
 version = "0.6.0-alpha.1"
@@ -3046,7 +2962,7 @@ dependencies = [
  "fs_extra",
  "generational-box",
  "http 1.1.0",
- "lru 0.12.4",
+ "lru 0.12.3",
  "rustc-hash",
  "serde",
  "serde_json",
@@ -3317,9 +3233,9 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "c6dc8c8ff84895b051f07a0e65f975cf225131742531338752abfb324e4449ff"
 dependencies = [
  "log",
  "regex",
@@ -3340,9 +3256,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "06676b12debf7bba6903559720abca942d3a66b8acb88815fd2c7c6537e9ade1"
 dependencies = [
  "anstream",
  "anstyle",
@@ -3658,16 +3574,16 @@ dependencies = [
 
 [[package]]
 name = "fs_at"
-version = "0.2.1"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14af6c9694ea25db25baa2a1788703b9e7c6648dcaeeebeb98f7561b5384c036"
+checksum = "982f82cc75107eef84f417ad6c53ae89bf65b561937ca4a3b3b0fd04d0aa2425"
 dependencies = [
  "aligned",
  "cfg-if",
  "cvt",
  "libc",
- "nix 0.29.0",
- "windows-sys 0.52.0",
+ "nix 0.26.4",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3685,6 +3601,90 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "fullstack-auth-example"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "axum 0.7.5",
+ "axum_session",
+ "axum_session_auth",
+ "dioxus",
+ "dioxus-fullstack",
+ "dioxus-web",
+ "execute",
+ "http 1.1.0",
+ "serde",
+ "simple_logger",
+ "sqlx",
+ "tokio",
+ "tower",
+ "tower-http",
+]
+
+[[package]]
+name = "fullstack-desktop-example"
+version = "0.1.0"
+dependencies = [
+ "axum 0.7.5",
+ "dioxus",
+ "serde",
+ "tokio",
+]
+
+[[package]]
+name = "fullstack-hackernews-example"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "dioxus",
+ "reqwest 0.12.5",
+ "serde",
+ "tracing",
+ "tracing-subscriber",
+ "tracing-wasm",
+]
+
+[[package]]
+name = "fullstack-hello-world-example"
+version = "0.1.0"
+dependencies = [
+ "dioxus",
+ "reqwest 0.12.5",
+ "serde",
+ "simple_logger",
+ "tracing",
+ "tracing-subscriber",
+ "tracing-wasm",
+]
+
+[[package]]
+name = "fullstack-router-example"
+version = "0.1.0"
+dependencies = [
+ "axum 0.7.5",
+ "dioxus",
+ "serde",
+ "tokio",
+]
+
+[[package]]
+name = "fullstack-streaming-example"
+version = "0.1.0"
+dependencies = [
+ "dioxus",
+ "futures",
+ "futures-util",
+ "once_cell",
+ "serde",
+ "simple_logger",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+ "tracing-wasm",
+]
+
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -4093,7 +4093,7 @@ dependencies = [
  "gix-utils",
  "itoa 1.0.11",
  "thiserror",
- "winnow 0.6.18",
+ "winnow 0.6.15",
 ]
 
 [[package]]
@@ -4114,7 +4114,7 @@ dependencies = [
  "smallvec",
  "thiserror",
  "unicode-bom",
- "winnow 0.6.18",
+ "winnow 0.6.15",
 ]
 
 [[package]]
@@ -4216,7 +4216,7 @@ dependencies = [
  "itoa 1.0.11",
  "smallvec",
  "thiserror",
- "winnow 0.6.18",
+ "winnow 0.6.15",
 ]
 
 [[package]]
@@ -4251,7 +4251,7 @@ dependencies = [
  "gix-validate",
  "memmap2",
  "thiserror",
- "winnow 0.6.18",
+ "winnow 0.6.15",
 ]
 
 [[package]]
@@ -4665,7 +4665,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "slab",
  "tokio",
  "tokio-util",
@@ -4684,7 +4684,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.1.0",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "slab",
  "tokio",
  "tokio-util",
@@ -5310,9 +5310,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.3.0"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
@@ -5507,9 +5507,9 @@ checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.1"
+version = "1.70.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
 
 [[package]]
 name = "itertools"
@@ -5689,9 +5689,9 @@ dependencies = [
 
 [[package]]
 name = "kstring"
-version = "2.0.2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "558bf9508a558512042d3095138b1f7b8fe90c5467d94f9f1da28b3731c5dbd1"
+checksum = "e703acfd696000db3f6d1238e23b3d1f889192e1e439969c44e8423bb7a5655e"
 dependencies = [
  "serde",
  "static_assertions",
@@ -5941,9 +5941,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "liquid"
-version = "0.26.9"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cdcc72b82748f47c2933c172313f5a9aea5b2c4eb3fa4c66b4ea55bb60bb4b1"
+checksum = "10929f201279ba14da3297b957dcda1e0bf7a6f3bb5115688be684aa8864e9cc"
 dependencies = [
  "doc-comment",
  "liquid-core",
@@ -5954,12 +5954,12 @@ dependencies = [
 
 [[package]]
 name = "liquid-core"
-version = "0.26.9"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2752e978ffc53670f3f2e8b3ef09f348d6f7b5474a3be3f8a5befe5382e4effb"
+checksum = "3aef4b2160791f456eb880c990a97746f693746f92302ef5f1d06111cf14b768"
 dependencies = [
  "anymap2",
- "itertools 0.13.0",
+ "itertools 0.12.1",
  "kstring",
  "liquid-derive",
  "num-traits",
@@ -5972,9 +5972,9 @@ dependencies = [
 
 [[package]]
 name = "liquid-derive"
-version = "0.26.8"
+version = "0.26.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b51f1d220e3fa869e24cfd75915efe3164bd09bb11b3165db3f37f57bf673e3"
+checksum = "915f6d0a2963a27cd5205c1902f32ddfe3bc035816afd268cf88c0fc0f8d287e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5983,11 +5983,11 @@ dependencies = [
 
 [[package]]
 name = "liquid-lib"
-version = "0.26.9"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b1a298d3d2287ee5b1e43840d885b8fdfc37d3f4e90d82aacfd04d021618da"
+checksum = "73f48fc446873f74d869582f5c4b8cbf3248c93395e410a67af5809b3731e44a"
 dependencies = [
- "itertools 0.13.0",
+ "itertools 0.12.1",
  "liquid-core",
  "once_cell",
  "percent-encoding",
@@ -6041,9 +6041,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.12.4"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
+checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
 dependencies = [
  "hashbrown 0.14.5",
 ]
@@ -6183,6 +6183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
 dependencies = [
  "cfg-if",
+ "rayon",
 ]
 
 [[package]]
@@ -6451,6 +6452,17 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "nix"
 version = "0.28.0"
@@ -6726,14 +6738,14 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.2"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
+checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
 dependencies = [
  "flate2",
  "memchr",
  "ruzstd",
- "wasmparser 0.214.0",
+ "wasmparser 0.212.0",
 ]
 
 [[package]]
@@ -6827,12 +6839,12 @@ dependencies = [
 
 [[package]]
 name = "os_pipe"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
+checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7072,7 +7084,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
 ]
 
 [[package]]
@@ -7286,7 +7298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
 dependencies = [
  "base64 0.22.1",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "quick-xml",
  "serde",
  "time",
@@ -7396,12 +7408,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.18"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f"
-dependencies = [
- "zerocopy 0.6.6",
-]
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "precomputed-hash"
@@ -7831,7 +7840,7 @@ dependencies = [
  "compact_str",
  "crossterm",
  "itertools 0.13.0",
- "lru 0.12.4",
+ "lru 0.12.3",
  "paste",
  "stability",
  "strum 0.26.3",
@@ -7878,15 +7887,16 @@ dependencies = [
 
 [[package]]
 name = "ravif"
-version = "0.11.9"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5797d09f9bd33604689e87e8380df4951d4912f01b63f71205e2abd4ae25e6b6"
+checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12"
 dependencies = [
  "avif-serialize",
  "imgref",
  "loop9",
  "quick-error",
  "rav1e",
+ "rayon",
  "rgb",
 ]
 
@@ -7997,16 +8007,18 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "remove_dir_all"
-version = "0.8.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c914caef075f03e9d5c568e2e71b3d3cf17dc61a5481ff379bb744721be0a75a"
+checksum = "23895cfadc1917fed9c6ed76a8c2903615fa3704f7493ff82b364c6540acc02b"
 dependencies = [
+ "aligned",
  "cfg-if",
  "cvt",
  "fs_at",
+ "lazy_static",
  "libc",
  "normpath 1.2.0",
- "windows-sys 0.52.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -8234,7 +8246,7 @@ checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
  "base64 0.21.7",
  "bitflags 2.6.0",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "serde",
  "serde_derive",
 ]
@@ -8648,12 +8660,11 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.122"
+version = "1.0.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
+checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
 dependencies = [
  "itoa 1.0.11",
- "memchr",
  "ryu",
  "serde",
 ]
@@ -8702,9 +8713,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
@@ -8731,7 +8742,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "serde",
  "serde_derive",
  "serde_json",
@@ -8753,9 +8764,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn"
-version = "0.6.13"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaae169927ef701a4734d680adcb08f13269c9f0af822bf175d681fe56d65c"
+checksum = "b06e6e5467a2cd93ce1accfdfd8b859404f0b3b2041131ffd774fabf666b8219"
 dependencies = [
  "axum 0.7.5",
  "bytes",
@@ -8788,9 +8799,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro"
-version = "0.6.13"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583085903fd5d091884eb52d99550e32777015af21f0f5dbec49bedcc320ce82"
+checksum = "09c216bb1c1ac890151397643c663c875a1836adf0b269be4e389cb1b48c173c"
 dependencies = [
  "const_format",
  "convert_case 0.6.0",
@@ -8802,9 +8813,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro_default"
-version = "0.6.13"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b628649700e28cf8bc33e0df5de5c9d591a1828ba005a25b425477055f1e0e74"
+checksum = "00783df297ec85ea605779f2fef9cbec98981dffe2e01e1a9845c102ee1f1ae6"
 dependencies = [
  "server_fn_macro",
  "syn 2.0.72",
@@ -8881,9 +8892,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-mio"
-version = "0.2.4"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
+checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
 dependencies = [
  "libc",
  "mio 0.8.11",
@@ -9000,7 +9011,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f20798defa0e9d4eff9ca451c7f84774c7378a9c3b5a40112cfa2b3eadb97ae2"
 dependencies = [
- "lru 0.12.4",
+ "lru 0.12.3",
  "once_cell",
  "rustc-hash",
 ]
@@ -9169,7 +9180,7 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "ipnetwork",
  "log",
  "mac_address",
@@ -9558,7 +9569,7 @@ dependencies = [
  "base64 0.21.7",
  "dashmap",
  "either",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "jsonc-parser",
  "lru 0.10.1",
  "once_cell",
@@ -9699,7 +9710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84b67e115ab136fe0eb03558bb0508ca7782eeb446a96d165508c48617e3fd94"
 dependencies = [
  "anyhow",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "serde",
  "serde_json",
  "sourcemap",
@@ -9805,7 +9816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d705c2e9fa6a7024d1771fa6f8203f28762fbe0995db919a2f5a6cabd9c6b544"
 dependencies = [
  "arrayvec",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "is-macro",
  "serde",
  "serde_derive",
@@ -10025,7 +10036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624e23b532c9a2f74ea850120b19079ab67f6e85af53c83d1984adbecc820b03"
 dependencies = [
  "arrayvec",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "num-bigint",
  "num_cpus",
  "once_cell",
@@ -10083,7 +10094,7 @@ checksum = "ae5f069e49b3ed41fa8136913497fa05357c24be2a29d205094d716d2d541a0a"
 dependencies = [
  "anyhow",
  "dashmap",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "once_cell",
  "preset_env_base",
  "rustc-hash",
@@ -10128,7 +10139,7 @@ checksum = "6df81c1cbb920d9c47abe6fb105363b0f78df2c8f6b0910c4fdd2ad7cbdfb23d"
 dependencies = [
  "better_scoped_tls",
  "bitflags 2.6.0",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "once_cell",
  "phf 0.11.2",
  "rustc-hash",
@@ -10164,7 +10175,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f689e03f059ebbff4455331d7e419933574fe409977f8c1d0005c480a89949e"
 dependencies = [
  "arrayvec",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "is-macro",
  "num-bigint",
  "serde",
@@ -10214,7 +10225,7 @@ dependencies = [
  "Inflector",
  "anyhow",
  "bitflags 2.6.0",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "is-macro",
  "path-clean 1.0.1",
  "pathdiff",
@@ -10239,7 +10250,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7f9a903d6774d3f9005775badc25817296791ffed560f1b7e38aab62ca37ff"
 dependencies = [
  "dashmap",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "once_cell",
  "petgraph",
  "rustc-hash",
@@ -10284,7 +10295,7 @@ checksum = "d411add563dd86d50b3db6e74e38def06587fa2fd370b430f71226688bfa6ded"
 dependencies = [
  "base64 0.21.7",
  "dashmap",
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "once_cell",
  "serde",
  "sha1",
@@ -10303,9 +10314,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_typescript"
-version = "0.194.4"
+version = "0.194.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99619353488c1dae960159faef86f0261e7fefe43b84ed1ba80c8cbc5a539434"
+checksum = "57d16aa796183d9f2249243e7e8429ccf2f00d7b9134d807d5e68ec826c289af"
 dependencies = [
  "ryu-js",
  "serde",
@@ -10324,7 +10335,7 @@ version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38f583b8db3cb9848537bd6f91c75398407e64332aee982337fe62ea4dec7e7b"
 dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "rustc-hash",
  "swc_atoms",
  "swc_common",
@@ -10341,7 +10352,7 @@ version = "0.133.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6148af60d25da893aef037621e4869e9b580eb280e12f5a8d4f87fa5e4cd5da"
 dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "num_cpus",
  "once_cell",
  "rustc-hash",
@@ -10399,7 +10410,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3f854cf8efc290aa927d31dab98b42011ff2341fecb2b27fdc817ef7b30ef3b"
 dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "petgraph",
  "rustc-hash",
  "swc_common",
@@ -10557,7 +10568,7 @@ dependencies = [
  "cfg-expr",
  "heck 0.5.0",
  "pkg-config",
- "toml 0.8.19",
+ "toml 0.8.15",
  "version-compare",
 ]
 
@@ -10629,9 +10640,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
 
 [[package]]
 name = "tauri-bundler"
@@ -10886,9 +10897,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.39.2"
+version = "1.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
+checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -11023,22 +11034,22 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
 dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.20",
+ "toml_edit 0.22.16",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
@@ -11049,7 +11060,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -11062,7 +11073,7 @@ version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
 dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -11073,22 +11084,22 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "toml_datetime",
  "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
 dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.18",
+ "winnow 0.6.15",
 ]
 
 [[package]]
@@ -11293,9 +11304,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "trybuild"
-version = "1.0.99"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "207aa50d36c4be8d8c6ea829478be44a372c6a77669937bb39c698e52f1491e8"
+checksum = "5b1e5645f2ee8025c2f1d75e1138f2dd034d74e6ba54620f3c569ba2a2a1ea06"
 dependencies = [
  "dissimilar",
  "glob",
@@ -11303,7 +11314,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "termcolor",
- "toml 0.8.19",
+ "toml 0.8.15",
 ]
 
 [[package]]
@@ -11593,9 +11604,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
 
 [[package]]
 name = "version_check"
-version = "0.9.5"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vlq"
@@ -11942,9 +11953,9 @@ checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b"
 
 [[package]]
 name = "wasmparser"
-version = "0.214.0"
+version = "0.212.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5309c1090e3e84dad0d382f42064e9933fdaedb87e468cc239f0eabea73ddcb6"
+checksum = "8d28bc49ba1e5c5b61ffa7a2eace10820443c4b7d1c0b144109261d14570fdf8"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -12263,15 +12274,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -12470,9 +12472,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "557404e450152cd6795bb558bca69e43c585055f4606e3bcae5894fc6dac9ba0"
 dependencies = [
  "memchr",
 ]
@@ -12602,9 +12604,9 @@ dependencies = [
 
 [[package]]
 name = "xxhash-rust"
-version = "0.8.12"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"
+checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb"
 
 [[package]]
 name = "yansi"
@@ -12669,34 +12671,13 @@ dependencies = [
  "zvariant",
 ]
 
-[[package]]
-name = "zerocopy"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
-dependencies = [
- "byteorder",
- "zerocopy-derive 0.6.6",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
- "zerocopy-derive 0.7.35",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
+ "zerocopy-derive",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 4b64bea7e..b5ed7c723 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,11 +33,11 @@ members = [
     "packages/lazy-js-bundle",
 
     # Fullstack examples
-    "packages/fullstack/examples/axum-hello-world",
-    "packages/fullstack/examples/axum-router",
-    "packages/fullstack/examples/axum-streaming",
-    "packages/fullstack/examples/axum-desktop",
-    "packages/fullstack/examples/axum-auth",
+    "packages/fullstack/examples/hello-world",
+    "packages/fullstack/examples/router",
+    "packages/fullstack/examples/streaming",
+    "packages/fullstack/examples/desktop",
+    "packages/fullstack/examples/auth",
     "packages/fullstack/examples/hackernews",
 
     # Static generation examples
diff --git a/packages/dioxus/Cargo.toml b/packages/dioxus/Cargo.toml
index bb999fc69..6e54668fd 100644
--- a/packages/dioxus/Cargo.toml
+++ b/packages/dioxus/Cargo.toml
@@ -57,7 +57,8 @@ web = ["dep:dioxus-web", "dioxus-fullstack?/web", "dioxus-static-site-generation
 ssr = ["dep:dioxus-ssr", "dioxus-router?/ssr", "dioxus-config-macro/ssr"]
 liveview = ["dep:dioxus-liveview", "dioxus-config-macro/liveview", "dioxus-router?/liveview"]
 static-generation = ["dep:dioxus-static-site-generation", "dioxus-config-macro/static-generation"]
-axum = ["dioxus-fullstack?/axum", "dioxus-fullstack?/server", "dioxus-static-site-generation?/server", "ssr", "dioxus-liveview?/axum", "dep:axum"]
+axum = ["server"]
+server = ["dioxus-fullstack?/axum", "dioxus-fullstack?/server", "dioxus-static-site-generation?/server", "ssr", "dioxus-liveview?/axum", "dep:axum"]
 
 # This feature just disables the no-renderer-enabled warning
 third-party-renderer = []
@@ -88,5 +89,5 @@ features = [
     "html",
     "liveview",
     "static-generation",
-    "axum"
+    "server"
 ]
diff --git a/packages/dioxus/build.rs b/packages/dioxus/build.rs
index d5d3e7374..48ffdf467 100644
--- a/packages/dioxus/build.rs
+++ b/packages/dioxus/build.rs
@@ -5,8 +5,8 @@ fn main() {
             return;
         }
 
-        let liveview_renderers = ["liveview", "axum"];
-        let fullstack_renderers = ["axum"];
+        let liveview_renderers = ["liveview", "server"];
+        let fullstack_renderers = ["server"];
         let client_renderers = ["desktop", "mobile", "web"];
         let client_renderer_selected = client_renderers
             .iter()
@@ -33,6 +33,10 @@ fn main() {
             println!("cargo:warning=You have enabled the launch feature, but have not enabled any client renderers. The application will not be able to launch. Try enabling one of the following renderers: {}, fullstack or liveview", client_renderers.join(", "));
         }
     }
+
+    if feature_enabled("axum") {
+        println!("cargo:warning=The axum feature has been renamed to server and will be removed in a future release. Please update your code to use server feature instead.");
+    }
 }
 
 fn feature_enabled(feature: &str) -> bool {
diff --git a/packages/fullstack/examples/axum-auth/.gitignore b/packages/fullstack/examples/auth/.gitignore
similarity index 100%
rename from packages/fullstack/examples/axum-auth/.gitignore
rename to packages/fullstack/examples/auth/.gitignore
diff --git a/packages/fullstack/examples/axum-auth/Cargo.toml b/packages/fullstack/examples/auth/Cargo.toml
similarity index 97%
rename from packages/fullstack/examples/axum-auth/Cargo.toml
rename to packages/fullstack/examples/auth/Cargo.toml
index 13e07e31c..a42450dc5 100644
--- a/packages/fullstack/examples/axum-auth/Cargo.toml
+++ b/packages/fullstack/examples/auth/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "axum-auth"
+name = "fullstack-auth-example"
 version = "0.1.0"
 edition = "2021"
 publish = false
diff --git a/packages/fullstack/examples/axum-auth/src/auth.rs b/packages/fullstack/examples/auth/src/auth.rs
similarity index 100%
rename from packages/fullstack/examples/axum-auth/src/auth.rs
rename to packages/fullstack/examples/auth/src/auth.rs
diff --git a/packages/fullstack/examples/axum-auth/src/main.rs b/packages/fullstack/examples/auth/src/main.rs
similarity index 100%
rename from packages/fullstack/examples/axum-auth/src/main.rs
rename to packages/fullstack/examples/auth/src/main.rs
diff --git a/packages/fullstack/examples/axum-desktop/.gitignore b/packages/fullstack/examples/desktop/.gitignore
similarity index 100%
rename from packages/fullstack/examples/axum-desktop/.gitignore
rename to packages/fullstack/examples/desktop/.gitignore
diff --git a/packages/fullstack/examples/axum-desktop/Cargo.toml b/packages/fullstack/examples/desktop/Cargo.toml
similarity index 93%
rename from packages/fullstack/examples/axum-desktop/Cargo.toml
rename to packages/fullstack/examples/desktop/Cargo.toml
index bae2a9241..60fa58bdd 100644
--- a/packages/fullstack/examples/axum-desktop/Cargo.toml
+++ b/packages/fullstack/examples/desktop/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "axum-desktop"
+name = "fullstack-desktop-example"
 version = "0.1.0"
 edition = "2021"
 publish = false
diff --git a/packages/fullstack/examples/axum-desktop/src/client.rs b/packages/fullstack/examples/desktop/src/client.rs
similarity index 91%
rename from packages/fullstack/examples/axum-desktop/src/client.rs
rename to packages/fullstack/examples/desktop/src/client.rs
index 45e11999b..5c35f1691 100644
--- a/packages/fullstack/examples/axum-desktop/src/client.rs
+++ b/packages/fullstack/examples/desktop/src/client.rs
@@ -3,7 +3,7 @@
 // cargo run --bin client --features desktop
 // ```
 
-use axum_desktop::*;
+use fullstack_desktop_example::*;
 
 fn main() {
     // Set the url of the server where server functions are hosted.
diff --git a/packages/fullstack/examples/axum-desktop/src/lib.rs b/packages/fullstack/examples/desktop/src/lib.rs
similarity index 100%
rename from packages/fullstack/examples/axum-desktop/src/lib.rs
rename to packages/fullstack/examples/desktop/src/lib.rs
diff --git a/packages/fullstack/examples/axum-desktop/src/main.rs b/packages/fullstack/examples/desktop/src/main.rs
similarity index 100%
rename from packages/fullstack/examples/axum-desktop/src/main.rs
rename to packages/fullstack/examples/desktop/src/main.rs
diff --git a/packages/fullstack/examples/axum-desktop/src/server.rs b/packages/fullstack/examples/desktop/src/server.rs
similarity index 94%
rename from packages/fullstack/examples/axum-desktop/src/server.rs
rename to packages/fullstack/examples/desktop/src/server.rs
index e9d475078..35e7cae17 100644
--- a/packages/fullstack/examples/axum-desktop/src/server.rs
+++ b/packages/fullstack/examples/desktop/src/server.rs
@@ -3,8 +3,8 @@
 // cargo run --bin server --features server
 // ```
 
-use axum_desktop::*;
 use dioxus::prelude::*;
+use fullstack_desktop_example::*;
 use server_fn::axum::register_explicit;
 
 #[tokio::main]
diff --git a/packages/fullstack/examples/hackernews/Cargo.toml b/packages/fullstack/examples/hackernews/Cargo.toml
index a6851212d..68c247573 100644
--- a/packages/fullstack/examples/hackernews/Cargo.toml
+++ b/packages/fullstack/examples/hackernews/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "dioxus-hackernews"
+name = "fullstack-hackernews-example"
 version = "0.1.0"
 authors = ["Evan Almloff <evanalmloff@gmail.com>"]
 edition = "2021"
diff --git a/packages/fullstack/examples/axum-hello-world/.gitignore b/packages/fullstack/examples/hello-world/.gitignore
similarity index 100%
rename from packages/fullstack/examples/axum-hello-world/.gitignore
rename to packages/fullstack/examples/hello-world/.gitignore
diff --git a/packages/fullstack/examples/axum-hello-world/Cargo.toml b/packages/fullstack/examples/hello-world/Cargo.toml
similarity index 92%
rename from packages/fullstack/examples/axum-hello-world/Cargo.toml
rename to packages/fullstack/examples/hello-world/Cargo.toml
index ad054df4e..16bb88cff 100644
--- a/packages/fullstack/examples/axum-hello-world/Cargo.toml
+++ b/packages/fullstack/examples/hello-world/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "axum-hello-world"
+name = "fullstack-hello-world-example"
 version = "0.1.0"
 edition = "2021"
 publish = false
diff --git a/packages/fullstack/examples/axum-hello-world/src/main.rs b/packages/fullstack/examples/hello-world/src/main.rs
similarity index 100%
rename from packages/fullstack/examples/axum-hello-world/src/main.rs
rename to packages/fullstack/examples/hello-world/src/main.rs
diff --git a/packages/fullstack/examples/axum-router/.gitignore b/packages/fullstack/examples/router/.gitignore
similarity index 100%
rename from packages/fullstack/examples/axum-router/.gitignore
rename to packages/fullstack/examples/router/.gitignore
diff --git a/packages/fullstack/examples/axum-router/Cargo.toml b/packages/fullstack/examples/router/Cargo.toml
similarity index 93%
rename from packages/fullstack/examples/axum-router/Cargo.toml
rename to packages/fullstack/examples/router/Cargo.toml
index e1cb35fab..9f92d87aa 100644
--- a/packages/fullstack/examples/axum-router/Cargo.toml
+++ b/packages/fullstack/examples/router/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "axum-router"
+name = "fullstack-router-example"
 version = "0.1.0"
 edition = "2021"
 publish = false
diff --git a/packages/fullstack/examples/axum-router/src/main.rs b/packages/fullstack/examples/router/src/main.rs
similarity index 100%
rename from packages/fullstack/examples/axum-router/src/main.rs
rename to packages/fullstack/examples/router/src/main.rs
diff --git a/packages/fullstack/examples/axum-streaming/.gitignore b/packages/fullstack/examples/streaming/.gitignore
similarity index 100%
rename from packages/fullstack/examples/axum-streaming/.gitignore
rename to packages/fullstack/examples/streaming/.gitignore
diff --git a/packages/fullstack/examples/axum-streaming/Cargo.toml b/packages/fullstack/examples/streaming/Cargo.toml
similarity index 93%
rename from packages/fullstack/examples/axum-streaming/Cargo.toml
rename to packages/fullstack/examples/streaming/Cargo.toml
index 84e5e37e8..29eba049a 100644
--- a/packages/fullstack/examples/axum-streaming/Cargo.toml
+++ b/packages/fullstack/examples/streaming/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "axum-streaming"
+name = "fullstack-streaming-example"
 version = "0.1.0"
 edition = "2021"
 publish = false
diff --git a/packages/fullstack/examples/axum-streaming/src/main.rs b/packages/fullstack/examples/streaming/src/main.rs
similarity index 100%
rename from packages/fullstack/examples/axum-streaming/src/main.rs
rename to packages/fullstack/examples/streaming/src/main.rs