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

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"