Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 7f2cce9

Browse files
author
Tian, ShaoQin
committed
upgrade to react-redux 6, and redux-form 8
1 parent cf728e1 commit 7f2cce9

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

‎client/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"bootstrap": "^4.1.3",
2121
"chart.js": "^2.7.3",
2222
"classnames": "^2.2.6",
23-
"connected-react-router": "^5.0.1",
23+
"connected-react-router": "^6.0.0",
2424
"core-js": "^2.5.7",
2525
"enzyme": "^3.7.0",
2626
"enzyme-adapter-react-16": "^1.7.0",
@@ -42,7 +42,7 @@
4242
"react-chartjs-2": "^2.7.2",
4343
"react-datepicker": "^2.0.0",
4444
"react-dom": "^16.6.3",
45-
"react-redux": "^5.1.0",
45+
"react-redux": "^6.0.0",
4646
"react-redux-loading-bar": "^4.0.5",
4747
"react-router-config": "^4.4.0-beta.6",
4848
"react-router-dom": "^4.3.1",
@@ -52,7 +52,7 @@
5252
"react-toastify": "^4.1.0",
5353
"reactstrap": "^6.5.0",
5454
"redux": "^4.0.0",
55-
"redux-form": "^7.4.2",
55+
"redux-form": "^8.0.4",
5656
"redux-logger": "^3.0.6",
5757
"redux-promise-middleware": "^5.1.1",
5858
"redux-saga": "^0.16.0",

‎client/src/utils/injectSaga.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
33
import hoistNonReactStatics from 'hoist-non-react-statics';
4-
4+
import{ReactReduxContext}from'react-redux'
55
import getInjectors from './sagaInjectors';
66

77
/**
@@ -19,9 +19,9 @@ export default ({ key, saga, mode }) => WrappedComponent => {
1919
class InjectSaga extends React.Component {
2020
static WrappedComponent = WrappedComponent;
2121

22-
static contextTypes = {
22+
/*static contextTypes = {
2323
store: PropTypes.object.isRequired,
24-
};
24+
};*/
2525

2626
static displayName = `withSaga(${WrappedComponent.displayName ||
2727
WrappedComponent.name ||
@@ -46,5 +46,7 @@ export default ({ key, saga, mode }) => WrappedComponent => {
4646
}
4747
}
4848

49+
InjectSaga.contextType = ReactReduxContext;
50+
4951
return hoistNonReactStatics(InjectSaga, WrappedComponent);
5052
};

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /