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

Cargo.toml

@@ -49,7 +49,7 @@ desktop = ["dioxus-desktop"]
 router = ["dioxus-router"]
 tui = ["dioxus-tui"]
 liveview = ["dioxus-liveview"]
-hot_reload = ["dioxus-core-macro/hot_reload", "dioxus-rsx-interpreter", "dioxus-desktop?/hot_reload", "dioxus-web?/hot_reload", "dioxus-router?/hot_reload"]
+hot-reload = ["dioxus-core-macro/hot-reload", "dioxus-rsx-interpreter", "dioxus-desktop?/hot-reload", "dioxus-web?/hot-reload", "dioxus-router?/hot-reload"]
 native-core = ["dioxus-native-core", "dioxus-native-core-macro"]
 
 [workspace]

docs/reference/src/guide/hot_reloading.md

@@ -5,9 +5,9 @@
 
 # Setup
 Install [dioxus-cli](https://github.com/DioxusLabs/cli).
-Enable the hot_reload feature on dioxus:
+Enable the hot-reload feature on dioxus:
 ```toml
-dioxus = { version = "*", features = ["web", "hot_reload"] }
+dioxus = { version = "*", features = ["web", "hot-reload"] }
 ```
 
 # Usage

packages/core-macro/Cargo.toml

@@ -28,4 +28,4 @@ trybuild = "1.0"
 
 [features]
 default = []
-hot_reload = ["dioxus-rsx-interpreter"]
+hot-reload = ["dioxus-rsx-interpreter"]

packages/core-macro/src/lib.rs

@@ -34,12 +34,12 @@ pub fn derive_typed_builder(input: proc_macro::TokenStream) -> proc_macro::Token
 /// ```
 #[proc_macro]
 pub fn rsx(s: TokenStream) -> TokenStream {
-    #[cfg(feature = "hot_reload")]
+    #[cfg(feature = "hot-reload")]
     let rsx_text = s.to_string();
     match syn::parse::<rsx::CallBody>(s) {
         Err(err) => err.to_compile_error().into(),
         Ok(body) => {
-            #[cfg(feature = "hot_reload")]
+            #[cfg(feature = "hot-reload")]
             {
                 use dioxus_rsx_interpreter::captuered_context::CapturedContextBuilder;
 
@@ -66,7 +66,7 @@ pub fn rsx(s: TokenStream) -> TokenStream {
                     Err(err) => err.into_compile_error().into(),
                 }
             }
-            #[cfg(not(feature = "hot_reload"))]
+            #[cfg(not(feature = "hot-reload"))]
             body.to_token_stream().into()
         }
     }

packages/desktop/Cargo.toml

@@ -44,7 +44,7 @@ tokio_runtime = ["tokio"]
 fullscreen = ["wry/fullscreen"]
 transparent = ["wry/transparent"]
 tray = ["wry/tray"]
-hot_reload = ["dioxus-rsx-interpreter", "interprocess"]
+hot-reload = ["dioxus-rsx-interpreter", "interprocess"]
 
 [dev-dependencies]
 dioxus-core-macro = { path = "../core-macro" }

packages/desktop/src/controller.rs

@@ -51,7 +51,7 @@ impl DesktopController {
                 dom.base_scope().provide_context(window_context);
 
                 // allow other proccesses to send the new rsx text to the @dioxusin ipc channel and recieve erros on the @dioxusout channel
-                #[cfg(feature = "hot_reload")]
+                #[cfg(feature = "hot-reload")]
                 {
                     use dioxus_rsx_interpreter::{
                         error::Error, ErrorHandler, SetManyRsxMessage, RSX_CONTEXT,

packages/native-core-macro/Cargo.toml

@@ -20,7 +20,7 @@ quote = "1.0"
 dioxus-native-core = { path = "../native-core", version = "^0.2.0" }
 
 [dev-dependencies]
-dioxus = { path = "../rsx-prelude", version = "^0.1.0",  package = "rsx-prelude", features = ["hot_reload"] }
+dioxus = { path = "../rsx-prelude", version = "^0.1.0",  package = "rsx-prelude" }
 
 smallvec = "1.6"
 fxhash = "0.2"

packages/router/Cargo.toml

@@ -42,7 +42,7 @@ default = ["query"]
 web = ["web-sys", "gloo-events", "js-sys", "wasm-bindgen"]
 query = ["serde", "serde_urlencoded"]
 wasm_test = []
-hot_reload = ["dioxus/hot_reload"]
+hot-reload = ["dioxus/hot-reload"]
 
 [dev-dependencies]
 console_error_panic_hook = "0.1.7"

packages/rsx-prelude/Cargo.toml

@@ -19,4 +19,4 @@ dioxus-rsx-interpreter = { path = "../rsx_interpreter", version = "^0.1.0", opti
 dioxus-hooks = { path = "../hooks", version = "^0.2.1" }
 
 [features]
-hot_reload = ["dioxus-core-macro/hot_reload", "dioxus-rsx-interpreter"]
+hot-reload = ["dioxus-core-macro/hot-reload", "dioxus-rsx-interpreter"]

packages/rsx-prelude/src/lib.rs

@@ -12,7 +12,7 @@ pub mod events {
     pub use dioxus_html::{on::*, KeyCode};
 }
 
-#[cfg(feature = "hot_reload")]
+#[cfg(feature = "hot-reload")]
 pub use dioxus_rsx_interpreter as rsx_interpreter;
 
 pub mod prelude {
@@ -22,7 +22,7 @@ pub mod prelude {
     pub use dioxus_elements::{GlobalAttributes, SvgAttributes};
     pub use dioxus_html as dioxus_elements;
 
-    #[cfg(feature = "hot_reload")]
+    #[cfg(feature = "hot-reload")]
     pub use dioxus_rsx_interpreter::{
         captuered_context::{CapturedContext, FormattedArg, IfmtArgs},
         get_line_num, resolve_scope, CodeLocation, RsxContext,

packages/rsx_interpreter/Cargo.toml

@@ -21,4 +21,4 @@ dioxus-hooks = { path = "../hooks"}
 [dev-dependencies]
 dioxus-core-macro = { path = "../core-macro" }
 bumpalo = { version = "3.6", features = ["collections", "boxed"] }
-dioxus = { path = "../rsx-prelude", version = "^0.1.0",  package = "rsx-prelude", features = ["hot_reload"] }
+dioxus = { path = "../rsx-prelude", version = "^0.1.0",  package = "rsx-prelude", features = ["hot-reload"] }

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};

src/lib.rs

@@ -46,7 +46,7 @@ pub mod events {
 
 pub use dioxus_rsx as rsx;
 
-#[cfg(feature = "hot_reload")]
+#[cfg(feature = "hot-reload")]
 pub use dioxus_rsx_interpreter as rsx_interpreter;
 
 pub mod prelude {
@@ -62,7 +62,7 @@ pub mod prelude {
     #[cfg(feature = "fermi")]
     pub use fermi::{use_atom_ref, use_init_atom_root, use_read, use_set, Atom, AtomRef};
 
-    #[cfg(feature = "hot_reload")]
+    #[cfg(feature = "hot-reload")]
     pub use dioxus_rsx_interpreter::{
         captuered_context::{CapturedContext, FormattedArg, IfmtArgs},
         get_line_num, resolve_scope, CodeLocation, RsxContext,