From 0db70a5b0e642d404f969c19278ade2216b8deec Mon Sep 17 00:00:00 2001 From: hypercube <0hypercube@gmail.com> Date: Thu, 24 Jul 2025 20:32:51 +0100 Subject: [PATCH] Fix flags from cargo.toml --- frontend/justfile | 11 +++++++++-- frontend/wasm/Cargo.toml | 24 ------------------------ 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/frontend/justfile b/frontend/justfile index fc37249ef0..e4c7a9a1c2 100644 --- a/frontend/justfile +++ b/frontend/justfile @@ -3,14 +3,21 @@ output := 'wasm'/'pkg'/'graphite_wasm_bg.wasm' build profile='debug': + # Build the rust code into the target directory cargo build -p graphite-wasm --lib --target wasm32-unknown-unknown --color=always {{ if profile != "debug" { "--release" } else { "" } }} + # Create a directory to store the package in mkdir -p pkg + # Build the JS glue and patch wasm wasm-bindgen \ {{ '..' / 'target' / 'wasm32-unknown-unknown' / if profile != "debug" { 'release' / 'graphite_wasm.wasm' } else { 'debug' / 'graphite_wasm.wasm' } }} \ - --out-dir {{ 'wasm' / 'pkg' }} --typescript --target web {{ if profile == "debug" { "--debug" } else { "" } }} + --out-dir {{ 'wasm' / 'pkg' }} --typescript --target web \ + {{ if profile != "release" { "--debug" } else { "" } }} \ + {{ if profile == "release" { "--no-demangle" } else { "" } }} \ + {{ if profile == "profiling" { "--keep-debug" } else { "" } }} - {{ if profile != 'debug' { "wasm-opt " + output + " -o " + output + " -O" } else { "" } }} + # Apply optimisations (if necessary) + {{ if profile != 'debug' { "wasm-opt " + output + " -o " + output + " -Os -g" } else { "" } }} diff --git a/frontend/wasm/Cargo.toml b/frontend/wasm/Cargo.toml index 13e45bd07e..69d7b456c7 100644 --- a/frontend/wasm/Cargo.toml +++ b/frontend/wasm/Cargo.toml @@ -39,30 +39,6 @@ math-parser = { workspace = true } wgpu = { workspace = true } web-sys = { workspace = true } -[package.metadata.wasm-pack.profile.dev] -wasm-opt = false - -[package.metadata.wasm-pack.profile.dev.wasm-bindgen] -debug-js-glue = true -demangle-name-section = true -dwarf-debug-info = false - -[package.metadata.wasm-pack.profile.release] -wasm-opt = ["-Os", "-g"] - -[package.metadata.wasm-pack.profile.release.wasm-bindgen] -debug-js-glue = false -demangle-name-section = false -dwarf-debug-info = false - -[package.metadata.wasm-pack.profile.profiling] -wasm-opt = ["-Os", "-g"] - -[package.metadata.wasm-pack.profile.profiling.wasm-bindgen] -debug-js-glue = true -demangle-name-section = true -dwarf-debug-info = true - [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = [ 'cfg(wasm_bindgen_unstable_test_coverage)',