make the root component take no arguments

packages/core-macro/src/component_body/utils.rs

@@ -1,6 +1,5 @@
 use crate::component_body::ComponentBody;
 use quote::ToTokens;
-use syn::{parse_quote, Path};
 
 /// The output produced by a deserializer.
 ///

packages/core/Cargo.toml

@@ -33,7 +33,7 @@ serde = { version = "1", features = ["derive"], optional = true }
 [dev-dependencies]
 tokio = { workspace = true, features = ["full"] }
 dioxus = { workspace = true }
-dioxus-core = { workspace = true, features = ["internal-testing"] }
+dioxus-core = { workspace = true }
 dioxus-html = { workspace = true, features = ["serialize"] }
 pretty_assertions = "1.3.0"
 rand = "0.8.5"
@@ -43,4 +43,3 @@ trybuild = "1.0"
 [features]
 default = []
 serialize = ["serde"]
-internal-testing = []

packages/core/README.md

@@ -38,7 +38,7 @@ First, start with your app:
 use dioxus::prelude::*;
 
 // First, declare a root component
-fn app(cx: Scope) -> Element {
+fn app() -> Element {
     cx.render(rsx!{
         div { "hello world" }
     })

packages/core/compile_tests/props_safety.rs

@@ -2,7 +2,7 @@ use dioxus::prelude::*;
 
 fn main() {}
 
-fn app(cx: Scope) -> Element {
+fn app() -> Element {
     let count: &RefCell<Vec<Element>> = cx.use_hook(|| RefCell::new(Vec::new()));
 
     render! {

packages/core/compile_tests/props_safety.stderr

@@ -1,7 +1,7 @@
 error[E0521]: borrowed data escapes outside of function
   --> compile_tests/props_safety.rs:8:5
    |
-5  |   fn app(cx: Scope) -> Element {
+5  |   fn app() -> Element {
    |          --
    |          |
    |          `cx` is a reference that is only valid in the function body

packages/core/compile_tests/props_safety_temporary_values.rs

@@ -2,7 +2,7 @@ use dioxus::prelude::*;
 
 fn main() {}
 
-fn app(cx: Scope) -> Element {
+fn app() -> Element {
     let count = vec![1, 2, 3];
 
     render! {

packages/core/src/fragment.rs

@@ -62,7 +62,7 @@ impl<const A: bool> FragmentBuilder<A> {
 /// ## Example
 ///
 /// ```rust, ignore
-/// fn App(cx: Scope) -> Element {
+/// fn App() -> Element {
 ///     cx.render(rsx!{
 ///         CustomCard {
 ///             h1 {}

packages/core/src/runtime.rs

@@ -115,7 +115,7 @@ impl Runtime {
 ///     let virtual_dom = VirtualDom::new(app);
 /// }
 ///
-/// fn app(cx: Scope) -> Element {
+/// fn app() -> Element {
 ///     render!{ Component { runtime: Runtime::current().unwrap() } }
 /// }
 ///

packages/core/src/virtual_dom.rs

@@ -88,7 +88,7 @@ use std::{any::Any, cell::Cell, collections::BTreeSet, future::Future, rc::Rc};
 ///
 /// ```rust
 /// # use dioxus::prelude::*;
-/// # fn App(cx: Scope) -> Element { cx.render(rsx! { div {} }) }
+/// # fn App() -> Element { cx.render(rsx! { div {} }) }
 ///
 /// let mut vdom = VirtualDom::new(App);
 /// let edits = vdom.rebuild();
@@ -127,7 +127,7 @@ use std::{any::Any, cell::Cell, collections::BTreeSet, future::Future, rc::Rc};
 /// Putting everything together, you can build an event loop around Dioxus by using the methods outlined above.
 /// ```rust, ignore
 /// #[component]
-/// fn App(cx: Scope) -> Element {
+/// fn App() -> Element {
 ///     cx.render(rsx! {
 ///         div { "Hello World" }
 ///     })
@@ -226,8 +226,8 @@ impl VirtualDom {
     /// ```
     ///
     /// Note: the VirtualDom is not progressed, you must either "run_with_deadline" or use "rebuild" to progress it.
-    pub fn new(app: fn(()) -> Element) -> Self {
+    pub fn new(app: fn() -> Element) -> Self {
-        Self::new_with_props(app, ())
+        Self::new_with_props(|app| app(), app)
     }
 
     /// Create a new VirtualDom with the given properties for the root component.
@@ -563,7 +563,6 @@ impl VirtualDom {
         to.append_children(ElementId(0), m);
     }
 
-    #[cfg(features = "internal-testing")]
     /// [`VirtualDom::rebuild`] to a vector of mutations for testing purposes
     pub fn rebuild_to_vec(&mut self) -> MutationsVec {
         let mut mutations = MutationsVec::default();
@@ -590,7 +589,6 @@ impl VirtualDom {
         }
     }
 
-    #[cfg(features = "internal-testing")]
     /// [`Self::render_immediate`] to a vector of mutations for testing purposes
     pub fn render_immediate_to_vec(&mut self) -> MutationsVec {
         let mut mutations = MutationsVec::default();
@@ -662,7 +660,6 @@ impl VirtualDom {
         }
     }
 
-    #[cfg(features = "internal-testing")]
     /// [`Self::render_with_deadline`] to a vector of mutations for testing purposes
     pub async fn render_with_deadline_to_vec(
         &mut self,

packages/core/tests/bubble_error.rs

@@ -2,7 +2,7 @@
 
 use dioxus::prelude::*;
 
-fn app(cx: Scope) -> Element {
+fn app() -> Element {
     let raw = match generation() % 2 {
         0 => "123.123",
         1 => "123.123.123",

packages/core/tests/context_api.rs

@@ -3,7 +3,7 @@ use dioxus::prelude::*;
 
 #[test]
 fn state_shares() {
-    fn app(cx: Scope) -> Element {
+    fn app() -> Element {
         cx.provide_context(generation() as i32);
 
         render!(child_1 {})

packages/core/tests/create_fragments.rs

@@ -6,7 +6,7 @@ use dioxus_core::ElementId;
 
 #[test]
 fn empty_fragment_creates_nothing() {
-    fn app(cx: Scope) -> Element {
+    fn app() -> Element {
         render!(())
     }
 
@@ -66,7 +66,7 @@ fn fragments_nested() {
 
 #[test]
 fn fragments_across_components() {
-    fn app(cx: Scope) -> Element {
+    fn app() -> Element {
         render! {
             demo_child {}
             demo_child {}
@@ -88,7 +88,7 @@ fn fragments_across_components() {
 
 #[test]
 fn list_fragments() {
-    fn app(cx: Scope) -> Element {
+    fn app() -> Element {
         render!(
             h1 { "hello" }
             (0..6).map(|f| render!( span { "{f}" }))

packages/core/tests/create_lists.rs

@@ -8,7 +8,7 @@ use dioxus_core::ElementId;
 // In Dioxus, we memoize the render! body and simplify it down to a few template loads
 //
 // Also note that the IDs increase linearly. This lets us drive a vec on the renderer for O(1) re-indexing
-fn app(cx: Scope) -> Element {
+fn app() -> Element {
     render! {
         div {
             (0..3).map(|i| render! {

packages/core/tests/create_passthru.rs

@@ -6,7 +6,7 @@ use dioxus_core::ElementId;
 #[test]
 fn nested_passthru_creates() {
     #[component]
-    fn App(cx: Scope) -> Element {
+    fn App() -> Element {
         render! {
             PassThru {
                 PassThru {
@@ -39,7 +39,7 @@ fn nested_passthru_creates() {
 #[test]
 fn nested_passthru_creates_add() {
     #[component]
-    fn App(cx: Scope) -> Element {
+    fn App() -> Element {
         render! {
             ChildComp {
                 "1"
@@ -81,7 +81,7 @@ fn nested_passthru_creates_add() {
 #[test]
 fn dynamic_node_as_root() {
     #[component]
-    fn App(cx: Scope) -> Element {
+    fn App() -> Element {
         let a = 123;
         let b = 456;
         render! { "{a}", "{b}" }

packages/core/tests/diff_component.rs

@@ -7,7 +7,7 @@ use dioxus::prelude::*;
 /// different pointers
 #[test]
 fn component_swap() {
-    fn app(cx: Scope) -> Element {
+    fn app() -> Element {
         let render_phase = cx.use_hook(|| 0);
 
         *render_phase += 1;

packages/core/tests/diff_element.rs

@@ -4,7 +4,7 @@ use dioxus_core::ElementId;
 
 #[test]
 fn text_diff() {
-    fn app(cx: Scope) -> Element {
+    fn app() -> Element {
         let gen = generation();
         render!( h1 { "hello {gen}" } )
     }
@@ -33,7 +33,7 @@ fn text_diff() {
 
 #[test]
 fn element_swap() {
-    fn app(cx: Scope) -> Element {
+    fn app() -> Element {
         let gen = generation();
 
         match gen % 2 {

packages/core/tests/error_boundary.rs

@@ -8,7 +8,7 @@ fn catches_panic() {
     _ = dom.rebuild_to_vec(&mut dioxus_core::NoOpMutations);
 }
 
-fn app(cx: Scope) -> Element {
+fn app() -> Element {
     render! {
         div {
             h1 { "Title" }

packages/core/tests/event_propagation.rs

@@ -51,7 +51,7 @@ fn events_propagate() {
     assert_eq!(*CLICKS.lock().unwrap(), 3);
 }
 
-fn app(cx: Scope) -> Element {
+fn app() -> Element {
     render! {
         div { onclick: move |_| {
                 println!("top clicked");

packages/core/tests/lifecycle.rs

@@ -41,7 +41,7 @@ fn manual_diffing() {
 #[test]
 fn events_generate() {
     set_event_converter(Box::new(SerializedHtmlEventConverter));
-    fn app(cx: Scope) -> Element {
+    fn app() -> Element {
         let count = cx.use_hook(|| 0);
 
         match *count {
@@ -79,7 +79,7 @@ fn events_generate() {
 
 // #[test]
 // fn components_generate() {
-//     fn app(cx: Scope) -> Element {
+//     fn app() -> Element {
 //         let render_phase = cx.use_hook(|| 0);
 //         *render_phase += 1;
 

packages/core/tests/miri_full_app.rs

@@ -24,7 +24,7 @@ fn miri_rollover() {
 }
 
 #[component]
-fn App(cx: Scope) -> Element {
+fn App() -> Element {
     let mut idx = use_state(cx, || 0);
     let onhover = |_| println!("go!");
 

packages/core/tests/miri_simple.rs

@@ -3,7 +3,7 @@ use dioxus::prelude::*;
 #[test]
 fn app_drops() {
     #[component]
-    fn App(cx: Scope) -> Element {
+    fn App() -> Element {
         render! { div {} }
     }
 
@@ -17,7 +17,7 @@ fn app_drops() {
 #[test]
 fn hooks_drop() {
     #[component]
-    fn App(cx: Scope) -> Element {
+    fn App() -> Element {
         cx.use_hook(|| String::from("asd"));
         cx.use_hook(|| String::from("asd"));
         cx.use_hook(|| String::from("asd"));
@@ -36,7 +36,7 @@ fn hooks_drop() {
 #[test]
 fn contexts_drop() {
     #[component]
-    fn App(cx: Scope) -> Element {
+    fn App() -> Element {
         cx.provide_context(String::from("asd"));
 
         render! {
@@ -61,7 +61,7 @@ fn contexts_drop() {
 #[test]
 fn tasks_drop() {
     #[component]
-    fn App(cx: Scope) -> Element {
+    fn App() -> Element {
         cx.spawn(async {
             // tokio::time::sleep(std::time::Duration::from_millis(100000)).await;
         });
@@ -93,7 +93,7 @@ fn root_props_drop() {
 #[test]
 fn diffing_drops_old() {
     #[component]
-    fn App(cx: Scope) -> Element {
+    fn App() -> Element {
         render! {
             div {
                 match generation() % 2 {

packages/core/tests/miri_stress.rs

@@ -9,7 +9,7 @@ use dioxus::prelude::*;
 /// When miri runs, it'll let us know if we leaked or aliased.
 #[test]
 fn test_memory_leak() {
-    fn app(cx: Scope) -> Element {
+    fn app() -> Element {
         let val = generation();
 
         cx.spawn(async {});
@@ -69,7 +69,7 @@ fn test_memory_leak() {
 
 #[test]
 fn memo_works_properly() {
-    fn app(cx: Scope) -> Element {
+    fn app() -> Element {
         let val = generation();
 
         if val == 2 || val == 4 {
@@ -142,7 +142,7 @@ fn supports_async() {
     use std::time::Duration;
     use tokio::time::sleep;
 
-    fn app(cx: Scope) -> Element {
+    fn app() -> Element {
         let colors = use_state(cx, || vec!["green", "blue", "red"]);
         let padding = use_state(cx, || 10);
 

packages/core/tests/suspense.rs

@@ -19,7 +19,7 @@ fn it_works() {
         });
 }
 
-fn app(cx: Scope) -> Element {
+fn app() -> Element {
     render!(
         div {
             "Waiting for... "

packages/core/tests/task.rs

@@ -8,7 +8,7 @@ async fn it_works() {
 
     static POLL_COUNT: AtomicUsize = AtomicUsize::new(0);
 
-    fn app(cx: Scope) -> Element {
+    fn app() -> Element {
         cx.use_hook(|| {
             cx.spawn(async {
                 for x in 0..10 {

packages/desktop/src/lib.rs

@@ -76,8 +76,8 @@ use wry::{application::window::WindowId, webview::WebContext};
 ///     })
 /// }
 /// ```
-pub fn launch(root: Component) {
+pub fn launch(root: fn() -> Element) {
-    launch_with_props(root, (), Config::default())
+    launch_with_props(|root| root(), root, Config::default())
 }
 
 /// Launch the WebView and run the event loop, with configuration.

packages/web/src/lib.rs

@@ -105,8 +105,12 @@ mod rehydrate;
 ///     render!(div {"hello world"})
 /// }
 /// ```
-pub fn launch(root_component: fn(()) -> Element) {
+pub fn launch(root_component: fn() -> Element) {
-    launch_with_props(root_component, (), Config::default());
+    launch_with_props(
+        |root_component| root_component(),
+        root_component,
+        Config::default(),
+    );
 }
 
 /// Launch your app and run the event loop, with configuration.