From 55fd797707c68f557eb46aadbc5f444195bc5c41 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 3 Feb 2020 13:56:45 +0100 Subject: [PATCH] Bump deps (#269) --- packages/react-identicon/package.json | 4 +- packages/ui-keyring/package.json | 6 +-- packages/ui-keyring/src/index.ts | 9 ++++- packages/ui-settings/package.json | 2 +- packages/ui-shared/package.json | 2 +- yarn.lock | 58 +++++++++++++-------------- 6 files changed, 44 insertions(+), 37 deletions(-) diff --git a/packages/react-identicon/package.json b/packages/react-identicon/package.json index e4b74cef..13620637 100644 --- a/packages/react-identicon/package.json +++ b/packages/react-identicon/package.json @@ -24,8 +24,8 @@ "react": "*" }, "devDependencies": { - "@polkadot/keyring": "^2.0.1", - "@polkadot/util-crypto": "^2.0.1", + "@polkadot/keyring": "^2.1.0-beta.0", + "@polkadot/util-crypto": "^2.1.0-beta.0", "xmlserializer": "^0.6.1" } } diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json index 76814268..5ca8f146 100644 --- a/packages/ui-keyring/package.json +++ b/packages/ui-keyring/package.json @@ -32,9 +32,9 @@ "store": "^2.0.12" }, "devDependencies": { - "@polkadot/keyring": "^2.0.1", - "@polkadot/types": "^1.0.1", - "@polkadot/util": "^2.0.1" + "@polkadot/keyring": "^2.1.0-beta.0", + "@polkadot/types": "^1.1.0-beta.14", + "@polkadot/util": "^2.1.0-beta.0" }, "optionalDependencies": { "@ledgerhq/hw-transport-node-hid": "^5.7.0" diff --git a/packages/ui-keyring/src/index.ts b/packages/ui-keyring/src/index.ts index ccd31bf3..a9aa4024 100644 --- a/packages/ui-keyring/src/index.ts +++ b/packages/ui-keyring/src/index.ts @@ -7,15 +7,22 @@ import { detectPackage } from '@polkadot/util'; import keyring, { Keyring } from './Keyring'; import Ledger from './ledger'; +let dirname = 'node_modules'; let pkgJson; +try { + dirname = __dirname; +} catch (error) { + // ignore +} + try { pkgJson = require('./package.json'); } catch (error) { pkgJson = require('../package.json'); } -detectPackage(pkgJson); +detectPackage(dirname, pkgJson); export default keyring; diff --git a/packages/ui-settings/package.json b/packages/ui-settings/package.json index 0debf373..9543dc82 100644 --- a/packages/ui-settings/package.json +++ b/packages/ui-settings/package.json @@ -14,7 +14,7 @@ "store": "^2.0.12" }, "devDependencies": { - "@polkadot/util": "^2.0.1" + "@polkadot/util": "^2.1.0-beta.0" }, "peerDependencies": { "@polkadot/util": "*" diff --git a/packages/ui-shared/package.json b/packages/ui-shared/package.json index 9a08d8d8..22a77e68 100644 --- a/packages/ui-shared/package.json +++ b/packages/ui-shared/package.json @@ -17,6 +17,6 @@ "@polkadot/util-crypto": "*" }, "devDependencies": { - "@polkadot/util-crypto": "^2.0.1" + "@polkadot/util-crypto": "^2.1.0-beta.0" } } diff --git a/yarn.lock b/yarn.lock index a3bf1c9e..7ae82e2c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2375,24 +2375,24 @@ typescript "^3.7.5" vuepress "^1.2.0" -"@polkadot/keyring@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-2.0.1.tgz#bbcc10c1a96bf3c43a53414f93646f3d7cc0d5e8" - integrity sha512-VsQQgQVnc5rfMGdFOxDhyv+YdoI5gJaTAhAB++FKxELUtfQJiGOCb16NUs29vNLf7UX59ZkLZfvO+EL0JcZwdw== +"@polkadot/keyring@^2.1.0-beta.0": + version "2.1.0-beta.0" + resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-2.1.0-beta.0.tgz#5fe05f715794e84eccb1f1efa2f01f92dd325e98" + integrity sha512-Qm9CXzKbb7WfkpaDS35ZaxZQWcwGCKJiCS8ymUnOQhCmd/7nQRu+ueIZpUfyxw5XEDeSA3fOhNmEi7oDxp8EAg== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/util" "^2.0.1" - "@polkadot/util-crypto" "^2.0.1" + "@polkadot/util" "^2.1.0-beta.0" + "@polkadot/util-crypto" "^2.1.0-beta.0" -"@polkadot/metadata@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.0.1.tgz#e0098bb71ec6264a9adb82897ac0c982af1856c3" - integrity sha512-eoc+iAaJFf9IMgvMVruXG7UtX6iyRhhDuPs507cPGRxtf5Hxz87QDWgp9Klro2OQQ/0KTCOh3QMVjbLYVQ6YNg== +"@polkadot/metadata@^1.1.0-beta.14": + version "1.1.0-beta.14" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.1.0-beta.14.tgz#79c62f3c9d415f0fd5705ac69c218ff2865fe757" + integrity sha512-ugQL4HaQGRtUCUaNGxpiFqp8Yk19iKZhvG8UD6o9NipCs8sDYlfg291VNqs48dosHnfTLUch0Z4Qne46NzNm9w== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/types" "^1.0.1" - "@polkadot/util" "^2.0.1" - "@polkadot/util-crypto" "^2.0.1" + "@polkadot/types" "^1.1.0-beta.14" + "@polkadot/util" "^2.1.0-beta.0" + "@polkadot/util-crypto" "^2.1.0-beta.0" "@polkadot/ts@^0.2.1": version "0.2.1" @@ -2401,25 +2401,25 @@ dependencies: "@types/chrome" "^0.0.92" -"@polkadot/types@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.0.1.tgz#c2a5ec343703e257fbb9904b01ca50d5284ec275" - integrity sha512-0WKZlyfXP09Nsdu3JrdCKw1VIGkbC967AcsVngIvxXYV7LDSbzHHHtkww1ZjoqJBFVewO/p49S3lTGTt5i+7mQ== +"@polkadot/types@^1.1.0-beta.14": + version "1.1.0-beta.14" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.1.0-beta.14.tgz#f904c978857cb31dc85ec940d456119e9950ac30" + integrity sha512-coxF0iDE8/UrzQS+NyKAgkT9VpesnpGxr6H6uH0EsfO5qI5Fa/z0514LMlJLNqgoCLxYcYi7YYG+4xq9zx8rdQ== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/metadata" "^1.0.1" - "@polkadot/util" "^2.0.1" - "@polkadot/util-crypto" "^2.0.1" + "@polkadot/metadata" "^1.1.0-beta.14" + "@polkadot/util" "^2.1.0-beta.0" + "@polkadot/util-crypto" "^2.1.0-beta.0" memoizee "^0.4.14" yargs "^15.1.0" -"@polkadot/util-crypto@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-2.0.1.tgz#abfe4c229bb52b56b7ebab9256d366c65a3eca63" - integrity sha512-/PJXSVggnO6OHE6U3ji5u8Gal1HW0hDUWm85Wxw7ZQY1AnXwrnklrbTM2a+2myShxRe3HJ4A4pcYsaZPELxj4Q== +"@polkadot/util-crypto@^2.1.0-beta.0": + version "2.1.0-beta.0" + resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-2.1.0-beta.0.tgz#0d27cb897e0d116ce9197b6f566f11a416ef26a7" + integrity sha512-NUHLZua94cUcn4NvZOYX8YYmxfbQfhPcbZevJrqvROIVzHkO7IRvIzxNPVQH7KcvQEs+qzJf8VrM0+u1gURpqA== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/util" "^2.0.1" + "@polkadot/util" "^2.1.0-beta.0" "@polkadot/wasm-crypto" "^0.20.1" "@types/bs58" "^4.0.0" "@types/elliptic" "^6.4.12" @@ -2434,10 +2434,10 @@ tweetnacl "^1.0.2" xxhashjs "^0.2.2" -"@polkadot/util@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-2.0.1.tgz#6004da88c7430992285a44cff1062e0bba963605" - integrity sha512-BjUVLpJ1UtuKpcW2V5NEm5739mmTVO7imQvf87HIpmsR37vC1aWcR6JSwn4O6VBEkCOaxjsVmyOVdzfsbYp4Ew== +"@polkadot/util@^2.1.0-beta.0": + version "2.1.0-beta.0" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-2.1.0-beta.0.tgz#a0e7c891687e771582fe616047e58f96b7e435ff" + integrity sha512-ZHJ4vG+AJdltqhqotMu9Fw3Um7Gii61Ve2MQYYCaalLr9AZO3fgAq9St4O8vza49ZxOru8bZaexlToxCIt2b4g== dependencies: "@babel/runtime" "^7.8.3" "@types/bn.js" "^4.11.6"