Fix examples

.github/workflows/publish-examples.yml

@@ -3,7 +3,7 @@ on:
   push:
     branches: [master]
     paths:
-      - 'ci/**'
+      - 'tools/build-examples/**'
       - 'examples/**'
 
 jobs:
@@ -33,7 +33,7 @@ jobs:
           version: 'latest'
 
       - name: Build examples
-        run: ./ci/build-examples.sh
+        run: cargo run -p build-examples -b build-examples
 
       - name: Deploy to Firebase
         uses: siku2/action-hosting-deploy@v1

examples/async_clock/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/boids/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/communication_child_to_parent/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/communication_grandchild_with_grandparent/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/communication_grandparent_to_grandchild/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/communication_parent_to_child/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/contexts/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/counter/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/counter_functional/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/dyn_create_destroy_apps/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/file_upload/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/function_memory_game/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/function_router/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/function_todomvc/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/futures/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/game_of_life/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/immutable/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/inner_html/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/js_callback/Trunk.toml

@@ -1,3 +1,6 @@
+[tools]
+wasm_opt = "version_122"
+
 [[hooks]]
 stage = "pre_build"
 command = "rustc"

examples/keyed_list/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/mount_point/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/nested_list/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/node_refs/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/password_strength/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/portals/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/router/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/suspense/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/timer/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/timer_functional/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/todomvc/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/two_apps/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/web_worker_fib/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/web_worker_prime/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

examples/webgl/Trunk.toml

@@ -0,0 +1,2 @@
+[tools]
+wasm_opt = "version_122"

packages/yew/src/lib.rs

@@ -2,7 +2,7 @@
 #![doc(html_logo_url = "https://yew.rs/img/logo.png")]
 #![cfg_attr(documenting, feature(doc_cfg))]
 #![cfg_attr(documenting, feature(doc_auto_cfg))]
-#![cfg_attr(nightly_yew, feature(fn_traits, async_closure, unboxed_closures))]
+#![cfg_attr(nightly_yew, feature(fn_traits, unboxed_closures))]
 
 //! # Yew Framework - API Documentation
 //!

tools/build-examples/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "build-examples"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[dependencies]
+reqwest = { version = "0.12.12", features = ["blocking"] }
+regex = "1.11.1"
+

tools/build-examples/src/bin/update-wasm-opt.rs

