Skip to content

Commit

Permalink
Merge pull request #53 from ProjectMirador/update-for-react-17
Browse files Browse the repository at this point in the history
Update dependencies and support for React 17
  • Loading branch information
cbeer authored Apr 9, 2021
2 parents 4f13678 + afaeaf0 commit 7281f75
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"test:watch": "jest --watch"
},
"dependencies": {
"@psychobolt/react-paperjs": "< 1.0",
"@psychobolt/react-paperjs-editor": "0.0.11",
"@psychobolt/react-paperjs": "^1.0.0",
"@psychobolt/react-paperjs-editor": "^0.0.14",
"draft-js": "^0.11.6",
"draft-js-export-html": "^1.4.1",
"draft-js-import-html": "^1.4.1",
Expand All @@ -38,8 +38,8 @@
"lodash": "^4.17.11",
"mirador": "^3.0.0-rc.5",
"prop-types": "^15.7.2",
"react": "^16.0",
"react-dom": "^16.0",
"react": "^17.0",
"react-dom": "^17.0",
"uuid": "^8.0.0"
},
"devDependencies": {
Expand All @@ -49,14 +49,14 @@
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.56",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.0",
"babel-eslint": "^10.1.0",
"canvas": "^2.6.1",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"eslint": "^6.8.0",
"eslint": "^7.2",
"eslint-config-airbnb": "^18.2.0",
"eslint-config-react-app": "^5.2.1",
"eslint-plugin-flowtype": "^4.7.0",
"eslint-config-react-app": "^6.0.0",
"eslint-plugin-flowtype": "^5.6.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jest": "^23.18.0",
"eslint-plugin-jsx-a11y": "^6.3.1",
Expand All @@ -68,8 +68,8 @@
"mirador": "^3.0.0-rc.5",
"nwb": "^0.24.7",
"prop-types": "^15.7.2",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react": "^17.0",
"react-dom": "^17.0",
"uuid": "^8.2.0"
},
"author": "",
Expand Down
2 changes: 1 addition & 1 deletion setupJest.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Enzyme from 'enzyme'; // eslint-disable-line import/no-extraneous-dependencies
import Adapter from 'enzyme-adapter-react-16'; // eslint-disable-line import/no-extraneous-dependencies
import Adapter from '@wojtekmaj/enzyme-adapter-react-17'; // eslint-disable-line import/no-extraneous-dependencies

Enzyme.configure({ adapter: new Adapter() });

0 comments on commit 7281f75

Please sign in to comment.