From 550739576b04635035e2bcc0b24e3285356a7ae8 Mon Sep 17 00:00:00 2001 From: Gustaf Dalemar Date: Thu, 20 Apr 2017 16:47:18 +0200 Subject: [PATCH 1/2] Use the new standalone prop-types package This makes this module compatible with React 15.5. Version range for React has also been updated to work with this package. --- package.json | 5 +++-- src/RedialContainer.js | 3 ++- src/RedialContext.js | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 357d410..45459a5 100644 --- a/package.json +++ b/package.json @@ -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" }, @@ -66,6 +66,7 @@ "redial": "^0.5.0" }, "dependencies": { - "lodash.isplainobject": "4.0.4" + "lodash.isplainobject": "4.0.4", + "prop-types": "^15.5.8" } } diff --git a/src/RedialContainer.js b/src/RedialContainer.js index 59b9479..97aca9f 100755 --- a/src/RedialContainer.js +++ b/src/RedialContainer.js @@ -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 { diff --git a/src/RedialContext.js b/src/RedialContext.js index 9efc0c5..196af12 100755 --- a/src/RedialContext.js +++ b/src/RedialContext.js @@ -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'; From 034f9c812f0fe88ab9965e50ee91dc68a461df89 Mon Sep 17 00:00:00 2001 From: Gustaf Dalemar Date: Thu, 20 Apr 2017 16:48:17 +0200 Subject: [PATCH 2/2] Updated examples to be compatible with React 15.5 --- examples/named-components/package.json | 6 +++--- examples/redux/package.json | 6 +++--- examples/simple-with-scroll/components/App.js | 3 ++- examples/simple-with-scroll/package.json | 7 ++++--- examples/simple/components/App.js | 3 ++- examples/simple/components/Github.js | 3 ++- examples/simple/package.json | 7 ++++--- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/examples/named-components/package.json b/examples/named-components/package.json index 3b47eb0..508b6b9 100644 --- a/examples/named-components/package.json +++ b/examples/named-components/package.json @@ -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" }, diff --git a/examples/redux/package.json b/examples/redux/package.json index 2bcdaf7..2991103 100644 --- a/examples/redux/package.json +++ b/examples/redux/package.json @@ -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", diff --git a/examples/simple-with-scroll/components/App.js b/examples/simple-with-scroll/components/App.js index 943588b..1ba12b7 100644 --- a/examples/simple-with-scroll/components/App.js +++ b/examples/simple-with-scroll/components/App.js @@ -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 { diff --git a/examples/simple-with-scroll/package.json b/examples/simple-with-scroll/package.json index c5d01c6..ed764b8 100644 --- a/examples/simple-with-scroll/package.json +++ b/examples/simple-with-scroll/package.json @@ -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" diff --git a/examples/simple/components/App.js b/examples/simple/components/App.js index e8c4e89..d19667a 100644 --- a/examples/simple/components/App.js +++ b/examples/simple/components/App.js @@ -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 { diff --git a/examples/simple/components/Github.js b/examples/simple/components/Github.js index 03f065c..f36aae4 100644 --- a/examples/simple/components/Github.js +++ b/examples/simple/components/Github.js @@ -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 { diff --git a/examples/simple/package.json b/examples/simple/package.json index 3b47eb0..6688f8e 100644 --- a/examples/simple/package.json +++ b/examples/simple/package.json @@ -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" },