1
0
mirror of https://github.com/oceanprotocol/commons.git synced 2023-03-15 18:03:00 +01:00

Merge pull request #223 from oceanprotocol/fix/packages

package updates
This commit is contained in:
Matthias Kretschmann 2020-03-20 11:43:10 +01:00 committed by GitHub
commit 5f8b3d7b69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 6395 additions and 2677 deletions

5253
client/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -14,59 +14,60 @@
}, },
"dependencies": { "dependencies": {
"@oceanprotocol/art": "^2.2.0", "@oceanprotocol/art": "^2.2.0",
"@oceanprotocol/squid": "next", "@oceanprotocol/squid": "2.0.0-beta.4",
"@oceanprotocol/typographies": "^0.1.0", "@oceanprotocol/typographies": "^0.1.0",
"@sindresorhus/slugify": "^0.10.0", "@sindresorhus/slugify": "^0.11.0",
"@truffle/hdwallet-provider": "^1.0.30", "@truffle/hdwallet-provider": "^1.0.33",
"axios": "^0.19.2", "axios": "^0.19.2",
"bip39": "^3.0.2", "bip39": "^3.0.2",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"ethereum-blockies": "github:MyEtherWallet/blockies", "ethereum-blockies": "github:MyEtherWallet/blockies",
"filesize": "^6.0.1", "filesize": "^6.1.0",
"history": "^4.10.1", "history": "^4.10.1",
"ipfs-http-client": "39.0.2", "ipfs-http-client": "39.0.2",
"is-url-superb": "^3.0.0", "is-url-superb": "^3.0.0",
"moment": "^2.24.0", "moment": "^2.24.0",
"node-sass": "^4.13.1", "node-sass": "^4.13.1",
"query-string": "^6.10.1", "query-string": "^6.11.1",
"react": "^16.12.0", "react": "^16.13.1",
"react-collapsed": "^2.2.3", "react-collapsed": "^2.2.3",
"react-datepicker": "^2.11.0", "react-datepicker": "^2.14.0",
"react-dom": "^16.12.0", "react-dom": "^16.13.1",
"react-dotdotdot": "^1.3.1", "react-dotdotdot": "^1.3.1",
"react-dropzone": "^10.2.1", "react-dropzone": "^10.2.1",
"react-ga": "^2.7.0", "react-ga": "^2.7.0",
"react-helmet": "^5.2.1", "react-helmet": "^5.2.1",
"react-markdown": "^4.3.1", "react-markdown": "^4.3.1",
"react-modal": "^3.11.1", "react-modal": "^3.11.2",
"react-moment": "^0.9.7", "react-moment": "^0.9.7",
"react-paginate": "^6.3.2", "react-paginate": "^6.3.2",
"react-popper": "^1.3.7", "react-popper": "^1.3.7",
"react-router-dom": "^5.1.2", "react-router-dom": "^5.1.2",
"react-transition-group": "^4.3.0", "react-transition-group": "^4.3.0",
"shortid": "^2.2.15", "shortid": "^2.2.15",
"web3": "^1.2.5" "web3": "^1.2.6"
}, },
"devDependencies": { "devDependencies": {
"@react-mock/state": "^0.1.8", "@react-mock/state": "^0.1.8",
"@testing-library/jest-dom": "^5.0.2", "@sheerun/mutationobserver-shim": "^0.3.3",
"@testing-library/react": "^9.4.0", "@testing-library/jest-dom": "^5.1.1",
"@types/classnames": "^2.2.9", "@testing-library/react": "^10.0.1",
"@types/classnames": "^2.2.10",
"@types/is-url": "^1.2.28", "@types/is-url": "^1.2.28",
"@types/jest": "^24.9.1", "@types/jest": "^25.1.4",
"@types/react": "^16.9.19", "@types/react": "^16.9.23",
"@types/react-datepicker": "^2.10.0", "@types/react-datepicker": "^2.11.0",
"@types/react-dom": "^16.9.5", "@types/react-dom": "^16.9.5",
"@types/react-helmet": "^5.0.15", "@types/react-helmet": "^5.0.15",
"@types/react-modal": "^3.10.4", "@types/react-modal": "^3.10.5",
"@types/react-paginate": "^6.2.1", "@types/react-paginate": "^6.2.1",
"@types/react-router-dom": "^5.1.3", "@types/react-router-dom": "^5.1.3",
"@types/react-transition-group": "^4.2.3", "@types/react-transition-group": "^4.2.4",
"@types/shortid": "^0.0.29", "@types/shortid": "^0.0.29",
"jest-mock-axios": "^3.2.0", "jest-mock-axios": "^3.2.0",
"react-scripts": "^3.3.1", "react-scripts": "^3.4.0",
"source-map-explorer": "^2.2.2", "source-map-explorer": "^2.4.0",
"typescript": "^3.7.5" "typescript": "^3.8.3"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -14,12 +14,16 @@
} }
.header { .header {
// stylelint-disable value-keyword-case
composes: categoryImage; composes: categoryImage;
// stylelint-enable value-keyword-case
height: 8rem; height: 8rem;
margin-top: $spacer / $line-height; margin-top: $spacer / $line-height;
} }
.dimmed { .dimmed {
// stylelint-disable value-keyword-case
composes: categoryImage; composes: categoryImage;
// stylelint-enable value-keyword-case
opacity: .6; opacity: .6;
} }

