From dde6a2f7afa0d19035a2e26451b13270d15bb392 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 20 Mar 2019 13:14:46 +0100 Subject: [PATCH] Build updates (#5) * Build script updates * Add @babel/core (peerdep) --- package.json | 3 ++- packages/wasm-crypto/{build.sh => adjust.sh} | 11 ++++------- packages/wasm-crypto/package.json | 5 +---- packages/wasm-schnorrkel/{build.sh => adjust.sh} | 4 +--- packages/wasm-schnorrkel/package.json | 5 +---- scripts/build-package.sh | 2 ++ scripts/build.sh | 6 +++++- scripts/test-package.sh | 14 ++++++++++++++ yarn.lock | 8 ++++---- 9 files changed, 34 insertions(+), 24 deletions(-) rename packages/wasm-crypto/{build.sh => adjust.sh} (66%) rename packages/wasm-schnorrkel/{build.sh => adjust.sh} (91%) create mode 100755 scripts/test-package.sh diff --git a/package.json b/package.json index fc49ddd5..ec76f0bd 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ ], "resolutions": { "babel-core": "^7.0.0-bridge.0", - "typescript": "^3.3.3333" + "typescript": "^3.3.4000" }, "scripts": { "build": "./scripts/build.sh", @@ -20,6 +20,7 @@ "test": "echo \"Tests included in build\"" }, "devDependencies": { + "@babel/core": "^7.4.0", "@polkadot/dev": "^0.28.0-beta.0", "@polkadot/util": "^0.39.0-beta.0" } diff --git a/packages/wasm-crypto/build.sh b/packages/wasm-crypto/adjust.sh similarity index 66% rename from packages/wasm-crypto/build.sh rename to packages/wasm-crypto/adjust.sh index cca7f360..c8a63612 100755 --- a/packages/wasm-crypto/build.sh +++ b/packages/wasm-crypto/adjust.sh @@ -2,9 +2,6 @@ set -e -echo "*** Building package" -../../scripts/build-package.sh - # shortcuts for files echo "*** Adjusting output" SRC=build/wasm.js @@ -18,7 +15,7 @@ sed -i -e 's/const TextEncoder = require('\''util'\'')\.TextEncoder;/const { str sed -i -e 's/let cachedTextEncoder = new /\/\/ let cachedTextEncoder = new /g' $SRC sed -i -e 's/cachedTextEncoder\.encode/stringToU8a/g' $SRC -echo "*** Testing package" -cargo test -- --nocapture -node ./test/wasm.js -yarn jest ./test/jest.spec.js +# this creates issues in both the browser and RN (@polkadot/util has a polyfill) +sed -i -e 's/const TextDecoder = require('\''util'\'')\.TextDecoder;/const { u8aToString } = require('\''@polkadot\/util'\'');/g' $SRC +sed -i -e 's/let cachedTextDecoder = new /\/\/ let cachedTextDecoder = new /g' $SRC +sed -i -e 's/cachedTextDecoder\.decode/u8aToString/g' $SRC diff --git a/packages/wasm-crypto/package.json b/packages/wasm-crypto/package.json index 17d9e7b4..1cbf1da3 100644 --- a/packages/wasm-crypto/package.json +++ b/packages/wasm-crypto/package.json @@ -1,5 +1,6 @@ { "name": "@polkadot/wasm-crypto", + "version": "0.2.0-beta.3", "author": "Jaco Greeff ", "files": [ "crypto-polyfill.js", @@ -12,10 +13,6 @@ ], "main": "index.js", "types": "index.d.ts", - "scripts": { - "build": "./build.sh" - }, - "version": "0.2.0-beta.3", "peerDependencies": { "@polkadot/util": "*" }, diff --git a/packages/wasm-schnorrkel/build.sh b/packages/wasm-schnorrkel/adjust.sh similarity index 91% rename from packages/wasm-schnorrkel/build.sh rename to packages/wasm-schnorrkel/adjust.sh index cee65085..2320448a 100755 --- a/packages/wasm-schnorrkel/build.sh +++ b/packages/wasm-schnorrkel/adjust.sh @@ -19,6 +19,4 @@ sed -i -e 's/let cachedTextDecoder = new /\/\/ let cachedTextDecoder = new /g' $ sed -i -e 's/cachedTextDecoder\.decode/u8aToString/g' $SRC echo "*** Testing package" -cargo test -- --nocapture -node ./test/wasm.js -yarn jest ./test/jest.spec.js +../../scripts/test-package.sh diff --git a/packages/wasm-schnorrkel/package.json b/packages/wasm-schnorrkel/package.json index 4e00e06f..d0fbc680 100644 --- a/packages/wasm-schnorrkel/package.json +++ b/packages/wasm-schnorrkel/package.json @@ -1,5 +1,6 @@ { "name": "@polkadot/wasm-schnorrkel", + "version": "0.2.0-beta.3", "collaborators": [ "Jaco Greeff ", "kianenigma " @@ -15,10 +16,6 @@ ], "main": "index.js", "types": "index.d.ts", - "scripts": { - "build": "./build.sh" - }, - "version": "0.2.0-beta.3", "peerDependencies": { "@polkadot/util": "*" }, diff --git a/scripts/build-package.sh b/scripts/build-package.sh index 1226cfe2..3fedb317 100755 --- a/scripts/build-package.sh +++ b/scripts/build-package.sh @@ -2,6 +2,8 @@ set -e +echo "*** Building package" + # cleanup old echo "*** Cleaning old builds" rm -rf ./build ./pkg diff --git a/scripts/build.sh b/scripts/build.sh index ee7012b7..746de3bf 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -14,10 +14,14 @@ for PKG in "${PACKAGES[@]}"; do echo "*** Building $PKG" cd $PKG - ./build.sh + ../../scripts/build-package.sh + ./adjust.sh + rm -rf build/*-e build/package.json build/README.md ls -al build + ../../scripts/test-package.sh + cd .. fi done diff --git a/scripts/test-package.sh b/scripts/test-package.sh new file mode 100755 index 00000000..3c275a88 --- /dev/null +++ b/scripts/test-package.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -e + +echo "*** Testing package" + +echo "*** Testing Rust" +cargo test -- --nocapture + +echo "*** Testing WASM" +node ./test/wasm.js + +echo "*** Testing via Jest" +yarn jest ./test/jest.spec.js diff --git a/yarn.lock b/yarn.lock index 8278426f..179a51a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10996,10 +10996,10 @@ typedoc@^0.14.2: typedoc-default-themes "^0.5.0" typescript "3.2.x" -typescript@3.2.x, typescript@^3.3.3333, typescript@^3.3.4000: - version "3.3.3333" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6" - integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw== +typescript@3.2.x, typescript@^3.3.4000: + version "3.3.4000" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0" + integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6"