Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion examples/basic/index.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 ReactDOM from 'react-dom';
import { createStore, compose, combineReducers } from 'redux';

Expand Down
3 changes: 2 additions & 1 deletion examples/server-rendering/components.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 {connect} from 'react-redux';
import {Link} from 'react-router';

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion src/ReduxRouter.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 { connect } from 'react-redux';
import { RouterContext as DefaultRoutingContext } from 'react-router';
import { createRouterObject } from 'react-router/lib/RouterUtils';
Expand Down
3 changes: 2 additions & 1 deletion src/__tests__/ReduxRouter-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down