Skip to content
This repository has been archived by the owner on Jul 4, 2018. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:cleverfranke/cf-kyt-starter-unive…
Browse files Browse the repository at this point in the history
…rsal-redux

* 'master' of github.com:cleverfranke/cf-kyt-starter-universal-redux:
  Updates Enzyme to remove deprecation warnings from the shallow test renderers
  Updates React router to version 3 which removes some PropTypes warnings Uses the seperate react-proptypes package to remove the other PropTypes warnings
  • Loading branch information
Jan Hoogeveen committed May 10, 2017
2 parents 264e606 + 5f6939a commit 7d34748
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ coverage
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release
build

# Dependency directory
node_modules
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -68,11 +68,13 @@
"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",
"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",
Expand Down
3 changes: 2 additions & 1 deletion src/components/Count/index.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/containers/App/index.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/containers/Redux/index.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down

0 comments on commit 7d34748

Please sign in to comment.