From ee523b91efc53eb1c5e0c641ce0ece6c2a27fa6a Mon Sep 17 00:00:00 2001 From: Jan Hoogeveen Date: Wed, 10 May 2017 16:03:17 +0200 Subject: [PATCH 1/2] Updates React router to version 3 which removes some PropTypes warnings Uses the seperate react-proptypes package to remove the other PropTypes warnings --- .gitignore | 2 +- package.json | 5 +++-- src/components/Count/index.js | 3 ++- src/containers/App/index.js | 3 ++- src/containers/Redux/index.js | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 06c1a63..514103a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ coverage .lock-wscript # Compiled binary addons (http://nodejs.org/api/addons.html) -build/Release +build # Dependency directory node_modules diff --git a/package.json b/package.json index bcb352a..a9f5749 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "react-dom": "~15.5.4", "react-helmet": "~5.0.2", "react-redux": "~5.0.3", - "react-router": "~2.8.1", + "react-router": "~3.0.5", "react-router-redux": "~4.0.8", "redux": "~3.6.0", "redux-promise-middleware": "~4.2.0", @@ -68,8 +68,9 @@ "babel-preset-kyt-react": "~0.2.0", "enzyme": "~2.8.0", "eslint": "~3.19.0", - "kyt": "~0.5.2", + "kyt": "~0.5.5", "nightmare": "~2.10.0", + "prop-types": "^15.5.9", "react-addons-perf": "~15.4.2", "react-addons-test-utils": "~15.5.1", "react-svg-loader": "~1.1.1", diff --git a/src/components/Count/index.js b/src/components/Count/index.js index 01eb133..23cb7dc 100644 --- a/src/components/Count/index.js +++ b/src/components/Count/index.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/src/containers/App/index.js b/src/containers/App/index.js index b24d9bb..d34d3b7 100644 --- a/src/containers/App/index.js +++ b/src/containers/App/index.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Link from 'react-router/lib/Link'; import IndexLink from 'react-router/lib/IndexLink'; import Helmet from 'react-helmet'; diff --git a/src/containers/Redux/index.js b/src/containers/Redux/index.js index 16bebaa..f764299 100644 --- a/src/containers/Redux/index.js +++ b/src/containers/Redux/index.js @@ -1,5 +1,5 @@ - -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import Helmet from 'react-helmet'; From 6b208757d7fc6840460b4ba81bd45afd6f656b4e Mon Sep 17 00:00:00 2001 From: Jan Hoogeveen Date: Wed, 10 May 2017 16:16:28 +0200 Subject: [PATCH 2/2] Updates Enzyme to remove deprecation warnings from the shallow test renderers --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index a9f5749..8b5fa01 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "react-addons-perf": "~15.4.2", "react-addons-test-utils": "~15.5.1", "react-svg-loader": "~1.1.1", + "react-test-renderer": "^15.5.4", "redux-devtools": "~3.4.0", "redux-devtools-dock-monitor": "~1.1.1", "redux-devtools-log-monitor": "~1.3.0",