Bump berry (#96)

* Bump berry

* Rewrite

.yarnrc.yml

@@ -8,4 +8,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.js
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-rc.js
+yarnPath: .yarn/releases/yarn-2.1.1.js

package.json

@@ -18,8 +18,8 @@
     "test": "./scripts/test-rust.sh"
   },
   "devDependencies": {
-    "@babel/core": "^7.11.0",
-    "@polkadot/dev": "^0.55.31"
+    "@babel/core": "^7.11.1",
+    "@polkadot/dev": "^0.55.33"
   },
   "version": "1.3.0-beta.28"
 }

packages/wasm-crypto/package.json

@@ -20,8 +20,8 @@
   "main": "index.js",
   "types": "index.d.ts",
   "devDependencies": {
-    "@polkadot/dev": "^0.55.31",
-    "@polkadot/util": "^3.1.0-beta.2",
+    "@polkadot/dev": "^0.55.33",
+    "@polkadot/util": "^3.0.1",
     "override-require": "^1.1.1"
   },
   "peerDependencies": {

scripts/build-package.sh

@@ -35,10 +35,11 @@ node ../../scripts/pack-wasm-base64.js
 echo "*** Building asm.js version"
 ../../binaryen/bin/wasm2js --output $ASM $OPT
 
-# cleanup the generated output, sadly there are no node-js outputs above
-sed -i -e 's/import {/\/\/ import {/g' $ASM
-sed -i -e 's/function asmFunc/var schnorrkel = require('\''\.\/wasm'\''); function asmFunc/g' $ASM
-sed -i -e 's/{abort.*},memasmFunc/schnorrkel, memasmFunc/g' $ASM
+# cleanup the generated asm, converting to cjs
+sed -i -e '/import {/d' $ASM
+echo "const imported = require('./wasm');
+$(cat $ASM)" > $ASM
+sed -i -e 's/{abort.*},memasmFunc/imported, memasmFunc/g' $ASM
 sed -i -e 's/export var /module\.exports\./g' $ASM
 
 # copy our package interfaces