diff --git a/client/package-lock.json b/client/package-lock.json
index f213b7f..ceea2ce 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1026,14 +1026,14 @@
"integrity": "sha512-p2n505t2K0zD1ZvGPhI6EsSviEVLCB7BYowhf/ONmVaWED138PaG4Z9nY6YuHU383uOoIWT+Lq3dLkFzDzstXw=="
},
"@oceanprotocol/keeper-contracts": {
- "version": "0.9.0",
- "resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.9.0.tgz",
- "integrity": "sha512-QrTCQNiQa9KszH6/dTAS0a8AoW/SIEkZazXTwA2aoePBS0X8fNpsKvT3N2OuR1YPAjCU3rGWzYdV4TNnMNbsSw=="
+ "version": "0.9.1",
+ "resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.9.1.tgz",
+ "integrity": "sha512-c1LvaH+e1tzow0gZLwSWe19ap+DrZuNmZfxBdwEVEPQXarI0jTXa5qVDoiBow8kBWaqSIUgFAzQOJW8rKdlS1A=="
},
"@oceanprotocol/squid": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/@oceanprotocol/squid/-/squid-0.5.0.tgz",
- "integrity": "sha512-yGu121WJ9XEX1U4ql/p7ISV36fqNydxGBYgXHbOjeXS/kvNFx3hP2emBf4QA12PjPZcmuLz0wE+7GBL4H/v+eA==",
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/@oceanprotocol/squid/-/squid-0.5.1.tgz",
+ "integrity": "sha512-YJewmMIpHG5cjsOsgOynky7z+5YT7l5+niW9AqCMOoMGy76VEe1+6nmAhZ/PB9BtIpYCGWOl1Y68I32qhX9IWQ==",
"requires": {
"@oceanprotocol/keeper-contracts": "^0.9.0",
"bignumber.js": "^8.0.1",
@@ -1382,9 +1382,9 @@
}
},
"@types/react": {
- "version": "16.8.10",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.10.tgz",
- "integrity": "sha512-7bUQeZKP4XZH/aB4i7k1i5yuwymDu/hnLMhD9NjVZvQQH7ZUgRN3d6iu8YXzx4sN/tNr0bj8jgguk8hhObzGvA==",
+ "version": "16.8.13",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.13.tgz",
+ "integrity": "sha512-otJ4ntMuHGrvm67CdDJMAls4WqotmAmW0g3HmWi9LCjSWXrxoXY/nHXrtmMfvPEEmGFNm6NdgMsJmnfH820Qaw==",
"dev": true,
"requires": {
"@types/prop-types": "*",
@@ -1392,9 +1392,9 @@
}
},
"@types/react-datepicker": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-2.2.0.tgz",
- "integrity": "sha512-zVAeDqkQgSdARElFXwXXpaaADyoRMo1SPsBzw6WV2iciJqS3ysSvYjqEKyTZfGbGkgw5sExEI2QKXam/KlCtyg==",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-2.2.1.tgz",
+ "integrity": "sha512-En5Ezrl+o/QvHhAFUxxQox2SDu4vDmo3/uhXj9SwX7ObZ5X4jwSS9CocTHsRCqpsr+F7JGhUJ9KK7FVeknDw4Q==",
"dev": true,
"requires": {
"@types/react": "*",
@@ -1441,9 +1441,9 @@
}
},
"@types/react-transition-group": {
- "version": "2.0.16",
- "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.0.16.tgz",
- "integrity": "sha512-FUJEx2BGJPU1qVQoWd9v7wpOwnCPTWhcE4iTaU5prry9SvwiI11lCXOci8Nz9cM/Fuf650l7Skg6nlVeCYjPFA==",
+ "version": "2.8.0",
+ "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.8.0.tgz",
+ "integrity": "sha512-DHZrY4UBypeT/bD2WakC3MkdBHMOkhqWnRRCMqrtNknyhfkCfKmRlpKdxGlPkDKvNl2uDSHcdvmKy8JW0aNETA==",
"dev": true,
"requires": {
"@types/react": "*"
@@ -16345,11 +16345,11 @@
}
},
"react-transition-group": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.7.1.tgz",
- "integrity": "sha512-b0VJTzNRnXxRpCuxng6QJbAzmmrhBn1BZJfPPnHbH2PIo8msdkajqwtfdyGm/OypPXZNfAHKEqeN15wjMXrRJQ==",
+ "version": "2.9.0",
+ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
+ "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
"requires": {
- "dom-helpers": "^3.3.1",
+ "dom-helpers": "^3.4.0",
"loose-envify": "^1.4.0",
"prop-types": "^15.6.2",
"react-lifecycles-compat": "^3.0.4"
@@ -19177,9 +19177,9 @@
}
},
"typescript": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.1.tgz",
- "integrity": "sha512-3NSMb2VzDQm8oBTLH6Nj55VVtUEpe/rgkIzMir0qVoLyjDZlnMBva0U6vDiV3IH+sl/Yu6oP5QwsAQtHPmDd2Q==",
+ "version": "3.4.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.2.tgz",
+ "integrity": "sha512-Og2Vn6Mk7JAuWA1hQdDQN/Ekm/SchX80VzLhjKN9ETYrIepBFAd8PkOdOTK2nKt0FCkmMZKBJvQ1dV1gIxPu/A==",
"dev": true
},
"ua-parser-js": {
@@ -19657,22 +19657,22 @@
"dev": true
},
"web3": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3/-/web3-1.0.0-beta.51.tgz",
- "integrity": "sha512-cSjJe8AwR9TKELLkGwk2HNL+37e+Y3x0nKkdBNpBZQNZR0SeoT3Jckkd7pBgrJKcyupItN+tKF48x5yNRvHzrQ==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3/-/web3-1.0.0-beta.52.tgz",
+ "integrity": "sha512-IWBV1gS7sElHqD2mkwjdyeEmY4YhWn7C+b+pdOWgDJ6j70ux2bqVMfsP0saZ9nWeF1TWMvUnrFsyZ7C4/VnhTA==",
"requires": {
"@babel/runtime": "^7.3.1",
"@types/node": "^10.12.18",
- "web3-bzz": "1.0.0-beta.51",
- "web3-core": "1.0.0-beta.51",
- "web3-core-helpers": "1.0.0-beta.51",
- "web3-core-method": "1.0.0-beta.51",
- "web3-eth": "1.0.0-beta.51",
- "web3-eth-personal": "1.0.0-beta.51",
- "web3-net": "1.0.0-beta.51",
- "web3-providers": "1.0.0-beta.51",
- "web3-shh": "1.0.0-beta.51",
- "web3-utils": "1.0.0-beta.51"
+ "web3-bzz": "1.0.0-beta.52",
+ "web3-core": "1.0.0-beta.52",
+ "web3-core-helpers": "1.0.0-beta.52",
+ "web3-core-method": "1.0.0-beta.52",
+ "web3-eth": "1.0.0-beta.52",
+ "web3-eth-personal": "1.0.0-beta.52",
+ "web3-net": "1.0.0-beta.52",
+ "web3-providers": "1.0.0-beta.52",
+ "web3-shh": "1.0.0-beta.52",
+ "web3-utils": "1.0.0-beta.52"
},
"dependencies": {
"@types/node": {
@@ -19796,9 +19796,9 @@
"integrity": "sha1-wqMN7bPlNdcsz4LjQ5QaULqFM6w="
},
"web3-bzz": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.0.0-beta.51.tgz",
- "integrity": "sha512-9zDifUc3qPOF2WJ2H/81Ki4rTLa4elB0OG8h3IEYHjXOLDHKzswBQC3favhvm/ZQ2WmnkGd04vsU2iQzBmr1OQ==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-bzz/-/web3-bzz-1.0.0-beta.52.tgz",
+ "integrity": "sha512-yva0KW0cIEdFyHaGMHuMGjl4jea/esNBVwfFsejNRJy2W2jSMjnji+AFXnkcq8MhOAyNtQD4WzNdad9F51PaZg==",
"requires": {
"@babel/runtime": "^7.3.1",
"@types/node": "^10.12.18",
@@ -19807,32 +19807,32 @@
}
},
"web3-core": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.0.0-beta.51.tgz",
- "integrity": "sha512-RZRAt0O+LsU1jV6BtuZBQYjE+YcNa9Bu6FzEAMZ92EdgiAkUB2kbTeipVGCMxOST26kWXUtwCwxkkx4g6iy41A==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.0.0-beta.52.tgz",
+ "integrity": "sha512-UKHNBIj5b4M40DrGJRQKgWTtbqZCCZck38oQgBbtLAUUQmvlZybLf8jGWUfMamyhJg/eBqT/t1l7OcAn5i9zrA==",
"requires": {
"@babel/runtime": "^7.3.1",
"@types/bn.js": "^4.11.4",
"@types/node": "^10.12.18",
"lodash": "^4.17.11",
- "web3-utils": "1.0.0-beta.51"
+ "web3-utils": "1.0.0-beta.52"
}
},
"web3-core-helpers": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.51.tgz",
- "integrity": "sha512-kA5JMJyrB5yxX3dQuziBP0Yo9i+MKwtYfA2E7DTbEoUueqjPcEwXMUxmpGROYmufCcfoe/B/FqpC8CzkqmHokw==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.52.tgz",
+ "integrity": "sha512-VJCJMEplvrU7jCgn0MCuLLa+XWkQVttQpShM5i0XkcKs2gmisMtoLO3lATx2b32ruu29EriBYkkAVzc0/nxppg==",
"requires": {
"@babel/runtime": "^7.3.1",
"lodash": "^4.17.11",
- "web3-eth-iban": "1.0.0-beta.51",
- "web3-utils": "1.0.0-beta.51"
+ "web3-eth-iban": "1.0.0-beta.52",
+ "web3-utils": "1.0.0-beta.52"
}
},
"web3-core-method": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.0.0-beta.51.tgz",
- "integrity": "sha512-Tl5jGWqx01W6OFPNZI1c4wtCt+HPKWldWrLORKfW0zHyXrYDH6V2BuitA7R7j+54+c/61W3C2E6a+g7sQ8+mWA==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-core-method/-/web3-core-method-1.0.0-beta.52.tgz",
+ "integrity": "sha512-lLbDsV2pxxrUDIWvRI/u6MsvG8mKGfCYOifXqb+yqAruhoNs/Gahoa/1UTjsn0qhVQafsffFRXaEhi6BQDQOYA==",
"requires": {
"@babel/runtime": "^7.3.1",
"eventemitter3": "3.1.0",
@@ -19840,9 +19840,9 @@
}
},
"web3-core-subscriptions": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.51.tgz",
- "integrity": "sha512-bM4KlA37Or/XfrZKLtXlvUSISKWUkXOH/32s0DBnxRkKuey8QKK460H5KF9/HS8LfY7cO11NAepnFe4Tk1rSaQ==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.52.tgz",
+ "integrity": "sha512-ZE6VsTVZ9PHV3FOJHnXOxUr4RuwXUpqC+RxCESb/UXvwHNnPbKNPpQjcoc5shaFrtOVtY14bIl35qTxVHSeGWg==",
"requires": {
"@babel/runtime": "^7.3.1",
"eventemitter3": "^3.1.0",
@@ -19850,43 +19850,43 @@
}
},
"web3-eth": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.0.0-beta.51.tgz",
- "integrity": "sha512-w+8YtfKAcEPmOtYf47cjQw3t6dm5YcGvkl4jVZF00WHuvkPMFsXBTbZdH4aVgjPhubl53rdLrJwAP2b7X83+kQ==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-eth/-/web3-eth-1.0.0-beta.52.tgz",
+ "integrity": "sha512-mpuIFSIke/ZVdWfEzq0QRJAxcDh50BJflsdUMbNaxf5prP7Sz8FZJz/fHiu4H4cEM6aW8Bi0Hsoqad4+caX6Uw==",
"requires": {
"@babel/runtime": "^7.3.1",
"ethereumjs-tx": "^1.3.7",
"rxjs": "^6.4.0",
- "web3-core": "1.0.0-beta.51",
- "web3-core-helpers": "1.0.0-beta.51",
- "web3-core-method": "1.0.0-beta.51",
- "web3-core-subscriptions": "1.0.0-beta.51",
- "web3-eth-abi": "1.0.0-beta.51",
- "web3-eth-accounts": "1.0.0-beta.51",
- "web3-eth-contract": "1.0.0-beta.51",
- "web3-eth-ens": "1.0.0-beta.51",
- "web3-eth-iban": "1.0.0-beta.51",
- "web3-eth-personal": "1.0.0-beta.51",
- "web3-net": "1.0.0-beta.51",
- "web3-providers": "1.0.0-beta.51",
- "web3-utils": "1.0.0-beta.51"
+ "web3-core": "1.0.0-beta.52",
+ "web3-core-helpers": "1.0.0-beta.52",
+ "web3-core-method": "1.0.0-beta.52",
+ "web3-core-subscriptions": "1.0.0-beta.52",
+ "web3-eth-abi": "1.0.0-beta.52",
+ "web3-eth-accounts": "1.0.0-beta.52",
+ "web3-eth-contract": "1.0.0-beta.52",
+ "web3-eth-ens": "1.0.0-beta.52",
+ "web3-eth-iban": "1.0.0-beta.52",
+ "web3-eth-personal": "1.0.0-beta.52",
+ "web3-net": "1.0.0-beta.52",
+ "web3-providers": "1.0.0-beta.52",
+ "web3-utils": "1.0.0-beta.52"
}
},
"web3-eth-abi": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.51.tgz",
- "integrity": "sha512-mTcMpIihZECzZ5oWUh9Jg7x5pVhPv6xPTPWxY9007QKbbBH01GwPogoxBz1X7RfWOwGqZABfxFgXow5NkL0T3A==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.52.tgz",
+ "integrity": "sha512-c03sH6y7ncp9tBPt0EZEcyFyou4kyYdr72VJMY8ip0JAfZgl4WI9XcGpD207z0lR4Ki1PSCfkh+ZigoXxggouw==",
"requires": {
"@babel/runtime": "^7.3.1",
"ethers": "^4.0.27",
"lodash": "^4.17.11",
- "web3-utils": "1.0.0-beta.51"
+ "web3-utils": "1.0.0-beta.52"
}
},
"web3-eth-accounts": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.51.tgz",
- "integrity": "sha512-6HJu4Vrli7p1S52mV83juFjWn0w7rUE4q9cZdYwsGmqHGrOmV7E3zuBEyuA+kelPLpSmcJDOnEowvORmRdpAyw==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.52.tgz",
+ "integrity": "sha512-B52yDVK2/3NKce1CESTZ/sD+6lU9pdNk4tPAtTkWTTPlejAbNlI04SdCX+hn2XJpDjsvU2HRSY3uNugVTrRQ6w==",
"requires": {
"@babel/runtime": "^7.3.1",
"crypto-browserify": "3.12.0",
@@ -19894,11 +19894,11 @@
"lodash": "^4.17.11",
"scrypt.js": "0.2.0",
"uuid": "3.3.2",
- "web3-core": "1.0.0-beta.51",
- "web3-core-helpers": "1.0.0-beta.51",
- "web3-core-method": "1.0.0-beta.51",
- "web3-providers": "1.0.0-beta.51",
- "web3-utils": "1.0.0-beta.51"
+ "web3-core": "1.0.0-beta.52",
+ "web3-core-helpers": "1.0.0-beta.52",
+ "web3-core-method": "1.0.0-beta.52",
+ "web3-providers": "1.0.0-beta.52",
+ "web3-utils": "1.0.0-beta.52"
},
"dependencies": {
"eth-lib": {
@@ -19919,98 +19919,98 @@
}
},
"web3-eth-contract": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.51.tgz",
- "integrity": "sha512-iVMay6OXDjDPeiPoeGpa6PQGuwIPxL/8UAVIlWVB1CYG9+FY6kcOUO7vI7dnDVwN1zneAslf9h86px6hgR92OQ==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.52.tgz",
+ "integrity": "sha512-X5Eqi/onxaBw04urowcYXl4L7eS3NuAFdBxSYP14rdTtP03TbgZEJ1GZDftF3cgMorvfGKcTyxyK0VYj/l+lfg==",
"requires": {
"@babel/runtime": "^7.3.1",
"@types/bn.js": "^4.11.4",
"lodash": "^4.17.11",
- "web3-core": "1.0.0-beta.51",
- "web3-core-helpers": "1.0.0-beta.51",
- "web3-core-method": "1.0.0-beta.51",
- "web3-core-subscriptions": "1.0.0-beta.51",
- "web3-eth-abi": "1.0.0-beta.51",
- "web3-eth-accounts": "1.0.0-beta.51",
- "web3-providers": "1.0.0-beta.51",
- "web3-utils": "1.0.0-beta.51"
+ "web3-core": "1.0.0-beta.52",
+ "web3-core-helpers": "1.0.0-beta.52",
+ "web3-core-method": "1.0.0-beta.52",
+ "web3-core-subscriptions": "1.0.0-beta.52",
+ "web3-eth-abi": "1.0.0-beta.52",
+ "web3-eth-accounts": "1.0.0-beta.52",
+ "web3-providers": "1.0.0-beta.52",
+ "web3-utils": "1.0.0-beta.52"
}
},
"web3-eth-ens": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.0.0-beta.51.tgz",
- "integrity": "sha512-JpHlAIUZGLGTTHWKBFciv5KGBi/+n0uqaO/dXoIfB/jI0Gcm5GYEwUt8TU/Y0/WVHvw/ttU1e0laJYPzTTEB8w==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-eth-ens/-/web3-eth-ens-1.0.0-beta.52.tgz",
+ "integrity": "sha512-8VTOF+v5pAjq1FmakXRceY6VrIoPB7DqfSc+K4aAOJ/tuIMIpe6pt0Bl9IYAbpgFrFqL7ow22d9xcd77ULIwiQ==",
"requires": {
"@babel/runtime": "^7.3.1",
"eth-ens-namehash": "2.0.8",
"lodash": "^4.17.11",
- "web3-core": "1.0.0-beta.51",
- "web3-core-helpers": "1.0.0-beta.51",
- "web3-core-method": "1.0.0-beta.51",
- "web3-eth-abi": "1.0.0-beta.51",
- "web3-eth-contract": "1.0.0-beta.51",
- "web3-net": "1.0.0-beta.51",
- "web3-providers": "1.0.0-beta.51",
- "web3-utils": "1.0.0-beta.51"
+ "web3-core": "1.0.0-beta.52",
+ "web3-core-helpers": "1.0.0-beta.52",
+ "web3-core-method": "1.0.0-beta.52",
+ "web3-eth-abi": "1.0.0-beta.52",
+ "web3-eth-contract": "1.0.0-beta.52",
+ "web3-net": "1.0.0-beta.52",
+ "web3-providers": "1.0.0-beta.52",
+ "web3-utils": "1.0.0-beta.52"
}
},
"web3-eth-iban": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.51.tgz",
- "integrity": "sha512-GNLsEWpEkyJqmogsF+mQLlO06tPOudfhVBCPC68SIOw6wQTqAtoqzOot3EJdrEIDGet9eujOoBs6VWAjNbMGRA==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.52.tgz",
+ "integrity": "sha512-LJZRZ+hZZPU9Fb7xR54mX1li5aKMp9xj9wgZZa4ikdL7iWi0rg1tOacEhbxWGQsjEYhGZYcvxhW9RIdHOwAySg==",
"requires": {
"@babel/runtime": "^7.3.1",
"bn.js": "4.11.8",
- "web3-utils": "1.0.0-beta.51"
+ "web3-utils": "1.0.0-beta.52"
}
},
"web3-eth-personal": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.51.tgz",
- "integrity": "sha512-Mq6uAvhfsKf7FSZVqJOfmb7i5zxQ6HkbTRcAyOOOfSmGnTvxSIjtKZCTAVv3UeBh3pxIXn5FSDlKngaj1MbYXg==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.52.tgz",
+ "integrity": "sha512-tNjoB9KztpZL2ayjWYxaInwMrEGxBV7rGMt3hkhk9y4UxlK+8rZtrboz5hggzcgzHaVGnG73rdynhbuPU/cSAQ==",
"requires": {
"@babel/runtime": "^7.3.1",
- "web3-core": "1.0.0-beta.51",
- "web3-core-helpers": "1.0.0-beta.51",
- "web3-core-method": "1.0.0-beta.51",
- "web3-net": "1.0.0-beta.51",
- "web3-providers": "1.0.0-beta.51",
- "web3-utils": "1.0.0-beta.51"
+ "web3-core": "1.0.0-beta.52",
+ "web3-core-helpers": "1.0.0-beta.52",
+ "web3-core-method": "1.0.0-beta.52",
+ "web3-net": "1.0.0-beta.52",
+ "web3-providers": "1.0.0-beta.52",
+ "web3-utils": "1.0.0-beta.52"
}
},
"web3-net": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.0.0-beta.51.tgz",
- "integrity": "sha512-1xeBIb/Tvf6PVNZ0u+pPrULNkLefTf0uuo8Hyx82EfY+mvMz6jvNDyFsD8spDGJUuxlDabFnoZdiaEv7LNwwSg==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-net/-/web3-net-1.0.0-beta.52.tgz",
+ "integrity": "sha512-rw66c5A5VTF/m3Acnr9ebIAgbr28q5jhXs8A8/F4VjbsDmUhQuQr3deyTPfyOEyupcnn6QRLoQ1EFVzeaUP7Ng==",
"requires": {
"@babel/runtime": "^7.3.1",
"lodash": "^4.17.11",
- "web3-core": "1.0.0-beta.51",
- "web3-core-helpers": "1.0.0-beta.51",
- "web3-core-method": "1.0.0-beta.51",
- "web3-providers": "1.0.0-beta.51",
- "web3-utils": "1.0.0-beta.51"
+ "web3-core": "1.0.0-beta.52",
+ "web3-core-helpers": "1.0.0-beta.52",
+ "web3-core-method": "1.0.0-beta.52",
+ "web3-providers": "1.0.0-beta.52",
+ "web3-utils": "1.0.0-beta.52"
}
},
"web3-shh": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.0.0-beta.51.tgz",
- "integrity": "sha512-IA4oaNH+PaGWQtTe7BmENszNTeSTsZ15hBNnOrMIyeF0PeghPj7sCenTtU/q8Ie6jR0oXfTXJOQCS/Q/QC3Ksg==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-shh/-/web3-shh-1.0.0-beta.52.tgz",
+ "integrity": "sha512-Qu9cb9fifUFIDTGujnBnInO3D2OCXDAmCowqMWebEazoZxk9P4oYWmumym1ZErixqEWREb4lkoayyEDSpARzSg==",
"requires": {
"@babel/runtime": "^7.3.1",
- "web3-core": "1.0.0-beta.51",
- "web3-core-helpers": "1.0.0-beta.51",
- "web3-core-method": "1.0.0-beta.51",
- "web3-core-subscriptions": "1.0.0-beta.51",
- "web3-net": "1.0.0-beta.51",
- "web3-providers": "1.0.0-beta.51",
- "web3-utils": "1.0.0-beta.51"
+ "web3-core": "1.0.0-beta.52",
+ "web3-core-helpers": "1.0.0-beta.52",
+ "web3-core-method": "1.0.0-beta.52",
+ "web3-core-subscriptions": "1.0.0-beta.52",
+ "web3-net": "1.0.0-beta.52",
+ "web3-providers": "1.0.0-beta.52",
+ "web3-utils": "1.0.0-beta.52"
}
},
"web3-utils": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.51.tgz",
- "integrity": "sha512-c9sRSscu0NIjD96X4ToDOgTxGyJevppuB+uHOgWkziaLGqlw/Li1l24nGkvr0Zqpt9SufvfPcWf8EEC92pnwKg==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.52.tgz",
+ "integrity": "sha512-WdHyzPcZu/sOnNrkcOZT20QEX9FhwD9OJJXENojQNvMK2a1xo3n8JWBcC2gzAGwsa0Aah6z2B3Xwa1P//8FaoA==",
"requires": {
"@babel/runtime": "^7.3.1",
"@types/bn.js": "^4.11.4",
@@ -20245,16 +20245,16 @@
}
},
"web3-providers": {
- "version": "1.0.0-beta.51",
- "resolved": "https://registry.npmjs.org/web3-providers/-/web3-providers-1.0.0-beta.51.tgz",
- "integrity": "sha512-aWUEZIou4+zEZbLaBf1GQwbNoERq66mLEB6ubcPz1WEq1T5jfUPfwO4b4W2bEbEZVsoxS1ZJvSFkj1yAtD0X+g==",
+ "version": "1.0.0-beta.52",
+ "resolved": "https://registry.npmjs.org/web3-providers/-/web3-providers-1.0.0-beta.52.tgz",
+ "integrity": "sha512-eRmWOn6BeYfAt8UQmCRnqXo1++IjSiIz7+EY9WJ+m7J5ncq/gQN3idWQxT3QZzGRiAvZlO8ZUuF7ff0vuufakg==",
"requires": {
"@babel/runtime": "^7.3.1",
"@types/node": "^10.12.18",
"eventemitter3": "3.1.0",
"lodash": "^4.17.11",
"url-parse": "1.4.4",
- "websocket": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible",
+ "websocket": "^1.0.28",
"xhr2-cookies": "1.1.0"
},
"dependencies": {
@@ -20267,6 +20267,17 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
"integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="
+ },
+ "websocket": {
+ "version": "1.0.28",
+ "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.28.tgz",
+ "integrity": "sha512-00y/20/80P7H4bCYkzuuvvfDvh+dgtXi5kzDf3UcZwN6boTYaKvsrtZ5lIYm1Gsg48siMErd9M4zjSYfYFHTrA==",
+ "requires": {
+ "debug": "^2.2.0",
+ "nan": "^2.11.0",
+ "typedarray-to-buffer": "^3.1.5",
+ "yaeti": "^0.0.6"
+ }
}
}
},
diff --git a/client/package.json b/client/package.json
index a3b11c0..9420cc5 100644
--- a/client/package.json
+++ b/client/package.json
@@ -11,7 +11,7 @@
},
"dependencies": {
"@oceanprotocol/art": "^2.2.0",
- "@oceanprotocol/squid": "^0.5.1",
+ "@oceanprotocol/squid": "^0.5.2",
"@oceanprotocol/typographies": "^0.1.0",
"classnames": "^2.2.6",
"filesize": "^4.1.2",
@@ -25,9 +25,9 @@
"react-moment": "^0.8.4",
"react-popper": "^1.3.3",
"react-router-dom": "^5.0.0",
- "react-transition-group": "^2.7.1",
+ "react-transition-group": "^2.9.0",
"slugify": "^1.3.4",
- "web3": "^1.0.0-beta.51"
+ "web3": "^1.0.0-beta.52"
},
"devDependencies": {
"@types/classnames": "^2.2.7",
@@ -35,16 +35,16 @@
"@types/is-url": "^1.2.28",
"@types/jest": "^24.0.11",
"@types/query-string": "^6.3.0",
- "@types/react": "^16.8.10",
- "@types/react-datepicker": "^2.2.0",
+ "@types/react": "^16.8.13",
+ "@types/react-datepicker": "^2.2.1",
"@types/react-dom": "^16.8.3",
"@types/react-helmet": "^5.0.8",
"@types/react-router-dom": "^4.3.1",
- "@types/react-transition-group": "^2.0.16",
+ "@types/react-transition-group": "^2.8.0",
"@types/web3": "^1.0.18",
"node-sass": "^4.11.0",
"react-scripts": "^2.1.8",
- "typescript": "^3.4.1"
+ "typescript": "^3.4.2"
},
"repository": {
"type": "git",
diff --git a/client/src/App.tsx b/client/src/App.tsx
index f567646..600465c 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -39,7 +39,7 @@ interface AppState {
}
network: string
web3: Web3
- ocean: {}
+ ocean: any
startLogin: () => void
message: string
}
@@ -95,7 +95,7 @@ class App extends Component<{}, AppState> {
)
),
account: '',
- ocean: {},
+ ocean: {} as any,
startLogin: this.startLogin,
requestFromFaucet: this.requestFromFaucet,
message: 'Connecting to Ocean...'
@@ -106,73 +106,77 @@ class App extends Component<{}, AppState> {
}
private startLoginProcess = async () => {
- if (window.web3) {
- const web3 = new Web3(window.web3.currentProvider)
- try {
- const accounts = await web3.eth.getAccounts()
+ try {
+ if (this.state.isWeb3 && window.ethereum) {
+ await window.ethereum.enable()
+ const accounts = await this.state.ocean.accounts.list()
if (accounts.length > 0) {
+ const balance = await accounts[0].getBalance()
this.setState({
isLogged: true,
- isWeb3: true,
- account: accounts[0],
- web3
+ balance,
+ account: accounts[0].getId()
})
} else {
- if (accounts.length === 0 && window.ethereum) {
- await window.ethereum.enable()
- const newAccounts = await web3.eth.getAccounts()
- if (newAccounts.length > 0) {
- this.setState({
- isLogged: true,
- isWeb3: true,
- account: newAccounts[0],
- web3
- })
- } else {
- // failed to unlock
- }
- } else {
- // no unlock procedure
- }
+ // not unlocked
}
- } catch (e) {
- // something went wrong, show error?
+ } else {
+ // no metamask/mist, show installation guide!
}
- } else {
- // no metamask/mist, show installation guide!
+ } catch (e) {
+ Logger.log('error logging', e)
+ // error in logging process
+ // show error
+ // rerun bootstrap process?
}
}
private bootstrap = async () => {
- if (window.web3) {
- this.setState({ isWeb3: true })
- const web3 = new Web3(window.web3.currentProvider)
- try {
- const accounts = await web3.eth.getAccounts()
+ try {
+ if (window.web3) {
+ const web3 = new Web3(window.web3.currentProvider)
+ const { ocean } = await provideOcean(web3)
+ const accounts = await ocean.accounts.list()
+ const network = await ocean.keeper.getNetworkName()
+ const isNile = network === 'Nile'
if (accounts.length > 0) {
+ const balance = await accounts[0].getBalance()
this.setState({
+ isWeb3: true,
isLogged: true,
- account: accounts[0],
- web3
+ isNile,
+ ocean,
+ web3,
+ balance,
+ network,
+ account: accounts[0].getId(),
+ isLoading: false
+ })
+ } else {
+ this.setState({
+ isWeb3: true,
+ isNile,
+ ocean,
+ web3,
+ network,
+ isLoading: false
})
}
- } catch (e) {
- Logger.log('web3 error', e)
+ } else {
+ const { ocean } = await provideOcean(this.state.web3)
+ const network = await ocean.keeper.getNetworkName()
+ const isNile = network === 'Nile'
+ this.setState({
+ isNile,
+ ocean,
+ network,
+ isLoading: false
+ })
}
- }
- try {
- const { ocean } = await provideOcean()
- this.setState({
- isLoading: false,
- ocean
- })
- const accounts = await ocean.accounts.list()
- const balance = await accounts[0].getBalance()
- const network = await ocean.keeper.getNetworkName()
- const isNile = network === 'Nile'
- this.setState({ balance, network, isNile })
} catch (e) {
- Logger.log('ocean/balance error', e)
+ // error in bootstrap process
+ // show error connecting to ocean
+ Logger.log('web3 error', e)
this.setState({
isLoading: false
})
diff --git a/client/src/components/molecules/Pagination.module.scss b/client/src/components/molecules/Pagination.module.scss
new file mode 100644
index 0000000..0060cb4
--- /dev/null
+++ b/client/src/components/molecules/Pagination.module.scss
@@ -0,0 +1,35 @@
+@import '../../styles/variables';
+
+.pagination {
+ display: flex;
+ margin-top: $spacer * 2;
+ margin-bottom: $spacer;
+ justify-content: center;
+
+ > div {
+ &:first-child {
+ padding: $spacer / 4;
+ }
+
+ &:last-child {
+ padding: $spacer / 4;
+ text-align: right;
+ }
+ }
+}
+
+.number {
+ text-align: center;
+ font-weight: $font-weight-bold;
+ padding: $spacer / 4;
+ margin-left: $spacer / 4;
+ margin-right: $spacer / 4;
+ display: inline-block;
+}
+
+.current {
+ composes: number;
+ cursor: default;
+ pointer-events: none;
+ color: $brand-grey-light;
+}
diff --git a/client/src/components/molecules/Pagination.tsx b/client/src/components/molecules/Pagination.tsx
new file mode 100644
index 0000000..191d866
--- /dev/null
+++ b/client/src/components/molecules/Pagination.tsx
@@ -0,0 +1,82 @@
+import React, { PureComponent } from 'react'
+import Button from '../atoms/Button'
+import styles from './Pagination.module.scss'
+
+const PageNumber = ({
+ i,
+ current,
+ setPage
+}: {
+ i: number
+ current: boolean
+ setPage(page: number): void
+}) => (
+ setPage(i + 1)}
+ >
+ {`${i + 1}`}
+
+)
+
+const PrevNext = ({
+ currentPage,
+ prevPage,
+ setPage
+}: {
+ currentPage: number
+ prevPage?: number
+ setPage(page: number): void
+}) => (
+ setPage(prevPage) : () => setPage(currentPage + 1)
+ }
+ >
+ {prevPage ? '←' : '→'}
+
+)
+
+export default class Pagination extends PureComponent<{
+ currentPage: number
+ totalPages: number
+ prevPage?: number
+ setPage(page: number): void
+}> {
+ public render() {
+ const { currentPage, totalPages, prevPage, setPage } = this.props
+ const isFirst = currentPage === 1
+ const isLast = currentPage === totalPages
+
+ return totalPages > 1 ? (
+
+
+ {!isFirst && (
+
+ )}
+
+
+ {Array.from({ length: totalPages }, (_, i) => (
+
+ ))}
+
+
+
+ ) : null
+ }
+}
diff --git a/client/src/components/organisms/AssetsUser.tsx b/client/src/components/organisms/AssetsUser.tsx
index cc81ee7..1382f22 100644
--- a/client/src/components/organisms/AssetsUser.tsx
+++ b/client/src/components/organisms/AssetsUser.tsx
@@ -4,6 +4,7 @@ import { Logger } from '@oceanprotocol/squid'
import { User } from '../../context/User'
import Spinner from '../atoms/Spinner'
import Asset from '../molecules/Asset'
+import Web3message from './Web3message'
import styles from './AssetsUser.module.scss'
export default class AssetsUser extends PureComponent<
@@ -47,49 +48,48 @@ export default class AssetsUser extends PureComponent<
}
public render() {
- return (
- this.context.isNile &&
- this.context.account && (
-
- {this.props.recent && (
-
- Your Latest Published Data Sets
-
- )}
+ return this.context.isNile && this.context.account ? (
+
+ {this.props.recent && (
+
+ Your Latest Published Data Sets
+
+ )}
- {this.state.isLoading ? (
-
- ) : this.state.results.length ? (
- <>
- {this.state.results
- .slice(
- 0,
- this.props.recent
- ? this.props.recent
- : undefined
- )
- .filter(asset => !!asset)
- .map((asset: any) => (
-
- ))}
- {this.props.recent && (
-
- All Data Sets
-
- )}
- >
- ) : (
-
-
No Data Sets Yet.
-
+ Publish A Data Set
-
- )}
-
- )
+ {this.state.isLoading ? (
+
+ ) : this.state.results.length ? (
+ <>
+ {this.state.results
+ .slice(
+ 0,
+ this.props.recent
+ ? this.props.recent
+ : undefined
+ )
+ .filter(asset => !!asset)
+ .map((asset: any) => (
+
+ ))}
+ {this.props.recent && (
+
+ All Data Sets
+
+ )}
+ >
+ ) : (
+
+
No Data Sets Yet.
+
+ Publish A Data Set
+
+ )}
+
+ ) : (
+
)
}
}
diff --git a/client/src/components/organisms/Web3message.tsx b/client/src/components/organisms/Web3message.tsx
index 34b8bec..6813960 100644
--- a/client/src/components/organisms/Web3message.tsx
+++ b/client/src/components/organisms/Web3message.tsx
@@ -26,9 +26,12 @@ export default class Web3message extends PureComponent {
public noWeb3() {
return (
-
No Web3 Browser. For
- publishing an asset you need to{' '}
-
+ Not a Web3 Browser.
+ For publishing or consuming an asset you need to{' '}
+
setup MetaMask
{' '}
or use any other Web3-capable plugin or browser.
@@ -40,7 +43,7 @@ export default class Web3message extends PureComponent {
return (
Account locked. For
- publishing an asset you need to unlock your Web3 account.
+ publishing an asset you need to unlock your Web3 account.{' '}
Unlock account
diff --git a/client/src/config/config.ts b/client/src/config/config.ts
index 9e2ad39..1e6dade 100644
--- a/client/src/config/config.ts
+++ b/client/src/config/config.ts
@@ -1,66 +1,75 @@
//
// commons-server connection
//
-export const serviceScheme = 'http'
-export const serviceHost = 'localhost'
-export const servicePort = 4000
+export const serviceScheme = process.env.REACT_APP_SERVICE_SCHEME || 'http'
+export const serviceHost = process.env.REACT_APP_SERVICE_HOST || 'localhost'
+export const servicePort = process.env.REACT_APP_SERVICE_PORT || 4000
//
// OCEAN REMOTE CONNECTIONS
//
-/*
-export const nodeScheme = 'https'
-export const nodeHost = 'nile.dev-ocean.com'
-export const nodePort = 443
+export const nodeScheme = process.env.REACT_APP_NODE_SCHEME || 'https'
+export const nodeHost = process.env.REACT_APP_NODE_HOST || 'nile.dev-ocean.com'
+export const nodePort = process.env.REACT_APP_NODE_PORT || 443
-export const aquariusScheme = 'https'
-export const aquariusHost = 'nginx-aquarius.dev-ocean.com'
-export const aquariusPort = 443
+export const aquariusScheme = process.env.REACT_APP_AQUARIUS_SCHEME || 'https'
+export const aquariusHost =
+ process.env.REACT_APP_AQUARIUS_HOST || 'nginx-aquarius.dev-ocean.com'
+export const aquariusPort = process.env.REACT_APP_AQUARIUS_PORT || 443
-export const brizoScheme = 'https'
-export const brizoHost = 'nginx-brizo.dev-ocean.com'
-export const brizoPort = 443
-export const brizoAddress = '0x376817c638d2a04f475a73af37f7b51a2862d567'
+export const brizoScheme = process.env.REACT_APP_BRIZO_SCHEME || 'https'
+export const brizoHost =
+ process.env.REACT_APP_BRIZO_HOST || 'nginx-brizo.dev-ocean.com'
+export const brizoPort = process.env.REACT_APP_BRIZO_PORT || 443
+export const brizoAddress =
+ process.env.REACT_APP_BRIZO_ADDRESS ||
+ '0x376817c638d2a04f475a73af37f7b51a2862d567'
-export const parityScheme = 'https'
-export const parityHost = 'nile.dev-ocean.com'
-export const parityPort = 443
+export const parityScheme = process.env.REACT_APP_PARITY_SCHEME || 'https'
+export const parityHost =
+ process.env.REACT_APP_PARITY_HOST || 'nile.dev-ocean.com'
+export const parityPort = process.env.REACT_APP_PARITY_PORT || 443
-export const secretStoreScheme = 'https'
-export const secretStoreHost = 'secret-store.dev-ocean.com'
-export const secretStorePort = 443
+export const secretStoreScheme =
+ process.env.REACT_APP_SECRET_STORE_SCHEME || 'https'
+export const secretStoreHost =
+ process.env.REACT_APP_SECRET_STORE_HOST || 'secret-store.dev-ocean.com'
+export const secretStorePort = process.env.REACT_APP_SECRET_STORE_PORT || 443
+
+export const faucetScheme = process.env.REACT_APP_FAUCET_SCHEME || 'https'
+export const faucetHost =
+ process.env.REACT_APP_FAUCET_HOST || 'faucet.nile.dev-ocean.com'
+export const faucetPort = process.env.REACT_APP_FAUCET_PORT || 443
-export const faucetScheme = 'https'
-export const faucetHost = 'faucet.nile.dev-ocean.com'
-export const faucetPort = 443
-*/
//
// OCEAN LOCAL CONNECTIONS
// e.g. when running with barge
//
-export const nodeScheme = 'http'
-export const nodeHost = 'localhost'
-export const nodePort = 8545
+// export const nodeScheme = 'http'
+// export const nodeHost = 'localhost'
+// export const nodePort = 8545
-export const aquariusScheme = 'http'
-export const aquariusHost = 'aquarius'
-export const aquariusPort = 5000
+// export const aquariusScheme = 'http'
+// export const aquariusHost = 'aquarius'
+// export const aquariusPort = 5000
-export const brizoScheme = 'http'
-export const brizoHost = 'localhost'
-export const brizoPort = 8030
-export const brizoAddress = '0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e'
+// export const brizoScheme = 'http'
+// export const brizoHost = 'localhost'
+// export const brizoPort = 8030
-export const parityScheme = 'http'
-export const parityHost = 'localhost'
-export const parityPort = 8545
+// export const parityScheme = 'http'
+// export const parityHost = 'localhost'
+// export const parityPort = 8545
+// export const threshold = 0
+// export const password = 'node0'
+// export const address = '0x00bd138abd70e2f00903268f3db08f2d25677c9e'
-export const secretStoreScheme = 'http'
-export const secretStoreHost = 'localhost'
-export const secretStorePort = 12001
+// export const secretStoreScheme = 'http'
+// export const secretStoreHost = 'localhost'
+// export const secretStorePort = 12001
-export const faucetScheme = 'http'
-export const faucetHost = 'localhost'
-export const faucetPort = 3001
+// export const faucetScheme = 'http'
+// export const faucetHost = 'localhost'
+// export const faucetPort = 3001
-export const verbose = true
+export const verbose = true
\ No newline at end of file
diff --git a/client/src/data/menu.json b/client/src/data/menu.json
index 7f48dd7..bc663f9 100644
--- a/client/src/data/menu.json
+++ b/client/src/data/menu.json
@@ -1,18 +1,15 @@
[
{
"title": "Publish",
- "link": "/publish",
- "web3": true
+ "link": "/publish"
},
{
"title": "History",
- "link": "/history",
- "web3": true
+ "link": "/history"
},
{
"title": "Faucet",
- "link": "/faucet",
- "web3": true
+ "link": "/faucet"
},
{
"title": "About",
diff --git a/client/src/ocean.ts b/client/src/ocean.ts
index f2fc95d..d27e483 100644
--- a/client/src/ocean.ts
+++ b/client/src/ocean.ts
@@ -1,4 +1,5 @@
import { Ocean } from '@oceanprotocol/squid'
+import Web3 from 'web3'
import {
aquariusHost,
@@ -20,7 +21,7 @@ import {
verbose
} from './config/config'
-export async function provideOcean() {
+export async function provideOcean(web3provider: Web3) {
const nodeUri = `${nodeScheme}://${nodeHost}:${nodePort}`
const aquariusUri = `${aquariusScheme}://${aquariusHost}:${aquariusPort}`
const brizoUri = `${brizoScheme}://${brizoHost}:${brizoPort}`
@@ -28,6 +29,7 @@ export async function provideOcean() {
const secretStoreUri = `${secretStoreScheme}://${secretStoreHost}:${secretStorePort}`
const config = {
+ web3provider,
nodeUri,
aquariusUri,
brizoUri,
@@ -37,7 +39,7 @@ export async function provideOcean() {
verbose
}
- const ocean = await Ocean.getInstance(config)
+ const ocean: Ocean = await Ocean.getInstance(config)
return { ocean }
}
diff --git a/client/src/routes/About.tsx b/client/src/routes/About.tsx
index 8242af2..4b41fa3 100644
--- a/client/src/routes/About.tsx
+++ b/client/src/routes/About.tsx
@@ -3,7 +3,35 @@ import Route from '../components/templates/Route'
class About extends Component {
public render() {
- return
Hello About
+ return (
+
+
+ Commons is built on top of the Ocean{' '}
+
+ Nile test network
+ {' '}
+ and is targeted at enthusiastic data scientists with some
+ crypto experience. It can be used with any Web3-capable
+ browser, like Firefox with MetaMask installed.
+
+
+
+
+ )
}
}
diff --git a/client/src/routes/Details/AssetDetails.tsx b/client/src/routes/Details/AssetDetails.tsx
index 09add94..5b7d6f7 100644
--- a/client/src/routes/Details/AssetDetails.tsx
+++ b/client/src/routes/Details/AssetDetails.tsx
@@ -31,7 +31,11 @@ export default class AssetDetails extends PureComponent
{
{base.copyrightHolder}
-
+
{
{base.categories && (
// TODO: Make this link to search for respective category
-
+
{base.categories[0]}
)}
diff --git a/client/src/routes/Details/AssetFile.tsx b/client/src/routes/Details/AssetFile.tsx
index 92c8197..f6d4c9a 100644
--- a/client/src/routes/Details/AssetFile.tsx
+++ b/client/src/routes/Details/AssetFile.tsx
@@ -1,9 +1,9 @@
import React, { PureComponent } from 'react'
import { Logger } from '@oceanprotocol/squid'
import filesize from 'filesize'
-import { User } from '../../context/User'
import Button from '../../components/atoms/Button'
import Spinner from '../../components/atoms/Spinner'
+import { User } from '../../context/User'
import styles from './AssetFile.module.scss'
import ReactGA from 'react-ga'
@@ -92,13 +92,31 @@ export default class AssetFile extends PureComponent<
{this.state.isLoading ? (
) : (
- this.purchaseAsset(ddo, file.index)}
- >
- Get file
-
+
+ {states =>
+ states.isLogged ? (
+
+ this.purchaseAsset(ddo, file.index)
+ }
+ >
+ Get file
+
+ ) : (
+ states.isWeb3 && (
+
+ Get file
+
+ )
+ )
+ }
+
)}
{this.state.error !== '' && (
diff --git a/client/src/routes/Details/AssetFilesDetails.tsx b/client/src/routes/Details/AssetFilesDetails.tsx
index 1c7cfe0..9497920 100644
--- a/client/src/routes/Details/AssetFilesDetails.tsx
+++ b/client/src/routes/Details/AssetFilesDetails.tsx
@@ -1,5 +1,7 @@
import React, { PureComponent } from 'react'
import AssetFile from './AssetFile'
+import { User } from '../../context/User'
+import Web3message from '../../components/organisms/Web3message'
import styles from './AssetFilesDetails.module.scss'
export default class AssetFilesDetails extends PureComponent<{
@@ -16,6 +18,11 @@ export default class AssetFilesDetails extends PureComponent<{
))}
+
+ {states =>
+ (!states.isNile || !states.isLogged) &&
+ }
+
>
) : (
No files attached.
diff --git a/client/src/routes/Details/index.tsx b/client/src/routes/Details/index.tsx
index e5055cb..f54552f 100644
--- a/client/src/routes/Details/index.tsx
+++ b/client/src/routes/Details/index.tsx
@@ -5,16 +5,16 @@ import { User } from '../../context/User'
import AssetDetails from './AssetDetails'
import stylesApp from '../../App.module.scss'
+interface DetailsProps {
+ location: Location
+ match: any
+}
+
interface DetailsState {
ddo: any
metadata: { base: { name: string } }
}
-interface DetailsProps {
- location: any
- match: any
-}
-
export default class Details extends Component {
public state = { ddo: {}, metadata: { base: { name: '' } } }
diff --git a/client/src/routes/Faucet.tsx b/client/src/routes/Faucet.tsx
index e091c2a..7b4fff9 100644
--- a/client/src/routes/Faucet.tsx
+++ b/client/src/routes/Faucet.tsx
@@ -10,15 +10,13 @@ interface FaucetState {
isLoading: boolean
success?: string
error?: string
- eth?: string
}
export default class Faucet extends PureComponent<{}, FaucetState> {
public state = {
isLoading: false,
success: undefined,
- error: undefined,
- eth: 'xx'
+ error: undefined
}
private getTokens = async (requestFromFaucet: () => any) => {
@@ -47,14 +45,20 @@ export default class Faucet extends PureComponent<{}, FaucetState> {
private RequestMarkup = () => (
- {states => (
- this.getTokens(states.requestFromFaucet)}
- >
- Request Ether
-
- )}
+ {states =>
+ states.isLogged ? (
+ this.getTokens(states.requestFromFaucet)}
+ >
+ Request Ether
+
+ ) : states.isWeb3 ? (
+
+ ) : (
+
+ )
+ }
)
@@ -93,7 +97,9 @@ export default class Faucet extends PureComponent<{}, FaucetState> {
title="Faucet"
description="Shower yourself with some Ether for the Ocean POA network."
>
-
+
+ {states => !states.isNile && }
+
diff --git a/client/src/routes/Home.tsx b/client/src/routes/Home.tsx
index 7a60ef0..d174d19 100644
--- a/client/src/routes/Home.tsx
+++ b/client/src/routes/Home.tsx
@@ -8,14 +8,14 @@ import styles from './Home.module.scss'
import meta from '../data/meta.json'
-interface HomeState {
- search?: string
-}
-
interface HomeProps {
history: any
}
+interface HomeState {
+ search?: string
+}
+
class Home extends Component {
public state = { search: '' }
diff --git a/client/src/routes/Publish/Step.tsx b/client/src/routes/Publish/Step.tsx
index b403dbb..afaf7de 100644
--- a/client/src/routes/Publish/Step.tsx
+++ b/client/src/routes/Publish/Step.tsx
@@ -158,9 +158,21 @@ export default class Step extends PureComponent {
{states =>
states.isLogged ? (
Register asset
- ) : (
+ ) : states.isWeb3 ? (
- Register asset (login first)
+ Register asset (unlock Metamask)
+
+ ) : (
+ {
+ e.preventDefault()
+ window.open(
+ 'https://docs.oceanprotocol.com/tutorials/metamask-setup/',
+ '_blank'
+ )
+ }}
+ >
+ Register asset (install Metamask)
)
}
diff --git a/client/src/routes/Search.tsx b/client/src/routes/Search.tsx
index 84af126..3602fd8 100644
--- a/client/src/routes/Search.tsx
+++ b/client/src/routes/Search.tsx
@@ -1,67 +1,107 @@
-import React, { Component } from 'react'
+import React, { PureComponent } from 'react'
import queryString from 'query-string'
import { Logger } from '@oceanprotocol/squid'
import Spinner from '../components/atoms/Spinner'
import Route from '../components/templates/Route'
import { User } from '../context/User'
import Asset from '../components/molecules/Asset'
+import Pagination from '../components/molecules/Pagination'
import styles from './Search.module.scss'
+interface SearchProps {
+ location: Location
+ history: History
+}
+
interface SearchState {
results: any[]
+ totalResults: number
+ offset: number
+ totalPages: number
+ currentPage: number
isLoading: boolean
}
-interface SearchProps {
- location: any
- history: any
-}
+export default class Search extends PureComponent {
+ public state = {
+ results: [],
+ totalResults: 0,
+ offset: 25,
+ totalPages: 1,
+ currentPage: 1,
+ isLoading: true
+ }
-export default class Search extends Component {
- public state = { results: [], isLoading: true }
+ private readonly searchTerm = queryString.parse(this.props.location.search)
+ .text
- public async componentDidMount() {
- const searchParams = queryString.parse(this.props.location.search)
+ public componentDidMount() {
+ this.searchAssets()
+ }
- const queryRequest = {
- offset: 500,
- page: 1,
+ private searchAssets = async () => {
+ const searchQuery = {
+ offset: this.state.offset,
+ page: this.state.currentPage,
query: {
- text: searchParams.text
+ text: [this.searchTerm],
+ price: [-1, 1]
},
sort: {
- text: 1
+ datePublished: 1
}
}
- const assets = await this.context.ocean.assets.search(searchParams.text)
- this.setState({ results: assets, isLoading: false })
- Logger.log(`Loaded ${assets.length} assets`)
+ const search = await this.context.ocean.aquarius.queryMetadata(
+ searchQuery
+ )
+ this.setState({
+ results: search.results,
+ totalResults: search.totalResults,
+ totalPages: search.totalPages,
+ currentPage: search.page + 1, // first page is always 0 in response
+ isLoading: false
+ })
+ Logger.log(`Loaded ${this.state.results.length} assets`)
+ }
+
+ private setPage = (page: number) => {
+ this.setState({ currentPage: page })
+ this.searchAssets()
}
public renderResults = () =>
this.state.isLoading ? (
- ) : this.state.results.length ? (
+ ) : this.state.results && this.state.results.length ? (
{this.state.results.map((asset: any) => (
))}
) : (
- No data sets yet
+ No data sets found.
)
public render() {
- const searchTerm = queryString.parse(this.props.location.search).text
+ const { totalResults, totalPages, currentPage } = this.state
return (
${searchTerm}`}
+ title={`${totalResults > 0 && totalResults} Results for ${
+ this.searchTerm
+ } `}
titleReverse
wide
>
{this.renderResults()}
+
+
)
}
diff --git a/library.json b/library.json
index d1b4647..1454dbb 100644
--- a/library.json
+++ b/library.json
@@ -7,19 +7,19 @@
"dependencies": [
{
"name": "keeper-contracts",
- "version": "~0.6.12"
+ "version": "~0.9.1"
},
{
"name": "brizo",
- "version": "~0.2.0"
+ "version": "~0.3.3"
},
{
"name": "aquarius",
- "version": "~0.1.8"
+ "version": "~0.2.1"
},
{
"name": "squid-js",
- "version": "~0.3.0"
+ "version": "~0.5.2"
}
]
}
diff --git a/server/package-lock.json b/server/package-lock.json
index 2187439..20c75f9 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -14,17 +14,17 @@
}
},
"@babel/core": {
- "version": "7.4.0",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.0.tgz",
- "integrity": "sha512-Dzl7U0/T69DFOTwqz/FJdnOSWS57NpjNfCwMKHABr589Lg8uX1RrlBIJ7L5Dubt/xkLsx0xH5EBFzlBVes1ayA==",
+ "version": "7.4.3",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.3.tgz",
+ "integrity": "sha512-oDpASqKFlbspQfzAE7yaeTmdljSH2ADIvBlb0RwbStltTuWa0+7CCI1fYVINNv9saHPa1W7oaKeuNuKj+RQCvA==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
"@babel/generator": "^7.4.0",
- "@babel/helpers": "^7.4.0",
- "@babel/parser": "^7.4.0",
+ "@babel/helpers": "^7.4.3",
+ "@babel/parser": "^7.4.3",
"@babel/template": "^7.4.0",
- "@babel/traverse": "^7.4.0",
+ "@babel/traverse": "^7.4.3",
"@babel/types": "^7.4.0",
"convert-source-map": "^1.1.0",
"debug": "^4.1.0",
@@ -84,13 +84,13 @@
}
},
"@babel/helpers": {
- "version": "7.4.2",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.2.tgz",
- "integrity": "sha512-gQR1eQeroDzFBikhrCccm5Gs2xBjZ57DNjGbqTaHo911IpmSxflOQWMAHPw/TXk8L3isv7s9lYzUkexOeTQUYg==",
+ "version": "7.4.3",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.3.tgz",
+ "integrity": "sha512-BMh7X0oZqb36CfyhvtbSmcWc3GXocfxv3yNsAEuM0l+fAqSO22rQrUpijr3oE/10jCTrB6/0b9kzmG4VetCj8Q==",
"dev": true,
"requires": {
"@babel/template": "^7.4.0",
- "@babel/traverse": "^7.4.0",
+ "@babel/traverse": "^7.4.3",
"@babel/types": "^7.4.0"
}
},
@@ -106,9 +106,9 @@
}
},
"@babel/parser": {
- "version": "7.4.2",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz",
- "integrity": "sha512-9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g==",
+ "version": "7.4.3",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.3.tgz",
+ "integrity": "sha512-gxpEUhTS1sGA63EGQGuA+WESPR/6tz6ng7tSHFCmaTJK/cGK8y37cBTspX+U2xCAue2IQVvF6Z0oigmjwD8YGQ==",
"dev": true
},
"@babel/plugin-syntax-object-rest-spread": {
@@ -132,16 +132,16 @@
}
},
"@babel/traverse": {
- "version": "7.4.0",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz",
- "integrity": "sha512-/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA==",
+ "version": "7.4.3",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.3.tgz",
+ "integrity": "sha512-HmA01qrtaCwwJWpSKpA948cBvU5BrmviAief/b3AVw936DtcdsTexlbyzNuDnthwhOQ37xshn7hvQaEQk7ISYQ==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
"@babel/generator": "^7.4.0",
"@babel/helper-function-name": "^7.1.0",
"@babel/helper-split-export-declaration": "^7.4.0",
- "@babel/parser": "^7.4.0",
+ "@babel/parser": "^7.4.3",
"@babel/types": "^7.4.0",
"debug": "^4.1.0",
"globals": "^11.1.0",
@@ -178,44 +178,43 @@
}
},
"@jest/console": {
- "version": "24.3.0",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.3.0.tgz",
- "integrity": "sha512-NaCty/OOei6rSDcbPdMiCbYCI0KGFGPgGO6B09lwWt5QTxnkuhKYET9El5u5z1GAcSxkQmSMtM63e24YabCWqA==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz",
+ "integrity": "sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==",
"dev": true,
"requires": {
"@jest/source-map": "^24.3.0",
- "@types/node": "*",
"chalk": "^2.0.1",
"slash": "^2.0.0"
}
},
"@jest/core": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.5.0.tgz",
- "integrity": "sha512-RDZArRzAs51YS7dXG1pbXbWGxK53rvUu8mCDYsgqqqQ6uSOaTjcVyBl2Jce0exT2rSLk38ca7az7t2f3b0/oYQ==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.7.1.tgz",
+ "integrity": "sha512-ivlZ8HX/FOASfHcb5DJpSPFps8ydfUYzLZfgFFqjkLijYysnIEOieg72YRhO4ZUB32xu40hsSMmaw+IGYeKONA==",
"dev": true,
"requires": {
- "@jest/console": "^24.3.0",
- "@jest/reporters": "^24.5.0",
- "@jest/test-result": "^24.5.0",
- "@jest/transform": "^24.5.0",
- "@jest/types": "^24.5.0",
+ "@jest/console": "^24.7.1",
+ "@jest/reporters": "^24.7.1",
+ "@jest/test-result": "^24.7.1",
+ "@jest/transform": "^24.7.1",
+ "@jest/types": "^24.7.0",
"ansi-escapes": "^3.0.0",
"chalk": "^2.0.1",
"exit": "^0.1.2",
"graceful-fs": "^4.1.15",
- "jest-changed-files": "^24.5.0",
- "jest-config": "^24.5.0",
- "jest-haste-map": "^24.5.0",
- "jest-message-util": "^24.5.0",
+ "jest-changed-files": "^24.7.0",
+ "jest-config": "^24.7.1",
+ "jest-haste-map": "^24.7.1",
+ "jest-message-util": "^24.7.1",
"jest-regex-util": "^24.3.0",
- "jest-resolve-dependencies": "^24.5.0",
- "jest-runner": "^24.5.0",
- "jest-runtime": "^24.5.0",
- "jest-snapshot": "^24.5.0",
- "jest-util": "^24.5.0",
- "jest-validate": "^24.5.0",
- "jest-watcher": "^24.5.0",
+ "jest-resolve-dependencies": "^24.7.1",
+ "jest-runner": "^24.7.1",
+ "jest-runtime": "^24.7.1",
+ "jest-snapshot": "^24.7.1",
+ "jest-util": "^24.7.1",
+ "jest-validate": "^24.7.0",
+ "jest-watcher": "^24.7.1",
"micromatch": "^3.1.10",
"p-each-series": "^1.0.0",
"pirates": "^4.0.1",
@@ -225,40 +224,38 @@
}
},
"@jest/environment": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.5.0.tgz",
- "integrity": "sha512-tzUHR9SHjMXwM8QmfHb/EJNbF0fjbH4ieefJBvtwO8YErLTrecc1ROj0uo2VnIT6SlpEGZnvdCK6VgKYBo8LsA==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.7.1.tgz",
+ "integrity": "sha512-wmcTTYc4/KqA+U5h1zQd5FXXynfa7VGP2NfF+c6QeGJ7c+2nStgh65RQWNX62SC716dTtqheTRrZl0j+54oGHw==",
"dev": true,
"requires": {
- "@jest/fake-timers": "^24.5.0",
- "@jest/transform": "^24.5.0",
- "@jest/types": "^24.5.0",
- "@types/node": "*",
- "jest-mock": "^24.5.0"
+ "@jest/fake-timers": "^24.7.1",
+ "@jest/transform": "^24.7.1",
+ "@jest/types": "^24.7.0",
+ "jest-mock": "^24.7.0"
}
},
"@jest/fake-timers": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.5.0.tgz",
- "integrity": "sha512-i59KVt3QBz9d+4Qr4QxsKgsIg+NjfuCjSOWj3RQhjF5JNy+eVJDhANQ4WzulzNCHd72srMAykwtRn5NYDGVraw==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.7.1.tgz",
+ "integrity": "sha512-4vSQJDKfR2jScOe12L9282uiwuwQv9Lk7mgrCSZHA9evB9efB/qx8i0KJxsAKtp8fgJYBJdYY7ZU6u3F4/pyjA==",
"dev": true,
"requires": {
- "@jest/types": "^24.5.0",
- "@types/node": "*",
- "jest-message-util": "^24.5.0",
- "jest-mock": "^24.5.0"
+ "@jest/types": "^24.7.0",
+ "jest-message-util": "^24.7.1",
+ "jest-mock": "^24.7.0"
}
},
"@jest/reporters": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.5.0.tgz",
- "integrity": "sha512-vfpceiaKtGgnuC3ss5czWOihKOUSyjJA4M4udm6nH8xgqsuQYcyDCi4nMMcBKsHXWgz9/V5G7iisnZGfOh1w6Q==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.7.1.tgz",
+ "integrity": "sha512-bO+WYNwHLNhrjB9EbPL4kX/mCCG4ZhhfWmO3m4FSpbgr7N83MFejayz30kKjgqr7smLyeaRFCBQMbXpUgnhAJw==",
"dev": true,
"requires": {
- "@jest/environment": "^24.5.0",
- "@jest/test-result": "^24.5.0",
- "@jest/transform": "^24.5.0",
- "@jest/types": "^24.5.0",
+ "@jest/environment": "^24.7.1",
+ "@jest/test-result": "^24.7.1",
+ "@jest/transform": "^24.7.1",
+ "@jest/types": "^24.7.0",
"chalk": "^2.0.1",
"exit": "^0.1.2",
"glob": "^7.1.2",
@@ -266,11 +263,11 @@
"istanbul-lib-coverage": "^2.0.2",
"istanbul-lib-instrument": "^3.0.1",
"istanbul-lib-source-maps": "^3.0.1",
- "jest-haste-map": "^24.5.0",
- "jest-resolve": "^24.5.0",
- "jest-runtime": "^24.5.0",
- "jest-util": "^24.5.0",
- "jest-worker": "^24.4.0",
+ "jest-haste-map": "^24.7.1",
+ "jest-resolve": "^24.7.1",
+ "jest-runtime": "^24.7.1",
+ "jest-util": "^24.7.1",
+ "jest-worker": "^24.6.0",
"node-notifier": "^5.2.1",
"slash": "^2.0.0",
"source-map": "^0.6.0",
@@ -305,32 +302,44 @@
}
},
"@jest/test-result": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.5.0.tgz",
- "integrity": "sha512-u66j2vBfa8Bli1+o3rCaVnVYa9O8CAFZeqiqLVhnarXtreSXG33YQ6vNYBogT7+nYiFNOohTU21BKiHlgmxD5A==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.7.1.tgz",
+ "integrity": "sha512-3U7wITxstdEc2HMfBX7Yx3JZgiNBubwDqQMh+BXmZXHa3G13YWF3p6cK+5g0hGkN3iufg/vGPl3hLxQXD74Npg==",
"dev": true,
"requires": {
- "@jest/console": "^24.3.0",
- "@jest/types": "^24.5.0",
- "@types/istanbul-lib-coverage": "^1.1.0"
+ "@jest/console": "^24.7.1",
+ "@jest/types": "^24.7.0",
+ "@types/istanbul-lib-coverage": "^2.0.0"
+ }
+ },
+ "@jest/test-sequencer": {
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.7.1.tgz",
+ "integrity": "sha512-84HQkCpVZI/G1zq53gHJvSmhUer4aMYp9tTaffW28Ih5OxfCg8hGr3nTSbL1OhVDRrFZwvF+/R9gY6JRkDUpUA==",
+ "dev": true,
+ "requires": {
+ "@jest/test-result": "^24.7.1",
+ "jest-haste-map": "^24.7.1",
+ "jest-runner": "^24.7.1",
+ "jest-runtime": "^24.7.1"
}
},
"@jest/transform": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.5.0.tgz",
- "integrity": "sha512-XSsDz1gdR/QMmB8UCKlweAReQsZrD/DK7FuDlNo/pE8EcKMrfi2kqLRk8h8Gy/PDzgqJj64jNEzOce9pR8oj1w==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.7.1.tgz",
+ "integrity": "sha512-EsOUqP9ULuJ66IkZQhI5LufCHlTbi7hrcllRMUEV/tOgqBVQi93+9qEvkX0n8mYpVXQ8VjwmICeRgg58mrtIEw==",
"dev": true,
"requires": {
"@babel/core": "^7.1.0",
- "@jest/types": "^24.5.0",
+ "@jest/types": "^24.7.0",
"babel-plugin-istanbul": "^5.1.0",
"chalk": "^2.0.1",
"convert-source-map": "^1.4.0",
"fast-json-stable-stringify": "^2.0.0",
"graceful-fs": "^4.1.15",
- "jest-haste-map": "^24.5.0",
+ "jest-haste-map": "^24.7.1",
"jest-regex-util": "^24.3.0",
- "jest-util": "^24.5.0",
+ "jest-util": "^24.7.1",
"micromatch": "^3.1.10",
"realpath-native": "^1.1.0",
"slash": "^2.0.0",
@@ -347,12 +356,12 @@
}
},
"@jest/types": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.5.0.tgz",
- "integrity": "sha512-kN7RFzNMf2R8UDadPOl6ReyI+MT8xfqRuAnuVL+i4gwjv/zubdDK+EDeLHYwq1j0CSSR2W/MmgaRlMZJzXdmVA==",
+ "version": "24.7.0",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.7.0.tgz",
+ "integrity": "sha512-ipJUa2rFWiKoBqMKP63Myb6h9+iT3FHRTF2M8OR6irxWzItisa8i4dcSg14IbvmXUnBlHBlUQPYUHWyX3UPpYA==",
"dev": true,
"requires": {
- "@types/istanbul-lib-coverage": "^1.1.0",
+ "@types/istanbul-lib-coverage": "^2.0.0",
"@types/yargs": "^12.0.9"
}
},
@@ -477,9 +486,9 @@
}
},
"@types/istanbul-lib-coverage": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.0.tgz",
- "integrity": "sha512-ohkhb9LehJy+PA40rDtGAji61NCgdtKLAlFoYp4cnuuQEswwdK3vz9SOIkkyc3wrk8dzjphQApNs56yyXLStaQ==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.0.tgz",
+ "integrity": "sha512-eAtOAFZefEnfJiRFQBGw1eYqa5GTLCZ1y86N0XSI/D6EB+E8z6VPV/UL7Gi5UEclFqoQk+6NRqEDsfmDLXn8sg==",
"dev": true
},
"@types/jasmine": {
@@ -519,9 +528,9 @@
}
},
"@types/node": {
- "version": "11.12.2",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-11.12.2.tgz",
- "integrity": "sha512-c82MtnqWB/CqqK7/zit74Ob8H1dBdV7bK+BcErwtXbe0+nUGkgzq5NTDmRW/pAv2lFtmeNmW95b0zK2hxpeklg==",
+ "version": "11.13.0",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.0.tgz",
+ "integrity": "sha512-rx29MMkRdVmzunmiA4lzBYJNnXsW/PhG4kMBy2ATsYaDjGGR75dCFEVVROKpNwlVdcUX3xxlghKQOeDPBJobng==",
"dev": true
},
"@types/range-parser": {
@@ -565,9 +574,9 @@
"dev": true
},
"@types/yargs": {
- "version": "12.0.10",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.10.tgz",
- "integrity": "sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ==",
+ "version": "12.0.12",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.12.tgz",
+ "integrity": "sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==",
"dev": true
},
"abab": {
@@ -822,16 +831,16 @@
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
},
"babel-jest": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.5.0.tgz",
- "integrity": "sha512-0fKCXyRwxFTJL0UXDJiT2xYxO9Lu2vBd9n+cC+eDjESzcVG3s2DRGAxbzJX21fceB1WYoBjAh8pQ83dKcl003g==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.7.1.tgz",
+ "integrity": "sha512-GPnLqfk8Mtt0i4OemjWkChi73A3ALs4w2/QbG64uAj8b5mmwzxc7jbJVRZt8NJkxi6FopVHog9S3xX6UJKb2qg==",
"dev": true,
"requires": {
- "@jest/transform": "^24.5.0",
- "@jest/types": "^24.5.0",
+ "@jest/transform": "^24.7.1",
+ "@jest/types": "^24.7.0",
"@types/babel__core": "^7.1.0",
"babel-plugin-istanbul": "^5.1.0",
- "babel-preset-jest": "^24.3.0",
+ "babel-preset-jest": "^24.6.0",
"chalk": "^2.4.2",
"slash": "^2.0.0"
}
@@ -848,22 +857,22 @@
}
},
"babel-plugin-jest-hoist": {
- "version": "24.3.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.3.0.tgz",
- "integrity": "sha512-nWh4N1mVH55Tzhx2isvUN5ebM5CDUvIpXPZYMRazQughie/EqGnbR+czzoQlhUmJG9pPJmYDRhvocotb2THl1w==",
+ "version": "24.6.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz",
+ "integrity": "sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==",
"dev": true,
"requires": {
"@types/babel__traverse": "^7.0.6"
}
},
"babel-preset-jest": {
- "version": "24.3.0",
- "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.3.0.tgz",
- "integrity": "sha512-VGTV2QYBa/Kn3WCOKdfS31j9qomaXSgJqi65B6o05/1GsJyj9LVhSljM9ro4S+IBGj/ENhNBuH9bpqzztKAQSw==",
+ "version": "24.6.0",
+ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz",
+ "integrity": "sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==",
"dev": true,
"requires": {
"@babel/plugin-syntax-object-rest-spread": "^7.0.0",
- "babel-plugin-jest-hoist": "^24.3.0"
+ "babel-plugin-jest-hoist": "^24.6.0"
}
},
"balanced-match": {
@@ -1122,15 +1131,15 @@
}
},
"callsites": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz",
- "integrity": "sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
"dev": true
},
"camelcase": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz",
- "integrity": "sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==",
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
"dev": true
},
"capture-exit": {
@@ -1679,12 +1688,6 @@
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
},
- "detect-file": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
- "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
- "dev": true
- },
"detect-newline": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
@@ -1750,6 +1753,12 @@
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
},
+ "emoji-regex": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+ "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+ "dev": true
+ },
"encodeurl": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -1931,26 +1940,17 @@
}
}
},
- "expand-tilde": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
- "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
- "dev": true,
- "requires": {
- "homedir-polyfill": "^1.0.1"
- }
- },
"expect": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/expect/-/expect-24.5.0.tgz",
- "integrity": "sha512-p2Gmc0CLxOgkyA93ySWmHFYHUPFIHG6XZ06l7WArWAsrqYVaVEkOU5NtT5i68KUyGKbkQgDCkiT65bWmdoL6Bw==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-24.7.1.tgz",
+ "integrity": "sha512-mGfvMTPduksV3xoI0xur56pQsg2vJjNf5+a+bXOjqCkiCBbmCayrBbHS/75y9K430cfqyocPr2ZjiNiRx4SRKw==",
"dev": true,
"requires": {
- "@jest/types": "^24.5.0",
+ "@jest/types": "^24.7.0",
"ansi-styles": "^3.2.0",
"jest-get-type": "^24.3.0",
- "jest-matcher-utils": "^24.5.0",
- "jest-message-util": "^24.5.0",
+ "jest-matcher-utils": "^24.7.0",
+ "jest-message-util": "^24.7.1",
"jest-regex-util": "^24.3.0"
}
},
@@ -2207,29 +2207,6 @@
"locate-path": "^3.0.0"
}
},
- "findup-sync": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
- "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
- "dev": true,
- "requires": {
- "detect-file": "^1.0.0",
- "is-glob": "^3.1.0",
- "micromatch": "^3.0.4",
- "resolve-dir": "^1.0.1"
- },
- "dependencies": {
- "is-glob": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
- "dev": true,
- "requires": {
- "is-extglob": "^2.1.0"
- }
- }
- }
- },
"flat": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
@@ -2998,30 +2975,6 @@
"ini": "^1.3.4"
}
},
- "global-modules": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
- "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
- "dev": true,
- "requires": {
- "global-prefix": "^1.0.1",
- "is-windows": "^1.0.1",
- "resolve-dir": "^1.0.0"
- }
- },
- "global-prefix": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
- "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
- "dev": true,
- "requires": {
- "expand-tilde": "^2.0.2",
- "homedir-polyfill": "^1.0.1",
- "ini": "^1.3.4",
- "is-windows": "^1.0.1",
- "which": "^1.2.14"
- }
- },
"globals": {
"version": "11.11.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
@@ -3166,15 +3119,6 @@
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
"dev": true
},
- "homedir-polyfill": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
- "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
- "dev": true,
- "requires": {
- "parse-passwd": "^1.0.0"
- }
- },
"hosted-git-info": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
@@ -3408,9 +3352,9 @@
"dev": true
},
"is-generator-fn": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.0.0.tgz",
- "integrity": "sha512-elzyIdM7iKoFHzcrndIqjYomImhxrFRnGP3galODoII4TB9gI7mZ+FnlLQmmjf27SxHS2gKEeyhX5/+YRS6H9g==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+ "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
"dev": true
},
"is-glob": {
@@ -3661,31 +3605,31 @@
}
},
"jest": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest/-/jest-24.5.0.tgz",
- "integrity": "sha512-lxL+Fq5/RH7inxxmfS2aZLCf8MsS+YCUBfeiNO6BWz/MmjhDGaIEA/2bzEf9q4Q0X+mtFHiinHFvQ0u+RvW/qQ==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest/-/jest-24.7.1.tgz",
+ "integrity": "sha512-AbvRar5r++izmqo5gdbAjTeA6uNRGoNRuj5vHB0OnDXo2DXWZJVuaObiGgtlvhKb+cWy2oYbQSfxv7Q7GjnAtA==",
"dev": true,
"requires": {
"import-local": "^2.0.0",
- "jest-cli": "^24.5.0"
+ "jest-cli": "^24.7.1"
},
"dependencies": {
"jest-cli": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.5.0.tgz",
- "integrity": "sha512-P+Jp0SLO4KWN0cGlNtC7JV0dW1eSFR7eRpoOucP2UM0sqlzp/bVHeo71Omonvigrj9AvCKy7NtQANtqJ7FXz8g==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.7.1.tgz",
+ "integrity": "sha512-32OBoSCVPzcTslGFl6yVCMzB2SqX3IrWwZCY5mZYkb0D2WsogmU3eV2o8z7+gRQa4o4sZPX/k7GU+II7CxM6WQ==",
"dev": true,
"requires": {
- "@jest/core": "^24.5.0",
- "@jest/test-result": "^24.5.0",
- "@jest/types": "^24.5.0",
+ "@jest/core": "^24.7.1",
+ "@jest/test-result": "^24.7.1",
+ "@jest/types": "^24.7.0",
"chalk": "^2.0.1",
"exit": "^0.1.2",
"import-local": "^2.0.0",
"is-ci": "^2.0.0",
- "jest-config": "^24.5.0",
- "jest-util": "^24.5.0",
- "jest-validate": "^24.5.0",
+ "jest-config": "^24.7.1",
+ "jest-util": "^24.7.1",
+ "jest-validate": "^24.7.0",
"prompts": "^2.0.1",
"realpath-native": "^1.1.0",
"yargs": "^12.0.2"
@@ -3694,50 +3638,51 @@
}
},
"jest-changed-files": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.5.0.tgz",
- "integrity": "sha512-Ikl29dosYnTsH9pYa1Tv9POkILBhN/TLZ37xbzgNsZ1D2+2n+8oEZS2yP1BrHn/T4Rs4Ggwwbp/x8CKOS5YJOg==",
+ "version": "24.7.0",
+ "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.7.0.tgz",
+ "integrity": "sha512-33BgewurnwSfJrW7T5/ZAXGE44o7swLslwh8aUckzq2e17/2Os1V0QU506ZNik3hjs8MgnEMKNkcud442NCDTw==",
"dev": true,
"requires": {
- "@jest/types": "^24.5.0",
+ "@jest/types": "^24.7.0",
"execa": "^1.0.0",
"throat": "^4.0.0"
}
},
"jest-config": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.5.0.tgz",
- "integrity": "sha512-t2UTh0Z2uZhGBNVseF8wA2DS2SuBiLOL6qpLq18+OZGfFUxTM7BzUVKyHFN/vuN+s/aslY1COW95j1Rw81huOQ==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.7.1.tgz",
+ "integrity": "sha512-8FlJNLI+X+MU37j7j8RE4DnJkvAghXmBWdArVzypW6WxfGuxiL/CCkzBg0gHtXhD2rxla3IMOSUAHylSKYJ83g==",
"dev": true,
"requires": {
"@babel/core": "^7.1.0",
- "@jest/types": "^24.5.0",
- "babel-jest": "^24.5.0",
+ "@jest/test-sequencer": "^24.7.1",
+ "@jest/types": "^24.7.0",
+ "babel-jest": "^24.7.1",
"chalk": "^2.0.1",
"glob": "^7.1.1",
- "jest-environment-jsdom": "^24.5.0",
- "jest-environment-node": "^24.5.0",
+ "jest-environment-jsdom": "^24.7.1",
+ "jest-environment-node": "^24.7.1",
"jest-get-type": "^24.3.0",
- "jest-jasmine2": "^24.5.0",
+ "jest-jasmine2": "^24.7.1",
"jest-regex-util": "^24.3.0",
- "jest-resolve": "^24.5.0",
- "jest-util": "^24.5.0",
- "jest-validate": "^24.5.0",
+ "jest-resolve": "^24.7.1",
+ "jest-util": "^24.7.1",
+ "jest-validate": "^24.7.0",
"micromatch": "^3.1.10",
- "pretty-format": "^24.5.0",
+ "pretty-format": "^24.7.0",
"realpath-native": "^1.1.0"
}
},
"jest-diff": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.5.0.tgz",
- "integrity": "sha512-mCILZd9r7zqL9Uh6yNoXjwGQx0/J43OD2vvWVKwOEOLZliQOsojXwqboubAQ+Tszrb6DHGmNU7m4whGeB9YOqw==",
+ "version": "24.7.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.7.0.tgz",
+ "integrity": "sha512-ULQZ5B1lWpH70O4xsANC4tf4Ko6RrpwhE3PtG6ERjMg1TiYTC2Wp4IntJVGro6a8HG9luYHhhmF4grF0Pltckg==",
"dev": true,
"requires": {
"chalk": "^2.0.1",
"diff-sequences": "^24.3.0",
"jest-get-type": "^24.3.0",
- "pretty-format": "^24.5.0"
+ "pretty-format": "^24.7.0"
}
},
"jest-docblock": {
@@ -3750,43 +3695,43 @@
}
},
"jest-each": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.5.0.tgz",
- "integrity": "sha512-6gy3Kh37PwIT5sNvNY2VchtIFOOBh8UCYnBlxXMb5sr5wpJUDPTUATX2Axq1Vfk+HWTMpsYPeVYp4TXx5uqUBw==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.7.1.tgz",
+ "integrity": "sha512-4fsS8fEfLa3lfnI1Jw6NxjhyRTgfpuOVTeUZZFyVYqeTa4hPhr2YkToUhouuLTrL2eMGOfpbdMyRx0GQ/VooKA==",
"dev": true,
"requires": {
- "@jest/types": "^24.5.0",
+ "@jest/types": "^24.7.0",
"chalk": "^2.0.1",
"jest-get-type": "^24.3.0",
- "jest-util": "^24.5.0",
- "pretty-format": "^24.5.0"
+ "jest-util": "^24.7.1",
+ "pretty-format": "^24.7.0"
}
},
"jest-environment-jsdom": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.5.0.tgz",
- "integrity": "sha512-62Ih5HbdAWcsqBx2ktUnor/mABBo1U111AvZWcLKeWN/n/gc5ZvDBKe4Og44fQdHKiXClrNGC6G0mBo6wrPeGQ==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.7.1.tgz",
+ "integrity": "sha512-Gnhb+RqE2JuQGb3kJsLF8vfqjt3PHKSstq4Xc8ic+ax7QKo4Z0RWGucU3YV+DwKR3T9SYc+3YCUQEJs8r7+Jxg==",
"dev": true,
"requires": {
- "@jest/environment": "^24.5.0",
- "@jest/fake-timers": "^24.5.0",
- "@jest/types": "^24.5.0",
- "jest-mock": "^24.5.0",
- "jest-util": "^24.5.0",
+ "@jest/environment": "^24.7.1",
+ "@jest/fake-timers": "^24.7.1",
+ "@jest/types": "^24.7.0",
+ "jest-mock": "^24.7.0",
+ "jest-util": "^24.7.1",
"jsdom": "^11.5.1"
}
},
"jest-environment-node": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.5.0.tgz",
- "integrity": "sha512-du6FuyWr/GbKLsmAbzNF9mpr2Iu2zWSaq/BNHzX+vgOcts9f2ayXBweS7RAhr+6bLp6qRpMB6utAMF5Ygktxnw==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.7.1.tgz",
+ "integrity": "sha512-GJJQt1p9/C6aj6yNZMvovZuxTUd+BEJprETdvTKSb4kHcw4mFj8777USQV0FJoJ4V3djpOwA5eWyPwfq//PFBA==",
"dev": true,
"requires": {
- "@jest/environment": "^24.5.0",
- "@jest/fake-timers": "^24.5.0",
- "@jest/types": "^24.5.0",
- "jest-mock": "^24.5.0",
- "jest-util": "^24.5.0"
+ "@jest/environment": "^24.7.1",
+ "@jest/fake-timers": "^24.7.1",
+ "@jest/types": "^24.7.0",
+ "jest-mock": "^24.7.0",
+ "jest-util": "^24.7.1"
}
},
"jest-get-type": {
@@ -3796,76 +3741,79 @@
"dev": true
},
"jest-haste-map": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.5.0.tgz",
- "integrity": "sha512-mb4Yrcjw9vBgSvobDwH8QUovxApdimGcOkp+V1ucGGw4Uvr3VzZQBJhNm1UY3dXYm4XXyTW2G7IBEZ9pM2ggRQ==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.7.1.tgz",
+ "integrity": "sha512-g0tWkzjpHD2qa03mTKhlydbmmYiA2KdcJe762SbfFo/7NIMgBWAA0XqQlApPwkWOF7Cxoi/gUqL0i6DIoLpMBw==",
"dev": true,
"requires": {
- "@jest/types": "^24.5.0",
+ "@jest/types": "^24.7.0",
+ "anymatch": "^2.0.0",
"fb-watchman": "^2.0.0",
+ "fsevents": "^1.2.7",
"graceful-fs": "^4.1.15",
"invariant": "^2.2.4",
"jest-serializer": "^24.4.0",
- "jest-util": "^24.5.0",
- "jest-worker": "^24.4.0",
+ "jest-util": "^24.7.1",
+ "jest-worker": "^24.6.0",
"micromatch": "^3.1.10",
- "sane": "^4.0.3"
+ "sane": "^4.0.3",
+ "walker": "^1.0.7"
}
},
"jest-jasmine2": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.5.0.tgz",
- "integrity": "sha512-sfVrxVcx1rNUbBeyIyhkqZ4q+seNKyAG6iM0S2TYBdQsXjoFDdqWFfsUxb6uXSsbimbXX/NMkJIwUZ1uT9+/Aw==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.7.1.tgz",
+ "integrity": "sha512-Y/9AOJDV1XS44wNwCaThq4Pw3gBPiOv/s6NcbOAkVRRUEPu+36L2xoPsqQXsDrxoBerqeyslpn2TpCI8Zr6J2w==",
"dev": true,
"requires": {
"@babel/traverse": "^7.1.0",
- "@jest/environment": "^24.5.0",
- "@jest/test-result": "^24.5.0",
- "@jest/types": "^24.5.0",
+ "@jest/environment": "^24.7.1",
+ "@jest/test-result": "^24.7.1",
+ "@jest/types": "^24.7.0",
"chalk": "^2.0.1",
"co": "^4.6.0",
- "expect": "^24.5.0",
+ "expect": "^24.7.1",
"is-generator-fn": "^2.0.0",
- "jest-each": "^24.5.0",
- "jest-matcher-utils": "^24.5.0",
- "jest-message-util": "^24.5.0",
- "jest-runtime": "^24.5.0",
- "jest-snapshot": "^24.5.0",
- "jest-util": "^24.5.0",
- "pretty-format": "^24.5.0",
+ "jest-each": "^24.7.1",
+ "jest-matcher-utils": "^24.7.0",
+ "jest-message-util": "^24.7.1",
+ "jest-runtime": "^24.7.1",
+ "jest-snapshot": "^24.7.1",
+ "jest-util": "^24.7.1",
+ "pretty-format": "^24.7.0",
"throat": "^4.0.0"
}
},
"jest-leak-detector": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.5.0.tgz",
- "integrity": "sha512-LZKBjGovFRx3cRBkqmIg+BZnxbrLqhQl09IziMk3oeh1OV81Hg30RUIx885mq8qBv1PA0comB9bjKcuyNO1bCQ==",
+ "version": "24.7.0",
+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.7.0.tgz",
+ "integrity": "sha512-zV0qHKZGXtmPVVzT99CVEcHE9XDf+8LwiE0Ob7jjezERiGVljmqKFWpV2IkG+rkFIEUHFEkMiICu7wnoPM/RoQ==",
"dev": true,
"requires": {
- "pretty-format": "^24.5.0"
+ "pretty-format": "^24.7.0"
}
},
"jest-matcher-utils": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.5.0.tgz",
- "integrity": "sha512-QM1nmLROjLj8GMGzg5VBra3I9hLpjMPtF1YqzQS3rvWn2ltGZLrGAO1KQ9zUCVi5aCvrkbS5Ndm2evIP9yZg1Q==",
+ "version": "24.7.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.7.0.tgz",
+ "integrity": "sha512-158ieSgk3LNXeUhbVJYRXyTPSCqNgVXOp/GT7O94mYd3pk/8+odKTyR1JLtNOQSPzNi8NFYVONtvSWA/e1RDXg==",
"dev": true,
"requires": {
"chalk": "^2.0.1",
- "jest-diff": "^24.5.0",
+ "jest-diff": "^24.7.0",
"jest-get-type": "^24.3.0",
- "pretty-format": "^24.5.0"
+ "pretty-format": "^24.7.0"
}
},
"jest-message-util": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.5.0.tgz",
- "integrity": "sha512-6ZYgdOojowCGiV0D8WdgctZEAe+EcFU+KrVds+0ZjvpZurUW2/oKJGltJ6FWY2joZwYXN5VL36GPV6pNVRqRnQ==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.7.1.tgz",
+ "integrity": "sha512-dk0gqVtyqezCHbcbk60CdIf+8UHgD+lmRHifeH3JRcnAqh4nEyPytSc9/L1+cQyxC+ceaeP696N4ATe7L+omcg==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@jest/test-result": "^24.5.0",
- "@jest/types": "^24.5.0",
+ "@jest/test-result": "^24.7.1",
+ "@jest/types": "^24.7.0",
"@types/stack-utils": "^1.0.1",
"chalk": "^2.0.1",
"micromatch": "^3.1.10",
@@ -3874,12 +3822,12 @@
}
},
"jest-mock": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.5.0.tgz",
- "integrity": "sha512-ZnAtkWrKf48eERgAOiUxVoFavVBziO2pAi2MfZ1+bGXVkDfxWLxU0//oJBkgwbsv6OAmuLBz4XFFqvCFMqnGUw==",
+ "version": "24.7.0",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.7.0.tgz",
+ "integrity": "sha512-6taW4B4WUcEiT2V9BbOmwyGuwuAFT2G8yghF7nyNW1/2gq5+6aTqSPcS9lS6ArvEkX55vbPAS/Jarx5LSm4Fng==",
"dev": true,
"requires": {
- "@jest/types": "^24.5.0"
+ "@jest/types": "^24.7.0"
}
},
"jest-pnp-resolver": {
@@ -3895,12 +3843,12 @@
"dev": true
},
"jest-resolve": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.5.0.tgz",
- "integrity": "sha512-ZIfGqLX1Rg8xJpQqNjdoO8MuxHV1q/i2OO1hLXjgCWFWs5bsedS8UrOdgjUqqNae6DXA+pCyRmdcB7lQEEbXew==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.7.1.tgz",
+ "integrity": "sha512-Bgrc+/UUZpGJ4323sQyj85hV9d+ANyPNu6XfRDUcyFNX1QrZpSoM0kE4Mb2vZMAYTJZsBFzYe8X1UaOkOELSbw==",
"dev": true,
"requires": {
- "@jest/types": "^24.5.0",
+ "@jest/types": "^24.7.0",
"browser-resolve": "^1.11.3",
"chalk": "^2.0.1",
"jest-pnp-resolver": "^1.2.1",
@@ -3908,68 +3856,68 @@
}
},
"jest-resolve-dependencies": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.5.0.tgz",
- "integrity": "sha512-dRVM1D+gWrFfrq2vlL5P9P/i8kB4BOYqYf3S7xczZ+A6PC3SgXYSErX/ScW/469pWMboM1uAhgLF+39nXlirCQ==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.7.1.tgz",
+ "integrity": "sha512-2Eyh5LJB2liNzfk4eo7bD1ZyBbqEJIyyrFtZG555cSWW9xVHxII2NuOkSl1yUYTAYCAmM2f2aIT5A7HzNmubyg==",
"dev": true,
"requires": {
- "@jest/types": "^24.5.0",
+ "@jest/types": "^24.7.0",
"jest-regex-util": "^24.3.0",
- "jest-snapshot": "^24.5.0"
+ "jest-snapshot": "^24.7.1"
}
},
"jest-runner": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.5.0.tgz",
- "integrity": "sha512-oqsiS9TkIZV5dVkD+GmbNfWBRPIvxqmlTQ+AQUJUQ07n+4xTSDc40r+aKBynHw9/tLzafC00DIbJjB2cOZdvMA==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.7.1.tgz",
+ "integrity": "sha512-aNFc9liWU/xt+G9pobdKZ4qTeG/wnJrJna3VqunziDNsWT3EBpmxXZRBMKCsNMyfy+A/XHiV+tsMLufdsNdgCw==",
"dev": true,
"requires": {
- "@jest/console": "^24.3.0",
- "@jest/environment": "^24.5.0",
- "@jest/test-result": "^24.5.0",
- "@jest/types": "^24.5.0",
+ "@jest/console": "^24.7.1",
+ "@jest/environment": "^24.7.1",
+ "@jest/test-result": "^24.7.1",
+ "@jest/types": "^24.7.0",
"chalk": "^2.4.2",
"exit": "^0.1.2",
"graceful-fs": "^4.1.15",
- "jest-config": "^24.5.0",
+ "jest-config": "^24.7.1",
"jest-docblock": "^24.3.0",
- "jest-haste-map": "^24.5.0",
- "jest-jasmine2": "^24.5.0",
- "jest-leak-detector": "^24.5.0",
- "jest-message-util": "^24.5.0",
- "jest-resolve": "^24.5.0",
- "jest-runtime": "^24.5.0",
- "jest-util": "^24.5.0",
- "jest-worker": "^24.4.0",
+ "jest-haste-map": "^24.7.1",
+ "jest-jasmine2": "^24.7.1",
+ "jest-leak-detector": "^24.7.0",
+ "jest-message-util": "^24.7.1",
+ "jest-resolve": "^24.7.1",
+ "jest-runtime": "^24.7.1",
+ "jest-util": "^24.7.1",
+ "jest-worker": "^24.6.0",
"source-map-support": "^0.5.6",
"throat": "^4.0.0"
}
},
"jest-runtime": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.5.0.tgz",
- "integrity": "sha512-GTFHzfLdwpaeoDPilNpBrorlPoNZuZrwKKzKJs09vWwHo+9TOsIIuszK8cWOuKC7ss07aN1922Ge8fsGdsqCuw==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.7.1.tgz",
+ "integrity": "sha512-0VAbyBy7tll3R+82IPJpf6QZkokzXPIS71aDeqh+WzPRXRCNz6StQ45otFariPdJ4FmXpDiArdhZrzNAC3sj6A==",
"dev": true,
"requires": {
- "@jest/console": "^24.3.0",
- "@jest/environment": "^24.5.0",
+ "@jest/console": "^24.7.1",
+ "@jest/environment": "^24.7.1",
"@jest/source-map": "^24.3.0",
- "@jest/transform": "^24.5.0",
- "@jest/types": "^24.5.0",
+ "@jest/transform": "^24.7.1",
+ "@jest/types": "^24.7.0",
"@types/yargs": "^12.0.2",
"chalk": "^2.0.1",
"exit": "^0.1.2",
"glob": "^7.1.3",
"graceful-fs": "^4.1.15",
- "jest-config": "^24.5.0",
- "jest-haste-map": "^24.5.0",
- "jest-message-util": "^24.5.0",
- "jest-mock": "^24.5.0",
+ "jest-config": "^24.7.1",
+ "jest-haste-map": "^24.7.1",
+ "jest-message-util": "^24.7.1",
+ "jest-mock": "^24.7.0",
"jest-regex-util": "^24.3.0",
- "jest-resolve": "^24.5.0",
- "jest-snapshot": "^24.5.0",
- "jest-util": "^24.5.0",
- "jest-validate": "^24.5.0",
+ "jest-resolve": "^24.7.1",
+ "jest-snapshot": "^24.7.1",
+ "jest-util": "^24.7.1",
+ "jest-validate": "^24.7.0",
"realpath-native": "^1.1.0",
"slash": "^2.0.0",
"strip-bom": "^3.0.0",
@@ -3983,37 +3931,36 @@
"dev": true
},
"jest-snapshot": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.5.0.tgz",
- "integrity": "sha512-eBEeJb5ROk0NcpodmSKnCVgMOo+Qsu5z9EDl3tGffwPzK1yV37mjGWF2YeIz1NkntgTzP+fUL4s09a0+0dpVWA==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.7.1.tgz",
+ "integrity": "sha512-8Xk5O4p+JsZZn4RCNUS3pxA+ORKpEKepE+a5ejIKrId9CwrVN0NY+vkqEkXqlstA5NMBkNahXkR/4qEBy0t5yA==",
"dev": true,
"requires": {
"@babel/types": "^7.0.0",
- "@jest/types": "^24.5.0",
+ "@jest/types": "^24.7.0",
"chalk": "^2.0.1",
- "expect": "^24.5.0",
- "jest-diff": "^24.5.0",
- "jest-matcher-utils": "^24.5.0",
- "jest-message-util": "^24.5.0",
- "jest-resolve": "^24.5.0",
+ "expect": "^24.7.1",
+ "jest-diff": "^24.7.0",
+ "jest-matcher-utils": "^24.7.0",
+ "jest-message-util": "^24.7.1",
+ "jest-resolve": "^24.7.1",
"mkdirp": "^0.5.1",
"natural-compare": "^1.4.0",
- "pretty-format": "^24.5.0",
+ "pretty-format": "^24.7.0",
"semver": "^5.5.0"
}
},
"jest-util": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.5.0.tgz",
- "integrity": "sha512-Xy8JsD0jvBz85K7VsTIQDuY44s+hYJyppAhcsHsOsGisVtdhar6fajf2UOf2mEVEgh15ZSdA0zkCuheN8cbr1Q==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.7.1.tgz",
+ "integrity": "sha512-/KilOue2n2rZ5AnEBYoxOXkeTu6vi7cjgQ8MXEkih0oeAXT6JkS3fr7/j8+engCjciOU1Nq5loMSKe0A1oeX0A==",
"dev": true,
"requires": {
- "@jest/console": "^24.3.0",
- "@jest/fake-timers": "^24.5.0",
+ "@jest/console": "^24.7.1",
+ "@jest/fake-timers": "^24.7.1",
"@jest/source-map": "^24.3.0",
- "@jest/test-result": "^24.5.0",
- "@jest/types": "^24.5.0",
- "@types/node": "*",
+ "@jest/test-result": "^24.7.1",
+ "@jest/types": "^24.7.0",
"callsites": "^3.0.0",
"chalk": "^2.0.1",
"graceful-fs": "^4.1.15",
@@ -4032,42 +3979,40 @@
}
},
"jest-validate": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.5.0.tgz",
- "integrity": "sha512-gg0dYszxjgK2o11unSIJhkOFZqNRQbWOAB2/LOUdsd2LfD9oXiMeuee8XsT0iRy5EvSccBgB4h/9HRbIo3MHgQ==",
+ "version": "24.7.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.7.0.tgz",
+ "integrity": "sha512-cgai/gts9B2chz1rqVdmLhzYxQbgQurh1PEQSvSgPZ8KGa1AqXsqC45W5wKEwzxKrWqypuQrQxnF4+G9VejJJA==",
"dev": true,
"requires": {
- "@jest/types": "^24.5.0",
+ "@jest/types": "^24.7.0",
"camelcase": "^5.0.0",
"chalk": "^2.0.1",
"jest-get-type": "^24.3.0",
"leven": "^2.1.0",
- "pretty-format": "^24.5.0"
+ "pretty-format": "^24.7.0"
}
},
"jest-watcher": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.5.0.tgz",
- "integrity": "sha512-/hCpgR6bg0nKvD3nv4KasdTxuhwfViVMHUATJlnGCD0r1QrmIssimPbmc5KfAQblAVxkD8xrzuij9vfPUk1/rA==",
+ "version": "24.7.1",
+ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.7.1.tgz",
+ "integrity": "sha512-Wd6TepHLRHVKLNPacEsBwlp9raeBIO+01xrN24Dek4ggTS8HHnOzYSFnvp+6MtkkJ3KfMzy220KTi95e2rRkrw==",
"dev": true,
"requires": {
- "@jest/test-result": "^24.5.0",
- "@jest/types": "^24.5.0",
- "@types/node": "*",
+ "@jest/test-result": "^24.7.1",
+ "@jest/types": "^24.7.0",
"@types/yargs": "^12.0.9",
"ansi-escapes": "^3.0.0",
"chalk": "^2.0.1",
- "jest-util": "^24.5.0",
+ "jest-util": "^24.7.1",
"string-length": "^2.0.0"
}
},
"jest-worker": {
- "version": "24.4.0",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz",
- "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==",
+ "version": "24.6.0",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.6.0.tgz",
+ "integrity": "sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==",
"dev": true,
"requires": {
- "@types/node": "*",
"merge-stream": "^1.0.1",
"supports-color": "^6.1.0"
},
@@ -4090,9 +4035,9 @@
"dev": true
},
"js-yaml": {
- "version": "3.13.0",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
- "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
+ "version": "3.13.1",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+ "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
@@ -4200,9 +4145,9 @@
"dev": true
},
"kleur": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.2.tgz",
- "integrity": "sha512-3h7B2WRT5LNXOtQiAaWonilegHcPSf9nLVXlSTci8lu1dZUuui61+EsPEZqSVxY7rXYmB2DVKMQILxaO5WL61Q==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+ "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
"dev": true
},
"latest-version": {
@@ -4374,13 +4319,13 @@
"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
},
"mem": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/mem/-/mem-4.1.0.tgz",
- "integrity": "sha512-I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+ "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
"dev": true,
"requires": {
"map-age-cleaner": "^0.1.1",
- "mimic-fn": "^1.0.0",
+ "mimic-fn": "^2.0.0",
"p-is-promise": "^2.0.0"
}
},
@@ -4475,9 +4420,9 @@
}
},
"mimic-fn": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
- "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
"dev": true
},
"minimatch": {
@@ -4524,9 +4469,9 @@
}
},
"mocha": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.0.2.tgz",
- "integrity": "sha512-RtTJsmmToGyeTznSOMoM6TPEk1A84FQaHIciKrRqARZx+B5ccJ5tXlmJzEKGBxZdqk9UjpRsesZTUkZmR5YnuQ==",
+ "version": "6.1.1",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.1.1.tgz",
+ "integrity": "sha512-ayfr68s4kyDnCU0hjkTk5Z8J8dqr1iPUuVjmd+dLFgaGKOPlgx1XrOGn5k3H1LlXNnLBb8voZMYMKxchiA4Ujg==",
"dev": true,
"requires": {
"ansi-colors": "3.2.3",
@@ -4534,11 +4479,11 @@
"debug": "3.2.6",
"diff": "3.5.0",
"escape-string-regexp": "1.0.5",
- "findup-sync": "2.0.0",
+ "find-up": "3.0.0",
"glob": "7.1.3",
"growl": "1.10.5",
"he": "1.2.0",
- "js-yaml": "3.12.0",
+ "js-yaml": "3.13.0",
"log-symbols": "2.2.0",
"minimatch": "3.0.4",
"mkdirp": "0.5.1",
@@ -4549,8 +4494,8 @@
"supports-color": "6.0.0",
"which": "1.3.1",
"wide-align": "1.1.3",
- "yargs": "12.0.5",
- "yargs-parser": "11.1.1",
+ "yargs": "13.2.2",
+ "yargs-parser": "13.0.0",
"yargs-unparser": "1.5.0"
},
"dependencies": {
@@ -4563,10 +4508,16 @@
"ms": "^2.1.1"
}
},
+ "get-caller-file": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "dev": true
+ },
"js-yaml": {
- "version": "3.12.0",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
- "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+ "version": "3.13.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
+ "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
@@ -4579,6 +4530,23 @@
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true
},
+ "require-main-filename": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "dev": true
+ },
+ "string-width": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "dev": true,
+ "requires": {
+ "emoji-regex": "^7.0.1",
+ "is-fullwidth-code-point": "^2.0.0",
+ "strip-ansi": "^5.1.0"
+ }
+ },
"supports-color": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
@@ -4587,6 +4555,35 @@
"requires": {
"has-flag": "^3.0.0"
}
+ },
+ "yargs": {
+ "version": "13.2.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz",
+ "integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==",
+ "dev": true,
+ "requires": {
+ "cliui": "^4.0.0",
+ "find-up": "^3.0.0",
+ "get-caller-file": "^2.0.1",
+ "os-locale": "^3.1.0",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^2.0.0",
+ "set-blocking": "^2.0.0",
+ "string-width": "^3.0.0",
+ "which-module": "^2.0.0",
+ "y18n": "^4.0.0",
+ "yargs-parser": "^13.0.0"
+ }
+ },
+ "yargs-parser": {
+ "version": "13.0.0",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz",
+ "integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==",
+ "dev": true,
+ "requires": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ }
}
}
},
@@ -4843,9 +4840,9 @@
}
},
"object-keys": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
- "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
"dev": true
},
"object-visit": {
@@ -4975,9 +4972,9 @@
"dev": true
},
"p-is-promise": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
- "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
"dev": true
},
"p-limit": {
@@ -5005,9 +5002,9 @@
"dev": true
},
"p-try": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
- "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
"dev": true
},
"package-json": {
@@ -5032,12 +5029,6 @@
"json-parse-better-errors": "^1.0.1"
}
},
- "parse-passwd": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
- "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
- "dev": true
- },
"parse5": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
@@ -5165,12 +5156,12 @@
"dev": true
},
"pretty-format": {
- "version": "24.5.0",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.5.0.tgz",
- "integrity": "sha512-/3RuSghukCf8Riu5Ncve0iI+BzVkbRU5EeUoArKARZobREycuH5O4waxvaNIloEXdb0qwgmEAed5vTpX1HNROQ==",
+ "version": "24.7.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.7.0.tgz",
+ "integrity": "sha512-apen5cjf/U4dj7tHetpC7UEFCvtAgnNZnBDkfPv3fokzIqyOJckAG9OlAPC1BlFALnqT/lGB2tl9EJjlK6eCsA==",
"dev": true,
"requires": {
- "@jest/types": "^24.5.0",
+ "@jest/types": "^24.7.0",
"ansi-regex": "^4.0.0",
"ansi-styles": "^3.2.0",
"react-is": "^16.8.4"
@@ -5503,16 +5494,6 @@
"resolve-from": "^3.0.0"
}
},
- "resolve-dir": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
- "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
- "dev": true,
- "requires": {
- "expand-tilde": "^2.0.0",
- "global-modules": "^1.0.0"
- }
- },
"resolve-from": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
@@ -5916,9 +5897,9 @@
}
},
"spdx-license-ids": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
- "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==",
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
+ "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==",
"dev": true
},
"split-string": {
@@ -6327,9 +6308,9 @@
"dev": true
},
"ts-jest": {
- "version": "24.0.1",
- "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-24.0.1.tgz",
- "integrity": "sha512-mgNZmYPuGBNgYpUzchI7vdSr6zATQI0TrSyzREnXHuPCvlW8T1DQ/fdscgx4ivS5vAMUGUaoxGdWIVHC5I8imw==",
+ "version": "24.0.2",
+ "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-24.0.2.tgz",
+ "integrity": "sha512-h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==",
"dev": true,
"requires": {
"bs-logger": "0.x",
@@ -6421,15 +6402,15 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
},
"typescript": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.1.tgz",
- "integrity": "sha512-3NSMb2VzDQm8oBTLH6Nj55VVtUEpe/rgkIzMir0qVoLyjDZlnMBva0U6vDiV3IH+sl/Yu6oP5QwsAQtHPmDd2Q==",
+ "version": "3.4.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.2.tgz",
+ "integrity": "sha512-Og2Vn6Mk7JAuWA1hQdDQN/Ekm/SchX80VzLhjKN9ETYrIepBFAd8PkOdOTK2nKt0FCkmMZKBJvQ1dV1gIxPu/A==",
"dev": true
},
"uglify-js": {
- "version": "3.5.2",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.2.tgz",
- "integrity": "sha512-imog1WIsi9Yb56yRt5TfYVxGmnWs3WSGU73ieSOlMVFwhJCA9W8fqFFMMj4kgDqiS/80LGdsYnWL7O9UcjEBlg==",
+ "version": "3.5.3",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz",
+ "integrity": "sha512-rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw==",
"dev": true,
"optional": true,
"requires": {
diff --git a/server/package.json b/server/package.json
index 18e9559..5af1b9e 100644
--- a/server/package.json
+++ b/server/package.json
@@ -34,16 +34,16 @@
"@types/jasmine": "^3.3.12",
"@types/jest": "^24.0.11",
"@types/morgan": "^1.7.35",
- "@types/node": "^11.12.2",
+ "@types/node": "^11.13.0",
"@types/request": "^2.48.1",
"chai": "^4.2.0",
- "jest": "^24.5.0",
- "mocha": "^6.0.2",
+ "jest": "^24.7.1",
+ "mocha": "^6.1.1",
"nodemon": "^1.18.10",
"supertest": "^4.0.2",
- "ts-jest": "^24.0.1",
+ "ts-jest": "^24.0.2",
"ts-node": "^8.0.3",
- "typescript": "^3.4.1"
+ "typescript": "^3.4.2"
},
"repository": {
"type": "git",
diff --git a/server/src/routes/UrlCheckRouter.ts b/server/src/routes/UrlCheckRouter.ts
index 3d8d12c..403610e 100644
--- a/server/src/routes/UrlCheckRouter.ts
+++ b/server/src/routes/UrlCheckRouter.ts
@@ -22,7 +22,10 @@ export class UrlCheckRouter {
headers: { Range: 'bytes=0-' }
},
(error, response) => {
- if (response && response.statusCode.toString().startsWith('2')) {
+ if (
+ response &&
+ response.statusCode.toString().startsWith('2')
+ ) {
const result: any = {}
result.found = true