From 1fd640fed569261bf40f08fb02ec5d60263d5aa0 Mon Sep 17 00:00:00 2001 From: Kyle Odell Date: Tue, 24 Oct 2017 13:26:53 -0400 Subject: [PATCH] [#289] Use independent 'prop-types' package. React.PropTypes is deprecated from React@15.5 --- examples/basic/index.js | 3 ++- examples/server-rendering/components.js | 3 ++- package.json | 1 + src/ReduxRouter.js | 3 ++- src/__tests__/ReduxRouter-test.js | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/examples/basic/index.js b/examples/basic/index.js index 08b6cf8..e131a8f 100644 --- a/examples/basic/index.js +++ b/examples/basic/index.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; import { createStore, compose, combineReducers } from 'redux'; diff --git a/examples/server-rendering/components.js b/examples/server-rendering/components.js index 94e0486..182c045 100644 --- a/examples/server-rendering/components.js +++ b/examples/server-rendering/components.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import {connect} from 'react-redux'; import {Link} from 'react-router'; diff --git a/package.json b/package.json index ea98974..4ab3165 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "mocha": "^2.2.5", "mocha-jsdom": "^1.0.0", "node-libs-browser": "^0.5.2", + "prop-types": "^15.6.0", "react": "^0.14.1", "react-addons-test-utils": "^0.14.1", "react-dom": "^0.14.1", diff --git a/src/ReduxRouter.js b/src/ReduxRouter.js index 7b65dda..284cbbf 100644 --- a/src/ReduxRouter.js +++ b/src/ReduxRouter.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { RouterContext as DefaultRoutingContext } from 'react-router'; import { createRouterObject } from 'react-router/lib/RouterUtils'; diff --git a/src/__tests__/ReduxRouter-test.js b/src/__tests__/ReduxRouter-test.js index f8bcaed..9656097 100644 --- a/src/__tests__/ReduxRouter-test.js +++ b/src/__tests__/ReduxRouter-test.js @@ -7,7 +7,8 @@ import { import * as server from '../server'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { renderToString } from 'react-dom/server'; import { renderIntoDocument,