Skip to content

Commit 19d6168

Browse files
authored
Merge branch 'master' into feature/407
2 parents a0f5108 + faaacea commit 19d6168

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docs/Walkthrough.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ A store enhancer is a function that enhances the behavior of `createStore()`. Yo
7373

7474
The easiest way to apply several store enhancers in a row is to use the [`compose()`](http://redux.js.org/docs/api/compose.html) utility function that ships with Redux. It is the same `compose()` that you can find in Underscore and Lodash. In our case, we would use it to compose several store enhancers into one: `compose(applyMiddleware(m1, m2, m3), DevTools.instrument())`.
7575

76-
You can add aditional options to it: `DevTools.instrument({ maxAge: 50, shouldCatchErrors: true })`. See [`redux-devtools-instrument`'s API](https://github.com/zalmoxisus/redux-devtools-instrument#api) for more details.
76+
You can add additional options to it: `DevTools.instrument({ maxAge: 50, shouldCatchErrors: true })`. See [`redux-devtools-instrument`'s API](https://github.com/zalmoxisus/redux-devtools-instrument#api) for more details.
7777

7878
It’s important that you should add `DevTools.instrument()` *after* `applyMiddleware` in your `compose()` function arguments. This is because `applyMiddleware` is potentially asynchronous, but `DevTools.instrument()` expects all actions to be plain objects rather than actions interpreted by asynchronous middleware such as [redux-promise](https://github.com/acdlite/redux-promise) or [redux-thunk](https://github.com/gaearon/redux-thunk). So make sure `applyMiddleware()` goes first in the `compose()` call, and `DevTools.instrument()` goes after it.
7979

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"peerDependencies": {
6363
"react": "^0.14.9 || ^15.3.0 || ^16.0.0",
6464
"react-redux": "^4.0.0 || ^5.0.0",
65-
"redux": "^4.0.0"
65+
"redux": "^3.5.2 || ^4.0.0"
6666
},
6767
"dependencies": {
6868
"prop-types": "^15.5.7",

0 commit comments

Comments
 (0)