Merge branch 'master' into feature/compute

This commit is contained in:
Alex Coseru 2020-05-19 02:16:14 +03:00 committed by GitHub
commit 17cdb87b8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 4369 additions and 4578 deletions

6256
client/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -14,27 +14,27 @@
},
"dependencies": {
"@oceanprotocol/art": "^2.2.0",
"@oceanprotocol/squid": "2.0.0",
"@oceanprotocol/squid": "2.1.2",
"@oceanprotocol/typographies": "^0.1.0",
"@sindresorhus/slugify": "^0.11.0",
"@truffle/hdwallet-provider": "^1.0.33",
"@sindresorhus/slugify": "^1.0.0",
"@truffle/hdwallet-provider": "^1.0.35",
"axios": "^0.19.2",
"bip39": "^3.0.2",
"classnames": "^2.2.6",
"ethereum-blockies": "github:MyEtherWallet/blockies",
"filesize": "^6.1.0",
"history": "^4.10.1",
"ipfs-http-client": "39.0.2",
"ipfs-http-client": "44.1.0",
"is-url-superb": "^3.0.0",
"moment": "^2.24.0",
"moment": "^2.25.3",
"node-sass": "^4.13.1",
"query-string": "^6.11.1",
"query-string": "^6.12.1",
"react": "^16.13.1",
"react-collapsed": "^2.2.3",
"react-datepicker": "^2.14.0",
"react-collapsed": "^3.0.0",
"react-datepicker": "^2.16.0",
"react-dom": "^16.13.1",
"react-dotdotdot": "^1.3.1",
"react-dropzone": "^10.2.1",
"react-dropzone": "^11.0.1",
"react-ga": "^2.7.0",
"react-helmet": "^5.2.1",
"react-markdown": "^4.3.1",
@ -50,24 +50,24 @@
"devDependencies": {
"@react-mock/state": "^0.1.8",
"@sheerun/mutationobserver-shim": "^0.3.3",
"@testing-library/jest-dom": "^5.1.1",
"@testing-library/react": "^10.0.1",
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^10.0.4",
"@types/classnames": "^2.2.10",
"@types/is-url": "^1.2.28",
"@types/jest": "^25.1.4",
"@types/react": "^16.9.23",
"@types/jest": "^25.2.2",
"@types/react": "^16.9.35",
"@types/react-datepicker": "^2.11.0",
"@types/react-dom": "^16.9.5",
"@types/react-dom": "^16.9.8",
"@types/react-helmet": "^5.0.15",
"@types/react-modal": "^3.10.5",
"@types/react-paginate": "^6.2.1",
"@types/react-router-dom": "^5.1.3",
"@types/react-transition-group": "^4.2.4",
"@types/shortid": "^0.0.29",
"jest-mock-axios": "^3.2.0",
"react-scripts": "^3.4.0",
"source-map-explorer": "^2.4.0",
"typescript": "^3.8.3"
"jest-mock-axios": "^4.0.0",
"react-scripts": "^3.4.1",
"source-map-explorer": "^2.4.2",
"typescript": "^3.9.2"
},
"repository": {
"type": "git",

1610
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -25,22 +25,22 @@
"dependencies": {},
"devDependencies": {
"@release-it/bumper": "^1.1.0",
"@typescript-eslint/eslint-plugin": "^2.24.0",
"@typescript-eslint/parser": "^2.24.0",
"auto-changelog": "^1.16.2",
"@typescript-eslint/eslint-plugin": "^2.33.0",
"@typescript-eslint/parser": "^2.33.0",
"auto-changelog": "^2.0.0",
"concurrently": "^5.1.0",
"cypress": "^4.2.0",
"cypress": "^4.5.0",
"cypress-log-to-output": "^1.0.8",
"eslint": "^6.8.0",
"eslint-config-oceanprotocol": "^1.5.0",
"eslint-config-prettier": "^6.10.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-cypress": "^2.10.3",
"eslint-plugin-prettier": "^3.1.2",
"prettier": "^1.19.1",
"prettier-stylelint": "^0.4.2",
"release-it": "^13.1.1",
"start-server-and-test": "^1.10.10",
"stylelint": "^13.2.1",
"release-it": "^13.6.1",
"start-server-and-test": "^1.11.0",
"stylelint": "^13.3.3",
"stylelint-config-bigchaindb": "^1.2.2",
"stylelint-config-css-modules": "^2.2.0",
"stylelint-config-standard": "^20.0.0",

1007
server/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -13,32 +13,32 @@
"coverage": "cat coverage/lcov.info | codacy-coverage --token 8801f827fe1144ffa85cd7da94f2bbf7"
},
"dependencies": {
"@sendgrid/mail": "^6.5.5",
"@sendgrid/mail": "^7.1.1",
"body-parser": "^1.19.0",
"compression": "^1.7.4",
"debug": "^4.1.1",
"dotenv": "^8.2.0",
"express": "^4.17.1",
"express-validator": "^6.4.0",
"morgan": "^1.9.1",
"express-validator": "^6.5.0",
"morgan": "^1.10.0",
"request": "^2.88.2"
},
"devDependencies": {
"@types/body-parser": "^1.19.0",
"@types/compression": "^1.7.0",
"@types/debug": "^4.1.5",
"@types/express": "^4.17.3",
"@types/jest": "^25.1.4",
"@types/express": "^4.17.6",
"@types/jest": "^25.2.2",
"@types/morgan": "^1.9.0",
"@types/node": "^13.9.2",
"@types/request": "^2.48.4",
"@types/supertest": "^2.0.8",
"@types/node": "^14.0.1",
"@types/request": "^2.48.5",
"@types/supertest": "^2.0.9",
"jest": "24.9.0",
"nodemon": "^2.0.2",
"nodemon": "^2.0.4",
"supertest": "^4.0.2",
"ts-jest": "24.3.0",
"ts-node": "^8.7.0",
"typescript": "^3.8.3"
"ts-node": "^8.10.1",
"typescript": "^3.9.2"
},
"repository": {
"type": "git",