Merge remote-tracking branch 'upstream/master' into clean_up_rsx_imports

packages/web/Cargo.toml

@@ -77,7 +77,7 @@ features = [
 [features]
 default = ["panic_hook"]
 panic_hook = ["console_error_panic_hook"]
-hot_reload = ["dioxus-rsx-interpreter", "web-sys/WebSocket", "web-sys/Location", "web-sys/MessageEvent", "web-sys/console", "serde_json"]
+hot-reload = ["dioxus-rsx-interpreter", "web-sys/WebSocket", "web-sys/Location", "web-sys/MessageEvent", "web-sys/console", "serde_json"]
 
 [dev-dependencies]
 dioxus = { path = "../rsx-prelude", version = "^0.1.0",  package = "rsx-prelude" }

packages/web/src/lib.rs

@@ -216,7 +216,7 @@ pub async fn run_with_props<T: 'static + Send>(root: Component<T>, root_props: T
 
     let mut work_loop = ric_raf::RafLoop::new();
 
-    #[cfg(feature = "hot_reload")]
+    #[cfg(feature = "hot-reload")]
     {
         use dioxus_rsx_interpreter::error::Error;
         use dioxus_rsx_interpreter::{ErrorHandler, SetManyRsxMessage, RSX_CONTEXT};