Skip to content
This repository has been archived by the owner on Sep 1, 2020. It is now read-only.

Commit

Permalink
Merge pull request #101 from DPr00f/master
Browse files Browse the repository at this point in the history
[Improvement] Got rid of React 15.5.x deprecation warning
  • Loading branch information
vkbansal authored Apr 17, 2017
2 parents 8658d04 + 30c8119 commit d2b16d8
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
},
"peerDependencies": {
"react": "^0.14.0 || ^15.0.0",
"react-dom": "^0.14.0 || ^15.0.0"
"react-dom": "^0.14.0 || ^15.0.0",
"prop-types": "^15.0.0"
},
"devDependencies": {
"babel-cli": "^6.24.0",
Expand Down Expand Up @@ -72,10 +73,11 @@
"http-server": "^0.9.0",
"jest": "^19.0.2",
"jsdom": "^9.12.0",
"react": "^15.4.2",
"react-addons-test-utils": "^15.4.2",
"react-dom": "^15.4.2",
"react-router-dom": "^4.0.0",
"react": "^15.5.4",
"react-addons-test-utils": "^15.5.1",
"react-dom": "^15.5.4",
"react-router-dom": "^4.1.1",
"prop-types": "^15.5.8",
"rimraf": "^2.6.1",
"webpack": "^2.3.2"
},
Expand Down
3 changes: 2 additions & 1 deletion src/ContextMenu.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';
import assign from 'object-assign';

Expand Down
3 changes: 2 additions & 1 deletion src/ContextMenuTrigger.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';
import assign from 'object-assign';

Expand Down
3 changes: 2 additions & 1 deletion src/MenuItem.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes, Component } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';
import assign from 'object-assign';

Expand Down
3 changes: 2 additions & 1 deletion src/SubMenu.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import cx from 'classnames';

import { cssClasses, hasOwnProp } from './helpers';
Expand Down

0 comments on commit d2b16d8

Please sign in to comment.