Get more axum stuff upgraded to 0.7

packages/fullstack/examples/axum-auth/Cargo.toml

@@ -31,13 +31,14 @@ serde = "1.0.159"
 execute = "0.2.12"
 anyhow = "1.0.71"
 
+
 [dependencies.axum_session]
-version = "0.3.0"
+workspace = true
 features = ["sqlite-rustls"]
 optional = true
 
 [dependencies.axum_session_auth]
-version = "0.12.0"
+workspace = true
 features = ["sqlite-rustls"]
 optional = true
 

packages/fullstack/examples/axum-auth/src/main.rs

@@ -44,8 +44,6 @@ fn main() {
                 .await
                 .unwrap();
 
-                //Create the Database table for storing our Session Data.
-                session_store.initiate().await.unwrap();
                 User::create_user_tables(&pool).await;
 
                 // build our application with some routes
@@ -67,9 +65,9 @@ fn main() {
 
                 // run it
                 let addr = std::net::SocketAddr::from(([127, 0, 0, 1], 3000));
+                let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
 
-                axum::Server::bind(&addr)
-                    .serve(app.into_make_service())
+                axum::serve(listener, app.into_make_service())
                     .await
                     .unwrap();
             });

packages/fullstack/examples/axum-desktop/src/server.rs

@@ -8,17 +8,19 @@ use dioxus::prelude::*;
 
 #[tokio::main]
 async fn main() {
-    let addr = std::net::SocketAddr::from(([127, 0, 0, 1], 8080));
+    let listener = tokio::net::TcpListener::bind("127.0.0.01:8080")
+        .await
+        .unwrap();
 
     let _ = PostServerData::register_explicit();
     let _ = GetServerData::register_explicit();
 
-    axum::Server::bind(&addr)
-        .serve(
-            axum::Router::new()
-                .register_server_fns("")
-                .into_make_service(),
-        )
-        .await
-        .unwrap();
+    axum::serve(
+        listener,
+        axum::Router::new()
+            .register_server_fns("")
+            .into_make_service(),
+    )
+    .await
+    .unwrap();
 }

packages/fullstack/examples/axum-router/Cargo.toml

@@ -7,7 +7,7 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dioxus = { workspace = true, features = ["router"] }
+dioxus = { workspace = true, features = ["fullstack", "router"] }
 axum = { workspace = true, optional = true }
 tokio = {workspace = true, features = ["full"], optional = true }
 serde = { version = "1.0.159", features = ["derive"] }
@@ -16,3 +16,4 @@ serde = { version = "1.0.159", features = ["derive"] }
 default = []
 server = ["axum", "dioxus/axum"]
 web = ["dioxus/web"]
+

packages/fullstack/examples/axum-router/src/main.rs

@@ -7,21 +7,17 @@
 use dioxus::prelude::*;
 
 fn main() {
-    let config = LaunchBuilder::fullstack();
-    #[cfg(feature = "server")]
-    config
-        .incremental(
-            IncrementalRendererConfig::default()
-                .invalidate_after(std::time::Duration::from_secs(120)),
-        )
-        .launch();
+    let cfg = server_only!(dioxus::fullstack::Config::new().incremental(
+        IncrementalRendererConfig::default().invalidate_after(std::time::Duration::from_secs(120)),
+    ));
 
-    #[cfg(not(feature = "server"))]
-    config.launch(|| {
-        rsx! {
-            Router::<Route> {}
-        }
-    });
+    LaunchBuilder::fullstack().with_cfg(cfg).launch(app);
+}
+
+fn app() -> Element {
+    rsx! {
+        Router::<Route> {}
+    }
 }
 
 #[derive(Clone, Routable, Debug, PartialEq, serde::Serialize, serde::Deserialize)]

packages/fullstack/examples/static-hydrated/src/main.rs

@@ -15,7 +15,7 @@ use serde::{Deserialize, Serialize};
 #[tokio::main]
 async fn main() {
     pre_cache_static_routes_with_props(
-        &ServerConfig::new_with_router(
+        &ServeConfig::new_with_router(
             dioxus_fullstack::router::FullstackRouterConfig::<Route>::default(),
         )
         .assets_path("docs")
@@ -37,13 +37,11 @@ fn main() {
     );
 }
 
-#[cfg(not(any(feature = "web", feature = "server")))]
-fn main() {}
-
 #[derive(Clone, Routable, Debug, PartialEq, Serialize, Deserialize)]
 enum Route {
     #[route("/")]
     Home {},
+
     #[route("/blog")]
     Blog,
 }
@@ -72,10 +70,7 @@ fn Home() -> Element {
     let text = use_signal(|| "...".to_string());
 
     rsx! {
-        Link {
-            to: Route::Blog {},
-            "Go to blog"
-        }
+        Link { to: Route::Blog {}, "Go to blog" }
         div {
             h1 { "High-Five counter: {count}" }
             button { onclick: move |_| count += 1, "Up high!" }