Skip to content

Commit e80433e

Browse files
authored
Merge pull request #632 from Emurgo/evgenii/asmjs_memory
Memory link fix
2 parents 965ebc7 + 18a649c commit e80433e

File tree

7 files changed

+273
-165
lines changed

7 files changed

+273
-165
lines changed

binaryen

Submodule binaryen updated 1784 files

package-lock.json

Lines changed: 104 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"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",
99
"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",
1010
"rust:publish": "cd rust && cargo publish && cd ../",
11-
"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",
11+
"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",
1212
"rust:check-warnings": "(cd rust; RUSTFLAGS=\"-D warnings\" cargo +stable build)",
1313
"rust:test": "(cd rust; cargo test)",
1414
"js:flowgen": "flowgen ./rust/pkg/cardano_serialization_lib.d.ts -o ./rust/pkg/cardano_serialization_lib.js.flow --add-flow-header",
@@ -34,7 +34,7 @@
3434
"url": "git+https://github.com/Emurgo/cardano-serialization-lib.git"
3535
},
3636
"devDependencies": {
37-
"flowgen": "1.11.0",
37+
"flowgen": "1.21.0",
3838
"husky": "4.2.5",
3939
"json-schema-to-typescript": "^10.1.5",
4040
"rimraf": "3.0.2"

rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ getrandom = "0.2.3"
4545
# wasm
4646
[target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
4747
serde-wasm-bindgen = "0.4.5"
48-
wasm-bindgen = "=0.2.83"
48+
wasm-bindgen = "=0.2.87"
4949
rand_os = { version = "0.1", features = ["wasm-bindgen"] }
5050
js-sys = "0.3.51"
5151
getrandom = { version = "0.2.3", features = ["js"] }

0 commit comments

Comments
 (0)