Merge branch 'master' of https://github.com/DioxusLabs/dioxus into rusty-events

 Conflicts:

	packages/tui/tests/events.rs

packages/router/Cargo.toml

@@ -11,9 +11,7 @@ keywords = ["dom", "ui", "gui", "react", "wasm"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dioxus-core = { path = "../core", version = "^0.2.1", default-features = false }
-dioxus-html = { path = "../html", version = "^0.2.1", default-features = false }
-dioxus-core-macro = { path = "../core-macro", version = "^0.2.1" }
+dioxus = { path = "../rsx-prelude", version = "^0.1.0",  package = "rsx-prelude" }
 futures-channel = "0.3.21"
 url = { version = "2.2.2", default-features = false }
 
@@ -44,6 +42,7 @@ default = ["query"]
 web = ["web-sys", "gloo-events", "js-sys", "wasm-bindgen"]
 query = ["serde", "serde_urlencoded"]
 wasm_test = []
+hot-reload = ["dioxus/hot-reload"]
 
 [dev-dependencies]
 console_error_panic_hook = "0.1.7"

packages/router/examples/simple.rs

@@ -1,8 +1,6 @@
 #![allow(non_snake_case)]
 
-use dioxus_core::prelude::*;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
+use dioxus::prelude::*;
 use dioxus_router::*;
 
 fn main() {

packages/router/src/components/link.rs

@@ -1,10 +1,7 @@
 use std::sync::Arc;
 
 use crate::{use_route, RouterCore};
-use dioxus_core as dioxus;
-use dioxus_core::prelude::*;
-use dioxus_core_macro::{format_args_f, rsx, Props};
-use dioxus_html as dioxus_elements;
+use dioxus::prelude::*;
 
 /// Props for the [`Link`](struct.Link.html) component.
 #[derive(Props)]

packages/router/src/components/redirect.rs

@@ -1,6 +1,4 @@
-use dioxus_core as dioxus;
-use dioxus_core::prelude::*;
-use dioxus_core_macro::Props;
+use dioxus::prelude::*;
 
 use crate::use_router;
 

packages/router/src/components/route.rs

@@ -1,11 +1,6 @@
+use dioxus::prelude::*;
 use std::sync::Arc;
 
-use dioxus_core as dioxus;
-use dioxus_core::prelude::*;
-use dioxus_core_macro::Props;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
-
 use crate::{RouteContext, RouterCore};
 
 /// Props for the [`Route`](struct.Route.html) component.

packages/router/src/components/router.rs

@@ -1,9 +1,6 @@
 use crate::ParsedRoute;
 use crate::{cfg::RouterCfg, RouteEvent, RouterCore};
-use dioxus_core as dioxus;
-use dioxus_core::prelude::*;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
+use dioxus::prelude::*;
 use futures_util::stream::StreamExt;
 use std::sync::Arc;
 

packages/router/src/hooks/use_route.rs

@@ -1,5 +1,5 @@
 use crate::{ParsedRoute, RouteContext, RouterCore, RouterService};
-use dioxus_core::{ScopeId, ScopeState};
+use dioxus::core::{ScopeId, ScopeState};
 use std::{borrow::Cow, str::FromStr, sync::Arc};
 use url::Url;
 

packages/router/src/hooks/use_router.rs

@@ -1,5 +1,5 @@
 use crate::RouterService;
-use dioxus_core::ScopeState;
+use dioxus::core::ScopeState;
 
 /// This hook provides access to the `RouterService` for the app.
 pub fn use_router(cx: &ScopeState) -> &RouterService {

packages/router/src/service.rs

@@ -2,7 +2,7 @@
 // does each window have its own router? probably, lol
 
 use crate::cfg::RouterCfg;
-use dioxus_core::ScopeId;
+use dioxus::core::ScopeId;
 use futures_channel::mpsc::UnboundedSender;
 use std::any::Any;
 use std::{

packages/router/tests/ssr_router.rs

@@ -1,8 +1,6 @@
 #![allow(non_snake_case)]
 
-use dioxus_core::prelude::*;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
+use dioxus::prelude::*;
 use dioxus_router::*;
 
 #[test]

packages/router/tests/web_router.rs

@@ -1,9 +1,7 @@
 #![cfg(target_arch = "wasm32")]
 #![allow(non_snake_case)]
 
-use dioxus_core::prelude::*;
-use dioxus_core_macro::*;
-use dioxus_html as dioxus_elements;
+use dioxus::prelude::*;
 use dioxus_router::*;
 use gloo_utils::document;
 use wasm_bindgen_test::*;