diff --git a/nix/kitchenWasm/default.nix b/nix/kitchenWasm/default.nix index 6d0055f..7d7c00b 100644 --- a/nix/kitchenWasm/default.nix +++ b/nix/kitchenWasm/default.nix @@ -32,8 +32,10 @@ stdenv.mkDerivation { mkdir -p $out cd web cp -r static $out - cargo build --lib --release --target wasm32-unknown-unknown --target-dir $out ${features} --offline - wasm-bindgen $out/wasm32-unknown-unknown/release/kitchen_wasm.wasm --out-dir $out --typescript --target web + sh ../scripts/wasm-build.sh release + #cargo build --lib --release --target wasm32-unknown-unknown --target-dir $out ${features} --offline + #wasm-bindgen $out/wasm32-unknown-unknown/release/kitchen_wasm.wasm --out-dir $out --typescript --target web + #sh ../scripts/wasm-opt.sh release 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 diff --git a/scripts/wasm-build.sh b/scripts/wasm-build.sh index 49e8356..d92053d 100644 --- a/scripts/wasm-build.sh +++ b/scripts/wasm-build.sh @@ -1,8 +1,8 @@ set -x buildtype=$1; -if [ -eq ${buildtype} = "release" ]; then - builtype_flag="--release" +if [ ${buildtype} = "release" ]; then + buildtype_flag="--release" fi cargo build --lib ${buildtype_flag} --target wasm32-unknown-unknown --target-dir $out --features debug_logs diff --git a/scripts/wasm-opt.sh b/scripts/wasm-opt.sh index 7cfaa52..f983110 100644 --- a/scripts/wasm-opt.sh +++ b/scripts/wasm-opt.sh @@ -1,6 +1,6 @@ set -x buildtype=$1; -wasm-opt $out/wasm32-unkown-unkown/${buildtype}/${project}_wasm.wasm --out-dir dist/ -0 +wasm-opt $out/wasm32-unknown-unkown/${buildtype}/${project}_wasm.wasm --out-dir dist/ -O rm -f $out/${project}_wasm_bg.wasm mv $out/${project}_wasm_bg-opt.wasm dist/${project}_wasm_bg.wasm