funman300
baf524ec75
Grey screen fix (canvas_bg.wasm): - Rebuilt Bevy WASM from refactored solitaire_core that removes the per-game KlondikeAdapter field from GameState. The old binary was built with wasm-opt -Oz; the large adapter allocation pattern appears to trigger an over-aggressive wasm-opt optimisation that corrupts Bevy's render pipeline, causing a permanent grey screen on /play. - build_wasm.sh: change wasm-opt -Oz → -O2. Speed-optimised level avoids the size-focused transforms that miscompile Bevy's deep render stacks. solitaire_core refactoring: - game_state.rs: remove adapter: KlondikeAdapter field; use static KlondikeAdapter::config_for() instead of a per-instance allocation. Gate test_pile_state behind #[cfg(feature = "test-support")] so production builds carry no test-only heap state. Add instruction_history() public accessor (delegates to saved_moves()). - card.rs: add Card::new(), face_up(), face_down() const constructors for more ergonomic test and wasm code. - pile.rs, solver.rs: cargo fmt. solitaire_wasm interactive API: - lib.rs: add SolitaireGame wasm-bindgen struct with draw(), move_cards(), undo(), auto_complete_step(), serialize(), from_saved() — the full player-action surface used by game.js. Add DebugSnapshot, DebugMove, DebugInvariantReport structs and debug_snapshot(), debug_legal_moves(), debug_apply_move_json() methods for e2e test automation (window.__FERROUS_DEBUG__ bridge). Add replay_moves() to export the current game as a Replay v2 payload. - solitaire_wasm.js + solitaire_wasm_bg.wasm: rebuilt with new API. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
82 lines
2.9 KiB
Bash
Executable File
82 lines
2.9 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Rebuild WASM artifacts and install them into solitaire_server/web/pkg/.
|
|
#
|
|
# Two artifacts are produced:
|
|
# solitaire_wasm.* — thin replay-viewer + interactive JS API (wasm-pack)
|
|
# canvas.* — full Bevy WASM app for play.html (cargo + wasm-bindgen)
|
|
#
|
|
# Prerequisites:
|
|
# cargo install wasm-pack wasm-bindgen-cli
|
|
# rustup target add wasm32-unknown-unknown
|
|
# (optional) cargo install wasm-opt # for smaller canvas_bg.wasm
|
|
#
|
|
# Run from the repo root:
|
|
# ./build_wasm.sh
|
|
#
|
|
# The generated pkg/ files are committed to git so self-hosters who don't
|
|
# touch the WASM crates can skip this step. Regenerate after any change to
|
|
# solitaire_wasm/, solitaire_web/, solitaire_engine/, or solitaire_core/.
|
|
|
|
set -euo pipefail
|
|
|
|
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
OUT_DIR="$REPO_ROOT/solitaire_server/web/pkg"
|
|
|
|
if ! command -v wasm-pack &> /dev/null; then
|
|
echo "error: wasm-pack not found." >&2
|
|
echo " Install with: cargo install wasm-pack" >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "Building solitaire_wasm (target: web)..."
|
|
wasm-pack build \
|
|
--target web \
|
|
--out-dir "$OUT_DIR" \
|
|
--no-typescript \
|
|
"$REPO_ROOT/solitaire_wasm"
|
|
|
|
# wasm-pack writes a package.json and .gitignore into the output dir.
|
|
# Remove them — we manage the output directory ourselves.
|
|
rm -f "$OUT_DIR/package.json" "$OUT_DIR/.gitignore"
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Bevy WASM app (solitaire_web → canvas.js + canvas_bg.wasm)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
if ! command -v wasm-bindgen &> /dev/null; then
|
|
echo "error: wasm-bindgen not found." >&2
|
|
echo " Install with: cargo install wasm-bindgen-cli" >&2
|
|
echo " The CLI version must match the wasm-bindgen crate dep." >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "Building solitaire_web (Bevy WASM app)..."
|
|
cargo build --release --target wasm32-unknown-unknown -p solitaire_web
|
|
|
|
echo "Running wasm-bindgen for solitaire_web..."
|
|
wasm-bindgen \
|
|
--out-dir "$OUT_DIR" \
|
|
--out-name canvas \
|
|
--target web \
|
|
--no-typescript \
|
|
"$REPO_ROOT/target/wasm32-unknown-unknown/release/solitaire_web.wasm"
|
|
|
|
# Optional size optimisation — Bevy bundles are large (~5-15 MB uncompressed).
|
|
# wasm-opt passes are skipped silently when the tool is not installed.
|
|
if command -v wasm-opt &> /dev/null; then
|
|
echo "Running wasm-opt on canvas_bg.wasm..."
|
|
# Use -O2 (not -Oz): Bevy's render pipeline uses deep call stacks and
|
|
# complex memory patterns that wasm-opt -Oz can miscompile, resulting
|
|
# in a grey screen on first load. -O2 is speed-optimised and avoids
|
|
# the size-focused transforms that trigger the regression.
|
|
wasm-opt -O2 \
|
|
-o "$OUT_DIR/canvas_bg.wasm" \
|
|
"$OUT_DIR/canvas_bg.wasm"
|
|
else
|
|
echo "note: wasm-opt not found; skipping size optimisation."
|
|
echo " Install with: cargo install wasm-opt (or via binaryen)"
|
|
fi
|
|
|
|
echo "Done. Output:"
|
|
ls -lh "$OUT_DIR"
|