View File

@ -19,7 +19,9 @@
} }
.inputWrapSearch { .inputWrapSearch {
// stylelint-disable value-keyword-case
composes: inputWrap; composes: inputWrap;
// stylelint-enable value-keyword-case
.input { .input {
padding-left: $spacer * 1.5; padding-left: $spacer * 1.5;

View File

@ -17,7 +17,9 @@
/* yellow triangle */ /* yellow triangle */
.statusIndicatorCloseEnough { .statusIndicatorCloseEnough {
// stylelint-disable value-keyword-case
composes: statusIndicator; composes: statusIndicator;
// stylelint-enable value-keyword-case
background: none; background: none;
width: 0; width: 0;
height: 0; height: 0;
@ -28,7 +30,9 @@
/* green circle */ /* green circle */
.statusIndicatorActive { .statusIndicatorActive {
// stylelint-disable value-keyword-case
composes: statusIndicator; composes: statusIndicator;
// stylelint-enable value-keyword-case
border-radius: 50%; border-radius: 50%;
background: $green; background: $green;
} }

View File

@ -22,6 +22,7 @@
margin-bottom: -.1rem; margin-bottom: -.1rem;
} }
// stylelint-disable value-keyword-case
.indicator { .indicator {
composes: statusIndicator from '../AccountStatus/Indicator.module.scss'; composes: statusIndicator from '../AccountStatus/Indicator.module.scss';
} }
@ -29,6 +30,7 @@
.indicatorActive { .indicatorActive {
composes: statusIndicatorActive from '../AccountStatus/Indicator.module.scss'; composes: statusIndicatorActive from '../AccountStatus/Indicator.module.scss';
} }
// stylelint-enable value-keyword-case
.indicatorLabel { .indicatorLabel {
font-family: $font-family-title; font-family: $font-family-title;

View File

@ -24,7 +24,6 @@ export default function useIpfsApi(config: IpfsConfig) {
ipfsMessage = 'Checking IPFS gateway...' ipfsMessage = 'Checking IPFS gateway...'
try { try {
// eslint-disable-next-line require-atomic-updates
ipfs = await ipfsClient(config) ipfs = await ipfsClient(config)
const version = await ipfs.version() const version = await ipfs.version()
ipfsVersion = version.version ipfsVersion = version.version
@ -32,7 +31,7 @@ export default function useIpfsApi(config: IpfsConfig) {
} catch (error) { } catch (error) {
setIpfsError(`IPFS connection error: ${error.message}`) setIpfsError(`IPFS connection error: ${error.message}`)
} }
setIpfsReady(Boolean(await ipfs.id())) setIpfsReady(Boolean(await (ipfs && ipfs.id())))
} }
initIpfs() initIpfs()

View File

@ -70,7 +70,11 @@ describe('Files', () => {
// open // open
fireEvent.click(getByText('+ Add to IPFS')) fireEvent.click(getByText('+ Add to IPFS'))
const text = await waitForElement(() => const text = await waitForElement(() =>
getByText(/Connected to / || /IPFS connection error/) getByText(
/Checking IPFS gateway/ ||
/Connected to / ||
/IPFS connection error/
)
) )
expect(text).toBeInTheDocument() expect(text).toBeInTheDocument()

View File

@ -1 +1,4 @@
import '@testing-library/jest-dom/extend-expect' import '@testing-library/jest-dom/extend-expect'
import MutationObserver from '@sheerun/mutationobserver-shim'
window.MutationObserver = MutationObserver

View File

@ -21,12 +21,14 @@ $brand-gradient: linear-gradient(to right bottom, $brand-purple, $brand-pink);
$body-background: darken($brand-white, 1%); $body-background: darken($brand-white, 1%);
// Fonts // Fonts
$font-family-base: 'Sharp Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', // stylelint-disable value-keyword-case
Helvetica, Arial, sans-serif; $font-family-base: 'Sharp Sans', -apple-system, blinkmacsystemfont, 'Segoe UI',
$font-family-title: 'Sharp Sans Display', -apple-system, BlinkMacSystemFont, helvetica, arial, sans-serif;
'Segoe UI', Helvetica, Arial, sans-serif; $font-family-title: 'Sharp Sans Display', -apple-system, blinkmacsystemfont,
$font-family-monospace: 'Fira Code', 'Fira Mono', Menlo, Monaco, Consolas, 'Segoe UI', helvetica, arial, sans-serif;
$font-family-monospace: 'Fira Code', 'Fira Mono', menlo, monaco, consolas,
'Courier New', monospace; 'Courier New', monospace;
// stylelint-enable value-keyword-case
$font-size-root: 16px; $font-size-root: 16px;
$font-size-base: 1rem; $font-size-base: 1rem;

2213
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -24,27 +24,27 @@
}, },
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
"@release-it/bumper": "^1.0.5", "@release-it/bumper": "^1.1.0",
"@typescript-eslint/eslint-plugin": "^2.18.0", "@typescript-eslint/eslint-plugin": "^2.24.0",
"@typescript-eslint/parser": "^2.18.0", "@typescript-eslint/parser": "^2.24.0",
"auto-changelog": "^1.16.2", "auto-changelog": "^1.16.2",
"concurrently": "^5.1.0", "concurrently": "^5.1.0",
"cypress": "^3.8.3", "cypress": "^4.2.0",
"cypress-log-to-output": "^1.0.7", "cypress-log-to-output": "^1.0.8",
"eslint": "^6.8.0", "eslint": "^6.8.0",
"eslint-config-oceanprotocol": "^1.5.0", "eslint-config-oceanprotocol": "^1.5.0",
"eslint-config-prettier": "^6.10.0", "eslint-config-prettier": "^6.10.0",
"eslint-plugin-cypress": "^2.8.1", "eslint-plugin-cypress": "^2.10.3",
"eslint-plugin-prettier": "^3.1.2", "eslint-plugin-prettier": "^3.1.2",
"prettier": "^1.19.1", "prettier": "^1.19.1",
"prettier-stylelint": "^0.4.2", "prettier-stylelint": "^0.4.2",
"release-it": "^12.4.3", "release-it": "^13.1.1",
"start-server-and-test": "^1.10.8", "start-server-and-test": "^1.10.10",
"stylelint": "^13.0.0", "stylelint": "^13.2.1",
"stylelint-config-bigchaindb": "^1.2.2", "stylelint-config-bigchaindb": "^1.2.2",
"stylelint-config-css-modules": "^2.2.0", "stylelint-config-css-modules": "^2.2.0",
"stylelint-config-standard": "^19.0.0", "stylelint-config-standard": "^20.0.0",
"typescript": "^3.7.5" "typescript": "^3.8.3"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

1409
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" "coverage": "cat coverage/lcov.info | codacy-coverage --token 8801f827fe1144ffa85cd7da94f2bbf7"
}, },
"dependencies": { "dependencies": {
"@sendgrid/mail": "^6.5.1", "@sendgrid/mail": "^6.5.5",
"body-parser": "^1.18.3", "body-parser": "^1.19.0",
"compression": "^1.7.4", "compression": "^1.7.4",
"debug": "^4.1.1", "debug": "^4.1.1",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"express": "^4.17.1", "express": "^4.17.1",
"express-validator": "^6.3.1", "express-validator": "^6.4.0",
"morgan": "^1.9.1", "morgan": "^1.9.1",
"request": "^2.88.0" "request": "^2.88.2"
}, },
"devDependencies": { "devDependencies": {
"@types/body-parser": "^1.17.1", "@types/body-parser": "^1.19.0",
"@types/compression": "^1.0.1", "@types/compression": "^1.7.0",
"@types/debug": "^4.1.5", "@types/debug": "^4.1.5",
"@types/express": "^4.17.2", "@types/express": "^4.17.3",
"@types/jest": "^24.9.1", "@types/jest": "^25.1.4",
"@types/morgan": "^1.7.37", "@types/morgan": "^1.9.0",
"@types/node": "^13.5.3", "@types/node": "^13.9.2",
"@types/request": "^2.48.4", "@types/request": "^2.48.4",
"@types/supertest": "^2.0.8", "@types/supertest": "^2.0.8",
"jest": "24.9.0", "jest": "24.9.0",
"nodemon": "^2.0.2", "nodemon": "^2.0.2",
"supertest": "^4.0.2", "supertest": "^4.0.2",
"ts-jest": "24.3.0", "ts-jest": "24.3.0",
"ts-node": "^8.6.2", "ts-node": "^8.7.0",
"typescript": "^3.7.5" "typescript": "^3.8.3"
}, },
"repository": { "repository": {
"type": "git", "type": "git",