Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 47 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/yew-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ wasm-bindgen = "0.2"
js-sys = "0.3"
pinned = "0.1.0"
thiserror = "1.0.37"
bincode = { version = "1.3.3" }
bincode = { version = "2.0.0-rc.3", features = ["serde"] }
wasm-bindgen-futures = "0.4"
serde = { version = "1", features = ["derive"] }
futures = "0.3"
Expand Down
7 changes: 5 additions & 2 deletions packages/yew-agent/src/codec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ impl Codec for Bincode {
where
I: Serialize,
{
let buf = bincode::serialize(&input).expect("can't serialize an worker message");
let buf = bincode::serde::encode_to_vec(&input, bincode::config::standard())
.expect("can't serialize an worker message");
Uint8Array::from(buf.as_slice()).into()
}

Expand All @@ -35,6 +36,8 @@ impl Codec for Bincode {
O: for<'de> Deserialize<'de>,
{
let data = Uint8Array::from(input).to_vec();
bincode::deserialize(&data).expect("can't deserialize an worker message")
let (result, _) = bincode::serde::decode_from_slice(&data, bincode::config::standard())
.expect("can't deserialize an worker message");
result
}
}
2 changes: 1 addition & 1 deletion packages/yew/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ futures = { version = "0.3", default-features = false, features = ["std"] }
html-escape = { version = "0.2.13", optional = true }
implicit-clone = { version = "0.5", features = ["map"] }
base64ct = { version = "1.6.0", features = ["std"], optional = true }
bincode = { version = "1.3.3", optional = true }
bincode = { version = "2.0.0-rc.3", optional = true, features = ["serde"] }
serde = { version = "1", features = ["derive"] }
tracing = "0.1.40"
tokise = "0.2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,15 @@ where
.await
.expect("failed to deserialize state");

let (state, deps) =
bincode::deserialize::<(Option<T>, Option<D>)>(&buf)
.map(|(state, deps)| (state.map(Rc::new), deps.map(Rc::new)))
.expect("failed to deserialize state");
let ((state, deps), _) =
bincode::serde::decode_from_slice::<(Option<T>, Option<D>), _>(
&buf,
bincode::config::standard(),
)
.map(|((state, deps), consumed)| {
((state.map(Rc::new), deps.map(Rc::new)), consumed)
})
.expect("failed to deserialize state");

data.set((Ok((state, deps)), None));
});
Expand Down
7 changes: 5 additions & 2 deletions packages/yew/src/functional/hooks/use_prepared_state/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,11 @@ mod feat_any_hydration_ssr {
fn prepare(&self) -> String {
use base64ct::{Base64, Encoding};

let state = bincode::serialize(&(self.state.as_deref(), self.deps.as_deref()))
.expect("failed to prepare state");
let state = bincode::serde::encode_to_vec(
(self.state.as_deref(), self.deps.as_deref()),
bincode::config::standard(),
)
.expect("failed to prepare state");

Base64::encode_string(&state)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ where
let f = self.state_fn.borrow_mut().take().unwrap();
let state = f(self.deps.clone());

let state = bincode::serialize(&(Some(&state), Some(&*self.deps)))
.expect("failed to prepare state");
let state = bincode::serde::encode_to_vec(
(Some(&state), Some(&*self.deps)),
bincode::config::standard(),
)
.expect("failed to prepare state");

Base64::encode_string(&state)
}
Expand Down
4 changes: 2 additions & 2 deletions packages/yew/tests/use_prepared_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ async fn use_prepared_state_works() {

assert_eq!(
s,
r#"<!--<[use_prepared_state::use_prepared_state_works::{{closure}}::App]>--><!--<[yew::suspense::component::feat_csr_ssr::Suspense]>--><!--<[yew::suspense::component::feat_csr_ssr::BaseSuspense]>--><!--<?>--><div><!--<[use_prepared_state::use_prepared_state_works::{{closure}}::Comp]>--><div>12345</div><script type="application/x-yew-comp-state">ATkwAAAB</script><!--</[use_prepared_state::use_prepared_state_works::{{closure}}::Comp]>--></div><!--</?>--><!--</[yew::suspense::component::feat_csr_ssr::BaseSuspense]>--><!--</[yew::suspense::component::feat_csr_ssr::Suspense]>--><!--</[use_prepared_state::use_prepared_state_works::{{closure}}::App]>-->"#
r#"<!--<[use_prepared_state::use_prepared_state_works::{{closure}}::App]>--><!--<[yew::suspense::component::feat_csr_ssr::Suspense]>--><!--<[yew::suspense::component::feat_csr_ssr::BaseSuspense]>--><!--<?>--><div><!--<[use_prepared_state::use_prepared_state_works::{{closure}}::Comp]>--><div>12345</div><script type="application/x-yew-comp-state">Afs5MAE=</script><!--</[use_prepared_state::use_prepared_state_works::{{closure}}::Comp]>--></div><!--</?>--><!--</[yew::suspense::component::feat_csr_ssr::BaseSuspense]>--><!--</[yew::suspense::component::feat_csr_ssr::Suspense]>--><!--</[use_prepared_state::use_prepared_state_works::{{closure}}::App]>-->"#
);

gloo::utils::document()
Expand Down Expand Up @@ -92,7 +92,7 @@ async fn use_prepared_state_with_suspension_works() {

assert_eq!(
s,
r#"<!--<[use_prepared_state::use_prepared_state_with_suspension_works::{{closure}}::App]>--><!--<[yew::suspense::component::feat_csr_ssr::Suspense]>--><!--<[yew::suspense::component::feat_csr_ssr::BaseSuspense]>--><!--<?>--><div><!--<[use_prepared_state::use_prepared_state_with_suspension_works::{{closure}}::Comp]>--><div>12345</div><script type="application/x-yew-comp-state">ATkwAAAB</script><!--</[use_prepared_state::use_prepared_state_with_suspension_works::{{closure}}::Comp]>--></div><!--</?>--><!--</[yew::suspense::component::feat_csr_ssr::BaseSuspense]>--><!--</[yew::suspense::component::feat_csr_ssr::Suspense]>--><!--</[use_prepared_state::use_prepared_state_with_suspension_works::{{closure}}::App]>-->"#
r#"<!--<[use_prepared_state::use_prepared_state_with_suspension_works::{{closure}}::App]>--><!--<[yew::suspense::component::feat_csr_ssr::Suspense]>--><!--<[yew::suspense::component::feat_csr_ssr::BaseSuspense]>--><!--<?>--><div><!--<[use_prepared_state::use_prepared_state_with_suspension_works::{{closure}}::Comp]>--><div>12345</div><script type="application/x-yew-comp-state">Afs5MAE=</script><!--</[use_prepared_state::use_prepared_state_with_suspension_works::{{closure}}::Comp]>--></div><!--</?>--><!--</[yew::suspense::component::feat_csr_ssr::BaseSuspense]>--><!--</[yew::suspense::component::feat_csr_ssr::Suspense]>--><!--</[use_prepared_state::use_prepared_state_with_suspension_works::{{closure}}::App]>-->"#
);

gloo::utils::document()
Expand Down
2 changes: 1 addition & 1 deletion packages/yew/tests/use_transitive_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ async fn use_transitive_state_works() {
assert_eq!(
s,
// div text content should be 0 but state should be 12345.
r#"<!--<[use_transitive_state::use_transitive_state_works::{{closure}}::App]>--><!--<[yew::suspense::component::feat_csr_ssr::Suspense]>--><!--<[yew::suspense::component::feat_csr_ssr::BaseSuspense]>--><!--<?>--><div><!--<[use_transitive_state::use_transitive_state_works::{{closure}}::Comp]>--><div>0</div><script type="application/x-yew-comp-state">ATkwAAAB</script><!--</[use_transitive_state::use_transitive_state_works::{{closure}}::Comp]>--></div><!--</?>--><!--</[yew::suspense::component::feat_csr_ssr::BaseSuspense]>--><!--</[yew::suspense::component::feat_csr_ssr::Suspense]>--><!--</[use_transitive_state::use_transitive_state_works::{{closure}}::App]>-->"#
r#"<!--<[use_transitive_state::use_transitive_state_works::{{closure}}::App]>--><!--<[yew::suspense::component::feat_csr_ssr::Suspense]>--><!--<[yew::suspense::component::feat_csr_ssr::BaseSuspense]>--><!--<?>--><div><!--<[use_transitive_state::use_transitive_state_works::{{closure}}::Comp]>--><div>0</div><script type="application/x-yew-comp-state">Afs5MAE=</script><!--</[use_transitive_state::use_transitive_state_works::{{closure}}::Comp]>--></div><!--</?>--><!--</[yew::suspense::component::feat_csr_ssr::BaseSuspense]>--><!--</[yew::suspense::component::feat_csr_ssr::Suspense]>--><!--</[use_transitive_state::use_transitive_state_works::{{closure}}::App]>-->"#
);

gloo::utils::document()
Expand Down
Loading