funman300
835a48fe9d
Build and Deploy / build-and-push (push) Failing after 58s
Adds a new `solitaire_web` crate that compiles the full `solitaire_engine` to `wasm32-unknown-unknown` and renders to a `<canvas id="bevy-canvas">` element in `play.html` — the same ECS code path as desktop and Android. Changes to enable the WASM target: - .cargo/config.toml: add wasm32-unknown-unknown rustflags for getrandom - Workspace Cargo.toml: add solitaire_web member - solitaire_data/Cargo.toml: gate tokio/reqwest/dirs/keyring to non-wasm - solitaire_data/src: add wasm32 branch to data_dir() (returns None); cfg-gate sync_client network types, auth_tokens, matomo_client - solitaire_engine/Cargo.toml: gate tokio/reqwest/kira/arboard/dirs/zip to non-wasm (mio/cpal/arboard don't compile for wasm32-unknown-unknown) - solitaire_engine/src/lib.rs: cfg-gate module declarations and re-exports for analytics, audio, sync, sync_setup, avatar, leaderboard plugins - solitaire_engine/src/core_game_plugin.rs: cfg-gate plugin registrations that require TokioRuntime (audio, sync, analytics, leaderboard, avatar) - solitaire_engine/src/resources.rs: cfg-gate TokioRuntimeResource - solitaire_engine/src/game_plugin.rs: cfg-gate std::fs::remove_file (x10) - solitaire_engine/src/theme/mod.rs: cfg-gate importer module (uses dirs+zip) - solitaire_engine/src/settings_plugin.rs: cfg-gate theme ZIP import UI - solitaire_engine/src/assets/sources.rs: cfg-gate FileAssetReader/user_theme_dir - solitaire_engine/src/auto_complete_plugin.rs: cfg-gate audio system - solitaire_engine/src/daily_challenge_plugin.rs: cfg-gate server fetch - solitaire_engine/src/hud_plugin.rs: cfg-gate AvatarResource import - solitaire_engine/src/profile_plugin.rs: cfg-gate AvatarResource import - solitaire_server/web/play.html: minimal HTML canvas shell - solitaire_web/: new crate (Cargo.toml + src/lib.rs) - build_wasm.sh: add Bevy WASM build step (cargo + wasm-bindgen + wasm-opt) All tests pass; clippy --workspace -- -D warnings clean; native build (solitaire_engine, solitaire_app) unaffected. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
143 lines
4.8 KiB
TOML
143 lines
4.8 KiB
TOML
[workspace]
|
|
members = [
|
|
"solitaire_core",
|
|
"solitaire_sync",
|
|
"solitaire_data",
|
|
"solitaire_engine",
|
|
"solitaire_server",
|
|
"solitaire_app",
|
|
"solitaire_assetgen",
|
|
"solitaire_wasm",
|
|
"solitaire_web",
|
|
]
|
|
resolver = "2"
|
|
|
|
[workspace.package]
|
|
edition = "2024"
|
|
version = "0.1.0"
|
|
license = "MIT"
|
|
rust-version = "1.95"
|
|
|
|
[workspace.dependencies]
|
|
serde = { version = "1", features = ["derive"] }
|
|
serde_json = "1"
|
|
uuid = { version = "1", features = ["v4", "serde"] }
|
|
chrono = { version = "0.4", features = ["serde"] }
|
|
thiserror = "2"
|
|
rand = "0.9"
|
|
async-trait = "0.1"
|
|
tokio = { version = "1", features = ["full"] }
|
|
dirs = "6"
|
|
keyring = "4"
|
|
keyring-core = "1"
|
|
reqwest = { version = "0.13", features = ["json", "rustls", "rustls-native-certs"], default-features = false }
|
|
arboard = { version = "3", default-features = false }
|
|
jni = { version = "0.21", default-features = false }
|
|
|
|
solitaire_core = { path = "solitaire_core" }
|
|
solitaire_sync = { path = "solitaire_sync" }
|
|
solitaire_data = { path = "solitaire_data" }
|
|
solitaire_engine = { path = "solitaire_engine" }
|
|
klondike = { version = "0.3.0", registry = "Quaternions" }
|
|
card_game = { version = "0.4.0", registry = "Quaternions" }
|
|
|
|
# Bevy with `default-features = false` to avoid the unused
|
|
# `bevy_audio → rodio + symphonia + cpal 0.15 + alsa 0.9` chain.
|
|
# Audio is handled directly by `kira` in `audio_plugin.rs`, so the
|
|
# `bevy_audio` feature is intentionally omitted. The features below
|
|
# enumerate every leaf of the standard `2d` + `ui` meta-features that
|
|
# we actually use; new features should only be added with a
|
|
# corresponding use site.
|
|
bevy = { version = "0.18", default-features = false, features = [
|
|
# default_app
|
|
"async_executor",
|
|
"bevy_asset",
|
|
"bevy_input_focus",
|
|
"bevy_log",
|
|
"bevy_state",
|
|
"bevy_window",
|
|
"custom_cursor",
|
|
"reflect_auto_register",
|
|
# default_platform (desktop subset)
|
|
"std",
|
|
"bevy_winit",
|
|
"default_font",
|
|
"multi_threaded",
|
|
# winit prefers Wayland when WAYLAND_DISPLAY is set on the
|
|
# session and falls through to X11 otherwise. Without `wayland`,
|
|
# winit-on-Wayland-session falls back to XWayland which renders
|
|
# the game in an X11 frame inside the Wayland compositor.
|
|
"wayland",
|
|
"x11",
|
|
# Android: NativeActivity glue. The feature is target-gated inside
|
|
# bevy_internal — desktop builds compile it out, so leaving it on
|
|
# the always-on list is harmless on Linux/macOS/Windows. Pairs with
|
|
# cargo-apk's NativeActivity wrapper (cargo-apk 0.10+ uses this by
|
|
# default). Switch to `android-game-activity` later if we want
|
|
# AndroidX GameActivity for Google Play Games integration.
|
|
"android-native-activity",
|
|
# common_api
|
|
"bevy_color",
|
|
"bevy_image",
|
|
"bevy_mesh",
|
|
"bevy_shader",
|
|
"bevy_text",
|
|
"png",
|
|
# 2d rendering
|
|
"bevy_camera",
|
|
"bevy_render",
|
|
"bevy_core_pipeline",
|
|
"bevy_sprite",
|
|
"bevy_sprite_render",
|
|
# UI rendering
|
|
"bevy_ui",
|
|
"bevy_ui_render",
|
|
] }
|
|
kira = "0.12"
|
|
|
|
# SVG rasterisation pipeline for the runtime card-theme system.
|
|
# usvg parses + simplifies; resvg renders to a tiny-skia Pixmap;
|
|
# tiny-skia provides the CPU rasteriser. All three are maintained
|
|
# together by the resvg-rs project and version in lockstep.
|
|
usvg = "0.47"
|
|
resvg = "0.47"
|
|
tiny-skia = "0.12"
|
|
|
|
# Theme manifest format. RON keeps the file human-editable while
|
|
# preserving Rust-style structures the importer can validate.
|
|
ron = "0.12"
|
|
|
|
# Importer-only: reads user-supplied theme zip archives, validates
|
|
# their contents, and unpacks them into the user themes directory.
|
|
# Default features are disabled to keep the dependency footprint small;
|
|
# only `deflate` is needed because the importer rejects other
|
|
# compression methods anyway (see Phase 7 spec).
|
|
zip = { version = "8.6", default-features = false, features = ["deflate"] }
|
|
# Image decoding for avatar bytes received from the server.
|
|
# Features mirror what Bevy already enables via bevy_image.
|
|
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "webp", "gif"] }
|
|
|
|
# Importer-only test dependency: tests build zip archives in a
|
|
# scratch directory so they don't pollute the real user themes path
|
|
# on the developer's machine.
|
|
tempfile = "3.27"
|
|
|
|
axum = "0.8"
|
|
sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] }
|
|
jsonwebtoken = { version = "10", default-features = false, features = ["rust_crypto"] }
|
|
bcrypt = "0.19"
|
|
tower_governor = "0.8"
|
|
tracing = "0.1"
|
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
|
dotenvy = "0.15"
|
|
|
|
[profile.dev]
|
|
opt-level = 1
|
|
|
|
[profile.dev.package."*"]
|
|
opt-level = 3
|
|
|
|
[profile.release]
|
|
opt-level = 3
|
|
lto = "thin"
|