fix(deps): migrate to Dioxus v0.7.0-rc.3

Author: DanielleHuisman

.github/workflows/ci.yml

@@ -34,13 +34,13 @@ jobs:
               run: cargo binstall -y --force cargo-deny cargo-machete cargo-sort
 
             - name: Lint
-              run: cargo clippy --locked
+              run: cargo clippy --all-features --all-targets --locked
 
             - name: Check dependencies
               run: cargo deny check
 
             - name: Check unused dependencies
-              run: cargo machete
+              run: cargo machete --with-metadata
 
             - name: Check manifest formatting
               run: cargo sort --workspace --check

.pre-commit-config.yaml

@@ -12,6 +12,7 @@ repos:
       hooks:
           - id: fmt
           - id: clippy
+            args: ['--all-targets', '--all-features', '--', '-D', 'warnings']
 
     - repo: https://github.com/EmbarkStudios/cargo-deny
       rev: 0.18.5
@@ -28,6 +29,7 @@ repos:
             name: cargo-machete
             language: rust
             entry: cargo machete
+            args: ['--with-metadata']
             types: [file, toml]
             files: Cargo\.(toml|lock)
             pass_filenames: false

Cargo.lock

@@ -33,15 +33,16 @@ actix-files = "0.6.6"
 actix-session = "0.11.0"
 actix-utils = "3.0.1"
 actix-web = "4.9.0"
+anyhow = "1.0.100"
 async-std = "1.13.0"
 async-trait = "0.1.83"
 axum = "0.8.1"
 bon = "3.3.2"
 chrono = "0.4.39"
 console_error_panic_hook = "0.1.2"
-dioxus = "0.7.0-rc.0"
-dioxus-html = "0.7.0-rc.0"
-dioxus-server = "0.7.0-rc.0"
+dioxus = "0.7.0-rc.3"
+dioxus-html = "0.7.0-rc.3"
+dioxus-server = "0.7.0-rc.3"
 futures = "0.3.31"
 http = "1.2.0"
 leptos = "0.8.3"

Cargo.toml

