Merge pull request 'WASM: compile for wasm32, and fix trunk's binary selection on aarch64' (#17) from fix/clippy-lints-wasm into main

Reviewed-on: #17

.cargo/config.toml

@@ -0,0 +1,29 @@
+# getrandom 0.3 refuses to build for wasm32-unknown-unknown unless it is told
+# which backend to use. The target has no OS entropy source, so the crate will
+# not guess: it wants the `wasm_js` backend named explicitly, AND the matching
+# feature enabled on the crate itself. Its own error is unusually clear that one
+# without the other is not enough:
+#
+#   error: The wasm32-unknown-unknown targets are not supported by default; you
+#   may need to enable the "wasm_js" configuration flag. Note that enabling the
+#   `wasm_js` feature flag alone is insufficient.
+#
+# This is the cfg half. The feature half is a wasm32-only dependency in
+# crates/sylpheed-viewer/Cargo.toml — that is the only crate reaching getrandom
+# here, transitively through `ahash`.
+#
+# Scoped to the wasm target, so native builds are untouched. Note that a
+# RUSTFLAGS environment variable, if one is ever set, replaces this rather than
+# adding to it.
+#
+# The second cfg is bevy_egui's. Its web clipboard support calls web-sys APIs
+# that are still gated behind an unstable flag, and it refuses to build without
+# it rather than silently dropping the feature:
+#
+#   error: bevy_egui uses unstable APIs to support clipboard on web.
+#
+[target.wasm32-unknown-unknown]
+rustflags = [
+    '--cfg', 'getrandom_backend="wasm_js"',
+    '--cfg', 'web_sys_unstable_apis',
+]

.github/workflows/ci.yml

@@ -111,7 +111,16 @@ jobs:
         uses: Swatinem/rust-cache@v2
 
       - name: Install Trunk
-        uses: jetli/trunk-action@v0.5.0
+        # v0.5.0 selects the download by PLATFORM ONLY and never consults the
+        # architecture -- `case 'linux': arch = 'x86_64-unknown-linux-gnu'` --
+        # so on this aarch64 runner it fetches an x86_64 binary. v0.5.1 adds
+        # `process.arch` with 'x64' -> 'x86_64', 'arm64' -> 'aarch64' and
+        # core.setFailed otherwise, so a wrong arch now fails loudly instead of
+        # silently. It also moves the download host thedodd/trunk ->
+        # trunk-rs/trunk (trunk moved repositories; v0.5.0 still points at the
+        # old one), and swaps io.mv for io.cp, which is what avoids EXDEV on a
+        # self-hosted runner whose /tmp is a separate filesystem -- ours.
+        uses: jetli/trunk-action@v0.5.1
 
       - name: Check WASM compile
         run: >
@@ -123,11 +132,17 @@ jobs:
       - name: Build WASM release with Trunk
         run: trunk build --release
 
-      - name: Upload WASM dist artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: web-dist
-          path: dist/
+      # No artifact upload. actions/upload-artifact@v4 hard-refuses on Gitea --
+      # Gitea presents as GHES and @actions/artifact v2+ aborts there
+      # (go-gitea/gitea#31256, #36024). Nothing consumes `web-dist`: it had
+      # exactly one reference in this repository, the line that produced it,
+      # and there is no download-artifact and no second workflow. The job's
+      # purpose -- proving the web build compiles -- is met by the step above.
+      # Add it back when something consumes the bundle, and decide then between
+      # actions/upload-artifact@v3 (the GHES guidance names v3.2.2 / the
+      # -node20 tag, so check the runner's node first) and the Gitea-specific
+      # christopherHX/gitea-upload-artifact@v4, which is a third-party
+      # dependency and therefore a decision, not a swap.
 
   # ── Format check ─────────────────────────────────────────────────────────────
   fmt:

Cargo.lock

@@ -2497,9 +2497,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi",
  "wasip2",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -4675,6 +4677,7 @@ dependencies = [
  "bevy",
  "bevy_egui",
  "futures",
+ "getrandom 0.3.4",
  "image",
  "rfd",
  "rodio",

crates/sylpheed-formats/Cargo.toml

@@ -11,7 +11,12 @@ xdvdfs    = { workspace = true }
 binrw     = { workspace = true }
 flate2    = "1"                     # zlib/DEFLATE for IPFB "Z1" entries (miniz_oxide backend, WASM-safe)
 ttf-parser = { version = "0.24", default-features = false, features = ["std", "opentype-layout"] } # font metadata (OTF/TTF/ttcf), WASM-safe
-tokio     = { workspace = true }
+# tokio is a DEV dependency only (see [dev-dependencies] below). Every use in
+# this crate is inside a `mod tests`: three runtime builders in ship.rs and one
+# `#[tokio::test]` in xiso.rs. As a normal dependency it pulled `tokio/full`,
+# whose `net` feature drags in `mio`, which does not build for wasm32 —
+#   error: This wasm target is unsupported by mio.
+# so the unused dependency was breaking the WASM job.
 futures   = { workspace = true }
 thiserror = { workspace = true }
 anyhow    = { workspace = true }

crates/sylpheed-viewer/Cargo.toml

@@ -56,3 +56,10 @@ rodio              = { workspace = true }
 image              = { version = "0.25", default-features = false, features = ["png"] }
 # Off-thread rasterization of embedded-font samples (avoids egui's global fonts).
 ab_glyph           = "0.2"
+
+# Reached only through `ahash`, which needs an entropy source for its random
+# state. Declared here purely to turn on the `wasm_js` feature; nothing in this
+# crate calls getrandom directly. The paired `--cfg getrandom_backend` lives in
+# /.cargo/config.toml — both are required, neither is sufficient.
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+getrandom = { version = "0.3", features = ["wasm_js"] }

crates/sylpheed-viewer/index.html

@@ -186,7 +186,7 @@
     </div>
 
     <!-- Trunk injects the compiled WASM module here -->
-    <link data-trunk rel="rust" data-wasm-opt="z" />
+    <link data-trunk rel="rust" data-bin="sylpheed-viewer" data-wasm-opt="z" />
 
     <script>
         // Update loading status messages as WASM initializes

crates/sylpheed-viewer/src/lib.rs

@@ -4,7 +4,11 @@
 //!
 //! This crate serves as both:
 //! - A **native binary** (via `main.rs`) — full desktop viewer
-//! - A **WASM library** (this file) — browser viewer at `index.html`
+//! - A **WASM app**, also entered through `main.rs` — browser viewer at
+//!   `index.html`. Trunk builds the *bin* target (`data-bin` in index.html) and
+//!   wasm-bindgen calls `main()`; there is no `#[wasm_bindgen(start)]` here and
+//!   this file is NOT the wasm entry point. Selecting the lib target instead
+//!   links an empty 1.4 KB module that still exits 0 — see #11.
 //!
 //! ## Architecture
 //! - `sylpheed_formats` handles all binary parsing — no Bevy dependency
@@ -42,7 +46,7 @@ impl Default for ViewerState {
 
 /// Build and run the viewer application.
 ///
-/// Called from `main.rs` on native and from `wasm_bindgen` init on the web.
+/// Called from `main.rs`, on both native and wasm.
 pub fn run() {
     let mut app = App::new();