Adapt interfaces for latest @polkadot/keyring (#146)

* Adapt interfaces for latest @polkadot/keyring * Re-write yarn.lock * Bump latest api
2026-06-12 07:21:03 +00:00 · 2019-06-13 16:16:53 +02:00
parent 77f3ad1b55
commit b26a0ef083
8 changed files with 109 additions and 131 deletions
@@ -1,7 +1,12 @@
 # 0.41.1

+- Adapt interface to cater for new `@polkadot/keyring`, where pairs -
+  - expose `address` getter instead of `address()`
+  - expose `publicKey` getter instead of `publicKey()`
+  - expose `meta` getter instead of `getMeta()`
 - Add support for the saving of contracts to the keyring
 - Use the injection of stores, providing an additional `ExtensionStore` for saving to Chrome/FF extensions (in addition to the standard localStorage saving)
+- Remove previously deprecated kering functions, `createAccount`, `createAccountExternal` & `createAccountMnemonic`
 - Remove (previously deprecated), `@polkadot/ui-util`, all these functions have been incorporated in `@polkadot/util`

 # 0.40.1
@@ -24,8 +24,8 @@
    "react": "*"
  },
  "devDependencies": {
-    "@polkadot/keyring": "^0.93.0-beta.3",
-    "@polkadot/util-crypto": "^0.93.0-beta.3",
+    "@polkadot/keyring": "^0.93.0-beta.5",
+    "@polkadot/util-crypto": "^0.93.0-beta.5",
    "xmlserializer": "^0.6.1"
  }
 }