@@ -15,14 +15,14 @@ fn main() {
 #[cfg(feature = "server")]
 #[tokio::main]
 async fn main() {
-    use std::{env, sync::Arc};
+    use std::sync::Arc;
 
-    use axum::Router;
+    use axum::{Extension, Router};
     use dioxus::{
         cli_config::fullstack_address_or_localhost,
         prelude::{DioxusRouterExt, *},
     };
-    use shield::{ErasedMethod, Method, Shield, ShieldOptions};
+    use shield::{Shield, ShieldOptions};
     use shield_bootstrap::BootstrapDioxusStyle;
     use shield_dioxus_axum::{AuthRoutes, AxumDioxusIntegration, ShieldLayer};
     use shield_memory::{MemoryStorage, User};
@@ -66,15 +66,14 @@ async fn main() {
 
     // Initialize router
     let router = Router::new()
-        .nest("/api/auth", AuthRoutes::router::<User, ()>())
+        .nest("/api/auth", AuthRoutes::new(shield).router())
         .serve_dioxus_application(
-            ServeConfig::builder()
-                .context(AxumDioxusIntegration::<User>::default().context())
-                .context(BootstrapDioxusStyle::default().context())
-                .build()
-                .unwrap(),
+            ServeConfig::new().context(BootstrapDioxusStyle::default().context()),
             App,
         )
+        .layer(Extension(
+            AxumDioxusIntegration::<User>::default().context(),
+        ))
         .layer(shield_layer)
         .layer(session_layer);
 

examples/dioxus-axum/src/main.rs

@@ -17,12 +17,12 @@ fn main() {
 async fn main() {
     use std::{env, sync::Arc};
 
-    use axum::Router;
+    use axum::{Extension, Router};
     use dioxus::{
         cli_config::fullstack_address_or_localhost,
         prelude::{DioxusRouterExt, *},
     };
-    use shield::{ErasedMethod, Method, Shield, ShieldOptions};
+    use shield::{Shield, ShieldOptions};
     use shield_bootstrap::BootstrapDioxusStyle;
     use shield_dioxus_axum::{AxumDioxusIntegration, ShieldLayer};
     use shield_memory::{MemoryStorage, User};
@@ -69,13 +69,12 @@ async fn main() {
     // Initialize router
     let router = Router::new()
         .serve_dioxus_application(
-            ServeConfig::builder()
-                .context(AxumDioxusIntegration::<User>::default().context())
-                .context(BootstrapDioxusStyle::default().context())
-                .build()
-                .unwrap(),
+            ServeConfig::new().context(BootstrapDioxusStyle::default().context()),
             App,
         )
+        .layer(Extension(
+            AxumDioxusIntegration::<User>::default().context(),
+        ))
         .layer(shield_layer)
         .layer(session_layer);
 

examples/workos/src/main.rs

@@ -13,12 +13,13 @@ use utoipa::{
     },
 };
 
+#[cfg(feature = "utoipa")]
+use crate::path::ActionPathParams;
 use crate::{
     action::{ActionForms, ActionMethodForm, ActionProviderForm},
     error::{ActionError, MethodError, ProviderError, SessionError, ShieldError},
     method::ErasedMethod,
     options::ShieldOptions,
-    path::ActionPathParams,
     request::Request,
     response::ResponseType,
     session::Session,

packages/core/shield/src/shield.rs

@@ -13,7 +13,7 @@ default = []
 utoipa = ["shield-axum/utoipa"]
 
 [dependencies]
-async-trait.workspace = true
+anyhow.workspace = true
 dioxus-server.workspace = true
 shield.workspace = true
 shield-axum.workspace = true

packages/integrations/shield-dioxus-axum/Cargo.toml

@@ -1,9 +1,8 @@
 use std::marker::PhantomData;
 
-use async_trait::async_trait;
-use dioxus_server::extract;
-
-use shield::{Session, ShieldDyn, User};
+use anyhow::{Result, anyhow};
+use dioxus_server::http::Extensions;
+use shield::{Session, Shield, ShieldDyn, User};
 use shield_axum::{ExtractSession, ExtractShield};
 use shield_dioxus::{DioxusIntegration, DioxusIntegrationDyn};
 
@@ -21,19 +20,24 @@ impl<U: User> Default for AxumDioxusIntegration<U> {
     }
 }
 
-#[async_trait]
 impl<U: User + Clone + 'static> DioxusIntegration for AxumDioxusIntegration<U> {
-    async fn extract_shield(&self) -> ShieldDyn {
-        let ExtractShield(shield) = extract::<ExtractShield<U>, _>()
-            .await
-            .expect("Shield should be extracted");
-
-        ShieldDyn::new(shield)
+    fn extract_shield(&self, extensions: &Extensions) -> Result<ShieldDyn> {
+        let ExtractShield(shield) = extensions
+            .get::<Shield<U>>()
+            .cloned()
+            .map(ExtractShield)
+            .ok_or_else(|| anyhow!("Shield should be extracted"))?;
+
+        Ok(ShieldDyn::new(shield))
     }
 
-    async fn extract_session(&self) -> Session {
-        let ExtractSession(session) = extract().await.expect("Session should be extracted");
+    fn extract_session(&self, extensions: &Extensions) -> Result<Session> {
+        let ExtractSession(session) = extensions
+            .get::<Session>()
+            .cloned()
+            .map(ExtractSession)
+            .ok_or_else(|| anyhow!("Session should be extracted"))?;
 
-        session
+        Ok(session)
     }
 }

packages/integrations/shield-dioxus-axum/src/integration.rs

@@ -12,7 +12,7 @@ version.workspace = true
 server = ["dioxus/server"]
 
 [dependencies]
-async-trait.workspace = true
+anyhow.workspace = true
 dioxus = { workspace = true, features = ["fullstack", "router"] }
 serde_json.workspace = true
 shield.workspace = true