@@ -0,0 +1,123 @@
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::process::ExitCode;
+
+use build_examples::{get_latest_wasm_opt_version, is_wasm_opt_outdated, NO_TRUNK_EXAMPLES};
+use regex::Regex;
+
+fn main() -> ExitCode {
+    // Must be run from root of the repo
+    let examples_dir = Path::new("examples");
+    if !examples_dir.exists() {
+        eprintln!(
+            "examples directory not found. Make sure you're running from the root of the repo."
+        );
+        return ExitCode::from(1);
+    }
+
+    let latest_wasm_opt = get_latest_wasm_opt_version();
+    let mut outdated_example_paths = Vec::new();
+    let mut outdated_examples = Vec::new();
+
+    // Get all entries in the examples directory
+    let entries = fs::read_dir(examples_dir).expect("Failed to read examples directory");
+
+    for entry in entries {
+        let entry = entry.expect("Failed to read directory entry");
+        let path = entry.path();
+
+        // Skip if not a directory
+        if !path.is_dir() {
+            continue;
+        }
+
+        let example = path
+            .file_name()
+            .expect("Failed to get directory name")
+            .to_string_lossy()
+            .to_string();
+
+        // Skip ssr examples as they don't need trunk
+        if NO_TRUNK_EXAMPLES.contains(&example.as_str()) {
+            continue;
+        }
+
+        // Check Trunk.toml for wasm_opt version and collect outdated examples
+        if is_wasm_opt_outdated(&path, &latest_wasm_opt) {
+            outdated_examples.push(example);
+            outdated_example_paths.push(path);
+        }
+    }
+
+    if outdated_examples.is_empty() {
+        println!(
+            "All examples are up-to-date with the latest wasm_opt version: {}",
+            latest_wasm_opt
+        );
+        return ExitCode::from(0);
+    }
+
+    println!(
+        "Found {} examples with outdated or missing wasm_opt configuration:",
+        outdated_examples.len()
+    );
+    for example in &outdated_examples {
+        println!("  - {}", example);
+    }
+    println!("Latest wasm_opt version is: {}", latest_wasm_opt);
+    println!("Updating all examples...");
+
+    let updated_count = update_all_examples(&outdated_example_paths, &latest_wasm_opt);
+    println!(
+        "Updated {} example configurations to use {}",
+        updated_count, latest_wasm_opt
+    );
+
+    ExitCode::from(0)
+}
+
+pub fn update_all_examples(outdated_paths: &[PathBuf], latest_version: &str) -> usize {
+    let mut updated_count = 0;
+
+    let re = Regex::new(r#"(?m)^\[tools\]\s*\nwasm_opt\s*=\s*"(version_\d+)""#).unwrap();
+    for path in outdated_paths {
+        let trunk_toml_path = path.join("Trunk.toml");
+
+        let content = fs::read_to_string(&trunk_toml_path).unwrap_or_default();
+
+        let updated_content = if re.is_match(&content) {
+            // Replace existing wasm_opt version
+            re.replace(&content, |_: &regex::Captures| {
+                format!(
+                    r#"[tools]
+wasm_opt = "{}""#,
+                    latest_version
+                )
+            })
+            .to_string()
+        } else {
+            // Add wasm_opt configuration
+            if content.is_empty() {
+                format!(
+                    r#"[tools]
+wasm_opt = "{}""#,
+                    latest_version
+                )
+            } else {
+                format!(
+                    "{}\n\n[tools]\nwasm_opt = \"{}\"",
+                    content.trim(),
+                    latest_version
+                )
+            }
+        };
+
+        if let Err(e) = fs::write(&trunk_toml_path, updated_content) {
+            println!("Failed to update {}: {}", trunk_toml_path.display(), e);
+        } else {
+            updated_count += 1;
+        }
+    }
+
+    updated_count
+}

tools/build-examples/src/lib.rs

@@ -0,0 +1,44 @@
+use std::fs;
+use std::path::Path;
+
+use regex::Regex;
+
+/// Examples that don't use Trunk for building
+pub const NO_TRUNK_EXAMPLES: [&str; 3] = ["simple_ssr", "ssr_router", "wasi_ssr_module"];
+
+pub fn get_latest_wasm_opt_version() -> String {
+    let url = "https://github.com/WebAssembly/binaryen/releases";
+    let client = reqwest::blocking::Client::new();
+    let res = client.get(url).send().unwrap();
+    let body = res.text().unwrap();
+    let re = Regex::new(r#"version_(\d+)"#).unwrap();
+    let captures = re.captures_iter(&body);
+    let mut versions: Vec<u32> = captures
+        .map(|c| c.get(1).unwrap().as_str().parse().unwrap())
+        .collect();
+    versions.sort();
+    format!("version_{}", versions.last().unwrap())
+}
+
+pub fn is_wasm_opt_outdated(path: &Path, latest_version: &str) -> bool {
+    let trunk_toml_path = path.join("Trunk.toml");
+
+    if !trunk_toml_path.exists() {
+        return true;
+    }
+
+    let content = match fs::read_to_string(&trunk_toml_path) {
+        Ok(content) => content,
+        Err(_) => return true,
+    };
+
+    // Check if wasm_opt is configured and up-to-date
+    let re = Regex::new(r#"(?m)^\[tools\]\s*\nwasm_opt\s*=\s*"(version_\d+)""#).unwrap();
+    match re.captures(&content) {
+        Some(captures) => {
+            let current_version = captures.get(1).unwrap().as_str();
+            current_version != latest_version
+        }
+        None => true,
+    }
+}