Upgrade to axum 0.7, drop 3rd party adapters

packages/dioxus/Cargo.toml

@@ -50,16 +50,10 @@ web = ["dioxus-web", "dioxus-fullstack?/web", "dioxus-config-macro/web", "dioxus
 ssr = ["dioxus-ssr", "dioxus-router?/ssr", "dioxus-config-macro/ssr"]
 liveview = ["dioxus-liveview", "dioxus-config-macro/liveview", "dioxus-router?/liveview"]
 axum = ["dioxus-fullstack?/axum", "ssr", "dioxus-liveview?/axum"]
-salvo = ["dioxus-fullstack?/salvo", "ssr", "dioxus-liveview?/salvo"]
-warp = ["dioxus-fullstack?/warp", "ssr", "dioxus-liveview?/warp"]
-rocket = ["dioxus-liveview?/rocket"]
 tui = ["dioxus-tui", "dioxus-config-macro/tui"]
 # This feature just disables the no-renderer-enabled warning
 third-party-renderer = []
 
-# This feature enables some nightly flags that make it more clear what structs/methods are available in each feature
-nightly-doc = []
-
 [dev-dependencies]
 futures-util = { workspace = true }
 tracing = { workspace = true }

packages/dioxus/build.rs

@@ -5,8 +5,8 @@ fn main() {
             return;
         }
 
-        let liveview_renderers = ["liveview", "axum", "salvo", "warp", "rocket"];
-        let fullstack_renderers = ["axum", "salvo", "warp"];
+        let liveview_renderers = ["liveview", "axum"];
+        let fullstack_renderers = ["axum"];
         let client_renderers = ["desktop", "mobile", "web", "tui"];
         let client_renderer_selected = client_renderers
             .iter()

packages/dioxus/src/launch.rs

@@ -38,7 +38,7 @@ impl LaunchBuilder {
 
     /// Launch your web application.
     #[cfg(feature = "web")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "web")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "web")))]
     pub fn web() -> LaunchBuilder<dioxus_web::Config, UnsendContext> {
         LaunchBuilder {
             launch_fn: dioxus_web::launch::launch,
@@ -49,7 +49,7 @@ impl LaunchBuilder {
 
     /// Launch your desktop application.
     #[cfg(feature = "desktop")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "desktop")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "desktop")))]
     pub fn desktop() -> LaunchBuilder<dioxus_desktop::Config, UnsendContext> {
         LaunchBuilder {
             launch_fn: dioxus_desktop::launch::launch,
@@ -60,7 +60,7 @@ impl LaunchBuilder {
 
     /// Launch your fullstack application.
     #[cfg(feature = "fullstack")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "fullstack")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "fullstack")))]
     pub fn fullstack() -> LaunchBuilder<dioxus_fullstack::Config, SendContext> {
         LaunchBuilder {
             launch_fn: dioxus_fullstack::launch::launch,
@@ -71,7 +71,7 @@ impl LaunchBuilder {
 
     /// Launch your fullstack application.
     #[cfg(feature = "mobile")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "mobile")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "mobile")))]
     pub fn mobile() -> LaunchBuilder<dioxus_mobile::Config, UnsendContext> {
         LaunchBuilder {
             launch_fn: dioxus_mobile::launch::launch,
@@ -81,7 +81,7 @@ impl LaunchBuilder {
     }
 
     #[cfg(feature = "tui")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "tui")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "tui")))]
     /// Launch your tui application
     pub fn tui() -> LaunchBuilder<dioxus_tui::Config, UnsendContext> {
         LaunchBuilder {
@@ -232,28 +232,28 @@ pub fn launch(app: fn() -> Element) {
 }
 
 #[cfg(feature = "web")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "web")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "web")))]
 /// Launch your web application without any additional configuration. See [`LaunchBuilder`] for more options.
 pub fn launch_web(app: fn() -> Element) {
     LaunchBuilder::web().launch(app)
 }
 
 #[cfg(feature = "desktop")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "desktop")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "desktop")))]
 /// Launch your desktop application without any additional configuration. See [`LaunchBuilder`] for more options.
 pub fn launch_desktop(app: fn() -> Element) {
     LaunchBuilder::desktop().launch(app)
 }
 
 #[cfg(feature = "fullstack")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "fullstack")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "fullstack")))]
 /// Launch your fullstack application without any additional configuration. See [`LaunchBuilder`] for more options.
 pub fn launch_fullstack(app: fn() -> Element) {
     LaunchBuilder::fullstack().launch(app)
 }
 
 #[cfg(feature = "tui")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "tui")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "tui")))]
 /// Launch your tui application without any additional configuration. See [`LaunchBuilder`] for more options.
 pub fn launch_tui(app: fn() -> Element) {
     LaunchBuilder::tui().launch(app)

packages/dioxus/src/lib.rs

@@ -1,114 +1,115 @@
 #![doc = include_str!("../README.md")]
 #![doc(html_logo_url = "https://avatars.githubusercontent.com/u/79236386")]
 #![doc(html_favicon_url = "https://avatars.githubusercontent.com/u/79236386")]
-#![cfg_attr(any(docsrs, feature = "nightly-doc"), feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 pub use dioxus_core;
 
 #[cfg(feature = "launch")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "launch")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "launch")))]
 mod launch;
 
 #[cfg(feature = "hooks")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "hooks")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "hooks")))]
 pub use dioxus_hooks as hooks;
 
 #[cfg(feature = "signals")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "signals")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "signals")))]
 pub use dioxus_signals as signals;
 
 pub mod events {
     #[cfg(feature = "html")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "html")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "html")))]
     pub use dioxus_html::prelude::*;
 }
 
 #[cfg(feature = "html")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "html")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "html")))]
 pub use dioxus_html as html;
 
 #[cfg(feature = "macro")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "macro")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "macro")))]
 pub use dioxus_core_macro as core_macro;
 
 pub mod prelude {
     #[cfg(feature = "launch")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "launch")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "launch")))]
     pub use crate::launch::*;
 
     #[cfg(feature = "hooks")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "hooks")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "hooks")))]
     pub use crate::hooks::*;
 
     #[cfg(feature = "signals")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "signals")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "signals")))]
     pub use dioxus_signals::*;
 
     pub use dioxus_core::prelude::*;
 
     #[cfg(feature = "macro")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "macro")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "macro")))]
     #[allow(deprecated)]
     pub use dioxus_core_macro::{component, format_args_f, inline_props, render, rsx, Props};
 
     #[cfg(feature = "launch")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "launch")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "launch")))]
     pub use dioxus_config_macro::*;
 
     #[cfg(feature = "html")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "html")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "html")))]
     pub use dioxus_html as dioxus_elements;
 
     #[cfg(feature = "html")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "html")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "html")))]
     pub use dioxus_elements::{prelude::*, GlobalAttributes, SvgAttributes};
 
     #[cfg(all(not(target_arch = "wasm32"), feature = "hot-reload"))]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "hot-reload")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "hot-reload")))]
     pub use dioxus_hot_reload::{self, hot_reload_init};
 
     pub use dioxus_core;
 
     #[cfg(feature = "fullstack")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "fullstack")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "fullstack")))]
     pub use dioxus_fullstack::prelude::*;
 
     #[cfg(feature = "router")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "router")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "router")))]
     pub use dioxus_router;
+
     #[cfg(feature = "router")]
-    #[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "router")))]
+    #[cfg_attr(docsrs, doc(cfg(feature = "router")))]
     pub use dioxus_router::prelude::*;
 }
 
 #[cfg(feature = "web")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "web")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "web")))]
 pub use dioxus_web as web;
 
 #[cfg(feature = "router")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "router")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "router")))]
 pub use dioxus_router as router;
 
 #[cfg(feature = "fullstack")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "fullstack")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "fullstack")))]
 pub use dioxus_fullstack as fullstack;
 
 #[cfg(feature = "desktop")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "desktop")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "desktop")))]
 pub use dioxus_desktop as desktop;
 
 #[cfg(feature = "mobile")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "mobile")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "mobile")))]
 pub use dioxus_desktop as mobile;
 
 #[cfg(feature = "liveview")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "liveview")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "liveview")))]
 pub use dioxus_liveview as liveview;
 
 #[cfg(feature = "tui")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "tui")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "tui")))]
 pub use dioxus_tui as tui;
 
 #[cfg(feature = "ssr")]
-#[cfg_attr(any(docsrs, feature = "nightly-doc"), doc(cfg(feature = "ssr")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "ssr")))]
 pub use dioxus_ssr as ssr;