Fix issues after cherry-picking

yewstack · Jun 5, 2021 · 15c59f0 · 15c59f0
1 parent 6978e23
commit 15c59f0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/examples/router/src/pages/post.rs b/examples/router/src/pages/post.rs
@@ -1,5 +1,6 @@
 use crate::{content, generator::Generated, Route};
 use content::PostPart;
+use std::borrow::Cow;
 use yew::prelude::*;
 use yew_router::prelude::*;
 
@@ -46,7 +47,7 @@ impl Component for Post {
         html! {
             <>
                 <section class="hero is-medium is-light has-background">
-                    <img class="hero-background is-transparent" src=post.meta.image_url />
+                    <img class="hero-background is-transparent" src=Cow::Owned(post.meta.image_url.clone()) />
                     <div class="hero-body">
                         <div class="container">
                             <h1 class="title">
@@ -77,7 +78,7 @@ impl Post {
             <article class="media block box my-6">
                 <figure class="media-left">
                     <p class="image is-64x64">
-                        <img src=quote.author.image_url loading="lazy" />
+                        <img src=Cow::Owned(quote.author.image_url.clone()) loading="lazy" />
                     </p>
                 </figure>
                 <div class="media-content">
@@ -97,7 +98,7 @@ impl Post {
     fn render_section_hero(&self, section: &content::Section) -> Html {
         html! {
             <section class="hero is-dark has-background mt-6 mb-3">
-                <img class="hero-background is-transparent" src=section.image_url loading="lazy" />
+                <img class="hero-background is-transparent" src=Cow::Owned(section.image_url.clone()) loading="lazy" />
                 <div class="hero-body">
                     <div class="container">
                         <h2 class="subtitle">{ &section.title }</h2>

diff --git a/packages/yew-router-macro/Cargo.toml b/packages/yew-router-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yew-router-macro"
-version = "0.14.0"
+version = "0.15.0"
 authors = ["Hamza <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yew-router"
-version = "0.14.0"
+version = "0.15.0"
 authors = ["Hamza <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/packages/yew-router/tests/router.rs b/packages/yew-router/tests/router.rs
@@ -61,7 +61,7 @@ fn component() -> Html {
                     <a onclick=onclick>{"click me"}</a>
                 </>
             },
-            Routes::No { id } => html! { <No id=id /> },
+            Routes::No { id } => html! { <No id=*id /> },
             Routes::NotFound => html! { <div id="result">{"404"}</div> },
         }
     });

diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml
@@ -30,17 +30,14 @@ slab = "0.4"
 thiserror = "1"
 wasm-bindgen = "0.2.74"
 wasm-bindgen-futures = "0.4"
-yew-macro = { version = "0.17.0", path = "../yew-macro" }
+yew-macro = { version = "^0.18.0", path = "../yew-macro" }
 
 # optional encodings
 bincode = { version = "1", optional = true }
 rmp-serde = { version = "0.15.0", optional = true }
 serde_cbor = { version = "0.11.1", optional = true }
 serde_yaml = { version = "0.8.4", optional = true }
 toml = { version = "0.5", optional = true }
-wasm-bindgen = { version = "0.2.60", optional = true }
-wasm-bindgen-futures = { version = "0.4", optional = true }
-yew-macro = { version = "^0.18.0", path = "../yew-macro" }
 
 [dependencies.web-sys]
 version = "0.3"