Merge branch 'upstream' into return-from-js

packages/web/Cargo.toml

@@ -31,6 +31,7 @@ smallstr = "0.2.0"
 futures-channel = "0.3.21"
 serde_json = { version = "1.0" }
 serde = { version = "1.0" }
+serde-wasm-bindgen = "0.4.5"
 
 [dependencies.web-sys]
 version = "0.3.56"
@@ -78,9 +79,8 @@ features = [
 ]
 
 [features]
-default = ["panic_hook", "hydrate"]
+default = ["panic_hook"]
 panic_hook = ["console_error_panic_hook"]
-hot-reload = ["dioxus/hot-reload"]
 hydrate = []
 
 [dev-dependencies]
@@ -88,4 +88,4 @@ dioxus = { path = "../dioxus" }
 wasm-bindgen-test = "0.3.29"
 dioxus-ssr = { path = "../ssr" }
 wasm-logger = "0.2.0"
-dioxus-web = { path = "." }
+dioxus-web = { path = "." }