Skip to content

Commit

Permalink
Merge f8786f8 into f1e4985
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelmokos committed Jul 2, 2018
2 parents f1e4985 + f8786f8 commit e8ff4fc
Show file tree
Hide file tree
Showing 7 changed files with 439 additions and 310 deletions.
5 changes: 5 additions & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,8 @@ extends:

rules:
react/no-multi-comp: off
react/destructuring-assignment: off
react/sort-comp: off

# https://eslint.org/docs/rules/lines-between-class-members
lines-between-class-members: off
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,22 +88,22 @@
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react-app": "^3.1.1",
"coveralls": "^3.0.1",
"babel-preset-react-app": "^3.1.2",
"coveralls": "^3.0.2",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"enzyme-to-json": "^3.3.4",
"eslint": "^4.19.1",
"eslint-config-with-prettier": "^3.5.1",
"flow-bin": "^0.74.0",
"eslint": "^5.0.1",
"eslint-config-with-prettier": "^4.1.0",
"flow-bin": "^0.75.0",
"flow-coverage-report": "^0.5.0",
"flow-typed": "^2.4.0",
"husky": "^0.14.3",
"immutable": "^4.0.0-rc.9",
"jest": "^23.1.0",
"jest": "^23.2.0",
"lint-staged": "^7.2.0",
"lodash": "^4.17.10",
"prettier": "^1.13.5",
"prettier": "^1.13.7",
"prop-types": "^15.6.2",
"raf": "^3.4.0",
"react": "^16.4.1",
Expand All @@ -117,6 +117,6 @@
"redux-saga": "^0.16.0",
"redux-thunk": "^2.3.0",
"rimraf": "^2.6.2",
"size-limit": "^0.18.2"
"size-limit": "^0.18.3"
}
}
2 changes: 1 addition & 1 deletion src/configureStore.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {mount} from "enzyme";
import {compose, bindActionCreators} from "redux";
import {connect} from "react-redux";
import {put, takeLatest} from "redux-saga/effects";
import {configureStore, injectReducer, injectSaga} from "./";
import {configureStore, injectReducer, injectSaga} from ".";

const {describe, beforeAll, it, expect} = global;

Expand Down
1 change: 1 addition & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export {default as configureStore} from "./configureStore";
export {default as injectReducer} from "./utils/injectReducer";
export {default as injectSaga} from "./utils/injectSaga";
// eslint-disable-next-line import/named
export {default as injectConstants} from "./utils/constants";
1 change: 1 addition & 0 deletions src/utils/injectReducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export default ({key, reducer}) => WrappedComponent => {
WrappedComponent.name ||
"Component"})`;
static contextTypes = {
// eslint-disable-next-line react/forbid-prop-types
store: PropTypes.object.isRequired,
};

Expand Down
1 change: 1 addition & 0 deletions src/utils/injectSaga.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export default ({key, saga, mode}) => WrappedComponent => {
WrappedComponent.name ||
"Component"})`;
static contextTypes = {
// eslint-disable-next-line react/forbid-prop-types
store: PropTypes.object.isRequired,
};

Expand Down

0 comments on commit e8ff4fc

Please sign in to comment.