Merge branch 'master' into intigrate-collect-assets

packages/router/src/components/history_buttons.rs

@@ -1,5 +1,5 @@
 use dioxus::prelude::*;
-use log::error;
+use tracing::error;
 
 use crate::utils::use_router_internal::use_router_internal;
 
@@ -30,13 +30,14 @@ pub struct HistoryButtonProps<'a> {
 ///     Index {},
 /// }
 ///
+/// #[component]
 /// fn App(cx: Scope) -> Element {
 ///     render! {
 ///         Router::<Route> {}
 ///     }
 /// }
 ///
-/// #[inline_props]
+/// #[component]
 /// fn Index(cx: Scope) -> Element {
 ///     render! {
 ///         GoBackButton {
@@ -52,7 +53,7 @@ pub struct HistoryButtonProps<'a> {
 /// #     r#"<button disabled="true" dioxus-prevent-default="onclick">go back</button>"#
 /// # );
 /// ```
-#[allow(non_snake_case)]
+#[component]
 pub fn GoBackButton<'a>(cx: Scope<'a, HistoryButtonProps<'a>>) -> Element {
     let HistoryButtonProps { children } = cx.props;
 
@@ -101,13 +102,14 @@ pub fn GoBackButton<'a>(cx: Scope<'a, HistoryButtonProps<'a>>) -> Element {
 ///     Index {},
 /// }
 ///
+/// #[component]
 /// fn App(cx: Scope) -> Element {
 ///     render! {
 ///         Router::<Route> {}
 ///     }
 /// }
 ///
-/// #[inline_props]
+/// #[component]
 /// fn Index(cx: Scope) -> Element {
 ///     render! {
 ///         GoForwardButton {
@@ -123,7 +125,7 @@ pub fn GoBackButton<'a>(cx: Scope<'a, HistoryButtonProps<'a>>) -> Element {
 /// #     r#"<button disabled="true" dioxus-prevent-default="onclick">go forward</button>"#
 /// # );
 /// ```
-#[allow(non_snake_case)]
+#[component]
 pub fn GoForwardButton<'a>(cx: Scope<'a, HistoryButtonProps<'a>>) -> Element {
     let HistoryButtonProps { children } = cx.props;
 

packages/router/src/components/link.rs

@@ -1,9 +1,11 @@
+#![allow(clippy::type_complexity)]
+
 use std::any::Any;
 use std::fmt::Debug;
 use std::rc::Rc;
 
 use dioxus::prelude::*;
-use log::error;
+use tracing::error;
 
 use crate::navigation::NavigationTarget;
 use crate::prelude::Routable;
@@ -133,13 +135,14 @@ impl Debug for LinkProps<'_> {
 ///     Index {},
 /// }
 ///
+/// #[component]
 /// fn App(cx: Scope) -> Element {
 ///     render! {
 ///         Router::<Route> {}
 ///     }
 /// }
 ///
-/// #[inline_props]
+/// #[component]
 /// fn Index(cx: Scope) -> Element {
 ///     render! {
 ///         render! {

packages/router/src/components/outlet.rs

@@ -29,7 +29,7 @@ use dioxus::prelude::*;
 ///     Index {},
 /// }
 ///
-/// #[inline_props]
+/// #[component]
 /// fn Index(cx: Scope) -> Element {
 ///     render! {
 ///         div {
@@ -38,7 +38,7 @@ use dioxus::prelude::*;
 ///     }
 /// }
 ///
-/// #[inline_props]
+/// #[component]
 /// fn Wrapper(cx: Scope) -> Element {
 ///     render! {
 ///         h1 { "App" }
@@ -46,7 +46,7 @@ use dioxus::prelude::*;
 ///     }
 /// }
 ///
-/// #[inline_props]
+/// #[component]
 /// fn Child(cx: Scope) -> Element {
 ///     render! {
 ///         p {
@@ -55,6 +55,7 @@ use dioxus::prelude::*;
 ///     }
 /// }
 ///
+/// # #[component]
 /// # fn App(cx: Scope) -> Element {
 /// #     render! {
 /// #         Router::<Route> {