From 263fc9dc94ec8e7a6393fce2031857e5391859d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Wed, 15 Nov 2023 00:33:33 +0800 Subject: [PATCH 01/88] Try to add wasi feature to avoid browser's ABI. --- .cargo/config.toml | 2 +- packages/yew-router/Cargo.toml | 16 +++++++--------- packages/yew-router/src/utils.rs | 4 ++-- packages/yew/Cargo.toml | 7 ++++--- packages/yew/src/dom_bundle/bcomp.rs | 4 ++-- packages/yew/src/dom_bundle/blist.rs | 4 ++-- packages/yew/src/dom_bundle/bnode.rs | 2 +- packages/yew/src/dom_bundle/bportal.rs | 2 +- packages/yew/src/dom_bundle/braw.rs | 2 +- packages/yew/src/dom_bundle/btag/attributes.rs | 2 +- packages/yew/src/dom_bundle/btag/listeners.rs | 2 +- packages/yew/src/dom_bundle/btag/mod.rs | 10 +++++----- packages/yew/src/dom_bundle/btext.rs | 6 +++--- packages/yew/src/dom_bundle/position.rs | 4 ++-- .../hooks/use_prepared_state/feat_hydration.rs | 4 ++-- packages/yew/src/html/component/lifecycle.rs | 10 +++++----- packages/yew/src/scheduler.rs | 4 ++-- packages/yew/src/virtual_dom/key.rs | 4 ++-- packages/yew/src/virtual_dom/vlist.rs | 2 +- packages/yew/src/virtual_dom/vsuspense.rs | 2 +- packages/yew/src/virtual_dom/vtag.rs | 2 +- packages/yew/src/virtual_dom/vtext.rs | 2 +- packages/yew/tests/hydration.rs | 2 +- packages/yew/tests/layout.rs | 2 +- packages/yew/tests/mod.rs | 2 +- packages/yew/tests/raw_html.rs | 18 +++++++++--------- packages/yew/tests/suspense.rs | 2 +- packages/yew/tests/use_callback.rs | 2 +- packages/yew/tests/use_context.rs | 2 +- packages/yew/tests/use_effect.rs | 2 +- packages/yew/tests/use_memo.rs | 2 +- packages/yew/tests/use_prepared_state.rs | 2 +- packages/yew/tests/use_reducer.rs | 2 +- packages/yew/tests/use_ref.rs | 2 +- packages/yew/tests/use_state.rs | 2 +- packages/yew/tests/use_transitive_state.rs | 2 +- 36 files changed, 70 insertions(+), 71 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index c231417eda5..5ea03f75395 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,4 +1,4 @@ -[target.'cfg(target_arch = "wasm32")'] +[target.'cfg(all(target_arch = "wasm32", not(feature = "wasi")))'] runner = 'wasm-bindgen-test-runner' # This section needs to be last. diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index e5b7d68e18a..987f09ff630 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -12,7 +12,7 @@ repository = "https://github.com/yewstack/yew" rust-version = "1.64.0" [dependencies] -yew = { version = "0.21.0", path = "../yew", default-features= false } +yew = { version = "0.21.0", path = "../yew", default-features = false } yew-router-macro = { version = "0.18.0", path = "../yew-router-macro" } wasm-bindgen = "0.2" @@ -26,11 +26,7 @@ urlencoding = "2.1.3" [dependencies.web-sys] version = "0.3" -features = [ - "Document", - "HtmlBaseElement", - "Window", -] +features = ["Document", "HtmlBaseElement", "Window"] [dev-dependencies] wasm-bindgen-test = "0.3" @@ -39,6 +35,8 @@ yew = { version = "0.21.0", path = "../yew", features = ["csr"] } [dev-dependencies.web-sys] version = "0.3" -features = [ - "HtmlHeadElement", -] +features = ["HtmlHeadElement"] + +[features] +wasi = [] +default = [] diff --git a/packages/yew-router/src/utils.rs b/packages/yew-router/src/utils.rs index ba356701725..28a9dd4de3a 100644 --- a/packages/yew-router/src/utils.rs +++ b/packages/yew-router/src/utils.rs @@ -42,7 +42,7 @@ pub fn fetch_base_url() -> Option { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] pub fn compose_path(pathname: &str, query: &str) -> Option { gloo::utils::window() .location() @@ -55,7 +55,7 @@ pub fn compose_path(pathname: &str, query: &str) -> Option { }) } -#[cfg(not(target_arch = "wasm32"))] +#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] pub fn compose_path(pathname: &str, query: &str) -> Option { let query = query.trim(); diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index 89cd95b4c6c..d72be9fd7a4 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -35,10 +35,10 @@ tracing = "0.1.40" prokio = "0.1.0" rustversion = "1" -[target.'cfg(target_arch = "wasm32")'.dependencies] +[target.'cfg(all(target_arch = "wasm32", not(feature = "wasi")))'.dependencies] wasm-bindgen-futures = "0.4" -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +[target.'cfg(any(not(target_arch = "wasm32"), feature = "wasi"))'.dependencies] # We still need tokio as we have docs linked to it. tokio = { version = "1.33", features = ["rt"] } @@ -78,7 +78,7 @@ features = [ "SubmitEvent", ] -[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] +[target.'cfg(any(not(target_arch = "wasm32"), feature = "wasi"))'.dev-dependencies] tokio = { version = "1.33", features = ["full"] } [dev-dependencies] @@ -95,6 +95,7 @@ features = ["ShadowRootInit", "ShadowRootMode", "HtmlButtonElement"] ssr = ["dep:html-escape", "dep:base64ct", "dep:bincode"] csr = [] hydration = ["csr", "dep:bincode"] +wasi = [] default = [] [package.metadata.docs.rs] diff --git a/packages/yew/src/dom_bundle/bcomp.rs b/packages/yew/src/dom_bundle/bcomp.rs index 5e6130f5497..05a4f546e4c 100644 --- a/packages/yew/src/dom_bundle/bcomp.rs +++ b/packages/yew/src/dom_bundle/bcomp.rs @@ -158,7 +158,7 @@ mod feat_hydration { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod tests { use gloo::utils::document; @@ -391,7 +391,7 @@ mod tests { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod layout_tests { extern crate self as yew; diff --git a/packages/yew/src/dom_bundle/blist.rs b/packages/yew/src/dom_bundle/blist.rs index ddd909027ea..66f964b6adf 100644 --- a/packages/yew/src/dom_bundle/blist.rs +++ b/packages/yew/src/dom_bundle/blist.rs @@ -490,7 +490,7 @@ mod feat_hydration { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod layout_tests { extern crate self as yew; @@ -567,7 +567,7 @@ mod layout_tests { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod layout_tests_keys { extern crate self as yew; diff --git a/packages/yew/src/dom_bundle/bnode.rs b/packages/yew/src/dom_bundle/bnode.rs index 2f59acfe47f..31e9bd04f8b 100644 --- a/packages/yew/src/dom_bundle/bnode.rs +++ b/packages/yew/src/dom_bundle/bnode.rs @@ -311,7 +311,7 @@ mod feat_hydration { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod layout_tests { use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure}; diff --git a/packages/yew/src/dom_bundle/bportal.rs b/packages/yew/src/dom_bundle/bportal.rs index 9792383101b..1b8062b40ed 100644 --- a/packages/yew/src/dom_bundle/bportal.rs +++ b/packages/yew/src/dom_bundle/bportal.rs @@ -118,7 +118,7 @@ impl BPortal { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod layout_tests { extern crate self as yew; diff --git a/packages/yew/src/dom_bundle/braw.rs b/packages/yew/src/dom_bundle/braw.rs index 0d122a87c7e..726c5527140 100644 --- a/packages/yew/src/dom_bundle/braw.rs +++ b/packages/yew/src/dom_bundle/braw.rs @@ -153,7 +153,7 @@ mod feat_hydration { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod tests { use gloo::utils::document; diff --git a/packages/yew/src/dom_bundle/btag/attributes.rs b/packages/yew/src/dom_bundle/btag/attributes.rs index d56be61021d..19c898cf2dd 100644 --- a/packages/yew/src/dom_bundle/btag/attributes.rs +++ b/packages/yew/src/dom_bundle/btag/attributes.rs @@ -272,7 +272,7 @@ impl Apply for Attributes { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod tests { use std::rc::Rc; diff --git a/packages/yew/src/dom_bundle/btag/listeners.rs b/packages/yew/src/dom_bundle/btag/listeners.rs index 8866896f38c..96bb81ff286 100644 --- a/packages/yew/src/dom_bundle/btag/listeners.rs +++ b/packages/yew/src/dom_bundle/btag/listeners.rs @@ -196,7 +196,7 @@ impl Registry { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod tests { use std::marker::PhantomData; diff --git a/packages/yew/src/dom_bundle/btag/mod.rs b/packages/yew/src/dom_bundle/btag/mod.rs index a376d3b1fc9..d7446e5ec95 100644 --- a/packages/yew/src/dom_bundle/btag/mod.rs +++ b/packages/yew/src/dom_bundle/btag/mod.rs @@ -288,13 +288,13 @@ impl BTag { self.key.as_ref() } - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] fn reference(&self) -> &Element { &self.reference } - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] fn children(&self) -> Option<&BNode> { match &self.inner { @@ -303,7 +303,7 @@ impl BTag { } } - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] fn tag(&self) -> &str { match &self.inner { @@ -403,7 +403,7 @@ mod feat_hydration { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod tests { use std::rc::Rc; @@ -1000,7 +1000,7 @@ mod tests { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod layout_tests { extern crate self as yew; diff --git a/packages/yew/src/dom_bundle/btext.rs b/packages/yew/src/dom_bundle/btext.rs index 2d668b9527f..0e807ffd521 100644 --- a/packages/yew/src/dom_bundle/btext.rs +++ b/packages/yew/src/dom_bundle/btext.rs @@ -146,12 +146,12 @@ mod feat_hydration { mod test { extern crate self as yew; - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure}; use crate::html; - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] wasm_bindgen_test_configure!(run_in_browser); #[test] @@ -166,7 +166,7 @@ mod test { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod layout_tests { extern crate self as yew; diff --git a/packages/yew/src/dom_bundle/position.rs b/packages/yew/src/dom_bundle/position.rs index 8a493a4e1a6..167c1c4cfdd 100644 --- a/packages/yew/src/dom_bundle/position.rs +++ b/packages/yew/src/dom_bundle/position.rs @@ -124,7 +124,7 @@ impl DomSlot { }); } - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] fn get(&self) -> Option { self.with_next_sibling(|n| n.cloned()) @@ -180,7 +180,7 @@ impl DynamicDomSlot { } } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod layout_tests { use gloo::utils::document; diff --git a/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs b/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs index 6ca568b2cf2..395b9a0edb8 100644 --- a/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs +++ b/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs @@ -12,7 +12,7 @@ use crate::functional::{use_state, Hook, HookContext}; use crate::platform::spawn_local; use crate::suspense::{Suspension, SuspensionResult}; -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] async fn decode_base64(s: &str) -> Result, JsValue> { use gloo::utils::window; use js_sys::Uint8Array; @@ -34,7 +34,7 @@ async fn decode_base64(s: &str) -> Result, JsValue> { Ok(content_array.to_vec()) } -#[cfg(not(target_arch = "wasm32"))] +#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] async fn decode_base64(_s: &str) -> Result, JsValue> { unreachable!("this function is not callable under non-wasm targets!"); } diff --git a/packages/yew/src/html/component/lifecycle.rs b/packages/yew/src/html/component/lifecycle.rs index ad5ee160965..3e53b24611b 100644 --- a/packages/yew/src/html/component/lifecycle.rs +++ b/packages/yew/src/html/component/lifecycle.rs @@ -740,7 +740,7 @@ mod feat_csr { #[cfg(feature = "csr")] pub(super) use feat_csr::*; -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[cfg(test)] mod tests { extern crate self as yew; @@ -797,7 +797,7 @@ mod tests { struct Props { lifecycle: Rc>>, #[allow(dead_code)] - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] create_message: Option, update_message: RefCell>, view_message: RefCell>, @@ -814,7 +814,7 @@ mod tests { fn create(ctx: &Context) -> Self { ctx.props().lifecycle.borrow_mut().push("create".into()); - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] if let Some(msg) = ctx.props().create_message { ctx.link().send_message(msg); } @@ -901,7 +901,7 @@ mod tests { test_lifecycle( Props { lifecycle: lifecycle.clone(), - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] create_message: Some(false), ..Props::default() }, @@ -982,7 +982,7 @@ mod tests { test_lifecycle( Props { lifecycle, - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] create_message: Some(true), update_message: RefCell::new(Some(true)), ..Props::default() diff --git a/packages/yew/src/scheduler.rs b/packages/yew/src/scheduler.rs index 6f9113bf346..7761bb256e6 100644 --- a/packages/yew/src/scheduler.rs +++ b/packages/yew/src/scheduler.rs @@ -220,7 +220,7 @@ pub(crate) fn start_now() { }); } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] mod arch { use crate::platform::spawn_local; @@ -233,7 +233,7 @@ mod arch { } } -#[cfg(not(target_arch = "wasm32"))] +#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] mod arch { // Delayed rendering is not very useful in the context of server-side rendering. // There are no event listeners or other high priority events that need to be diff --git a/packages/yew/src/virtual_dom/key.rs b/packages/yew/src/virtual_dom/key.rs index 8ef29abc528..3027657795e 100644 --- a/packages/yew/src/virtual_dom/key.rs +++ b/packages/yew/src/virtual_dom/key.rs @@ -72,12 +72,12 @@ key_impl_from_to_string!(isize); mod test { use std::rc::Rc; - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure}; use crate::html; - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] wasm_bindgen_test_configure!(run_in_browser); #[test] diff --git a/packages/yew/src/virtual_dom/vlist.rs b/packages/yew/src/virtual_dom/vlist.rs index 62dc5b14e0a..d23c8347a65 100644 --- a/packages/yew/src/virtual_dom/vlist.rs +++ b/packages/yew/src/virtual_dom/vlist.rs @@ -275,7 +275,7 @@ mod feat_ssr { } } -#[cfg(not(target_arch = "wasm32"))] +#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] #[cfg(feature = "ssr")] #[cfg(test)] mod ssr_tests { diff --git a/packages/yew/src/virtual_dom/vsuspense.rs b/packages/yew/src/virtual_dom/vsuspense.rs index 8167f4fb2e1..e0d2432c54c 100644 --- a/packages/yew/src/virtual_dom/vsuspense.rs +++ b/packages/yew/src/virtual_dom/vsuspense.rs @@ -61,7 +61,7 @@ mod feat_ssr { } } -#[cfg(not(target_arch = "wasm32"))] +#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] #[cfg(feature = "ssr")] #[cfg(test)] mod ssr_tests { diff --git a/packages/yew/src/virtual_dom/vtag.rs b/packages/yew/src/virtual_dom/vtag.rs index 0b0d9699049..f5706d7b7f2 100644 --- a/packages/yew/src/virtual_dom/vtag.rs +++ b/packages/yew/src/virtual_dom/vtag.rs @@ -555,7 +555,7 @@ mod feat_ssr { } } -#[cfg(not(target_arch = "wasm32"))] +#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] #[cfg(feature = "ssr")] #[cfg(test)] mod ssr_tests { diff --git a/packages/yew/src/virtual_dom/vtext.rs b/packages/yew/src/virtual_dom/vtext.rs index c1a3d5f38c0..75d9961ec65 100644 --- a/packages/yew/src/virtual_dom/vtext.rs +++ b/packages/yew/src/virtual_dom/vtext.rs @@ -68,7 +68,7 @@ mod feat_ssr { } } -#[cfg(not(target_arch = "wasm32"))] +#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] #[cfg(feature = "ssr")] #[cfg(test)] mod ssr_tests { diff --git a/packages/yew/tests/hydration.rs b/packages/yew/tests/hydration.rs index ecaa11eb1f4..26972613f6f 100644 --- a/packages/yew/tests/hydration.rs +++ b/packages/yew/tests/hydration.rs @@ -1,5 +1,5 @@ #![cfg(feature = "hydration")] -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] use std::ops::Range; use std::rc::Rc; diff --git a/packages/yew/tests/layout.rs b/packages/yew/tests/layout.rs index 0369ba66fa5..6f142a57aa3 100644 --- a/packages/yew/tests/layout.rs +++ b/packages/yew/tests/layout.rs @@ -1,4 +1,4 @@ -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] mod common; diff --git a/packages/yew/tests/mod.rs b/packages/yew/tests/mod.rs index a5eba7d5765..de64ddf8392 100644 --- a/packages/yew/tests/mod.rs +++ b/packages/yew/tests/mod.rs @@ -1,4 +1,4 @@ -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] mod common; diff --git a/packages/yew/tests/raw_html.rs b/packages/yew/tests/raw_html.rs index 031ba7f50db..20484285529 100644 --- a/packages/yew/tests/raw_html.rs +++ b/packages/yew/tests/raw_html.rs @@ -1,13 +1,13 @@ mod common; -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] use wasm_bindgen::JsCast; -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] use wasm_bindgen_test::wasm_bindgen_test as test; use yew::prelude::*; -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser); -#[cfg(not(target_arch = "wasm32"))] +#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] use tokio::test; macro_rules! create_test { @@ -27,7 +27,7 @@ macro_rules! create_test { } } - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] { use std::time::Duration; @@ -46,7 +46,7 @@ macro_rules! create_test { .unwrap(); assert_eq!(e.inner_html(), $expected); } - #[cfg(not(target_arch = "wasm32"))] + #[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] { let actual = yew::ServerRenderer::::new() .hydratable(false) @@ -74,7 +74,7 @@ create_test!( macro_rules! create_update_html_test { ($name:ident, $initial:expr, $updated:expr) => { - #[cfg(target_arch = "wasm32")] + #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[test] async fn $name() { #[function_component] @@ -150,7 +150,7 @@ create_update_html_test!( "firstsecond" ); -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[test] async fn change_vnode_types_from_other_to_vraw() { #[function_component] @@ -202,7 +202,7 @@ async fn change_vnode_types_from_other_to_vraw() { assert_eq!(e.inner_html(), "second"); } -#[cfg(target_arch = "wasm32")] +#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #[test] async fn change_vnode_types_from_vraw_to_other() { #[function_component] diff --git a/packages/yew/tests/suspense.rs b/packages/yew/tests/suspense.rs index 0596f3c6946..5a225013f77 100644 --- a/packages/yew/tests/suspense.rs +++ b/packages/yew/tests/suspense.rs @@ -1,4 +1,4 @@ -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] mod common; diff --git a/packages/yew/tests/use_callback.rs b/packages/yew/tests/use_callback.rs index 28130a092fd..b65013572ef 100644 --- a/packages/yew/tests/use_callback.rs +++ b/packages/yew/tests/use_callback.rs @@ -1,4 +1,4 @@ -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] use std::sync::atomic::{AtomicBool, Ordering}; diff --git a/packages/yew/tests/use_context.rs b/packages/yew/tests/use_context.rs index d4123c8111c..5369bae2710 100644 --- a/packages/yew/tests/use_context.rs +++ b/packages/yew/tests/use_context.rs @@ -1,4 +1,4 @@ -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] mod common; diff --git a/packages/yew/tests/use_effect.rs b/packages/yew/tests/use_effect.rs index e5ffa0373ae..12f085135f1 100644 --- a/packages/yew/tests/use_effect.rs +++ b/packages/yew/tests/use_effect.rs @@ -1,4 +1,4 @@ -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] mod common; diff --git a/packages/yew/tests/use_memo.rs b/packages/yew/tests/use_memo.rs index e67ce0567d1..1de9fb1d4fe 100644 --- a/packages/yew/tests/use_memo.rs +++ b/packages/yew/tests/use_memo.rs @@ -1,4 +1,4 @@ -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] use std::sync::atomic::{AtomicBool, Ordering}; diff --git a/packages/yew/tests/use_prepared_state.rs b/packages/yew/tests/use_prepared_state.rs index 28644d026be..81d65da2e2e 100644 --- a/packages/yew/tests/use_prepared_state.rs +++ b/packages/yew/tests/use_prepared_state.rs @@ -1,4 +1,4 @@ -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] #![cfg(feature = "hydration")] #![cfg_attr(nightly_yew, feature(async_closure))] diff --git a/packages/yew/tests/use_reducer.rs b/packages/yew/tests/use_reducer.rs index b08403bca52..c1df05f6573 100644 --- a/packages/yew/tests/use_reducer.rs +++ b/packages/yew/tests/use_reducer.rs @@ -1,4 +1,4 @@ -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] use std::collections::HashSet; use std::rc::Rc; diff --git a/packages/yew/tests/use_ref.rs b/packages/yew/tests/use_ref.rs index 2ba8e133975..7e991ebb62a 100644 --- a/packages/yew/tests/use_ref.rs +++ b/packages/yew/tests/use_ref.rs @@ -1,4 +1,4 @@ -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] mod common; diff --git a/packages/yew/tests/use_state.rs b/packages/yew/tests/use_state.rs index c48bc0f295d..a2254ab2367 100644 --- a/packages/yew/tests/use_state.rs +++ b/packages/yew/tests/use_state.rs @@ -1,4 +1,4 @@ -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] mod common; diff --git a/packages/yew/tests/use_transitive_state.rs b/packages/yew/tests/use_transitive_state.rs index 71f7f31dda1..155de9d9c78 100644 --- a/packages/yew/tests/use_transitive_state.rs +++ b/packages/yew/tests/use_transitive_state.rs @@ -1,5 +1,5 @@ #![cfg(feature = "hydration")] -#![cfg(target_arch = "wasm32")] +#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] use std::time::Duration; From 7bd1e0431e5ae07d26d2d12c6f88b79356d96aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 20 Nov 2023 10:26:50 +0800 Subject: [PATCH 02/88] Add async render for single-threaded env. --- packages/yew/src/server_renderer.rs | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/packages/yew/src/server_renderer.rs b/packages/yew/src/server_renderer.rs index 2fbd13e628f..ff420416c43 100644 --- a/packages/yew/src/server_renderer.rs +++ b/packages/yew/src/server_renderer.rs @@ -334,4 +334,36 @@ where rx } + + /// Renders Yew Application into a string Stream. + /// + /// This function will not create a new tokio task, + /// but will completely transfer the asynchronous control to the user. + async fn render_stream_async(self) -> impl Stream { + let Self { + create_props, + hydratable, + .. + } = self; + + let props = create_props(); + let s = LocalServerRenderer::::with_props(props) + .hydratable(hydratable) + .render_stream(); + s + } + + /// Renders Yew Application into a string. + /// + /// As opposed to the traditional method, + /// this method completely transfers the asynchronous control to the user, + /// and will not try to create additional tokio threads in the environment internally. + /// + /// This method is most suitable for single-threaded environments such as WASI. + pub async fn render_async(self) -> String { + let s = self.render_stream_async(); + futures::pin_mut!(s); + + s.await.collect::().await + } } From a935141f0ec2e2d506e76660834f376b89469eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 20 Nov 2023 14:18:15 +0800 Subject: [PATCH 03/88] Temporarily enable my own patch branch. It would be modified later after the corresponding library branches are merged. --- Cargo.toml | 14 ++++++-------- packages/yew-router/Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9205d8e3dcb..35bc1f280b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,6 @@ [workspace] -members = [ - "packages/*", - "tools/*", - "examples/*", -] -default-members = [ - "packages/*", -] +members = ["packages/*", "tools/*", "examples/*"] +default-members = ["packages/*"] resolver = "2" [profile.release] @@ -20,3 +14,7 @@ lto = true codegen-units = 1 panic = "abort" opt-level = 3 + +[patch.crates-io] +gloo = { git = "https://github.com/langyo/gloo", branch = "wasi-fix" } +prokio = { git = "https://github.com/langyo/prokio", branch = "wasi-fix" } diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index 987f09ff630..59b94d2ac02 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -38,5 +38,5 @@ version = "0.3" features = ["HtmlHeadElement"] [features] -wasi = [] +wasi = ["gloo/wasi"] default = [] From 3338893f0f497fedf910f9d4346ebe22cfc797c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 21 Nov 2023 00:32:30 +0800 Subject: [PATCH 04/88] add example for WASI SSR. --- examples/wasi_ssr/Cargo.toml | 13 +++++++++++++ examples/wasi_ssr/README.md | 13 +++++++++++++ examples/wasi_ssr/src/main.rs | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 examples/wasi_ssr/Cargo.toml create mode 100644 examples/wasi_ssr/README.md create mode 100644 examples/wasi_ssr/src/main.rs diff --git a/examples/wasi_ssr/Cargo.toml b/examples/wasi_ssr/Cargo.toml new file mode 100644 index 00000000000..4c811712dc2 --- /dev/null +++ b/examples/wasi_ssr/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "wasi_ssr" +version = "0.1.0" +edition = "2021" +authors = ["langyo "] + +[dependencies] +anyhow = "^1" +serde = { version = "^1", features = ["derive"] } +serde_json = "^1" +tokio_wasi = { version = "^1", features = ["full"] } + +yew = { path = "../../packages/yew", features = ["ssr", "hydration", "wasi"] } diff --git a/examples/wasi_ssr/README.md b/examples/wasi_ssr/README.md new file mode 100644 index 00000000000..d446534c8d9 --- /dev/null +++ b/examples/wasi_ssr/README.md @@ -0,0 +1,13 @@ +# WASI SSR Example + +This example demonstrates how to use the WASI target to run a simple server-side rendering application. + +## Building + +To build the example, run the following command from the root of the repository: + +```bash +cargo build --example wasi_ssr --target wasm32-wasi +``` + +> TODO - It needs to write a `bin` target for this example that it's only runnable on `wasmtime_wasi::preview2`. diff --git a/examples/wasi_ssr/src/main.rs b/examples/wasi_ssr/src/main.rs new file mode 100644 index 00000000000..9e1dd839bc6 --- /dev/null +++ b/examples/wasi_ssr/src/main.rs @@ -0,0 +1,34 @@ +use anyhow::Result; + +use yew::{function_component, prelude::*, ServerRenderer}; + +#[function_component] +fn App() -> Html { + html! { +
+ {"Hello, World!"} +
+ } +} + +pub async fn render() -> Result { + let renderer = ServerRenderer::::new(); + let html_raw = renderer.render_async().await; + + let mut body = String::new(); + body.push_str(""); + body.push_str("
"); + body.push_str(&html_raw); + body.push_str("
"); + body.push_str(""); + + Ok(body) +} + +#[tokio::main(flavor = "current_thread")] +async fn main() -> Result<()> { + let ret = render().await?; + println!("{}", ret); + + Ok(()) +} From b218db91f0f08931ab30483def4d15b5533f031c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 21 Nov 2023 01:55:43 +0800 Subject: [PATCH 05/88] Ready to run WASI on wasmtime. --- examples/README.md | 1 + examples/wasi_ssr/Cargo.toml | 4 ++++ examples/wasi_ssr/README.md | 8 +++++++- examples/wasi_ssr/src/bin/wasi_ssr_render.rs | 6 ++++++ packages/yew/Cargo.toml | 6 +++--- 5 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 examples/wasi_ssr/src/bin/wasi_ssr_render.rs diff --git a/examples/README.md b/examples/README.md index e196494df3e..80311cdd6df 100644 --- a/examples/README.md +++ b/examples/README.md @@ -60,6 +60,7 @@ As an example, check out the TodoMVC example here: "] +[[bin]] +name = "wasi_ssr" +path = "src/bin/wasi_ssr_render.rs" + [dependencies] anyhow = "^1" serde = { version = "^1", features = ["derive"] } diff --git a/examples/wasi_ssr/README.md b/examples/wasi_ssr/README.md index d446534c8d9..b2555636d1e 100644 --- a/examples/wasi_ssr/README.md +++ b/examples/wasi_ssr/README.md @@ -7,7 +7,13 @@ This example demonstrates how to use the WASI target to run a simple server-side To build the example, run the following command from the root of the repository: ```bash -cargo build --example wasi_ssr --target wasm32-wasi +cargo build --package wasi_ssr --target wasm32-wasi ``` > TODO - It needs to write a `bin` target for this example that it's only runnable on `wasmtime_wasi::preview2`. + +## Running + +```bash +cargo run --package wasi_ssr --bin wasi_ssr +``` diff --git a/examples/wasi_ssr/src/bin/wasi_ssr_render.rs b/examples/wasi_ssr/src/bin/wasi_ssr_render.rs new file mode 100644 index 00000000000..12119d7ba4f --- /dev/null +++ b/examples/wasi_ssr/src/bin/wasi_ssr_render.rs @@ -0,0 +1,6 @@ +fn main() { + println!("Current dir: {:?}", std::env::current_dir()); + println!("Current file: {:?}", std::env::current_exe()); + + // TODO - Run the WASI module here by wasmtime_wasi::preview2 +} diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index d72be9fd7a4..4305bb820e8 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -35,10 +35,10 @@ tracing = "0.1.40" prokio = "0.1.0" rustversion = "1" -[target.'cfg(all(target_arch = "wasm32", not(feature = "wasi")))'.dependencies] +[target.'cfg(target_arch = "wasm32")'.dependencies] wasm-bindgen-futures = "0.4" -[target.'cfg(any(not(target_arch = "wasm32"), feature = "wasi"))'.dependencies] +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] # We still need tokio as we have docs linked to it. tokio = { version = "1.33", features = ["rt"] } @@ -78,7 +78,7 @@ features = [ "SubmitEvent", ] -[target.'cfg(any(not(target_arch = "wasm32"), feature = "wasi"))'.dev-dependencies] +[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] tokio = { version = "1.33", features = ["full"] } [dev-dependencies] From 7ef5659f61fea5322cb5340fc23817d75af5180b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 21 Nov 2023 14:18:25 +0800 Subject: [PATCH 06/88] complete the example --- examples/README.md | 2 +- examples/wasi_ssr/README.md | 19 --------------- examples/wasi_ssr/src/bin/wasi_ssr_render.rs | 6 ----- .../{wasi_ssr => wasi_ssr_module}/Cargo.toml | 13 +++++------ examples/wasi_ssr_module/README.md | 23 +++++++++++++++++++ .../{wasi_ssr => wasi_ssr_module}/src/main.rs | 1 + packages/yew/Cargo.toml | 4 ++-- 7 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 examples/wasi_ssr/README.md delete mode 100644 examples/wasi_ssr/src/bin/wasi_ssr_render.rs rename examples/{wasi_ssr => wasi_ssr_module}/Cargo.toml (60%) create mode 100644 examples/wasi_ssr_module/README.md rename examples/{wasi_ssr => wasi_ssr_module}/src/main.rs (96%) diff --git a/examples/README.md b/examples/README.md index 80311cdd6df..0d07875a175 100644 --- a/examples/README.md +++ b/examples/README.md @@ -60,7 +60,7 @@ As an example, check out the TodoMVC example here: TODO - It needs to write a `bin` target for this example that it's only runnable on `wasmtime_wasi::preview2`. - -## Running - -```bash -cargo run --package wasi_ssr --bin wasi_ssr -``` diff --git a/examples/wasi_ssr/src/bin/wasi_ssr_render.rs b/examples/wasi_ssr/src/bin/wasi_ssr_render.rs deleted file mode 100644 index 12119d7ba4f..00000000000 --- a/examples/wasi_ssr/src/bin/wasi_ssr_render.rs +++ /dev/null @@ -1,6 +0,0 @@ -fn main() { - println!("Current dir: {:?}", std::env::current_dir()); - println!("Current file: {:?}", std::env::current_exe()); - - // TODO - Run the WASI module here by wasmtime_wasi::preview2 -} diff --git a/examples/wasi_ssr/Cargo.toml b/examples/wasi_ssr_module/Cargo.toml similarity index 60% rename from examples/wasi_ssr/Cargo.toml rename to examples/wasi_ssr_module/Cargo.toml index 04ee7759d5a..7af8656b639 100644 --- a/examples/wasi_ssr/Cargo.toml +++ b/examples/wasi_ssr_module/Cargo.toml @@ -1,17 +1,16 @@ [package] -name = "wasi_ssr" +name = "wasi_ssr_module" version = "0.1.0" edition = "2021" authors = ["langyo "] -[[bin]] -name = "wasi_ssr" -path = "src/bin/wasi_ssr_render.rs" - [dependencies] +yew = { path = "../../packages/yew", features = ["ssr", "wasi"] } + anyhow = "^1" +bytes = "^1" serde = { version = "^1", features = ["derive"] } serde_json = "^1" -tokio_wasi = { version = "^1", features = ["full"] } +lazy_static = "^1" -yew = { path = "../../packages/yew", features = ["ssr", "hydration", "wasi"] } +tokio_wasi = { version = "^1", features = ["full"] } diff --git a/examples/wasi_ssr_module/README.md b/examples/wasi_ssr_module/README.md new file mode 100644 index 00000000000..58cacda16b2 --- /dev/null +++ b/examples/wasi_ssr_module/README.md @@ -0,0 +1,23 @@ +# WASI SSR Module Example + +This example demonstrates how to use the WASI target to run a simple server-side rendering application. + +It depends on [wasmtime](https://wasmtime.dev)'s WASI preview2. + +## Building + +To build the example, run the following command from the root of the repository: + +```bash +cargo build --package wasi_ssr_module --target wasm32-wasi --release +``` + +## Running + +> Note: This example requires the wasmtime CLI to be installed. See [wasmtime's installation instructions](https://docs.wasmtime.dev/cli-install.html) for more information. + +```bash +wasmtime target/wasm32-wasi/release/wasi_ssr_module.wasm +``` + +> Warn: This example is not yet fully functional. For some unknown reason, this demo only works [outside this project](https://github.com/celestia-island/tairitsu/blob/e032b536984e449e14941c9b755d747a0aa366fb/packages/proto/src/html/render.rs) because the dependency `web-sys` includes some objects forcible. It would have crashed when running on this project that caused by unknown import `__wbindgen_placeholder__::__wbindgen_xxx` has not been defined in the WASI environment. diff --git a/examples/wasi_ssr/src/main.rs b/examples/wasi_ssr_module/src/main.rs similarity index 96% rename from examples/wasi_ssr/src/main.rs rename to examples/wasi_ssr_module/src/main.rs index 9e1dd839bc6..45a8afcb2af 100644 --- a/examples/wasi_ssr/src/main.rs +++ b/examples/wasi_ssr_module/src/main.rs @@ -29,6 +29,7 @@ pub async fn render() -> Result { async fn main() -> Result<()> { let ret = render().await?; println!("{}", ret); + println!("{}", "Oh"); Ok(()) } diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index 4305bb820e8..cfa27c8f18a 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -95,8 +95,8 @@ features = ["ShadowRootInit", "ShadowRootMode", "HtmlButtonElement"] ssr = ["dep:html-escape", "dep:base64ct", "dep:bincode"] csr = [] hydration = ["csr", "dep:bincode"] -wasi = [] -default = [] +wasi = ["gloo/wasi"] +default = ["wasi"] [package.metadata.docs.rs] all-features = true From dae7f158be7acd9b91650212df0fd65056ed63f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 21 Nov 2023 14:46:05 +0800 Subject: [PATCH 07/88] fix fmt --- examples/wasi_ssr_module/src/main.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/wasi_ssr_module/src/main.rs b/examples/wasi_ssr_module/src/main.rs index 45a8afcb2af..f8e1397b78b 100644 --- a/examples/wasi_ssr_module/src/main.rs +++ b/examples/wasi_ssr_module/src/main.rs @@ -1,6 +1,9 @@ -use anyhow::Result; +#![allow(unused_imports)] +#![allow(non_snake_case)] -use yew::{function_component, prelude::*, ServerRenderer}; +use anyhow::Result; +use yew::prelude::*; +use yew::{function_component, ServerRenderer}; #[function_component] fn App() -> Html { From b2e0bdc376451c49887886ecd5feb2f94287d85b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 21 Nov 2023 14:49:12 +0800 Subject: [PATCH 08/88] fix fmt --- packages/yew/src/server_renderer.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/yew/src/server_renderer.rs b/packages/yew/src/server_renderer.rs index ff420416c43..a42b9d73a9d 100644 --- a/packages/yew/src/server_renderer.rs +++ b/packages/yew/src/server_renderer.rs @@ -347,10 +347,9 @@ where } = self; let props = create_props(); - let s = LocalServerRenderer::::with_props(props) + LocalServerRenderer::::with_props(props) .hydratable(hydratable) - .render_stream(); - s + .render_stream() } /// Renders Yew Application into a string. From 517ed0047f158a03c78d65e50867e20807713882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 21 Nov 2023 14:54:27 +0800 Subject: [PATCH 09/88] I made a mistake..sry --- packages/yew/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index cfa27c8f18a..5301499a811 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -96,7 +96,7 @@ ssr = ["dep:html-escape", "dep:base64ct", "dep:bincode"] csr = [] hydration = ["csr", "dep:bincode"] wasi = ["gloo/wasi"] -default = ["wasi"] +default = [] [package.metadata.docs.rs] all-features = true From ff4a0bab172e884b6965a3a56ef03adebcc08eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 21 Nov 2023 15:30:35 +0800 Subject: [PATCH 10/88] add yew-router suites for demo --- examples/wasi_ssr_module/Cargo.toml | 1 + examples/wasi_ssr_module/README.md | 2 +- examples/wasi_ssr_module/src/main.rs | 30 ++++++++++++++++++++++++-- examples/wasi_ssr_module/src/router.rs | 29 +++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 examples/wasi_ssr_module/src/router.rs diff --git a/examples/wasi_ssr_module/Cargo.toml b/examples/wasi_ssr_module/Cargo.toml index 7af8656b639..036c5bc5a3c 100644 --- a/examples/wasi_ssr_module/Cargo.toml +++ b/examples/wasi_ssr_module/Cargo.toml @@ -6,6 +6,7 @@ authors = ["langyo "] [dependencies] yew = { path = "../../packages/yew", features = ["ssr", "wasi"] } +yew-router = { path = "../../packages/yew-router", features = ["wasi"] } anyhow = "^1" bytes = "^1" diff --git a/examples/wasi_ssr_module/README.md b/examples/wasi_ssr_module/README.md index 58cacda16b2..5055c03163d 100644 --- a/examples/wasi_ssr_module/README.md +++ b/examples/wasi_ssr_module/README.md @@ -20,4 +20,4 @@ cargo build --package wasi_ssr_module --target wasm32-wasi --release wasmtime target/wasm32-wasi/release/wasi_ssr_module.wasm ``` -> Warn: This example is not yet fully functional. For some unknown reason, this demo only works [outside this project](https://github.com/celestia-island/tairitsu/blob/e032b536984e449e14941c9b755d747a0aa366fb/packages/proto/src/html/render.rs) because the dependency `web-sys` includes some objects forcible. It would have crashed when running on this project that caused by unknown import `__wbindgen_placeholder__::__wbindgen_xxx` has not been defined in the WASI environment. +> Warn: This example is not yet fully functional. For some unknown reason, this demo only works [outside this project](https://github.com/celestia-island/tairitsu/blob/a724e3f34754fadf279f036e2c473cbf2abf4b8b/packages/proto/src/html/render.rs) because the dependency `web-sys` includes some objects forcible. It would have crashed when running on this project that caused by unknown import `__wbindgen_placeholder__::__wbindgen_xxx` has not been defined in the WASI environment. diff --git a/examples/wasi_ssr_module/src/main.rs b/examples/wasi_ssr_module/src/main.rs index f8e1397b78b..db23aa927a5 100644 --- a/examples/wasi_ssr_module/src/main.rs +++ b/examples/wasi_ssr_module/src/main.rs @@ -1,15 +1,42 @@ #![allow(unused_imports)] #![allow(non_snake_case)] +mod router; + use anyhow::Result; + use yew::prelude::*; use yew::{function_component, ServerRenderer}; +use router::{switch, Route}; + +#[function_component] +fn Content() -> Html { + use yew_router::prelude::*; + + html! { + <> +

{"Yew WASI SSR demo"}

+ render={switch} /> + + } +} + #[function_component] fn App() -> Html { + use yew_router::{ + history::{AnyHistory, History, MemoryHistory}, + prelude::*, + }; + + let history = AnyHistory::from(MemoryHistory::new()); + history.push("/"); + html! {
- {"Hello, World!"} + + +
} } @@ -32,7 +59,6 @@ pub async fn render() -> Result { async fn main() -> Result<()> { let ret = render().await?; println!("{}", ret); - println!("{}", "Oh"); Ok(()) } diff --git a/examples/wasi_ssr_module/src/router.rs b/examples/wasi_ssr_module/src/router.rs new file mode 100644 index 00000000000..b37b582cec6 --- /dev/null +++ b/examples/wasi_ssr_module/src/router.rs @@ -0,0 +1,29 @@ +use yew::prelude::*; +use yew_router::prelude::*; + +#[derive(Routable, PartialEq, Eq, Clone, Debug)] +pub enum Route { + #[at("/")] + Portal, + + #[at("/t/:id")] + Thread { id: String }, + + #[not_found] + #[at("/404")] + NotFound, +} + +pub fn switch(routes: Route) -> Html { + match routes { + Route::Portal => { + html! {

{"Hello"}

} + } + Route::Thread { id } => { + html! {

{format!("Thread id {}", id)}

} + } + Route::NotFound => { + html! {

{"Not found"}

} + } + } +} From 1335d2064dffbffb13431f9ac50412122d236d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 21 Nov 2023 15:32:43 +0800 Subject: [PATCH 11/88] fix typo --- examples/wasi_ssr_module/src/main.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/examples/wasi_ssr_module/src/main.rs b/examples/wasi_ssr_module/src/main.rs index db23aa927a5..9f34948c583 100644 --- a/examples/wasi_ssr_module/src/main.rs +++ b/examples/wasi_ssr_module/src/main.rs @@ -4,12 +4,10 @@ mod router; use anyhow::Result; - +use router::{switch, Route}; use yew::prelude::*; use yew::{function_component, ServerRenderer}; -use router::{switch, Route}; - #[function_component] fn Content() -> Html { use yew_router::prelude::*; @@ -24,10 +22,8 @@ fn Content() -> Html { #[function_component] fn App() -> Html { - use yew_router::{ - history::{AnyHistory, History, MemoryHistory}, - prelude::*, - }; + use yew_router::history::{AnyHistory, History, MemoryHistory}; + use yew_router::prelude::*; let history = AnyHistory::from(MemoryHistory::new()); history.push("/"); From 1de83b77e9db83b573677aebbbf66c778355d4fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 21 Nov 2023 18:24:40 +0800 Subject: [PATCH 12/88] Make the async render stream function public --- packages/yew/src/server_renderer.rs | 30 +++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/packages/yew/src/server_renderer.rs b/packages/yew/src/server_renderer.rs index a42b9d73a9d..6c0b271a707 100644 --- a/packages/yew/src/server_renderer.rs +++ b/packages/yew/src/server_renderer.rs @@ -337,9 +337,8 @@ where /// Renders Yew Application into a string Stream. /// - /// This function will not create a new tokio task, - /// but will completely transfer the asynchronous control to the user. - async fn render_stream_async(self) -> impl Stream { + /// It would return a stream that yields a string for each rendered chunk. + pub async fn render_stream_async(self) -> impl Stream { let Self { create_props, hydratable, @@ -354,15 +353,30 @@ where /// Renders Yew Application into a string. /// - /// As opposed to the traditional method, - /// this method completely transfers the asynchronous control to the user, - /// and will not try to create additional tokio threads in the environment internally. - /// - /// This method is most suitable for single-threaded environments such as WASI. + /// This method completely transfers the asynchronous control to the user, + /// and will not try to create additional async runtime tasks in the environment internally. + /// It's most suitable for single-threaded environments such as WASI. pub async fn render_async(self) -> String { let s = self.render_stream_async(); futures::pin_mut!(s); s.await.collect::().await } + + /// Renders Yew Application into a string. + /// + /// This method completely transfers the asynchronous control to the user, + /// and will not try to create additional async runtime tasks in the environment internally. + /// It's most suitable for single-threaded environments such as WASI. + pub async fn render_to_string_async(self, w: &mut String) { + let s = self.render_stream_async(); + futures::pin_mut!(s); + + s.await + .for_each(|m| { + w.push_str(&m); + async {} + }) + .await; + } } From e91895a70edd39f5f7302f618d0f048a44e97b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 30 Nov 2023 21:14:32 +0800 Subject: [PATCH 13/88] Use target_os instead of feature. --- .cargo/config.toml | 2 +- examples/wasi_ssr_module/Cargo.toml | 4 ++-- packages/yew-router/Cargo.toml | 1 - packages/yew-router/src/utils.rs | 4 ++-- packages/yew/Cargo.toml | 1 - packages/yew/src/dom_bundle/bcomp.rs | 4 ++-- packages/yew/src/dom_bundle/blist.rs | 4 ++-- packages/yew/src/dom_bundle/bnode.rs | 2 +- packages/yew/src/dom_bundle/bportal.rs | 2 +- packages/yew/src/dom_bundle/braw.rs | 2 +- packages/yew/src/dom_bundle/btag/attributes.rs | 2 +- packages/yew/src/dom_bundle/btag/listeners.rs | 2 +- packages/yew/src/dom_bundle/btag/mod.rs | 10 +++++----- packages/yew/src/dom_bundle/btext.rs | 6 +++--- packages/yew/src/dom_bundle/position.rs | 4 ++-- .../hooks/use_prepared_state/feat_hydration.rs | 4 ++-- packages/yew/src/html/component/lifecycle.rs | 10 +++++----- packages/yew/src/scheduler.rs | 4 ++-- packages/yew/src/virtual_dom/key.rs | 4 ++-- packages/yew/src/virtual_dom/vlist.rs | 2 +- packages/yew/src/virtual_dom/vsuspense.rs | 2 +- packages/yew/src/virtual_dom/vtag.rs | 2 +- packages/yew/src/virtual_dom/vtext.rs | 2 +- 23 files changed, 39 insertions(+), 41 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 5ea03f75395..00a2269cd87 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,4 +1,4 @@ -[target.'cfg(all(target_arch = "wasm32", not(feature = "wasi")))'] +[target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'] runner = 'wasm-bindgen-test-runner' # This section needs to be last. diff --git a/examples/wasi_ssr_module/Cargo.toml b/examples/wasi_ssr_module/Cargo.toml index 036c5bc5a3c..d38e2201e9c 100644 --- a/examples/wasi_ssr_module/Cargo.toml +++ b/examples/wasi_ssr_module/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" authors = ["langyo "] [dependencies] -yew = { path = "../../packages/yew", features = ["ssr", "wasi"] } -yew-router = { path = "../../packages/yew-router", features = ["wasi"] } +yew = { path = "../../packages/yew", features = ["ssr"] } +yew-router = { path = "../../packages/yew-router" } anyhow = "^1" bytes = "^1" diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index 59b94d2ac02..ad17a9e9c2c 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -38,5 +38,4 @@ version = "0.3" features = ["HtmlHeadElement"] [features] -wasi = ["gloo/wasi"] default = [] diff --git a/packages/yew-router/src/utils.rs b/packages/yew-router/src/utils.rs index 28a9dd4de3a..8b8a7797fd4 100644 --- a/packages/yew-router/src/utils.rs +++ b/packages/yew-router/src/utils.rs @@ -42,7 +42,7 @@ pub fn fetch_base_url() -> Option { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] pub fn compose_path(pathname: &str, query: &str) -> Option { gloo::utils::window() .location() @@ -55,7 +55,7 @@ pub fn compose_path(pathname: &str, query: &str) -> Option { }) } -#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] +#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] pub fn compose_path(pathname: &str, query: &str) -> Option { let query = query.trim(); diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index 5301499a811..89cd95b4c6c 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -95,7 +95,6 @@ features = ["ShadowRootInit", "ShadowRootMode", "HtmlButtonElement"] ssr = ["dep:html-escape", "dep:base64ct", "dep:bincode"] csr = [] hydration = ["csr", "dep:bincode"] -wasi = ["gloo/wasi"] default = [] [package.metadata.docs.rs] diff --git a/packages/yew/src/dom_bundle/bcomp.rs b/packages/yew/src/dom_bundle/bcomp.rs index 05a4f546e4c..8ae9391b59f 100644 --- a/packages/yew/src/dom_bundle/bcomp.rs +++ b/packages/yew/src/dom_bundle/bcomp.rs @@ -158,7 +158,7 @@ mod feat_hydration { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod tests { use gloo::utils::document; @@ -391,7 +391,7 @@ mod tests { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod layout_tests { extern crate self as yew; diff --git a/packages/yew/src/dom_bundle/blist.rs b/packages/yew/src/dom_bundle/blist.rs index 66f964b6adf..c29b8490f3f 100644 --- a/packages/yew/src/dom_bundle/blist.rs +++ b/packages/yew/src/dom_bundle/blist.rs @@ -490,7 +490,7 @@ mod feat_hydration { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod layout_tests { extern crate self as yew; @@ -567,7 +567,7 @@ mod layout_tests { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod layout_tests_keys { extern crate self as yew; diff --git a/packages/yew/src/dom_bundle/bnode.rs b/packages/yew/src/dom_bundle/bnode.rs index 31e9bd04f8b..5fcd6a28d43 100644 --- a/packages/yew/src/dom_bundle/bnode.rs +++ b/packages/yew/src/dom_bundle/bnode.rs @@ -311,7 +311,7 @@ mod feat_hydration { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod layout_tests { use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure}; diff --git a/packages/yew/src/dom_bundle/bportal.rs b/packages/yew/src/dom_bundle/bportal.rs index 1b8062b40ed..0c880f8a2f4 100644 --- a/packages/yew/src/dom_bundle/bportal.rs +++ b/packages/yew/src/dom_bundle/bportal.rs @@ -118,7 +118,7 @@ impl BPortal { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod layout_tests { extern crate self as yew; diff --git a/packages/yew/src/dom_bundle/braw.rs b/packages/yew/src/dom_bundle/braw.rs index 726c5527140..c6aeefb8f12 100644 --- a/packages/yew/src/dom_bundle/braw.rs +++ b/packages/yew/src/dom_bundle/braw.rs @@ -153,7 +153,7 @@ mod feat_hydration { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod tests { use gloo::utils::document; diff --git a/packages/yew/src/dom_bundle/btag/attributes.rs b/packages/yew/src/dom_bundle/btag/attributes.rs index 19c898cf2dd..a07a30c7a03 100644 --- a/packages/yew/src/dom_bundle/btag/attributes.rs +++ b/packages/yew/src/dom_bundle/btag/attributes.rs @@ -272,7 +272,7 @@ impl Apply for Attributes { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod tests { use std::rc::Rc; diff --git a/packages/yew/src/dom_bundle/btag/listeners.rs b/packages/yew/src/dom_bundle/btag/listeners.rs index 96bb81ff286..7e832528458 100644 --- a/packages/yew/src/dom_bundle/btag/listeners.rs +++ b/packages/yew/src/dom_bundle/btag/listeners.rs @@ -196,7 +196,7 @@ impl Registry { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod tests { use std::marker::PhantomData; diff --git a/packages/yew/src/dom_bundle/btag/mod.rs b/packages/yew/src/dom_bundle/btag/mod.rs index d7446e5ec95..50b58bdc33e 100644 --- a/packages/yew/src/dom_bundle/btag/mod.rs +++ b/packages/yew/src/dom_bundle/btag/mod.rs @@ -288,13 +288,13 @@ impl BTag { self.key.as_ref() } - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] fn reference(&self) -> &Element { &self.reference } - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] fn children(&self) -> Option<&BNode> { match &self.inner { @@ -303,7 +303,7 @@ impl BTag { } } - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] fn tag(&self) -> &str { match &self.inner { @@ -403,7 +403,7 @@ mod feat_hydration { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod tests { use std::rc::Rc; @@ -1000,7 +1000,7 @@ mod tests { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod layout_tests { extern crate self as yew; diff --git a/packages/yew/src/dom_bundle/btext.rs b/packages/yew/src/dom_bundle/btext.rs index 0e807ffd521..d8ffbdc4f0e 100644 --- a/packages/yew/src/dom_bundle/btext.rs +++ b/packages/yew/src/dom_bundle/btext.rs @@ -146,12 +146,12 @@ mod feat_hydration { mod test { extern crate self as yew; - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure}; use crate::html; - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] wasm_bindgen_test_configure!(run_in_browser); #[test] @@ -166,7 +166,7 @@ mod test { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod layout_tests { extern crate self as yew; diff --git a/packages/yew/src/dom_bundle/position.rs b/packages/yew/src/dom_bundle/position.rs index 167c1c4cfdd..191b3df50f0 100644 --- a/packages/yew/src/dom_bundle/position.rs +++ b/packages/yew/src/dom_bundle/position.rs @@ -124,7 +124,7 @@ impl DomSlot { }); } - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] fn get(&self) -> Option { self.with_next_sibling(|n| n.cloned()) @@ -180,7 +180,7 @@ impl DynamicDomSlot { } } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod layout_tests { use gloo::utils::document; diff --git a/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs b/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs index 395b9a0edb8..b488916a774 100644 --- a/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs +++ b/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs @@ -12,7 +12,7 @@ use crate::functional::{use_state, Hook, HookContext}; use crate::platform::spawn_local; use crate::suspense::{Suspension, SuspensionResult}; -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] async fn decode_base64(s: &str) -> Result, JsValue> { use gloo::utils::window; use js_sys::Uint8Array; @@ -34,7 +34,7 @@ async fn decode_base64(s: &str) -> Result, JsValue> { Ok(content_array.to_vec()) } -#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] +#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] async fn decode_base64(_s: &str) -> Result, JsValue> { unreachable!("this function is not callable under non-wasm targets!"); } diff --git a/packages/yew/src/html/component/lifecycle.rs b/packages/yew/src/html/component/lifecycle.rs index 3e53b24611b..d1263fa0670 100644 --- a/packages/yew/src/html/component/lifecycle.rs +++ b/packages/yew/src/html/component/lifecycle.rs @@ -740,7 +740,7 @@ mod feat_csr { #[cfg(feature = "csr")] pub(super) use feat_csr::*; -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod tests { extern crate self as yew; @@ -797,7 +797,7 @@ mod tests { struct Props { lifecycle: Rc>>, #[allow(dead_code)] - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] create_message: Option, update_message: RefCell>, view_message: RefCell>, @@ -814,7 +814,7 @@ mod tests { fn create(ctx: &Context) -> Self { ctx.props().lifecycle.borrow_mut().push("create".into()); - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] if let Some(msg) = ctx.props().create_message { ctx.link().send_message(msg); } @@ -901,7 +901,7 @@ mod tests { test_lifecycle( Props { lifecycle: lifecycle.clone(), - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] create_message: Some(false), ..Props::default() }, @@ -982,7 +982,7 @@ mod tests { test_lifecycle( Props { lifecycle, - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] create_message: Some(true), update_message: RefCell::new(Some(true)), ..Props::default() diff --git a/packages/yew/src/scheduler.rs b/packages/yew/src/scheduler.rs index 7761bb256e6..7c7ffdb7da6 100644 --- a/packages/yew/src/scheduler.rs +++ b/packages/yew/src/scheduler.rs @@ -220,7 +220,7 @@ pub(crate) fn start_now() { }); } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] mod arch { use crate::platform::spawn_local; @@ -233,7 +233,7 @@ mod arch { } } -#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] +#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] mod arch { // Delayed rendering is not very useful in the context of server-side rendering. // There are no event listeners or other high priority events that need to be diff --git a/packages/yew/src/virtual_dom/key.rs b/packages/yew/src/virtual_dom/key.rs index 3027657795e..0bd68f61dc6 100644 --- a/packages/yew/src/virtual_dom/key.rs +++ b/packages/yew/src/virtual_dom/key.rs @@ -72,12 +72,12 @@ key_impl_from_to_string!(isize); mod test { use std::rc::Rc; - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure}; use crate::html; - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] wasm_bindgen_test_configure!(run_in_browser); #[test] diff --git a/packages/yew/src/virtual_dom/vlist.rs b/packages/yew/src/virtual_dom/vlist.rs index d23c8347a65..b9ac687033a 100644 --- a/packages/yew/src/virtual_dom/vlist.rs +++ b/packages/yew/src/virtual_dom/vlist.rs @@ -275,7 +275,7 @@ mod feat_ssr { } } -#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] +#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] #[cfg(feature = "ssr")] #[cfg(test)] mod ssr_tests { diff --git a/packages/yew/src/virtual_dom/vsuspense.rs b/packages/yew/src/virtual_dom/vsuspense.rs index e0d2432c54c..c3d393b64f6 100644 --- a/packages/yew/src/virtual_dom/vsuspense.rs +++ b/packages/yew/src/virtual_dom/vsuspense.rs @@ -61,7 +61,7 @@ mod feat_ssr { } } -#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] +#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] #[cfg(feature = "ssr")] #[cfg(test)] mod ssr_tests { diff --git a/packages/yew/src/virtual_dom/vtag.rs b/packages/yew/src/virtual_dom/vtag.rs index f5706d7b7f2..c2ccbec0a81 100644 --- a/packages/yew/src/virtual_dom/vtag.rs +++ b/packages/yew/src/virtual_dom/vtag.rs @@ -555,7 +555,7 @@ mod feat_ssr { } } -#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] +#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] #[cfg(feature = "ssr")] #[cfg(test)] mod ssr_tests { diff --git a/packages/yew/src/virtual_dom/vtext.rs b/packages/yew/src/virtual_dom/vtext.rs index 75d9961ec65..fd7fd0f5a12 100644 --- a/packages/yew/src/virtual_dom/vtext.rs +++ b/packages/yew/src/virtual_dom/vtext.rs @@ -68,7 +68,7 @@ mod feat_ssr { } } -#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] +#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] #[cfg(feature = "ssr")] #[cfg(test)] mod ssr_tests { From cc02f9304db7b95fe63c685092f003c8e56e280b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 1 Dec 2023 14:41:51 +0800 Subject: [PATCH 14/88] Renew gloo-history's patch. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 35bc1f280b2..a178501fd18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,5 +16,5 @@ panic = "abort" opt-level = 3 [patch.crates-io] -gloo = { git = "https://github.com/langyo/gloo", branch = "wasi-fix" } +gloo = { git = "https://github.com/rustwasm/gloo", rev = "7516f26" } prokio = { git = "https://github.com/langyo/prokio", branch = "wasi-fix" } From d9bae8dd388a04edf51fcdc812d0d35fbc3196d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 5 Dec 2023 13:40:10 +0800 Subject: [PATCH 15/88] Exclude WASI example to avoid web-sys. --- Cargo.lock | 153 ++- Cargo.toml | 1 + examples/wasi_ssr_module/.gitignore | 1 + examples/wasi_ssr_module/Cargo.lock | 1583 +++++++++++++++++++++++++++ examples/wasi_ssr_module/README.md | 4 +- 5 files changed, 1695 insertions(+), 47 deletions(-) create mode 100644 examples/wasi_ssr_module/.gitignore create mode 100644 examples/wasi_ssr_module/Cargo.lock diff --git a/Cargo.lock b/Cargo.lock index b560bd7eaef..4b4508dfc15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -103,9 +103,9 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", @@ -118,7 +118,7 @@ version = "0.0.1" dependencies = [ "chrono", "futures 0.3.29", - "gloo-net 0.4.0", + "gloo-net 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "yew", ] @@ -1105,20 +1105,19 @@ dependencies = [ [[package]] name = "gloo" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd35526c28cc55c1db77aed6296de58677dbab863b118483a27845631d870249" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" dependencies = [ "gloo-console 0.3.0", "gloo-dialogs 0.2.0", "gloo-events 0.2.0", "gloo-file 0.3.0", - "gloo-history 0.2.0", - "gloo-net 0.4.0", + "gloo-history 0.2.1", + "gloo-net 0.4.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", "gloo-render 0.2.0", "gloo-storage 0.3.0", "gloo-timers 0.3.0", - "gloo-utils 0.2.0", - "gloo-worker 0.4.1", + "gloo-utils 0.2.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", + "gloo-worker 0.4.1 (git+https://github.com/rustwasm/gloo?rev=7516f26)", ] [[package]] @@ -1137,10 +1136,9 @@ dependencies = [ [[package]] name = "gloo-console" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a17868f56b4a24f677b17c8cb69958385102fa879418052d60b50bc1727e261" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" dependencies = [ - "gloo-utils 0.2.0", + "gloo-utils 0.2.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", "js-sys", "serde", "wasm-bindgen", @@ -1160,8 +1158,7 @@ dependencies = [ [[package]] name = "gloo-dialogs" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4748e10122b01435750ff530095b1217cf6546173459448b83913ebe7815df" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" dependencies = [ "wasm-bindgen", "web-sys", @@ -1180,8 +1177,7 @@ dependencies = [ [[package]] name = "gloo-events" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27c26fb45f7c385ba980f5fa87ac677e363949e065a083722697ef1b2cc91e41" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" dependencies = [ "wasm-bindgen", "web-sys", @@ -1202,8 +1198,7 @@ dependencies = [ [[package]] name = "gloo-file" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97563d71863fb2824b2e974e754a81d19c4a7ec47b09ced8a0e6656b6d54bd1f" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" dependencies = [ "futures-channel", "gloo-events 0.2.0", @@ -1221,7 +1216,7 @@ dependencies = [ "gloo-events 0.1.2", "gloo-utils 0.1.7", "serde", - "serde-wasm-bindgen", + "serde-wasm-bindgen 0.5.0", "serde_urlencoded", "thiserror", "wasm-bindgen", @@ -1230,14 +1225,14 @@ dependencies = [ [[package]] name = "gloo-history" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91be9f3dd048f35a59c8de3d716ef6d568360078c73ed35a7700776ed53153c8" +version = "0.2.1" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" dependencies = [ + "getrandom", "gloo-events 0.2.0", - "gloo-utils 0.2.0", + "gloo-utils 0.2.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", "serde", - "serde-wasm-bindgen", + "serde-wasm-bindgen 0.6.1", "serde_urlencoded", "thiserror", "wasm-bindgen", @@ -1274,7 +1269,27 @@ dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils 0.2.0", + "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "http", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-net" +version = "0.4.0" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils 0.2.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", "http", "js-sys", "pin-project", @@ -1299,8 +1314,7 @@ dependencies = [ [[package]] name = "gloo-render" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56008b6744713a8e8d98ac3dcb7d06543d5662358c9c805b4ce2167ad4649833" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" dependencies = [ "wasm-bindgen", "web-sys", @@ -1324,10 +1338,9 @@ dependencies = [ [[package]] name = "gloo-storage" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc8031e8c92758af912f9bc08fbbadd3c6f3cfcbf6b64cdf3d6a81f0139277a" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" dependencies = [ - "gloo-utils 0.2.0", + "gloo-utils 0.2.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", "js-sys", "serde", "serde_json", @@ -1349,8 +1362,7 @@ dependencies = [ [[package]] name = "gloo-timers" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" dependencies = [ "futures-channel", "futures-core", @@ -1384,6 +1396,18 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gloo-worker" version = "0.2.1" @@ -1409,8 +1433,26 @@ checksum = "f2cbd4c35cc3a2b1fb792318acc06bd514193f6d058173da5cdbcdabe6514303" dependencies = [ "bincode", "futures 0.3.29", - "gloo-utils 0.2.0", - "gloo-worker-macros", + "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-worker-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys", + "pinned", + "serde", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-worker" +version = "0.4.1" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +dependencies = [ + "bincode", + "futures 0.3.29", + "gloo-utils 0.2.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", + "gloo-worker-macros 0.1.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", "js-sys", "pinned", "serde", @@ -1432,6 +1474,17 @@ dependencies = [ "syn 2.0.38", ] +[[package]] +name = "gloo-worker-macros" +version = "0.1.0" +source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "h2" version = "0.3.20" @@ -1873,9 +1926,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" @@ -1951,9 +2004,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lipsum" @@ -2398,8 +2451,7 @@ dependencies = [ [[package]] name = "prokio" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b55e106e5791fa5a13abd13c85d6127312e8e09098059ca2bc9b03ca4cf488" +source = "git+https://github.com/langyo/prokio?branch=wasi-fix#395c868933dd84543e11af93011a158a37a10606" dependencies = [ "futures 0.3.29", "gloo 0.8.1", @@ -2604,14 +2656,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.13" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.10", + "linux-raw-sys 0.4.11", "windows-sys 0.48.0", ] @@ -2706,6 +2758,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + [[package]] name = "serde_derive" version = "1.0.190" @@ -2998,7 +3061,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.13", + "rustix 0.38.25", "windows-sys 0.48.0", ] @@ -3857,7 +3920,7 @@ name = "yew-agent" version = "0.3.0" dependencies = [ "futures 0.3.29", - "gloo-worker 0.4.1", + "gloo-worker 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "wasm-bindgen", "yew", diff --git a/Cargo.toml b/Cargo.toml index a178501fd18..61cefa91188 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,6 @@ [workspace] members = ["packages/*", "tools/*", "examples/*"] +exclude = ["examples/wasi_ssr_module"] default-members = ["packages/*"] resolver = "2" diff --git a/examples/wasi_ssr_module/.gitignore b/examples/wasi_ssr_module/.gitignore new file mode 100644 index 00000000000..ea8c4bf7f35 --- /dev/null +++ b/examples/wasi_ssr_module/.gitignore @@ -0,0 +1 @@ +/target diff --git a/examples/wasi_ssr_module/Cargo.lock b/examples/wasi_ssr_module/Cargo.lock new file mode 100644 index 00000000000..197bd6a9757 --- /dev/null +++ b/examples/wasi_ssr_module/Cargo.lock @@ -0,0 +1,1583 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "anymap2" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "dns-parser" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" +dependencies = [ + "byteorder", + "quick-error", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gloo" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d" +dependencies = [ + "gloo-console 0.2.3", + "gloo-dialogs 0.1.1", + "gloo-events 0.1.2", + "gloo-file 0.2.3", + "gloo-history 0.1.5", + "gloo-net 0.3.1", + "gloo-render 0.1.1", + "gloo-storage 0.2.2", + "gloo-timers 0.2.6", + "gloo-utils 0.1.7", + "gloo-worker 0.2.1", +] + +[[package]] +name = "gloo" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd35526c28cc55c1db77aed6296de58677dbab863b118483a27845631d870249" +dependencies = [ + "gloo-console 0.3.0", + "gloo-dialogs 0.2.0", + "gloo-events 0.2.0", + "gloo-file 0.3.0", + "gloo-history 0.2.1", + "gloo-net 0.4.0", + "gloo-render 0.2.0", + "gloo-storage 0.3.0", + "gloo-timers 0.3.0", + "gloo-utils 0.2.0", + "gloo-worker 0.4.0", +] + +[[package]] +name = "gloo-console" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f" +dependencies = [ + "gloo-utils 0.1.7", + "js-sys", + "serde", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-console" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a17868f56b4a24f677b17c8cb69958385102fa879418052d60b50bc1727e261" +dependencies = [ + "gloo-utils 0.2.0", + "js-sys", + "serde", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-dialogs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-dialogs" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4748e10122b01435750ff530095b1217cf6546173459448b83913ebe7815df" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-events" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b107f8abed8105e4182de63845afcc7b69c098b7852a813ea7462a320992fc" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-events" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27c26fb45f7c385ba980f5fa87ac677e363949e065a083722697ef1b2cc91e41" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-file" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7" +dependencies = [ + "gloo-events 0.1.2", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-file" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97563d71863fb2824b2e974e754a81d19c4a7ec47b09ced8a0e6656b6d54bd1f" +dependencies = [ + "futures-channel", + "gloo-events 0.2.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-history" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f" +dependencies = [ + "gloo-events 0.1.2", + "gloo-utils 0.1.7", + "serde", + "serde-wasm-bindgen 0.5.0", + "serde_urlencoded", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-history" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4022e82f5f9e03cb1251b13c0a967e0600e97aa179c617f6519bac40640160" +dependencies = [ + "getrandom", + "gloo-events 0.2.0", + "gloo-utils 0.2.0", + "serde", + "serde-wasm-bindgen 0.6.1", + "serde_urlencoded", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-net" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66b4e3c7d9ed8d315fd6b97c8b1f74a7c6ecbbc2320e65ae7ed38b7068cc620" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils 0.1.7", + "http", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-net" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ac9e8288ae2c632fa9f8657ac70bfe38a1530f345282d7ba66a1f70b72b7dc4" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils 0.2.0", + "http", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-render" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-render" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56008b6744713a8e8d98ac3dcb7d06543d5662358c9c805b4ce2167ad4649833" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-storage" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480" +dependencies = [ + "gloo-utils 0.1.7", + "js-sys", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-storage" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc8031e8c92758af912f9bc08fbbadd3c6f3cfcbf6b64cdf3d6a81f0139277a" +dependencies = [ + "gloo-utils 0.2.0", + "js-sys", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "gloo-utils" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-worker" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13471584da78061a28306d1359dd0178d8d6fc1c7c80e5e35d27260346e0516a" +dependencies = [ + "anymap2", + "bincode", + "gloo-console 0.2.3", + "gloo-utils 0.1.7", + "js-sys", + "serde", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-worker" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76495d3dd87de51da268fa3a593da118ab43eb7f8809e17eb38d3319b424e400" +dependencies = [ + "bincode", + "futures", + "gloo-utils 0.2.0", + "gloo-worker-macros", + "js-sys", + "pinned", + "serde", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-worker-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956caa58d4857bc9941749d55e4bd3000032d8212762586fa5705632967140e7" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "implicit-clone" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc06a255cbf402a52ae399c05a518c68c569c916ea11423620111df576b9b9bb" +dependencies = [ + "implicit-clone-derive", + "indexmap", +] + +[[package]] +name = "implicit-clone-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9311685eb9a34808bbb0608ad2fcab9ae216266beca5848613e95553ac914e3b" +dependencies = [ + "quote", + "syn 2.0.39", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "js-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio_wasi" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826049861effde5245d1107a8eb21846bd8fc7a16486e60be4d0568361c947e5" +dependencies = [ + "libc", + "log", + "wasi", + "wasmedge_wasi_socket", + "windows-sys 0.48.0", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pinned" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a829027bd95e54cfe13e3e258a1ae7b645960553fb82b75ff852c29688ee595b" +dependencies = [ + "futures", + "rustversion", + "thiserror", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +dependencies = [ + "proc-macro2", + "syn 2.0.39", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prokio" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b55e106e5791fa5a13abd13c85d6127312e8e09098059ca2bc9b03ca4cf488" +dependencies = [ + "futures", + "gloo 0.8.1", + "num_cpus", + "once_cell", + "pin-project", + "pinned", + "tokio", + "tokio-stream", + "wasm-bindgen-futures", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags", +] + +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "serde" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_derive" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tokio" +version = "1.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +dependencies = [ + "backtrace", + "pin-project-lite", +] + +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio_wasi" +version = "1.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3a7120cdbe4719425355a0f6b59191c67ab5ed4eebc64bdb12ea3bc8776adf" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio_wasi", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "wasmedge_wasi_socket", + "windows-sys 0.45.0", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasi_ssr_module" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytes", + "lazy_static", + "serde", + "serde_json", + "tokio_wasi", + "yew", + "yew-router", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" + +[[package]] +name = "wasmedge_wasi_socket" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900a4c17690ef5efcccbdc833853b3e48f2a0de589427a609ddb5e866e1cb91f" +dependencies = [ + "bytes", + "dns-parser", + "libc", + "rand", +] + +[[package]] +name = "web-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0383266b19108dfc6314a56047aa545a1b4d1be60e799b4dbdd407b56402704b" +dependencies = [ + "memchr", +] + +[[package]] +name = "yew" +version = "0.21.0" +dependencies = [ + "base64ct", + "bincode", + "console_error_panic_hook", + "futures", + "gloo 0.10.0", + "html-escape", + "implicit-clone", + "indexmap", + "js-sys", + "prokio", + "rustversion", + "serde", + "slab", + "thiserror", + "tokio", + "tracing", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "yew-macro", +] + +[[package]] +name = "yew-macro" +version = "0.21.0" +dependencies = [ + "once_cell", + "prettyplease", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "yew-router" +version = "0.18.0" +dependencies = [ + "gloo 0.10.0", + "js-sys", + "route-recognizer", + "serde", + "serde_urlencoded", + "tracing", + "urlencoding", + "wasm-bindgen", + "web-sys", + "yew", + "yew-router-macro", +] + +[[package]] +name = "yew-router-macro" +version = "0.18.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] diff --git a/examples/wasi_ssr_module/README.md b/examples/wasi_ssr_module/README.md index 5055c03163d..8cd39c587f3 100644 --- a/examples/wasi_ssr_module/README.md +++ b/examples/wasi_ssr_module/README.md @@ -9,7 +9,7 @@ It depends on [wasmtime](https://wasmtime.dev)'s WASI preview2. To build the example, run the following command from the root of the repository: ```bash -cargo build --package wasi_ssr_module --target wasm32-wasi --release +cargo build --manifest-path examples/wasi_ssr_module/Cargo.toml --target wasm32-wasi --release ``` ## Running @@ -17,7 +17,7 @@ cargo build --package wasi_ssr_module --target wasm32-wasi --release > Note: This example requires the wasmtime CLI to be installed. See [wasmtime's installation instructions](https://docs.wasmtime.dev/cli-install.html) for more information. ```bash -wasmtime target/wasm32-wasi/release/wasi_ssr_module.wasm +wasmtime examples/wasi_ssr_module/target/wasm32-wasi/release/wasi_ssr_module.wasm ``` > Warn: This example is not yet fully functional. For some unknown reason, this demo only works [outside this project](https://github.com/celestia-island/tairitsu/blob/a724e3f34754fadf279f036e2c473cbf2abf4b8b/packages/proto/src/html/render.rs) because the dependency `web-sys` includes some objects forcible. It would have crashed when running on this project that caused by unknown import `__wbindgen_placeholder__::__wbindgen_xxx` has not been defined in the WASI environment. From bf0c89811645b9345b15e88cee30979bbbbc39a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 5 Dec 2023 13:58:23 +0800 Subject: [PATCH 16/88] Try to add CI for WASI example. --- .github/workflows/main-checks.yml | 42 +++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index e0bb2ba7e81..fb723a24a30 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -3,11 +3,11 @@ name: Main Checks on: pull_request: paths: - - ".github/workflows/main-checks.yml" - - "ci/**" - - "packages/**/*" - - "Cargo.toml" - - "Cargo.lock" + - '.github/workflows/main-checks.yml' + - 'ci/**' + - 'packages/**/*' + - 'Cargo.toml' + - 'Cargo.lock' push: branches: [master] @@ -146,6 +146,38 @@ jobs: RUSTFLAGS: ${{ matrix.toolchain == 'nightly' && '--cfg nightly_yew' || '' }} run: cargo test -p yew --all-features + example-runnable-tests-on-wasi: + name: Example Runnable Tests on WASI + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + toolchain: + - 1.64.0 + - stable + - nightly + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ matrix.toolchain }} + target: wasm32-wasi + + - name: Install wasmtime + run: | + wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasmtime-v15.0.1-x86_64-linux.tar.xz + tar xf wasmtime-v15.0.1-x86_64-linux.tar.xz + mv wasmtime-v15.0.1-x86_64-linux/wasmtime-min ~/wasmtime + rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux + chmod +x ~/wasmtime + + - uses: Swatinem/rust-cache@v2 + + - name: Build and run example wasi_ssr_module + run: | + cargo build --manifest-path examples/wasi_ssr_module/Cargo.toml --target wasm32-wasi + ~/wasmtime examples/wasi_ssr_module/target/wasm32-wasi/debug/wasi_ssr_module.wasm + test-lints: name: Test lints on nightly runs-on: ubuntu-latest From 0286b6987d6fe1c202a55d4ebacab18c271204b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 5 Dec 2023 14:10:31 +0800 Subject: [PATCH 17/88] Fix CI. --- .github/workflows/main-checks.yml | 2 +- examples/wasi_ssr_module/.gitignore | 1 + examples/wasi_ssr_module/Cargo.lock | 1583 --------------------------- 3 files changed, 2 insertions(+), 1584 deletions(-) delete mode 100644 examples/wasi_ssr_module/Cargo.lock diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index fb723a24a30..e825879d6ee 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -167,7 +167,7 @@ jobs: run: | wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasmtime-v15.0.1-x86_64-linux.tar.xz tar xf wasmtime-v15.0.1-x86_64-linux.tar.xz - mv wasmtime-v15.0.1-x86_64-linux/wasmtime-min ~/wasmtime + mv wasmtime-v15.0.1-x86_64-linux/wasmtime ~/wasmtime rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux chmod +x ~/wasmtime diff --git a/examples/wasi_ssr_module/.gitignore b/examples/wasi_ssr_module/.gitignore index ea8c4bf7f35..4570d34ab1f 100644 --- a/examples/wasi_ssr_module/.gitignore +++ b/examples/wasi_ssr_module/.gitignore @@ -1 +1,2 @@ /target +Cargo.toml diff --git a/examples/wasi_ssr_module/Cargo.lock b/examples/wasi_ssr_module/Cargo.lock deleted file mode 100644 index 197bd6a9757..00000000000 --- a/examples/wasi_ssr_module/Cargo.lock +++ /dev/null @@ -1,1583 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "anymap2" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "dns-parser" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" -dependencies = [ - "byteorder", - "quick-error", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" - -[[package]] -name = "futures-io" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-macro" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "futures-sink" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" - -[[package]] -name = "futures-task" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" - -[[package]] -name = "futures-util" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "gloo" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d" -dependencies = [ - "gloo-console 0.2.3", - "gloo-dialogs 0.1.1", - "gloo-events 0.1.2", - "gloo-file 0.2.3", - "gloo-history 0.1.5", - "gloo-net 0.3.1", - "gloo-render 0.1.1", - "gloo-storage 0.2.2", - "gloo-timers 0.2.6", - "gloo-utils 0.1.7", - "gloo-worker 0.2.1", -] - -[[package]] -name = "gloo" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd35526c28cc55c1db77aed6296de58677dbab863b118483a27845631d870249" -dependencies = [ - "gloo-console 0.3.0", - "gloo-dialogs 0.2.0", - "gloo-events 0.2.0", - "gloo-file 0.3.0", - "gloo-history 0.2.1", - "gloo-net 0.4.0", - "gloo-render 0.2.0", - "gloo-storage 0.3.0", - "gloo-timers 0.3.0", - "gloo-utils 0.2.0", - "gloo-worker 0.4.0", -] - -[[package]] -name = "gloo-console" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f" -dependencies = [ - "gloo-utils 0.1.7", - "js-sys", - "serde", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-console" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a17868f56b4a24f677b17c8cb69958385102fa879418052d60b50bc1727e261" -dependencies = [ - "gloo-utils 0.2.0", - "js-sys", - "serde", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-dialogs" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-dialogs" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4748e10122b01435750ff530095b1217cf6546173459448b83913ebe7815df" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-events" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b107f8abed8105e4182de63845afcc7b69c098b7852a813ea7462a320992fc" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-events" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27c26fb45f7c385ba980f5fa87ac677e363949e065a083722697ef1b2cc91e41" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-file" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7" -dependencies = [ - "gloo-events 0.1.2", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-file" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97563d71863fb2824b2e974e754a81d19c4a7ec47b09ced8a0e6656b6d54bd1f" -dependencies = [ - "futures-channel", - "gloo-events 0.2.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-history" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f" -dependencies = [ - "gloo-events 0.1.2", - "gloo-utils 0.1.7", - "serde", - "serde-wasm-bindgen 0.5.0", - "serde_urlencoded", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-history" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4022e82f5f9e03cb1251b13c0a967e0600e97aa179c617f6519bac40640160" -dependencies = [ - "getrandom", - "gloo-events 0.2.0", - "gloo-utils 0.2.0", - "serde", - "serde-wasm-bindgen 0.6.1", - "serde_urlencoded", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-net" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66b4e3c7d9ed8d315fd6b97c8b1f74a7c6ecbbc2320e65ae7ed38b7068cc620" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "gloo-utils 0.1.7", - "http", - "js-sys", - "pin-project", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-net" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ac9e8288ae2c632fa9f8657ac70bfe38a1530f345282d7ba66a1f70b72b7dc4" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "gloo-utils 0.2.0", - "http", - "js-sys", - "pin-project", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-render" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-render" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56008b6744713a8e8d98ac3dcb7d06543d5662358c9c805b4ce2167ad4649833" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-storage" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480" -dependencies = [ - "gloo-utils 0.1.7", - "js-sys", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-storage" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc8031e8c92758af912f9bc08fbbadd3c6f3cfcbf6b64cdf3d6a81f0139277a" -dependencies = [ - "gloo-utils 0.2.0", - "js-sys", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "gloo-timers" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "gloo-utils" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-utils" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-worker" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13471584da78061a28306d1359dd0178d8d6fc1c7c80e5e35d27260346e0516a" -dependencies = [ - "anymap2", - "bincode", - "gloo-console 0.2.3", - "gloo-utils 0.1.7", - "js-sys", - "serde", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-worker" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76495d3dd87de51da268fa3a593da118ab43eb7f8809e17eb38d3319b424e400" -dependencies = [ - "bincode", - "futures", - "gloo-utils 0.2.0", - "gloo-worker-macros", - "js-sys", - "pinned", - "serde", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-worker-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956caa58d4857bc9941749d55e4bd3000032d8212762586fa5705632967140e7" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "html-escape" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" -dependencies = [ - "utf8-width", -] - -[[package]] -name = "http" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "implicit-clone" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc06a255cbf402a52ae399c05a518c68c569c916ea11423620111df576b9b9bb" -dependencies = [ - "implicit-clone-derive", - "indexmap", -] - -[[package]] -name = "implicit-clone-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9311685eb9a34808bbb0608ad2fcab9ae216266beca5848613e95553ac914e3b" -dependencies = [ - "quote", - "syn 2.0.39", -] - -[[package]] -name = "indexmap" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.150" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio_wasi" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826049861effde5245d1107a8eb21846bd8fc7a16486e60be4d0568361c947e5" -dependencies = [ - "libc", - "log", - "wasi", - "wasmedge_wasi_socket", - "windows-sys 0.48.0", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pinned" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a829027bd95e54cfe13e3e258a1ae7b645960553fb82b75ff852c29688ee595b" -dependencies = [ - "futures", - "rustversion", - "thiserror", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "prettyplease" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" -dependencies = [ - "proc-macro2", - "syn 2.0.39", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prokio" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b55e106e5791fa5a13abd13c85d6127312e8e09098059ca2bc9b03ca4cf488" -dependencies = [ - "futures", - "gloo 0.8.1", - "num_cpus", - "once_cell", - "pin-project", - "pinned", - "tokio", - "tokio-stream", - "wasm-bindgen-futures", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags", -] - -[[package]] -name = "route-recognizer" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde_derive" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "tokio" -version = "1.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" -dependencies = [ - "backtrace", - "pin-project-lite", -] - -[[package]] -name = "tokio-macros" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio_wasi" -version = "1.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3a7120cdbe4719425355a0f6b59191c67ab5ed4eebc64bdb12ea3bc8776adf" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio_wasi", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "wasmedge_wasi_socket", - "windows-sys 0.45.0", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "utf8-width" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasi_ssr_module" -version = "0.1.0" -dependencies = [ - "anyhow", - "bytes", - "lazy_static", - "serde", - "serde_json", - "tokio_wasi", - "yew", - "yew-router", -] - -[[package]] -name = "wasm-bindgen" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" - -[[package]] -name = "wasmedge_wasi_socket" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900a4c17690ef5efcccbdc833853b3e48f2a0de589427a609ddb5e866e1cb91f" -dependencies = [ - "bytes", - "dns-parser", - "libc", - "rand", -] - -[[package]] -name = "web-sys" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winnow" -version = "0.5.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0383266b19108dfc6314a56047aa545a1b4d1be60e799b4dbdd407b56402704b" -dependencies = [ - "memchr", -] - -[[package]] -name = "yew" -version = "0.21.0" -dependencies = [ - "base64ct", - "bincode", - "console_error_panic_hook", - "futures", - "gloo 0.10.0", - "html-escape", - "implicit-clone", - "indexmap", - "js-sys", - "prokio", - "rustversion", - "serde", - "slab", - "thiserror", - "tokio", - "tracing", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "yew-macro", -] - -[[package]] -name = "yew-macro" -version = "0.21.0" -dependencies = [ - "once_cell", - "prettyplease", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "yew-router" -version = "0.18.0" -dependencies = [ - "gloo 0.10.0", - "js-sys", - "route-recognizer", - "serde", - "serde_urlencoded", - "tracing", - "urlencoding", - "wasm-bindgen", - "web-sys", - "yew", - "yew-router-macro", -] - -[[package]] -name = "yew-router-macro" -version = "0.18.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] From 666aa6a40a95dcedeb35d183d20860f10d182788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 5 Dec 2023 14:15:41 +0800 Subject: [PATCH 18/88] Fix CI that requires compiler 1.67 or newer. --- .github/workflows/main-checks.yml | 2 +- examples/wasi_ssr_module/.gitignore | 2 +- examples/wasi_ssr_module/README.md | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index e825879d6ee..0a6caee0a46 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -153,7 +153,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.64.0 + - 1.67.0 - stable - nightly steps: diff --git a/examples/wasi_ssr_module/.gitignore b/examples/wasi_ssr_module/.gitignore index 4570d34ab1f..96ef6c0b944 100644 --- a/examples/wasi_ssr_module/.gitignore +++ b/examples/wasi_ssr_module/.gitignore @@ -1,2 +1,2 @@ /target -Cargo.toml +Cargo.lock diff --git a/examples/wasi_ssr_module/README.md b/examples/wasi_ssr_module/README.md index 8cd39c587f3..6a79e546ca9 100644 --- a/examples/wasi_ssr_module/README.md +++ b/examples/wasi_ssr_module/README.md @@ -4,6 +4,8 @@ This example demonstrates how to use the WASI target to run a simple server-side It depends on [wasmtime](https://wasmtime.dev)'s WASI preview2. +> It requires Rust 1.67 or newer. + ## Building To build the example, run the following command from the root of the repository: From 2c035e90e5f84e5bf8b7a115a96ddfc3e6484c06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Wed, 6 Dec 2023 14:09:12 +0800 Subject: [PATCH 19/88] Use CLI's flag instead of exclude example. https://github.com/bytecodealliance/wasmtime/pull/4312 --- .github/workflows/main-checks.yml | 4 +- Cargo.lock | 91 ++++++++++++++++++++++++++++- Cargo.toml | 1 - examples/wasi_ssr_module/.gitignore | 2 - 4 files changed, 91 insertions(+), 7 deletions(-) delete mode 100644 examples/wasi_ssr_module/.gitignore diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index 0a6caee0a46..97f4e26ea05 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -175,8 +175,8 @@ jobs: - name: Build and run example wasi_ssr_module run: | - cargo build --manifest-path examples/wasi_ssr_module/Cargo.toml --target wasm32-wasi - ~/wasmtime examples/wasi_ssr_module/target/wasm32-wasi/debug/wasi_ssr_module.wasm + cargo build --package wasi_ssr_module --target wasm32-wasi + ~/wasmtime --trap-unknown-imports target/wasm32-wasi/debug/wasi_ssr_module.wasm test-lints: name: Test lints on nightly diff --git a/Cargo.lock b/Cargo.lock index 4b4508dfc15..0eef99df834 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -718,6 +718,16 @@ dependencies = [ "syn 2.0.38", ] +[[package]] +name = "dns-parser" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" +dependencies = [ + "byteorder", + "quick-error 1.2.3", +] + [[package]] name = "dyn_create_destroy_apps" version = "0.1.0" @@ -2082,6 +2092,19 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio_wasi" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826049861effde5245d1107a8eb21846bd8fc7a16486e60be4d0568361c947e5" +dependencies = [ + "libc", + "log", + "wasi", + "wasmedge_wasi_socket", + "windows-sys 0.48.0", +] + [[package]] name = "mount_point" version = "0.1.0" @@ -2475,6 +2498,12 @@ dependencies = [ "unicase", ] +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + [[package]] name = "quick-error" version = "2.0.1" @@ -3165,10 +3194,21 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "socket2 0.5.4", - "tokio-macros", + "tokio-macros 2.1.0", "windows-sys 0.48.0", ] +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "tokio-macros" version = "2.1.0" @@ -3227,6 +3267,27 @@ dependencies = [ "tracing", ] +[[package]] +name = "tokio_wasi" +version = "1.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3a7120cdbe4719425355a0f6b59191c67ab5ed4eebc64bdb12ea3bc8776adf" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio_wasi", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.4.9", + "tokio-macros 1.8.2", + "wasmedge_wasi_socket", + "windows-sys 0.45.0", +] + [[package]] name = "toml_datetime" version = "0.6.3" @@ -3520,6 +3581,20 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi_ssr_module" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytes", + "lazy_static", + "serde", + "serde_json", + "tokio_wasi", + "yew", + "yew-router", +] + [[package]] name = "wasm-bindgen" version = "0.2.87" @@ -3621,6 +3696,18 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wasmedge_wasi_socket" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900a4c17690ef5efcccbdc833853b3e48f2a0de589427a609ddb5e866e1cb91f" +dependencies = [ + "bytes", + "dns-parser", + "libc", + "rand", +] + [[package]] name = "web-sys" version = "0.3.64" @@ -4019,7 +4106,7 @@ dependencies = [ "itertools", "js-sys", "lazy_static", - "quick-error", + "quick-error 2.0.1", "regex", "time", ] diff --git a/Cargo.toml b/Cargo.toml index 61cefa91188..a178501fd18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,5 @@ [workspace] members = ["packages/*", "tools/*", "examples/*"] -exclude = ["examples/wasi_ssr_module"] default-members = ["packages/*"] resolver = "2" diff --git a/examples/wasi_ssr_module/.gitignore b/examples/wasi_ssr_module/.gitignore deleted file mode 100644 index 96ef6c0b944..00000000000 --- a/examples/wasi_ssr_module/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -Cargo.lock From dea1dba88d1f5cf414617405f9bf35859e01c855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 9 Dec 2023 01:35:36 +0800 Subject: [PATCH 20/88] Remove patchs. --- Cargo.lock | 201 ++++++++++------------------ Cargo.toml | 4 - examples/wasi_ssr_module/Cargo.toml | 2 +- examples/wasi_ssr_module/README.md | 2 +- packages/yew-router/Cargo.toml | 2 +- packages/yew/Cargo.toml | 4 +- tools/website-test/Cargo.toml | 2 +- 7 files changed, 74 insertions(+), 143 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0eef99df834..c40c47b76cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,7 +118,7 @@ version = "0.0.1" dependencies = [ "chrono", "futures 0.3.29", - "gloo-net 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-net 0.4.0", "yew", ] @@ -718,16 +718,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "dns-parser" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" -dependencies = [ - "byteorder", - "quick-error 1.2.3", -] - [[package]] name = "dyn_create_destroy_apps" version = "0.1.0" @@ -1103,7 +1093,7 @@ dependencies = [ "gloo-dialogs 0.1.1", "gloo-events 0.1.2", "gloo-file 0.2.3", - "gloo-history 0.1.4", + "gloo-history 0.1.5", "gloo-net 0.3.1", "gloo-render 0.1.1", "gloo-storage 0.2.2", @@ -1115,19 +1105,39 @@ dependencies = [ [[package]] name = "gloo" version = "0.10.0" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd35526c28cc55c1db77aed6296de58677dbab863b118483a27845631d870249" +dependencies = [ + "gloo-console 0.3.0", + "gloo-dialogs 0.2.0", + "gloo-events 0.2.0", + "gloo-file 0.3.0", + "gloo-history 0.2.1", + "gloo-net 0.4.0", + "gloo-render 0.2.0", + "gloo-storage 0.3.0", + "gloo-timers 0.3.0", + "gloo-utils 0.2.0", + "gloo-worker 0.4.1", +] + +[[package]] +name = "gloo" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15282ece24eaf4bd338d73ef580c6714c8615155c4190c781290ee3fa0fd372" dependencies = [ "gloo-console 0.3.0", "gloo-dialogs 0.2.0", "gloo-events 0.2.0", "gloo-file 0.3.0", "gloo-history 0.2.1", - "gloo-net 0.4.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", + "gloo-net 0.5.0", "gloo-render 0.2.0", "gloo-storage 0.3.0", "gloo-timers 0.3.0", - "gloo-utils 0.2.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", - "gloo-worker 0.4.1 (git+https://github.com/rustwasm/gloo?rev=7516f26)", + "gloo-utils 0.2.0", + "gloo-worker 0.5.0", ] [[package]] @@ -1146,9 +1156,10 @@ dependencies = [ [[package]] name = "gloo-console" version = "0.3.0" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a17868f56b4a24f677b17c8cb69958385102fa879418052d60b50bc1727e261" dependencies = [ - "gloo-utils 0.2.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", + "gloo-utils 0.2.0", "js-sys", "serde", "wasm-bindgen", @@ -1168,7 +1179,8 @@ dependencies = [ [[package]] name = "gloo-dialogs" version = "0.2.0" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4748e10122b01435750ff530095b1217cf6546173459448b83913ebe7815df" dependencies = [ "wasm-bindgen", "web-sys", @@ -1187,7 +1199,8 @@ dependencies = [ [[package]] name = "gloo-events" version = "0.2.0" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27c26fb45f7c385ba980f5fa87ac677e363949e065a083722697ef1b2cc91e41" dependencies = [ "wasm-bindgen", "web-sys", @@ -1208,7 +1221,8 @@ dependencies = [ [[package]] name = "gloo-file" version = "0.3.0" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97563d71863fb2824b2e974e754a81d19c4a7ec47b09ced8a0e6656b6d54bd1f" dependencies = [ "futures-channel", "gloo-events 0.2.0", @@ -1219,9 +1233,9 @@ dependencies = [ [[package]] name = "gloo-history" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfd137a4b629e72b8c949ec56c71ea9bd5491cc66358a0a7787e94875feec71" +checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f" dependencies = [ "gloo-events 0.1.2", "gloo-utils 0.1.7", @@ -1236,11 +1250,12 @@ dependencies = [ [[package]] name = "gloo-history" version = "0.2.1" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4022e82f5f9e03cb1251b13c0a967e0600e97aa179c617f6519bac40640160" dependencies = [ "getrandom", "gloo-events 0.2.0", - "gloo-utils 0.2.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", + "gloo-utils 0.2.0", "serde", "serde-wasm-bindgen 0.6.1", "serde_urlencoded", @@ -1279,7 +1294,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-utils 0.2.0", "http", "js-sys", "pin-project", @@ -1293,13 +1308,14 @@ dependencies = [ [[package]] name = "gloo-net" -version = "0.4.0" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils 0.2.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", + "gloo-utils 0.2.0", "http", "js-sys", "pin-project", @@ -1324,7 +1340,8 @@ dependencies = [ [[package]] name = "gloo-render" version = "0.2.0" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56008b6744713a8e8d98ac3dcb7d06543d5662358c9c805b4ce2167ad4649833" dependencies = [ "wasm-bindgen", "web-sys", @@ -1348,9 +1365,10 @@ dependencies = [ [[package]] name = "gloo-storage" version = "0.3.0" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc8031e8c92758af912f9bc08fbbadd3c6f3cfcbf6b64cdf3d6a81f0139277a" dependencies = [ - "gloo-utils 0.2.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", + "gloo-utils 0.2.0", "js-sys", "serde", "serde_json", @@ -1372,7 +1390,8 @@ dependencies = [ [[package]] name = "gloo-timers" version = "0.3.0" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" dependencies = [ "futures-channel", "futures-core", @@ -1406,18 +1425,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-utils" -version = "0.2.0" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-worker" version = "0.2.1" @@ -1443,8 +1450,8 @@ checksum = "f2cbd4c35cc3a2b1fb792318acc06bd514193f6d058173da5cdbcdabe6514303" dependencies = [ "bincode", "futures 0.3.29", - "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gloo-worker-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-utils 0.2.0", + "gloo-worker-macros", "js-sys", "pinned", "serde", @@ -1456,13 +1463,14 @@ dependencies = [ [[package]] name = "gloo-worker" -version = "0.4.1" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "085f262d7604911c8150162529cefab3782e91adb20202e8658f7275d2aefe5d" dependencies = [ "bincode", "futures 0.3.29", - "gloo-utils 0.2.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", - "gloo-worker-macros 0.1.0 (git+https://github.com/rustwasm/gloo?rev=7516f26)", + "gloo-utils 0.2.0", + "gloo-worker-macros", "js-sys", "pinned", "serde", @@ -1484,17 +1492,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "gloo-worker-macros" -version = "0.1.0" -source = "git+https://github.com/rustwasm/gloo?rev=7516f26#7516f2663e169bd20c3439a205feb575d1499173" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.38", -] - [[package]] name = "h2" version = "0.3.20" @@ -2092,19 +2089,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mio_wasi" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826049861effde5245d1107a8eb21846bd8fc7a16486e60be4d0568361c947e5" -dependencies = [ - "libc", - "log", - "wasi", - "wasmedge_wasi_socket", - "windows-sys 0.48.0", -] - [[package]] name = "mount_point" version = "0.1.0" @@ -2474,7 +2458,8 @@ dependencies = [ [[package]] name = "prokio" version = "0.1.0" -source = "git+https://github.com/langyo/prokio?branch=wasi-fix#395c868933dd84543e11af93011a158a37a10606" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b55e106e5791fa5a13abd13c85d6127312e8e09098059ca2bc9b03ca4cf488" dependencies = [ "futures 0.3.29", "gloo 0.8.1", @@ -2498,12 +2483,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quick-error" version = "2.0.1" @@ -3194,21 +3173,10 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "socket2 0.5.4", - "tokio-macros 2.1.0", + "tokio-macros", "windows-sys 0.48.0", ] -[[package]] -name = "tokio-macros" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "tokio-macros" version = "2.1.0" @@ -3267,27 +3235,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tokio_wasi" -version = "1.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3a7120cdbe4719425355a0f6b59191c67ab5ed4eebc64bdb12ea3bc8776adf" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio_wasi", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.4.9", - "tokio-macros 1.8.2", - "wasmedge_wasi_socket", - "windows-sys 0.45.0", -] - [[package]] name = "toml_datetime" version = "0.6.3" @@ -3590,7 +3537,7 @@ dependencies = [ "lazy_static", "serde", "serde_json", - "tokio_wasi", + "tokio", "yew", "yew-router", ] @@ -3696,18 +3643,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmedge_wasi_socket" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900a4c17690ef5efcccbdc833853b3e48f2a0de589427a609ddb5e866e1cb91f" -dependencies = [ - "bytes", - "dns-parser", - "libc", - "rand", -] - [[package]] name = "web-sys" version = "0.3.64" @@ -3756,7 +3691,7 @@ version = "0.1.0" dependencies = [ "derive_more", "glob", - "gloo 0.10.0", + "gloo 0.11.0", "js-sys", "tokio", "wasm-bindgen", @@ -3982,7 +3917,7 @@ dependencies = [ "bincode", "console_error_panic_hook", "futures 0.3.29", - "gloo 0.10.0", + "gloo 0.11.0", "html-escape", "implicit-clone", "indexmap 2.0.2", @@ -4007,7 +3942,7 @@ name = "yew-agent" version = "0.3.0" dependencies = [ "futures 0.3.29", - "gloo-worker 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-worker 0.4.1", "serde", "wasm-bindgen", "yew", @@ -4045,7 +3980,7 @@ dependencies = [ name = "yew-router" version = "0.18.0" dependencies = [ - "gloo 0.10.0", + "gloo 0.11.0", "js-sys", "route-recognizer", "serde", @@ -4106,7 +4041,7 @@ dependencies = [ "itertools", "js-sys", "lazy_static", - "quick-error 2.0.1", + "quick-error", "regex", "time", ] diff --git a/Cargo.toml b/Cargo.toml index a178501fd18..386379907df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,3 @@ lto = true codegen-units = 1 panic = "abort" opt-level = 3 - -[patch.crates-io] -gloo = { git = "https://github.com/rustwasm/gloo", rev = "7516f26" } -prokio = { git = "https://github.com/langyo/prokio", branch = "wasi-fix" } diff --git a/examples/wasi_ssr_module/Cargo.toml b/examples/wasi_ssr_module/Cargo.toml index d38e2201e9c..bf1b0db59d9 100644 --- a/examples/wasi_ssr_module/Cargo.toml +++ b/examples/wasi_ssr_module/Cargo.toml @@ -14,4 +14,4 @@ serde = { version = "^1", features = ["derive"] } serde_json = "^1" lazy_static = "^1" -tokio_wasi = { version = "^1", features = ["full"] } +tokio = { version = "^1", features = ["macros", "rt", "time"] } diff --git a/examples/wasi_ssr_module/README.md b/examples/wasi_ssr_module/README.md index 6a79e546ca9..82de4786f93 100644 --- a/examples/wasi_ssr_module/README.md +++ b/examples/wasi_ssr_module/README.md @@ -19,7 +19,7 @@ cargo build --manifest-path examples/wasi_ssr_module/Cargo.toml --target wasm32- > Note: This example requires the wasmtime CLI to be installed. See [wasmtime's installation instructions](https://docs.wasmtime.dev/cli-install.html) for more information. ```bash -wasmtime examples/wasi_ssr_module/target/wasm32-wasi/release/wasi_ssr_module.wasm +wasmtime --trap-unknown-imports target/wasm32-wasi/release/wasi_ssr_module.wasm ``` > Warn: This example is not yet fully functional. For some unknown reason, this demo only works [outside this project](https://github.com/celestia-island/tairitsu/blob/a724e3f34754fadf279f036e2c473cbf2abf4b8b/packages/proto/src/html/render.rs) because the dependency `web-sys` includes some objects forcible. It would have crashed when running on this project that caused by unknown import `__wbindgen_placeholder__::__wbindgen_xxx` has not been defined in the WASI environment. diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index ad17a9e9c2c..cdc906032e3 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -17,7 +17,7 @@ yew-router-macro = { version = "0.18.0", path = "../yew-router-macro" } wasm-bindgen = "0.2" js-sys = "0.3" -gloo = { version = "0.10", features = ["futures"] } +gloo = { version = "0.11", features = ["futures"] } route-recognizer = "0.3" serde = "1" serde_urlencoded = "0.7.1" diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index 89cd95b4c6c..b6091b3192a 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -18,7 +18,7 @@ rust-version = "1.64.0" [dependencies] console_error_panic_hook = "0.1" -gloo = "0.10" +gloo = "0.11" indexmap = { version = "2", features = ["std"] } js-sys = "0.3" slab = "0.4" @@ -83,7 +83,7 @@ tokio = { version = "1.33", features = ["full"] } [dev-dependencies] wasm-bindgen-test = "0.3" -gloo = { version = "0.10", features = ["futures"] } +gloo = { version = "0.11", features = ["futures"] } wasm-bindgen-futures = "0.4" trybuild = "1" diff --git a/tools/website-test/Cargo.toml b/tools/website-test/Cargo.toml index e24d135286e..4d04ce89bec 100644 --- a/tools/website-test/Cargo.toml +++ b/tools/website-test/Cargo.toml @@ -11,7 +11,7 @@ yew-agent = { path = "../../packages/yew-agent/" } [dev-dependencies] derive_more = "0.99" -gloo = "0.10" +gloo = "0.11" js-sys = "0.3" wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" From 133169e90ea8e9a2c4cb79e0f471bb2a8c92d897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 9 Dec 2023 09:55:01 +0800 Subject: [PATCH 21/88] Use LocalServerRenderer instead of ServerRenderer. https://github.com/yewstack/prokio/pull/11#issuecomment-1847979933 --- examples/wasi_ssr_module/src/main.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/wasi_ssr_module/src/main.rs b/examples/wasi_ssr_module/src/main.rs index 9f34948c583..ea940f7eab4 100644 --- a/examples/wasi_ssr_module/src/main.rs +++ b/examples/wasi_ssr_module/src/main.rs @@ -5,8 +5,7 @@ mod router; use anyhow::Result; use router::{switch, Route}; -use yew::prelude::*; -use yew::{function_component, ServerRenderer}; +use yew::{prelude::*, LocalServerRenderer}; #[function_component] fn Content() -> Html { @@ -38,8 +37,8 @@ fn App() -> Html { } pub async fn render() -> Result { - let renderer = ServerRenderer::::new(); - let html_raw = renderer.render_async().await; + let renderer = LocalServerRenderer::::new(); + let html_raw = renderer.render().await; let mut body = String::new(); body.push_str(""); From a520095c260b676d41b683d362bb62ddd323d41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 9 Dec 2023 09:55:18 +0800 Subject: [PATCH 22/88] Remove unused exports. --- packages/yew/src/server_renderer.rs | 45 ----------------------------- 1 file changed, 45 deletions(-) diff --git a/packages/yew/src/server_renderer.rs b/packages/yew/src/server_renderer.rs index 6c0b271a707..2fbd13e628f 100644 --- a/packages/yew/src/server_renderer.rs +++ b/packages/yew/src/server_renderer.rs @@ -334,49 +334,4 @@ where rx } - - /// Renders Yew Application into a string Stream. - /// - /// It would return a stream that yields a string for each rendered chunk. - pub async fn render_stream_async(self) -> impl Stream { - let Self { - create_props, - hydratable, - .. - } = self; - - let props = create_props(); - LocalServerRenderer::::with_props(props) - .hydratable(hydratable) - .render_stream() - } - - /// Renders Yew Application into a string. - /// - /// This method completely transfers the asynchronous control to the user, - /// and will not try to create additional async runtime tasks in the environment internally. - /// It's most suitable for single-threaded environments such as WASI. - pub async fn render_async(self) -> String { - let s = self.render_stream_async(); - futures::pin_mut!(s); - - s.await.collect::().await - } - - /// Renders Yew Application into a string. - /// - /// This method completely transfers the asynchronous control to the user, - /// and will not try to create additional async runtime tasks in the environment internally. - /// It's most suitable for single-threaded environments such as WASI. - pub async fn render_to_string_async(self, w: &mut String) { - let s = self.render_stream_async(); - futures::pin_mut!(s); - - s.await - .for_each(|m| { - w.push_str(&m); - async {} - }) - .await; - } } From b3f2b6e76a3639c7233668d5d73eb07947aa37fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 9 Dec 2023 10:02:24 +0800 Subject: [PATCH 23/88] Add description about `LocalServerRenderer`. --- .../advanced-topics/server-side-rendering.md | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/website/docs/advanced-topics/server-side-rendering.md b/website/docs/advanced-topics/server-side-rendering.md index 6d3789ff33c..c49a5dda070 100644 --- a/website/docs/advanced-topics/server-side-rendering.md +++ b/website/docs/advanced-topics/server-side-rendering.md @@ -195,6 +195,52 @@ fn main() { Example: [simple_ssr](https://github.com/yewstack/yew/tree/master/examples/simple_ssr) Example: [ssr_router](https://github.com/yewstack/yew/tree/master/examples/ssr_router) +## Single thread mode + +Yew supports single thread mode for server-side rendering by `yew::LocalServerRenderer`. This mode would work in a single thread environment like WASI. + +```rust +// Build it by `wasm32-wasi` target + +use anyhow::Result; +use yew::{prelude::*, LocalServerRenderer}; + +#[function_component] +fn App() -> Html { + use yew_router::prelude::*; + + html! { + <> +

{"Yew WASI SSR demo"}

+ + } +} + +pub async fn render() -> Result { + let renderer = LocalServerRenderer::::new(); + let html_raw = renderer.render().await; + + let mut body = String::new(); + body.push_str(""); + body.push_str("
"); + body.push_str(&html_raw); + body.push_str("
"); + body.push_str(""); + + Ok(body) +} + +#[tokio::main(flavor = "current_thread")] +async fn main() -> Result<()> { + let ret = render().await?; + println!("{}", ret); + + Ok(()) +} +``` + +Example: [wasi_ssr_module](https://github.com/yewstack/yew/tree/master/examples/wasi_ssr_module) + :::caution Server-side rendering is currently experimental. If you find a bug, please file From 459e110e9d3763bdbe69fab37c34024f2be49ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 9 Dec 2023 10:40:54 +0800 Subject: [PATCH 24/88] fix fmt --- examples/wasi_ssr_module/src/main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/wasi_ssr_module/src/main.rs b/examples/wasi_ssr_module/src/main.rs index ea940f7eab4..e6ba2e31665 100644 --- a/examples/wasi_ssr_module/src/main.rs +++ b/examples/wasi_ssr_module/src/main.rs @@ -5,7 +5,8 @@ mod router; use anyhow::Result; use router::{switch, Route}; -use yew::{prelude::*, LocalServerRenderer}; +use yew::prelude::*; +use yew::LocalServerRenderer; #[function_component] fn Content() -> Html { From ec8ee8a4fb2a206f0f844fb3edc7453982dd00ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 9 Dec 2023 10:46:27 +0800 Subject: [PATCH 25/88] fix fmt --- .../docs/advanced-topics/server-side-rendering.md | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/website/docs/advanced-topics/server-side-rendering.md b/website/docs/advanced-topics/server-side-rendering.md index c49a5dda070..e98cde971c3 100644 --- a/website/docs/advanced-topics/server-side-rendering.md +++ b/website/docs/advanced-topics/server-side-rendering.md @@ -202,8 +202,8 @@ Yew supports single thread mode for server-side rendering by `yew::LocalServerRe ```rust // Build it by `wasm32-wasi` target -use anyhow::Result; -use yew::{prelude::*, LocalServerRenderer}; +use yew::prelude::*; +use yew::LocalServerRenderer; #[function_component] fn App() -> Html { @@ -216,7 +216,7 @@ fn App() -> Html { } } -pub async fn render() -> Result { +pub async fn render() -> String { let renderer = LocalServerRenderer::::new(); let html_raw = renderer.render().await; @@ -227,15 +227,12 @@ pub async fn render() -> Result { body.push_str(""); body.push_str(""); - Ok(body) + body } #[tokio::main(flavor = "current_thread")] -async fn main() -> Result<()> { - let ret = render().await?; - println!("{}", ret); - - Ok(()) +async fn main() { + println!("{}", render().await); } ``` From 66996868523716ef3743ccd24e880c3ba27d17e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 9 Dec 2023 11:05:36 +0800 Subject: [PATCH 26/88] Update Cargo.lock --- Cargo.lock | 819 ++++++++++++++--------------- examples/wasi_ssr_module/README.md | 4 +- 2 files changed, 388 insertions(+), 435 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c40c47b76cc..572bdd26801 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6cd65a4b849ace0b7f6daeebcc1a1d111282227ca745458c61dbf670e52a597" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" dependencies = [ "anstyle", "anstyle-parse", @@ -57,36 +57,36 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0238ca56c96dfa37bdf7c373c8886dd591322500aceeeccdb2216fe06dc2f796" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -109,7 +109,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -124,9 +124,9 @@ dependencies = [ [[package]] name = "atomic-polyfill" -version = "0.1.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" dependencies = [ "critical-section", ] @@ -199,9 +199,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -212,12 +212,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.5" @@ -232,9 +226,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "basic-toml" -version = "0.1.2" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0de75129aa8d0cceaf750b89013f0e08804d6ec61416da787b35ad0d7cddf1" +checksum = "2f2139706359229bfa8f19142ac1155b4b80beafb7a60471ac5dd109d4a19778" dependencies = [ "serde", ] @@ -295,9 +289,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block-buffer" @@ -323,21 +317,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" -version = "0.6.3" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -347,11 +341,12 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -387,14 +382,14 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] name = "clap" -version = "4.4.7" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive", @@ -402,9 +397,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", @@ -422,7 +417,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -516,9 +511,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -526,20 +521,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "core_affinity" -version = "0.8.1" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622892f5635ce1fc38c8f16dfc938553ed64af482edb5e150bf4caedbfcb2304" -dependencies = [ - "libc", - "num_cpus", - "winapi", -] +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "counter" @@ -560,18 +544,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] [[package]] name = "critical-section" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "crypto-common" @@ -620,15 +604,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" dependencies = [ "powerfmt", ] @@ -695,27 +679,25 @@ dependencies = [ [[package]] name = "divan" -version = "0.1.1" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9fe20b31e5a6a2c689cb9cd6b8ab3e1b417536b2369830b037acfee34b11469" +checksum = "40199864856263dbaada0c9e1afd042416a3f947293eb1c4475b68df3e6a1042" dependencies = [ "clap", "condtype", - "core_affinity", "divan-macros", - "linkme", "regex-lite", ] [[package]] name = "divan-macros" -version = "0.1.1" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c41656525d3cbca56bc91ca045ffb591b7b7d7bd7453750b63bacc35c46f3cc" +checksum = "875fb84b58aa0b32af7a1c768083693c01b7625571b1a46c40f3c8b42ce58b1c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -741,9 +723,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -753,18 +735,18 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -775,29 +757,18 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -822,18 +793,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "file_upload" version = "0.1.0" dependencies = [ - "base64 0.21.5", + "base64", "gloo 0.10.0", "js-sys", "web-sys", @@ -869,9 +837,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -988,7 +956,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1045,9 +1013,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -1058,9 +1026,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "git2" @@ -1068,7 +1036,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "libc", "libgit2-sys", "log", @@ -1118,7 +1086,7 @@ dependencies = [ "gloo-storage 0.3.0", "gloo-timers 0.3.0", "gloo-utils 0.2.0", - "gloo-worker 0.4.1", + "gloo-worker 0.4.0", ] [[package]] @@ -1444,9 +1412,9 @@ dependencies = [ [[package]] name = "gloo-worker" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cbd4c35cc3a2b1fb792318acc06bd514193f6d058173da5cdbcdabe6514303" +checksum = "76495d3dd87de51da268fa3a593da118ab43eb7f8809e17eb38d3319b424e400" dependencies = [ "bincode", "futures 0.3.29", @@ -1489,14 +1457,14 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "h2" -version = "0.3.20" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -1504,7 +1472,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", @@ -1522,24 +1490,17 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "headers" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64", "bytes", "headers-core", "http", @@ -1559,9 +1520,9 @@ dependencies = [ [[package]] name = "heapless" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" dependencies = [ "atomic-polyfill", "hash32", @@ -1579,18 +1540,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "html-escape" @@ -1603,9 +1555,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1614,9 +1566,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1625,9 +1577,9 @@ dependencies = [ [[package]] name = "http-range-header" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "httparse" @@ -1637,9 +1589,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -1664,7 +1616,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -1686,16 +1638,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1715,9 +1667,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1735,31 +1687,32 @@ dependencies = [ [[package]] name = "implicit-clone" -version = "0.4.1" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af3d77000817fd9e7db159e8d52ed9b5941a2cdbfbdc8ca646e59887ae2b2dd1" +checksum = "fc06a255cbf402a52ae399c05a518c68c569c916ea11423620111df576b9b9bb" dependencies = [ - "indexmap 2.0.2", + "implicit-clone-derive", + "indexmap", ] [[package]] -name = "indexmap" -version = "1.9.3" +name = "implicit-clone-derive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "9311685eb9a34808bbb0608ad2fcab9ae216266beca5848613e95553ac914e3b" dependencies = [ - "autocfg", - "hashbrown 0.12.3", + "quote", + "syn 2.0.39", ] [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown", ] [[package]] @@ -1796,32 +1749,20 @@ dependencies = [ "web-sys", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix 0.37.25", + "hermit-abi", + "rustix", "windows-sys 0.48.0", ] @@ -1836,15 +1777,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jemalloc-sys" -version = "0.5.3+5.3.0-patched" +version = "0.5.4+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9bd5d616ea7ed58b571b2e209a65759664d7fb021a0819d7a790afc67e47ca1" +checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2" dependencies = [ "cc", "libc", @@ -1862,9 +1803,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -1893,9 +1834,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -1953,9 +1894,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libssh2-sys" @@ -1973,9 +1914,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -1983,37 +1924,11 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linkme" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ed2ee9464ff9707af8e9ad834cffa4802f072caad90639c583dd3c62e6e608" -dependencies = [ - "linkme-impl", -] - -[[package]] -name = "linkme-impl" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lipsum" @@ -2027,9 +1942,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2043,15 +1958,15 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "matchit" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "mime" @@ -2071,18 +1986,18 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi", @@ -2163,9 +2078,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -2173,11 +2088,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -2189,26 +2104,26 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.30.4" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -2225,7 +2140,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2236,9 +2151,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" dependencies = [ "cc", "libc", @@ -2269,15 +2184,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -2295,28 +2210,28 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2350,9 +2265,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "portable-atomic" -version = "1.3.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "portals" @@ -2394,7 +2309,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2439,9 +2354,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -2530,9 +2445,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] @@ -2578,7 +2493,7 @@ version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.5", + "base64", "bytes", "encoding_rs", "futures-core", @@ -2650,38 +2565,24 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.25" +version = "0.38.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "bfeae074e687625746172d639330f1de242a178bf3189b51e35a7a21573513ac" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.11", - "windows-sys 0.48.0", + "linux-raw-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64", ] [[package]] @@ -2692,17 +2593,17 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -2713,15 +2614,15 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -2732,9 +2633,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -2748,9 +2649,9 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -2779,20 +2680,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -2801,10 +2702,11 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" dependencies = [ + "itoa", "serde", ] @@ -2822,9 +2724,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -2869,15 +2771,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -2885,9 +2787,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -2953,7 +2855,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2980,9 +2882,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -3042,23 +2944,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall", - "rustix 0.37.25", + "rustix", "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -3069,7 +2970,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.25", + "rustix", "windows-sys 0.48.0", ] @@ -3090,7 +2991,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3160,9 +3061,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.33.0" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" dependencies = [ "backtrace", "bytes", @@ -3172,20 +3073,20 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3223,9 +3124,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -3237,17 +3138,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap", "toml_datetime", "winnow", ] @@ -3324,7 +3225,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3338,9 +3239,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trybuild" @@ -3386,30 +3287,30 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -3422,15 +3323,15 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "url" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -3451,9 +3352,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8-width" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "utf8parse" @@ -3463,9 +3364,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ "serde", ] @@ -3544,9 +3445,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3554,24 +3455,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -3581,9 +3482,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3591,28 +3492,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-bindgen-test" -version = "0.3.37" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671" +checksum = "2cf9242c0d27999b831eae4767b2a146feb0b27d332d553e605864acd2afd403" dependencies = [ "console_error_panic_hook", "js-sys", @@ -3624,12 +3525,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.37" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" +checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89" dependencies = [ "proc-macro2", "quote", + "syn 2.0.39", ] [[package]] @@ -3645,9 +3547,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -3721,9 +3623,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -3735,45 +3637,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.42.2", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.48.5", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.52.0", ] [[package]] @@ -3793,17 +3689,32 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -3814,9 +3725,15 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" @@ -3826,9 +3743,15 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" @@ -3838,9 +3761,15 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" @@ -3850,9 +3779,15 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" @@ -3862,9 +3797,15 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" @@ -3874,9 +3815,15 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" @@ -3886,15 +3833,21 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.4" +version = "0.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" +checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" dependencies = [ "memchr", ] @@ -3920,7 +3873,7 @@ dependencies = [ "gloo 0.11.0", "html-escape", "implicit-clone", - "indexmap 2.0.2", + "indexmap", "js-sys", "prokio", "rustversion", @@ -3942,7 +3895,7 @@ name = "yew-agent" version = "0.3.0" dependencies = [ "futures 0.3.29", - "gloo-worker 0.4.1", + "gloo-worker 0.4.0", "serde", "wasm-bindgen", "yew", @@ -3956,7 +3909,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", "trybuild", "yew-agent", ] @@ -3971,7 +3924,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", "trybuild", "yew", ] @@ -4001,7 +3954,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", "trybuild", "yew-router", ] diff --git a/examples/wasi_ssr_module/README.md b/examples/wasi_ssr_module/README.md index 82de4786f93..974b29803b7 100644 --- a/examples/wasi_ssr_module/README.md +++ b/examples/wasi_ssr_module/README.md @@ -19,7 +19,7 @@ cargo build --manifest-path examples/wasi_ssr_module/Cargo.toml --target wasm32- > Note: This example requires the wasmtime CLI to be installed. See [wasmtime's installation instructions](https://docs.wasmtime.dev/cli-install.html) for more information. ```bash -wasmtime --trap-unknown-imports target/wasm32-wasi/release/wasi_ssr_module.wasm +wasmtime target/wasm32-wasi/release/wasi_ssr_module.wasm ``` -> Warn: This example is not yet fully functional. For some unknown reason, this demo only works [outside this project](https://github.com/celestia-island/tairitsu/blob/a724e3f34754fadf279f036e2c473cbf2abf4b8b/packages/proto/src/html/render.rs) because the dependency `web-sys` includes some objects forcible. It would have crashed when running on this project that caused by unknown import `__wbindgen_placeholder__::__wbindgen_xxx` has not been defined in the WASI environment. +> Note: If your wasmtime CLI throws an error that it says some imports like `__wbindgen_placeholder__::__wbindgen_xxx` is invalid, try to run `cargo update`. See issue [#411](https://github.com/rustwasm/gloo/pull/411#discussion_r1421219033). From 34b64cafafd48da19974e789882878605889a57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 9 Dec 2023 11:13:16 +0800 Subject: [PATCH 27/88] Bump rust compiler's version to 1.67... --- .github/workflows/main-checks.yml | 4 ++-- packages/yew-agent-macro/Cargo.toml | 2 +- packages/yew-agent/Cargo.toml | 2 +- packages/yew-macro/Cargo.toml | 2 +- packages/yew-macro/Makefile.toml | 2 +- packages/yew-router-macro/Cargo.toml | 4 ++-- packages/yew-router-macro/Makefile.toml | 2 +- packages/yew-router/Cargo.toml | 2 +- packages/yew/Cargo.toml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index 97f4e26ea05..4169233a4d2 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -67,7 +67,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.64.0 + - 1.67.0 - stable steps: @@ -116,7 +116,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.64.0 + - 1.67.0 - stable - nightly diff --git a/packages/yew-agent-macro/Cargo.toml b/packages/yew-agent-macro/Cargo.toml index 149198c5cee..d6b9125990f 100644 --- a/packages/yew-agent-macro/Cargo.toml +++ b/packages/yew-agent-macro/Cargo.toml @@ -2,7 +2,7 @@ name = "yew-agent-macro" version = "0.2.0" edition = "2021" -rust-version = "1.64.0" +rust-version = "1.67.0" authors = ["Kaede Hoshikawa "] repository = "https://github.com/yewstack/yew" homepage = "https://yew.rs" diff --git a/packages/yew-agent/Cargo.toml b/packages/yew-agent/Cargo.toml index 2007b54f86f..8865164af38 100644 --- a/packages/yew-agent/Cargo.toml +++ b/packages/yew-agent/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" readme = "../../README.md" description = "Agents for Yew" license = "MIT OR Apache-2.0" -rust-version = "1.64.0" +rust-version = "1.67.0" [dependencies] yew = { version = "0.21.0", path = "../yew" } diff --git a/packages/yew-macro/Cargo.toml b/packages/yew-macro/Cargo.toml index 9d497486b92..b9a4c188dae 100644 --- a/packages/yew-macro/Cargo.toml +++ b/packages/yew-macro/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" keywords = ["web", "wasm", "frontend", "webasm", "webassembly"] categories = ["gui", "web-programming", "wasm"] description = "A framework for making client-side single-page apps" -rust-version = "1.64.0" +rust-version = "1.67.0" [lib] proc-macro = true diff --git a/packages/yew-macro/Makefile.toml b/packages/yew-macro/Makefile.toml index b679fa4fa51..12ccace96fd 100644 --- a/packages/yew-macro/Makefile.toml +++ b/packages/yew-macro/Makefile.toml @@ -1,6 +1,6 @@ [tasks.test] clear = true -toolchain = "1.64.0" +toolchain = "1.67.0" command = "cargo" # test target can be optionally specified like `cargo make test html_macro`, args = ["test", "${@}"] diff --git a/packages/yew-router-macro/Cargo.toml b/packages/yew-router-macro/Cargo.toml index 381f09d03c2..4ebf8790017 100644 --- a/packages/yew-router-macro/Cargo.toml +++ b/packages/yew-router-macro/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "MIT OR Apache-2.0" description = "Contains macros used with yew-router" repository = "https://github.com/yewstack/yew" -rust-version = "1.64.0" +rust-version = "1.67.0" [lib] proc-macro = true @@ -14,7 +14,7 @@ proc-macro = true [dependencies] proc-macro2 = "1" quote = "1" -syn = { version = "2", features = ["full","extra-traits"] } +syn = { version = "2", features = ["full", "extra-traits"] } [dev-dependencies] rustversion = "1" diff --git a/packages/yew-router-macro/Makefile.toml b/packages/yew-router-macro/Makefile.toml index 1eae4efc7c4..759fbe40e5b 100644 --- a/packages/yew-router-macro/Makefile.toml +++ b/packages/yew-router-macro/Makefile.toml @@ -1,6 +1,6 @@ [tasks.test] clear = true -toolchain = "1.64.0" +toolchain = "1.67.0" command = "cargo" args = ["test"] diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index cdc906032e3..2dccb770ebf 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["web", "yew", "router"] categories = ["gui", "web-programming"] description = "A router implementation for the Yew framework" repository = "https://github.com/yewstack/yew" -rust-version = "1.64.0" +rust-version = "1.67.0" [dependencies] yew = { version = "0.21.0", path = "../yew", default-features = false } diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index b6091b3192a..4c0f1cffca7 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["web", "webasm", "javascript"] categories = ["gui", "wasm", "web-programming"] description = "A framework for creating reliable and efficient web applications" readme = "../../README.md" -rust-version = "1.64.0" +rust-version = "1.67.0" [dependencies] console_error_panic_hook = "0.1" From 44e14426f8b1fa912115b1f1fcc92862334e1de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 9 Dec 2023 14:35:23 +0800 Subject: [PATCH 28/88] Exclude WASI on yew-router browser interfaces. --- packages/yew-router/src/lib.rs | 14 ++++++++++---- packages/yew-router/src/navigator.rs | 3 +++ packages/yew-router/src/router.rs | 11 +++++++++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/packages/yew-router/src/lib.rs b/packages/yew-router/src/lib.rs index 1cf262e21d8..40a0b6a6e42 100644 --- a/packages/yew-router/src/lib.rs +++ b/packages/yew-router/src/lib.rs @@ -78,16 +78,20 @@ pub mod switch; pub mod utils; pub use routable::{AnyRoute, Routable}; -pub use router::{BrowserRouter, HashRouter, Router}; +pub use router::Router; +#[cfg(not(target_os = "wasi"))] +pub use router::{BrowserRouter, HashRouter}; pub use switch::Switch; pub mod history { //! A module that provides universal session history and location information. pub use gloo::history::{ - AnyHistory, BrowserHistory, HashHistory, History, HistoryError, HistoryResult, Location, - MemoryHistory, + AnyHistory, History, HistoryError, HistoryResult, Location, MemoryHistory, }; + + #[cfg(not(target_os = "wasi"))] + pub use gloo::history::{BrowserHistory, HashHistory}; } pub mod prelude { @@ -102,5 +106,7 @@ pub mod prelude { pub use crate::scope_ext::{LocationHandle, NavigatorHandle, RouterScopeExt}; #[doc(no_inline)] pub use crate::Routable; - pub use crate::{BrowserRouter, HashRouter, Router, Switch}; + #[cfg(not(target_os = "wasi"))] + pub use crate::{BrowserRouter, HashRouter}; + pub use crate::{Router, Switch}; } diff --git a/packages/yew-router/src/navigator.rs b/packages/yew-router/src/navigator.rs index 48345609f83..a1eef694c2c 100644 --- a/packages/yew-router/src/navigator.rs +++ b/packages/yew-router/src/navigator.rs @@ -12,6 +12,7 @@ pub type NavigationResult = HistoryResult; #[derive(Debug, PartialEq, Eq, Clone, Copy)] pub enum NavigatorKind { /// Browser History. + #[cfg(not(target_os = "wasi"))] Browser, /// Hash History. Hash, @@ -150,7 +151,9 @@ impl Navigator { /// Returns the Navigator kind. pub fn kind(&self) -> NavigatorKind { match &self.inner { + #[cfg(not(target_os = "wasi"))] AnyHistory::Browser(_) => NavigatorKind::Browser, + #[cfg(not(target_os = "wasi"))] AnyHistory::Hash(_) => NavigatorKind::Hash, AnyHistory::Memory(_) => NavigatorKind::Memory, } diff --git a/packages/yew-router/src/router.rs b/packages/yew-router/src/router.rs index b3becda9ea1..373c2c9894a 100644 --- a/packages/yew-router/src/router.rs +++ b/packages/yew-router/src/router.rs @@ -4,9 +4,14 @@ use std::rc::Rc; use yew::prelude::*; use yew::virtual_dom::AttrValue; -use crate::history::{AnyHistory, BrowserHistory, HashHistory, History, Location}; +use crate::history::{AnyHistory, History, Location}; +#[cfg(not(target_os = "wasi"))] +use crate::history::{BrowserHistory, HashHistory}; use crate::navigator::Navigator; -use crate::utils::{base_url, strip_slash_suffix}; + +#[cfg(not(target_os = "wasi"))] +use crate::utils::base_url; +use crate::utils::strip_slash_suffix; /// Props for [`Router`]. #[derive(Properties, PartialEq, Clone)] @@ -144,6 +149,7 @@ pub struct ConcreteRouterProps { /// /// The router will by default use the value declared in `` as its basename. /// You may also specify a different basename with props. +#[cfg(not(target_os = "wasi"))] #[function_component(BrowserRouter)] pub fn browser_router(props: &ConcreteRouterProps) -> Html { let ConcreteRouterProps { children, basename } = props.clone(); @@ -167,6 +173,7 @@ pub fn browser_router(props: &ConcreteRouterProps) -> Html { /// # Warning /// /// Prefer [`BrowserRouter`] whenever possible and use this as a last resort. +#[cfg(not(target_os = "wasi"))] #[function_component(HashRouter)] pub fn hash_router(props: &ConcreteRouterProps) -> Html { let ConcreteRouterProps { children, basename } = props.clone(); From d05e0d855ae123c5e9a6b862aa021a67df4acf04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 9 Dec 2023 15:16:44 +0800 Subject: [PATCH 29/88] fix fmt --- packages/yew-router/src/lib.rs | 1 - packages/yew-router/src/router.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/yew-router/src/lib.rs b/packages/yew-router/src/lib.rs index 40a0b6a6e42..a574f01ed22 100644 --- a/packages/yew-router/src/lib.rs +++ b/packages/yew-router/src/lib.rs @@ -89,7 +89,6 @@ pub mod history { pub use gloo::history::{ AnyHistory, History, HistoryError, HistoryResult, Location, MemoryHistory, }; - #[cfg(not(target_os = "wasi"))] pub use gloo::history::{BrowserHistory, HashHistory}; } diff --git a/packages/yew-router/src/router.rs b/packages/yew-router/src/router.rs index 373c2c9894a..bb849f91061 100644 --- a/packages/yew-router/src/router.rs +++ b/packages/yew-router/src/router.rs @@ -8,7 +8,6 @@ use crate::history::{AnyHistory, History, Location}; #[cfg(not(target_os = "wasi"))] use crate::history::{BrowserHistory, HashHistory}; use crate::navigator::Navigator; - #[cfg(not(target_os = "wasi"))] use crate::utils::base_url; use crate::utils::strip_slash_suffix; From 0b536c37a91c7e8678c24256aab6834aaa863544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 9 Dec 2023 15:40:00 +0800 Subject: [PATCH 30/88] Wait for gloo's PR dealed. --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 386379907df..2b0edeec490 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,3 +14,6 @@ lto = true codegen-units = 1 panic = "abort" opt-level = 3 + +[patch.crates-io] +gloo = { git = "https://github.com/langyo/gloo", branch = "cargo-lock-update" } From e40fbecc1debda969f7efe2451d3c2bf41f36b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sun, 10 Dec 2023 13:29:56 +0800 Subject: [PATCH 31/88] Rollback to rust compiler 1.64. cc https://github.com/rustwasm/gloo/pull/423#issuecomment-1848353295 --- .github/workflows/main-checks.yml | 6 +- Cargo.lock | 415 +++++++++++++++--------- packages/yew-agent-macro/Cargo.toml | 2 +- packages/yew-agent/Cargo.toml | 2 +- packages/yew-macro/Cargo.toml | 2 +- packages/yew-macro/Makefile.toml | 2 +- packages/yew-router-macro/Cargo.toml | 2 +- packages/yew-router-macro/Makefile.toml | 2 +- packages/yew-router/Cargo.toml | 2 +- packages/yew/Cargo.toml | 2 +- 10 files changed, 267 insertions(+), 170 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index 4169233a4d2..cf3dbeda5e4 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -67,7 +67,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.67.0 + - 1.64.0 - stable steps: @@ -116,7 +116,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.67.0 + - 1.64.0 - stable - nightly @@ -153,7 +153,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.67.0 + - 1.64.0 - stable - nightly steps: diff --git a/Cargo.lock b/Cargo.lock index 572bdd26801..62014613f2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,54 +41,6 @@ dependencies = [ "libc", ] -[[package]] -name = "anstream" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - [[package]] name = "anyhow" version = "1.0.75" @@ -150,9 +102,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.20" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core", @@ -387,44 +339,41 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" dependencies = [ - "clap_builder", + "bitflags 1.3.2", "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" -dependencies = [ - "anstream", - "anstyle", "clap_lex", + "is-terminal", + "once_cell", "strsim", + "termcolor", "terminal_size", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" dependencies = [ "heck", + "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.39", + "syn 1.0.109", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +dependencies = [ + "os_str_bytes", +] [[package]] name = "cobs" @@ -432,12 +381,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - [[package]] name = "communication_child_to_parent" version = "0.0.1" @@ -663,9 +606,9 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.4.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" +checksum = "890d779e1bc371e4fa7727ef6d29a9346be20ddfe40cd8c744cd083ce0640b15" [[package]] name = "digest" @@ -793,9 +736,12 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] [[package]] name = "file_upload" @@ -1076,35 +1022,34 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd35526c28cc55c1db77aed6296de58677dbab863b118483a27845631d870249" dependencies = [ - "gloo-console 0.3.0", - "gloo-dialogs 0.2.0", - "gloo-events 0.2.0", - "gloo-file 0.3.0", - "gloo-history 0.2.1", + "gloo-console 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-dialogs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-events 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-file 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-history 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "gloo-net 0.4.0", - "gloo-render 0.2.0", - "gloo-storage 0.3.0", - "gloo-timers 0.3.0", - "gloo-utils 0.2.0", + "gloo-render 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-storage 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-timers 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gloo-worker 0.4.0", ] [[package]] name = "gloo" version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15282ece24eaf4bd338d73ef580c6714c8615155c4190c781290ee3fa0fd372" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" dependencies = [ - "gloo-console 0.3.0", - "gloo-dialogs 0.2.0", - "gloo-events 0.2.0", - "gloo-file 0.3.0", - "gloo-history 0.2.1", + "gloo-console 0.3.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-dialogs 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-file 0.3.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-history 0.2.1 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", "gloo-net 0.5.0", - "gloo-render 0.2.0", - "gloo-storage 0.3.0", - "gloo-timers 0.3.0", - "gloo-utils 0.2.0", + "gloo-render 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-storage 0.3.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-timers 0.3.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", "gloo-worker 0.5.0", ] @@ -1127,7 +1072,19 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a17868f56b4a24f677b17c8cb69958385102fa879418052d60b50bc1727e261" dependencies = [ - "gloo-utils 0.2.0", + "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys", + "serde", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-console" +version = "0.3.0" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +dependencies = [ + "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", "js-sys", "serde", "wasm-bindgen", @@ -1154,6 +1111,15 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gloo-dialogs" +version = "0.2.0" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gloo-events" version = "0.1.2" @@ -1174,6 +1140,15 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gloo-events" +version = "0.2.0" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gloo-file" version = "0.2.3" @@ -1193,7 +1168,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97563d71863fb2824b2e974e754a81d19c4a7ec47b09ced8a0e6656b6d54bd1f" dependencies = [ "futures-channel", - "gloo-events 0.2.0", + "gloo-events 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-file" +version = "0.3.0" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +dependencies = [ + "futures-channel", + "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", "js-sys", "wasm-bindgen", "web-sys", @@ -1222,10 +1209,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4022e82f5f9e03cb1251b13c0a967e0600e97aa179c617f6519bac40640160" dependencies = [ "getrandom", - "gloo-events 0.2.0", - "gloo-utils 0.2.0", + "gloo-events 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", + "serde-wasm-bindgen 0.6.2", + "serde_urlencoded", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-history" +version = "0.2.1" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +dependencies = [ + "getrandom", + "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", "serde", - "serde-wasm-bindgen 0.6.1", + "serde-wasm-bindgen 0.6.2", "serde_urlencoded", "thiserror", "wasm-bindgen", @@ -1262,7 +1265,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils 0.2.0", + "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "http", "js-sys", "pin-project", @@ -1277,13 +1280,12 @@ dependencies = [ [[package]] name = "gloo-net" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils 0.2.0", + "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", "http", "js-sys", "pin-project", @@ -1315,6 +1317,15 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gloo-render" +version = "0.2.0" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gloo-storage" version = "0.2.2" @@ -1336,7 +1347,21 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbc8031e8c92758af912f9bc08fbbadd3c6f3cfcbf6b64cdf3d6a81f0139277a" dependencies = [ - "gloo-utils 0.2.0", + "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "js-sys", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-storage" +version = "0.3.0" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +dependencies = [ + "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", "js-sys", "serde", "serde_json", @@ -1367,6 +1392,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "gloo-utils" version = "0.1.7" @@ -1393,6 +1429,18 @@ dependencies = [ "web-sys", ] +[[package]] +name = "gloo-utils" +version = "0.2.0" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gloo-worker" version = "0.2.1" @@ -1418,8 +1466,8 @@ checksum = "76495d3dd87de51da268fa3a593da118ab43eb7f8809e17eb38d3319b424e400" dependencies = [ "bincode", "futures 0.3.29", - "gloo-utils 0.2.0", - "gloo-worker-macros", + "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-worker-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "js-sys", "pinned", "serde", @@ -1432,13 +1480,12 @@ dependencies = [ [[package]] name = "gloo-worker" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "085f262d7604911c8150162529cefab3782e91adb20202e8658f7275d2aefe5d" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" dependencies = [ "bincode", "futures 0.3.29", - "gloo-utils 0.2.0", - "gloo-worker-macros", + "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-worker-macros 0.1.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", "js-sys", "pinned", "serde", @@ -1460,11 +1507,22 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "gloo-worker-macros" +version = "0.1.0" +source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "h2" -version = "0.3.22" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -1472,7 +1530,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1488,6 +1546,12 @@ dependencies = [ "byteorder", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.14.3" @@ -1692,7 +1756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc06a255cbf402a52ae399c05a518c68c569c916ea11423620111df576b9b9bb" dependencies = [ "implicit-clone-derive", - "indexmap", + "indexmap 1.9.3", ] [[package]] @@ -1705,6 +1769,16 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + [[package]] name = "indexmap" version = "2.1.0" @@ -1712,7 +1786,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.3", ] [[package]] @@ -1749,6 +1823,17 @@ dependencies = [ "web-sys", ] +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "ipnet" version = "2.9.0" @@ -1757,11 +1842,12 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi", + "io-lifetimes", "rustix", "windows-sys 0.48.0", ] @@ -1926,9 +2012,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lipsum" @@ -2161,6 +2247,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + [[package]] name = "papergrid" version = "0.10.0" @@ -2190,7 +2282,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -2443,6 +2535,15 @@ dependencies = [ "getrandom", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_syscall" version = "0.4.1" @@ -2454,9 +2555,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", @@ -2466,9 +2567,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", @@ -2477,15 +2578,15 @@ dependencies = [ [[package]] name = "regex-lite" -version = "0.1.5" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" +checksum = "f96ede7f386ba6e910092e7ccdc04176cface62abebea07ed6b46d870ed95ca2" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" @@ -2565,15 +2666,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.27" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfeae074e687625746172d639330f1de242a178bf3189b51e35a7a21573513ac" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags 2.4.1", + "bitflags 1.3.2", "errno", + "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -2593,9 +2695,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "schannel" @@ -2669,9 +2771,9 @@ dependencies = [ [[package]] name = "serde-wasm-bindgen" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d" +checksum = "67d27afff48127b3edfe6ad379a2bd0795d2cfa56730ca2745e5b89386126404" dependencies = [ "js-sys", "serde", @@ -2944,13 +3046,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", "windows-sys 0.48.0", ] @@ -2966,9 +3069,9 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.3.0" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ "rustix", "windows-sys 0.48.0", @@ -3138,17 +3241,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ - "indexmap", + "indexmap 1.9.3", "toml_datetime", "winnow", ] @@ -3356,12 +3459,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - [[package]] name = "uuid" version = "1.6.1" @@ -3845,9 +3942,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.26" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" dependencies = [ "memchr", ] @@ -3873,7 +3970,7 @@ dependencies = [ "gloo 0.11.0", "html-escape", "implicit-clone", - "indexmap", + "indexmap 2.1.0", "js-sys", "prokio", "rustversion", diff --git a/packages/yew-agent-macro/Cargo.toml b/packages/yew-agent-macro/Cargo.toml index d6b9125990f..149198c5cee 100644 --- a/packages/yew-agent-macro/Cargo.toml +++ b/packages/yew-agent-macro/Cargo.toml @@ -2,7 +2,7 @@ name = "yew-agent-macro" version = "0.2.0" edition = "2021" -rust-version = "1.67.0" +rust-version = "1.64.0" authors = ["Kaede Hoshikawa "] repository = "https://github.com/yewstack/yew" homepage = "https://yew.rs" diff --git a/packages/yew-agent/Cargo.toml b/packages/yew-agent/Cargo.toml index 8865164af38..2007b54f86f 100644 --- a/packages/yew-agent/Cargo.toml +++ b/packages/yew-agent/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" readme = "../../README.md" description = "Agents for Yew" license = "MIT OR Apache-2.0" -rust-version = "1.67.0" +rust-version = "1.64.0" [dependencies] yew = { version = "0.21.0", path = "../yew" } diff --git a/packages/yew-macro/Cargo.toml b/packages/yew-macro/Cargo.toml index b9a4c188dae..9d497486b92 100644 --- a/packages/yew-macro/Cargo.toml +++ b/packages/yew-macro/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" keywords = ["web", "wasm", "frontend", "webasm", "webassembly"] categories = ["gui", "web-programming", "wasm"] description = "A framework for making client-side single-page apps" -rust-version = "1.67.0" +rust-version = "1.64.0" [lib] proc-macro = true diff --git a/packages/yew-macro/Makefile.toml b/packages/yew-macro/Makefile.toml index 12ccace96fd..b679fa4fa51 100644 --- a/packages/yew-macro/Makefile.toml +++ b/packages/yew-macro/Makefile.toml @@ -1,6 +1,6 @@ [tasks.test] clear = true -toolchain = "1.67.0" +toolchain = "1.64.0" command = "cargo" # test target can be optionally specified like `cargo make test html_macro`, args = ["test", "${@}"] diff --git a/packages/yew-router-macro/Cargo.toml b/packages/yew-router-macro/Cargo.toml index 4ebf8790017..c612ed97215 100644 --- a/packages/yew-router-macro/Cargo.toml +++ b/packages/yew-router-macro/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "MIT OR Apache-2.0" description = "Contains macros used with yew-router" repository = "https://github.com/yewstack/yew" -rust-version = "1.67.0" +rust-version = "1.64.0" [lib] proc-macro = true diff --git a/packages/yew-router-macro/Makefile.toml b/packages/yew-router-macro/Makefile.toml index 759fbe40e5b..1eae4efc7c4 100644 --- a/packages/yew-router-macro/Makefile.toml +++ b/packages/yew-router-macro/Makefile.toml @@ -1,6 +1,6 @@ [tasks.test] clear = true -toolchain = "1.67.0" +toolchain = "1.64.0" command = "cargo" args = ["test"] diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index 2dccb770ebf..cdc906032e3 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["web", "yew", "router"] categories = ["gui", "web-programming"] description = "A router implementation for the Yew framework" repository = "https://github.com/yewstack/yew" -rust-version = "1.67.0" +rust-version = "1.64.0" [dependencies] yew = { version = "0.21.0", path = "../yew", default-features = false } diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index 4c0f1cffca7..b6091b3192a 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["web", "webasm", "javascript"] categories = ["gui", "wasm", "web-programming"] description = "A framework for creating reliable and efficient web applications" readme = "../../README.md" -rust-version = "1.67.0" +rust-version = "1.64.0" [dependencies] console_error_panic_hook = "0.1" From 67293e2348ced1fa154d5751a91e6b87a7997ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sun, 10 Dec 2023 13:47:58 +0800 Subject: [PATCH 32/88] Fix lock file. --- Cargo.lock | 283 ++++++++++++++++++++++++++++------------------------- Cargo.toml | 2 +- 2 files changed, 150 insertions(+), 135 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 62014613f2f..fa4bdf518e0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,6 +41,54 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" version = "1.0.75" @@ -102,9 +150,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", @@ -339,41 +387,44 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.32" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ - "bitflags 1.3.2", + "clap_builder", "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +dependencies = [ + "anstream", + "anstyle", "clap_lex", - "is-terminal", - "once_cell", "strsim", - "termcolor", "terminal_size", ] [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cobs" @@ -381,6 +432,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "communication_child_to_parent" version = "0.0.1" @@ -606,9 +663,9 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "890d779e1bc371e4fa7727ef6d29a9346be20ddfe40cd8c744cd083ce0640b15" +checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" [[package]] name = "digest" @@ -736,12 +793,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "file_upload" @@ -1038,18 +1092,18 @@ dependencies = [ [[package]] name = "gloo" version = "0.11.0" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ - "gloo-console 0.3.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", - "gloo-dialogs 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", - "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", - "gloo-file 0.3.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", - "gloo-history 0.2.1 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-console 0.3.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-dialogs 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-file 0.3.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-history 0.2.1 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", "gloo-net 0.5.0", - "gloo-render 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", - "gloo-storage 0.3.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", - "gloo-timers 0.3.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", - "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-render 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-storage 0.3.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-timers 0.3.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", "gloo-worker 0.5.0", ] @@ -1082,9 +1136,9 @@ dependencies = [ [[package]] name = "gloo-console" version = "0.3.0" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ - "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", "js-sys", "serde", "wasm-bindgen", @@ -1114,7 +1168,7 @@ dependencies = [ [[package]] name = "gloo-dialogs" version = "0.2.0" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ "wasm-bindgen", "web-sys", @@ -1143,7 +1197,7 @@ dependencies = [ [[package]] name = "gloo-events" version = "0.2.0" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ "wasm-bindgen", "web-sys", @@ -1177,10 +1231,10 @@ dependencies = [ [[package]] name = "gloo-file" version = "0.3.0" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ "futures-channel", - "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", "js-sys", "wasm-bindgen", "web-sys", @@ -1222,11 +1276,11 @@ dependencies = [ [[package]] name = "gloo-history" version = "0.2.1" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ "getrandom", - "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", - "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", "serde", "serde-wasm-bindgen 0.6.2", "serde_urlencoded", @@ -1280,12 +1334,12 @@ dependencies = [ [[package]] name = "gloo-net" version = "0.5.0" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", "http", "js-sys", "pin-project", @@ -1320,7 +1374,7 @@ dependencies = [ [[package]] name = "gloo-render" version = "0.2.0" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ "wasm-bindgen", "web-sys", @@ -1359,9 +1413,9 @@ dependencies = [ [[package]] name = "gloo-storage" version = "0.3.0" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ - "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", "js-sys", "serde", "serde_json", @@ -1395,7 +1449,7 @@ dependencies = [ [[package]] name = "gloo-timers" version = "0.3.0" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ "futures-channel", "futures-core", @@ -1432,7 +1486,7 @@ dependencies = [ [[package]] name = "gloo-utils" version = "0.2.0" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ "js-sys", "serde", @@ -1480,12 +1534,12 @@ dependencies = [ [[package]] name = "gloo-worker" version = "0.5.0" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ "bincode", "futures 0.3.29", - "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", - "gloo-worker-macros 0.1.0 (git+https://github.com/langyo/gloo?branch=cargo-lock-update)", + "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-worker-macros 0.1.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", "js-sys", "pinned", "serde", @@ -1510,7 +1564,7 @@ dependencies = [ [[package]] name = "gloo-worker-macros" version = "0.1.0" -source = "git+https://github.com/langyo/gloo?branch=cargo-lock-update#5f966275731368d07c05ca3a23b72a0722994b41" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1520,9 +1574,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -1530,7 +1584,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", @@ -1546,12 +1600,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.3" @@ -1756,7 +1804,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc06a255cbf402a52ae399c05a518c68c569c916ea11423620111df576b9b9bb" dependencies = [ "implicit-clone-derive", - "indexmap 1.9.3", + "indexmap", ] [[package]] @@ -1769,16 +1817,6 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.1.0" @@ -1786,7 +1824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -1823,17 +1861,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -1842,12 +1869,11 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "io-lifetimes", "rustix", "windows-sys 0.48.0", ] @@ -2012,9 +2038,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lipsum" @@ -2247,12 +2273,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "papergrid" version = "0.10.0" @@ -2282,7 +2302,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -2535,15 +2555,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -2555,9 +2566,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.6" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -2567,9 +2578,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -2578,15 +2589,15 @@ dependencies = [ [[package]] name = "regex-lite" -version = "0.1.0" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f96ede7f386ba6e910092e7ccdc04176cface62abebea07ed6b46d870ed95ca2" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" @@ -2666,16 +2677,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3046,14 +3056,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "autocfg", "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall", "rustix", "windows-sys 0.48.0", ] @@ -3069,9 +3078,9 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ "rustix", "windows-sys 0.48.0", @@ -3241,17 +3250,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 1.9.3", + "indexmap", "toml_datetime", "winnow", ] @@ -3459,6 +3468,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "1.6.1" @@ -3942,9 +3957,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.4.1" +version = "0.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" dependencies = [ "memchr", ] @@ -3970,7 +3985,7 @@ dependencies = [ "gloo 0.11.0", "html-escape", "implicit-clone", - "indexmap 2.1.0", + "indexmap", "js-sys", "prokio", "rustversion", diff --git a/Cargo.toml b/Cargo.toml index 2b0edeec490..9dfc1631c6b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,4 +16,4 @@ panic = "abort" opt-level = 3 [patch.crates-io] -gloo = { git = "https://github.com/langyo/gloo", branch = "cargo-lock-update" } +gloo = { git = "https://github.com/langyo/gloo", branch = "revert-wasi-macro" } From 1fc95e026aa02ce1931fa9648bf11962be963ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sun, 10 Dec 2023 13:57:06 +0800 Subject: [PATCH 33/88] Downgrade `toml_datetime` version. --- Cargo.lock | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fa4bdf518e0..12e19bf49dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1584,7 +1584,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -1600,6 +1600,12 @@ dependencies = [ "byteorder", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.14.3" @@ -1804,7 +1810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc06a255cbf402a52ae399c05a518c68c569c916ea11423620111df576b9b9bb" dependencies = [ "implicit-clone-derive", - "indexmap", + "indexmap 2.1.0", ] [[package]] @@ -1817,6 +1823,16 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + [[package]] name = "indexmap" version = "2.1.0" @@ -1824,7 +1840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.3", ] [[package]] @@ -3250,17 +3266,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ - "indexmap", + "indexmap 1.9.3", "toml_datetime", "winnow", ] @@ -3957,9 +3973,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.26" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" +checksum = "656953b22bcbfb1ec8179d60734981d1904494ecc91f8a3f0ee5c7389bb8eb4b" dependencies = [ "memchr", ] @@ -3985,7 +4001,7 @@ dependencies = [ "gloo 0.11.0", "html-escape", "implicit-clone", - "indexmap", + "indexmap 2.1.0", "js-sys", "prokio", "rustversion", From 5a7be987d363b1363d733b8c53472a08ad9e4ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sun, 10 Dec 2023 14:00:07 +0800 Subject: [PATCH 34/88] Fix enum for `gloo-history`. --- packages/yew-router/src/navigator.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/yew-router/src/navigator.rs b/packages/yew-router/src/navigator.rs index a1eef694c2c..48345609f83 100644 --- a/packages/yew-router/src/navigator.rs +++ b/packages/yew-router/src/navigator.rs @@ -12,7 +12,6 @@ pub type NavigationResult = HistoryResult; #[derive(Debug, PartialEq, Eq, Clone, Copy)] pub enum NavigatorKind { /// Browser History. - #[cfg(not(target_os = "wasi"))] Browser, /// Hash History. Hash, @@ -151,9 +150,7 @@ impl Navigator { /// Returns the Navigator kind. pub fn kind(&self) -> NavigatorKind { match &self.inner { - #[cfg(not(target_os = "wasi"))] AnyHistory::Browser(_) => NavigatorKind::Browser, - #[cfg(not(target_os = "wasi"))] AnyHistory::Hash(_) => NavigatorKind::Hash, AnyHistory::Memory(_) => NavigatorKind::Memory, } From 6064d8bbce8dcdee9f6027478c788b376b73b635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sun, 10 Dec 2023 14:17:17 +0800 Subject: [PATCH 35/88] Well, it seems there is no way to avoid the MSRV upgrade.... --- .github/workflows/main-checks.yml | 6 +-- Cargo.lock | 64 ++++++++++--------------- packages/yew-agent-macro/Cargo.toml | 2 +- packages/yew-agent/Cargo.toml | 2 +- packages/yew-macro/Cargo.toml | 2 +- packages/yew-macro/Makefile.toml | 2 +- packages/yew-router-macro/Cargo.toml | 2 +- packages/yew-router-macro/Makefile.toml | 2 +- packages/yew-router/Cargo.toml | 2 +- packages/yew/Cargo.toml | 2 +- 10 files changed, 35 insertions(+), 51 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index cf3dbeda5e4..4169233a4d2 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -67,7 +67,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.64.0 + - 1.67.0 - stable steps: @@ -116,7 +116,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.64.0 + - 1.67.0 - stable - nightly @@ -153,7 +153,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.64.0 + - 1.67.0 - stable - nightly steps: diff --git a/Cargo.lock b/Cargo.lock index 12e19bf49dd..49070ef0260 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1092,7 +1092,7 @@ dependencies = [ [[package]] name = "gloo" version = "0.11.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "gloo-console 0.3.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", "gloo-dialogs 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", @@ -1136,7 +1136,7 @@ dependencies = [ [[package]] name = "gloo-console" version = "0.3.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", "js-sys", @@ -1168,7 +1168,7 @@ dependencies = [ [[package]] name = "gloo-dialogs" version = "0.2.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "wasm-bindgen", "web-sys", @@ -1197,7 +1197,7 @@ dependencies = [ [[package]] name = "gloo-events" version = "0.2.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "wasm-bindgen", "web-sys", @@ -1231,7 +1231,7 @@ dependencies = [ [[package]] name = "gloo-file" version = "0.3.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "futures-channel", "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", @@ -1276,7 +1276,7 @@ dependencies = [ [[package]] name = "gloo-history" version = "0.2.1" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "getrandom", "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", @@ -1334,7 +1334,7 @@ dependencies = [ [[package]] name = "gloo-net" version = "0.5.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "futures-channel", "futures-core", @@ -1374,7 +1374,7 @@ dependencies = [ [[package]] name = "gloo-render" version = "0.2.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "wasm-bindgen", "web-sys", @@ -1413,7 +1413,7 @@ dependencies = [ [[package]] name = "gloo-storage" version = "0.3.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", "js-sys", @@ -1449,7 +1449,7 @@ dependencies = [ [[package]] name = "gloo-timers" version = "0.3.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "futures-channel", "futures-core", @@ -1486,7 +1486,7 @@ dependencies = [ [[package]] name = "gloo-utils" version = "0.2.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "js-sys", "serde", @@ -1534,7 +1534,7 @@ dependencies = [ [[package]] name = "gloo-worker" version = "0.5.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "bincode", "futures 0.3.29", @@ -1564,7 +1564,7 @@ dependencies = [ [[package]] name = "gloo-worker-macros" version = "0.1.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#f623f9d4cfaf58e7c6f721da899957916e8313c6" +source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1584,7 +1584,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap", "slab", "tokio", "tokio-util", @@ -1600,12 +1600,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.3" @@ -1810,7 +1804,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc06a255cbf402a52ae399c05a518c68c569c916ea11423620111df576b9b9bb" dependencies = [ "implicit-clone-derive", - "indexmap 2.1.0", + "indexmap", ] [[package]] @@ -1823,16 +1817,6 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.1.0" @@ -1840,7 +1824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -3266,17 +3250,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 1.9.3", + "indexmap", "toml_datetime", "winnow", ] @@ -3973,9 +3957,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.4.11" +version = "0.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "656953b22bcbfb1ec8179d60734981d1904494ecc91f8a3f0ee5c7389bb8eb4b" +checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" dependencies = [ "memchr", ] @@ -4001,7 +3985,7 @@ dependencies = [ "gloo 0.11.0", "html-escape", "implicit-clone", - "indexmap 2.1.0", + "indexmap", "js-sys", "prokio", "rustversion", diff --git a/packages/yew-agent-macro/Cargo.toml b/packages/yew-agent-macro/Cargo.toml index 149198c5cee..d6b9125990f 100644 --- a/packages/yew-agent-macro/Cargo.toml +++ b/packages/yew-agent-macro/Cargo.toml @@ -2,7 +2,7 @@ name = "yew-agent-macro" version = "0.2.0" edition = "2021" -rust-version = "1.64.0" +rust-version = "1.67.0" authors = ["Kaede Hoshikawa "] repository = "https://github.com/yewstack/yew" homepage = "https://yew.rs" diff --git a/packages/yew-agent/Cargo.toml b/packages/yew-agent/Cargo.toml index 2007b54f86f..8865164af38 100644 --- a/packages/yew-agent/Cargo.toml +++ b/packages/yew-agent/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" readme = "../../README.md" description = "Agents for Yew" license = "MIT OR Apache-2.0" -rust-version = "1.64.0" +rust-version = "1.67.0" [dependencies] yew = { version = "0.21.0", path = "../yew" } diff --git a/packages/yew-macro/Cargo.toml b/packages/yew-macro/Cargo.toml index 9d497486b92..b9a4c188dae 100644 --- a/packages/yew-macro/Cargo.toml +++ b/packages/yew-macro/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" keywords = ["web", "wasm", "frontend", "webasm", "webassembly"] categories = ["gui", "web-programming", "wasm"] description = "A framework for making client-side single-page apps" -rust-version = "1.64.0" +rust-version = "1.67.0" [lib] proc-macro = true diff --git a/packages/yew-macro/Makefile.toml b/packages/yew-macro/Makefile.toml index b679fa4fa51..12ccace96fd 100644 --- a/packages/yew-macro/Makefile.toml +++ b/packages/yew-macro/Makefile.toml @@ -1,6 +1,6 @@ [tasks.test] clear = true -toolchain = "1.64.0" +toolchain = "1.67.0" command = "cargo" # test target can be optionally specified like `cargo make test html_macro`, args = ["test", "${@}"] diff --git a/packages/yew-router-macro/Cargo.toml b/packages/yew-router-macro/Cargo.toml index c612ed97215..4ebf8790017 100644 --- a/packages/yew-router-macro/Cargo.toml +++ b/packages/yew-router-macro/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "MIT OR Apache-2.0" description = "Contains macros used with yew-router" repository = "https://github.com/yewstack/yew" -rust-version = "1.64.0" +rust-version = "1.67.0" [lib] proc-macro = true diff --git a/packages/yew-router-macro/Makefile.toml b/packages/yew-router-macro/Makefile.toml index 1eae4efc7c4..759fbe40e5b 100644 --- a/packages/yew-router-macro/Makefile.toml +++ b/packages/yew-router-macro/Makefile.toml @@ -1,6 +1,6 @@ [tasks.test] clear = true -toolchain = "1.64.0" +toolchain = "1.67.0" command = "cargo" args = ["test"] diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index cdc906032e3..2dccb770ebf 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["web", "yew", "router"] categories = ["gui", "web-programming"] description = "A router implementation for the Yew framework" repository = "https://github.com/yewstack/yew" -rust-version = "1.64.0" +rust-version = "1.67.0" [dependencies] yew = { version = "0.21.0", path = "../yew", default-features = false } diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index b6091b3192a..4c0f1cffca7 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["web", "webasm", "javascript"] categories = ["gui", "wasm", "web-programming"] description = "A framework for creating reliable and efficient web applications" readme = "../../README.md" -rust-version = "1.64.0" +rust-version = "1.67.0" [dependencies] console_error_panic_hook = "0.1" From 27120308644c59dcbecfc9f8caba60f4786eea6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 11 Dec 2023 21:12:01 +0800 Subject: [PATCH 36/88] fix: Replace feature = "wasi" to target_os = "wasi". --- packages/yew/tests/hydration.rs | 2 +- packages/yew/tests/layout.rs | 2 +- packages/yew/tests/mod.rs | 2 +- packages/yew/tests/raw_html.rs | 18 +++++++++--------- packages/yew/tests/suspense.rs | 2 +- packages/yew/tests/use_callback.rs | 2 +- packages/yew/tests/use_context.rs | 2 +- packages/yew/tests/use_effect.rs | 2 +- packages/yew/tests/use_memo.rs | 2 +- packages/yew/tests/use_prepared_state.rs | 2 +- packages/yew/tests/use_reducer.rs | 2 +- packages/yew/tests/use_ref.rs | 2 +- packages/yew/tests/use_state.rs | 2 +- packages/yew/tests/use_transitive_state.rs | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/yew/tests/hydration.rs b/packages/yew/tests/hydration.rs index 26972613f6f..99d818ec529 100644 --- a/packages/yew/tests/hydration.rs +++ b/packages/yew/tests/hydration.rs @@ -1,5 +1,5 @@ #![cfg(feature = "hydration")] -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] use std::ops::Range; use std::rc::Rc; diff --git a/packages/yew/tests/layout.rs b/packages/yew/tests/layout.rs index 6f142a57aa3..7eb7ae27f09 100644 --- a/packages/yew/tests/layout.rs +++ b/packages/yew/tests/layout.rs @@ -1,4 +1,4 @@ -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] mod common; diff --git a/packages/yew/tests/mod.rs b/packages/yew/tests/mod.rs index de64ddf8392..2cf30271e4d 100644 --- a/packages/yew/tests/mod.rs +++ b/packages/yew/tests/mod.rs @@ -1,4 +1,4 @@ -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] mod common; diff --git a/packages/yew/tests/raw_html.rs b/packages/yew/tests/raw_html.rs index 20484285529..c6105069394 100644 --- a/packages/yew/tests/raw_html.rs +++ b/packages/yew/tests/raw_html.rs @@ -1,13 +1,13 @@ mod common; -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] use wasm_bindgen::JsCast; -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] use wasm_bindgen_test::wasm_bindgen_test as test; use yew::prelude::*; -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser); -#[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] +#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] use tokio::test; macro_rules! create_test { @@ -27,7 +27,7 @@ macro_rules! create_test { } } - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] { use std::time::Duration; @@ -46,7 +46,7 @@ macro_rules! create_test { .unwrap(); assert_eq!(e.inner_html(), $expected); } - #[cfg(any(not(target_arch = "wasm32"), feature = "wasi"))] + #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] { let actual = yew::ServerRenderer::::new() .hydratable(false) @@ -74,7 +74,7 @@ create_test!( macro_rules! create_update_html_test { ($name:ident, $initial:expr, $updated:expr) => { - #[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] + #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[test] async fn $name() { #[function_component] @@ -150,7 +150,7 @@ create_update_html_test!( "firstsecond" ); -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[test] async fn change_vnode_types_from_other_to_vraw() { #[function_component] @@ -202,7 +202,7 @@ async fn change_vnode_types_from_other_to_vraw() { assert_eq!(e.inner_html(), "second"); } -#[cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[test] async fn change_vnode_types_from_vraw_to_other() { #[function_component] diff --git a/packages/yew/tests/suspense.rs b/packages/yew/tests/suspense.rs index 5a225013f77..d47bb912cad 100644 --- a/packages/yew/tests/suspense.rs +++ b/packages/yew/tests/suspense.rs @@ -1,4 +1,4 @@ -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] mod common; diff --git a/packages/yew/tests/use_callback.rs b/packages/yew/tests/use_callback.rs index b65013572ef..a8439caf131 100644 --- a/packages/yew/tests/use_callback.rs +++ b/packages/yew/tests/use_callback.rs @@ -1,4 +1,4 @@ -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] use std::sync::atomic::{AtomicBool, Ordering}; diff --git a/packages/yew/tests/use_context.rs b/packages/yew/tests/use_context.rs index 5369bae2710..96d88bd95b0 100644 --- a/packages/yew/tests/use_context.rs +++ b/packages/yew/tests/use_context.rs @@ -1,4 +1,4 @@ -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] mod common; diff --git a/packages/yew/tests/use_effect.rs b/packages/yew/tests/use_effect.rs index 12f085135f1..2746d89a566 100644 --- a/packages/yew/tests/use_effect.rs +++ b/packages/yew/tests/use_effect.rs @@ -1,4 +1,4 @@ -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] mod common; diff --git a/packages/yew/tests/use_memo.rs b/packages/yew/tests/use_memo.rs index 1de9fb1d4fe..c6e819f78c9 100644 --- a/packages/yew/tests/use_memo.rs +++ b/packages/yew/tests/use_memo.rs @@ -1,4 +1,4 @@ -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] use std::sync::atomic::{AtomicBool, Ordering}; diff --git a/packages/yew/tests/use_prepared_state.rs b/packages/yew/tests/use_prepared_state.rs index 81d65da2e2e..c7a122886f0 100644 --- a/packages/yew/tests/use_prepared_state.rs +++ b/packages/yew/tests/use_prepared_state.rs @@ -1,4 +1,4 @@ -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #![cfg(feature = "hydration")] #![cfg_attr(nightly_yew, feature(async_closure))] diff --git a/packages/yew/tests/use_reducer.rs b/packages/yew/tests/use_reducer.rs index c1df05f6573..17603668023 100644 --- a/packages/yew/tests/use_reducer.rs +++ b/packages/yew/tests/use_reducer.rs @@ -1,4 +1,4 @@ -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] use std::collections::HashSet; use std::rc::Rc; diff --git a/packages/yew/tests/use_ref.rs b/packages/yew/tests/use_ref.rs index 7e991ebb62a..135cb8df8a4 100644 --- a/packages/yew/tests/use_ref.rs +++ b/packages/yew/tests/use_ref.rs @@ -1,4 +1,4 @@ -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] mod common; diff --git a/packages/yew/tests/use_state.rs b/packages/yew/tests/use_state.rs index a2254ab2367..8e1354bee25 100644 --- a/packages/yew/tests/use_state.rs +++ b/packages/yew/tests/use_state.rs @@ -1,4 +1,4 @@ -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] mod common; diff --git a/packages/yew/tests/use_transitive_state.rs b/packages/yew/tests/use_transitive_state.rs index 155de9d9c78..94de0abad75 100644 --- a/packages/yew/tests/use_transitive_state.rs +++ b/packages/yew/tests/use_transitive_state.rs @@ -1,5 +1,5 @@ #![cfg(feature = "hydration")] -#![cfg(all(target_arch = "wasm32", not(feature = "wasi")))] +#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] use std::time::Duration; From 7ed602d0d62a7fdb74f8be1715086103fa6db6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 11 Dec 2023 21:18:41 +0800 Subject: [PATCH 37/88] Remove tips for rust version. --- examples/wasi_ssr_module/README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/wasi_ssr_module/README.md b/examples/wasi_ssr_module/README.md index 974b29803b7..00adebabb97 100644 --- a/examples/wasi_ssr_module/README.md +++ b/examples/wasi_ssr_module/README.md @@ -4,8 +4,6 @@ This example demonstrates how to use the WASI target to run a simple server-side It depends on [wasmtime](https://wasmtime.dev)'s WASI preview2. -> It requires Rust 1.67 or newer. - ## Building To build the example, run the following command from the root of the repository: From 700731bcbf7a8f1f1e30a3305bfc5307cb9f4234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 11 Dec 2023 21:24:47 +0800 Subject: [PATCH 38/88] Bump `gloo` to 0.11. --- Cargo.lock | 214 +++++--------------- Cargo.toml | 3 - examples/boids/Cargo.toml | 6 +- examples/counter/Cargo.toml | 2 +- examples/dyn_create_destroy_apps/Cargo.toml | 9 +- examples/file_upload/Cargo.toml | 2 +- examples/function_memory_game/Cargo.toml | 6 +- examples/function_router/Cargo.toml | 2 +- examples/function_todomvc/Cargo.toml | 6 +- examples/futures/Cargo.toml | 2 +- examples/game_of_life/Cargo.toml | 4 +- examples/inner_html/Cargo.toml | 2 +- examples/mount_point/Cargo.toml | 4 +- examples/portals/Cargo.toml | 2 +- examples/router/Cargo.toml | 2 +- examples/timer/Cargo.toml | 2 +- examples/todomvc/Cargo.toml | 6 +- examples/two_apps/Cargo.toml | 2 +- 18 files changed, 74 insertions(+), 202 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 49070ef0260..b4a3adcef03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -308,7 +308,7 @@ version = "0.1.0" dependencies = [ "anyhow", "getrandom", - "gloo 0.10.0", + "gloo 0.11.0", "rand", "serde", "web-sys", @@ -529,7 +529,7 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" name = "counter" version = "0.1.1" dependencies = [ - "gloo 0.10.0", + "gloo 0.11.0", "js-sys", "wasm-bindgen", "yew", @@ -704,7 +704,7 @@ dependencies = [ name = "dyn_create_destroy_apps" version = "0.1.0" dependencies = [ - "gloo 0.10.0", + "gloo 0.11.0", "js-sys", "slab", "wasm-bindgen", @@ -802,7 +802,7 @@ name = "file_upload" version = "0.1.0" dependencies = [ "base64", - "gloo 0.10.0", + "gloo 0.11.0", "js-sys", "web-sys", "yew", @@ -849,7 +849,7 @@ name = "function_memory_game" version = "0.1.0" dependencies = [ "getrandom", - "gloo 0.10.0", + "gloo 0.11.0", "nanoid", "rand", "serde", @@ -864,7 +864,7 @@ name = "function_router" version = "0.1.0" dependencies = [ "getrandom", - "gloo 0.10.0", + "gloo 0.11.0", "instant", "lipsum", "log", @@ -880,7 +880,7 @@ dependencies = [ name = "function_todomvc" version = "0.1.0" dependencies = [ - "gloo 0.10.0", + "gloo 0.11.0", "serde", "strum", "strum_macros", @@ -892,7 +892,7 @@ dependencies = [ name = "futures" version = "0.1.0" dependencies = [ - "gloo 0.10.0", + "gloo 0.11.0", "pulldown-cmark", "wasm-bindgen", "wasm-bindgen-futures", @@ -994,7 +994,7 @@ name = "game_of_life" version = "0.1.4" dependencies = [ "getrandom", - "gloo 0.10.0", + "gloo 0.11.0", "log", "rand", "wasm-logger", @@ -1076,34 +1076,35 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd35526c28cc55c1db77aed6296de58677dbab863b118483a27845631d870249" dependencies = [ - "gloo-console 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gloo-dialogs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gloo-events 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gloo-file 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gloo-history 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-console 0.3.0", + "gloo-dialogs 0.2.0", + "gloo-events 0.2.0", + "gloo-file 0.3.0", + "gloo-history 0.2.1", "gloo-net 0.4.0", - "gloo-render 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gloo-storage 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gloo-timers 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-render 0.2.0", + "gloo-storage 0.3.0", + "gloo-timers 0.3.0", + "gloo-utils 0.2.0", "gloo-worker 0.4.0", ] [[package]] name = "gloo" version = "0.11.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15282ece24eaf4bd338d73ef580c6714c8615155c4190c781290ee3fa0fd372" dependencies = [ - "gloo-console 0.3.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", - "gloo-dialogs 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", - "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", - "gloo-file 0.3.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", - "gloo-history 0.2.1 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-console 0.3.0", + "gloo-dialogs 0.2.0", + "gloo-events 0.2.0", + "gloo-file 0.3.0", + "gloo-history 0.2.1", "gloo-net 0.5.0", - "gloo-render 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", - "gloo-storage 0.3.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", - "gloo-timers 0.3.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", - "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-render 0.2.0", + "gloo-storage 0.3.0", + "gloo-timers 0.3.0", + "gloo-utils 0.2.0", "gloo-worker 0.5.0", ] @@ -1126,19 +1127,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a17868f56b4a24f677b17c8cb69958385102fa879418052d60b50bc1727e261" dependencies = [ - "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "js-sys", - "serde", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-console" -version = "0.3.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" -dependencies = [ - "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-utils 0.2.0", "js-sys", "serde", "wasm-bindgen", @@ -1165,15 +1154,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-dialogs" -version = "0.2.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-events" version = "0.1.2" @@ -1194,15 +1174,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-events" -version = "0.2.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-file" version = "0.2.3" @@ -1222,19 +1193,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97563d71863fb2824b2e974e754a81d19c4a7ec47b09ced8a0e6656b6d54bd1f" dependencies = [ "futures-channel", - "gloo-events 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-file" -version = "0.3.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" -dependencies = [ - "futures-channel", - "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-events 0.2.0", "js-sys", "wasm-bindgen", "web-sys", @@ -1263,24 +1222,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4022e82f5f9e03cb1251b13c0a967e0600e97aa179c617f6519bac40640160" dependencies = [ "getrandom", - "gloo-events 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", - "serde-wasm-bindgen 0.6.2", - "serde_urlencoded", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-history" -version = "0.2.1" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" -dependencies = [ - "getrandom", - "gloo-events 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", - "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-events 0.2.0", + "gloo-utils 0.2.0", "serde", "serde-wasm-bindgen 0.6.2", "serde_urlencoded", @@ -1319,7 +1262,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-utils 0.2.0", "http", "js-sys", "pin-project", @@ -1334,12 +1277,13 @@ dependencies = [ [[package]] name = "gloo-net" version = "0.5.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-utils 0.2.0", "http", "js-sys", "pin-project", @@ -1371,15 +1315,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-render" -version = "0.2.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-storage" version = "0.2.2" @@ -1401,21 +1336,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbc8031e8c92758af912f9bc08fbbadd3c6f3cfcbf6b64cdf3d6a81f0139277a" dependencies = [ - "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "js-sys", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "gloo-storage" -version = "0.3.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" -dependencies = [ - "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-utils 0.2.0", "js-sys", "serde", "serde_json", @@ -1446,17 +1367,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gloo-timers" -version = "0.3.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "gloo-utils" version = "0.1.7" @@ -1483,18 +1393,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-utils" -version = "0.2.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-worker" version = "0.2.1" @@ -1520,8 +1418,8 @@ checksum = "76495d3dd87de51da268fa3a593da118ab43eb7f8809e17eb38d3319b424e400" dependencies = [ "bincode", "futures 0.3.29", - "gloo-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gloo-worker-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gloo-utils 0.2.0", + "gloo-worker-macros", "js-sys", "pinned", "serde", @@ -1534,12 +1432,13 @@ dependencies = [ [[package]] name = "gloo-worker" version = "0.5.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "085f262d7604911c8150162529cefab3782e91adb20202e8658f7275d2aefe5d" dependencies = [ "bincode", "futures 0.3.29", - "gloo-utils 0.2.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", - "gloo-worker-macros 0.1.0 (git+https://github.com/langyo/gloo?branch=revert-wasi-macro)", + "gloo-utils 0.2.0", + "gloo-worker-macros", "js-sys", "pinned", "serde", @@ -1561,17 +1460,6 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "gloo-worker-macros" -version = "0.1.0" -source = "git+https://github.com/langyo/gloo?branch=revert-wasi-macro#7cd71ba6b24ffda9c7e8e99a3c818e18e89b3962" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.39", -] - [[package]] name = "h2" version = "0.3.22" @@ -1844,7 +1732,7 @@ dependencies = [ name = "inner_html" version = "0.1.0" dependencies = [ - "gloo 0.10.0", + "gloo 0.11.0", "web-sys", "yew", ] @@ -2120,7 +2008,7 @@ dependencies = [ name = "mount_point" version = "0.1.0" dependencies = [ - "gloo 0.10.0", + "gloo 0.11.0", "wasm-bindgen", "web-sys", "yew", @@ -2385,7 +2273,7 @@ checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" name = "portals" version = "0.1.0" dependencies = [ - "gloo 0.10.0", + "gloo 0.11.0", "wasm-bindgen", "web-sys", "yew", @@ -2648,7 +2536,7 @@ name = "router" version = "0.1.0" dependencies = [ "getrandom", - "gloo 0.10.0", + "gloo 0.11.0", "instant", "lipsum", "log", @@ -3128,7 +3016,7 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" name = "timer" version = "0.1.0" dependencies = [ - "gloo 0.10.0", + "gloo 0.11.0", "js-sys", "wasm-bindgen", "yew", @@ -3162,7 +3050,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" name = "todomvc" version = "0.1.0" dependencies = [ - "gloo 0.10.0", + "gloo 0.11.0", "serde", "serde_derive", "strum", @@ -3393,7 +3281,7 @@ dependencies = [ name = "two_apps" version = "0.1.0" dependencies = [ - "gloo 0.10.0", + "gloo 0.11.0", "yew", ] diff --git a/Cargo.toml b/Cargo.toml index 9dfc1631c6b..386379907df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,3 @@ lto = true codegen-units = 1 panic = "abort" opt-level = 3 - -[patch.crates-io] -gloo = { git = "https://github.com/langyo/gloo", branch = "revert-wasi-macro" } diff --git a/examples/boids/Cargo.toml b/examples/boids/Cargo.toml index 1a3a1b8178c..e0b030605f9 100644 --- a/examples/boids/Cargo.toml +++ b/examples/boids/Cargo.toml @@ -12,10 +12,8 @@ getrandom = { version = "0.2", features = ["js"] } rand = "0.8" serde = { version = "1.0", features = ["derive"] } yew = { path = "../../packages/yew", features = ["csr"] } -gloo = "0.10" +gloo = "0.11" [dependencies.web-sys] version = "0.3" -features = [ - "HtmlInputElement", -] +features = ["HtmlInputElement"] diff --git a/examples/counter/Cargo.toml b/examples/counter/Cargo.toml index 381c2cc0d7f..feaad6adceb 100644 --- a/examples/counter/Cargo.toml +++ b/examples/counter/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -gloo = "0.10" +gloo = "0.11" js-sys = "0.3" yew = { path = "../../packages/yew", features = ["csr"] } wasm-bindgen = "0.2" diff --git a/examples/dyn_create_destroy_apps/Cargo.toml b/examples/dyn_create_destroy_apps/Cargo.toml index 7880e6ebe20..06f9322bbd2 100644 --- a/examples/dyn_create_destroy_apps/Cargo.toml +++ b/examples/dyn_create_destroy_apps/Cargo.toml @@ -9,14 +9,9 @@ license = "MIT OR Apache-2.0" js-sys = "0.3" yew = { path = "../../packages/yew", features = ["csr"] } slab = "0.4.9" -gloo = "0.10" +gloo = "0.11" wasm-bindgen = "0.2" [dependencies.web-sys] version = "0.3.64" -features = [ - "Document", - "Element", - "Node", - "DomTokenList" -] +features = ["Document", "Element", "Node", "DomTokenList"] diff --git a/examples/file_upload/Cargo.toml b/examples/file_upload/Cargo.toml index 3c4d3817a5e..3322afc43b9 100644 --- a/examples/file_upload/Cargo.toml +++ b/examples/file_upload/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" js-sys = "0.3" yew = { path = "../../packages/yew", features = ["csr"] } base64 = "0.21.5" -gloo = "0.10" +gloo = "0.11" [dependencies.web-sys] version = "0.3" diff --git a/examples/function_memory_game/Cargo.toml b/examples/function_memory_game/Cargo.toml index 363e2e2b31c..125166cd3d9 100644 --- a/examples/function_memory_game/Cargo.toml +++ b/examples/function_memory_game/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" serde = { version = "1.0", features = ["derive"] } strum = "0.25" strum_macros = "0.25" -gloo = "0.10" +gloo = "0.11" nanoid = "0.4" rand = "0.8" getrandom = { version = "0.2", features = ["js"] } @@ -17,6 +17,4 @@ yew = { path = "../../packages/yew", features = ["csr"] } [dependencies.web-sys] version = "0.3" -features = [ - "HtmlInputElement", -] +features = ["HtmlInputElement"] diff --git a/examples/function_router/Cargo.toml b/examples/function_router/Cargo.toml index 4e3b73a3ca2..74bb4c6a4f2 100644 --- a/examples/function_router/Cargo.toml +++ b/examples/function_router/Cargo.toml @@ -11,7 +11,7 @@ rand = { version = "0.8", features = ["small_rng"] } yew = { path = "../../packages/yew" } yew-router = { path = "../../packages/yew-router" } serde = { version = "1.0", features = ["derive"] } -gloo = "0.10" +gloo = "0.11" wasm-logger = "0.2" instant = { version = "0.1", features = ["wasm-bindgen"] } once_cell = "1" diff --git a/examples/function_todomvc/Cargo.toml b/examples/function_todomvc/Cargo.toml index f6dcc2378e2..ebc10615001 100644 --- a/examples/function_todomvc/Cargo.toml +++ b/examples/function_todomvc/Cargo.toml @@ -9,11 +9,9 @@ license = "MIT OR Apache-2.0" serde = { version = "1.0", features = ["derive"] } strum = "0.25" strum_macros = "0.25" -gloo = "0.10" +gloo = "0.11" yew = { path = "../../packages/yew", features = ["csr"] } [dependencies.web-sys] version = "0.3" -features = [ - "HtmlInputElement", -] +features = ["HtmlInputElement"] diff --git a/examples/futures/Cargo.toml b/examples/futures/Cargo.toml index bd0c70d5bc9..99a8b43f28f 100644 --- a/examples/futures/Cargo.toml +++ b/examples/futures/Cargo.toml @@ -10,7 +10,7 @@ pulldown-cmark = { version = "0.9", default-features = false } wasm-bindgen = "0.2" wasm-bindgen-futures = "0.4" yew = { path = "../../packages/yew", features = ["csr"] } -gloo = "0.10" +gloo = "0.11" [dependencies.web-sys] version = "0.3" diff --git a/examples/game_of_life/Cargo.toml b/examples/game_of_life/Cargo.toml index 8b81d044a7d..5ae8f325174 100644 --- a/examples/game_of_life/Cargo.toml +++ b/examples/game_of_life/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.4" authors = [ "Diego Cardoso ", "Ilya Bogdanov " + "Junjie Huang ", ] edition = "2021" license = "MIT OR Apache-2.0" @@ -15,4 +15,4 @@ log = "0.4" rand = "0.8" wasm-logger = "0.2" yew = { path = "../../packages/yew", features = ["csr"] } -gloo = "0.10" +gloo = "0.11" diff --git a/examples/inner_html/Cargo.toml b/examples/inner_html/Cargo.toml index 9b9a12047bc..37f971a8bf4 100644 --- a/examples/inner_html/Cargo.toml +++ b/examples/inner_html/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" [dependencies] yew = { path = "../../packages/yew", features = ["csr"] } -gloo = "0.10" +gloo = "0.11" [dependencies.web-sys] version = "0.3" diff --git a/examples/mount_point/Cargo.toml b/examples/mount_point/Cargo.toml index d33af38f6ee..5dc77f2e183 100644 --- a/examples/mount_point/Cargo.toml +++ b/examples/mount_point/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" [dependencies] wasm-bindgen = "0.2" yew = { path = "../../packages/yew", features = ["csr"] } -gloo = "0.10" +gloo = "0.11" [dependencies.web-sys] version = "0.3" @@ -19,5 +19,5 @@ features = [ "Element", "HtmlCanvasElement", "Node", - "Window" + "Window", ] diff --git a/examples/portals/Cargo.toml b/examples/portals/Cargo.toml index a7b04290582..6729e15e8c1 100644 --- a/examples/portals/Cargo.toml +++ b/examples/portals/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0" [dependencies] yew = { path = "../../packages/yew", features = ["csr"] } -gloo = "0.10" +gloo = "0.11" wasm-bindgen = "0.2" [dependencies.web-sys] diff --git a/examples/router/Cargo.toml b/examples/router/Cargo.toml index 9c21071b012..b6d9cc65937 100644 --- a/examples/router/Cargo.toml +++ b/examples/router/Cargo.toml @@ -15,4 +15,4 @@ yew = { path = "../../packages/yew", features = ["csr"] } yew-router = { path = "../../packages/yew-router" } serde = { version = "1.0", features = ["derive"] } once_cell = "1" -gloo = "0.10" +gloo = "0.11" diff --git a/examples/timer/Cargo.toml b/examples/timer/Cargo.toml index d8e3545e4e4..3e7d0dd3d32 100644 --- a/examples/timer/Cargo.toml +++ b/examples/timer/Cargo.toml @@ -8,5 +8,5 @@ license = "MIT OR Apache-2.0" [dependencies] yew = { path = "../../packages/yew", features = ["csr"] } js-sys = "0.3" -gloo = "0.10" +gloo = "0.11" wasm-bindgen = "0.2" diff --git a/examples/todomvc/Cargo.toml b/examples/todomvc/Cargo.toml index dfb83760194..41b3637761d 100644 --- a/examples/todomvc/Cargo.toml +++ b/examples/todomvc/Cargo.toml @@ -11,10 +11,8 @@ strum_macros = "0.25" serde = "1" serde_derive = "1" yew = { path = "../../packages/yew", features = ["csr"] } -gloo = "0.10" +gloo = "0.11" [dependencies.web-sys] version = "0.3" -features = [ - "HtmlInputElement", -] +features = ["HtmlInputElement"] diff --git a/examples/two_apps/Cargo.toml b/examples/two_apps/Cargo.toml index 01fa89c05d3..679db2b2477 100644 --- a/examples/two_apps/Cargo.toml +++ b/examples/two_apps/Cargo.toml @@ -7,4 +7,4 @@ license = "MIT OR Apache-2.0" [dependencies] yew = { path = "../../packages/yew", features = ["csr"] } -gloo = "0.10" +gloo = "0.11" From 73db848839dd1ced016b6c23c722eaa3461d54bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 11 Dec 2023 21:31:20 +0800 Subject: [PATCH 39/88] Try to test yew-macro on compiler 1.67. --- packages/yew-macro/tests/classes_macro_test.rs | 2 +- packages/yew-macro/tests/derive_props_test.rs | 2 +- packages/yew-macro/tests/function_attr_test.rs | 2 +- packages/yew-macro/tests/hook_attr_test.rs | 2 +- packages/yew-macro/tests/hook_macro_test.rs | 2 +- packages/yew-macro/tests/html_macro_test.rs | 2 +- packages/yew-macro/tests/props_macro_test.rs | 2 +- packages/yew-router-macro/tests/routable_derive_test.rs | 2 +- website/docs/getting-started/introduction.mdx | 2 +- .../version-0.21/getting-started/introduction.mdx | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/yew-macro/tests/classes_macro_test.rs b/packages/yew-macro/tests/classes_macro_test.rs index e2cadf8cf39..81c7341007e 100644 --- a/packages/yew-macro/tests/classes_macro_test.rs +++ b/packages/yew-macro/tests/classes_macro_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.64), test)] +#[rustversion::attr(stable(1.67), test)] fn classes_macro() { let t = trybuild::TestCases::new(); t.pass("tests/classes_macro/*-pass.rs"); diff --git a/packages/yew-macro/tests/derive_props_test.rs b/packages/yew-macro/tests/derive_props_test.rs index c98e8feb953..daa901631da 100644 --- a/packages/yew-macro/tests/derive_props_test.rs +++ b/packages/yew-macro/tests/derive_props_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.64), test)] +#[rustversion::attr(stable(1.67), test)] fn derive_props() { let t = trybuild::TestCases::new(); t.pass("tests/derive_props/pass.rs"); diff --git a/packages/yew-macro/tests/function_attr_test.rs b/packages/yew-macro/tests/function_attr_test.rs index ed3cf9d044a..8a177b176e6 100644 --- a/packages/yew-macro/tests/function_attr_test.rs +++ b/packages/yew-macro/tests/function_attr_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.64), test)] +#[rustversion::attr(stable(1.67), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/function_component_attr/*-pass.rs"); diff --git a/packages/yew-macro/tests/hook_attr_test.rs b/packages/yew-macro/tests/hook_attr_test.rs index bd0a3b28812..12d9d76fc45 100644 --- a/packages/yew-macro/tests/hook_attr_test.rs +++ b/packages/yew-macro/tests/hook_attr_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.64), test)] +#[rustversion::attr(stable(1.67), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/hook_attr/*-pass.rs"); diff --git a/packages/yew-macro/tests/hook_macro_test.rs b/packages/yew-macro/tests/hook_macro_test.rs index 01e81a41345..0c33d83c1a1 100644 --- a/packages/yew-macro/tests/hook_macro_test.rs +++ b/packages/yew-macro/tests/hook_macro_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.64), test)] +#[rustversion::attr(stable(1.67), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/hook_macro/*-pass.rs"); diff --git a/packages/yew-macro/tests/html_macro_test.rs b/packages/yew-macro/tests/html_macro_test.rs index 4a91060b1fc..a091c133384 100644 --- a/packages/yew-macro/tests/html_macro_test.rs +++ b/packages/yew-macro/tests/html_macro_test.rs @@ -1,7 +1,7 @@ use yew::{html, html_nested}; #[allow(dead_code)] -#[rustversion::attr(stable(1.64), test)] +#[rustversion::attr(stable(1.67), test)] fn html_macro() { let t = trybuild::TestCases::new(); diff --git a/packages/yew-macro/tests/props_macro_test.rs b/packages/yew-macro/tests/props_macro_test.rs index b82adc18486..8af7024b85e 100644 --- a/packages/yew-macro/tests/props_macro_test.rs +++ b/packages/yew-macro/tests/props_macro_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.64), test)] +#[rustversion::attr(stable(1.67), test)] fn props_macro() { let t = trybuild::TestCases::new(); t.pass("tests/props_macro/*-pass.rs"); diff --git a/packages/yew-router-macro/tests/routable_derive_test.rs b/packages/yew-router-macro/tests/routable_derive_test.rs index 59dbd5e0104..cea64383b33 100644 --- a/packages/yew-router-macro/tests/routable_derive_test.rs +++ b/packages/yew-router-macro/tests/routable_derive_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.64), test)] +#[rustversion::attr(stable(1.67), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/routable_derive/*-pass.rs"); diff --git a/website/docs/getting-started/introduction.mdx b/website/docs/getting-started/introduction.mdx index fedde6320c4..998248e91be 100644 --- a/website/docs/getting-started/introduction.mdx +++ b/website/docs/getting-started/introduction.mdx @@ -11,7 +11,7 @@ bundler for Rust. To install Rust, follow the [official instructions](https://www.rust-lang.org/tools/install). :::important -The minimum supported Rust version (MSRV) for Yew is `1.64.0`. Older versions will not compile. +The minimum supported Rust version (MSRV) for Yew is `1.67.0`. Older versions will not compile. You can check your toolchain version using `rustup show` (under "active toolchain") or `rustc --version`. To update your toolchain, run `rustup update`. diff --git a/website/versioned_docs/version-0.21/getting-started/introduction.mdx b/website/versioned_docs/version-0.21/getting-started/introduction.mdx index fedde6320c4..998248e91be 100644 --- a/website/versioned_docs/version-0.21/getting-started/introduction.mdx +++ b/website/versioned_docs/version-0.21/getting-started/introduction.mdx @@ -11,7 +11,7 @@ bundler for Rust. To install Rust, follow the [official instructions](https://www.rust-lang.org/tools/install). :::important -The minimum supported Rust version (MSRV) for Yew is `1.64.0`. Older versions will not compile. +The minimum supported Rust version (MSRV) for Yew is `1.67.0`. Older versions will not compile. You can check your toolchain version using `rustup show` (under "active toolchain") or `rustc --version`. To update your toolchain, run `rustup update`. From 24515fdf551fc3ff7626c0481840fec588ded270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 11 Dec 2023 21:53:44 +0800 Subject: [PATCH 40/88] Try to use compiler 1.68 instead. --- .github/workflows/main-checks.yml | 6 +++--- packages/yew-agent-macro/Cargo.toml | 2 +- packages/yew-agent/Cargo.toml | 2 +- packages/yew-macro/Cargo.toml | 2 +- packages/yew-macro/Makefile.toml | 2 +- packages/yew-macro/tests/classes_macro_test.rs | 2 +- packages/yew-macro/tests/derive_props_test.rs | 2 +- packages/yew-macro/tests/function_attr_test.rs | 2 +- packages/yew-macro/tests/hook_attr_test.rs | 2 +- packages/yew-macro/tests/hook_macro_test.rs | 2 +- packages/yew-macro/tests/html_macro_test.rs | 2 +- packages/yew-macro/tests/props_macro_test.rs | 2 +- packages/yew-router-macro/Cargo.toml | 2 +- packages/yew-router-macro/Makefile.toml | 2 +- packages/yew-router-macro/tests/routable_derive_test.rs | 2 +- packages/yew-router/Cargo.toml | 2 +- packages/yew/Cargo.toml | 2 +- website/docs/getting-started/introduction.mdx | 2 +- .../version-0.21/getting-started/introduction.mdx | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index 4169233a4d2..94b276c52a8 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -67,7 +67,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.67.0 + - 1.68.0 - stable steps: @@ -116,7 +116,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.67.0 + - 1.68.0 - stable - nightly @@ -153,7 +153,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.67.0 + - 1.68.0 - stable - nightly steps: diff --git a/packages/yew-agent-macro/Cargo.toml b/packages/yew-agent-macro/Cargo.toml index d6b9125990f..34852db42a7 100644 --- a/packages/yew-agent-macro/Cargo.toml +++ b/packages/yew-agent-macro/Cargo.toml @@ -2,7 +2,7 @@ name = "yew-agent-macro" version = "0.2.0" edition = "2021" -rust-version = "1.67.0" +rust-version = "1.68.0" authors = ["Kaede Hoshikawa "] repository = "https://github.com/yewstack/yew" homepage = "https://yew.rs" diff --git a/packages/yew-agent/Cargo.toml b/packages/yew-agent/Cargo.toml index 8865164af38..bcf32d3e88e 100644 --- a/packages/yew-agent/Cargo.toml +++ b/packages/yew-agent/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" readme = "../../README.md" description = "Agents for Yew" license = "MIT OR Apache-2.0" -rust-version = "1.67.0" +rust-version = "1.68.0" [dependencies] yew = { version = "0.21.0", path = "../yew" } diff --git a/packages/yew-macro/Cargo.toml b/packages/yew-macro/Cargo.toml index b9a4c188dae..254ea457eb7 100644 --- a/packages/yew-macro/Cargo.toml +++ b/packages/yew-macro/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" keywords = ["web", "wasm", "frontend", "webasm", "webassembly"] categories = ["gui", "web-programming", "wasm"] description = "A framework for making client-side single-page apps" -rust-version = "1.67.0" +rust-version = "1.68.0" [lib] proc-macro = true diff --git a/packages/yew-macro/Makefile.toml b/packages/yew-macro/Makefile.toml index 12ccace96fd..9d0e17c9c9b 100644 --- a/packages/yew-macro/Makefile.toml +++ b/packages/yew-macro/Makefile.toml @@ -1,6 +1,6 @@ [tasks.test] clear = true -toolchain = "1.67.0" +toolchain = "1.68.0" command = "cargo" # test target can be optionally specified like `cargo make test html_macro`, args = ["test", "${@}"] diff --git a/packages/yew-macro/tests/classes_macro_test.rs b/packages/yew-macro/tests/classes_macro_test.rs index 81c7341007e..52b12bed981 100644 --- a/packages/yew-macro/tests/classes_macro_test.rs +++ b/packages/yew-macro/tests/classes_macro_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.67), test)] +#[rustversion::attr(stable(1.68), test)] fn classes_macro() { let t = trybuild::TestCases::new(); t.pass("tests/classes_macro/*-pass.rs"); diff --git a/packages/yew-macro/tests/derive_props_test.rs b/packages/yew-macro/tests/derive_props_test.rs index daa901631da..a4c14974a22 100644 --- a/packages/yew-macro/tests/derive_props_test.rs +++ b/packages/yew-macro/tests/derive_props_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.67), test)] +#[rustversion::attr(stable(1.68), test)] fn derive_props() { let t = trybuild::TestCases::new(); t.pass("tests/derive_props/pass.rs"); diff --git a/packages/yew-macro/tests/function_attr_test.rs b/packages/yew-macro/tests/function_attr_test.rs index 8a177b176e6..5b52d5f58e9 100644 --- a/packages/yew-macro/tests/function_attr_test.rs +++ b/packages/yew-macro/tests/function_attr_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.67), test)] +#[rustversion::attr(stable(1.68), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/function_component_attr/*-pass.rs"); diff --git a/packages/yew-macro/tests/hook_attr_test.rs b/packages/yew-macro/tests/hook_attr_test.rs index 12d9d76fc45..f61bbf78353 100644 --- a/packages/yew-macro/tests/hook_attr_test.rs +++ b/packages/yew-macro/tests/hook_attr_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.67), test)] +#[rustversion::attr(stable(1.68), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/hook_attr/*-pass.rs"); diff --git a/packages/yew-macro/tests/hook_macro_test.rs b/packages/yew-macro/tests/hook_macro_test.rs index 0c33d83c1a1..321acd94a65 100644 --- a/packages/yew-macro/tests/hook_macro_test.rs +++ b/packages/yew-macro/tests/hook_macro_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.67), test)] +#[rustversion::attr(stable(1.68), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/hook_macro/*-pass.rs"); diff --git a/packages/yew-macro/tests/html_macro_test.rs b/packages/yew-macro/tests/html_macro_test.rs index a091c133384..f332f5434fb 100644 --- a/packages/yew-macro/tests/html_macro_test.rs +++ b/packages/yew-macro/tests/html_macro_test.rs @@ -1,7 +1,7 @@ use yew::{html, html_nested}; #[allow(dead_code)] -#[rustversion::attr(stable(1.67), test)] +#[rustversion::attr(stable(1.68), test)] fn html_macro() { let t = trybuild::TestCases::new(); diff --git a/packages/yew-macro/tests/props_macro_test.rs b/packages/yew-macro/tests/props_macro_test.rs index 8af7024b85e..e282252a5cd 100644 --- a/packages/yew-macro/tests/props_macro_test.rs +++ b/packages/yew-macro/tests/props_macro_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.67), test)] +#[rustversion::attr(stable(1.68), test)] fn props_macro() { let t = trybuild::TestCases::new(); t.pass("tests/props_macro/*-pass.rs"); diff --git a/packages/yew-router-macro/Cargo.toml b/packages/yew-router-macro/Cargo.toml index 4ebf8790017..4cc05bc37bf 100644 --- a/packages/yew-router-macro/Cargo.toml +++ b/packages/yew-router-macro/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "MIT OR Apache-2.0" description = "Contains macros used with yew-router" repository = "https://github.com/yewstack/yew" -rust-version = "1.67.0" +rust-version = "1.68.0" [lib] proc-macro = true diff --git a/packages/yew-router-macro/Makefile.toml b/packages/yew-router-macro/Makefile.toml index 759fbe40e5b..712eccdddbb 100644 --- a/packages/yew-router-macro/Makefile.toml +++ b/packages/yew-router-macro/Makefile.toml @@ -1,6 +1,6 @@ [tasks.test] clear = true -toolchain = "1.67.0" +toolchain = "1.68.0" command = "cargo" args = ["test"] diff --git a/packages/yew-router-macro/tests/routable_derive_test.rs b/packages/yew-router-macro/tests/routable_derive_test.rs index cea64383b33..8b6cd658a07 100644 --- a/packages/yew-router-macro/tests/routable_derive_test.rs +++ b/packages/yew-router-macro/tests/routable_derive_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.67), test)] +#[rustversion::attr(stable(1.68), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/routable_derive/*-pass.rs"); diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index 2dccb770ebf..6b008cd702d 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["web", "yew", "router"] categories = ["gui", "web-programming"] description = "A router implementation for the Yew framework" repository = "https://github.com/yewstack/yew" -rust-version = "1.67.0" +rust-version = "1.68.0" [dependencies] yew = { version = "0.21.0", path = "../yew", default-features = false } diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index 4c0f1cffca7..c8ab55119d2 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["web", "webasm", "javascript"] categories = ["gui", "wasm", "web-programming"] description = "A framework for creating reliable and efficient web applications" readme = "../../README.md" -rust-version = "1.67.0" +rust-version = "1.68.0" [dependencies] console_error_panic_hook = "0.1" diff --git a/website/docs/getting-started/introduction.mdx b/website/docs/getting-started/introduction.mdx index 998248e91be..9f217910e75 100644 --- a/website/docs/getting-started/introduction.mdx +++ b/website/docs/getting-started/introduction.mdx @@ -11,7 +11,7 @@ bundler for Rust. To install Rust, follow the [official instructions](https://www.rust-lang.org/tools/install). :::important -The minimum supported Rust version (MSRV) for Yew is `1.67.0`. Older versions will not compile. +The minimum supported Rust version (MSRV) for Yew is `1.68.0`. Older versions will not compile. You can check your toolchain version using `rustup show` (under "active toolchain") or `rustc --version`. To update your toolchain, run `rustup update`. diff --git a/website/versioned_docs/version-0.21/getting-started/introduction.mdx b/website/versioned_docs/version-0.21/getting-started/introduction.mdx index 998248e91be..fedde6320c4 100644 --- a/website/versioned_docs/version-0.21/getting-started/introduction.mdx +++ b/website/versioned_docs/version-0.21/getting-started/introduction.mdx @@ -11,7 +11,7 @@ bundler for Rust. To install Rust, follow the [official instructions](https://www.rust-lang.org/tools/install). :::important -The minimum supported Rust version (MSRV) for Yew is `1.67.0`. Older versions will not compile. +The minimum supported Rust version (MSRV) for Yew is `1.64.0`. Older versions will not compile. You can check your toolchain version using `rustup show` (under "active toolchain") or `rustc --version`. To update your toolchain, run `rustup update`. From 56ca03c4401829027f7938cfb50a698757c93591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 11 Dec 2023 21:59:51 +0800 Subject: [PATCH 41/88] Try to use compiler 1.69 instead...... --- .github/workflows/main-checks.yml | 6 +++--- packages/yew-agent-macro/Cargo.toml | 2 +- packages/yew-agent/Cargo.toml | 2 +- packages/yew-macro/Cargo.toml | 2 +- packages/yew-macro/Makefile.toml | 2 +- packages/yew-macro/tests/classes_macro_test.rs | 2 +- packages/yew-macro/tests/derive_props_test.rs | 2 +- packages/yew-macro/tests/function_attr_test.rs | 2 +- packages/yew-macro/tests/hook_attr_test.rs | 2 +- packages/yew-macro/tests/hook_macro_test.rs | 2 +- packages/yew-macro/tests/html_macro_test.rs | 2 +- packages/yew-macro/tests/props_macro_test.rs | 2 +- packages/yew-router-macro/Cargo.toml | 2 +- packages/yew-router-macro/Makefile.toml | 2 +- packages/yew-router-macro/tests/routable_derive_test.rs | 2 +- packages/yew-router/Cargo.toml | 2 +- packages/yew/Cargo.toml | 2 +- website/docs/getting-started/introduction.mdx | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index 94b276c52a8..108b88c5123 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -67,7 +67,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.68.0 + - 1.69.0 - stable steps: @@ -116,7 +116,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.68.0 + - 1.69.0 - stable - nightly @@ -153,7 +153,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.68.0 + - 1.69.0 - stable - nightly steps: diff --git a/packages/yew-agent-macro/Cargo.toml b/packages/yew-agent-macro/Cargo.toml index 34852db42a7..d558fd44ff2 100644 --- a/packages/yew-agent-macro/Cargo.toml +++ b/packages/yew-agent-macro/Cargo.toml @@ -2,7 +2,7 @@ name = "yew-agent-macro" version = "0.2.0" edition = "2021" -rust-version = "1.68.0" +rust-version = "1.69.0" authors = ["Kaede Hoshikawa "] repository = "https://github.com/yewstack/yew" homepage = "https://yew.rs" diff --git a/packages/yew-agent/Cargo.toml b/packages/yew-agent/Cargo.toml index bcf32d3e88e..8bcea84a6e0 100644 --- a/packages/yew-agent/Cargo.toml +++ b/packages/yew-agent/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" readme = "../../README.md" description = "Agents for Yew" license = "MIT OR Apache-2.0" -rust-version = "1.68.0" +rust-version = "1.69.0" [dependencies] yew = { version = "0.21.0", path = "../yew" } diff --git a/packages/yew-macro/Cargo.toml b/packages/yew-macro/Cargo.toml index 254ea457eb7..43d50ec2d94 100644 --- a/packages/yew-macro/Cargo.toml +++ b/packages/yew-macro/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" keywords = ["web", "wasm", "frontend", "webasm", "webassembly"] categories = ["gui", "web-programming", "wasm"] description = "A framework for making client-side single-page apps" -rust-version = "1.68.0" +rust-version = "1.69.0" [lib] proc-macro = true diff --git a/packages/yew-macro/Makefile.toml b/packages/yew-macro/Makefile.toml index 9d0e17c9c9b..e81746c47dc 100644 --- a/packages/yew-macro/Makefile.toml +++ b/packages/yew-macro/Makefile.toml @@ -1,6 +1,6 @@ [tasks.test] clear = true -toolchain = "1.68.0" +toolchain = "1.69.0" command = "cargo" # test target can be optionally specified like `cargo make test html_macro`, args = ["test", "${@}"] diff --git a/packages/yew-macro/tests/classes_macro_test.rs b/packages/yew-macro/tests/classes_macro_test.rs index 52b12bed981..efb79fcbfcb 100644 --- a/packages/yew-macro/tests/classes_macro_test.rs +++ b/packages/yew-macro/tests/classes_macro_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.68), test)] +#[rustversion::attr(stable(1.69), test)] fn classes_macro() { let t = trybuild::TestCases::new(); t.pass("tests/classes_macro/*-pass.rs"); diff --git a/packages/yew-macro/tests/derive_props_test.rs b/packages/yew-macro/tests/derive_props_test.rs index a4c14974a22..ccf01e17e27 100644 --- a/packages/yew-macro/tests/derive_props_test.rs +++ b/packages/yew-macro/tests/derive_props_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.68), test)] +#[rustversion::attr(stable(1.69), test)] fn derive_props() { let t = trybuild::TestCases::new(); t.pass("tests/derive_props/pass.rs"); diff --git a/packages/yew-macro/tests/function_attr_test.rs b/packages/yew-macro/tests/function_attr_test.rs index 5b52d5f58e9..69f4787768c 100644 --- a/packages/yew-macro/tests/function_attr_test.rs +++ b/packages/yew-macro/tests/function_attr_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.68), test)] +#[rustversion::attr(stable(1.69), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/function_component_attr/*-pass.rs"); diff --git a/packages/yew-macro/tests/hook_attr_test.rs b/packages/yew-macro/tests/hook_attr_test.rs index f61bbf78353..12b4f9048e2 100644 --- a/packages/yew-macro/tests/hook_attr_test.rs +++ b/packages/yew-macro/tests/hook_attr_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.68), test)] +#[rustversion::attr(stable(1.69), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/hook_attr/*-pass.rs"); diff --git a/packages/yew-macro/tests/hook_macro_test.rs b/packages/yew-macro/tests/hook_macro_test.rs index 321acd94a65..38153e6e8f6 100644 --- a/packages/yew-macro/tests/hook_macro_test.rs +++ b/packages/yew-macro/tests/hook_macro_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.68), test)] +#[rustversion::attr(stable(1.69), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/hook_macro/*-pass.rs"); diff --git a/packages/yew-macro/tests/html_macro_test.rs b/packages/yew-macro/tests/html_macro_test.rs index f332f5434fb..b9b374e7a8b 100644 --- a/packages/yew-macro/tests/html_macro_test.rs +++ b/packages/yew-macro/tests/html_macro_test.rs @@ -1,7 +1,7 @@ use yew::{html, html_nested}; #[allow(dead_code)] -#[rustversion::attr(stable(1.68), test)] +#[rustversion::attr(stable(1.69), test)] fn html_macro() { let t = trybuild::TestCases::new(); diff --git a/packages/yew-macro/tests/props_macro_test.rs b/packages/yew-macro/tests/props_macro_test.rs index e282252a5cd..7162efd3f1f 100644 --- a/packages/yew-macro/tests/props_macro_test.rs +++ b/packages/yew-macro/tests/props_macro_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.68), test)] +#[rustversion::attr(stable(1.69), test)] fn props_macro() { let t = trybuild::TestCases::new(); t.pass("tests/props_macro/*-pass.rs"); diff --git a/packages/yew-router-macro/Cargo.toml b/packages/yew-router-macro/Cargo.toml index 4cc05bc37bf..c33c50d4c70 100644 --- a/packages/yew-router-macro/Cargo.toml +++ b/packages/yew-router-macro/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "MIT OR Apache-2.0" description = "Contains macros used with yew-router" repository = "https://github.com/yewstack/yew" -rust-version = "1.68.0" +rust-version = "1.69.0" [lib] proc-macro = true diff --git a/packages/yew-router-macro/Makefile.toml b/packages/yew-router-macro/Makefile.toml index 712eccdddbb..ba0b45bdf16 100644 --- a/packages/yew-router-macro/Makefile.toml +++ b/packages/yew-router-macro/Makefile.toml @@ -1,6 +1,6 @@ [tasks.test] clear = true -toolchain = "1.68.0" +toolchain = "1.69.0" command = "cargo" args = ["test"] diff --git a/packages/yew-router-macro/tests/routable_derive_test.rs b/packages/yew-router-macro/tests/routable_derive_test.rs index 8b6cd658a07..7d0c2ab7923 100644 --- a/packages/yew-router-macro/tests/routable_derive_test.rs +++ b/packages/yew-router-macro/tests/routable_derive_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.68), test)] +#[rustversion::attr(stable(1.69), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/routable_derive/*-pass.rs"); diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index 6b008cd702d..435f0ea7b3c 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["web", "yew", "router"] categories = ["gui", "web-programming"] description = "A router implementation for the Yew framework" repository = "https://github.com/yewstack/yew" -rust-version = "1.68.0" +rust-version = "1.69.0" [dependencies] yew = { version = "0.21.0", path = "../yew", default-features = false } diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index c8ab55119d2..e620e22128e 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["web", "webasm", "javascript"] categories = ["gui", "wasm", "web-programming"] description = "A framework for creating reliable and efficient web applications" readme = "../../README.md" -rust-version = "1.68.0" +rust-version = "1.69.0" [dependencies] console_error_panic_hook = "0.1" diff --git a/website/docs/getting-started/introduction.mdx b/website/docs/getting-started/introduction.mdx index 9f217910e75..38941e9d43e 100644 --- a/website/docs/getting-started/introduction.mdx +++ b/website/docs/getting-started/introduction.mdx @@ -11,7 +11,7 @@ bundler for Rust. To install Rust, follow the [official instructions](https://www.rust-lang.org/tools/install). :::important -The minimum supported Rust version (MSRV) for Yew is `1.68.0`. Older versions will not compile. +The minimum supported Rust version (MSRV) for Yew is `1.69.0`. Older versions will not compile. You can check your toolchain version using `rustup show` (under "active toolchain") or `rustc --version`. To update your toolchain, run `rustup update`. From 326017cc72f106ddb88333469fbe3330d1b0d0fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 11 Dec 2023 21:24:47 +0800 Subject: [PATCH 42/88] Revert MSRV back --- .github/workflows/main-checks.yml | 6 +++--- packages/yew-agent-macro/Cargo.toml | 2 +- packages/yew-agent/Cargo.toml | 2 +- packages/yew-macro/Cargo.toml | 2 +- packages/yew-macro/Makefile.toml | 2 +- packages/yew-macro/tests/classes_macro_test.rs | 2 +- packages/yew-macro/tests/derive_props_test.rs | 2 +- packages/yew-macro/tests/function_attr_test.rs | 2 +- packages/yew-macro/tests/hook_attr_test.rs | 2 +- packages/yew-macro/tests/hook_macro_test.rs | 2 +- packages/yew-macro/tests/html_macro_test.rs | 2 +- packages/yew-macro/tests/props_macro_test.rs | 2 +- packages/yew-router-macro/Cargo.toml | 2 +- packages/yew-router-macro/Makefile.toml | 2 +- packages/yew-router-macro/tests/routable_derive_test.rs | 2 +- packages/yew-router/Cargo.toml | 2 +- packages/yew/Cargo.toml | 2 +- website/docs/getting-started/introduction.mdx | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index 108b88c5123..cf3dbeda5e4 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -67,7 +67,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.69.0 + - 1.64.0 - stable steps: @@ -116,7 +116,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.69.0 + - 1.64.0 - stable - nightly @@ -153,7 +153,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.69.0 + - 1.64.0 - stable - nightly steps: diff --git a/packages/yew-agent-macro/Cargo.toml b/packages/yew-agent-macro/Cargo.toml index d558fd44ff2..149198c5cee 100644 --- a/packages/yew-agent-macro/Cargo.toml +++ b/packages/yew-agent-macro/Cargo.toml @@ -2,7 +2,7 @@ name = "yew-agent-macro" version = "0.2.0" edition = "2021" -rust-version = "1.69.0" +rust-version = "1.64.0" authors = ["Kaede Hoshikawa "] repository = "https://github.com/yewstack/yew" homepage = "https://yew.rs" diff --git a/packages/yew-agent/Cargo.toml b/packages/yew-agent/Cargo.toml index 8bcea84a6e0..2007b54f86f 100644 --- a/packages/yew-agent/Cargo.toml +++ b/packages/yew-agent/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" readme = "../../README.md" description = "Agents for Yew" license = "MIT OR Apache-2.0" -rust-version = "1.69.0" +rust-version = "1.64.0" [dependencies] yew = { version = "0.21.0", path = "../yew" } diff --git a/packages/yew-macro/Cargo.toml b/packages/yew-macro/Cargo.toml index 43d50ec2d94..9d497486b92 100644 --- a/packages/yew-macro/Cargo.toml +++ b/packages/yew-macro/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" keywords = ["web", "wasm", "frontend", "webasm", "webassembly"] categories = ["gui", "web-programming", "wasm"] description = "A framework for making client-side single-page apps" -rust-version = "1.69.0" +rust-version = "1.64.0" [lib] proc-macro = true diff --git a/packages/yew-macro/Makefile.toml b/packages/yew-macro/Makefile.toml index e81746c47dc..b679fa4fa51 100644 --- a/packages/yew-macro/Makefile.toml +++ b/packages/yew-macro/Makefile.toml @@ -1,6 +1,6 @@ [tasks.test] clear = true -toolchain = "1.69.0" +toolchain = "1.64.0" command = "cargo" # test target can be optionally specified like `cargo make test html_macro`, args = ["test", "${@}"] diff --git a/packages/yew-macro/tests/classes_macro_test.rs b/packages/yew-macro/tests/classes_macro_test.rs index efb79fcbfcb..e2cadf8cf39 100644 --- a/packages/yew-macro/tests/classes_macro_test.rs +++ b/packages/yew-macro/tests/classes_macro_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.69), test)] +#[rustversion::attr(stable(1.64), test)] fn classes_macro() { let t = trybuild::TestCases::new(); t.pass("tests/classes_macro/*-pass.rs"); diff --git a/packages/yew-macro/tests/derive_props_test.rs b/packages/yew-macro/tests/derive_props_test.rs index ccf01e17e27..c98e8feb953 100644 --- a/packages/yew-macro/tests/derive_props_test.rs +++ b/packages/yew-macro/tests/derive_props_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.69), test)] +#[rustversion::attr(stable(1.64), test)] fn derive_props() { let t = trybuild::TestCases::new(); t.pass("tests/derive_props/pass.rs"); diff --git a/packages/yew-macro/tests/function_attr_test.rs b/packages/yew-macro/tests/function_attr_test.rs index 69f4787768c..ed3cf9d044a 100644 --- a/packages/yew-macro/tests/function_attr_test.rs +++ b/packages/yew-macro/tests/function_attr_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.69), test)] +#[rustversion::attr(stable(1.64), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/function_component_attr/*-pass.rs"); diff --git a/packages/yew-macro/tests/hook_attr_test.rs b/packages/yew-macro/tests/hook_attr_test.rs index 12b4f9048e2..bd0a3b28812 100644 --- a/packages/yew-macro/tests/hook_attr_test.rs +++ b/packages/yew-macro/tests/hook_attr_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.69), test)] +#[rustversion::attr(stable(1.64), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/hook_attr/*-pass.rs"); diff --git a/packages/yew-macro/tests/hook_macro_test.rs b/packages/yew-macro/tests/hook_macro_test.rs index 38153e6e8f6..01e81a41345 100644 --- a/packages/yew-macro/tests/hook_macro_test.rs +++ b/packages/yew-macro/tests/hook_macro_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.69), test)] +#[rustversion::attr(stable(1.64), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/hook_macro/*-pass.rs"); diff --git a/packages/yew-macro/tests/html_macro_test.rs b/packages/yew-macro/tests/html_macro_test.rs index b9b374e7a8b..4a91060b1fc 100644 --- a/packages/yew-macro/tests/html_macro_test.rs +++ b/packages/yew-macro/tests/html_macro_test.rs @@ -1,7 +1,7 @@ use yew::{html, html_nested}; #[allow(dead_code)] -#[rustversion::attr(stable(1.69), test)] +#[rustversion::attr(stable(1.64), test)] fn html_macro() { let t = trybuild::TestCases::new(); diff --git a/packages/yew-macro/tests/props_macro_test.rs b/packages/yew-macro/tests/props_macro_test.rs index 7162efd3f1f..b82adc18486 100644 --- a/packages/yew-macro/tests/props_macro_test.rs +++ b/packages/yew-macro/tests/props_macro_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.69), test)] +#[rustversion::attr(stable(1.64), test)] fn props_macro() { let t = trybuild::TestCases::new(); t.pass("tests/props_macro/*-pass.rs"); diff --git a/packages/yew-router-macro/Cargo.toml b/packages/yew-router-macro/Cargo.toml index c33c50d4c70..c612ed97215 100644 --- a/packages/yew-router-macro/Cargo.toml +++ b/packages/yew-router-macro/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "MIT OR Apache-2.0" description = "Contains macros used with yew-router" repository = "https://github.com/yewstack/yew" -rust-version = "1.69.0" +rust-version = "1.64.0" [lib] proc-macro = true diff --git a/packages/yew-router-macro/Makefile.toml b/packages/yew-router-macro/Makefile.toml index ba0b45bdf16..1eae4efc7c4 100644 --- a/packages/yew-router-macro/Makefile.toml +++ b/packages/yew-router-macro/Makefile.toml @@ -1,6 +1,6 @@ [tasks.test] clear = true -toolchain = "1.69.0" +toolchain = "1.64.0" command = "cargo" args = ["test"] diff --git a/packages/yew-router-macro/tests/routable_derive_test.rs b/packages/yew-router-macro/tests/routable_derive_test.rs index 7d0c2ab7923..59dbd5e0104 100644 --- a/packages/yew-router-macro/tests/routable_derive_test.rs +++ b/packages/yew-router-macro/tests/routable_derive_test.rs @@ -1,5 +1,5 @@ #[allow(dead_code)] -#[rustversion::attr(stable(1.69), test)] +#[rustversion::attr(stable(1.64), test)] fn tests() { let t = trybuild::TestCases::new(); t.pass("tests/routable_derive/*-pass.rs"); diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index 435f0ea7b3c..cdc906032e3 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -9,7 +9,7 @@ keywords = ["web", "yew", "router"] categories = ["gui", "web-programming"] description = "A router implementation for the Yew framework" repository = "https://github.com/yewstack/yew" -rust-version = "1.69.0" +rust-version = "1.64.0" [dependencies] yew = { version = "0.21.0", path = "../yew", default-features = false } diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index e620e22128e..b6091b3192a 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["web", "webasm", "javascript"] categories = ["gui", "wasm", "web-programming"] description = "A framework for creating reliable and efficient web applications" readme = "../../README.md" -rust-version = "1.69.0" +rust-version = "1.64.0" [dependencies] console_error_panic_hook = "0.1" diff --git a/website/docs/getting-started/introduction.mdx b/website/docs/getting-started/introduction.mdx index 38941e9d43e..fedde6320c4 100644 --- a/website/docs/getting-started/introduction.mdx +++ b/website/docs/getting-started/introduction.mdx @@ -11,7 +11,7 @@ bundler for Rust. To install Rust, follow the [official instructions](https://www.rust-lang.org/tools/install). :::important -The minimum supported Rust version (MSRV) for Yew is `1.69.0`. Older versions will not compile. +The minimum supported Rust version (MSRV) for Yew is `1.64.0`. Older versions will not compile. You can check your toolchain version using `rustup show` (under "active toolchain") or `rustc --version`. To update your toolchain, run `rustup update`. From 6349ad708dd978bebcb046898fa2995d25aa52e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 11 Dec 2023 22:11:32 +0800 Subject: [PATCH 43/88] Pin the oldest Cargo.lock. --- Cargo.lock | 223 +++++++++++++++++++++++++---------------------------- 1 file changed, 104 insertions(+), 119 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b4a3adcef03..8a67aabd1a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,54 +41,6 @@ dependencies = [ "libc", ] -[[package]] -name = "anstream" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - [[package]] name = "anyhow" version = "1.0.75" @@ -150,9 +102,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.20" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core", @@ -387,44 +339,41 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" dependencies = [ - "clap_builder", + "bitflags 1.3.2", "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" -dependencies = [ - "anstream", - "anstyle", "clap_lex", + "is-terminal", + "once_cell", "strsim", + "termcolor", "terminal_size", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" dependencies = [ "heck", + "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.39", + "syn 1.0.109", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +dependencies = [ + "os_str_bytes", +] [[package]] name = "cobs" @@ -432,12 +381,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - [[package]] name = "communication_child_to_parent" version = "0.0.1" @@ -663,9 +606,9 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.4.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" +checksum = "890d779e1bc371e4fa7727ef6d29a9346be20ddfe40cd8c744cd083ce0640b15" [[package]] name = "digest" @@ -793,9 +736,12 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] [[package]] name = "file_upload" @@ -1462,9 +1408,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -1472,7 +1418,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1488,6 +1434,12 @@ dependencies = [ "byteorder", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.14.3" @@ -1692,7 +1644,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc06a255cbf402a52ae399c05a518c68c569c916ea11423620111df576b9b9bb" dependencies = [ "implicit-clone-derive", - "indexmap", + "indexmap 1.9.3", ] [[package]] @@ -1705,6 +1657,16 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + [[package]] name = "indexmap" version = "2.1.0" @@ -1712,7 +1674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.3", ] [[package]] @@ -1749,6 +1711,17 @@ dependencies = [ "web-sys", ] +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "ipnet" version = "2.9.0" @@ -1757,11 +1730,12 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi", + "io-lifetimes", "rustix", "windows-sys 0.48.0", ] @@ -1926,9 +1900,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lipsum" @@ -2161,6 +2135,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + [[package]] name = "papergrid" version = "0.10.0" @@ -2190,7 +2170,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -2443,6 +2423,15 @@ dependencies = [ "getrandom", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_syscall" version = "0.4.1" @@ -2454,9 +2443,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", @@ -2466,9 +2455,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", @@ -2477,15 +2466,15 @@ dependencies = [ [[package]] name = "regex-lite" -version = "0.1.5" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" +checksum = "f96ede7f386ba6e910092e7ccdc04176cface62abebea07ed6b46d870ed95ca2" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" @@ -2565,15 +2554,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags 2.4.1", + "bitflags 1.3.2", "errno", + "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -2944,13 +2934,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", "windows-sys 0.48.0", ] @@ -2966,9 +2957,9 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.3.0" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ "rustix", "windows-sys 0.48.0", @@ -3138,17 +3129,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ - "indexmap", + "indexmap 1.9.3", "toml_datetime", "winnow", ] @@ -3356,12 +3347,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - [[package]] name = "uuid" version = "1.6.1" @@ -3845,9 +3830,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.26" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" dependencies = [ "memchr", ] @@ -3873,7 +3858,7 @@ dependencies = [ "gloo 0.11.0", "html-escape", "implicit-clone", - "indexmap", + "indexmap 2.1.0", "js-sys", "prokio", "rustversion", From fe37d550d5abcfce82299c2f71e0c4ebb85e2fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 11 Dec 2023 22:59:23 +0800 Subject: [PATCH 44/88] Downgrade deps for MSRV. --- Cargo.lock | 912 ++++++++++++++++++++++++++++------------------------- 1 file changed, 481 insertions(+), 431 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a67aabd1a8..8b8433f5401 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ "gimli", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] @@ -41,6 +41,54 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6cd65a4b849ace0b7f6daeebcc1a1d111282227ca745458c61dbf670e52a597" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0238ca56c96dfa37bdf7c373c8886dd591322500aceeeccdb2216fe06dc2f796" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + [[package]] name = "anyhow" version = "1.0.75" @@ -55,13 +103,13 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.38", ] [[package]] @@ -76,9 +124,9 @@ dependencies = [ [[package]] name = "atomic-polyfill" -version = "1.0.3" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" +checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" dependencies = [ "critical-section", ] @@ -102,9 +150,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", @@ -151,9 +199,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line", "cc", @@ -164,6 +212,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + [[package]] name = "base64" version = "0.21.5" @@ -178,9 +232,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "basic-toml" -version = "0.1.7" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f2139706359229bfa8f19142ac1155b4b80beafb7a60471ac5dd109d4a19778" +checksum = "5c0de75129aa8d0cceaf750b89013f0e08804d6ec61416da787b35ad0d7cddf1" dependencies = [ "serde", ] @@ -241,9 +295,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "block-buffer" @@ -269,21 +323,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytecount" -version = "0.6.7" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" +checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "byteorder" -version = "1.5.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" @@ -293,12 +347,11 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", - "libc", ] [[package]] @@ -334,46 +387,49 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.48.1", ] [[package]] name = "clap" -version = "4.0.32" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ - "bitflags 1.3.2", + "clap_builder", "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +dependencies = [ + "anstream", + "anstyle", "clap_lex", - "is-terminal", - "once_cell", "strsim", - "termcolor", "terminal_size", ] [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cobs" @@ -381,6 +437,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "communication_child_to_parent" version = "0.0.1" @@ -454,9 +516,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.4" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -464,9 +526,20 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "core_affinity" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "622892f5635ce1fc38c8f16dfc938553ed64af482edb5e150bf4caedbfcb2304" +dependencies = [ + "libc", + "num_cpus", + "winapi", +] [[package]] name = "counter" @@ -487,18 +560,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" dependencies = [ "libc", ] [[package]] name = "critical-section" -version = "1.1.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" +checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" [[package]] name = "crypto-common" @@ -547,15 +620,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ "powerfmt", ] @@ -606,9 +679,9 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "890d779e1bc371e4fa7727ef6d29a9346be20ddfe40cd8c744cd083ce0640b15" +checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" [[package]] name = "digest" @@ -622,25 +695,27 @@ dependencies = [ [[package]] name = "divan" -version = "0.1.5" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40199864856263dbaada0c9e1afd042416a3f947293eb1c4475b68df3e6a1042" +checksum = "e9fe20b31e5a6a2c689cb9cd6b8ab3e1b417536b2369830b037acfee34b11469" dependencies = [ "clap", "condtype", + "core_affinity", "divan-macros", + "linkme", "regex-lite", ] [[package]] name = "divan-macros" -version = "0.1.5" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875fb84b58aa0b32af7a1c768083693c01b7625571b1a46c40f3c8b42ce58b1c" +checksum = "3c41656525d3cbca56bc91ca045ffb591b7b7d7bd7453750b63bacc35c46f3cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.38", ] [[package]] @@ -666,9 +741,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -678,18 +753,18 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] [[package]] name = "env_logger" -version = "0.10.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ "humantime", "is-terminal", @@ -700,18 +775,29 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", "libc", - "windows-sys 0.52.0", ] [[package]] @@ -747,7 +833,7 @@ dependencies = [ name = "file_upload" version = "0.1.0" dependencies = [ - "base64", + "base64 0.21.5", "gloo 0.11.0", "js-sys", "web-sys", @@ -783,9 +869,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -902,7 +988,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.38", ] [[package]] @@ -959,9 +1045,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -972,9 +1058,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "git2" @@ -982,7 +1068,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.0", "libc", "libgit2-sys", "log", @@ -1007,7 +1093,7 @@ dependencies = [ "gloo-dialogs 0.1.1", "gloo-events 0.1.2", "gloo-file 0.2.3", - "gloo-history 0.1.5", + "gloo-history 0.1.4", "gloo-net 0.3.1", "gloo-render 0.1.1", "gloo-storage 0.2.2", @@ -1026,13 +1112,13 @@ dependencies = [ "gloo-dialogs 0.2.0", "gloo-events 0.2.0", "gloo-file 0.3.0", - "gloo-history 0.2.1", + "gloo-history 0.2.0", "gloo-net 0.4.0", "gloo-render 0.2.0", "gloo-storage 0.3.0", "gloo-timers 0.3.0", "gloo-utils 0.2.0", - "gloo-worker 0.4.0", + "gloo-worker 0.4.1", ] [[package]] @@ -1045,7 +1131,7 @@ dependencies = [ "gloo-dialogs 0.2.0", "gloo-events 0.2.0", "gloo-file 0.3.0", - "gloo-history 0.2.1", + "gloo-history 0.2.0", "gloo-net 0.5.0", "gloo-render 0.2.0", "gloo-storage 0.3.0", @@ -1147,14 +1233,14 @@ dependencies = [ [[package]] name = "gloo-history" -version = "0.1.5" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f" +checksum = "ddfd137a4b629e72b8c949ec56c71ea9bd5491cc66358a0a7787e94875feec71" dependencies = [ "gloo-events 0.1.2", "gloo-utils 0.1.7", "serde", - "serde-wasm-bindgen 0.5.0", + "serde-wasm-bindgen", "serde_urlencoded", "thiserror", "wasm-bindgen", @@ -1163,15 +1249,14 @@ dependencies = [ [[package]] name = "gloo-history" -version = "0.2.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4022e82f5f9e03cb1251b13c0a967e0600e97aa179c617f6519bac40640160" +checksum = "91be9f3dd048f35a59c8de3d716ef6d568360078c73ed35a7700776ed53153c8" dependencies = [ - "getrandom", "gloo-events 0.2.0", "gloo-utils 0.2.0", "serde", - "serde-wasm-bindgen 0.6.2", + "serde-wasm-bindgen", "serde_urlencoded", "thiserror", "wasm-bindgen", @@ -1358,9 +1443,9 @@ dependencies = [ [[package]] name = "gloo-worker" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76495d3dd87de51da268fa3a593da118ab43eb7f8809e17eb38d3319b424e400" +checksum = "f2cbd4c35cc3a2b1fb792318acc06bd514193f6d058173da5cdbcdabe6514303" dependencies = [ "bincode", "futures 0.3.29", @@ -1403,7 +1488,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.38", ] [[package]] @@ -1442,17 +1527,18 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" [[package]] name = "headers" -version = "0.3.9" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ - "base64", + "base64 0.13.1", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -1472,9 +1558,9 @@ dependencies = [ [[package]] name = "heapless" -version = "0.7.17" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" dependencies = [ "atomic-polyfill", "hash32", @@ -1492,9 +1578,18 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "html-escape" @@ -1507,9 +1602,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1518,9 +1613,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", @@ -1529,9 +1624,9 @@ dependencies = [ [[package]] name = "http-range-header" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" [[package]] name = "httparse" @@ -1541,9 +1636,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "humantime" @@ -1568,7 +1663,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1590,16 +1685,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows", ] [[package]] @@ -1619,9 +1714,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1639,22 +1734,11 @@ dependencies = [ [[package]] name = "implicit-clone" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc06a255cbf402a52ae399c05a518c68c569c916ea11423620111df576b9b9bb" -dependencies = [ - "implicit-clone-derive", - "indexmap 1.9.3", -] - -[[package]] -name = "implicit-clone-derive" -version = "0.1.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9311685eb9a34808bbb0608ad2fcab9ae216266beca5848613e95553ac914e3b" +checksum = "af3d77000817fd9e7db159e8d52ed9b5941a2cdbfbdc8ca646e59887ae2b2dd1" dependencies = [ - "quote", - "syn 2.0.39", + "indexmap 2.0.2", ] [[package]] @@ -1669,12 +1753,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.1", ] [[package]] @@ -1717,16 +1801,16 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.1", "libc", "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" @@ -1734,9 +1818,9 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.1", "io-lifetimes", - "rustix", + "rustix 0.37.25", "windows-sys 0.48.0", ] @@ -1751,15 +1835,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jemalloc-sys" -version = "0.5.4+5.3.0-patched" +version = "0.5.3+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2" +checksum = "f9bd5d616ea7ed58b571b2e209a65759664d7fb021a0819d7a790afc67e47ca1" dependencies = [ "cc", "libc", @@ -1777,9 +1861,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] @@ -1808,9 +1892,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1848,9 +1932,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libgit2-sys" @@ -1868,9 +1952,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libssh2-sys" @@ -1888,9 +1972,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "libc", @@ -1898,12 +1982,38 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "linkme" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ed2ee9464ff9707af8e9ad834cffa4802f072caad90639c583dd3c62e6e608" +dependencies = [ + "linkme-impl", +] + +[[package]] +name = "linkme-impl" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "linux-raw-sys" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + [[package]] name = "lipsum" version = "0.9.0" @@ -1916,9 +2026,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1932,15 +2042,15 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "matchit" -version = "0.7.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] name = "memchr" -version = "2.6.4" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "mime" @@ -1960,18 +2070,18 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "wasi", @@ -2052,9 +2162,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", "libm", @@ -2062,11 +2172,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.16.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] @@ -2078,26 +2188,26 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.1" +version = "0.30.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.61" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags 2.4.1", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -2114,7 +2224,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.38", ] [[package]] @@ -2125,9 +2235,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.97" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ "cc", "libc", @@ -2135,12 +2245,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "papergrid" version = "0.10.0" @@ -2164,15 +2268,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.48.1", ] [[package]] @@ -2190,28 +2294,28 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.38", ] [[package]] @@ -2245,9 +2349,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" [[package]] name = "portals" @@ -2289,7 +2393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.39", + "syn 2.0.38", ] [[package]] @@ -2334,9 +2438,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2432,20 +2536,11 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "regex" -version = "1.9.6" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -2455,9 +2550,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -2466,15 +2561,15 @@ dependencies = [ [[package]] name = "regex-lite" -version = "0.1.0" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f96ede7f386ba6e910092e7ccdc04176cface62abebea07ed6b46d870ed95ca2" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" @@ -2482,7 +2577,7 @@ version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -2554,25 +2649,38 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.37.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.10", "windows-sys 0.48.0", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64", + "base64 0.21.5", ] [[package]] @@ -2583,17 +2691,17 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.42.0", ] [[package]] @@ -2604,15 +2712,15 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -2623,9 +2731,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -2639,9 +2747,9 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] @@ -2657,33 +2765,22 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "serde-wasm-bindgen" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d27afff48127b3edfe6ad379a2bd0795d2cfa56730ca2745e5b89386126404" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -2692,11 +2789,10 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.14" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" dependencies = [ - "itoa", "serde", ] @@ -2714,9 +2810,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.6" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", @@ -2761,15 +2857,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.10" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -2777,9 +2873,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -2845,7 +2941,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.39", + "syn 2.0.38", ] [[package]] @@ -2872,9 +2968,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -2941,27 +3037,27 @@ dependencies = [ "autocfg", "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix", + "redox_syscall", + "rustix 0.37.25", "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.4.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix", + "rustix 0.38.13", "windows-sys 0.48.0", ] @@ -2982,7 +3078,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.38", ] [[package]] @@ -3052,9 +3148,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.35.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -3064,20 +3160,20 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.4", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.38", ] [[package]] @@ -3115,9 +3211,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -3129,17 +3225,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.0.2", "toml_datetime", "winnow", ] @@ -3216,7 +3312,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.38", ] [[package]] @@ -3230,9 +3326,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trybuild" @@ -3278,30 +3374,30 @@ dependencies = [ [[package]] name = "typenum" -version = "1.17.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicase" -version = "2.7.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ "version_check", ] [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-normalization" @@ -3314,15 +3410,15 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "url" -version = "2.5.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -3343,15 +3439,21 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8-width" -version = "0.1.7" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" + +[[package]] +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.6.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "serde", ] @@ -3430,9 +3532,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3440,24 +3542,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.38", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -3467,9 +3569,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3477,28 +3579,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-bindgen-test" -version = "0.3.39" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf9242c0d27999b831eae4767b2a146feb0b27d332d553e605864acd2afd403" +checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671" dependencies = [ "console_error_panic_hook", "js-sys", @@ -3510,13 +3612,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.39" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89" +checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", ] [[package]] @@ -3532,9 +3633,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -3608,9 +3709,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ "winapi", ] @@ -3622,39 +3723,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-core" -version = "0.51.1" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.48.1", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows-targets 0.42.2", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.42.2", ] [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.48.1", ] [[package]] @@ -3674,32 +3781,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -3710,15 +3802,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -3728,15 +3814,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -3746,15 +3826,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -3764,15 +3838,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -3782,15 +3850,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" @@ -3800,15 +3862,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -3818,21 +3874,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" dependencies = [ "memchr", ] @@ -3858,7 +3908,7 @@ dependencies = [ "gloo 0.11.0", "html-escape", "implicit-clone", - "indexmap 2.1.0", + "indexmap 2.0.2", "js-sys", "prokio", "rustversion", @@ -3880,7 +3930,7 @@ name = "yew-agent" version = "0.3.0" dependencies = [ "futures 0.3.29", - "gloo-worker 0.4.0", + "gloo-worker 0.4.1", "serde", "wasm-bindgen", "yew", @@ -3894,7 +3944,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.39", + "syn 2.0.38", "trybuild", "yew-agent", ] @@ -3909,7 +3959,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.39", + "syn 2.0.38", "trybuild", "yew", ] @@ -3939,7 +3989,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.39", + "syn 2.0.38", "trybuild", "yew-router", ] From 9dee9013be77eae8cd47e440fce5908c4115a717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 00:29:50 +0800 Subject: [PATCH 45/88] Bump benchmark tool's tokio to 1.35 --- Cargo.lock | 22 +++++++++++----------- tools/benchmark-ssr/Cargo.toml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8b8433f5401..84fcb913d4e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1932,9 +1932,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libgit2-sys" @@ -2079,9 +2079,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi", @@ -2873,9 +2873,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -3148,9 +3148,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.33.0" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" dependencies = [ "backtrace", "bytes", @@ -3160,16 +3160,16 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", diff --git a/tools/benchmark-ssr/Cargo.toml b/tools/benchmark-ssr/Cargo.toml index 4b6ad7e0e4d..2acd408e829 100644 --- a/tools/benchmark-ssr/Cargo.toml +++ b/tools/benchmark-ssr/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] yew = { path = "../../packages/yew", features = ["ssr"] } function_router = { path = "../../examples/function_router" } -tokio = { version = "1.33", features = ["full"] } +tokio = { version = "1.35", features = ["full"] } average = "0.14.1" tabled = "0.14.0" indicatif = "0.17.7" From 5d3912b0bd49790855b47a1c619fd918ef8b995a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 02:33:38 +0800 Subject: [PATCH 46/88] Try to write WASI CI. --- .github/workflows/main-checks-wasi.yml | 88 +++++++++++++++++++ .github/workflows/main-checks.yml | 32 ------- Cargo.lock | 6 +- packages/yew-router/tests/basename.rs | 2 + packages/yew-router/tests/browser_router.rs | 2 + packages/yew-router/tests/hash_router.rs | 2 + packages/yew-router/tests/link.rs | 2 + .../yew-router/tests/url_encoded_routes.rs | 2 + packages/yew/Cargo.toml | 3 + packages/yew/src/virtual_dom/vsuspense.rs | 1 + 10 files changed, 105 insertions(+), 35 deletions(-) create mode 100644 .github/workflows/main-checks-wasi.yml diff --git a/.github/workflows/main-checks-wasi.yml b/.github/workflows/main-checks-wasi.yml new file mode 100644 index 00000000000..4377c838844 --- /dev/null +++ b/.github/workflows/main-checks-wasi.yml @@ -0,0 +1,88 @@ +name: Main Checks on WASI + +on: + pull_request: + paths: + - '.github/workflows/main-checks-wasi.yml' + - 'ci/**' + - 'packages/**/*' + - 'Cargo.toml' + - 'Cargo.lock' + push: + branches: [master] + +jobs: + unit_tests: + name: Unit Tests on ${{ matrix.toolchain }} + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + toolchain: + - 1.64.0 + - stable + - nightly + + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ matrix.toolchain }} + target: wasm32-wasi + + - name: Install wasmtime + run: | + wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasmtime-v15.0.1-x86_64-linux.tar.xz + tar xf wasmtime-v15.0.1-x86_64-linux.tar.xz + mv wasmtime-v15.0.1-x86_64-linux/wasmtime ~/wasmtime + rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux + chmod +x ~/wasmtime + + - uses: Swatinem/rust-cache@v2 + + - name: Run WASI tests for yew + run: | + RUST_LOG=info + cargo test --features ssr --target wasm32-wasi -p yew --no-run 2>&1 |\ + grep -o "target/wasm32-wasi/debug/deps/[^ ]*\.wasm" |\ + xargs -I {} ~/wasmtime -W unknown-imports-trap=y {} + + - name: Run WASI tests for yew-router + run: | + cargo test --features ssr --target wasm32-wasi -p yew-router --no-run 2>&1 |\ + grep -o "target/wasm32-wasi/debug/deps/[^ ]*\.wasm" |\ + xargs -I {} ~/wasmtime -W unknown-imports-trap=y {} + + example-runnable-tests-on-wasi: + name: Example Runnable Tests on WASI + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + package: + - wasi_ssr_module + toolchain: + - 1.64.0 + - stable + - nightly + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ matrix.toolchain }} + target: wasm32-wasi + + - name: Install wasmtime + run: | + wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasmtime-v15.0.1-x86_64-linux.tar.xz + tar xf wasmtime-v15.0.1-x86_64-linux.tar.xz + mv wasmtime-v15.0.1-x86_64-linux/wasmtime ~/wasmtime + rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux + chmod +x ~/wasmtime + + - uses: Swatinem/rust-cache@v2 + + - name: Build and run ${{ matrix.package }} + run: | + cargo build --target wasm32-wasi -p ${{ matrix.package }} + ~/wasmtime -W unknown-imports-trap=y target/wasm32-wasi/debug/${{ matrix.package }}.wasm diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index cf3dbeda5e4..04646a40843 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -146,38 +146,6 @@ jobs: RUSTFLAGS: ${{ matrix.toolchain == 'nightly' && '--cfg nightly_yew' || '' }} run: cargo test -p yew --all-features - example-runnable-tests-on-wasi: - name: Example Runnable Tests on WASI - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - toolchain: - - 1.64.0 - - stable - - nightly - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ matrix.toolchain }} - target: wasm32-wasi - - - name: Install wasmtime - run: | - wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasmtime-v15.0.1-x86_64-linux.tar.xz - tar xf wasmtime-v15.0.1-x86_64-linux.tar.xz - mv wasmtime-v15.0.1-x86_64-linux/wasmtime ~/wasmtime - rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux - chmod +x ~/wasmtime - - - uses: Swatinem/rust-cache@v2 - - - name: Build and run example wasi_ssr_module - run: | - cargo build --package wasi_ssr_module --target wasm32-wasi - ~/wasmtime --trap-unknown-imports target/wasm32-wasi/debug/wasi_ssr_module.wasm - test-lints: name: Test lints on nightly runs-on: ubuntu-latest diff --git a/Cargo.lock b/Cargo.lock index 84fcb913d4e..b9ba365919a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1093,7 +1093,7 @@ dependencies = [ "gloo-dialogs 0.1.1", "gloo-events 0.1.2", "gloo-file 0.2.3", - "gloo-history 0.1.4", + "gloo-history 0.1.5", "gloo-net 0.3.1", "gloo-render 0.1.1", "gloo-storage 0.2.2", @@ -1233,9 +1233,9 @@ dependencies = [ [[package]] name = "gloo-history" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfd137a4b629e72b8c949ec56c71ea9bd5491cc66358a0a7787e94875feec71" +checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f" dependencies = [ "gloo-events 0.1.2", "gloo-utils 0.1.7", diff --git a/packages/yew-router/tests/basename.rs b/packages/yew-router/tests/basename.rs index 0ba058c5cd2..15da65412fd 100644 --- a/packages/yew-router/tests/basename.rs +++ b/packages/yew-router/tests/basename.rs @@ -1,3 +1,5 @@ +#![cfg(not(target_os = "wasi"))] + use std::time::Duration; use serde::{Deserialize, Serialize}; diff --git a/packages/yew-router/tests/browser_router.rs b/packages/yew-router/tests/browser_router.rs index f3a5f49379c..2344060080f 100644 --- a/packages/yew-router/tests/browser_router.rs +++ b/packages/yew-router/tests/browser_router.rs @@ -1,3 +1,5 @@ +#![cfg(not(target_os = "wasi"))] + use std::time::Duration; use serde::{Deserialize, Serialize}; diff --git a/packages/yew-router/tests/hash_router.rs b/packages/yew-router/tests/hash_router.rs index 48f793ca346..6b11a9bf1d6 100644 --- a/packages/yew-router/tests/hash_router.rs +++ b/packages/yew-router/tests/hash_router.rs @@ -1,3 +1,5 @@ +#![cfg(not(target_os = "wasi"))] + use std::time::Duration; use serde::{Deserialize, Serialize}; diff --git a/packages/yew-router/tests/link.rs b/packages/yew-router/tests/link.rs index 50510b79242..56aa30493b1 100644 --- a/packages/yew-router/tests/link.rs +++ b/packages/yew-router/tests/link.rs @@ -1,3 +1,5 @@ +#![cfg(not(target_os = "wasi"))] + use std::time::Duration; use serde::{Deserialize, Serialize}; diff --git a/packages/yew-router/tests/url_encoded_routes.rs b/packages/yew-router/tests/url_encoded_routes.rs index 272a1a82599..6d2cf213b74 100644 --- a/packages/yew-router/tests/url_encoded_routes.rs +++ b/packages/yew-router/tests/url_encoded_routes.rs @@ -1,3 +1,5 @@ +#![cfg(not(target_os = "wasi"))] + use std::time::Duration; use yew::platform::time::sleep; diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index b6091b3192a..ea2e6e418a5 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -81,6 +81,9 @@ features = [ [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] tokio = { version = "1.33", features = ["full"] } +[target.'cfg(all(target_arch = "wasm32", target_os = "wasi"))'.dependencies] +tokio = { version = "1.33", features = ["macros", "rt", "time"] } + [dev-dependencies] wasm-bindgen-test = "0.3" gloo = { version = "0.11", features = ["futures"] } diff --git a/packages/yew/src/virtual_dom/vsuspense.rs b/packages/yew/src/virtual_dom/vsuspense.rs index c3d393b64f6..67d579f9945 100644 --- a/packages/yew/src/virtual_dom/vsuspense.rs +++ b/packages/yew/src/virtual_dom/vsuspense.rs @@ -76,6 +76,7 @@ mod ssr_tests { use crate::suspense::{Suspension, SuspensionResult}; use crate::ServerRenderer; + #[cfg(not(target_os = "wasi"))] #[test(flavor = "multi_thread", worker_threads = 2)] async fn test_suspense() { #[derive(PartialEq)] From 9045be2b47870b2059a3d5cdf00c9cd1136bc650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 11:07:04 +0800 Subject: [PATCH 47/88] Rollback the quotes --- .github/workflows/main-checks.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index 04646a40843..e0bb2ba7e81 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -3,11 +3,11 @@ name: Main Checks on: pull_request: paths: - - '.github/workflows/main-checks.yml' - - 'ci/**' - - 'packages/**/*' - - 'Cargo.toml' - - 'Cargo.lock' + - ".github/workflows/main-checks.yml" + - "ci/**" + - "packages/**/*" + - "Cargo.toml" + - "Cargo.lock" push: branches: [master] From 865469d1c2205064b39c8527b53d3743b3b59f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 11:08:29 +0800 Subject: [PATCH 48/88] Combine CI files... --- .github/workflows/main-checks-wasi.yml | 88 -------------------------- .github/workflows/main-checks.yml | 75 ++++++++++++++++++++++ 2 files changed, 75 insertions(+), 88 deletions(-) delete mode 100644 .github/workflows/main-checks-wasi.yml diff --git a/.github/workflows/main-checks-wasi.yml b/.github/workflows/main-checks-wasi.yml deleted file mode 100644 index 4377c838844..00000000000 --- a/.github/workflows/main-checks-wasi.yml +++ /dev/null @@ -1,88 +0,0 @@ -name: Main Checks on WASI - -on: - pull_request: - paths: - - '.github/workflows/main-checks-wasi.yml' - - 'ci/**' - - 'packages/**/*' - - 'Cargo.toml' - - 'Cargo.lock' - push: - branches: [master] - -jobs: - unit_tests: - name: Unit Tests on ${{ matrix.toolchain }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - toolchain: - - 1.64.0 - - stable - - nightly - - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ matrix.toolchain }} - target: wasm32-wasi - - - name: Install wasmtime - run: | - wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasmtime-v15.0.1-x86_64-linux.tar.xz - tar xf wasmtime-v15.0.1-x86_64-linux.tar.xz - mv wasmtime-v15.0.1-x86_64-linux/wasmtime ~/wasmtime - rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux - chmod +x ~/wasmtime - - - uses: Swatinem/rust-cache@v2 - - - name: Run WASI tests for yew - run: | - RUST_LOG=info - cargo test --features ssr --target wasm32-wasi -p yew --no-run 2>&1 |\ - grep -o "target/wasm32-wasi/debug/deps/[^ ]*\.wasm" |\ - xargs -I {} ~/wasmtime -W unknown-imports-trap=y {} - - - name: Run WASI tests for yew-router - run: | - cargo test --features ssr --target wasm32-wasi -p yew-router --no-run 2>&1 |\ - grep -o "target/wasm32-wasi/debug/deps/[^ ]*\.wasm" |\ - xargs -I {} ~/wasmtime -W unknown-imports-trap=y {} - - example-runnable-tests-on-wasi: - name: Example Runnable Tests on WASI - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - package: - - wasi_ssr_module - toolchain: - - 1.64.0 - - stable - - nightly - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ matrix.toolchain }} - target: wasm32-wasi - - - name: Install wasmtime - run: | - wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasmtime-v15.0.1-x86_64-linux.tar.xz - tar xf wasmtime-v15.0.1-x86_64-linux.tar.xz - mv wasmtime-v15.0.1-x86_64-linux/wasmtime ~/wasmtime - rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux - chmod +x ~/wasmtime - - - uses: Swatinem/rust-cache@v2 - - - name: Build and run ${{ matrix.package }} - run: | - cargo build --target wasm32-wasi -p ${{ matrix.package }} - ~/wasmtime -W unknown-imports-trap=y target/wasm32-wasi/debug/${{ matrix.package }}.wasm diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index e0bb2ba7e81..f5ae7adc42d 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -164,3 +164,78 @@ jobs: env: RUSTFLAGS: --cfg nightly_yew --cfg yew_lints run: cargo test -p yew-macro test_html_lints + + unit_tests_wasi: + name: Unit Tests (WASI) on ${{ matrix.toolchain }} + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + toolchain: + - 1.64.0 + - stable + - nightly + + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ matrix.toolchain }} + target: wasm32-wasi + + - name: Install wasmtime + run: | + wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasmtime-v15.0.1-x86_64-linux.tar.xz + tar xf wasmtime-v15.0.1-x86_64-linux.tar.xz + mv wasmtime-v15.0.1-x86_64-linux/wasmtime ~/wasmtime + rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux + chmod +x ~/wasmtime + + - uses: Swatinem/rust-cache@v2 + + - name: Run WASI tests for yew + run: | + RUST_LOG=info + cargo test --features ssr --target wasm32-wasi -p yew --no-run 2>&1 |\ + grep -o "target/wasm32-wasi/debug/deps/[^ ]*\.wasm" |\ + xargs -I {} ~/wasmtime -W unknown-imports-trap=y {} + + - name: Run WASI tests for yew-router + run: | + cargo test --features ssr --target wasm32-wasi -p yew-router --no-run 2>&1 |\ + grep -o "target/wasm32-wasi/debug/deps/[^ ]*\.wasm" |\ + xargs -I {} ~/wasmtime -W unknown-imports-trap=y {} + + example-runnable-tests-on-wasi: + name: Example Runnable Tests on WASI + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + package: + - wasi_ssr_module + toolchain: + - 1.64.0 + - stable + - nightly + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ matrix.toolchain }} + target: wasm32-wasi + + - name: Install wasmtime + run: | + wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasmtime-v15.0.1-x86_64-linux.tar.xz + tar xf wasmtime-v15.0.1-x86_64-linux.tar.xz + mv wasmtime-v15.0.1-x86_64-linux/wasmtime ~/wasmtime + rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux + chmod +x ~/wasmtime + + - uses: Swatinem/rust-cache@v2 + + - name: Build and run ${{ matrix.package }} + run: | + cargo build --target wasm32-wasi -p ${{ matrix.package }} + ~/wasmtime -W unknown-imports-trap=y target/wasm32-wasi/debug/${{ matrix.package }}.wasm From de9b5f6bada59c951fff5d665ece26e5995625ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 11:10:02 +0800 Subject: [PATCH 49/88] Rollback the use that gloo-history has fixed it. --- packages/yew-router/src/lib.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/yew-router/src/lib.rs b/packages/yew-router/src/lib.rs index a574f01ed22..1e9a3b8df31 100644 --- a/packages/yew-router/src/lib.rs +++ b/packages/yew-router/src/lib.rs @@ -78,9 +78,7 @@ pub mod switch; pub mod utils; pub use routable::{AnyRoute, Routable}; -pub use router::Router; -#[cfg(not(target_os = "wasi"))] -pub use router::{BrowserRouter, HashRouter}; +pub use router::{BrowserRouter, HashRouter, Router}; pub use switch::Switch; pub mod history { From f0494f022c10f66f628fe6ae4540204b71420597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 11:10:51 +0800 Subject: [PATCH 50/88] fix --- packages/yew-router/src/lib.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/yew-router/src/lib.rs b/packages/yew-router/src/lib.rs index 1e9a3b8df31..1cf262e21d8 100644 --- a/packages/yew-router/src/lib.rs +++ b/packages/yew-router/src/lib.rs @@ -85,10 +85,9 @@ pub mod history { //! A module that provides universal session history and location information. pub use gloo::history::{ - AnyHistory, History, HistoryError, HistoryResult, Location, MemoryHistory, + AnyHistory, BrowserHistory, HashHistory, History, HistoryError, HistoryResult, Location, + MemoryHistory, }; - #[cfg(not(target_os = "wasi"))] - pub use gloo::history::{BrowserHistory, HashHistory}; } pub mod prelude { @@ -103,7 +102,5 @@ pub mod prelude { pub use crate::scope_ext::{LocationHandle, NavigatorHandle, RouterScopeExt}; #[doc(no_inline)] pub use crate::Routable; - #[cfg(not(target_os = "wasi"))] - pub use crate::{BrowserRouter, HashRouter}; - pub use crate::{Router, Switch}; + pub use crate::{BrowserRouter, HashRouter, Router, Switch}; } From 0991e0ad9cc5c8b30e845b4dbe022ca974bad7c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 11:52:37 +0800 Subject: [PATCH 51/88] Bump gloo-history version. --- Cargo.lock | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b9ba365919a..0ffdd70892e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1093,7 +1093,7 @@ dependencies = [ "gloo-dialogs 0.1.1", "gloo-events 0.1.2", "gloo-file 0.2.3", - "gloo-history 0.1.5", + "gloo-history 0.1.4", "gloo-net 0.3.1", "gloo-render 0.1.1", "gloo-storage 0.2.2", @@ -1112,7 +1112,7 @@ dependencies = [ "gloo-dialogs 0.2.0", "gloo-events 0.2.0", "gloo-file 0.3.0", - "gloo-history 0.2.0", + "gloo-history 0.2.1", "gloo-net 0.4.0", "gloo-render 0.2.0", "gloo-storage 0.3.0", @@ -1131,7 +1131,7 @@ dependencies = [ "gloo-dialogs 0.2.0", "gloo-events 0.2.0", "gloo-file 0.3.0", - "gloo-history 0.2.0", + "gloo-history 0.2.1", "gloo-net 0.5.0", "gloo-render 0.2.0", "gloo-storage 0.3.0", @@ -1233,14 +1233,14 @@ dependencies = [ [[package]] name = "gloo-history" -version = "0.1.5" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f" +checksum = "ddfd137a4b629e72b8c949ec56c71ea9bd5491cc66358a0a7787e94875feec71" dependencies = [ "gloo-events 0.1.2", "gloo-utils 0.1.7", "serde", - "serde-wasm-bindgen", + "serde-wasm-bindgen 0.5.0", "serde_urlencoded", "thiserror", "wasm-bindgen", @@ -1249,14 +1249,15 @@ dependencies = [ [[package]] name = "gloo-history" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91be9f3dd048f35a59c8de3d716ef6d568360078c73ed35a7700776ed53153c8" +checksum = "0c4022e82f5f9e03cb1251b13c0a967e0600e97aa179c617f6519bac40640160" dependencies = [ + "getrandom", "gloo-events 0.2.0", "gloo-utils 0.2.0", "serde", - "serde-wasm-bindgen", + "serde-wasm-bindgen 0.6.1", "serde_urlencoded", "thiserror", "wasm-bindgen", @@ -1738,7 +1739,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af3d77000817fd9e7db159e8d52ed9b5941a2cdbfbdc8ca646e59887ae2b2dd1" dependencies = [ - "indexmap 2.0.2", + "indexmap 1.9.3", ] [[package]] @@ -2765,6 +2766,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + [[package]] name = "serde_derive" version = "1.0.190" From 05650beb5010cf883a493cf4bdc4ba393f50eedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 11:56:17 +0800 Subject: [PATCH 52/88] Block raw html update tests on WASI. --- packages/yew/tests/raw_html.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/yew/tests/raw_html.rs b/packages/yew/tests/raw_html.rs index c6105069394..fc9df959e77 100644 --- a/packages/yew/tests/raw_html.rs +++ b/packages/yew/tests/raw_html.rs @@ -127,23 +127,28 @@ macro_rules! create_update_html_test { }; } +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] create_update_html_test!( set_new_html_string, "first", "second" ); +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] create_update_html_test!( set_new_html_string_multiple_children, "firstsecond", "second" ); +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] create_update_html_test!( clear_html_string_multiple_children, "firstsecond", "" ); + +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] create_update_html_test!( nothing_changes, "firstsecond", From edab06034a15a1c185f23827b486f69657e0c290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 11:58:34 +0800 Subject: [PATCH 53/88] Rollback indexmap's version. --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 0ffdd70892e..7357d482b11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1739,7 +1739,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af3d77000817fd9e7db159e8d52ed9b5941a2cdbfbdc8ca646e59887ae2b2dd1" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.0.2", ] [[package]] From 1d8c171030b6e3a1acfc1abca2831d6fec953345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 12:25:31 +0800 Subject: [PATCH 54/88] fix CI --- packages/yew/tests/raw_html.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/yew/tests/raw_html.rs b/packages/yew/tests/raw_html.rs index fc9df959e77..af4e22f4c6f 100644 --- a/packages/yew/tests/raw_html.rs +++ b/packages/yew/tests/raw_html.rs @@ -72,6 +72,7 @@ create_test!( r#"

paragraph

link"# ); +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] macro_rules! create_update_html_test { ($name:ident, $initial:expr, $updated:expr) => { #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] From 32e86d0881ba5ae585ac54b225b2dd57775a5d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 12:28:37 +0800 Subject: [PATCH 55/88] fix CI --- packages/yew/src/virtual_dom/key.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/yew/src/virtual_dom/key.rs b/packages/yew/src/virtual_dom/key.rs index 0bd68f61dc6..0792f649dd0 100644 --- a/packages/yew/src/virtual_dom/key.rs +++ b/packages/yew/src/virtual_dom/key.rs @@ -68,16 +68,15 @@ key_impl_from_to_string!(i64); key_impl_from_to_string!(i128); key_impl_from_to_string!(isize); +#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] #[cfg(test)] mod test { use std::rc::Rc; - #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure}; use crate::html; - #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] wasm_bindgen_test_configure!(run_in_browser); #[test] From d79f9c2fe6ce305e4b7fd8536e0ac5626eb75061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 14:00:54 +0800 Subject: [PATCH 56/88] Update some SSR test suites that replace ServerRender instead of LocalServerRender. --- packages/yew/src/virtual_dom/vlist.rs | 8 +++++--- packages/yew/src/virtual_dom/vtag.rs | 26 +++++++++++++++++--------- packages/yew/src/virtual_dom/vtext.rs | 5 +++-- packages/yew/tests/raw_html.rs | 2 +- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/packages/yew/src/virtual_dom/vlist.rs b/packages/yew/src/virtual_dom/vlist.rs index b9ac687033a..1001444fe8b 100644 --- a/packages/yew/src/virtual_dom/vlist.rs +++ b/packages/yew/src/virtual_dom/vlist.rs @@ -282,9 +282,10 @@ mod ssr_tests { use tokio::test; use crate::prelude::*; - use crate::ServerRenderer; + use crate::LocalServerRenderer as ServerRenderer; - #[test] + #[cfg_attr(not(target_os = "wasi"), test)] + #[cfg_attr(target_os = "wasi", test(flavor = "current_thread"))] async fn test_text_back_to_back() { #[function_component] fn Comp() -> Html { @@ -301,7 +302,8 @@ mod ssr_tests { assert_eq!(s, "
Hello world!
"); } - #[test] + #[cfg_attr(not(target_os = "wasi"), test)] + #[cfg_attr(target_os = "wasi", test(flavor = "current_thread"))] async fn test_fragment() { #[derive(PartialEq, Properties, Debug)] struct ChildProps { diff --git a/packages/yew/src/virtual_dom/vtag.rs b/packages/yew/src/virtual_dom/vtag.rs index c2ccbec0a81..98d17eb5cac 100644 --- a/packages/yew/src/virtual_dom/vtag.rs +++ b/packages/yew/src/virtual_dom/vtag.rs @@ -562,9 +562,10 @@ mod ssr_tests { use tokio::test; use crate::prelude::*; - use crate::ServerRenderer; + use crate::LocalServerRenderer as ServerRenderer; - #[test] + #[cfg_attr(not(target_os = "wasi"), test)] + #[cfg_attr(target_os = "wasi", test(flavor = "current_thread"))] async fn test_simple_tag() { #[function_component] fn Comp() -> Html { @@ -579,7 +580,8 @@ mod ssr_tests { assert_eq!(s, "
"); } - #[test] + #[cfg_attr(not(target_os = "wasi"), test)] + #[cfg_attr(target_os = "wasi", test(flavor = "current_thread"))] async fn test_simple_tag_with_attr() { #[function_component] fn Comp() -> Html { @@ -594,7 +596,8 @@ mod ssr_tests { assert_eq!(s, r#"
"#); } - #[test] + #[cfg_attr(not(target_os = "wasi"), test)] + #[cfg_attr(target_os = "wasi", test(flavor = "current_thread"))] async fn test_simple_tag_with_content() { #[function_component] fn Comp() -> Html { @@ -609,7 +612,8 @@ mod ssr_tests { assert_eq!(s, r#"
Hello!
"#); } - #[test] + #[cfg_attr(not(target_os = "wasi"), test)] + #[cfg_attr(target_os = "wasi", test(flavor = "current_thread"))] async fn test_simple_tag_with_nested_tag_and_input() { #[function_component] fn Comp() -> Html { @@ -624,7 +628,8 @@ mod ssr_tests { assert_eq!(s, r#"
Hello!
"#); } - #[test] + #[cfg_attr(not(target_os = "wasi"), test)] + #[cfg_attr(target_os = "wasi", test(flavor = "current_thread"))] async fn test_textarea() { #[function_component] fn Comp() -> Html { @@ -639,7 +644,8 @@ mod ssr_tests { assert_eq!(s, r#""#); } - #[test] + #[cfg_attr(not(target_os = "wasi"), test)] + #[cfg_attr(target_os = "wasi", test(flavor = "current_thread"))] async fn test_escaping_in_style_tag() { #[function_component] fn Comp() -> Html { @@ -654,7 +660,8 @@ mod ssr_tests { assert_eq!(s, r#""#); } - #[test] + #[cfg_attr(not(target_os = "wasi"), test)] + #[cfg_attr(target_os = "wasi", test(flavor = "current_thread"))] async fn test_escaping_in_script_tag() { #[function_component] fn Comp() -> Html { @@ -669,7 +676,8 @@ mod ssr_tests { assert_eq!(s, r#""#); } - #[test] + #[cfg_attr(not(target_os = "wasi"), test)] + #[cfg_attr(target_os = "wasi", test(flavor = "current_thread"))] async fn test_multiple_vtext_in_style_tag() { #[function_component] fn Comp() -> Html { diff --git a/packages/yew/src/virtual_dom/vtext.rs b/packages/yew/src/virtual_dom/vtext.rs index fd7fd0f5a12..b16749d15b7 100644 --- a/packages/yew/src/virtual_dom/vtext.rs +++ b/packages/yew/src/virtual_dom/vtext.rs @@ -75,9 +75,10 @@ mod ssr_tests { use tokio::test; use crate::prelude::*; - use crate::ServerRenderer; + use crate::LocalServerRenderer as ServerRenderer; - #[test] + #[cfg_attr(not(target_os = "wasi"), test)] + #[cfg_attr(target_os = "wasi", test(flavor = "current_thread"))] async fn test_simple_str() { #[function_component] fn Comp() -> Html { diff --git a/packages/yew/tests/raw_html.rs b/packages/yew/tests/raw_html.rs index af4e22f4c6f..db48dd1a128 100644 --- a/packages/yew/tests/raw_html.rs +++ b/packages/yew/tests/raw_html.rs @@ -48,7 +48,7 @@ macro_rules! create_test { } #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] { - let actual = yew::ServerRenderer::::new() + let actual = yew::LocalServerRenderer::::new() .hydratable(false) .render() .await; From 3eedd3707c9878e0bd806438946cdec52566fd40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 14:07:25 +0800 Subject: [PATCH 57/88] Remove yew-router's cfg macro --- .github/workflows/main-checks.yml | 28 +++++++++++----------------- packages/yew-router/src/router.rs | 7 +------ 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index f5ae7adc42d..c6f48ea7271 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -3,11 +3,11 @@ name: Main Checks on: pull_request: paths: - - ".github/workflows/main-checks.yml" - - "ci/**" - - "packages/**/*" - - "Cargo.toml" - - "Cargo.lock" + - '.github/workflows/main-checks.yml' + - 'ci/**' + - 'packages/**/*' + - 'Cargo.toml' + - 'Cargo.lock' push: branches: [master] @@ -164,7 +164,7 @@ jobs: env: RUSTFLAGS: --cfg nightly_yew --cfg yew_lints run: cargo test -p yew-macro test_html_lints - + unit_tests_wasi: name: Unit Tests (WASI) on ${{ matrix.toolchain }} runs-on: ubuntu-latest @@ -192,20 +192,14 @@ jobs: chmod +x ~/wasmtime - uses: Swatinem/rust-cache@v2 - + - name: Run WASI tests for yew run: | RUST_LOG=info - cargo test --features ssr --target wasm32-wasi -p yew --no-run 2>&1 |\ - grep -o "target/wasm32-wasi/debug/deps/[^ ]*\.wasm" |\ - xargs -I {} ~/wasmtime -W unknown-imports-trap=y {} - - - name: Run WASI tests for yew-router - run: | - cargo test --features ssr --target wasm32-wasi -p yew-router --no-run 2>&1 |\ + cargo test --features ssr,hydration --target wasm32-wasi -p yew --no-run 2>&1 |\ grep -o "target/wasm32-wasi/debug/deps/[^ ]*\.wasm" |\ xargs -I {} ~/wasmtime -W unknown-imports-trap=y {} - + example-runnable-tests-on-wasi: name: Example Runnable Tests on WASI runs-on: ubuntu-latest @@ -232,9 +226,9 @@ jobs: mv wasmtime-v15.0.1-x86_64-linux/wasmtime ~/wasmtime rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux chmod +x ~/wasmtime - + - uses: Swatinem/rust-cache@v2 - + - name: Build and run ${{ matrix.package }} run: | cargo build --target wasm32-wasi -p ${{ matrix.package }} diff --git a/packages/yew-router/src/router.rs b/packages/yew-router/src/router.rs index bb849f91061..658a1ee2186 100644 --- a/packages/yew-router/src/router.rs +++ b/packages/yew-router/src/router.rs @@ -4,11 +4,8 @@ use std::rc::Rc; use yew::prelude::*; use yew::virtual_dom::AttrValue; -use crate::history::{AnyHistory, History, Location}; -#[cfg(not(target_os = "wasi"))] -use crate::history::{BrowserHistory, HashHistory}; +use crate::history::{AnyHistory, BrowserHistory, HashHistory, History, Location}; use crate::navigator::Navigator; -#[cfg(not(target_os = "wasi"))] use crate::utils::base_url; use crate::utils::strip_slash_suffix; @@ -148,7 +145,6 @@ pub struct ConcreteRouterProps { /// /// The router will by default use the value declared in `` as its basename. /// You may also specify a different basename with props. -#[cfg(not(target_os = "wasi"))] #[function_component(BrowserRouter)] pub fn browser_router(props: &ConcreteRouterProps) -> Html { let ConcreteRouterProps { children, basename } = props.clone(); @@ -172,7 +168,6 @@ pub fn browser_router(props: &ConcreteRouterProps) -> Html { /// # Warning /// /// Prefer [`BrowserRouter`] whenever possible and use this as a last resort. -#[cfg(not(target_os = "wasi"))] #[function_component(HashRouter)] pub fn hash_router(props: &ConcreteRouterProps) -> Html { let ConcreteRouterProps { children, basename } = props.clone(); From da76e98298768ac765de39c3e779ec8dd4e555ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 14:09:02 +0800 Subject: [PATCH 58/88] Fix fmt --- packages/yew-router/src/router.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/yew-router/src/router.rs b/packages/yew-router/src/router.rs index 658a1ee2186..b3becda9ea1 100644 --- a/packages/yew-router/src/router.rs +++ b/packages/yew-router/src/router.rs @@ -6,8 +6,7 @@ use yew::virtual_dom::AttrValue; use crate::history::{AnyHistory, BrowserHistory, HashHistory, History, Location}; use crate::navigator::Navigator; -use crate::utils::base_url; -use crate::utils::strip_slash_suffix; +use crate::utils::{base_url, strip_slash_suffix}; /// Props for [`Router`]. #[derive(Properties, PartialEq, Clone)] From 6336f52c5e0651005920290d672a5c80a4003470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 15 Dec 2023 14:22:07 +0800 Subject: [PATCH 59/88] Try to fix CI --- packages/yew/tests/use_transitive_state.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/yew/tests/use_transitive_state.rs b/packages/yew/tests/use_transitive_state.rs index 94de0abad75..71f7f31dda1 100644 --- a/packages/yew/tests/use_transitive_state.rs +++ b/packages/yew/tests/use_transitive_state.rs @@ -1,5 +1,5 @@ #![cfg(feature = "hydration")] -#![cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] +#![cfg(target_arch = "wasm32")] use std::time::Duration; From 1692b4ae7788d63530d870e16ef2e48246c3bad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 29 Mar 2024 00:40:58 +0800 Subject: [PATCH 60/88] Update examples/wasi_ssr_module/README.md Co-authored-by: Elina --- examples/wasi_ssr_module/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/wasi_ssr_module/README.md b/examples/wasi_ssr_module/README.md index 00adebabb97..51fbceeb009 100644 --- a/examples/wasi_ssr_module/README.md +++ b/examples/wasi_ssr_module/README.md @@ -20,4 +20,4 @@ cargo build --manifest-path examples/wasi_ssr_module/Cargo.toml --target wasm32- wasmtime target/wasm32-wasi/release/wasi_ssr_module.wasm ``` -> Note: If your wasmtime CLI throws an error that it says some imports like `__wbindgen_placeholder__::__wbindgen_xxx` is invalid, try to run `cargo update`. See issue [#411](https://github.com/rustwasm/gloo/pull/411#discussion_r1421219033). +> Note: If your wasmtime CLI throws an error that it says some imports like `__wbindgen_placeholder__::__wbindgen_xxx` is invalid, try to run `cargo update`. See issue [rustwasm/gloo#411](https://github.com/rustwasm/gloo/pull/411#discussion_r1421219033). From 0b5bb9ed060c2c57d8d86857ac7a66578900eb7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 29 Mar 2024 00:53:25 +0800 Subject: [PATCH 61/88] Revert back some unnecessary changes. --- .github/workflows/main-checks.yml | 10 ++-- Cargo.lock | 87 ++----------------------------- 2 files changed, 8 insertions(+), 89 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index c6f48ea7271..955c4fb790a 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -3,11 +3,11 @@ name: Main Checks on: pull_request: paths: - - '.github/workflows/main-checks.yml' - - 'ci/**' - - 'packages/**/*' - - 'Cargo.toml' - - 'Cargo.lock' + - ".github/workflows/main-checks.yml" + - "ci/**" + - "packages/**/*" + - "Cargo.toml" + - "Cargo.lock" push: branches: [master] diff --git a/Cargo.lock b/Cargo.lock index 5e07a1964da..19ff9ba03d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2172,16 +2172,6 @@ dependencies = [ "yew", ] -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - [[package]] name = "num-traits" version = "0.2.15" @@ -2267,12 +2257,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "papergrid" version = "0.10.0" @@ -2858,15 +2842,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -2883,14 +2858,14 @@ dependencies = [ "bytes", "clap", "futures 0.3.29", + "log", "reqwest", "serde", - "time", "tokio", - "tracing-subscriber", - "tracing-web", "uuid", "warp", + "wasm-bindgen-futures", + "wasm-logger", "yew", ] @@ -3129,16 +3104,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - [[package]] name = "time" version = "0.3.30" @@ -3146,7 +3111,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", - "js-sys", "powerfmt", "serde", "time-core", @@ -3381,45 +3345,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "nu-ansi-term", - "sharded-slab", - "smallvec", - "thread_local", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tracing-web" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e6a141feebd51f8d91ebfd785af50fca223c570b86852166caa3b141defe7c" -dependencies = [ - "js-sys", - "tracing-core", - "tracing-subscriber", - "wasm-bindgen", - "web-sys", ] [[package]] @@ -3556,12 +3481,6 @@ dependencies = [ "serde", ] -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - [[package]] name = "vcpkg" version = "0.2.15" From e9429db50fa5a5f45c9ccc15ff296a2d0d62beff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 29 Mar 2024 01:25:08 +0800 Subject: [PATCH 62/88] Clippy --- packages/yew-router/src/utils.rs | 2 +- packages/yew/src/renderer.rs | 2 +- packages/yew/src/virtual_dom/vlist.rs | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/yew-router/src/utils.rs b/packages/yew-router/src/utils.rs index 8b8a7797fd4..a1a1067eedb 100644 --- a/packages/yew-router/src/utils.rs +++ b/packages/yew-router/src/utils.rs @@ -8,7 +8,7 @@ pub(crate) fn strip_slash_suffix(path: &str) -> &str { static BASE_URL_LOADED: std::sync::Once = std::sync::Once::new(); thread_local! { - static BASE_URL: RefCell> = RefCell::new(None); + static BASE_URL: RefCell> = const { RefCell::new(None) }; } // This exists so we can cache the base url. It costs us a `to_string` call instead of a DOM API diff --git a/packages/yew/src/renderer.rs b/packages/yew/src/renderer.rs index 442268a281c..7c7e20e63c6 100644 --- a/packages/yew/src/renderer.rs +++ b/packages/yew/src/renderer.rs @@ -8,7 +8,7 @@ use crate::app_handle::AppHandle; use crate::html::BaseComponent; thread_local! { - static PANIC_HOOK_IS_SET: Cell = Cell::new(false); + static PANIC_HOOK_IS_SET: Cell = const { Cell::new(false) }; } /// Set a custom panic hook. diff --git a/packages/yew/src/virtual_dom/vlist.rs b/packages/yew/src/virtual_dom/vlist.rs index 1001444fe8b..a80f5f6b480 100644 --- a/packages/yew/src/virtual_dom/vlist.rs +++ b/packages/yew/src/virtual_dom/vlist.rs @@ -48,6 +48,7 @@ impl Deref for VList { // This is mutable because the Vec is not Sync static mut EMPTY: Vec = Vec::new(); // SAFETY: The EMPTY value is always read-only + #[allow(static_mut_refs)] unsafe { &EMPTY } } } From 837531309eaaed2037b9e2e93003ac23eee38de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Fri, 29 Mar 2024 01:27:36 +0800 Subject: [PATCH 63/88] fmt --- packages/yew/src/virtual_dom/vlist.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/yew/src/virtual_dom/vlist.rs b/packages/yew/src/virtual_dom/vlist.rs index a80f5f6b480..c178d7fd1ff 100644 --- a/packages/yew/src/virtual_dom/vlist.rs +++ b/packages/yew/src/virtual_dom/vlist.rs @@ -49,7 +49,9 @@ impl Deref for VList { static mut EMPTY: Vec = Vec::new(); // SAFETY: The EMPTY value is always read-only #[allow(static_mut_refs)] - unsafe { &EMPTY } + unsafe { + &EMPTY + } } } } From d148fcb32ad1cfc534dc90665b04a53ec191f6ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 16 May 2024 09:41:49 +0800 Subject: [PATCH 64/88] Fix CI. --- packages/yew-macro/src/html_tree/lint/mod.rs | 1 + packages/yew/src/html/classes.rs | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/yew-macro/src/html_tree/lint/mod.rs b/packages/yew-macro/src/html_tree/lint/mod.rs index bbb34f24648..5504be6bbf1 100644 --- a/packages/yew-macro/src/html_tree/lint/mod.rs +++ b/packages/yew-macro/src/html_tree/lint/mod.rs @@ -11,6 +11,7 @@ use crate::props::{ElementProps, Prop}; /// Lints HTML elements to check if they are well formed. If the element is not well-formed, then /// use `proc-macro-error` (and the `emit_warning!` macro) to produce a warning. At present, these /// are only emitted on nightly. +#[allow(dead_code)] pub trait Lint { fn lint(element: &HtmlElement); } diff --git a/packages/yew/src/html/classes.rs b/packages/yew/src/html/classes.rs index 941ec617bf2..7c3f8705e1c 100644 --- a/packages/yew/src/html/classes.rs +++ b/packages/yew/src/html/classes.rs @@ -1,4 +1,5 @@ use std::borrow::Cow; +use std::fmt::Display; use std::iter::FromIterator; use std::rc::Rc; @@ -165,14 +166,14 @@ impl IntoIterator for &Classes { } } -impl ToString for Classes { - fn to_string(&self) -> String { +impl Display for Classes { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { let mut iter = self.set.iter().cloned(); iter.next() .map(|first| build_attr_value(first, iter)) .unwrap_or_default() - .to_string() + .fmt(f) } } From 491a2c1814ece4608eadbc760fbcf01f543ae429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 16 May 2024 10:05:44 +0800 Subject: [PATCH 65/88] Fix CI. --- packages/yew/src/dom_bundle/subtree_root.rs | 2 +- packages/yew/src/html/component/lifecycle.rs | 1 + packages/yew/src/scheduler.rs | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/yew/src/dom_bundle/subtree_root.rs b/packages/yew/src/dom_bundle/subtree_root.rs index 83720fecddf..92efc76c9b5 100644 --- a/packages/yew/src/dom_bundle/subtree_root.rs +++ b/packages/yew/src/dom_bundle/subtree_root.rs @@ -27,9 +27,9 @@ pub trait EventGrating { fn set_cache_key(&self, key: u32); } +/// Duck-typing, not a real class on js-side. On rust-side, use impls of EventGrating below #[wasm_bindgen] extern "C" { - // Duck-typing, not a real class on js-side. On rust-side, use impls of EventGrating below type EventTargetable; #[wasm_bindgen(method, getter = __yew_subtree_id, structural)] fn subtree_id(this: &EventTargetable) -> Option; diff --git a/packages/yew/src/html/component/lifecycle.rs b/packages/yew/src/html/component/lifecycle.rs index c5abcb03064..47244484309 100644 --- a/packages/yew/src/html/component/lifecycle.rs +++ b/packages/yew/src/html/component/lifecycle.rs @@ -146,6 +146,7 @@ where /// /// Mostly a thin wrapper that passes the context to a component's lifecycle /// methods. +#[allow(dead_code)] pub(crate) trait Stateful { fn view(&self) -> HtmlResult; fn rendered(&mut self, first_render: bool); diff --git a/packages/yew/src/scheduler.rs b/packages/yew/src/scheduler.rs index 7c7ffdb7da6..308729233fa 100644 --- a/packages/yew/src/scheduler.rs +++ b/packages/yew/src/scheduler.rs @@ -55,6 +55,7 @@ impl TopologicalQueue { /// Take a single entry, preferring parents over children #[rustversion::since(1.66)] + #[allow(clippy::incompatible_msrv)] #[inline] fn pop_topmost(&mut self) -> Option { self.inner.pop_first().map(|(_, v)| v) From d42077a526893a14f3cebeaec11c4e5e462ea7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 16 May 2024 12:44:23 +0800 Subject: [PATCH 66/88] Try to fix clippy. --- packages/yew/src/dom_bundle/btag/listeners.rs | 3 +++ packages/yew/src/dom_bundle/subtree_root.rs | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/yew/src/dom_bundle/btag/listeners.rs b/packages/yew/src/dom_bundle/btag/listeners.rs index 7e832528458..c69f237b741 100644 --- a/packages/yew/src/dom_bundle/btag/listeners.rs +++ b/packages/yew/src/dom_bundle/btag/listeners.rs @@ -1,3 +1,6 @@ +#![allow(clippy::empty_docs)] +// TODO: https://github.com/rustwasm/wasm-bindgen/pull/3946 + use std::cell::RefCell; use std::collections::HashMap; use std::ops::Deref; diff --git a/packages/yew/src/dom_bundle/subtree_root.rs b/packages/yew/src/dom_bundle/subtree_root.rs index 92efc76c9b5..768a3ed454a 100644 --- a/packages/yew/src/dom_bundle/subtree_root.rs +++ b/packages/yew/src/dom_bundle/subtree_root.rs @@ -1,5 +1,8 @@ //! Per-subtree state of apps +#![allow(clippy::empty_docs)] +// TODO: https://github.com/rustwasm/wasm-bindgen/pull/3946 + use std::borrow::Cow; use std::cell::RefCell; use std::collections::HashSet; @@ -27,9 +30,9 @@ pub trait EventGrating { fn set_cache_key(&self, key: u32); } -/// Duck-typing, not a real class on js-side. On rust-side, use impls of EventGrating below #[wasm_bindgen] extern "C" { + // Duck-typing, not a real class on js-side. On rust-side, use impls of EventGrating below type EventTargetable; #[wasm_bindgen(method, getter = __yew_subtree_id, structural)] fn subtree_id(this: &EventTargetable) -> Option; From 63989865d82dab9274e3f1964654e08d588ba672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 10 Aug 2024 20:03:12 +0800 Subject: [PATCH 67/88] Fix `ToString` trait. --- Cargo.lock | 26 +++++++++++++++++++++++++- packages/yew/src/html/classes.rs | 3 +-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 33e4534cc09..233ffcf6740 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1116,7 +1116,7 @@ dependencies = [ "gloo-dialogs 0.2.0", "gloo-events 0.2.0", "gloo-file 0.3.0", - "gloo-history 0.2.0", + "gloo-history 0.2.1", "gloo-net 0.5.0", "gloo-render 0.2.0", "gloo-storage 0.3.0", @@ -4256,3 +4256,27 @@ dependencies = [ "wasm-bindgen", "web-sys", ] + +[[patch.unused]] +name = "hikari-boot" +version = "0.1.0" + +[[patch.unused]] +name = "hikari-components" +version = "0.1.0" + +[[patch.unused]] +name = "tairitsu-boot" +version = "0.1.0" + +[[patch.unused]] +name = "tairitsu-database" +version = "0.1.0" + +[[patch.unused]] +name = "tairitsu-utils" +version = "0.1.0" + +[[patch.unused]] +name = "tairitsu-vm" +version = "0.1.0" diff --git a/packages/yew/src/html/classes.rs b/packages/yew/src/html/classes.rs index 063e0e6a740..d2305a129e4 100644 --- a/packages/yew/src/html/classes.rs +++ b/packages/yew/src/html/classes.rs @@ -1,5 +1,4 @@ use std::borrow::Cow; -use std::fmt::Display; use std::iter::FromIterator; use std::rc::Rc; @@ -174,7 +173,7 @@ impl ToString for Classes { iter.next() .map(|first| build_attr_value(first, iter)) .unwrap_or_default() - .fmt(f) + .to_string() } } From 2c6a1506f7db02fedef5585d56bdc94c43f34cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 10 Aug 2024 20:10:11 +0800 Subject: [PATCH 68/88] Remove pin version of WASI CI test. --- .github/workflows/main-checks.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index a4f10943712..c56b274b9e5 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -3,11 +3,11 @@ name: Main Checks on: pull_request: paths: - - ".github/workflows/main-checks.yml" - - "ci/**" - - "packages/**/*" - - "Cargo.toml" - - "Cargo.lock" + - '.github/workflows/main-checks.yml' + - 'ci/**' + - 'packages/**/*' + - 'Cargo.toml' + - 'Cargo.lock' push: branches: [master] @@ -172,7 +172,6 @@ jobs: fail-fast: false matrix: toolchain: - - 1.64.0 - stable - nightly @@ -209,7 +208,6 @@ jobs: package: - wasi_ssr_module toolchain: - - 1.64.0 - stable - nightly steps: From 7a5e1f573dbedc26d063ad8cc7daf9eed7d03fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 10 Aug 2024 20:12:19 +0800 Subject: [PATCH 69/88] Pin the newer version. --- .github/workflows/main-checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index c56b274b9e5..66a270c8440 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -172,6 +172,7 @@ jobs: fail-fast: false matrix: toolchain: + - 1.76.0 - stable - nightly @@ -208,6 +209,7 @@ jobs: package: - wasi_ssr_module toolchain: + - 1.76.0 - stable - nightly steps: From 321c99fd5792ec90852c9d87f0808c468e8b2fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Tue, 13 Aug 2024 23:31:35 +0800 Subject: [PATCH 70/88] Fix typo. --- packages/yew/src/dom_bundle/btag/listeners.rs | 3 --- packages/yew/src/dom_bundle/subtree_root.rs | 3 --- website/docs/advanced-topics/server-side-rendering.md | 4 +++- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/yew/src/dom_bundle/btag/listeners.rs b/packages/yew/src/dom_bundle/btag/listeners.rs index c69f237b741..7e832528458 100644 --- a/packages/yew/src/dom_bundle/btag/listeners.rs +++ b/packages/yew/src/dom_bundle/btag/listeners.rs @@ -1,6 +1,3 @@ -#![allow(clippy::empty_docs)] -// TODO: https://github.com/rustwasm/wasm-bindgen/pull/3946 - use std::cell::RefCell; use std::collections::HashMap; use std::ops::Deref; diff --git a/packages/yew/src/dom_bundle/subtree_root.rs b/packages/yew/src/dom_bundle/subtree_root.rs index 768a3ed454a..83720fecddf 100644 --- a/packages/yew/src/dom_bundle/subtree_root.rs +++ b/packages/yew/src/dom_bundle/subtree_root.rs @@ -1,8 +1,5 @@ //! Per-subtree state of apps -#![allow(clippy::empty_docs)] -// TODO: https://github.com/rustwasm/wasm-bindgen/pull/3946 - use std::borrow::Cow; use std::cell::RefCell; use std::collections::HashSet; diff --git a/website/docs/advanced-topics/server-side-rendering.md b/website/docs/advanced-topics/server-side-rendering.md index e98cde971c3..07635a0ccdd 100644 --- a/website/docs/advanced-topics/server-side-rendering.md +++ b/website/docs/advanced-topics/server-side-rendering.md @@ -200,7 +200,9 @@ Example: [ssr_router](https://github.com/yewstack/yew/tree/master/examples/ssr_r Yew supports single thread mode for server-side rendering by `yew::LocalServerRenderer`. This mode would work in a single thread environment like WASI. ```rust -// Build it by `wasm32-wasi` target +// Build it by `wasm32-wasip1` target or `wasm32-wasip2` target (after rustc 1.78). +// You can still use `wasm32-wasi` target to build if you are using older version of rustc (before 1.84). +// See https://blog.rust-lang.org/2024/04/09/updates-to-rusts-wasi-targets.html for more information. use yew::prelude::*; use yew::LocalServerRenderer; From 47db4baecaf797151ed312326064496020dab840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Wed, 14 Aug 2024 11:31:11 +0800 Subject: [PATCH 71/88] Bump `wasm-bindgen`. --- Cargo.lock | 45 ++++++++----------------------- tools/benchmark-hooks/Cargo.toml | 4 +-- tools/benchmark-struct/Cargo.toml | 4 +-- 3 files changed, 15 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 233ffcf6740..8a606e0cc9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3662,19 +3662,20 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -3699,9 +3700,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3709,9 +3710,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -3722,9 +3723,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-bindgen-test" @@ -4256,27 +4257,3 @@ dependencies = [ "wasm-bindgen", "web-sys", ] - -[[patch.unused]] -name = "hikari-boot" -version = "0.1.0" - -[[patch.unused]] -name = "hikari-components" -version = "0.1.0" - -[[patch.unused]] -name = "tairitsu-boot" -version = "0.1.0" - -[[patch.unused]] -name = "tairitsu-database" -version = "0.1.0" - -[[patch.unused]] -name = "tairitsu-utils" -version = "0.1.0" - -[[patch.unused]] -name = "tairitsu-vm" -version = "0.1.0" diff --git a/tools/benchmark-hooks/Cargo.toml b/tools/benchmark-hooks/Cargo.toml index ba0cadabb7c..d99641218e9 100644 --- a/tools/benchmark-hooks/Cargo.toml +++ b/tools/benchmark-hooks/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib"] [dependencies] rand = { version = "0.8.5", features = ["small_rng"] } getrandom = { version = "0.2.14", features = ["js"] } -wasm-bindgen = "0.2.92" -web-sys = { version = "0.3.69", features = ["Window"]} +wasm-bindgen = "0.2.93" +web-sys = { version = "0.3.69", features = ["Window"] } yew = { version = "0.21.0", features = ["csr"], path = "../../packages/yew" } [package.metadata.wasm-pack.profile.release] diff --git a/tools/benchmark-struct/Cargo.toml b/tools/benchmark-struct/Cargo.toml index fc8475ef5b3..b6254fcbd2d 100644 --- a/tools/benchmark-struct/Cargo.toml +++ b/tools/benchmark-struct/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib"] [dependencies] rand = { version = "0.8.5", features = ["small_rng"] } getrandom = { version = "0.2.14", features = ["js"] } -wasm-bindgen = "0.2.92" -web-sys = { version = "0.3.69", features = ["Window"]} +wasm-bindgen = "0.2.93" +web-sys = { version = "0.3.69", features = ["Window"] } yew = { version = "0.21.0", features = ["csr"], path = "../../packages/yew" } [package.metadata.wasm-pack.profile.release] From 87d67f8f9e5df1fba44ff56d74e93760f4f96801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Wed, 14 Aug 2024 12:05:51 +0800 Subject: [PATCH 72/88] Fix SSR example. --- examples/simple_ssr/index.html | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/simple_ssr/index.html b/examples/simple_ssr/index.html index 2cb77d4d490..976443cb512 100644 --- a/examples/simple_ssr/index.html +++ b/examples/simple_ssr/index.html @@ -1,9 +1,13 @@ - - - Yew SSR Example - - - + + + Yew SSR Example + + + + + + + \ No newline at end of file From 30677e713194ad2e05f055ed3847ab868b552ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 15 Aug 2024 10:11:38 +0800 Subject: [PATCH 73/88] Fix typo. --- Cargo.lock | 26 ++++++++++---------- packages/yew-macro/src/html_tree/lint/mod.rs | 1 - packages/yew/Cargo.toml | 7 +++--- packages/yew/src/html/component/lifecycle.rs | 1 - tools/benchmark-ssr/Cargo.toml | 2 +- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a606e0cc9c..6107ea5cc4c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1552,9 +1552,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "html-escape" @@ -1862,7 +1862,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -1879,7 +1879,7 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.9", "io-lifetimes", "rustix 0.37.25", "windows-sys 0.48.0", @@ -2126,13 +2126,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3262,28 +3263,27 @@ dependencies = [ [[package]] name = "tokio" -version = "1.38.1" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", diff --git a/packages/yew-macro/src/html_tree/lint/mod.rs b/packages/yew-macro/src/html_tree/lint/mod.rs index 60e8cd15262..82b0c351f04 100644 --- a/packages/yew-macro/src/html_tree/lint/mod.rs +++ b/packages/yew-macro/src/html_tree/lint/mod.rs @@ -11,7 +11,6 @@ use crate::props::{ElementProps, Prop}; /// Lints HTML elements to check if they are well formed. If the element is not well-formed, then /// use `proc-macro-error` (and the `emit_warning!` macro) to produce a warning. At present, these /// are only emitted on nightly. -#[allow(dead_code)] pub trait Lint { #[cfg_attr(not(yew_lints), allow(dead_code))] fn lint(element: &HtmlElement); diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index 4927dd3537c..99faae53629 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -40,7 +40,7 @@ wasm-bindgen-futures = "0.4" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] # We still need tokio as we have docs linked to it. -tokio = { version = "1.38", features = ["rt"] } +tokio = { version = "1.39", features = ["rt"] } [dependencies.web-sys] version = "^0.3.69" @@ -79,10 +79,10 @@ features = [ ] [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -tokio = { version = "1.38", features = ["full"] } +tokio = { version = "1.39", features = ["full"] } [target.'cfg(all(target_arch = "wasm32", target_os = "wasi"))'.dependencies] -tokio = { version = "1.33", features = ["macros", "rt", "time"] } +tokio = { version = "1.39", features = ["macros", "rt", "time"] } [dev-dependencies] wasm-bindgen-test = "0.3" @@ -106,4 +106,3 @@ rustdoc-args = ["--cfg", "documenting"] [lints.rust] unexpected_cfgs = { level = "allow", check-cfg = ['cfg(nightly_yew)'] } - diff --git a/packages/yew/src/html/component/lifecycle.rs b/packages/yew/src/html/component/lifecycle.rs index 1992f551fc5..f8e46942c6f 100644 --- a/packages/yew/src/html/component/lifecycle.rs +++ b/packages/yew/src/html/component/lifecycle.rs @@ -146,7 +146,6 @@ where /// /// Mostly a thin wrapper that passes the context to a component's lifecycle /// methods. -#[allow(dead_code)] pub(crate) trait Stateful { fn view(&self) -> HtmlResult; #[cfg(feature = "csr")] diff --git a/tools/benchmark-ssr/Cargo.toml b/tools/benchmark-ssr/Cargo.toml index bc0afa2258a..b399b73bcd9 100644 --- a/tools/benchmark-ssr/Cargo.toml +++ b/tools/benchmark-ssr/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] yew = { path = "../../packages/yew", features = ["ssr"] } function_router = { path = "../../examples/function_router" } -tokio = { version = "1.38", features = ["full"] } +tokio = { version = "1.39", features = ["full"] } average = "0.15.1" tabled = "0.15.0" indicatif = "0.17.8" From 1bbb3f73dc1f90a30d7e19282575e92b5434c8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 15 Aug 2024 13:01:38 +0800 Subject: [PATCH 74/88] Try to support non-browser environments. --- packages/yew/Cargo.toml | 1 + packages/yew/src/scheduler.rs | 12 ++++++++++-- .../docs/advanced-topics/server-side-rendering.md | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index 99faae53629..9efe508fd2a 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -98,6 +98,7 @@ features = ["ShadowRootInit", "ShadowRootMode", "HtmlButtonElement"] ssr = ["dep:html-escape", "dep:base64ct", "dep:bincode"] csr = [] hydration = ["csr", "dep:bincode"] +not_browser_env = [] default = [] [package.metadata.docs.rs] diff --git a/packages/yew/src/scheduler.rs b/packages/yew/src/scheduler.rs index 4163f960d78..98e82ea0b47 100644 --- a/packages/yew/src/scheduler.rs +++ b/packages/yew/src/scheduler.rs @@ -211,7 +211,11 @@ pub(crate) fn start_now() { }); } -#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] +#[cfg(all( + target_arch = "wasm32", + not(target_os = "wasi"), + not(feature = "not_browser_env") +))] mod arch { use crate::platform::spawn_local; @@ -224,7 +228,11 @@ mod arch { } } -#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] +#[cfg(any( + not(target_arch = "wasm32"), + target_os = "wasi", + feature = "not_browser_env" +))] mod arch { // Delayed rendering is not very useful in the context of server-side rendering. // There are no event listeners or other high priority events that need to be diff --git a/website/docs/advanced-topics/server-side-rendering.md b/website/docs/advanced-topics/server-side-rendering.md index 07635a0ccdd..046e0149289 100644 --- a/website/docs/advanced-topics/server-side-rendering.md +++ b/website/docs/advanced-topics/server-side-rendering.md @@ -240,6 +240,8 @@ async fn main() { Example: [wasi_ssr_module](https://github.com/yewstack/yew/tree/master/examples/wasi_ssr_module) +> Note: If you are using `wasm32-unknown-unknown` target to build the SSR application, you may need to use feature `not_browser_env` to disable browser-specific features. This would be useful on serverless platforms like Cloudflare Worker. + :::caution Server-side rendering is currently experimental. If you find a bug, please file From 4b69e36214f35f64baae734380ee4799efad93ff Mon Sep 17 00:00:00 2001 From: Martin Molzer Date: Wed, 21 Aug 2024 16:09:49 +0200 Subject: [PATCH 75/88] Update wasm-bindgen-test to 0.3.43 refer to rustwasm/wasm-bindgen#4083 --- Cargo.lock | 46 ++++++++++++++++++++++++++++------ packages/yew-router/Cargo.toml | 2 +- packages/yew/Cargo.toml | 2 +- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6107ea5cc4c..7e1ec4ba95e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1959,9 +1959,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2115,6 +2115,16 @@ dependencies = [ "unicase", ] +[[package]] +name = "minicov" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169" +dependencies = [ + "cc", + "walkdir", +] + [[package]] name = "miniz_oxide" version = "0.6.2" @@ -2795,6 +2805,15 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "schannel" version = "0.1.21" @@ -3602,6 +3621,16 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -3688,9 +3717,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -3729,12 +3758,13 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-bindgen-test" -version = "0.3.42" +version = "0.3.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b" +checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9" dependencies = [ "console_error_panic_hook", "js-sys", + "minicov", "scoped-tls", "wasm-bindgen", "wasm-bindgen-futures", @@ -3743,9 +3773,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.42" +version = "0.3.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" +checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021" dependencies = [ "proc-macro2", "quote", diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index 77f71d82fd5..5445b3a0a23 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -29,7 +29,7 @@ version = "0.3" features = ["Document", "HtmlBaseElement", "Window"] [dev-dependencies] -wasm-bindgen-test = "0.3" +wasm-bindgen-test = "0.3.43" serde = { version = "1", features = ["derive"] } yew = { version = "0.21.0", path = "../yew", features = ["csr"] } diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index 9efe508fd2a..2f38527ad93 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -85,7 +85,7 @@ tokio = { version = "1.39", features = ["full"] } tokio = { version = "1.39", features = ["macros", "rt", "time"] } [dev-dependencies] -wasm-bindgen-test = "0.3" +wasm-bindgen-test = "0.3.43" gloo = { version = "0.11", features = ["futures"] } wasm-bindgen-futures = "0.4" trybuild = "1" From 0414af9f39d2ab418244b5956543b4dedad38d77 Mon Sep 17 00:00:00 2001 From: Martin Molzer Date: Wed, 21 Aug 2024 16:28:47 +0200 Subject: [PATCH 76/88] fix doc test running on nightly --- packages/yew/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/yew/src/lib.rs b/packages/yew/src/lib.rs index cd85d32af3e..85ed7091fd7 100644 --- a/packages/yew/src/lib.rs +++ b/packages/yew/src/lib.rs @@ -73,6 +73,7 @@ //! yew::Renderer::::new().render(); //! } //! # } +//! # fn main() {} //! ``` #![deny( From a6ece17a20ff3ed5a5aac555f20793109a0cfaac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 22 Aug 2024 15:22:08 +0800 Subject: [PATCH 77/88] Update website/docs/advanced-topics/server-side-rendering.md Co-authored-by: WorldSEnder --- website/docs/advanced-topics/server-side-rendering.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/docs/advanced-topics/server-side-rendering.md b/website/docs/advanced-topics/server-side-rendering.md index 046e0149289..c68c3b362f4 100644 --- a/website/docs/advanced-topics/server-side-rendering.md +++ b/website/docs/advanced-topics/server-side-rendering.md @@ -240,7 +240,9 @@ async fn main() { Example: [wasi_ssr_module](https://github.com/yewstack/yew/tree/master/examples/wasi_ssr_module) -> Note: If you are using `wasm32-unknown-unknown` target to build the SSR application, you may need to use feature `not_browser_env` to disable browser-specific features. This would be useful on serverless platforms like Cloudflare Worker. +:::note +If you are using the `wasm32-unknown-unknown` target to build a SSR application, you can use the `not_browser_env` feature flag to disable access of browser-specific APIs inside of Yew. This would be useful on serverless platforms like Cloudflare Worker. +::: :::caution From 2df015ae4df8cc2593b2e8e9d16f513e0563f802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 22 Aug 2024 15:33:41 +0800 Subject: [PATCH 78/88] Update WASI CI. --- .cargo/config.toml | 3 +++ .github/workflows/main-checks.yml | 28 +++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 00a2269cd87..a0282bb695c 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,6 +1,9 @@ [target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'] runner = 'wasm-bindgen-test-runner' +[target.'cfg(all(target_arch = "wasm32", target_os = "wasi"))'] +runner = 'wasmtime -W unknown-imports-trap=y' + # This section needs to be last. # GitHub Actions modifies this section. [unstable] diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index 66a270c8440..3f26f66ee94 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -181,14 +181,14 @@ jobs: - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.toolchain }} - target: wasm32-wasi + target: wasm32-wasip1 - name: Install wasmtime run: | - wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasmtime-v15.0.1-x86_64-linux.tar.xz - tar xf wasmtime-v15.0.1-x86_64-linux.tar.xz - mv wasmtime-v15.0.1-x86_64-linux/wasmtime ~/wasmtime - rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux + wget https://github.com/bytecodealliance/wasmtime/releases/download/v24.0.0/wasmtime-v24.0.0-x86_64-linux.tar.xz + tar xf wasmtime-v24.0.0-x86_64-linux.tar.xz + mv wasmtime-v24.0.0-x86_64-linux/wasmtime ~/wasmtime + rm -rf wasmtime-v24.0.0-x86_64-linux.tar.xz wasmtime-v24.0.0-x86_64-linux chmod +x ~/wasmtime - uses: Swatinem/rust-cache@v2 @@ -196,9 +196,7 @@ jobs: - name: Run WASI tests for yew run: | RUST_LOG=info - cargo test --features ssr,hydration --target wasm32-wasi -p yew --no-run 2>&1 |\ - grep -o "target/wasm32-wasi/debug/deps/[^ ]*\.wasm" |\ - xargs -I {} ~/wasmtime -W unknown-imports-trap=y {} + cargo test --features ssr,hydration --target wasm32-wasip1 -p yew example-runnable-tests-on-wasi: name: Example Runnable Tests on WASI @@ -217,19 +215,19 @@ jobs: - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.toolchain }} - target: wasm32-wasi + target: wasm32-wasip1 - name: Install wasmtime run: | - wget https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasmtime-v15.0.1-x86_64-linux.tar.xz - tar xf wasmtime-v15.0.1-x86_64-linux.tar.xz - mv wasmtime-v15.0.1-x86_64-linux/wasmtime ~/wasmtime - rm -rf wasmtime-v15.0.1-x86_64-linux.tar.xz wasmtime-v15.0.1-x86_64-linux + wget https://github.com/bytecodealliance/wasmtime/releases/download/v24.0.0/wasmtime-v24.0.0-x86_64-linux.tar.xz + tar xf wasmtime-v24.0.0-x86_64-linux.tar.xz + mv wasmtime-v24.0.0-x86_64-linux/wasmtime ~/wasmtime + rm -rf wasmtime-v24.0.0-x86_64-linux.tar.xz wasmtime-v24.0.0-x86_64-linux chmod +x ~/wasmtime - uses: Swatinem/rust-cache@v2 - name: Build and run ${{ matrix.package }} run: | - cargo build --target wasm32-wasi -p ${{ matrix.package }} - ~/wasmtime -W unknown-imports-trap=y target/wasm32-wasi/debug/${{ matrix.package }}.wasm + cargo build --target wasm32-wasip1 -p ${{ matrix.package }} + ~/wasmtime -W unknown-imports-trap=y target/wasm32-wasip1/debug/${{ matrix.package }}.wasm From 1d266cf4cb4a192fb7da3ef3ffe17890f03dd547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 22 Aug 2024 15:39:53 +0800 Subject: [PATCH 79/88] Remove WASI test for rustc 1.76. --- .github/workflows/main-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index 3f26f66ee94..d1a2b88f4c2 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -172,7 +172,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.76.0 + - 1.78.0 - stable - nightly From 768a91417a5fe893338fe30badb8555f1e9dc05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 22 Aug 2024 15:43:44 +0800 Subject: [PATCH 80/88] Try to let `wasmtime` CLI can be executed. --- .github/workflows/main-checks.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index d1a2b88f4c2..d60ab573fc5 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -172,7 +172,6 @@ jobs: fail-fast: false matrix: toolchain: - - 1.78.0 - stable - nightly @@ -190,6 +189,8 @@ jobs: mv wasmtime-v24.0.0-x86_64-linux/wasmtime ~/wasmtime rm -rf wasmtime-v24.0.0-x86_64-linux.tar.xz wasmtime-v24.0.0-x86_64-linux chmod +x ~/wasmtime + mv ~/wasmtime /usr/local/bin + source ~/.bashrc - uses: Swatinem/rust-cache@v2 @@ -224,6 +225,8 @@ jobs: mv wasmtime-v24.0.0-x86_64-linux/wasmtime ~/wasmtime rm -rf wasmtime-v24.0.0-x86_64-linux.tar.xz wasmtime-v24.0.0-x86_64-linux chmod +x ~/wasmtime + mv ~/wasmtime /usr/local/bin + source ~/.bashrc - uses: Swatinem/rust-cache@v2 From 9fdae79d4a772218f9c91d07081793f557fb9824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 22 Aug 2024 15:47:03 +0800 Subject: [PATCH 81/88] Limit the function `decode_base64` that it shouldn't runnable in non-browser environment. --- .../hooks/use_prepared_state/feat_hydration.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs b/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs index b488916a774..77d3650e4e3 100644 --- a/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs +++ b/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration.rs @@ -12,7 +12,11 @@ use crate::functional::{use_state, Hook, HookContext}; use crate::platform::spawn_local; use crate::suspense::{Suspension, SuspensionResult}; -#[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))] +#[cfg(all( + target_arch = "wasm32", + not(target_os = "wasi"), + not(feature = "not_browser_env") +))] async fn decode_base64(s: &str) -> Result, JsValue> { use gloo::utils::window; use js_sys::Uint8Array; @@ -34,7 +38,11 @@ async fn decode_base64(s: &str) -> Result, JsValue> { Ok(content_array.to_vec()) } -#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))] +#[cfg(any( + not(target_arch = "wasm32"), + target_os = "wasi", + feature = "not_browser_env" +))] async fn decode_base64(_s: &str) -> Result, JsValue> { unreachable!("this function is not callable under non-wasm targets!"); } From d489d907123832f4a5ff926a39139a9202d9edc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 22 Aug 2024 15:48:16 +0800 Subject: [PATCH 82/88] Remove WASI example test for rustc 1.76. --- .github/workflows/main-checks.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index d60ab573fc5..97504e846d5 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -208,7 +208,6 @@ jobs: package: - wasi_ssr_module toolchain: - - 1.76.0 - stable - nightly steps: From cfc86bbd6e3306796ede9f18256d587235bed780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 22 Aug 2024 15:49:02 +0800 Subject: [PATCH 83/88] Revert changes. --- Cargo.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b3015e5882b..7bf8f5c8c4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,9 @@ [workspace] -members = ["packages/*", "tools/*", "examples/*"] +members = [ + "packages/*", + "tools/*", + "examples/*" +] default-members = ["packages/*"] resolver = "2" From 4725390a09285fdbae8e58601309dd83d5875b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Thu, 22 Aug 2024 15:51:55 +0800 Subject: [PATCH 84/88] Fix CI --- .github/workflows/main-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index 97504e846d5..3968dae792d 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -232,4 +232,4 @@ jobs: - name: Build and run ${{ matrix.package }} run: | cargo build --target wasm32-wasip1 -p ${{ matrix.package }} - ~/wasmtime -W unknown-imports-trap=y target/wasm32-wasip1/debug/${{ matrix.package }}.wasm + wasmtime -W unknown-imports-trap=y target/wasm32-wasip1/debug/${{ matrix.package }}.wasm From ed4f96f2fd6446d5dcf245213076c8cf43e2ef3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 26 Aug 2024 01:54:40 +0800 Subject: [PATCH 85/88] Fix Cargo.lock --- Cargo.lock | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e52a218c2b4..23e04f679e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2767,15 +2767,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "schannel" version = "0.1.23" @@ -3650,16 +3641,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.1" @@ -4272,3 +4253,7 @@ dependencies = [ "wasm-bindgen", "web-sys", ] + +[[patch.unused]] +name = "tairitsu-database" +version = "0.1.0" From 4a3b79fb7f2d9af72b41c5553920c0ae3e0040f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Mon, 26 Aug 2024 10:50:53 +0800 Subject: [PATCH 86/88] Remove unused deps --- Cargo.lock | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 23e04f679e7..f77a6c1d5b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4253,7 +4253,3 @@ dependencies = [ "wasm-bindgen", "web-sys", ] - -[[patch.unused]] -name = "tairitsu-database" -version = "0.1.0" From 1290325b7179c808b69646a808007288694b2d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sun, 13 Oct 2024 00:41:29 +0800 Subject: [PATCH 87/88] Undo the formatting changes. --- .github/workflows/main-checks.yml | 10 +++++----- examples/boids/Cargo.toml | 4 +++- examples/function_memory_game/Cargo.toml | 4 +++- examples/function_todomvc/Cargo.toml | 4 +++- examples/game_of_life/Cargo.toml | 2 +- examples/mount_point/Cargo.toml | 2 +- examples/todomvc/Cargo.toml | 4 +++- packages/yew-router-macro/Cargo.toml | 2 +- packages/yew-router/Cargo.toml | 16 ++++++++++------ 9 files changed, 30 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml index 2909bc9ea90..608b0a9c3ab 100644 --- a/.github/workflows/main-checks.yml +++ b/.github/workflows/main-checks.yml @@ -3,11 +3,11 @@ name: Main Checks on: pull_request: paths: - - '.github/workflows/main-checks.yml' - - 'ci/**' - - 'packages/**/*' - - 'Cargo.toml' - - 'Cargo.lock' + - ".github/workflows/main-checks.yml" + - "ci/**" + - "packages/**/*" + - "Cargo.toml" + - "Cargo.lock" push: branches: [master] diff --git a/examples/boids/Cargo.toml b/examples/boids/Cargo.toml index e0b030605f9..55e2cf676ad 100644 --- a/examples/boids/Cargo.toml +++ b/examples/boids/Cargo.toml @@ -16,4 +16,6 @@ gloo = "0.11" [dependencies.web-sys] version = "0.3" -features = ["HtmlInputElement"] +features = [ + "HtmlInputElement", +] diff --git a/examples/function_memory_game/Cargo.toml b/examples/function_memory_game/Cargo.toml index 24b7a9324a0..08c8809af27 100644 --- a/examples/function_memory_game/Cargo.toml +++ b/examples/function_memory_game/Cargo.toml @@ -17,4 +17,6 @@ yew = { path = "../../packages/yew", features = ["csr"] } [dependencies.web-sys] version = "0.3" -features = ["HtmlInputElement"] +features = [ + "HtmlInputElement", +] diff --git a/examples/function_todomvc/Cargo.toml b/examples/function_todomvc/Cargo.toml index 6e6bdb02cc4..f089fafb19d 100644 --- a/examples/function_todomvc/Cargo.toml +++ b/examples/function_todomvc/Cargo.toml @@ -14,4 +14,6 @@ yew = { path = "../../packages/yew", features = ["csr"] } [dependencies.web-sys] version = "0.3" -features = ["HtmlInputElement"] +features = [ + "HtmlInputElement", +] diff --git a/examples/game_of_life/Cargo.toml b/examples/game_of_life/Cargo.toml index 5ae8f325174..ed153a0f96a 100644 --- a/examples/game_of_life/Cargo.toml +++ b/examples/game_of_life/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.4" authors = [ "Diego Cardoso ", "Ilya Bogdanov ", + "Junjie Huang " ] edition = "2021" license = "MIT OR Apache-2.0" diff --git a/examples/mount_point/Cargo.toml b/examples/mount_point/Cargo.toml index 5dc77f2e183..225c10cbe36 100644 --- a/examples/mount_point/Cargo.toml +++ b/examples/mount_point/Cargo.toml @@ -19,5 +19,5 @@ features = [ "Element", "HtmlCanvasElement", "Node", - "Window", + "Window" ] diff --git a/examples/todomvc/Cargo.toml b/examples/todomvc/Cargo.toml index e8ded16f036..261d90b24fb 100644 --- a/examples/todomvc/Cargo.toml +++ b/examples/todomvc/Cargo.toml @@ -15,4 +15,6 @@ gloo = "0.11" [dependencies.web-sys] version = "0.3" -features = ["HtmlInputElement"] +features = [ + "HtmlInputElement", +] diff --git a/packages/yew-router-macro/Cargo.toml b/packages/yew-router-macro/Cargo.toml index 0c30ff6928b..550b84f58cb 100644 --- a/packages/yew-router-macro/Cargo.toml +++ b/packages/yew-router-macro/Cargo.toml @@ -14,7 +14,7 @@ proc-macro = true [dependencies] proc-macro2 = "1" quote = "1" -syn = { version = "2", features = ["full", "extra-traits"] } +syn = { version = "2", features = ["full","extra-traits"] } [dev-dependencies] rustversion = "1" diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index 5445b3a0a23..e8133874e0d 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -12,7 +12,7 @@ repository = "https://github.com/yewstack/yew" rust-version = "1.76.0" [dependencies] -yew = { version = "0.21.0", path = "../yew", default-features = false } +yew = { version = "0.21.0", path = "../yew", default-features= false } yew-router-macro = { version = "0.18.0", path = "../yew-router-macro" } wasm-bindgen = "0.2" @@ -26,16 +26,20 @@ urlencoding = "2.1.3" [dependencies.web-sys] version = "0.3" -features = ["Document", "HtmlBaseElement", "Window"] +features = [ + "Document", + "HtmlBaseElement", + "Window" +] [dev-dependencies] -wasm-bindgen-test = "0.3.43" +wasm-bindgen-test = "0.3" serde = { version = "1", features = ["derive"] } yew = { version = "0.21.0", path = "../yew", features = ["csr"] } [dev-dependencies.web-sys] version = "0.3" -features = ["HtmlHeadElement"] +features = [ + "HtmlHeadElement" +] -[features] -default = [] From cc486a4dba2e3359b683332034097eeb1eeebcd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sun, 13 Oct 2024 00:55:32 +0800 Subject: [PATCH 88/88] Undo the formatting changes. --- Cargo.toml | 6 ++++-- packages/yew-router/Cargo.toml | 5 ++--- packages/yew/Cargo.toml | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 92461e9e4e6..1c5626cc75d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,9 +2,11 @@ members = [ "packages/*", "tools/*", - "examples/*" + "examples/*", +] +default-members = [ + "packages/*", ] -default-members = ["packages/*"] resolver = "2" [profile.release] diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index e8133874e0d..056e5633a27 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -29,7 +29,7 @@ version = "0.3" features = [ "Document", "HtmlBaseElement", - "Window" + "Window", ] [dev-dependencies] @@ -40,6 +40,5 @@ yew = { version = "0.21.0", path = "../yew", features = ["csr"] } [dev-dependencies.web-sys] version = "0.3" features = [ - "HtmlHeadElement" + "HtmlHeadElement", ] - diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index 61c76638edb..582dfea5d49 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -85,7 +85,7 @@ tokio = { version = "1.40", features = ["full"] } tokio = { version = "1.40", features = ["macros", "rt", "time"] } [dev-dependencies] -wasm-bindgen-test = "0.3.43" +wasm-bindgen-test = "0.3" gloo = { version = "0.11", features = ["futures"] } wasm-bindgen-futures = "0.4" trybuild = "1" @@ -107,3 +107,4 @@ rustdoc-args = ["--cfg", "documenting"] [lints.rust] unexpected_cfgs = { level = "allow", check-cfg = ['cfg(nightly_yew)'] } +