@@ -19,9 +19,9 @@
    "styled-components": "^4.3.1"
  },
  "devDependencies": {
-    "@polkadot/keyring": "^0.93.0-beta.3",
-    "@polkadot/types": "^0.81.0-beta.10",
-    "@polkadot/util": "^0.93.0-beta.3"
+    "@polkadot/keyring": "^0.93.0-beta.5",
+    "@polkadot/types": "^0.81.0-beta.14",
+    "@polkadot/util": "^0.93.0-beta.5"
  },
  "peerDependencies": {
    "@polkadot/keyring": "*",
@@ -58,11 +58,11 @@ export default class Base {
    return this._genesisHash;
  }

-  decodeAddress (key: string | Uint8Array, ignoreChecksum?: boolean): Uint8Array {
+  decodeAddress = (key: string | Uint8Array, ignoreChecksum?: boolean): Uint8Array => {
    return this.keyring.decodeAddress(key, ignoreChecksum);
  }

-  encodeAddress (key: string | Uint8Array): string {
+  encodeAddress = (key: string | Uint8Array): string => {
    return this.keyring.encodeAddress(key);
  }

@@ -72,7 +72,7 @@ export default class Base {

  getPairs (): Array<KeyringPair> {
    return this.keyring.getPairs().filter((pair: KeyringPair) =>
-      env.isDevelopment() || pair.getMeta().isTesting !== true
+      env.isDevelopment() || pair.meta.isTesting !== true
    );
  }

@@ -116,19 +116,14 @@ export default class Base {
  protected addAccountPairs (): void {
    this.keyring
      .getPairs()
-      .forEach((pair: KeyringPair) => {
-        const address = pair.address();
-
-        this.accounts.add(this._store, address, {
-          address,
-          meta: pair.getMeta()
-        });
+      .forEach(({ address, meta }: KeyringPair) => {
+        this.accounts.add(this._store, address, { address, meta });
      });
  }

  protected addTimestamp (pair: KeyringPair): void {
-    if (!pair.getMeta().whenCreated) {
-      pair.setMeta({  whenCreated: Date.now() });
+    if (!pair.meta.whenCreated) {
+      pair.setMeta({ whenCreated: Date.now() });
    }
  }
 }
@@ -8,7 +8,7 @@ import { SingleAddress } from './observable/types';
 import { CreateResult, KeyringAddress, KeyringAddressType, KeyringItemType, KeyringJson, KeyringJson$Meta, KeyringOptions, KeyringStruct } from './types';

 import createPair from '@polkadot/keyring/pair';
-import { hexToU8a, isHex, isString, u8aToHex } from '@polkadot/util';
+import { hexToU8a, isHex, isString } from '@polkadot/util';

 import env from './observable/development';
 import Base from './Base';
@@ -58,7 +58,7 @@ export class Keyring extends Base implements KeyringStruct {
  }

  backupAccount (pair: KeyringPair, password: string): KeyringPair$Json {
-    if (!pair.isLocked()) {
+    if (!pair.isLocked) {
      pair.lock();
    }

@@ -67,24 +67,6 @@ export class Keyring extends Base implements KeyringStruct {
    return pair.toJson(password);
  }

-  createAccount (seed: Uint8Array, password?: string, meta?: KeyringPair$Meta): KeyringPair {
-    console.warn('createAccount deprecated, use addUri instead');
-
-    return this.addUri(u8aToHex(seed), password, meta).pair;
-  }
-
-  createAccountExternal (publicKey: Uint8Array, meta?: KeyringPair$Meta): KeyringPair {
-    console.warn('createAccountExternal deprecated, use addExternal instead');
-
-    return this.addExternal(publicKey, meta).pair;
-  }
-
-  createAccountMnemonic (seed: string, password?: string, meta?: KeyringPair$Meta): KeyringPair {
-    console.warn('createAccountMnemonic deprecated, use createUri instead');
-
-    return this.addUri(seed, password, meta).pair;
-  }
-
  createFromUri (suri: string, meta: KeyringPair$Meta = {}, type?: KeypairType): KeyringPair {
    return this.keyring.createFromUri(suri, meta, type);
  }
@@ -95,7 +77,7 @@ export class Keyring extends Base implements KeyringStruct {
    json.meta.whenEdited = Date.now();

    this.keyring.addFromJson(json);
-    this.accounts.add(this._store, pair.address(), json);
+    this.accounts.add(this._store, pair.address, json);
  }

  forgetAccount (address: string): void {
@@ -121,10 +103,11 @@ export class Keyring extends Base implements KeyringStruct {
    return Object
      .keys(available)
      .map((address) => this.getAddress(address, 'account'))
-      .filter((account) => env.isDevelopment() || account.getMeta().isTesting !== true);
+      .filter((account) => env.isDevelopment() || account.meta.isTesting !== true);
  }

  getAddress (_address: string | Uint8Array, type: KeyringItemType | null = null): KeyringAddress {
+    const encodeAddress = this.encodeAddress;
    const address = isString(_address)
      ? _address
      : this.encodeAddress(_address);
@@ -148,14 +131,19 @@ export class Keyring extends Base implements KeyringStruct {
    }

    return {
-      address: (): string =>
-        address,
-      isValid: (): boolean =>
-        !!subject.getValue()[address],
-      publicKey: (): Uint8Array =>
-        publicKey,
-      getMeta: (): KeyringJson$Meta =>
-        subject.getValue()[address].json.meta
+      get address (): string {
+        return encodeAddress(publicKey);
+      },
+      get isValid (): boolean {
+        return !!(subject && subject.getValue()[address]);
+      },
+      get publicKey (): Uint8Array {
+        return publicKey;
+      },
+      get meta (): KeyringJson$Meta {
+        // This is actually non-applicable, i.e. here we will have a subject
+        return subject ? subject.getValue()[address].json.meta : {};
+      }
    };
  }

@@ -197,7 +185,7 @@ export class Keyring extends Base implements KeyringStruct {
      // FIXME Just for the transition period (ignoreChecksum)
      const pair = this.keyring.addFromJson(json as KeyringPair$Json, true);

-      this.accounts.add(this._store, pair.address(), json);
+      this.accounts.add(this._store, pair.address, json);
    }

    const [, hexAddr] = key.split(':');
@@ -245,7 +233,7 @@ export class Keyring extends Base implements KeyringStruct {
    };
    const pair = this.keyring.addFromAddress(address, json.meta);

-    this.accounts.add(this._store, pair.address(), json);
+    this.accounts.add(this._store, pair.address, json);
  }

  loadAll (options: KeyringOptions, injected: Array<{ address: string, meta: KeyringJson$Meta }> = []): void {
@@ -302,17 +290,17 @@ export class Keyring extends Base implements KeyringStruct {
    const json = pair.toJson(password);

    this.keyring.addFromJson(json);
-    this.accounts.add(this._store, pair.address(), json);
+    this.accounts.add(this._store, pair.address, json);

    return json;
  }

  saveAccountMeta (pair: KeyringPair, meta: KeyringPair$Meta): void {
-    const address = pair.address();
+    const address = pair.address;

    this._store.get(accountKey(address), (json: KeyringJson) => {
      pair.setMeta(meta);
-      json.meta = pair.getMeta();
+      json.meta = pair.meta;

      this.accounts.add(this._store, address, json);
    });
@@ -44,10 +44,10 @@ export type KeyringJson = {
 };

 export type KeyringAddress = {
-  address: () => string,
-  isValid: () => boolean,
-  publicKey: () => Uint8Array,
-  getMeta: () => KeyringJson$Meta
+  readonly address: string,
+  readonly isValid: boolean,
+  readonly meta: KeyringJson$Meta,
+  readonly publicKey: Uint8Array
 };

 export type KeyringAddressType = 'address' | 'contract';
@@ -70,9 +70,6 @@ export interface KeyringStruct {
  addPair: (pair: KeyringPair, password: string) => CreateResult;
  addUri: (suri: string, password?: string, meta?: KeyringPair$Meta, type?: KeypairType) => CreateResult;
  backupAccount: (pair: KeyringPair, password: string) => KeyringPair$Json;
-  createAccount: (seed: Uint8Array, password?: string, meta?: KeyringPair$Meta) => KeyringPair;
-  createAccountExternal: (publicKey: Uint8Array, meta?: KeyringPair$Meta) => KeyringPair;
-  createAccountMnemonic: (seed: string, password?: string, meta?: KeyringPair$Meta) => KeyringPair;
  createFromUri (suri: string, meta?: KeyringPair$Meta, type?: KeypairType): KeyringPair;
  decodeAddress: (key: string | Uint8Array) => Uint8Array;
  encodeAddress: (key: string | Uint8Array) => string;
@@ -14,7 +14,7 @@
    "store": "^2.0.12"
  },
  "devDependencies": {
-    "@polkadot/util": "^0.93.0-beta.3"
+    "@polkadot/util": "^0.93.0-beta.5"
  },
  "peerDependencies": {
    "@polkadot/util": "*"
@@ -1905,14 +1905,14 @@
    typescript "^3.5.1"
    vuepress "^1.0.1"

-"@polkadot/keyring@^0.93.0-beta.3":
-  version "0.93.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.93.0-beta.3.tgz#3d980c6546e4b7f49b83a621621412f1d322db1b"
-  integrity sha512-mjU1mycuIOdXgbwDVlVwnojaBxtfraoiKvilG14EvG5bCMEQoGU3jUdOTXQs7v1bhrjmrXFMfixaZlco394Gow==
+"@polkadot/keyring@^0.93.0-beta.5":
+  version "0.93.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.93.0-beta.5.tgz#581cedb279ce718026a5d901065293d4193dfbe9"
+  integrity sha512-NHNVyn1DmpD6yN06caHdkmrrhQIh/bvs87DlnsjsGA2PccQFH+UO315Qa3eNmueZorCzyIKTsOYBpY1lwehqSw==
  dependencies:
    "@babel/runtime" "^7.4.5"
-    "@polkadot/util" "^0.93.0-beta.3"
-    "@polkadot/util-crypto" "^0.93.0-beta.3"
+    "@polkadot/util" "^0.93.0-beta.5"
+    "@polkadot/util-crypto" "^0.93.0-beta.5"
    "@types/bs58" "^4.0.0"
    bs58 "^4.0.1"

@@ -1923,22 +1923,22 @@
  dependencies:
    "@types/chrome" "^0.0.86"

-"@polkadot/types@^0.81.0-beta.10":
-  version "0.81.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.81.0-beta.10.tgz#09103b476e0c505a1d983f017a9bec1d2f44686f"
-  integrity sha512-4rLlqR/TeGbQ8dSha+YusQ9ptu2vzz/snCd8Ys/z1Dwt0bKhRP1uityQyCCM1AHeWoyGs/K0eetXP/h3f9okIg==
+"@polkadot/types@^0.81.0-beta.14":
+  version "0.81.0-beta.14"
+  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.81.0-beta.14.tgz#fc0693a60ce2eef5ece72676b04bad567b74be15"
+  integrity sha512-KkmeZUgwMuO10QxzpgTGyi7nRiNoJeeAG7MtVEtRlWjUrIAhjAzdxWgy/hoYycxs7hRHCWmSiDloomde9/zF+w==
  dependencies:
    "@babel/runtime" "^7.4.5"
-    "@polkadot/util" "^0.93.0-beta.3"
-    "@polkadot/util-crypto" "^0.93.0-beta.3"
+    "@polkadot/util" "^0.93.0-beta.5"
+    "@polkadot/util-crypto" "^0.93.0-beta.5"

-"@polkadot/util-crypto@^0.93.0-beta.3":
-  version "0.93.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.93.0-beta.3.tgz#8d590c18fa7cd72042a53d6a79332f1fcac98758"
-  integrity sha512-o6K36gz47Zuqd1e//sNmx5axGCMJrZRJMgXZQgSXPBgb423JFR3IZYZVqQx+r+k5xTqH6t9VhXfv55jE5YyFiA==
+"@polkadot/util-crypto@^0.93.0-beta.5":
+  version "0.93.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.93.0-beta.5.tgz#81a399395825b22d532d3834c12e143112564cd5"
+  integrity sha512-GntTfbZd2qfIo1GdYTHtimuDhQIiexiLaQ3/qfShAZ3BP1QiVHx6yYFngMPkEKnebx7rgowT4g0yH1ztf35WiQ==
  dependencies:
    "@babel/runtime" "^7.4.5"
-    "@polkadot/util" "^0.93.0-beta.3"
+    "@polkadot/util" "^0.93.0-beta.5"
    "@polkadot/wasm-crypto" "^0.11.1"
    "@types/bip39" "^2.4.2"
    "@types/pbkdf2" "^3.0.0"
@@ -1951,10 +1951,10 @@
    tweetnacl "^1.0.1"
    xxhashjs "^0.2.2"

-"@polkadot/util@^0.93.0-beta.3":
-  version "0.93.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.93.0-beta.3.tgz#6334ab1026f743f3a4f45740091066ee8041aff7"
-  integrity sha512-rFRcT8OHXNvx+tGMeDRZOAoeGguiRVsEk5+MYXViq0sjuK+YWioWmDEN+HiiqBB2Qih0BQ+UEZ63MXqZAwH2vg==
+"@polkadot/util@^0.93.0-beta.5":
+  version "0.93.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.93.0-beta.5.tgz#c0b27459fdf4848382403b924698f1b012df8c88"
+  integrity sha512-dhJ56+5dYAAz45rdc5AqvFGI1qeQ8qTGiFbiE9S+ZXimEU/3mR1LRcq8nMx4aeZaC3blrReuAmzTxLS2c6aOsw==
  dependencies:
    "@babel/runtime" "^7.4.5"
    "@types/bn.js" "^4.11.5"
@@ -2133,9 +2133,9 @@
  integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==

 "@types/jest@^24.0.13":
-  version "24.0.13"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.13.tgz#10f50b64cb05fb02411fbba49e9042a3a11da3f9"
-  integrity sha512-3m6RPnO35r7Dg+uMLj1+xfZaOgIHHHut61djNjzwExXN4/Pm9has9C6I1KMYSfz7mahDhWUOVg4HW/nZdv5Pww==
+  version "24.0.14"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.14.tgz#bb40fec243164b2def5cfaddd0cb4d4e958c5c1c"
+  integrity sha512-IxS2AO0nOr4zrpKfRCxobQUb1bSK6ejodZ7odCzHXMjsASCI8J10N8qVQhrCjvJTc3bUjGGeuD+ytKZqyhajqQ==
  dependencies:
    "@types/jest-diff" "*"

@@ -4810,9 +4810,9 @@ depd@^1.1.2, depd@~1.1.2:
  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=

 deprecation@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.0.0.tgz#dd0427cd920c78bc575ec39dab2f22e7c304fb9d"
-  integrity sha512-lbQN037mB3VfA2JFuguM5GCJ+zPinMeCrFe+AfSZ6eqrnJA/Fs+EYMnd6Nb2mn9lf2jO9xwEd9o9lic+D4vkcw==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.0.tgz#a828f8e6a1105b70b5a8f971a3d057cbfde890cb"
+  integrity sha512-XkLgHkoeWhfPyUv3V1ocE1UGSulHHdFz+uDNUgaOp345+urSFNL7ylsSZnH0gIxWCRoOV0WiniGkSSvTqZmsKQ==

 des.js@^1.0.0:
  version "1.0.0"
@@ -5065,9 +5065,9 @@ ee-first@1.1.1:
  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=

 electron-to-chromium@^1.3.150:
-  version "1.3.157"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.157.tgz#6211d69e8c4ee18df8c84e74e8644bcafc09486c"
-  integrity sha512-vxGi3lOGqlupuogZxJOMfu+Q1vaOlG6XbsblWw8XnUZSr/ptbt3D6jhHT5LJPZuFUpKhbEo1u4QipivSory1Kg==
+  version "1.3.158"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.158.tgz#5e16909dcfd25ab7cd1665114ee381083a3ee858"
+  integrity sha512-wJsJaWsViNQ129XPGmyO5gGs1jPMHr9vffjHAhUje1xZbEzQcqbENdvfyRD9q8UF0TgFQFCCUbaIpJarFbvsIg==

 elliptic@^6.0.0, elliptic@^6.4.1:
  version "6.4.1"
@@ -6476,10 +6476,10 @@ http-errors@~1.6.2:
    setprototypeof "1.1.0"
    statuses ">= 1.4.0 < 2"

-http-parser-js@>=0.4.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
-  integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
+"http-parser-js@>= 0.4.0, < 0.4.11":
+  version "0.4.10"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
+  integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=

 http-proxy-agent@^2.1.0:
  version "2.1.0"
@@ -6656,11 +6656,6 @@ indexes-of@^1.0.1:
  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=

-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
-
 inflight@^1.0.4:
  version "1.0.6"
  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -7341,9 +7336,9 @@ jest-get-type@^24.8.0:
  integrity sha512-RR4fo8jEmMD9zSz2nLbs2j0zvPpk/KCEz3a62jJWbd2ayNo0cb+KFRxPHVhE4ZmgGJEQp0fosmNz84IfqM8cMQ==

 jest-haste-map@^24.8.0:
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.0.tgz#51794182d877b3ddfd6e6d23920e3fe72f305800"
-  integrity sha512-ZBPRGHdPt1rHajWelXdqygIDpJx8u3xOoLyUBWRW28r3tagrgoepPrzAozW7kW9HrQfhvmiv1tncsxqHJO1onQ==
+  version "24.8.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.1.tgz#f39cc1d2b1d907e014165b4bd5a957afcb992982"
+  integrity sha512-SwaxMGVdAZk3ernAx2Uv2sorA7jm3Kx+lR0grp6rMmnY06Kn/urtKx1LPN2mGTea4fCT38impYT28FfcLUhX0g==
  dependencies:
    "@jest/types" "^24.8.0"
    anymatch "^2.0.0"
@@ -8786,9 +8781,9 @@ node-int64@^0.4.0:
  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=

 node-libs-browser@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
-  integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
  dependencies:
    assert "^1.1.1"
    browserify-zlib "^0.2.0"
@@ -8800,7 +8795,7 @@ node-libs-browser@^2.0.0:
    events "^3.0.0"
    https-browserify "^1.0.0"
    os-browserify "^0.3.0"
-    path-browserify "0.0.0"
+    path-browserify "0.0.1"
    process "^0.11.10"
    punycode "^1.2.4"
    querystring-es3 "^0.2.0"
@@ -8812,7 +8807,7 @@ node-libs-browser@^2.0.0:
    tty-browserify "0.0.0"
    url "^0.11.0"
    util "^0.11.0"
-    vm-browserify "0.0.4"
+    vm-browserify "^1.0.1"

 node-modules-regexp@^1.0.0:
  version "1.0.0"
@@ -9480,10 +9475,10 @@ pascalcase@^0.1.1:
  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=

-path-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==

 path-dirname@^1.0.0:
  version "1.0.2"
@@ -10893,7 +10888,7 @@ rxjs@^6.4.0:
  dependencies:
    tslib "^1.9.0"

-safe-buffer@5.1.2, safe-buffer@>=5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, "safe-buffer@>= 5.1.0", safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  version "5.1.2"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -11760,9 +11755,9 @@ svgo@^1.0.0:
    util.promisify "~1.0.0"

 symbol-tree@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
-  integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==

 tapable@^1.0.0, tapable@^1.1.0:
  version "1.1.3"
@@ -12478,12 +12473,10 @@ verror@1.10.0:
    core-util-is "1.0.2"
    extsprintf "^1.2.0"

-vm-browserify@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
-  dependencies:
-    indexof "0.0.1"
+vm-browserify@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
+  integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==

 vue-hot-reload-api@^2.3.0:
  version "2.3.3"
@@ -12739,9 +12732,9 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0:
    source-map "~0.6.1"

 webpack@^4.33.0, webpack@^4.8.1:
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.33.0.tgz#c30fc4307db432e5c5e3333aaa7c16a15a3b277e"
-  integrity sha512-ggWMb0B2QUuYso6FPZKUohOgfm+Z0sVFs8WwWuSH1IAvkWs428VDNmOlAxvHGTB9Dm/qOB/qtE5cRx5y01clxw==
+  version "4.34.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.34.0.tgz#a4c30129482f7b4ece4c0842002dedf2b56fab58"
+  integrity sha512-ry2IQy1wJjOefLe1uJLzn5tG/DdIKzQqNlIAd2L84kcaADqNvQDTBlo8UcCNyDaT5FiaB+16jhAkb63YeG3H8Q==
  dependencies:
    "@webassemblyjs/ast" "1.8.5"
    "@webassemblyjs/helper-module-context" "1.8.5"
@@ -12783,15 +12776,15 @@ webpackbar@3.2.0:
    wrap-ansi "^5.1.0"

 websocket-driver@>=0.5.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.1.tgz#d58fa3269f51e480f5af051db7f5c5c1a1092d20"
-  integrity sha512-EC4YX5LEHtiB1XjaCh6++35jGaFmhT7687pySyCfPX9bB8Quw7+Fpx8gSCpkD78tPjalxuoOm8TtTz8K4dAQEg==
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.2.tgz#373303067d1dbefa3fddfa228a32b2a098957fa6"
+  integrity sha512-RRTAkzsGiOP8PwGwLfd/H0NbotLXyS5zxg4EbuQ2K3aNqgUOVbOzBKKvTXzUsKiwVs+pBpBtqBYHj6PS6JVXDQ==
  dependencies:
-    http-parser-js ">=0.4.0"
-    safe-buffer ">=5.1.1"
-    websocket-extensions ">=0.1.1"
+    http-parser-js ">= 0.4.0, < 0.4.11"
+    safe-buffer ">= 5.1.0"
+    websocket-extensions ">= 0.1.1"

-websocket-extensions@>=0.1.1:
+"websocket-extensions@>= 0.1.1":
  version "0.1.3"
  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==