Skip to content

Commit

Permalink
Merge pull request #54 from environment-agency-austria/chore/update-d…
Browse files Browse the repository at this point in the history
…ependencies

Updated dependencies
  • Loading branch information
maschino authored Dec 11, 2019
2 parents 9f5592d + c482c4f commit 3cc6496
Show file tree
Hide file tree
Showing 5 changed files with 2,366 additions and 1,864 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "oceanjs"
"extends": "react-app"
}
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "8"
- "lts/*"
cache:
yarn: true

Expand All @@ -12,7 +12,6 @@ jobs:
- script: jest --coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage
name: "Produce coverage"
- stage: Build
node_js: "8"
name: "Rollup build"
script: "yarn build"
deploy:
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
"language": "typescriptreact",
"autoFix": true
}
]
],
"typescript.tsdk": "node_modules\\typescript\\lib"
}
60 changes: 32 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,39 +24,43 @@
"react-ocean-forms": "^2.0.0"
},
"devDependencies": {
"@types/enzyme": "^3.9.1",
"@types/enzyme": "^3.10.4",
"@types/enzyme-adapter-react-16": "^1.0.5",
"@types/jest": "^24.0.11",
"@types/react": "^16.8.13",
"@types/react-intl": "^2.3.17",
"@typescript-eslint/eslint-plugin": "^1.6.0",
"@typescript-eslint/parser": "^1.6.0",
"coveralls": "^3.0.3",
"enzyme": "^3.9.0",
"enzyme-adapter-react-16": "^1.12.1",
"enzyme-to-json": "^3.3.5",
"eslint": "^5.16.0",
"eslint-config-oceanjs": "^1.1.0",
"eslint-plugin-react": "^7.12.4",
"eslint-plugin-react-hooks": "^1.6.0",
"jest": "^24.7.1",
"@types/jest": "^24.0.23",
"@types/react": "^16.9.16",
"@types/react-intl": "^2.3.18",
"@typescript-eslint/eslint-plugin": "^2.11.0",
"@typescript-eslint/parser": "^2.11.0",
"babel-eslint": "^10.0.3",
"coveralls": "^3.0.9",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.15.1",
"enzyme-to-json": "^3.4.3",
"eslint": "^6.7.2",
"eslint-config-react-app": "^5.1.0",
"eslint-plugin-flowtype": "^4.5.2",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.17.0",
"eslint-plugin-react-hooks": "^2.3.0",
"jest": "^24.9.0",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-intl": "^2.8.0",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-intl": "^2.9.0",
"react-ocean-forms": "^2.2.0",
"rollup": "^1.10.0",
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-filesize": "^6.0.1",
"rollup-plugin-node-resolve": "^4.2.3",
"rollup-plugin-typescript2": "^0.20.1",
"ts-jest": "^24.0.2",
"ts-loader": "^5.3.3",
"typescript": "^3.4.3"
"rollup": "^1.27.10",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-filesize": "^6.2.1",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-typescript2": "^0.25.3",
"ts-jest": "^24.2.0",
"ts-loader": "^6.2.1",
"typescript": "^3.7.3"
},
"resolutions": {
"@types/react": "16.8.13",
"@types/enzyme": "3.9.1"
"@types/react": "16.9.16",
"@types/enzyme": "3.10.4"
},
"files": [
"build/"
Expand Down
Loading

0 comments on commit 3cc6496

Please sign in to comment.