Skip to content

Commit

Permalink
update react to 16.2
Browse files Browse the repository at this point in the history
- fix graphTitle propTypes

- test for Edge.jsx show a warning relating to svg tags:
  facebook/react#11899
  facebook/react#11023

  but they still pass
  • Loading branch information
aepyornis committed Feb 20, 2018
1 parent d12f925 commit 1cb4b34
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 23 deletions.
4 changes: 2 additions & 2 deletions app/components/GraphTitle.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ export default class GraphTitle extends Component {
}
}

GraphTitle.PropTypes = {
GraphTitle.propTypes = {
url: PropTypes.string,
title: PropTypes.string,
isEmbedded: PropTypes.boolean,
isEmbedded: PropTypes.bool,
embedded: PropTypes.object
}
46 changes: 30 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"classnames": "^2.2.0",
"lodash": "^4.17.4",
"prop-types": "^15.5.10",
"react": "^15.6.2",
"react": "^16.2.0",
"react-anything-sortable": "^1.7.2",
"react-color": "^2.11.7",
"react-custom-scrollbars": "^4.1.2",
"react-dom": "^15.6.2",
"react-dom": "^16.2.0",
"react-draggable": "^3.0.5",
"react-hotkeys": "^0.10.0",
"react-medium-editor": "^1.8.1",
Expand All @@ -51,11 +51,11 @@
"babel-preset-react": "^6.24.1",
"css-loader": "^0.28.9",
"enzyme": "^3.3.0",
"enzyme-adapter-react-15": "^1.0.5",
"enzyme-adapter-react-16": "^1.1.1",
"file-loader": "^1.1.8",
"http-server": "^0.11.1",
"jest-cli": "^22.4.0",
"react-test-renderer": "^15.5.4",
"react-test-renderer": "^16.2.0",
"redux-logger": "^3.0.6",
"sinon": "^4.3.0",
"style-loader": "^0.20.0",
Expand Down
2 changes: 1 addition & 1 deletion test/setup.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-15';
import Adapter from 'enzyme-adapter-react-16';
Enzyme.configure({ adapter: new Adapter() });


0 comments on commit 1cb4b34

Please sign in to comment.