From fe0bf5d60de57c0f9b1971f59e89e675858c98a4 Mon Sep 17 00:00:00 2001 From: Doug Kent Date: Mon, 17 Aug 2020 06:08:07 -0400 Subject: [PATCH] update package-lock --- package-lock.json | 3591 ++++----------------------------------------- 1 file changed, 251 insertions(+), 3340 deletions(-) diff --git a/package-lock.json b/package-lock.json index 79544fccc..b922d6961 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,17 +5,18 @@ "requires": true, "dependencies": { "3box": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/3box/-/3box-1.20.3.tgz", - "integrity": "sha512-aa8cJT4F/x75JL0prcFtdbhtaLslwzb8riqFXDHVitKeVXCsES9KSwyXkP9oo5wi93ACryhmwN1gkLzZ8FuCNg==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/3box/-/3box-1.21.0.tgz", + "integrity": "sha512-4D8+VeRyXFF6ECaBgPdengxgKRRfA3nlllAVtsZupv8MKpAGkoc/c+5k+XBwWtbozbv3EFY0we/QWpS7Uf1GRA==", "requires": { - "3box-orbitdb-plugins": "^2.1.0", - "3id-blockchain-utils": "^0.4.0", + "3box-orbitdb-plugins": "^2.1.2", + "3box-shared-cache": "^1.1.0", + "3id-blockchain-utils": "^0.4.1", "3id-connect": "0.1.0", "3id-resolver": "^1.0.0", "@babel/runtime": "^7.4.5", - "@ethersproject/hdnode": "5.0.0-beta.137", - "@ethersproject/wallet": "5.0.0-beta.136", + "@ethersproject/hdnode": "5.0.2", + "@ethersproject/wallet": "5.0.2", "did-jwt": "^4.2.0", "did-resolver": "^1.1.0", "events": "^3.0.0", @@ -28,11 +29,12 @@ "ipfs-repo": "^3.0.2", "is-ipfs": "^1.0.3", "js-sha256": "^0.9.0", + "levelup": "^4.4.0", "libp2p-pubsub": "^0.4.6", "lodash.merge": "^4.6.2", "muport-did-resolver": "^1.0.2", "node-fetch": "^2.6.0", - "orbit-db": "^0.24.1", + "orbit-db": "^0.24.2", "orbit-db-cache": "^0.3.0", "orbit-db-identity-provider": "^0.3.0", "orbit-db-storage-adapter": "^0.5.3", @@ -42,6 +44,57 @@ "tweetnacl-util": "^0.15.0" }, "dependencies": { + "abstract-leveldown": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz", + "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==", + "requires": { + "buffer": "^5.5.0", + "immediate": "^3.2.3", + "level-concat-iterator": "~2.0.0", + "level-supports": "~1.0.0", + "xtend": "~4.0.0" + } + }, + "deferred-leveldown": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz", + "integrity": "sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==", + "requires": { + "abstract-leveldown": "~6.2.1", + "inherits": "^2.0.3" + } + }, + "level-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz", + "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==", + "requires": { + "errno": "~0.1.1" + } + }, + "level-iterator-stream": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz", + "integrity": "sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==", + "requires": { + "inherits": "^2.0.4", + "readable-stream": "^3.4.0", + "xtend": "^4.0.2" + } + }, + "levelup": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz", + "integrity": "sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==", + "requires": { + "deferred-leveldown": "~5.3.0", + "level-errors": "~2.0.0", + "level-iterator-stream": "~4.0.0", + "level-supports": "~1.0.0", + "xtend": "~4.0.0" + } + }, "p-timeout": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", @@ -50,6 +103,16 @@ "p-finally": "^1.0.0" } }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, "tweetnacl": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", @@ -96,61 +159,109 @@ } } }, - "3id-blockchain-utils": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/3id-blockchain-utils/-/3id-blockchain-utils-0.4.1.tgz", - "integrity": "sha512-z7Qb4CuTVg/ug3i7/Gp+l9ZebNAcz4fPFEjXnS8gwA+mAvRUl4uCF2psvcQJtWtImLvznFwUAtXDG9T0N6ylLA==", + "3box-shared-cache": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/3box-shared-cache/-/3box-shared-cache-1.1.0.tgz", + "integrity": "sha512-08d5538dNltMX4c+Oev3Bt5cw/gQCmHUQFugF6stWxXhpOPR/ukU4sbmyaP1+bx2IjfP678XWyWWF82KoIkV4Q==", "requires": { "@babel/runtime": "^7.9.2", - "@ethersproject/contracts": "^5.0.1", - "@ethersproject/providers": "^5.0.4", - "@ethersproject/wallet": "^5.0.1", - "js-sha256": "^0.9.0" + "abstract-leveldown": "^6.2.2", + "datastore-level": "^1.1.0", + "level-js": "^4.0.2", + "levelup": "^4.3.2", + "orbit-db-storage-adapter": "^0.5.3", + "postmsg-rpc": "^2.4.0" }, "dependencies": { - "@ethersproject/hdnode": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.2.tgz", - "integrity": "sha512-QAUI5tfseTFqv00Vnbwzofqse81wN9TaL+x5GufTHIHJXgVdguxU+l39E3VYDCmO+eVAA6RCn5dJgeyra+PU2g==", + "abstract-leveldown": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz", + "integrity": "sha512-TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ==", "requires": { - "@ethersproject/abstract-signer": "^5.0.0", - "@ethersproject/basex": "^5.0.0", - "@ethersproject/bignumber": "^5.0.0", - "@ethersproject/bytes": "^5.0.0", - "@ethersproject/logger": "^5.0.0", - "@ethersproject/pbkdf2": "^5.0.0", - "@ethersproject/properties": "^5.0.0", - "@ethersproject/sha2": "^5.0.0", - "@ethersproject/signing-key": "^5.0.0", - "@ethersproject/strings": "^5.0.0", - "@ethersproject/transactions": "^5.0.0", - "@ethersproject/wordlists": "^5.0.0" + "buffer": "^5.5.0", + "immediate": "^3.2.3", + "level-concat-iterator": "~2.0.0", + "level-supports": "~1.0.0", + "xtend": "~4.0.0" } }, - "@ethersproject/wallet": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.2.tgz", - "integrity": "sha512-gg86ynLV5k5caNnYpJoYc6WyIUHKMTjOITCk5zXGyVbbkXE07y/fGql4A51W0C6mWkeb5Mzz8AKqzHZECdH30w==", + "deferred-leveldown": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz", + "integrity": "sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==", "requires": { - "@ethersproject/abstract-provider": "^5.0.0", - "@ethersproject/abstract-signer": "^5.0.0", - "@ethersproject/address": "^5.0.0", - "@ethersproject/bignumber": "^5.0.0", - "@ethersproject/bytes": "^5.0.0", - "@ethersproject/hash": "^5.0.0", - "@ethersproject/hdnode": "^5.0.0", - "@ethersproject/json-wallets": "^5.0.0", - "@ethersproject/keccak256": "^5.0.0", - "@ethersproject/logger": "^5.0.0", - "@ethersproject/properties": "^5.0.0", - "@ethersproject/random": "^5.0.0", - "@ethersproject/signing-key": "^5.0.0", - "@ethersproject/transactions": "^5.0.0", - "@ethersproject/wordlists": "^5.0.0" + "abstract-leveldown": "~6.2.1", + "inherits": "^2.0.3" + }, + "dependencies": { + "abstract-leveldown": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz", + "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==", + "requires": { + "buffer": "^5.5.0", + "immediate": "^3.2.3", + "level-concat-iterator": "~2.0.0", + "level-supports": "~1.0.0", + "xtend": "~4.0.0" + } + } + } + }, + "level-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz", + "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==", + "requires": { + "errno": "~0.1.1" + } + }, + "level-iterator-stream": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz", + "integrity": "sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==", + "requires": { + "inherits": "^2.0.4", + "readable-stream": "^3.4.0", + "xtend": "^4.0.2" + } + }, + "levelup": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz", + "integrity": "sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==", + "requires": { + "deferred-leveldown": "~5.3.0", + "level-errors": "~2.0.0", + "level-iterator-stream": "~4.0.0", + "level-supports": "~1.0.0", + "xtend": "~4.0.0" + } + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } } } }, + "3id-blockchain-utils": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/3id-blockchain-utils/-/3id-blockchain-utils-0.4.1.tgz", + "integrity": "sha512-z7Qb4CuTVg/ug3i7/Gp+l9ZebNAcz4fPFEjXnS8gwA+mAvRUl4uCF2psvcQJtWtImLvznFwUAtXDG9T0N6ylLA==", + "requires": { + "@babel/runtime": "^7.9.2", + "@ethersproject/contracts": "^5.0.1", + "@ethersproject/providers": "^5.0.4", + "@ethersproject/wallet": "^5.0.1", + "js-sha256": "^0.9.0" + } + }, "3id-connect": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/3id-connect/-/3id-connect-0.1.0.tgz", @@ -3530,22 +3641,22 @@ } }, "@ethersproject/hdnode": { - "version": "5.0.0-beta.137", - "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.0-beta.137.tgz", - "integrity": "sha512-TDe57vm/tndbaSKi/NRgC0uAp4uVr60LurTAw+u6mG5ihZg9mlYgr15GxOXWTRiJfa3V3kQD8VsTpzlNMYHViw==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.2.tgz", + "integrity": "sha512-QAUI5tfseTFqv00Vnbwzofqse81wN9TaL+x5GufTHIHJXgVdguxU+l39E3VYDCmO+eVAA6RCn5dJgeyra+PU2g==", "requires": { - "@ethersproject/abstract-signer": ">=5.0.0-beta.132", - "@ethersproject/basex": ">=5.0.0-beta.127", - "@ethersproject/bignumber": ">=5.0.0-beta.130", - "@ethersproject/bytes": ">=5.0.0-beta.129", - "@ethersproject/logger": ">=5.0.0-beta.129", - "@ethersproject/pbkdf2": ">=5.0.0-beta.127", - "@ethersproject/properties": ">=5.0.0-beta.131", - "@ethersproject/sha2": ">=5.0.0-beta.129", - "@ethersproject/signing-key": ">=5.0.0-beta.129", - "@ethersproject/strings": ">=5.0.0-beta.130", - "@ethersproject/transactions": ">=5.0.0-beta.128", - "@ethersproject/wordlists": ">=5.0.0-beta.128" + "@ethersproject/abstract-signer": "^5.0.0", + "@ethersproject/basex": "^5.0.0", + "@ethersproject/bignumber": "^5.0.0", + "@ethersproject/bytes": "^5.0.0", + "@ethersproject/logger": "^5.0.0", + "@ethersproject/pbkdf2": "^5.0.0", + "@ethersproject/properties": "^5.0.0", + "@ethersproject/sha2": "^5.0.0", + "@ethersproject/signing-key": "^5.0.0", + "@ethersproject/strings": "^5.0.0", + "@ethersproject/transactions": "^5.0.0", + "@ethersproject/wordlists": "^5.0.0" } }, "@ethersproject/json-wallets": { @@ -3568,25 +3679,6 @@ "scrypt-js": "3.0.1" }, "dependencies": { - "@ethersproject/hdnode": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.2.tgz", - "integrity": "sha512-QAUI5tfseTFqv00Vnbwzofqse81wN9TaL+x5GufTHIHJXgVdguxU+l39E3VYDCmO+eVAA6RCn5dJgeyra+PU2g==", - "requires": { - "@ethersproject/abstract-signer": "^5.0.0", - "@ethersproject/basex": "^5.0.0", - "@ethersproject/bignumber": "^5.0.0", - "@ethersproject/bytes": "^5.0.0", - "@ethersproject/logger": "^5.0.0", - "@ethersproject/pbkdf2": "^5.0.0", - "@ethersproject/properties": "^5.0.0", - "@ethersproject/sha2": "^5.0.0", - "@ethersproject/signing-key": "^5.0.0", - "@ethersproject/strings": "^5.0.0", - "@ethersproject/transactions": "^5.0.0", - "@ethersproject/wordlists": "^5.0.0" - } - }, "scrypt-js": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz", @@ -3762,25 +3854,25 @@ } }, "@ethersproject/wallet": { - "version": "5.0.0-beta.136", - "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.0-beta.136.tgz", - "integrity": "sha512-ORK5/zCf0XCh7lcTKDXXUm18Crm4kjM3k/J6HRzs56LCHDlDlQbWRnfubq7uj6ZH6/FEIuf5F2J8YvOVpoqcSA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.2.tgz", + "integrity": "sha512-gg86ynLV5k5caNnYpJoYc6WyIUHKMTjOITCk5zXGyVbbkXE07y/fGql4A51W0C6mWkeb5Mzz8AKqzHZECdH30w==", "requires": { - "@ethersproject/abstract-provider": ">=5.0.0-beta.131", - "@ethersproject/abstract-signer": ">=5.0.0-beta.132", - "@ethersproject/address": ">=5.0.0-beta.128", - "@ethersproject/bignumber": ">=5.0.0-beta.130", - "@ethersproject/bytes": ">=5.0.0-beta.129", - "@ethersproject/hash": ">=5.0.0-beta.128", - "@ethersproject/hdnode": ">=5.0.0-beta.130", - "@ethersproject/json-wallets": ">=5.0.0-beta.129", - "@ethersproject/keccak256": ">=5.0.0-beta.127", - "@ethersproject/logger": ">=5.0.0-beta.129", - "@ethersproject/properties": ">=5.0.0-beta.131", - "@ethersproject/random": ">=5.0.0-beta.128", - "@ethersproject/signing-key": ">=5.0.0-beta.129", - "@ethersproject/transactions": ">=5.0.0-beta.128", - "@ethersproject/wordlists": ">=5.0.0-beta.128" + "@ethersproject/abstract-provider": "^5.0.0", + "@ethersproject/abstract-signer": "^5.0.0", + "@ethersproject/address": "^5.0.0", + "@ethersproject/bignumber": "^5.0.0", + "@ethersproject/bytes": "^5.0.0", + "@ethersproject/hash": "^5.0.0", + "@ethersproject/hdnode": "^5.0.0", + "@ethersproject/json-wallets": "^5.0.0", + "@ethersproject/keccak256": "^5.0.0", + "@ethersproject/logger": "^5.0.0", + "@ethersproject/properties": "^5.0.0", + "@ethersproject/random": "^5.0.0", + "@ethersproject/signing-key": "^5.0.0", + "@ethersproject/transactions": "^5.0.0", + "@ethersproject/wordlists": "^5.0.0" } }, "@ethersproject/web": { @@ -7700,15 +7792,9 @@ "integrity": "sha512-XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w==" }, "@toruslabs/eccrypto": { -<<<<<<< refs/remotes/origin/dev-2 "version": "1.1.5", "resolved": "https://registry.npmjs.org/@toruslabs/eccrypto/-/eccrypto-1.1.5.tgz", "integrity": "sha512-7sSAQ9M6b9wzxpIE98yi8zPh3wgdYiVBxvMvCOCb4c65UDOT6lpZyH30qP2fX30PaI+I2Ra+FwjfCCUuJegxfQ==", -======= - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@toruslabs/eccrypto/-/eccrypto-1.1.4.tgz", - "integrity": "sha512-AQYcd7AM6ePb+V6CZTb6Lb/iaZ/BKpZ66AFdF1YLvMnyBeRY1JgdFOnjQfhtrUAYRMdcc8pBfvjFoWWK7EcggA==", ->>>>>>> package-lock "requires": { "acorn": "^7.4.0", "elliptic": "^6.5.3", @@ -7956,48 +8042,6 @@ } }, "@toruslabs/torus.js": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/@toruslabs/torus.js/-/torus.js-2.2.5.tgz", - "integrity": "sha512-fxrIQmtNo4p3uEy5KdiIrZiB32KGPtaV70PoPg/vQB4IL/gjrQSYSIcC0VyP04yBfjHLccJe/HKOhlofpKcjAg==", - "requires": { - "@toruslabs/eccrypto": "^1.1.4", -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 ->>>>>>> package-lock - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/@toruslabs/torus.js/-/torus.js-2.2.4.tgz", - "integrity": "sha512-xFDWWGHl9gXkduEysSIWvWR5KPJnYDq9Y1cA7v2oIf0/cevldD03iafg2JeP2m3P8LcyPkYS6stCcDStv24TUg==", - "requires": { - "@toruslabs/eccrypto": "^1.1.3", ->>>>>>> package-lock - "@toruslabs/http-helpers": "^1.3.4", -======= - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/@toruslabs/torus.js/-/torus.js-2.2.3.tgz", - "integrity": "sha512-GryzcqY5/iumfCy0LNUIdjo9iKYRHof6UQzHYK/u2oc4XtCWVKnwk+6OZfuYeurEoW/VDYU+b1MEa7qqOKV9RQ==", - "requires": { - "@toruslabs/eccrypto": "^1.1.3", - "@toruslabs/http-helpers": "^1.3.3", ->>>>>>> remove webpack from dependencies -======= - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/@toruslabs/torus.js/-/torus.js-2.2.4.tgz", - "integrity": "sha512-xFDWWGHl9gXkduEysSIWvWR5KPJnYDq9Y1cA7v2oIf0/cevldD03iafg2JeP2m3P8LcyPkYS6stCcDStv24TUg==", -======= -======= ->>>>>>> fix merge conflict "version": "2.2.5", "resolved": "https://registry.npmjs.org/@toruslabs/torus.js/-/torus.js-2.2.5.tgz", "integrity": "sha512-fxrIQmtNo4p3uEy5KdiIrZiB32KGPtaV70PoPg/vQB4IL/gjrQSYSIcC0VyP04yBfjHLccJe/HKOhlofpKcjAg==", @@ -8288,14 +8332,6 @@ "version": "4.14.159", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.159.tgz", "integrity": "sha512-gF7A72f7WQN33DpqOWw9geApQPh4M3PxluMtaHxWHXEGSN12/WbcEk/eNSqWNQcQhF66VSZ06vCF94CrHwXJDg==" -<<<<<<< refs/remotes/origin/dev-2 - }, - "@types/long": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", - "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" -======= ->>>>>>> package-lock }, "@types/long": { "version": "4.0.1", @@ -8541,15 +8577,9 @@ } }, "@types/react-select": { -<<<<<<< refs/remotes/origin/dev-2 "version": "3.0.19", "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.19.tgz", "integrity": "sha512-d+6qtfFXZeIOAABlVL1e50RZn8ctOABE4tFDxM6KW4lKuXgTTgLVrSik5AX9XjBjV7N80FtS6GTN/WeoXL9Jww==", -======= - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.16.tgz", - "integrity": "sha512-qXCfHprExDzB+ZYCqzH80D2TE+F17MMAY5/GrHm74xSsmS6B6G8nm3gZiTod/u82JSzDO193qJiP7ZxunT8oBg==", ->>>>>>> package-lock "dev": true, "requires": { "@types/react": "*", @@ -8712,50 +8742,9 @@ } }, "@types/underscore": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "1.10.21", "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.21.tgz", "integrity": "sha512-tDEGvuNq36TPjzqXwqzjbcRJSn0I7XH03817tWVhAaaz8k5+0CwUH2K2KpZ3oB5sgkhGMV2l6KhIG401I+ODgg==", -======= - "version": "1.10.17", - "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.17.tgz", - "integrity": "sha512-puV6Kw1HU/WKxyJgSkC0cQCv0UmNWZrjNIWqseDBOg4G3fE6yYXHWGI+9Sjha94FytbVChXPltmQRzCdFt932Q==", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "1.10.17", - "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.17.tgz", - "integrity": "sha512-puV6Kw1HU/WKxyJgSkC0cQCv0UmNWZrjNIWqseDBOg4G3fE6yYXHWGI+9Sjha94FytbVChXPltmQRzCdFt932Q==", -======= - "version": "1.10.14", - "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.14.tgz", - "integrity": "sha512-VE20ZYf38nmOU1lU0wpQBWcGPlskfKK8uU8AN1UIz5PjxT2YM7HTF0iUA85iGJnbQ3tZweqIfQqmLgLMtP27YQ==", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "1.10.17", - "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.17.tgz", - "integrity": "sha512-puV6Kw1HU/WKxyJgSkC0cQCv0UmNWZrjNIWqseDBOg4G3fE6yYXHWGI+9Sjha94FytbVChXPltmQRzCdFt932Q==", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "version": "1.10.20", - "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.20.tgz", - "integrity": "sha512-UiLhTLijxQ6sKP2aQbextgPVovrrxqXFP+UO/l90o1Ytguc85UWtbHcmnZDRe8hQ2MHeA+BJglgbYsgtll/zyw==", ->>>>>>> package-lock ->>>>>>> package-lock -======= - "version": "1.10.20", - "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.20.tgz", - "integrity": "sha512-UiLhTLijxQ6sKP2aQbextgPVovrrxqXFP+UO/l90o1Ytguc85UWtbHcmnZDRe8hQ2MHeA+BJglgbYsgtll/zyw==", ->>>>>>> fix merge conflict "dev": true }, "@types/web3": { @@ -8846,86 +8835,12 @@ "integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==" }, "@typescript-eslint/eslint-plugin": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.9.0.tgz", - "integrity": "sha512-UD6b4p0/hSe1xdTvRCENSx7iQ+KR6ourlZFfYuPC7FlXEzdHuLPrEmuxZ23b2zW96KJX9Z3w05GE/wNOiEzrVg==", - "dev": true, - "requires": { - "@typescript-eslint/experimental-utils": "3.9.0", -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 ->>>>>>> 3box fix for identity-wallet - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.1.tgz", - "integrity": "sha512-3DB9JDYkMrc8Au00rGFiJLK2Ja9CoMP6Ut0sHsXp3ZtSugjNxvSSHTnKLfo4o+QmjYBJqEznDqsG1zj4F2xnsg==", - "dev": true, - "requires": { - "@typescript-eslint/experimental-utils": "3.7.1", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.0.tgz", - "integrity": "sha512-4OEcPON3QIx0ntsuiuFP/TkldmBGXf0uKxPQlGtS/W2F3ndYm8Vgdpj/woPJkzUc65gd3iR+qi3K8SDQP/obFg==", - "dev": true, - "requires": { - "@typescript-eslint/experimental-utils": "3.7.0", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.1.tgz", - "integrity": "sha512-3DB9JDYkMrc8Au00rGFiJLK2Ja9CoMP6Ut0sHsXp3ZtSugjNxvSSHTnKLfo4o+QmjYBJqEznDqsG1zj4F2xnsg==", - "dev": true, - "requires": { - "@typescript-eslint/experimental-utils": "3.7.1", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.8.0.tgz", - "integrity": "sha512-lFb4VCDleFSR+eo4Ew+HvrJ37ZH1Y9ZyE+qyP7EiwBpcCVxwmUc5PAqhShCQ8N8U5vqYydm74nss+a0wrrCErw==", - "dev": true, - "requires": { - "@typescript-eslint/experimental-utils": "3.8.0", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= -======= ->>>>>>> fix merge conflict "version": "3.9.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.9.0.tgz", "integrity": "sha512-UD6b4p0/hSe1xdTvRCENSx7iQ+KR6ourlZFfYuPC7FlXEzdHuLPrEmuxZ23b2zW96KJX9Z3w05GE/wNOiEzrVg==", "dev": true, "requires": { "@typescript-eslint/experimental-utils": "3.9.0", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> 3box fix for identity-wallet ->>>>>>> 3box fix for identity-wallet -======= ->>>>>>> fix merge conflict "debug": "^4.1.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -8966,9 +8881,6 @@ } }, "@typescript-eslint/experimental-utils": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "3.9.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.9.0.tgz", "integrity": "sha512-/vSHUDYizSOhrOJdjYxPNGfb4a3ibO8zd4nUKo/QBFOmxosT3cVUV7KIg8Dwi6TXlr667G7YPqFK9+VSZOorNA==", @@ -8977,87 +8889,6 @@ "@types/json-schema": "^7.0.3", "@typescript-eslint/types": "3.9.0", "@typescript-eslint/typescript-estree": "3.9.0", -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 ->>>>>>> 3box fix for identity-wallet - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.1.tgz", - "integrity": "sha512-TqE97pv7HrqWcGJbLbZt1v59tcqsSVpWTOf1AqrWK7n8nok2sGgVtYRuGXeNeLw3wXlLEbY1MKP3saB2HsO/Ng==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/types": "3.7.1", - "@typescript-eslint/typescript-estree": "3.7.1", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.0.tgz", - "integrity": "sha512-xpfXXAfZqhhqs5RPQBfAFrWDHoNxD5+sVB5A46TF58Bq1hRfVROrWHcQHHUM9aCBdy9+cwATcvCbRg8aIRbaHQ==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/types": "3.7.0", - "@typescript-eslint/typescript-estree": "3.7.0", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.1.tgz", - "integrity": "sha512-TqE97pv7HrqWcGJbLbZt1v59tcqsSVpWTOf1AqrWK7n8nok2sGgVtYRuGXeNeLw3wXlLEbY1MKP3saB2HsO/Ng==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/types": "3.7.1", - "@typescript-eslint/typescript-estree": "3.7.1", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.8.0.tgz", - "integrity": "sha512-o8T1blo1lAJE0QDsW7nSyvZHbiDzQDjINJKyB44Z3sSL39qBy5L10ScI/XwDtaiunoyKGLiY9bzRk4YjsUZl8w==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/types": "3.8.0", - "@typescript-eslint/typescript-estree": "3.8.0", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= -======= ->>>>>>> fix merge conflict - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.9.0.tgz", - "integrity": "sha512-/vSHUDYizSOhrOJdjYxPNGfb4a3ibO8zd4nUKo/QBFOmxosT3cVUV7KIg8Dwi6TXlr667G7YPqFK9+VSZOorNA==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/types": "3.9.0", - "@typescript-eslint/typescript-estree": "3.9.0", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> 3box fix for identity-wallet ->>>>>>> 3box fix for identity-wallet -======= ->>>>>>> fix merge conflict "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" }, @@ -9075,9 +8906,6 @@ } }, "@typescript-eslint/parser": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "3.9.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.9.0.tgz", "integrity": "sha512-rDHOKb6uW2jZkHQniUQVZkixQrfsZGUCNWWbKWep4A5hGhN5dLHMUCNAWnC4tXRlHedXkTDptIpxs6e4Pz8UfA==", @@ -9087,161 +8915,10 @@ "@typescript-eslint/experimental-utils": "3.9.0", "@typescript-eslint/types": "3.9.0", "@typescript-eslint/typescript-estree": "3.9.0", -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 ->>>>>>> 3box fix for identity-wallet - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.7.1.tgz", - "integrity": "sha512-W4QV/gXvfIsccN8225784LNOorcm7ch68Fi3V4Wg7gmkWSQRKevO4RrRqWo6N/Z/myK1QAiGgeaXN57m+R/8iQ==", - "dev": true, - "requires": { - "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "3.7.1", - "@typescript-eslint/types": "3.7.1", - "@typescript-eslint/typescript-estree": "3.7.1", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.7.0.tgz", - "integrity": "sha512-2LZauVUt7jAWkcIW7djUc3kyW+fSarNEuM3RF2JdLHR9BfX/nDEnyA4/uWz0wseoWVZbDXDF7iF9Jc342flNqQ==", - "dev": true, - "requires": { - "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "3.7.0", - "@typescript-eslint/types": "3.7.0", - "@typescript-eslint/typescript-estree": "3.7.0", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.7.1.tgz", - "integrity": "sha512-W4QV/gXvfIsccN8225784LNOorcm7ch68Fi3V4Wg7gmkWSQRKevO4RrRqWo6N/Z/myK1QAiGgeaXN57m+R/8iQ==", - "dev": true, - "requires": { - "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "3.7.1", - "@typescript-eslint/types": "3.7.1", - "@typescript-eslint/typescript-estree": "3.7.1", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.8.0.tgz", - "integrity": "sha512-u5vjOBaCsnMVQOvkKCXAmmOhyyMmFFf5dbkM3TIbg3MZ2pyv5peE4gj81UAbTHwTOXEwf7eCQTUMKrDl/+qGnA==", - "dev": true, - "requires": { - "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "3.8.0", - "@typescript-eslint/types": "3.8.0", - "@typescript-eslint/typescript-estree": "3.8.0", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= -======= ->>>>>>> fix merge conflict - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.9.0.tgz", - "integrity": "sha512-rDHOKb6uW2jZkHQniUQVZkixQrfsZGUCNWWbKWep4A5hGhN5dLHMUCNAWnC4tXRlHedXkTDptIpxs6e4Pz8UfA==", - "dev": true, - "requires": { - "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "3.9.0", - "@typescript-eslint/types": "3.9.0", - "@typescript-eslint/typescript-estree": "3.9.0", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> 3box fix for identity-wallet ->>>>>>> 3box fix for identity-wallet -======= ->>>>>>> fix merge conflict "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/types": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.9.0.tgz", - "integrity": "sha512-rb6LDr+dk9RVVXO/NJE8dT1pGlso3voNdEIN8ugm4CWM5w5GimbThCMiMl4da1t5u3YwPWEwOnKAULCZgBtBHg==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.9.0.tgz", - "integrity": "sha512-N+158NKgN4rOmWVfvKOMoMFV5n8XxAliaKkArm/sOypzQ0bUL8MSnOEBW3VFIeffb/K5ce/cAV0yYhR7U4ALAA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "3.9.0", - "@typescript-eslint/visitor-keys": "3.9.0", -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 ->>>>>>> 3box fix for identity-wallet - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.7.1.tgz", - "integrity": "sha512-PZe8twm5Z4b61jt7GAQDor6KiMhgPgf4XmUb9zdrwTbgtC/Sj29gXP1dws9yEn4+aJeyXrjsD9XN7AWFhmnUfg==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.1.tgz", - "integrity": "sha512-m97vNZkI08dunYOr2lVZOHoyfpqRs0KDpd6qkGaIcLGhQ2WPtgHOd/eVbsJZ0VYCQvupKrObAGTOvk3tfpybYA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "3.7.1", - "@typescript-eslint/visitor-keys": "3.7.1", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.7.0.tgz", - "integrity": "sha512-reCaK+hyKkKF+itoylAnLzFeNYAEktB0XVfSQvf0gcVgpz1l49Lt6Vo9x4MVCCxiDydA0iLAjTF/ODH0pbfnpg==", -======= - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.7.1.tgz", - "integrity": "sha512-PZe8twm5Z4b61jt7GAQDor6KiMhgPgf4XmUb9zdrwTbgtC/Sj29gXP1dws9yEn4+aJeyXrjsD9XN7AWFhmnUfg==", ->>>>>>> package-lock -======= - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.8.0.tgz", - "integrity": "sha512-8kROmEQkv6ss9kdQ44vCN1dTrgu4Qxrd2kXr10kz2NP5T8/7JnEfYNxCpPkArbLIhhkGLZV3aVMplH1RXQRF7Q==", ->>>>>>> package-lock -======= -======= ->>>>>>> fix merge conflict "version": "3.9.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.9.0.tgz", "integrity": "sha512-rb6LDr+dk9RVVXO/NJE8dT1pGlso3voNdEIN8ugm4CWM5w5GimbThCMiMl4da1t5u3YwPWEwOnKAULCZgBtBHg==", @@ -9253,38 +8930,8 @@ "integrity": "sha512-N+158NKgN4rOmWVfvKOMoMFV5n8XxAliaKkArm/sOypzQ0bUL8MSnOEBW3VFIeffb/K5ce/cAV0yYhR7U4ALAA==", "dev": true, "requires": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "@typescript-eslint/types": "3.7.0", - "@typescript-eslint/visitor-keys": "3.7.0", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "@typescript-eslint/types": "3.7.1", - "@typescript-eslint/visitor-keys": "3.7.1", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "@typescript-eslint/types": "3.8.0", - "@typescript-eslint/visitor-keys": "3.8.0", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "@typescript-eslint/types": "3.9.0", - "@typescript-eslint/visitor-keys": "3.9.0", ->>>>>>> 3box fix for identity-wallet ->>>>>>> 3box fix for identity-wallet -======= "@typescript-eslint/types": "3.9.0", "@typescript-eslint/visitor-keys": "3.9.0", ->>>>>>> fix merge conflict "debug": "^4.1.1", "glob": "^7.1.6", "is-glob": "^4.0.1", @@ -9326,66 +8973,15 @@ } }, "@typescript-eslint/visitor-keys": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.9.0.tgz", - "integrity": "sha512-O1qeoGqDbu0EZUC/MZ6F1WHTIzcBVhGqDj3LhTnj65WUA548RXVxUHbYhAW9bZWfb2rnX9QsbbP5nmeJ5Z4+ng==", -======= - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.1.tgz", - "integrity": "sha512-xn22sQbEya+Utj2IqJHGLA3i1jDzR43RzWupxojbSWnj3nnPLavaQmWe5utw03CwYao3r00qzXfgJMGNkrzrAA==", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.1.tgz", - "integrity": "sha512-xn22sQbEya+Utj2IqJHGLA3i1jDzR43RzWupxojbSWnj3nnPLavaQmWe5utw03CwYao3r00qzXfgJMGNkrzrAA==", -======= - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.0.tgz", - "integrity": "sha512-k5PiZdB4vklUpUX4NBncn5RBKty8G3ihTY+hqJsCdMuD0v4jofI5xuqwnVcWxfv6iTm2P/dfEa2wMUnsUY8ODw==", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.1.tgz", - "integrity": "sha512-xn22sQbEya+Utj2IqJHGLA3i1jDzR43RzWupxojbSWnj3nnPLavaQmWe5utw03CwYao3r00qzXfgJMGNkrzrAA==", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.8.0.tgz", - "integrity": "sha512-gfqQWyVPpT9NpLREXNR820AYwgz+Kr1GuF3nf1wxpHD6hdxI62tq03ToomFnDxY0m3pUB39IF7sil7D5TQexLA==", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= "version": "3.9.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.9.0.tgz", "integrity": "sha512-O1qeoGqDbu0EZUC/MZ6F1WHTIzcBVhGqDj3LhTnj65WUA548RXVxUHbYhAW9bZWfb2rnX9QsbbP5nmeJ5Z4+ng==", ->>>>>>> 3box fix for identity-wallet ->>>>>>> 3box fix for identity-wallet -======= - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.9.0.tgz", - "integrity": "sha512-O1qeoGqDbu0EZUC/MZ6F1WHTIzcBVhGqDj3LhTnj65WUA548RXVxUHbYhAW9bZWfb2rnX9QsbbP5nmeJ5Z4+ng==", ->>>>>>> fix merge conflict "dev": true, "requires": { "eslint-visitor-keys": "^1.1.0" } }, "@walletconnect/client": { -<<<<<<< refs/remotes/origin/dev-2 "version": "1.2.1", "resolved": "https://registry.npmjs.org/@walletconnect/client/-/client-1.2.1.tgz", "integrity": "sha512-GpldbPXgd9VTSUfE+2BDEsKr6JPUU17j+m2a9IMGeysWWmcIb0fYh5DDFrbBPLYigJY8XgFwk4YLdtPafMlueQ==", @@ -9413,59 +9009,20 @@ "requires": { "@walletconnect/types": "^1.2.1", "@walletconnect/utils": "^1.2.1", -======= - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@walletconnect/client/-/client-1.2.0.tgz", - "integrity": "sha512-s5sPUAUczQNTbtzdDpP48Dd/RyQUx2jMVRIhxW2oSan3Iw5vhV1mE9849l7aCBvrxXOMEXECQrdbtqWJOkak9w==", - "requires": { - "@walletconnect/core": "^1.2.0", - "@walletconnect/iso-crypto": "^1.2.0", - "@walletconnect/types": "^1.2.0", - "@walletconnect/utils": "^1.2.0" - } - }, - "@walletconnect/core": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@walletconnect/core/-/core-1.2.0.tgz", - "integrity": "sha512-2/vKz+m3DNDGfc4MNX/735pBs4JXc+y/hVyPY+HRd/K3nX/u9YjjojR1cKTtBKC/Ue1CKXdvrfe3xo3PK/6JvQ==", - "requires": { - "@walletconnect/socket-transport": "^1.2.0", - "@walletconnect/types": "^1.2.0", - "@walletconnect/utils": "^1.2.0" - } - }, - "@walletconnect/http-connection": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@walletconnect/http-connection/-/http-connection-1.2.0.tgz", - "integrity": "sha512-EwNmWmLCtwXinuEybr9D0cqIs9wqj7xey6O+cYYjveoZJhXwtgAbi/ZUIpep0AZvnrT41xIOy3BEvw6P/XCTOQ==", - "requires": { - "@walletconnect/types": "^1.2.0", - "@walletconnect/utils": "^1.2.0", ->>>>>>> 3box fix for identity-wallet "xhr2-cookies": "1.1.0" } }, "@walletconnect/iso-crypto": { -<<<<<<< refs/remotes/origin/dev-2 "version": "1.2.1", "resolved": "https://registry.npmjs.org/@walletconnect/iso-crypto/-/iso-crypto-1.2.1.tgz", "integrity": "sha512-l5btVlALo+k3kjZN2MveE6+7Ert1Z030yn1wOdSyAvgCZaPWU0jfJDm0QzXS/oKY+5nRtSQROtWK0PfpQ9/7dg==", "requires": { "@walletconnect/types": "^1.2.1", "@walletconnect/utils": "^1.2.1", -======= - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@walletconnect/iso-crypto/-/iso-crypto-1.2.0.tgz", - "integrity": "sha512-XaBNaFzRTZVnhMGyy2ns7t3ud1R3eputOqYoKofT8JemnW3kPR9eoD6vs3N5hM10k//jQdgF2qSNlttKGUU8hA==", - "requires": { - "@walletconnect/types": "^1.2.0", - "@walletconnect/utils": "^1.2.0", ->>>>>>> 3box fix for identity-wallet "eccrypto-js": "5.2.0" } }, "@walletconnect/mobile-registry": { -<<<<<<< refs/remotes/origin/dev-2 "version": "1.2.1", "resolved": "https://registry.npmjs.org/@walletconnect/mobile-registry/-/mobile-registry-1.2.1.tgz", "integrity": "sha512-ivSIZ24pHPVWY96vA6mc1IQJ0qbYM4IoXLx7sLnjdTOxogTF4uBO3O104O2tvpnxemqt+9jaPHlfQNOTOBEdvA==" @@ -9478,38 +9035,16 @@ "@walletconnect/mobile-registry": "^1.2.1", "@walletconnect/types": "^1.2.1", "@walletconnect/utils": "^1.2.1", -======= - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@walletconnect/mobile-registry/-/mobile-registry-1.2.0.tgz", - "integrity": "sha512-RsRS7D3ALU/ED+lV27fSmf2NaKoh880xNcDEmIiVt5AGMEFuXsOkWr1IdDHcqnostn+E6DMqM1k5g4ZTYdq3Gg==" - }, - "@walletconnect/qrcode-modal": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@walletconnect/qrcode-modal/-/qrcode-modal-1.2.0.tgz", - "integrity": "sha512-CvXrcekck7wjsx0fucJVSadNKaw1tZtRGqHsxt3GjSDTlg0WUa2uMTGPc9IOaSdmpvIANGHFEIHXymcD4p4KVw==", - "requires": { - "@walletconnect/mobile-registry": "^1.2.0", - "@walletconnect/types": "^1.2.0", - "@walletconnect/utils": "^1.2.0", ->>>>>>> 3box fix for identity-wallet "preact": "10.4.1", "qrcode": "1.4.4" } }, "@walletconnect/socket-transport": { -<<<<<<< refs/remotes/origin/dev-2 "version": "1.2.1", "resolved": "https://registry.npmjs.org/@walletconnect/socket-transport/-/socket-transport-1.2.1.tgz", "integrity": "sha512-zJNMWSaPnBwfpTe39h3xcXiOqw99WdwLrX7wkUMUTzn3AK6m2B9SySPtS6TSis+2BcFX3kgnDSLeDv2qQJ8oSw==", "requires": { "@walletconnect/types": "^1.2.1", -======= - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@walletconnect/socket-transport/-/socket-transport-1.2.0.tgz", - "integrity": "sha512-24kf0SzCRI96f3T8Gbxf4A6SQh/Q8w1JoGFfi2QFix9MW9JW2iJioCevbS1w+atO6rozJE1zZPJZsdMQEGg/9A==", - "requires": { - "@walletconnect/types": "^1.2.0", ->>>>>>> 3box fix for identity-wallet "ws": "7.3.0" }, "dependencies": { @@ -9521,7 +9056,6 @@ } }, "@walletconnect/types": { -<<<<<<< refs/remotes/origin/dev-2 "version": "1.2.1", "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-1.2.1.tgz", "integrity": "sha512-9P+QSdYMrlgoGGiByKAKlLUAbAVDE10LzCJVFp3KYoqZLsxl0OjM5Hr1YpYT9X8ws+KIWQhp7ui8+ZzC0EakLg==" @@ -9532,18 +9066,6 @@ "integrity": "sha512-FWK7O874QC6ZrSjMnh0k+4lt22LRKwmP56puY02XQh7HJ1bkgmWXAd2shgtVXAOr/5sfimYkUGwmhNRp31443g==", "requires": { "@walletconnect/types": "^1.2.1", -======= - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-1.2.0.tgz", - "integrity": "sha512-ILcHUdpNnq+5akh2vSWcyh/USYDw2k4YApbOr6iNgEApyNzpIUF1rGA/dgGazq16UWxoFdiJexTMINv7c6LcRA==" - }, - "@walletconnect/utils": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@walletconnect/utils/-/utils-1.2.0.tgz", - "integrity": "sha512-enxUyv0j6rqEqkT17Q4mTYmAvz2U7X6ubs0Ao9W9EJiWrAvs1NAXHGoqFjZFXtBDxD1tqE3AAZVWBuvaadMr3A==", - "requires": { - "@walletconnect/types": "^1.2.0", ->>>>>>> 3box fix for identity-wallet "detect-browser": "5.1.0", "enc-utils": "2.1.0", "js-sha3": "0.8.0" @@ -9557,7 +9079,6 @@ } }, "@walletconnect/web3-provider": { -<<<<<<< refs/remotes/origin/dev-2 "version": "1.2.1", "resolved": "https://registry.npmjs.org/@walletconnect/web3-provider/-/web3-provider-1.2.1.tgz", "integrity": "sha512-uvRiiHU1etEHv/O8WvzGCR1Dtwms8Ic8bMOFs0cogc+fywsxD0dZ/xSxZwwKHqWFY8euERpw+FDhFPcYOfOr8w==", @@ -9567,99 +9088,18 @@ "@walletconnect/qrcode-modal": "^1.2.1", "@walletconnect/types": "^1.2.1", "@walletconnect/utils": "^1.2.1", -======= - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@walletconnect/web3-provider/-/web3-provider-1.2.0.tgz", - "integrity": "sha512-aaeBaSs/+SvIBr2VrBYjbvo3PR/ZzXox8iY3rJUgqGAnbVH8DLTV0W5l+SvIMJMh/VMjlnmvHWKzQ0lkiHzSrA==", - "requires": { - "@walletconnect/client": "^1.2.0", - "@walletconnect/http-connection": "^1.2.0", - "@walletconnect/qrcode-modal": "^1.2.0", - "@walletconnect/types": "^1.2.0", - "@walletconnect/utils": "^1.2.0", ->>>>>>> 3box fix for identity-wallet "web3-provider-engine": "15.0.12" } }, "@wdio/cli": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.4.0.tgz", - "integrity": "sha512-QNkAtoucBs9SKmOEDsfdJl8KhH8WgWBvaxngSLR/q/oY2IVpEzzscmXWOJOoXtMUkrQQ9waGwcagMmPToNUluQ==", -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.3.6.tgz", - "integrity": "sha512-KYM/PdtUk1Hqt9RuynNDUgQi5SEZmCVdUQt0z7tJTKhF4pEoRx0qBTqSS9l6jPtCRIRMP0ue8F+2iklILjpLkw==", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.3.6.tgz", - "integrity": "sha512-KYM/PdtUk1Hqt9RuynNDUgQi5SEZmCVdUQt0z7tJTKhF4pEoRx0qBTqSS9l6jPtCRIRMP0ue8F+2iklILjpLkw==", -======= - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.3.5.tgz", - "integrity": "sha512-xRmfYn+H9f1286W/2ZRkRapwdIuQCZPSbH8j0BEdoq6+kuBTY6SKwe+s+VBtc4Xe1aCQpL9aCUnLxyF45vDdTg==", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.3.6.tgz", - "integrity": "sha512-KYM/PdtUk1Hqt9RuynNDUgQi5SEZmCVdUQt0z7tJTKhF4pEoRx0qBTqSS9l6jPtCRIRMP0ue8F+2iklILjpLkw==", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= "version": "6.4.0", "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.4.0.tgz", "integrity": "sha512-QNkAtoucBs9SKmOEDsfdJl8KhH8WgWBvaxngSLR/q/oY2IVpEzzscmXWOJOoXtMUkrQQ9waGwcagMmPToNUluQ==", ->>>>>>> package-lock ->>>>>>> package-lock -======= - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.4.0.tgz", - "integrity": "sha512-QNkAtoucBs9SKmOEDsfdJl8KhH8WgWBvaxngSLR/q/oY2IVpEzzscmXWOJOoXtMUkrQQ9waGwcagMmPToNUluQ==", ->>>>>>> fix merge conflict "dev": true, "requires": { "@wdio/config": "6.1.14", "@wdio/logger": "6.0.16", -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "@wdio/utils": "6.4.0", -======= - "@wdio/utils": "6.3.6", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "@wdio/utils": "6.3.6", -======= - "@wdio/utils": "6.3.0", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "@wdio/utils": "6.3.6", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= "@wdio/utils": "6.4.0", ->>>>>>> package-lock ->>>>>>> package-lock -======= - "@wdio/utils": "6.4.0", ->>>>>>> fix merge conflict "async-exit-hook": "^2.0.1", "chalk": "^4.0.0", "chokidar": "^3.0.0", @@ -9672,36 +9112,7 @@ "lodash.union": "^4.6.0", "mkdirp": "^1.0.4", "recursive-readdir": "^2.2.2", -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "webdriverio": "6.4.0", -======= - "webdriverio": "6.3.6", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "webdriverio": "6.3.6", -======= - "webdriverio": "6.3.5", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "webdriverio": "6.3.6", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= "webdriverio": "6.4.0", ->>>>>>> package-lock ->>>>>>> package-lock -======= - "webdriverio": "6.4.0", ->>>>>>> fix merge conflict "yargs": "^15.0.1", "yarn-install": "^1.0.0" }, @@ -9998,40 +9409,9 @@ } }, "@wdio/dot-reporter": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/dot-reporter/-/dot-reporter-6.4.0.tgz", - "integrity": "sha512-Iv6PBQSQ5Ep78Vv2UYXcQVBW4oH6cxYTelLon4MnS9Hl1x8Z67KrOdT0HNxdgNYfh/bpxX820Rx70h4ZWqgD0g==", -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/dot-reporter/-/dot-reporter-6.3.6.tgz", - "integrity": "sha512-UdJIJIEhQNPmuKLBb+20QDyt0zmXZ94CIwFJt9wkv8+B/AAvK7Hp9QeBlXJEUowxItaE9WXbi+8mnGegomWelA==", -======= -<<<<<<< dev-2 - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/dot-reporter/-/dot-reporter-6.3.6.tgz", - "integrity": "sha512-UdJIJIEhQNPmuKLBb+20QDyt0zmXZ94CIwFJt9wkv8+B/AAvK7Hp9QeBlXJEUowxItaE9WXbi+8mnGegomWelA==", -======= "version": "6.4.0", "resolved": "https://registry.npmjs.org/@wdio/dot-reporter/-/dot-reporter-6.4.0.tgz", "integrity": "sha512-Iv6PBQSQ5Ep78Vv2UYXcQVBW4oH6cxYTelLon4MnS9Hl1x8Z67KrOdT0HNxdgNYfh/bpxX820Rx70h4ZWqgD0g==", ->>>>>>> package-lock ->>>>>>> package-lock -======= - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/dot-reporter/-/dot-reporter-6.4.0.tgz", - "integrity": "sha512-Iv6PBQSQ5Ep78Vv2UYXcQVBW4oH6cxYTelLon4MnS9Hl1x8Z67KrOdT0HNxdgNYfh/bpxX820Rx70h4ZWqgD0g==", ->>>>>>> fix merge conflict "dev": true, "requires": { "@wdio/reporter": "6.3.6", @@ -10085,9 +9465,6 @@ } }, "@wdio/local-runner": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "6.4.0", "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-6.4.0.tgz", "integrity": "sha512-El4MGktVfgilk2+Q8Lxd3fUIsTG4n2U1+duIOMJA8vqjPPulL9Tp/axIxrKGhGfLUHXbFfFJdNmP7k5xsuvaog==", @@ -10096,70 +9473,6 @@ "@wdio/logger": "6.0.16", "@wdio/repl": "6.4.0", "@wdio/runner": "6.4.0", -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 ->>>>>>> package-lock - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-6.3.6.tgz", - "integrity": "sha512-40qyjnfdgM3lYo29FTwD21Jl+bQZJr0BC4YauxRF8C/g/SMuc+NyU3v5vCKXFsz3leMvgqCucurDYT81W4IwuA==", - "dev": true, - "requires": { - "@wdio/logger": "6.0.16", - "@wdio/repl": "6.3.6", - "@wdio/runner": "6.3.6", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-6.3.5.tgz", - "integrity": "sha512-n9/OOmRuXeq2/B2vyLvyWhRX4BV1lv1hyHianL3tIXP4PhHLyPCWvFBZJsZIZiQGYZnKm7BIq5niZenHewUahg==", - "dev": true, - "requires": { - "@wdio/logger": "6.0.16", - "@wdio/repl": "6.3.0", - "@wdio/runner": "6.3.5", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-6.3.6.tgz", - "integrity": "sha512-40qyjnfdgM3lYo29FTwD21Jl+bQZJr0BC4YauxRF8C/g/SMuc+NyU3v5vCKXFsz3leMvgqCucurDYT81W4IwuA==", - "dev": true, - "requires": { - "@wdio/logger": "6.0.16", - "@wdio/repl": "6.3.6", - "@wdio/runner": "6.3.6", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= -======= ->>>>>>> fix merge conflict - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-6.4.0.tgz", - "integrity": "sha512-El4MGktVfgilk2+Q8Lxd3fUIsTG4n2U1+duIOMJA8vqjPPulL9Tp/axIxrKGhGfLUHXbFfFJdNmP7k5xsuvaog==", - "dev": true, - "requires": { - "@wdio/logger": "6.0.16", - "@wdio/repl": "6.4.0", - "@wdio/runner": "6.4.0", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict "async-exit-hook": "^2.0.1", "stream-buffers": "^3.0.2" } @@ -10238,9 +9551,6 @@ } }, "@wdio/mocha-framework": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "6.4.0", "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-6.4.0.tgz", "integrity": "sha512-xRN4pblLuTBkfK/mj2wWs/R/Xkzv5I/FGxdj/X/CNlbCu+llYSjJ5acXFA06klT/LymLgV468a9b6zK42g9rVQ==", @@ -10248,66 +9558,6 @@ "requires": { "@wdio/logger": "6.0.16", "@wdio/utils": "6.4.0", -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 ->>>>>>> package-lock - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-6.3.6.tgz", - "integrity": "sha512-lNcm5fZYnJTiduPFLmRQ4NWV7o/EJd+y1rXVFNNK24oI4lhTdnX87tvnCnco1dkcZRSSv1fS90PBPD7HXkAwWQ==", - "dev": true, - "requires": { - "@wdio/logger": "6.0.16", - "@wdio/utils": "6.3.6", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-6.3.0.tgz", - "integrity": "sha512-3lLvzhDYWwOYmiJAjr2fm/nENq6g6uUOtkIeEQFp1kDyBQkDsH1PXGdFklQbRiQT8mAqOPhx1kvXrCA/XpWl7g==", - "dev": true, - "requires": { - "@wdio/logger": "6.0.16", - "@wdio/utils": "6.3.0", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-6.3.6.tgz", - "integrity": "sha512-lNcm5fZYnJTiduPFLmRQ4NWV7o/EJd+y1rXVFNNK24oI4lhTdnX87tvnCnco1dkcZRSSv1fS90PBPD7HXkAwWQ==", - "dev": true, - "requires": { - "@wdio/logger": "6.0.16", - "@wdio/utils": "6.3.6", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= -======= ->>>>>>> fix merge conflict - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-6.4.0.tgz", - "integrity": "sha512-xRN4pblLuTBkfK/mj2wWs/R/Xkzv5I/FGxdj/X/CNlbCu+llYSjJ5acXFA06klT/LymLgV468a9b6zK42g9rVQ==", - "dev": true, - "requires": { - "@wdio/logger": "6.0.16", - "@wdio/utils": "6.4.0", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict "expect-webdriverio": "^1.1.5", "mocha": "^8.0.1" } @@ -10319,42 +9569,6 @@ "dev": true }, "@wdio/repl": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-6.4.0.tgz", - "integrity": "sha512-3oSRBzbWM67kng/ZqcDtFTHhTVO/fIALNqfyEEzaMb7oJ2OXgibBzjEa1r8ZhKIC8TpEAJ29BdSll4brHUhQrw==", - "dev": true, - "requires": { - "@wdio/utils": "6.4.0" -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-6.3.6.tgz", - "integrity": "sha512-FDvYacQxSmrrBYsscpcJuz8HGEq2TDosJkrMOyJ6q+Voi5wisvVF8fIiLEvwvL+Uraj1gHwXABFD2YlZZJqFKw==", - "dev": true, - "requires": { - "@wdio/utils": "6.3.6" ->>>>>>> package-lock - } - }, - "@wdio/reporter": { - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-6.3.6.tgz", - "integrity": "sha512-u+iaIZS1oAyHUyXxzyr+pySi2gaFe7u1v6HD1vW6C0sNvICK+wFco4fOSpatizPnVSjuEamgI7ErngBdzUiUag==", -======= - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-6.3.0.tgz", - "integrity": "sha512-1GKzfyCTLW5WkFd3W7NLACih+zNWU7c8kFurbCQXDK1ko1obqJEs7ZjBr85q5XqMWburdks5rDjyml2iEB2LBg==", -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-6.3.6.tgz", - "integrity": "sha512-cocBRkv5sYUBxXResuxskQhIkKgDgE/yAtgMGR5wXLrtG/sMpZ2HVy6LOcOeARidAaRwbav80M2ZHjTCjPn53w==", ->>>>>>> package-lock - "dev": true - }, - "@wdio/repl": { -======= ->>>>>>> fix merge conflict "version": "6.4.0", "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-6.4.0.tgz", "integrity": "sha512-3oSRBzbWM67kng/ZqcDtFTHhTVO/fIALNqfyEEzaMb7oJ2OXgibBzjEa1r8ZhKIC8TpEAJ29BdSll4brHUhQrw==", @@ -10403,114 +9617,18 @@ } }, "@wdio/runner": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "6.4.0", "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.4.0.tgz", "integrity": "sha512-XjAUkIYWAPKimgRKVJ/fP6BCj07lYP8/Vtkd5fMDaoWESpj7bRIvJXiI+DSVnMYtAWFTjSZ3kDhq9h3fhEnMaQ==", -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.3.6.tgz", - "integrity": "sha512-k2EcQ4QIWWSpOA0OaBKpLxt4bSwsVk+BjsgT9TIRp4Ao+DR+AL4nLn6C11NjCnbdoGdFZ5WAsaqZPdy4zmm7ZA==", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.3.6.tgz", - "integrity": "sha512-k2EcQ4QIWWSpOA0OaBKpLxt4bSwsVk+BjsgT9TIRp4Ao+DR+AL4nLn6C11NjCnbdoGdFZ5WAsaqZPdy4zmm7ZA==", -======= - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.3.5.tgz", - "integrity": "sha512-jAM/9xI3i4svcQZmry6TAnpfTenZGyvKCegyaJTL3HvUBWkTVE9Y4ecYiZeLOSYp5DTqXaQnoyu6Cv9JgGvTHw==", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.3.6.tgz", - "integrity": "sha512-k2EcQ4QIWWSpOA0OaBKpLxt4bSwsVk+BjsgT9TIRp4Ao+DR+AL4nLn6C11NjCnbdoGdFZ5WAsaqZPdy4zmm7ZA==", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.4.0.tgz", - "integrity": "sha512-XjAUkIYWAPKimgRKVJ/fP6BCj07lYP8/Vtkd5fMDaoWESpj7bRIvJXiI+DSVnMYtAWFTjSZ3kDhq9h3fhEnMaQ==", ->>>>>>> package-lock ->>>>>>> package-lock -======= - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.4.0.tgz", - "integrity": "sha512-XjAUkIYWAPKimgRKVJ/fP6BCj07lYP8/Vtkd5fMDaoWESpj7bRIvJXiI+DSVnMYtAWFTjSZ3kDhq9h3fhEnMaQ==", ->>>>>>> fix merge conflict "dev": true, "requires": { "@wdio/config": "6.1.14", "@wdio/logger": "6.0.16", -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "@wdio/utils": "6.4.0", - "deepmerge": "^4.0.0", - "gaze": "^1.1.2", - "webdriver": "6.4.0", - "webdriverio": "6.4.0" -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 ->>>>>>> package-lock - "@wdio/utils": "6.3.6", - "deepmerge": "^4.0.0", - "gaze": "^1.1.2", - "webdriver": "6.3.6", - "webdriverio": "6.3.6" -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "@wdio/utils": "6.3.0", - "deepmerge": "^4.0.0", - "gaze": "^1.1.2", - "webdriver": "6.3.5", - "webdriverio": "6.3.5" ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "@wdio/utils": "6.3.6", - "deepmerge": "^4.0.0", - "gaze": "^1.1.2", - "webdriver": "6.3.6", - "webdriverio": "6.3.6" ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= -======= ->>>>>>> fix merge conflict "@wdio/utils": "6.4.0", "deepmerge": "^4.0.0", "gaze": "^1.1.2", "webdriver": "6.4.0", "webdriverio": "6.4.0" -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict }, "dependencies": { "deepmerge": { @@ -10564,40 +9682,9 @@ } }, "@wdio/spec-reporter": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-6.4.0.tgz", - "integrity": "sha512-nY7tr6nRDkJEsT0Yv/ZJVaDT2KjtQqd/X+X7cFHEMvy13NguOOdC/+WQyilR+JrT5JSJZySRDdu0gm7A8DSVGA==", -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-6.3.6.tgz", - "integrity": "sha512-RO/Bc8NIGE8VScrmJz8VNFtIAFoW02xOgFGD8J4LgObQ/cKyn/v6vxCCRgGv27DHYW4j0/rtrem/+z/hgU/C9w==", -======= -<<<<<<< dev-2 - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-6.3.6.tgz", - "integrity": "sha512-RO/Bc8NIGE8VScrmJz8VNFtIAFoW02xOgFGD8J4LgObQ/cKyn/v6vxCCRgGv27DHYW4j0/rtrem/+z/hgU/C9w==", -======= - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-6.4.0.tgz", - "integrity": "sha512-nY7tr6nRDkJEsT0Yv/ZJVaDT2KjtQqd/X+X7cFHEMvy13NguOOdC/+WQyilR+JrT5JSJZySRDdu0gm7A8DSVGA==", ->>>>>>> package-lock ->>>>>>> package-lock -======= "version": "6.4.0", "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-6.4.0.tgz", "integrity": "sha512-nY7tr6nRDkJEsT0Yv/ZJVaDT2KjtQqd/X+X7cFHEMvy13NguOOdC/+WQyilR+JrT5JSJZySRDdu0gm7A8DSVGA==", ->>>>>>> fix merge conflict "dev": true, "requires": { "@wdio/reporter": "6.3.6", @@ -10653,50 +9740,9 @@ } }, "@wdio/utils": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.4.0.tgz", - "integrity": "sha512-sAVBbgQjUmvbvkQ/EyWIUSDoebtiZewmf6wb6Pt6EZfaTm4hul30Txd+IXfazhuxp701PskwufkMWzrQIXhpKw==", -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.3.6.tgz", - "integrity": "sha512-qY/RR/t2YCu+4V5wDlPnuouRiO38BRq0ubMipjRGDixytK6VPa5CfosVqDOlrsXrIBrGHCQct1aGLk7KiugmiQ==", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.3.6.tgz", - "integrity": "sha512-qY/RR/t2YCu+4V5wDlPnuouRiO38BRq0ubMipjRGDixytK6VPa5CfosVqDOlrsXrIBrGHCQct1aGLk7KiugmiQ==", -======= - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.3.0.tgz", - "integrity": "sha512-PbeC5fpieamgSAHf7S58MAyraGU1qKxnHdfGMG+ZIWiIo73oo4j/57CcH6ZawQ3YC1wEc/5q+VXg7N5hvqhJOQ==", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.3.6.tgz", - "integrity": "sha512-qY/RR/t2YCu+4V5wDlPnuouRiO38BRq0ubMipjRGDixytK6VPa5CfosVqDOlrsXrIBrGHCQct1aGLk7KiugmiQ==", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.4.0.tgz", - "integrity": "sha512-sAVBbgQjUmvbvkQ/EyWIUSDoebtiZewmf6wb6Pt6EZfaTm4hul30Txd+IXfazhuxp701PskwufkMWzrQIXhpKw==", ->>>>>>> package-lock ->>>>>>> package-lock -======= "version": "6.4.0", "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.4.0.tgz", "integrity": "sha512-sAVBbgQjUmvbvkQ/EyWIUSDoebtiZewmf6wb6Pt6EZfaTm4hul30Txd+IXfazhuxp701PskwufkMWzrQIXhpKw==", ->>>>>>> fix merge conflict "dev": true, "requires": { "@wdio/logger": "6.0.16" @@ -10983,16 +10029,6 @@ "requires": { "@types/node": ">=6", "tslib": "^1.9.3" -<<<<<<< refs/remotes/origin/dev-2 -======= - }, - "dependencies": { - "@types/node": { - "version": "14.0.27", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz", - "integrity": "sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==" - } ->>>>>>> package-lock } }, "@wry/equality": { @@ -11201,48 +10237,9 @@ "dev": true }, "ajv-keywords": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", -======= - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.1.tgz", - "integrity": "sha512-KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA==", ->>>>>>> remove webpack from dependencies -======= - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", -======= - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.1.tgz", - "integrity": "sha512-KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA==", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", ->>>>>>> package-lock ->>>>>>> package-lock -======= "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", ->>>>>>> fix merge conflict "dev": true }, "alphanum-sort": { @@ -13057,50 +12054,9 @@ } }, "babel-plugin-styled-components": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz", - "integrity": "sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA==", -======= - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.0.tgz", - "integrity": "sha512-X+3II2OfDD7AKEKzJfqJBhR48FfVHsImTETtYvZtJrGiBQmRP8UQKOCQL+hOhvHP0l4Fuwqk2bMCXAd3YADpwA==", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.0.tgz", - "integrity": "sha512-X+3II2OfDD7AKEKzJfqJBhR48FfVHsImTETtYvZtJrGiBQmRP8UQKOCQL+hOhvHP0l4Fuwqk2bMCXAd3YADpwA==", -======= - "version": "1.10.7", - "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.7.tgz", - "integrity": "sha512-MBMHGcIA22996n9hZRf/UJLVVgkEOITuR2SvjHLb5dSTUyR4ZRGn+ngITapes36FI3WLxZHfRhkA1ffHxihOrg==", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.0.tgz", - "integrity": "sha512-X+3II2OfDD7AKEKzJfqJBhR48FfVHsImTETtYvZtJrGiBQmRP8UQKOCQL+hOhvHP0l4Fuwqk2bMCXAd3YADpwA==", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz", - "integrity": "sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA==", ->>>>>>> package-lock ->>>>>>> package-lock -======= "version": "1.11.1", "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz", "integrity": "sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA==", ->>>>>>> fix merge conflict "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", "@babel/helper-module-imports": "^7.0.0", @@ -13680,71 +12636,6 @@ "isobject": "^3.0.1", "mixin-deep": "^1.2.0", "pascalcase": "^0.1.1" -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock -======= - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> package-lock -======= ->>>>>>> remove webpack from dependencies -======= -======= ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } }, "base-x": { @@ -14186,73 +13077,12 @@ } }, "braces": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" -======= - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> package-lock -======= -======= ->>>>>>> fix merge conflict "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { "fill-range": "^7.0.1" -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> remove webpack from dependencies -======= ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } }, "brcast": { @@ -14861,59 +13691,9 @@ } }, "caniuse-lite": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "1.0.30001114", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001114.tgz", "integrity": "sha512-ml/zTsfNBM+T1+mjglWRPgVsu2L76GAaADKX5f4t0pbhttEp0WMawJsHDYlFkVZkoA+89uvBRrVrEE4oqenzXQ==" -======= - "version": "1.0.30001109", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001109.tgz", - "integrity": "sha512-4JIXRodHzdS3HdK8nSgIqXYLExOvG+D2/EenSvcub2Kp3QEADjo2v2oUn5g0n0D+UNwG9BtwKOyGcSq2qvQXvQ==" ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "1.0.30001109", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001109.tgz", - "integrity": "sha512-4JIXRodHzdS3HdK8nSgIqXYLExOvG+D2/EenSvcub2Kp3QEADjo2v2oUn5g0n0D+UNwG9BtwKOyGcSq2qvQXvQ==" -======= - "version": "1.0.30001107", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001107.tgz", - "integrity": "sha512-86rCH+G8onCmdN4VZzJet5uPELII59cUzDphko3thQFgAQG1RNa+sVLDoALIhRYmflo5iSIzWY3vu1XTWtNMQQ==" ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "1.0.30001109", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001109.tgz", - "integrity": "sha512-4JIXRodHzdS3HdK8nSgIqXYLExOvG+D2/EenSvcub2Kp3QEADjo2v2oUn5g0n0D+UNwG9BtwKOyGcSq2qvQXvQ==" ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "version": "1.0.30001112", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001112.tgz", - "integrity": "sha512-J05RTQlqsatidif/38aN3PGULCLrg8OYQOlJUKbeYVzC2mGZkZLIztwRlB3MtrfLmawUmjFlNJvy/uhwniIe1Q==" ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "version": "1.0.30001113", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001113.tgz", - "integrity": "sha512-qMvjHiKH21zzM/VDZr6oosO6Ri3U0V2tC015jRXjOecwQCJtsU5zklTNTk31jQbIOP8gha0h1ccM/g0ECP+4BA==" ->>>>>>> 3box fix for identity-wallet ->>>>>>> 3box fix for identity-wallet -======= - "version": "1.0.30001113", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001113.tgz", - "integrity": "sha512-qMvjHiKH21zzM/VDZr6oosO6Ri3U0V2tC015jRXjOecwQCJtsU5zklTNTk31jQbIOP8gha0h1ccM/g0ECP+4BA==" ->>>>>>> fix merge conflict }, "capture-exit": { "version": "2.0.0", @@ -15062,21 +13842,9 @@ } }, "chokidar": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "3.4.2", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", -======= - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz", - "integrity": "sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==", ->>>>>>> remove webpack from dependencies -======= - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", - "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", ->>>>>>> package-lock "dev": true, "requires": { "anymatch": "~3.1.1", @@ -15087,66 +13855,6 @@ "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.4.0" -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock -======= - }, - "dependencies": { - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - } ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> package-lock -======= ->>>>>>> remove webpack from dependencies -======= -======= ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } }, "chownr": { @@ -17527,85 +16235,12 @@ } }, "define-property": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" -<<<<<<< refs/remotes/origin/dev-2 -======= - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "dependencies": { - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> package-lock -======= "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { "is-descriptor": "^1.0.0" ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> remove webpack from dependencies -======= ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } }, "defined": { @@ -17759,84 +16394,15 @@ } }, "devtools": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "6.4.0", "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.4.0.tgz", "integrity": "sha512-E2T+tiElHOQg2t+5L4TZwTX9krTIsTIZy9AS/DMkEv0IFUqr314fIvBbsVzo9qk0dv88E7DSf+n5GsbSrMngpA==", -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.3.6.tgz", - "integrity": "sha512-Pkir5lsMvvONrcH9nUakGNOr/3y2FiOCuGg4O+0XX0CbSmLSZV+AmuXTZ+yBbRzpH3llUCkGMzsVVzFVhF5/aQ==", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.3.6.tgz", - "integrity": "sha512-Pkir5lsMvvONrcH9nUakGNOr/3y2FiOCuGg4O+0XX0CbSmLSZV+AmuXTZ+yBbRzpH3llUCkGMzsVVzFVhF5/aQ==", -======= - "version": "6.3.4", - "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.3.4.tgz", - "integrity": "sha512-dOcLdArp5/dJBzD8T5wcT2YgqkA22Mkqo0OS9cXz7JkHNgwOx1FI2Bq9GvP6o0TENHifYSYg3G0K/z0bacekqg==", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.3.6.tgz", - "integrity": "sha512-Pkir5lsMvvONrcH9nUakGNOr/3y2FiOCuGg4O+0XX0CbSmLSZV+AmuXTZ+yBbRzpH3llUCkGMzsVVzFVhF5/aQ==", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.4.0.tgz", - "integrity": "sha512-E2T+tiElHOQg2t+5L4TZwTX9krTIsTIZy9AS/DMkEv0IFUqr314fIvBbsVzo9qk0dv88E7DSf+n5GsbSrMngpA==", ->>>>>>> package-lock ->>>>>>> package-lock -======= - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.4.0.tgz", - "integrity": "sha512-E2T+tiElHOQg2t+5L4TZwTX9krTIsTIZy9AS/DMkEv0IFUqr314fIvBbsVzo9qk0dv88E7DSf+n5GsbSrMngpA==", ->>>>>>> fix merge conflict "dev": true, "requires": { "@wdio/config": "6.1.14", "@wdio/logger": "6.0.16", "@wdio/protocols": "6.3.6", -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "@wdio/utils": "6.4.0", -======= - "@wdio/utils": "6.3.6", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "@wdio/protocols": "6.3.0", - "@wdio/utils": "6.3.0", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "@wdio/protocols": "6.3.6", -<<<<<<< dev-2 - "@wdio/utils": "6.3.6", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "@wdio/utils": "6.4.0", ->>>>>>> package-lock ->>>>>>> package-lock -======= "@wdio/utils": "6.4.0", ->>>>>>> fix merge conflict "chrome-launcher": "^0.13.1", "puppeteer-core": "^5.1.0", "ua-parser-js": "^0.7.21", @@ -18375,59 +16941,9 @@ "dev": true }, "electron-to-chromium": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "1.3.533", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.533.tgz", "integrity": "sha512-YqAL+NXOzjBnpY+dcOKDlZybJDCOzgsq4koW3fvyty/ldTmsb4QazZpOWmVvZ2m0t5jbBf7L0lIGU3BUipwG+A==" -======= - "version": "1.3.514", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.514.tgz", - "integrity": "sha512-8vb8zKIeGlZigeDzNWWthmGeLzo5CC43Lc+CZshMs7UXFVMPNLtXJGa/txedpu3OJFrXXVheBwp9PqOJJlHQ8w==" ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "1.3.514", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.514.tgz", - "integrity": "sha512-8vb8zKIeGlZigeDzNWWthmGeLzo5CC43Lc+CZshMs7UXFVMPNLtXJGa/txedpu3OJFrXXVheBwp9PqOJJlHQ8w==" -======= - "version": "1.3.509", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.509.tgz", - "integrity": "sha512-cN4lkjNRuTG8rtAqTOVgwpecEC2kbKA04PG6YijcKGHK/kD0xLjiqExcAOmLUwtXZRF8cBeam2I0VZcih919Ug==" ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "1.3.514", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.514.tgz", - "integrity": "sha512-8vb8zKIeGlZigeDzNWWthmGeLzo5CC43Lc+CZshMs7UXFVMPNLtXJGa/txedpu3OJFrXXVheBwp9PqOJJlHQ8w==" ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "version": "1.3.526", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.526.tgz", - "integrity": "sha512-HiroW5ZbGwgT8kCnoEO8qnGjoTPzJxduvV/Vv/wH63eo2N6Zj3xT5fmmaSPAPUM05iN9/5fIEkIg3owTtV6QZg==" ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "version": "1.3.529", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.529.tgz", - "integrity": "sha512-n3sriLldqNyjBlosbnPftjCY+m1dVOY307I1Y0HaHAqDGe3hRvK7ksJwWd+qs599ybR4jobCo1+7zXM9GyNMSA==" ->>>>>>> 3box fix for identity-wallet ->>>>>>> 3box fix for identity-wallet -======= - "version": "1.3.529", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.529.tgz", - "integrity": "sha512-n3sriLldqNyjBlosbnPftjCY+m1dVOY307I1Y0HaHAqDGe3hRvK7ksJwWd+qs599ybR4jobCo1+7zXM9GyNMSA==" ->>>>>>> fix merge conflict }, "element-resize-detector": { "version": "1.2.1", @@ -18888,15 +17404,9 @@ } }, "eslint": { -<<<<<<< refs/remotes/origin/dev-2 "version": "7.7.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz", "integrity": "sha512-1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg==", -======= - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz", - "integrity": "sha512-QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w==", ->>>>>>> package-lock "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -19341,42 +17851,9 @@ } }, "eslint-plugin-react": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "7.20.6", "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.6.tgz", "integrity": "sha512-kidMTE5HAEBSLu23CUDvj8dc3LdBU0ri1scwHBZjI41oDv4tjsWZKU7MQccFzH1QYPYhsnTF2ovh7JlcIcmxgg==", -======= - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.5.tgz", - "integrity": "sha512-ajbJfHuFnpVNJjhyrfq+pH1C0gLc2y94OiCbAXT5O0J0YCKaFEHDV8+3+mDOr+w8WguRX+vSs1bM2BDG0VLvCw==", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.5.tgz", - "integrity": "sha512-ajbJfHuFnpVNJjhyrfq+pH1C0gLc2y94OiCbAXT5O0J0YCKaFEHDV8+3+mDOr+w8WguRX+vSs1bM2BDG0VLvCw==", -======= - "version": "7.20.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.4.tgz", - "integrity": "sha512-y4DOQ0LrzuDQFEAnYFGjJMRHQQqfTco02qiWI00eGQYikHTzC15S5aRHGWSffnThv8sBpsmFBLky3K5keniAJg==", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.5.tgz", - "integrity": "sha512-ajbJfHuFnpVNJjhyrfq+pH1C0gLc2y94OiCbAXT5O0J0YCKaFEHDV8+3+mDOr+w8WguRX+vSs1bM2BDG0VLvCw==", ->>>>>>> package-lock ->>>>>>> package-lock -======= - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.5.tgz", - "integrity": "sha512-ajbJfHuFnpVNJjhyrfq+pH1C0gLc2y94OiCbAXT5O0J0YCKaFEHDV8+3+mDOr+w8WguRX+vSs1bM2BDG0VLvCw==", ->>>>>>> fix merge conflict "dev": true, "requires": { "array-includes": "^3.1.1", @@ -19687,21 +18164,9 @@ } }, "eth-rpc-errors": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eth-rpc-errors/-/eth-rpc-errors-3.0.0.tgz", - "integrity": "sha512-iPPNHPrLwUlR9xCSYm7HHQjWBasor3+KZfRvwEWxMz3ca0yqnlBeJrnyphkGIXZ4J7AMAaOLmwy4AWhnxOiLxg==", -======= - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/eth-rpc-errors/-/eth-rpc-errors-2.1.1.tgz", - "integrity": "sha512-MY3zAa5ZF8hvgQu1HOF9agaK5GgigBRGpTJ8H0oVlE0NqMu13CW6syyjLXdeIDCGQTbUeHliU1z9dVmvMKx1Tg==", ->>>>>>> package-lock -======= "version": "3.0.0", "resolved": "https://registry.npmjs.org/eth-rpc-errors/-/eth-rpc-errors-3.0.0.tgz", "integrity": "sha512-iPPNHPrLwUlR9xCSYm7HHQjWBasor3+KZfRvwEWxMz3ca0yqnlBeJrnyphkGIXZ4J7AMAaOLmwy4AWhnxOiLxg==", ->>>>>>> package-lock "requires": { "fast-safe-stringify": "^2.0.6" } @@ -20233,139 +18698,10 @@ "is-descriptor": "^0.1.0" } }, -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -======= ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", ->>>>>>> remove webpack from dependencies -======= ->>>>>>> package-lock - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } -<<<<<<< refs/remotes/origin/dev-2 - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", -======= -<<<<<<< dev-2 ->>>>>>> package-lock - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, -======= - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, ->>>>>>> package-lock - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true -======= - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", -======= ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict "dev": true, "requires": { "kind-of": "^3.0.2" @@ -20557,25 +18893,15 @@ "dev": true }, "expect": { -<<<<<<< refs/remotes/origin/dev-2 "version": "26.4.0", "resolved": "https://registry.npmjs.org/expect/-/expect-26.4.0.tgz", "integrity": "sha512-dbYDJhFcqQsamlos6nEwAMe+ahdckJBk5fmw1DYGLQGabGSlUuT+Fm2jHYw5119zG3uIhP+lCQbjJhFEdZMJtg==", -======= - "version": "26.3.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-26.3.0.tgz", - "integrity": "sha512-3tC0dpPgkTGkycM9H+mMjzIhm8I3ZAOV+y1Cj3xmF9iKxDeHBCAB64hf1OY//bMzQ/AftfodNy2pQWMKpTIV8Q==", ->>>>>>> package-lock "dev": true, "requires": { "@jest/types": "^26.3.0", "ansi-styles": "^4.0.0", "jest-get-type": "^26.3.0", -<<<<<<< refs/remotes/origin/dev-2 "jest-matcher-utils": "^26.4.0", -======= - "jest-matcher-utils": "^26.3.0", ->>>>>>> package-lock "jest-message-util": "^26.3.0", "jest-regex-util": "^26.0.0" } @@ -20587,25 +18913,15 @@ "dev": true }, "jest-diff": { -<<<<<<< refs/remotes/origin/dev-2 "version": "26.4.0", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.4.0.tgz", "integrity": "sha512-wwC38HlOW+iTq6j5tkj/ZamHn6/nrdcEOc/fKaVILNtN2NLWGdkfRaHWwfNYr5ehaLvuoG2LfCZIcWByVj0gjg==", -======= - "version": "26.3.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.3.0.tgz", - "integrity": "sha512-q5OZAtnr5CbHzrhjANzc3wvROk7+rcjCUI5uqM4cjOjtscNKfbJKBs3YhsWWhsdsIZzI3gc6wOpm49r6S61beg==", ->>>>>>> package-lock "dev": true, "requires": { "chalk": "^4.0.0", "diff-sequences": "^26.3.0", "jest-get-type": "^26.3.0", -<<<<<<< refs/remotes/origin/dev-2 "pretty-format": "^26.4.0" -======= - "pretty-format": "^26.3.0" ->>>>>>> package-lock } }, "jest-get-type": { @@ -20615,7 +18931,6 @@ "dev": true }, "jest-matcher-utils": { -<<<<<<< refs/remotes/origin/dev-2 "version": "26.4.0", "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.4.0.tgz", "integrity": "sha512-u+xdCdq+F262DH+PutJKXLGr2H5P3DImdJCir51PGSfi3TtbLQ5tbzKaN8BkXbiTIU6ayuAYBWTlU1nyckVdzA==", @@ -20625,17 +18940,6 @@ "jest-diff": "^26.4.0", "jest-get-type": "^26.3.0", "pretty-format": "^26.4.0" -======= - "version": "26.3.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.3.0.tgz", - "integrity": "sha512-M5ZRSp6qpyzZyrLwXD2Sop7xaxm6qu/mKvqWU+BOSPTa4Y0ZEoKUYBzus/emg6kaVt7Ov9xMDLLZR1SrC8FxCw==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "jest-diff": "^26.3.0", - "jest-get-type": "^26.3.0", - "pretty-format": "^26.3.0" ->>>>>>> package-lock } }, "jest-message-util": { @@ -20671,15 +18975,9 @@ } }, "pretty-format": { -<<<<<<< refs/remotes/origin/dev-2 "version": "26.4.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.0.tgz", "integrity": "sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg==", -======= - "version": "26.3.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.3.0.tgz", - "integrity": "sha512-24kRw4C2Ok8+SHquydTZZCZPF2fvANI7rChGs8sNu784+1Jkq5jVFMvNAJSLuLy6XUcP3Fnw+SscLIQag/CG8Q==", ->>>>>>> package-lock "dev": true, "requires": { "@jest/types": "^26.3.0", @@ -20784,90 +19082,12 @@ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "extend-shallow": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" -======= - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } ->>>>>>> remove webpack from dependencies -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { "is-extendable": "^0.1.0" ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } }, "external-editor": { @@ -20906,80 +19126,6 @@ "regex-not": "^1.0.0", "snapdragon": "^0.8.1", "to-regex": "^3.0.1" -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock -======= - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> package-lock -======= ->>>>>>> remove webpack from dependencies -======= -======= ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } }, "extract-zip": { @@ -21324,67 +19470,12 @@ "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==" }, "fill-range": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" -======= - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> package-lock -======= -======= ->>>>>>> fix merge conflict "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, "requires": { "to-regex-range": "^5.0.1" -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> remove webpack from dependencies -======= ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } }, "finalhandler": { @@ -21402,110 +19493,9 @@ } }, "find-cache-dir": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", - "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", -======= - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", ->>>>>>> remove webpack from dependencies -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", - "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", ->>>>>>> package-lock - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" - }, - "dependencies": { - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "make-dir": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", -======= - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", ->>>>>>> remove webpack from dependencies - "dev": true, - "requires": { - "semver": "^6.0.0" - } - }, -<<<<<<< refs/remotes/origin/dev-2 - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } -<<<<<<< refs/remotes/origin/dev-2 -======= -<<<<<<< refs/remotes/origin/dev-2 -======= - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", -======= "version": "3.3.1", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", ->>>>>>> package-lock "dev": true, "requires": { "commondir": "^1.0.1", @@ -21541,25 +19531,6 @@ "semver": "^6.0.0" } }, -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true -<<<<<<< refs/remotes/origin/dev-2 -======= - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "requires": { - "semver": "^6.0.0" - } - }, -======= ->>>>>>> package-lock "p-locate": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", @@ -21568,42 +19539,12 @@ "requires": { "p-limit": "^2.2.0" } -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } ->>>>>>> package-lock -======= -======= ->>>>>>> package-lock }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true -<<<<<<< dev-2 ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= }, "pkg-dir": { "version": "4.2.0", @@ -21613,10 +19554,6 @@ "requires": { "find-up": "^4.0.0" } ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } } }, @@ -24372,29 +22309,6 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true -<<<<<<< refs/remotes/origin/dev-2 - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } -======= ->>>>>>> remove webpack from dependencies }, "is-number": { "version": "3.0.0", @@ -25071,37 +22985,9 @@ } }, "identity-wallet": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "1.4.1", "resolved": "https://registry.npmjs.org/identity-wallet/-/identity-wallet-1.4.1.tgz", "integrity": "sha512-VRlpoin4gXqn6q1lx0rvTZn4lWCjRLQ6TcOigFPJgCF3mCWEqWcvwEsXIZR9vybX7N6Voiw3A1l1sqniVXfnnA==", -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/identity-wallet/-/identity-wallet-1.4.0.tgz", - "integrity": "sha512-3V9CPICqy/fzqSnFVp8MqESO+xTqmdCn2XoyO3KShxSS1jyyt47D6TWu1qz6tODKZvHunpgjeYfXzCGhlZWjpw==", ->>>>>>> upgrade provider packages -======= -<<<<<<< dev-2 - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/identity-wallet/-/identity-wallet-1.4.0.tgz", - "integrity": "sha512-3V9CPICqy/fzqSnFVp8MqESO+xTqmdCn2XoyO3KShxSS1jyyt47D6TWu1qz6tODKZvHunpgjeYfXzCGhlZWjpw==", -======= - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/identity-wallet/-/identity-wallet-1.4.1.tgz", - "integrity": "sha512-VRlpoin4gXqn6q1lx0rvTZn4lWCjRLQ6TcOigFPJgCF3mCWEqWcvwEsXIZR9vybX7N6Voiw3A1l1sqniVXfnnA==", ->>>>>>> 3box fix for identity-wallet ->>>>>>> 3box fix for identity-wallet -======= - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/identity-wallet/-/identity-wallet-1.4.1.tgz", - "integrity": "sha512-VRlpoin4gXqn6q1lx0rvTZn4lWCjRLQ6TcOigFPJgCF3mCWEqWcvwEsXIZR9vybX7N6Voiw3A1l1sqniVXfnnA==", ->>>>>>> fix merge conflict "requires": { "3id-blockchain-utils": "^0.4.0", "@babel/runtime": "^7.4.5", @@ -25120,47 +23006,6 @@ "tweetnacl-util": "^0.15.1" }, "dependencies": { - "@ethersproject/hdnode": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.2.tgz", - "integrity": "sha512-QAUI5tfseTFqv00Vnbwzofqse81wN9TaL+x5GufTHIHJXgVdguxU+l39E3VYDCmO+eVAA6RCn5dJgeyra+PU2g==", - "requires": { - "@ethersproject/abstract-signer": "^5.0.0", - "@ethersproject/basex": "^5.0.0", - "@ethersproject/bignumber": "^5.0.0", - "@ethersproject/bytes": "^5.0.0", - "@ethersproject/logger": "^5.0.0", - "@ethersproject/pbkdf2": "^5.0.0", - "@ethersproject/properties": "^5.0.0", - "@ethersproject/sha2": "^5.0.0", - "@ethersproject/signing-key": "^5.0.0", - "@ethersproject/strings": "^5.0.0", - "@ethersproject/transactions": "^5.0.0", - "@ethersproject/wordlists": "^5.0.0" - } - }, - "@ethersproject/wallet": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.2.tgz", - "integrity": "sha512-gg86ynLV5k5caNnYpJoYc6WyIUHKMTjOITCk5zXGyVbbkXE07y/fGql4A51W0C6mWkeb5Mzz8AKqzHZECdH30w==", - "requires": { - "@ethersproject/abstract-provider": "^5.0.0", - "@ethersproject/abstract-signer": "^5.0.0", - "@ethersproject/address": "^5.0.0", - "@ethersproject/bignumber": "^5.0.0", - "@ethersproject/bytes": "^5.0.0", - "@ethersproject/hash": "^5.0.0", - "@ethersproject/hdnode": "^5.0.0", - "@ethersproject/json-wallets": "^5.0.0", - "@ethersproject/keccak256": "^5.0.0", - "@ethersproject/logger": "^5.0.0", - "@ethersproject/properties": "^5.0.0", - "@ethersproject/random": "^5.0.0", - "@ethersproject/signing-key": "^5.0.0", - "@ethersproject/transactions": "^5.0.0", - "@ethersproject/wordlists": "^5.0.0" - } - }, "multibase": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz", @@ -25514,40 +23359,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= - }, - "nanoid": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", - "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==" ->>>>>>> package-lock -======= ->>>>>>> upgrade provider packages -======= -<<<<<<< dev-2 -======= - }, - "nanoid": { -<<<<<<< dev-2 - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.10.tgz", - "integrity": "sha512-iZFMXKeXWkxzlfmMfM91gw7YhN2sdJtixY+eZh9V6QWJWTOiurhpKhBMgr82pfzgSqglQgqYSCowEYsz8D++6w==" ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", - "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==" ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } } }, @@ -25870,11 +23681,30 @@ "path-exists": "^4.0.0" } }, + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, + "it-glob": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.7.tgz", + "integrity": "sha512-XfbziJs4fi0MfdEGTLkZXeqo2EorF2baFXxFn1E2dGbgYMhFTZlZ2Yn/mx5CkpuLWVJvO1DwtTOVW2mzRyVK8w==", + "requires": { + "fs-extra": "^8.1.0", + "minimatch": "^3.0.4" + } + }, "js-sha3": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", @@ -26333,40 +24163,6 @@ "multihashes": "^1.0.1", "murmurhash3js-revisited": "^3.0.0" } -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= - }, - "nanoid": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", - "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==" ->>>>>>> package-lock -======= ->>>>>>> upgrade provider packages -======= -<<<<<<< dev-2 -======= - }, - "nanoid": { -<<<<<<< dev-2 - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.10.tgz", - "integrity": "sha512-iZFMXKeXWkxzlfmMfM91gw7YhN2sdJtixY+eZh9V6QWJWTOiurhpKhBMgr82pfzgSqglQgqYSCowEYsz8D++6w==" ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", - "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==" ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } } }, @@ -26981,40 +24777,6 @@ "universalify": "^1.0.0" } }, - "it-glob": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.8.tgz", - "integrity": "sha512-PmIAgb64aJPM6wwT1UTlNDAJnNgdGrvr0vRr3AYCngcUuq1KaAovuz0dQAmUkaXudDG3EQzc7OttuLW9DaL3YQ==", - "requires": { - "fs-extra": "^8.1.0", - "minimatch": "^3.0.4" - }, - "dependencies": { - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" - } - } - }, "jsonfile": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", @@ -27024,31 +24786,6 @@ "universalify": "^1.0.0" } }, -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= - "nanoid": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", - "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==" - }, ->>>>>>> package-lock -======= ->>>>>>> upgrade provider packages -======= -<<<<<<< dev-2 -======= - "nanoid": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", - "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==" - }, ->>>>>>> remove webpack from dependencies ->>>>>>> remove webpack from dependencies -======= ->>>>>>> fix merge conflict "universalify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", @@ -28051,70 +25788,12 @@ "dev": true }, "is-accessor-descriptor": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" -======= - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> package-lock -======= -======= ->>>>>>> fix merge conflict "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { "kind-of": "^6.0.0" -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> remove webpack from dependencies -======= ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } }, "is-alphabetical": { @@ -28188,100 +25867,12 @@ } }, "is-data-descriptor": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" -======= - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } ->>>>>>> remove webpack from dependencies -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= -======= ->>>>>>> fix merge conflict "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { "kind-of": "^6.0.0" -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } }, "is-date-object": { @@ -28295,17 +25886,6 @@ "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==" }, "is-descriptor": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", @@ -28314,48 +25894,6 @@ "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" -======= - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> package-lock -======= -======= ->>>>>>> fix merge conflict - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> remove webpack from dependencies -======= ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } }, "is-directory": { @@ -28545,74 +26083,10 @@ "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==" }, "is-number": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -======= ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict "version": "6.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-6.0.0.tgz", "integrity": "sha512-Wu1VHeILBK8KAWJUAiSZQX94GmOE45Rg6/538fKwiloUu21KncEkYGPqob2oSZ5mUT73vLGrHQjKw3KMPwfDzg==", "dev": true -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock -======= - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> package-lock -======= ->>>>>>> remove webpack from dependencies -======= -======= ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict }, "is-obj": { "version": "2.0.0", @@ -29100,9 +26574,9 @@ "integrity": "sha512-hU5ObR14987PR7l0J7dfWAgKYiWoKbXcoXKqhQDGgHSZML6UPmHSS9ILBGucZkoA2B152kEqEOllS4tVQq11fg==" }, "it-glob": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.7.tgz", - "integrity": "sha512-XfbziJs4fi0MfdEGTLkZXeqo2EorF2baFXxFn1E2dGbgYMhFTZlZ2Yn/mx5CkpuLWVJvO1DwtTOVW2mzRyVK8w==", + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.8.tgz", + "integrity": "sha512-PmIAgb64aJPM6wwT1UTlNDAJnNgdGrvr0vRr3AYCngcUuq1KaAovuz0dQAmUkaXudDG3EQzc7OttuLW9DaL3YQ==", "requires": { "fs-extra": "^8.1.0", "minimatch": "^3.0.4" @@ -30563,68 +28037,11 @@ "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" }, "json-rpc-engine": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "5.3.0", "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-5.3.0.tgz", "integrity": "sha512-+diJ9s8rxB+fbJhT7ZEf8r8spaLRignLd8jTgQ/h5JSGppAHGtNMZtCoabipCaleR1B3GTGxbXBOqhaJSGmPGQ==", "requires": { "eth-rpc-errors": "^3.0.0", -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 ->>>>>>> package-lock - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-5.2.0.tgz", - "integrity": "sha512-F9xjrIjMqPNCxzk9jtOgJMs9mt+80p03IbJALnO278grtSU+Sh/fSqb7gNk/gwlTxavO2+ABKenyz4ZP3kwKIQ==", - "requires": { - "eth-rpc-errors": "^2.1.1", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-5.1.8.tgz", - "integrity": "sha512-vTBSDEPJV1fPAsbm2g5sEuPjsgLdiab2f1CTn2PyRr8nxggUpA996PDlNQDsM0gnrA99F8KIBLq2nIKrOFl1Mg==", - "requires": { - "async": "^2.0.1", - "eth-json-rpc-errors": "^2.0.1", - "promise-to-callback": "^1.0.0", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-5.2.0.tgz", - "integrity": "sha512-F9xjrIjMqPNCxzk9jtOgJMs9mt+80p03IbJALnO278grtSU+Sh/fSqb7gNk/gwlTxavO2+ABKenyz4ZP3kwKIQ==", - "requires": { - "eth-rpc-errors": "^2.1.1", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= -======= ->>>>>>> fix merge conflict - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-5.3.0.tgz", - "integrity": "sha512-+diJ9s8rxB+fbJhT7ZEf8r8spaLRignLd8jTgQ/h5JSGppAHGtNMZtCoabipCaleR1B3GTGxbXBOqhaJSGmPGQ==", - "requires": { - "eth-rpc-errors": "^3.0.0", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict "safe-event-emitter": "^1.0.1" } }, @@ -32101,6 +29518,40 @@ } } }, + "it-glob": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.7.tgz", + "integrity": "sha512-XfbziJs4fi0MfdEGTLkZXeqo2EorF2baFXxFn1E2dGbgYMhFTZlZ2Yn/mx5CkpuLWVJvO1DwtTOVW2mzRyVK8w==", + "requires": { + "fs-extra": "^8.1.0", + "minimatch": "^3.0.4" + }, + "dependencies": { + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + } + } + }, "js-sha3": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", @@ -32184,31 +29635,6 @@ } } }, -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= - "nanoid": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", - "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==" - }, ->>>>>>> package-lock -======= ->>>>>>> upgrade provider packages -======= -<<<<<<< dev-2 -======= - "nanoid": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz", - "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==" - }, ->>>>>>> remove webpack from dependencies ->>>>>>> remove webpack from dependencies -======= ->>>>>>> fix merge conflict "p-map": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", @@ -34946,18 +32372,6 @@ "picomatch": "^2.0.7" } }, -<<<<<<< refs/remotes/origin/dev-2 -======= - "serialize-javascript": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", - "dev": true, - "requires": { - "randombytes": "^2.1.0" - } - }, ->>>>>>> package-lock "strip-json-comments": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", @@ -35937,37 +33351,6 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true -<<<<<<< refs/remotes/origin/dev-2 - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } - } -======= ->>>>>>> remove webpack from dependencies }, "is-data-descriptor": { "version": "0.1.4", @@ -43481,15 +40864,9 @@ } }, "serialize-javascript": { -<<<<<<< refs/remotes/origin/dev-2 "version": "4.0.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", -======= - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz", - "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", ->>>>>>> remove webpack from dependencies "dev": true, "requires": { "randombytes": "^2.1.0" @@ -43606,67 +40983,12 @@ "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" }, "set-value": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict "version": "3.0.2", "resolved": "https://registry.npmjs.org/set-value/-/set-value-3.0.2.tgz", "integrity": "sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==", "dev": true, "requires": { "is-plain-object": "^2.0.4" -<<<<<<< refs/remotes/origin/dev-2 -======= - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", - "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> package-lock -======= - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-3.0.2.tgz", - "integrity": "sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= ->>>>>>> remove webpack from dependencies -======= ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict } }, "setimmediate": { @@ -44004,10 +41326,6 @@ "is-descriptor": "^0.1.0" } }, -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", @@ -44058,12 +41376,6 @@ "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", -======= - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", ->>>>>>> remove webpack from dependencies "dev": true, "requires": { "is-accessor-descriptor": "^0.1.6", @@ -44088,105 +41400,6 @@ "define-property": "^1.0.0", "isobject": "^3.0.0", "snapdragon-util": "^3.0.1" -<<<<<<< refs/remotes/origin/dev-2 -======= - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, -======= ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } ->>>>>>> remove webpack from dependencies - } - }, - "snapdragon-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "dev": true, - "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" } }, "snapdragon-util": { @@ -45795,15 +43008,6 @@ "source-map-support": "~0.5.12" }, "dependencies": { -<<<<<<< refs/remotes/origin/dev-2 -======= - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, ->>>>>>> remove webpack from dependencies "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -46244,21 +43448,9 @@ } }, "to-regex-range": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", -======= - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", ->>>>>>> remove webpack from dependencies -======= "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", ->>>>>>> package-lock "dev": true, "requires": { "is-number": "^7.0.0" @@ -47597,14 +44789,6 @@ "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", "dev": true -<<<<<<< refs/remotes/origin/dev-2 - }, - "void-elements": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", - "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=" -======= ->>>>>>> remove webpack from dependencies }, "void-elements": { "version": "2.0.1", @@ -48850,90 +46034,15 @@ } }, "webdriver": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.4.0.tgz", - "integrity": "sha512-yF5i2Wc6G+uQdEl3iAFpDPFP3xgfucUWaj6uXogEcMtq67SSIc4G9mq6vZCUF6F/GoW0H5c9F0L8ab8ZSTSX6w==", -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.3.6.tgz", - "integrity": "sha512-cp8RSA50rBGDRBUG7oG5tZYvnvwLIfJsGbVtC6/C2DIRSGDaJvPRIsO0pJh/QL9T+dxk/KkA8xhZTPheV98h2g==", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.3.6.tgz", - "integrity": "sha512-cp8RSA50rBGDRBUG7oG5tZYvnvwLIfJsGbVtC6/C2DIRSGDaJvPRIsO0pJh/QL9T+dxk/KkA8xhZTPheV98h2g==", -======= - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.3.5.tgz", - "integrity": "sha512-UN5k34+Zo2KihVoFILFSXtk0trVUbOBC5XRXY0QtYEPbgZ2hSdzhnRlj+qDVvGBiC/zjPf8IV/C6avzThd/Y+g==", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.3.6.tgz", - "integrity": "sha512-cp8RSA50rBGDRBUG7oG5tZYvnvwLIfJsGbVtC6/C2DIRSGDaJvPRIsO0pJh/QL9T+dxk/KkA8xhZTPheV98h2g==", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= "version": "6.4.0", "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.4.0.tgz", "integrity": "sha512-yF5i2Wc6G+uQdEl3iAFpDPFP3xgfucUWaj6uXogEcMtq67SSIc4G9mq6vZCUF6F/GoW0H5c9F0L8ab8ZSTSX6w==", ->>>>>>> package-lock ->>>>>>> package-lock -======= - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.4.0.tgz", - "integrity": "sha512-yF5i2Wc6G+uQdEl3iAFpDPFP3xgfucUWaj6uXogEcMtq67SSIc4G9mq6vZCUF6F/GoW0H5c9F0L8ab8ZSTSX6w==", ->>>>>>> fix merge conflict "dev": true, "requires": { "@wdio/config": "6.1.14", "@wdio/logger": "6.0.16", -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 "@wdio/protocols": "6.3.6", -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "@wdio/utils": "6.4.0", -======= -======= -<<<<<<< dev-2 ->>>>>>> package-lock - "@wdio/utils": "6.3.6", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "@wdio/protocols": "6.3.0", - "@wdio/utils": "6.3.0", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "@wdio/protocols": "6.3.6", - "@wdio/utils": "6.3.6", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "@wdio/utils": "6.4.0", ->>>>>>> package-lock ->>>>>>> package-lock -======= - "@wdio/protocols": "6.3.6", - "@wdio/utils": "6.4.0", ->>>>>>> fix merge conflict "got": "^11.0.2", "lodash.merge": "^4.6.1" }, @@ -49056,120 +46165,20 @@ } }, "webdriverio": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.4.0.tgz", - "integrity": "sha512-dtttlqvOLp5tCvCvT/A9Slau/W+9d2VtaMsL8awF9lPpjKMRBXRfD541CqU8fxnIl1XszqAAvcXdTJkqgtGPyg==", -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.3.6.tgz", - "integrity": "sha512-srgbSrJrcuADCwu37iijat1Z8JckTbcqbSCCdyLHOWEe0CgFdLcYKK5dYfuTQPhqSv6XYgPXq1Fce6jzo7nShA==", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.3.6.tgz", - "integrity": "sha512-srgbSrJrcuADCwu37iijat1Z8JckTbcqbSCCdyLHOWEe0CgFdLcYKK5dYfuTQPhqSv6XYgPXq1Fce6jzo7nShA==", -======= - "version": "6.3.5", - "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.3.5.tgz", - "integrity": "sha512-hPREeod6pjPmZXpHI+ixRUeaVr/Ce2AwBfyttQlvL0GmsRgYSHKs5Dy7VWlvXmGhH/ahIJCOY0tccUPTXcGJPQ==", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.3.6.tgz", - "integrity": "sha512-srgbSrJrcuADCwu37iijat1Z8JckTbcqbSCCdyLHOWEe0CgFdLcYKK5dYfuTQPhqSv6XYgPXq1Fce6jzo7nShA==", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.4.0.tgz", - "integrity": "sha512-dtttlqvOLp5tCvCvT/A9Slau/W+9d2VtaMsL8awF9lPpjKMRBXRfD541CqU8fxnIl1XszqAAvcXdTJkqgtGPyg==", ->>>>>>> package-lock ->>>>>>> package-lock -======= "version": "6.4.0", "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.4.0.tgz", "integrity": "sha512-dtttlqvOLp5tCvCvT/A9Slau/W+9d2VtaMsL8awF9lPpjKMRBXRfD541CqU8fxnIl1XszqAAvcXdTJkqgtGPyg==", ->>>>>>> fix merge conflict "dev": true, "requires": { "@types/puppeteer": "^3.0.1", "@wdio/config": "6.1.14", "@wdio/logger": "6.0.16", -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "@wdio/repl": "6.4.0", "@wdio/utils": "6.4.0", "archiver": "^5.0.0", "atob": "^2.1.2", "css-value": "^0.0.1", "devtools": "6.4.0", -======= -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -<<<<<<< dev-2 -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -<<<<<<< dev-2 ->>>>>>> package-lock - "@wdio/repl": "6.3.6", - "@wdio/utils": "6.3.6", - "archiver": "^5.0.0", - "atob": "^2.1.2", - "css-value": "^0.0.1", - "devtools": "6.3.6", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock -======= -======= - "@wdio/repl": "6.3.0", - "@wdio/utils": "6.3.0", - "archiver": "^4.0.1", - "atob": "^2.1.2", - "css-value": "^0.0.1", - "devtools": "6.3.4", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "@wdio/repl": "6.3.6", - "@wdio/utils": "6.3.6", - "archiver": "^5.0.0", - "atob": "^2.1.2", - "css-value": "^0.0.1", - "devtools": "6.3.6", ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= -======= ->>>>>>> fix merge conflict - "@wdio/repl": "6.4.0", - "@wdio/utils": "6.4.0", - "archiver": "^5.0.0", - "atob": "^2.1.2", - "css-value": "^0.0.1", - "devtools": "6.4.0", -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> package-lock ->>>>>>> package-lock -======= ->>>>>>> fix merge conflict "get-port": "^5.1.1", "grapheme-splitter": "^1.0.2", "lodash.clonedeep": "^4.5.0", @@ -49181,36 +46190,7 @@ "resq": "^1.6.0", "rgb2hex": "^0.2.0", "serialize-error": "^7.0.0", -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 - "webdriver": "6.4.0" -======= - "webdriver": "6.3.6" ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 -<<<<<<< dev-2 - "webdriver": "6.3.6" -======= - "webdriver": "6.3.5" ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "webdriver": "6.3.6" ->>>>>>> package-lock -<<<<<<< refs/remotes/origin/dev-2 -======= -======= - "webdriver": "6.4.0" ->>>>>>> package-lock ->>>>>>> package-lock -======= "webdriver": "6.4.0" ->>>>>>> fix merge conflict } }, "webidl-conversions": { @@ -49220,48 +46200,9 @@ "dev": true }, "webpack": { -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 -<<<<<<< refs/remotes/origin/dev-2 "version": "4.44.1", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz", "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==", -======= - "version": "4.44.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.0.tgz", - "integrity": "sha512-wAuJxK123sqAw31SpkPiPW3iKHgFUiKvO7E7UZjtdExcsRe3fgav4mvoMM7vvpjLHVoJ6a0Mtp2fzkoA13e0Zw==", ->>>>>>> remove webpack from dependencies -======= - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz", - "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==", ->>>>>>> package-lock -======= -<<<<<<< dev-2 -<<<<<<< dev-2 - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz", - "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==", -======= - "version": "4.44.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.0.tgz", - "integrity": "sha512-wAuJxK123sqAw31SpkPiPW3iKHgFUiKvO7E7UZjtdExcsRe3fgav4mvoMM7vvpjLHVoJ6a0Mtp2fzkoA13e0Zw==", ->>>>>>> remove webpack from dependencies -<<<<<<< refs/remotes/origin/dev-2 ->>>>>>> remove webpack from dependencies -======= -======= - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz", - "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==", ->>>>>>> package-lock ->>>>>>> package-lock -======= - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz", - "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==", ->>>>>>> fix merge conflict "dev": true, "requires": { "@webassemblyjs/ast": "1.9.0", @@ -49294,30 +46235,6 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", "dev": true -<<<<<<< refs/remotes/origin/dev-2 - }, - "find-cache-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" - } - }, - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "dev": true, - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } -======= ->>>>>>> remove webpack from dependencies }, "find-cache-dir": { "version": "2.1.0", @@ -49368,15 +46285,9 @@ "dev": true }, "terser-webpack-plugin": { -<<<<<<< refs/remotes/origin/dev-2 "version": "1.4.5", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", -======= - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz", - "integrity": "sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==", ->>>>>>> remove webpack from dependencies "dev": true, "requires": { "cacache": "^12.0.2",