From 651f0cb264940c8a46f1284b2fcc79b0d522fd66 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Sun, 23 Jun 2024 12:50:24 -0400 Subject: [PATCH] build: get rid of wasm-pack It get's doing naughty things with network access. --- nix/kitchenWasm/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nix/kitchenWasm/default.nix b/nix/kitchenWasm/default.nix index 8f6df3b..29c2c09 100644 --- a/nix/kitchenWasm/default.nix +++ b/nix/kitchenWasm/default.nix @@ -34,13 +34,20 @@ stdenv.mkDerivation { ''; # TODO(jwall): Build this from the root rather than the src. buildPhase = '' + set -x echo building with wasm-pack wasm-pack --version mkdir -p $out cd web cp -r static $out - RUST_LOG=info wasm-pack build --mode no-install --release --target web --out-dir $out ${features}; + cargo build --lib --release --target wasm32-unknown-unknown --target-dir $out --offline + wasm-bindgen $out/wasm32-unknown-unknown/release/kitchen_wasm.wasm --out-dir $out --typescript --target web + wasm-opt $out/kitchen_wasm_bg.wasm -o $out/kitchen_wasm_bg-opt.wasm -O + rm -f $out/kitchen_wasm_bg.wasm + mv $out/kitchen_wasm_bg-opt.wasm $out/kitchen_wasm_bg.wasm cp -r index.html $out cp -r favicon.ico $out + rm -rf $out/release + rm -rf $out/wasm32-unknown-unknown ''; }