Merge pull request #2076 from Nisatru/run-web

Get web examples running again

8 files changed, 43 insertions, 3 deletions

diff --git a/examples/counter/Cargo.toml b/examples/counter/Cargo.toml
index 1e9bba6b..22f86064 100644
--- a/examples/counter/Cargo.toml
+++ b/examples/counter/Cargo.toml
@@ -7,3 +7,7 @@ publish = false
 
 [dependencies]
 iced.workspace = true
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+iced.workspace = true
+iced.features = ["webgl"]
diff --git a/examples/counter/README.md b/examples/counter/README.md
index 53243c24..18761bba 100644
--- a/examples/counter/README.md
+++ b/examples/counter/README.md
@@ -13,4 +13,12 @@ You can run it with `cargo run`:
 cargo run --package counter
 ```
 
+The web version can be run with [`trunk`]:
+
+```
+cd examples/counter
+trunk serve
+```
+
 [`main`]: src/main.rs
+[`trunk`]: https://trunkrs.dev/
diff --git a/examples/integration/Cargo.toml b/examples/integration/Cargo.toml
index 032cc75e..a4a961f8 100644
--- a/examples/integration/Cargo.toml
+++ b/examples/integration/Cargo.toml
@@ -10,11 +10,14 @@ iced_winit.workspace = true
 iced_wgpu.workspace = true
 iced_widget.workspace = true
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 tracing-subscriber = "0.3"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
+iced_wgpu.workspace = true
+iced_wgpu.features = ["webgl"]
+
 console_error_panic_hook = "0.1"
 console_log = "1.0"
-log.workspace = true
 wasm-bindgen = "0.2"
 web-sys = { version = "0.3", features = ["Element", "HtmlCanvasElement", "Window", "Document"] }
diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index af48af5f..d0b2d891 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -29,7 +29,7 @@ use winit::platform::web::WindowBuilderExtWebSys;
 pub fn main() -> Result<(), Box<dyn std::error::Error>> {
     #[cfg(target_arch = "wasm32")]
     let canvas_element = {
-        console_log::init_with_level(log::Level::Debug)?;
+        console_log::init().expect("Initialize logger");
 
         std::panic::set_hook(Box::new(console_error_panic_hook::hook));
 
diff --git a/examples/todos/Cargo.toml b/examples/todos/Cargo.toml
index fea20375..3334d84f 100644
--- a/examples/todos/Cargo.toml
+++ b/examples/todos/Cargo.toml
@@ -18,6 +18,9 @@ async-std.workspace = true
 directories-next = "2.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
+iced.workspace = true
+iced.features = ["debug", "webgl"]
+
 web-sys = { workspace = true, features = ["Window", "Storage"] }
 wasm-timer.workspace = true
 
diff --git a/examples/todos/README.md b/examples/todos/README.md
index 852dd88d..5e42f166 100644
--- a/examples/todos/README.md
+++ b/examples/todos/README.md
@@ -14,7 +14,14 @@ You can run the native version with `cargo run`:
 ```
 cargo run --package todos
 ```
-We have not yet implemented a `LocalStorage` version of the auto-save feature. Therefore, it does not work on web _yet_!
+
+The web version can be run with [`trunk`]:
+
+```
+cd examples/todos
+trunk serve
+```
 
 [`main`]: src/main.rs
 [TodoMVC]: http://todomvc.com/
+[`trunk`]: https://trunkrs.dev/
diff --git a/examples/tour/Cargo.toml b/examples/tour/Cargo.toml
index 21206ecb..9e984ad1 100644
--- a/examples/tour/Cargo.toml
+++ b/examples/tour/Cargo.toml
@@ -9,4 +9,12 @@ publish = false
 iced.workspace = true
 iced.features = ["image", "debug"]
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 tracing-subscriber = "0.3"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+iced.workspace = true
+iced.features = ["image", "debug", "webgl"]
+
+console_error_panic_hook = "0.1"
+console_log = "1.0"
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index af508206..3387b481 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -8,6 +8,13 @@ use iced::widget::{Button, Column, Container, Slider};
 use iced::{Color, Element, Font, Length, Renderer, Sandbox, Settings};
 
 pub fn main() -> iced::Result {
+    #[cfg(target_arch = "wasm32")]
+    {
+        console_log::init().expect("Initialize logger");
+        std::panic::set_hook(Box::new(console_error_panic_hook::hook));
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
     tracing_subscriber::fmt::init();
 
     Tour::run(Settings::default())