Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: properly remove wasm-bindgen from rust wasm modules #1796

Merged
merged 7 commits into from
Jun 30, 2023
Merged

fix: properly remove wasm-bindgen from rust wasm modules #1796

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2b5fdac
fix: properly remove wasm-bindgen from the module
dOrgJelli Jun 29, 2023
7f4fa30
chore: set nightly to 2023-06-15 in ci
cbrzn Jun 29, 2023
67560f9
chore: fix CLI CI
dOrgJelli Jun 30, 2023
ae168bc
Merge branch 'wasm-bindgen-rust-build-fix' of https://github.com/poly…
dOrgJelli Jun 30, 2023
19136db
chore: lint fix
dOrgJelli Jun 30, 2023
b3ee74b
temp: disable long CI step
dOrgJelli Jun 30, 2023
90dd5fc
fix: re-enable rebuild wrap step
dOrgJelli Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/vm-script.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,32 @@ mv ./{{dir}}/Cargo-local.toml ./{{dir}}/Cargo.toml
cargo build --manifest-path ./{{dir}}/Cargo.toml \
--target wasm32-unknown-unknown --release

# Make the build directory
# Make the build & build-staging directory
rm -rf ./build
mkdir ./build
rm -rf ./build-staging
mkdir ./build-staging

# Run wasm-bindgen over the module, replacing all placeholder __wbindgen_... imports
wasm-bindgen ./{{dir}}/target/wasm32-unknown-unknown/release/module.wasm --out-dir ./build --out-name bg_module.wasm
# Move the rust module into the staging directory
mv ./{{dir}}/target/wasm32-unknown-unknown/release/module.wasm ./build-staging/module.wasm

# Run wasm-tools strip to remove the wasm-interface-types custom section
wasm-tools strip ./build/bg_module.wasm -d wasm-interface-types -o ./build/strip_module.wasm
rm -rf ./build/bg_module.wasm
# Wasm Post-processing

# Run wasm-snip to trip down the size of the binary, removing any dead code
wasm-snip ./build/strip_module.wasm -o ./build/snipped_module.wasm
rm -rf ./build/strip_module.wasm
# 1. Run `wasm-bindgen` over the module, replacing all placeholder __wbindgen_... imports
wasm-bindgen ./build-staging/module.wasm --out-dir ./build-staging --out-name module_bg.wasm

# Use wasm-opt to perform the "asyncify" post-processing step over all modules
# 2. If wasm-bindgen isn't being used, the only import that will be remaining will be __wbindgen_throw.
# So, let's remove this, and if more extraneous imports exist an error will be raised post-compilation
wasm-snip ./build-staging/module_bg.wasm -o ./build-staging/module_bg_snip.wasm -p .*__wbindgen_throw

# 3. Run `wasm-tools strip` to remove the wasm-interface-types custom section (sometimes get injected)
wasm-tools strip ./build-staging/module_bg_snip.wasm -d wasm-interface-types -o ./build-staging/module_bg_snip_strip.wasm

# 4. Use wasm-opt to perform the "asyncify" post-processing step over all modules
export ASYNCIFY_STACK_SIZE=24576
wasm-opt --asyncify -Os ./build/snipped_module.wasm -o ./build/wrap.wasm
rm -rf ./build/snipped_module.wasm
wasm-opt --asyncify -Os ./build-staging/module_bg_snip_strip.wasm -o ./build-staging/module_bg_snip_strip_opt.wasm

# Finish - Move the result
mv ./build-staging/module_bg_snip_strip_opt.wasm ./build/wrap.wasm

{{/polywrap_module}}