Update gloo dependencies in yew and examples (yewstack#2021)

Updates to using the latest stable gloo, in some cases removing
dependencies on `master` branch.

Removes `weblog` in favour of `gloo_console`, where applicable.

Author: mc1098

examples/boids/Cargo.toml

@@ -12,4 +12,4 @@ getrandom = { version = "0.2", features = ["js"] }
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 yew = { path = "../../packages/yew" }
-gloo = { git = "https://github.com/rustwasm/gloo/" }
+gloo = "0.3"

examples/counter/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
+gloo-console = "0.1"
 js-sys = "0.3"
 yew = { path = "../../packages/yew" }
-weblog = "0.3"
 wasm-bindgen = "0.2"

examples/counter/src/main.rs

@@ -1,5 +1,5 @@
+use gloo_console as console;
 use js_sys::Date;
-use weblog::console_log;
 use yew::{html, Component, Context, Html};
 
 // Define the possible messages which can be sent to the component
@@ -24,12 +24,12 @@ impl Component for Model {
         match msg {
             Msg::Increment => {
                 self.value += 1;
-                console_log!("plus one"); // Will output a string to the browser console
+                console::log!("plus one"); // Will output a string to the browser console
                 true // Return true to cause the displayed change to update
             }
             Msg::Decrement => {
                 self.value -= 1;
-                console_log!("minus one");
+                console::log!("minus one");
                 true
             }
         }

examples/crm/Cargo.toml

@@ -9,5 +9,5 @@ license = "MIT OR Apache-2.0"
 serde = "1"
 serde_derive = "1"
 yew = { path = "../../packages/yew" }
-gloo = { git = "https://github.com/rustwasm/gloo/" }
+gloo = "0.3"
 

examples/dyn_create_destroy_apps/Cargo.toml

@@ -9,9 +9,8 @@ license = "MIT OR Apache-2.0"
 js-sys = "0.3"
 yew = { path = "../../packages/yew" }
 slab = "0.4.3"
-gloo = "0.2"
+gloo = "0.3"
 wasm-bindgen = "0.2"
-weblog = "0.3"
 
 [dependencies.web-sys]
 version = "0.3.50"

examples/dyn_create_destroy_apps/src/counter.rs

@@ -1,4 +1,4 @@
-use gloo::timers::callback::Interval;
+use gloo::{console, timers::callback::Interval};
 use yew::prelude::*;
 
 pub struct CounterModel {
@@ -61,6 +61,6 @@ impl Component for CounterModel {
     }
 
     fn destroy(&mut self, _ctx: &Context<Self>) {
-        weblog::console_log!("CounterModel app destroyed");
+        console::log!("CounterModel app destroyed");
     }
 }

examples/file_upload/Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 js-sys = "0.3"
 yew = { path = "../../packages/yew" }
-gloo = "0.2"
+gloo-file = "0.1"
 
 [dependencies.web-sys]
 version = "0.3"

examples/file_upload/src/main.rs

@@ -1,8 +1,8 @@
 use web_sys::{Event, HtmlInputElement};
 use yew::{html, html::TargetCast, Component, Context, Html};
 
-use gloo::file::callbacks::FileReader;
-use gloo::file::File;
+use gloo_file::callbacks::FileReader;
+use gloo_file::File;
 
 type Chunks = bool;
 
@@ -50,14 +50,14 @@ impl Component for Model {
                         let link = ctx.link().clone();
 
                         if bytes {
-                            gloo::file::callbacks::read_as_bytes(&file, move |res| {
+                            gloo_file::callbacks::read_as_bytes(&file, move |res| {
                                 link.send_message(Msg::LoadedBytes(
                                     file_name,
                                     res.expect("failed to read file"),
                                 ))
                             })
                         } else {
-                            gloo::file::callbacks::read_as_text(&file, move |res| {
+                            gloo_file::callbacks::read_as_text(&file, move |res| {
                                 link.send_message(Msg::Loaded(
                                     file_name,
                                     res.unwrap_or_else(|e| e.to_string()),

examples/game_of_life/Cargo.toml

@@ -15,4 +15,4 @@ log = "0.4"
 rand = "0.8"
 wasm-logger = "0.2"
 yew = { path = "../../packages/yew" }
-gloo = "0.2"
+gloo-timers = "0.2"

examples/game_of_life/src/main.rs

@@ -1,5 +1,5 @@
 use cell::Cellule;
-use gloo::timers::callback::Interval;
+use gloo_timers::callback::Interval;
 use rand::Rng;
 use yew::html::Scope;
 use yew::{classes, html, Component, Context, Html};

examples/multi_thread/Cargo.toml

@@ -11,4 +11,4 @@ serde = { version = "1.0", features = ["derive"] }
 wasm-logger = "0.2"
 yew = { path = "../../packages/yew" }
 yew-agent = { path = "../../packages/yew-agent" }
-gloo = "0.2"
+gloo-timers = "0.2"

examples/multi_thread/src/context.rs

@@ -1,4 +1,4 @@
-use gloo::timers::callback::Interval;
+use gloo_timers::callback::Interval;
 use serde::{Deserialize, Serialize};
 use yew_agent::{Agent, AgentLink, Context, HandlerId};
 

examples/multi_thread/src/job.rs

@@ -1,4 +1,4 @@
-use gloo::timers::callback::Interval;
+use gloo_timers::callback::Interval;
 use serde::{Deserialize, Serialize};
 use yew_agent::{Agent, AgentLink, HandlerId, Job};
 

examples/multi_thread/src/native_worker.rs

@@ -1,4 +1,4 @@
-use gloo::timers::callback::Interval;
+use gloo_timers::callback::Interval;
 use serde::{Deserialize, Serialize};
 use yew_agent::{Agent, AgentLink, HandlerId, Public};
 

examples/pub_sub/Cargo.toml

@@ -5,8 +5,6 @@ edition = "2018"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
-wasm-logger = "0.2.0"
 yew = { path = "../../packages/yew" }
 yew-agent = { path = "../../packages/yew-agent" }

examples/router/Cargo.toml

@@ -15,4 +15,4 @@ yew = { path = "../../packages/yew" }
 yew-router = { path = "../../packages/yew-router" }
 serde = { version = "1.0", features = ["derive"] }
 lazy_static = "1.4.0"
-gloo = "0.2"
+gloo-timers = "0.2"

examples/router/src/components/progress_delay.rs

@@ -1,4 +1,4 @@
-use gloo::timers::callback::Interval;
+use gloo_timers::callback::Interval;
 use instant::Instant;
 use yew::prelude::*;
 

examples/store/Cargo.toml

@@ -8,5 +8,5 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 yew = { path = "../../packages/yew" }
 yew-agent = { path = "../../packages/yew-agent" }
-weblog = "0.3"
 wasm-bindgen = "0.2"
+gloo-console = "0.1"

examples/store/src/main.rs

@@ -3,9 +3,9 @@ mod post;
 mod text_input;
 
 use agents::posts::{PostId, PostRequest, PostStore};
+use gloo_console as console;
 use post::Post;
 use text_input::TextInput;
-use weblog::console_log;
 use yew::prelude::*;
 use yew_agent::utils::store::{Bridgeable, ReadOnly, StoreWrapper};
 use yew_agent::Bridge;
@@ -41,7 +41,7 @@ impl Component for Model {
             Msg::PostStoreMsg(state) => {
                 // We can see this is logged once before we click any button.
                 // The state of the store is sent when we open a bridge.
-                console_log!("Received update");
+                console::log!("Received update");
 
                 let state = state.borrow();
                 if state.posts.len() != self.post_ids.len() {

examples/timer/Cargo.toml

@@ -8,6 +8,5 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 yew = { path = "../../packages/yew" }
 js-sys = "0.3"
-gloo = "0.2"
-weblog = "0.3"
+gloo = "0.3"
 wasm-bindgen = "0.2"

examples/timer/src/main.rs

@@ -1,6 +1,7 @@
-use gloo::console_timer::ConsoleTimer;
-use gloo::timers::callback::{Interval, Timeout};
-use weblog::*;
+use gloo::{
+    console::{self, Timer},
+    timers::callback::{Interval, Timeout},
+};
 use yew::{html, Component, Context, Html};
 
 pub enum Msg {
@@ -18,7 +19,7 @@ pub struct Model {
     _standalone: (Interval, Interval),
     interval: Option<Interval>,
     timeout: Option<Timeout>,
-    console_timer: Option<ConsoleTimer<'static>>,
+    console_timer: Option<Timer<'static>>,
 }
 
 impl Model {
@@ -39,7 +40,7 @@ impl Component for Model {
 
     fn create(ctx: &Context<Self>) -> Self {
         let standalone_handle =
-            Interval::new(10, || console_debug!("Example of a standalone callback."));
+            Interval::new(10, || console::debug!("Example of a standalone callback."));
 
         let clock_handle = {
             let link = ctx.link().clone();
@@ -67,10 +68,10 @@ impl Component for Model {
                 self.timeout = Some(handle);
 
                 self.messages.clear();
-                console_clear!();
+                console::clear!();
 
                 self.messages.push("Timer started!");
-                self.console_timer = Some(ConsoleTimer::new("Timer"));
+                self.console_timer = Some(Timer::new("Timer"));
                 true
             }
             Msg::StartInterval => {
@@ -81,15 +82,15 @@ impl Component for Model {
                 self.interval = Some(handle);
 
                 self.messages.clear();
-                console_clear!();
+                console::clear!();
 
                 self.messages.push("Interval started!");
                 true
             }
             Msg::Cancel => {
                 self.cancel();
                 self.messages.push("Canceled!");
-                console_warn!("Canceled!");
+                console::warn!("Canceled!");
                 true
             }
             Msg::Done => {
@@ -98,7 +99,7 @@ impl Component for Model {
 
                 // todo weblog
                 // ConsoleService::group();
-                console_info!("Done!");
+                console::info!("Done!");
                 if let Some(timer) = self.console_timer.take() {
                     drop(timer);
                 }

examples/todomvc/Cargo.toml

@@ -11,4 +11,4 @@ strum_macros = "0.21"
 serde = "1"
 serde_derive = "1"
 yew = { path = "../../packages/yew" }
-gloo = { git = "https://github.com/rustwasm/gloo/" }
+gloo = "0.3"

examples/webgl/Cargo.toml

@@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
 js-sys = "0.3"
 wasm-bindgen = "0.2"
 yew = { path = "../../packages/yew" }
-gloo-render = { git = "https://github.com/rustwasm/gloo/" }
+gloo-render = "0.1"
 
 [dependencies.web-sys]
 version = "0.3"

packages/yew-agent/Cargo.toml

@@ -9,8 +9,8 @@ edition = "2018"
 [dependencies]
 anymap = "0.12"
 bincode = { version = "1" }
+gloo-console = "0.1.0"
 js-sys = "0.3"
-log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 slab = "0.4"
 wasm-bindgen = "0.2"

packages/yew-agent/src/pool.rs

@@ -1,5 +1,5 @@
 use super::*;
-use log::warn;
+use gloo_console as console;
 use slab::Slab;
 use yew::scheduler::Shared;
 
@@ -20,14 +20,17 @@ pub(crate) fn locate_callback_and_respond<AGN: Agent>(
         match slab.get(id.raw_id()).cloned() {
             Some(callback) => callback,
             None => {
-                warn!("Id of handler does not exist in the slab: {}.", id.raw_id());
+                console::warn!(format!(
+                    "Id of handler does not exist in the slab: {}.",
+                    id.raw_id()
+                ));
                 return;
             }
         }
     };
     match callback {
         Some(callback) => callback.emit(output),
-        None => warn!("The Id of the handler: {}, while present in the slab, is not associated with a callback.", id.raw_id()),
+        None => console::warn!(format!("The Id of the handler: {}, while present in the slab, is not associated with a callback.", id.raw_id())),
     }
 }
 

packages/yew-router/Cargo.toml

@@ -16,8 +16,7 @@ yew-router-macro = { path = "../yew-router-macro" }
 
 wasm-bindgen = "0.2"
 js-sys = "0.3"
-weblog = "0.3.0"
-gloo = "0.2.1"
+gloo = "0.3.0"
 route-recognizer = "0.3.0"
 serde = "1.0"
 serde_urlencoded = "0.7"

packages/yew-router/src/router.rs

@@ -1,7 +1,7 @@
 //! Router Component.
 
 use crate::Routable;
-use gloo::events::EventListener;
+use gloo::{console, events::EventListener};
 use std::marker::PhantomData;
 use std::rc::Rc;
 use yew::prelude::*;
@@ -103,7 +103,7 @@ where
         match route {
             Some(route) => (ctx.props().render.0)(&route),
             None => {
-                weblog::console_warn!("no route matched");
+                console::warn!("no route matched");
                 html! {}
             }
         }

packages/yew/Cargo.toml

@@ -19,11 +19,10 @@ description = "A framework for making client-side single-page apps"
 anyhow = "1"
 anymap = "0.12"
 console_error_panic_hook = "0.1"
-gloo = "0.2.1"
+gloo = "0.3"
 http = "0.2"
 indexmap = { version = "1.5", features = ["std"] }
 js-sys = "0.3"
-log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 slab = "0.4"

packages/yew/src/virtual_dom/vnode.rs

@@ -2,7 +2,7 @@
 
 use super::{Key, VChild, VComp, VDiff, VList, VTag, VText};
 use crate::html::{AnyScope, Component, NodeRef};
-use log::warn;
+use gloo::console;
 use std::cmp::PartialEq;
 use std::fmt;
 use std::iter::FromIterator;
@@ -91,7 +91,7 @@ impl VDiff for VNode {
             VNode::VList(ref mut vlist) => vlist.detach(parent),
             VNode::VRef(ref node) => {
                 if parent.remove_child(node).is_err() {
-                    warn!("Node not found to remove VRef");
+                    console::warn!("Node not found to remove VRef");
                 }
             }
         }

packages/yew/src/virtual_dom/vtag.rs

@@ -3,7 +3,7 @@
 use super::{Apply, AttrValue, Attributes, Key, Listener, Listeners, VDiff, VList, VNode};
 use crate::html::{AnyScope, IntoPropValue, NodeRef};
 use crate::utils::document;
-use log::warn;
+use gloo::console;
 use std::borrow::Cow;
 use std::cmp::PartialEq;
 use std::hint::unreachable_unchecked;
@@ -474,7 +474,7 @@ impl VDiff for VTag {
             children.detach(&node);
         }
         if parent.remove_child(&node).is_err() {
-            warn!("Node not found to remove VTag");
+            console::warn!("Node not found to remove VTag");
         }
         self.node_ref.set(None);
     }