Skip to content

Commit

Permalink
Merge pull request #632 from Emurgo/evgenii/asmjs_memory
Browse files Browse the repository at this point in the history
Memory link fix
  • Loading branch information
lisicky authored Jul 6, 2023
2 parents 965ebc7 + 18a649c commit e80433e
Show file tree
Hide file tree
Showing 7 changed files with 273 additions and 165 deletions.
2 changes: 1 addition & 1 deletion binaryen
Submodule binaryen updated 1784 files
137 changes: 104 additions & 33 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"rust:build-web": "(rimraf ./rust/pkg && cd rust; wasm-pack build --target=web; cd ..; npm run js:ts-json-gen; cd rust; wasm-pack pack) && npm run js:flowgen",
"rust:build-asm": "(rimraf ./rust/pkg && cd rust; wasm-pack build --target=browser; cd ..; npm run js:ts-json-gen; cd rust; wasm-pack pack) && npm run asm:build && npm run js:flowgen",
"rust:publish": "cd rust && cargo publish && cd ../",
"asm:build": "./binaryen/bin/wasm2js ./rust/pkg/cardano_serialization_lib_bg.wasm --output ./rust/pkg/cardano_serialization_lib.asm.js && node ./scripts/wasm-to-asm",
"asm:build": "./binaryen/bin/wasm2js ./rust/pkg/cardano_serialization_lib_bg.wasm --output ./rust/pkg/cardano_serialization_lib.asm.js && node ./scripts/wasm-to-asm && node ./scripts/fix-buffer-ref.js",
"rust:check-warnings": "(cd rust; RUSTFLAGS=\"-D warnings\" cargo +stable build)",
"rust:test": "(cd rust; cargo test)",
"js:flowgen": "flowgen ./rust/pkg/cardano_serialization_lib.d.ts -o ./rust/pkg/cardano_serialization_lib.js.flow --add-flow-header",
Expand All @@ -34,7 +34,7 @@
"url": "git+https://github.com/Emurgo/cardano-serialization-lib.git"
},
"devDependencies": {
"flowgen": "1.11.0",
"flowgen": "1.21.0",
"husky": "4.2.5",
"json-schema-to-typescript": "^10.1.5",
"rimraf": "3.0.2"
Expand Down
2 changes: 1 addition & 1 deletion rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ getrandom = "0.2.3"
# wasm
[target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
serde-wasm-bindgen = "0.4.5"
wasm-bindgen = "=0.2.83"
wasm-bindgen = "=0.2.87"
rand_os = { version = "0.1", features = ["wasm-bindgen"] }
js-sys = "0.3.51"
getrandom = { version = "0.2.3", features = ["js"] }
Expand Down
Loading

0 comments on commit e80433e

Please sign in to comment.