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

This commit is contained in:
Evan Almloff committed 2022-06-26 07:22:55 -05:00
commit 041f474329
14 files changed
+19 -19

No files matched your search

+1 -1
View File
@@ -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"]
+2 -2
View File
@@ -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,