diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml index a778099b..407ac950 100644 --- a/.github/workflows/push-master.yml +++ b/.github/workflows/push-master.yml @@ -3,7 +3,6 @@ on: push: branches: - master - - vf/build-test jobs: master: diff --git a/package.json b/package.json index c694918a..8636d59e 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "test:wasm-crypto:deno": "deno test --allow-read --import-map=import_map.json packages/wasm-crypto/test/deno.ts", "test:wasm-crypto:js": "yarn test:wasm-crypto:js:jest && yarn test:wasm-crypto:js:node", "test:wasm-crypto:js:jest": "polkadot-dev-run-test --env node --loader ./packages/wasm-crypto/test/loader-build.js", - "test:wasm-crypto:js:node": "node --no-warnings --loader ./packages/wasm-crypto/test/loader-build.js ./packages/wasm-crypto/test/wasm.js && node --no-warnings --loader ./packages/wasm-crypto/test/loader-build.js ./packages/wasm-crypto/test/asm.js", + "test:wasm-crypto:js:node": "node --no-warnings --loader ./packages/wasm-crypto/test/loader-build.js ./packages/wasm-crypto/test/wasm.js", "test:wasm-crypto:rust": "cd packages/wasm-crypto && RUST_BACKTRACE=full cargo test --release -- --test-threads=1 --nocapture" }, "devDependencies": { diff --git a/packages/wasm-crypto-init/src/asm.ts b/packages/wasm-crypto-init/src/asm.ts index 07c77cff..8dd40fbc 100644 --- a/packages/wasm-crypto-init/src/asm.ts +++ b/packages/wasm-crypto-init/src/asm.ts @@ -5,7 +5,9 @@ import type { InitFn } from '@polkadot/wasm-bridge/types'; import type { WasmCryptoInstance } from './types.js'; import { createWasmFn } from '@polkadot/wasm-bridge'; -import { asmJsInit } from '@polkadot/wasm-crypto-asmjs'; +import * as mod from '@polkadot/wasm-crypto-asmjs'; + +const { asmJsInit } = mod; export { packageInfo } from './packageInfo.js'; diff --git a/scripts/build-wasm.sh b/scripts/build-wasm.sh index eaf1ffc3..6ebfedc1 100755 --- a/scripts/build-wasm.sh +++ b/scripts/build-wasm.sh @@ -9,7 +9,6 @@ source ../scripts/rust-version.sh WSM=$PKG_NAME/build-wasm/wasm_bg.wasm OPT=$PKG_NAME/build-wasm/wasm_opt.wasm -ASM=$PKG_NAME-asmjs/build/cjs/data.js DENO_DIR=$PKG_NAME-asmjs/build-deno/deno DENO_ASM=$DENO_DIR/data.js @@ -30,26 +29,10 @@ echo "*** Optimising WASM output" echo "*** Packing WASM into baseX" node ../scripts/pack-wasm-base.mjs -# build asmjs version from the input (optimised) WASM -echo "*** Building asm.js version" -../binaryen/bin/wasm2js -Oz --output $ASM $OPT + # copy the deno version mkdir -p $DENO_DIR -cp $ASM $DENO_ASM -# cleanup the generated asm, converting to cjs -sed -i -e '/import {/d' $ASM -sed -i -e '1,/var retasmFunc = /!d' $ASM -sed -i -e 's/var retasmFunc = .*/exports.asmJsInit = (wbg) => asmFunc(wbg);/g' $ASM - -# same as the cjs version, this time for deno -sed -i -e '/import {/d' $DENO_ASM -sed -i -e '1,/var retasmFunc = /!d' $DENO_ASM -sed -i -e 's/var retasmFunc = .*/export const asmJsInit = (wbg) => asmFunc(wbg);/g' $DENO_ASM - -# cleanups -rm -rf $PKG_NAME-asmjs/build/cjs/*-e -rm -rf $PKG_NAME-asmjs/build-deno/deno/*-e rm -rf $PKG_NAME-wasm/build/cjs/*-e rm -rf $PKG_NAME-wasm/build-deno/deno/*-e