Merge remote-tracking branch 'upstream/dev' into terminal-rewrite

.github/pull_request_template.md

@@ -18,6 +18,6 @@ person(s) who reviewed your changes. This will make sure it gets re-added to the
 
 - [ ] Run `cargo fmt`.
 - [ ] Run `cargo clippy`. If applicable, add:
-  - [ ] `--target wasm32-unknown-unknown`
-- [ ] Run `cargo build --release` 
-- [ ] If applicable, run `trunk build --release`
+  - [ ] `--target wasm32-unknown-unknown -Z build-std=std,panic_abort`
+- [ ] Run `cargo build --release`
+- [ ] If applicable, run `trunk build --release`

Cargo.toml

@@ -294,11 +294,6 @@ opt-level = 3
 # https://bevy-cheatbook.github.io/pitfalls/performance.html#why-not-use---release
 
 [patch.crates-io]
-# We need this for rodio to work in WebAssembly until
-# https://github.com/RustAudio/cpal/pull/774
-# is merged.
-cpal = { git = "https://github.com/DouglasDwyer/cpal.git", rev = "91aeb4d6b02c25791f636fdf92a73637597c077a" }
-
 # flume's global spinlock uses `thread::sleep` which doesn't work in the main thread in WebAssembly.
 # This is a patched version with `thread::sleep` removed in WebAssembly builds.
 # See https://github.com/zesterer/flume/issues/137.

crates/audio/Cargo.toml

@@ -30,7 +30,7 @@ thiserror.workspace = true
 luminol-filesystem.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rodio = "0.17.1"
+rodio = "0.17.3"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 rodio = { version = "0.17.1", features = ["wasm-bindgen"] }