Skip to content

Commit

Permalink
Merge pull request #19 from dlmr/fix/use-standalone-prop-types
Browse files Browse the repository at this point in the history
Use standalone prop-types
  • Loading branch information
dlmr committed Apr 20, 2017
2 parents 5a80df7 + 034f9c8 commit 55a79e4
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 19 deletions.
6 changes: 3 additions & 3 deletions examples/named-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"isomorphic-fetch": "2.2.1",
"koa": "1.2.0",
"nunjucks": "2.4.2",
"react": "^15.0.2",
"react-dom": "^15.0.2",
"react-router": "^2.5.2",
"react": "^15.5.0",
"react-dom": "^15.5.0",
"react-router": "^3.0.5",
"react-router-redial": "^0.1.3",
"redial": "^0.5.0"
},
Expand Down
6 changes: 3 additions & 3 deletions examples/redux/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"isomorphic-fetch": "2.2.1",
"koa": "1.2.0",
"nunjucks": "2.4.2",
"react": "^15.0.2",
"react-dom": "^15.0.2",
"react-router": "^2.5.2",
"react": "^15.5.0",
"react-dom": "^15.5.0",
"react-router": "^3.0.5",
"react-router-redial": "^0.1.3",
"redial": "^0.5.0",
"redux-devtools": "3.2.0",
Expand Down
3 changes: 2 additions & 1 deletion examples/simple-with-scroll/components/App.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 { Link, IndexLink } from 'react-router';

export default class App extends Component {
Expand Down
7 changes: 4 additions & 3 deletions examples/simple-with-scroll/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
"isomorphic-fetch": "2.2.1",
"koa": "1.2.0",
"nunjucks": "2.4.2",
"react": "^15.0.2",
"react-dom": "^15.0.2",
"react-router": "^2.5.2",
"prop-types": "^15.5.8",
"react": "^15.5.0",
"react-dom": "^15.5.0",
"react-router": "^3.0.5",
"react-router-redial": "^0.1.3",
"react-router-scroll": "^0.3.2",
"redial": "^0.5.0"
Expand Down
3 changes: 2 additions & 1 deletion examples/simple/components/App.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 { Link, IndexLink } from 'react-router';

export default class App extends Component {
Expand Down
3 changes: 2 additions & 1 deletion examples/simple/components/Github.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 { withRouter } from 'react-router';

class Github extends Component {
Expand Down
7 changes: 4 additions & 3 deletions examples/simple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
"isomorphic-fetch": "2.2.1",
"koa": "1.2.0",
"nunjucks": "2.4.2",
"react": "^15.0.2",
"react-dom": "^15.0.2",
"react-router": "^2.5.2",
"prop-types": "^15.5.8",
"react": "^15.5.0",
"react-dom": "^15.5.0",
"react-router": "^3.0.5",
"react-router-redial": "^0.1.3",
"redial": "^0.5.0"
},
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"homepage": "https://github.com/dlmr/react-router-redial#readme",
"peerDependencies": {
"react": "*",
"react": "^0.14.9 || ^15.3.0",
"react-router": "^2.4.0 || ^3.0.0",
"redial": "^0.4.1 || ^0.5.0"
},
Expand Down Expand Up @@ -66,6 +66,7 @@
"redial": "^0.5.0"
},
"dependencies": {
"lodash.isplainobject": "4.0.4"
"lodash.isplainobject": "4.0.4",
"prop-types": "^15.5.8"
}
}
3 changes: 2 additions & 1 deletion src/RedialContainer.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 getRoutePath from './util/getRoutePath';

export default class RedialContainer extends Component {
Expand Down
3 changes: 2 additions & 1 deletion src/RedialContext.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* global __REDIAL_PROPS__ */

import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';

import triggerHooks from './triggerHooks';
import createMap from './createMap';
Expand Down

0 comments on commit 55a79e4

Please sign in to comment.