Skip to content

Commit 76b8994

Browse files
authored
Switch SSR examples from wasm-logger to tracing-web (#4054)
1 parent 195730d commit 76b8994

6 files changed

Lines changed: 91 additions & 10 deletions

File tree

Cargo.lock

Lines changed: 67 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ serde_json = "1"
4848
futures = { version = "0.3", default-features = false }
4949
log = "0.4"
5050
wasm-logger = "0.2"
51+
tracing-web = "0.1"
52+
tracing-subscriber = { version = "0.3", features = ["fmt"] }
5153
rand = "0.9"
5254
getrandom = { version = "0.3", features = ["wasm_js"] }
5355
instant = { version = "0.1", features = ["wasm-bindgen"] }

examples/simple_ssr/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ futures.workspace = true
2121

2222
[target.'cfg(target_arch = "wasm32")'.dependencies]
2323
wasm-bindgen-futures.workspace = true
24-
wasm-logger.workspace = true
25-
log.workspace = true
24+
tracing-web.workspace = true
25+
tracing-subscriber.workspace = true
2626

2727
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
2828
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "fs"] }

examples/simple_ssr/src/bin/simple_ssr_hydrate.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ use simple_ssr::App;
22

33
fn main() {
44
#[cfg(target_arch = "wasm32")]
5-
wasm_logger::init(wasm_logger::Config::new(log::Level::Trace));
5+
{
6+
let fmt_layer = tracing_subscriber::fmt::layer()
7+
.with_ansi(false) // Only partially supported across browsers
8+
.without_time() // std::time is not available in browsers
9+
.with_writer(tracing_web::MakeWebConsoleWriter::new())
10+
.with_filter(tracing_subscriber::filter::LevelFilter::TRACE);
11+
use tracing_subscriber::prelude::*;
12+
tracing_subscriber::registry().with(fmt_layer).init();
13+
}
614
yew::Renderer::<App>::new().hydrate();
715
}

examples/ssr_router/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ required-features = ["ssr"]
1616
[dependencies]
1717
yew = { path = "../../packages/yew" }
1818
function_router = { path = "../function_router" }
19-
log = "0.4"
2019
futures = { workspace = true, features = ["std"] }
2120
hyper-util = "0.1.20"
2221

2322
[target.'cfg(target_arch = "wasm32")'.dependencies]
2423
wasm-bindgen-futures.workspace = true
25-
wasm-logger.workspace = true
24+
tracing-web.workspace = true
25+
tracing-subscriber.workspace = true
2626

2727
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
2828
yew-router = { path = "../../packages/yew-router" }

examples/ssr_router/src/bin/ssr_router_hydrate.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ use function_router::App;
22

33
fn main() {
44
#[cfg(target_arch = "wasm32")]
5-
wasm_logger::init(wasm_logger::Config::new(log::Level::Trace));
5+
{
6+
let fmt_layer = tracing_subscriber::fmt::layer()
7+
.with_ansi(false) // Only partially supported across browsers
8+
.without_time() // std::time is not available in browsers
9+
.with_writer(tracing_web::MakeWebConsoleWriter::new())
10+
.with_filter(tracing_subscriber::filter::LevelFilter::TRACE);
11+
use tracing_subscriber::prelude::*;
12+
tracing_subscriber::registry().with(fmt_layer).init();
13+
}
614
yew::Renderer::<App>::new().hydrate();
715
}

0 commit comments

Comments
 (0)