Merge latest changes

CONTRIBUTING.md

@@ -0,0 +1,125 @@
+# Contributing
+We are open to, and grateful for, any contributions made by the community.  By contributing to Redux, you agree to abide by the [code of conduct](https://github.com/rackt/redux/blob/master/CODE_OF_CONDUCT.md).
+
+## Reporting Issues and Asking Questions
+Before opening an issue, please search the [issue tracker](https://github.com/rackt/redux/issues) to make sure your issue hasn't already been reported.
+
+Please ask any general and implementation specific questions on [Stack Overflow with a Redux tag](http://stackoverflow.com/questions/tagged/redux?sort=votes&pageSize=50) for support.
+
+## Development
+
+Visit the [Issue tracker](https://github.com/rackt/redux/issues) to find a list of open issues that need attention.
+
+Fork, then clone the repo:
+```
+git clone https://github.com/your-username/redux.git
+```
+
+### Building
+
+#### Build Redux
+
+Running the `build` task will create both a CommonJS module-per-module build and a UMD build.
+```
+npm run build
+```
+
+To create just a CommonJS module-per-module build:
+```
+npm run build:lib
+```
+
+To create just a UMD build:
+```
+npm run build:umd
+npm run build:umd:min
+```
+
+### Testing and Linting
+To run both linting and testing at once, run the following:
+```
+npm run check
+```
+
+To only run tests:
+```
+npm run test
+```
+
+To continuously watch and run tests, run the following:
+```
+npm run test:watch
+```
+
+To perform linting with `eslint`, run the following:
+```
+npm run lint
+```
+
+### Docs
+
+Improvements to the documentation are always welcome. In the docs we abide by typographic rules, so
+instead of ' you should use ’, same for “ ” and dashes (—) where appropriate. These rules only apply to the text, not to code blocks.
+
+#### Preparing to build the documentation
+To install the latest version of `gitbook` and prepare to build the documentation, run the following:
+```
+npm run docs:prepare
+```
+#### Building the documentation
+To build the documentation, run the following:
+```
+npm run docs:build
+```
+
+To watch and re-build documentation when changes occur, run the following:
+```
+npm run docs:watch
+```
+
+#### Publishing the documentation
+To publish the documentation, run the following:
+```
+npm run docs:publish
+```
+
+#### Cleaning up built documentation
+To remove previously built documentation, run the following:
+```
+npm run docs:clean
+```
+
+### Examples
+Redux comes with [official examples](http://rackt.github.io/redux/docs/introduction/Examples.html) to demonstrate various concepts and best practices.
+
+When adding a new example, please adhere to the style and format of the existing examples, and try to reuse as much code as possible.  For example, `index.html`, `server.js`, and `webpack.config.js` can typically be reused. 
+
+>For ease of development, the webpack configs for the examples are set up so that the `redux` module is aliased to the project `src` folder when inside of the Redux folder. If an example is moved out of the Redux folder, they will instead use the version of Redux from `node_modules`.
+
+#### Building and testing the examples
+To build and test the official Redux examples, run the following:
+```
+npm run build:examples
+npm run test:examples
+```
+
+Please visit the [Examples page](http://rackt.github.io/redux/docs/introduction/Examples.html) for information on running an individual example.
+
+###New Features
+Please open an issue with a proposal for a new feature or refactoring before starting on the work. We don't want you to waste your efforts on a pull request that we won't want to accept.
+
+###Style
+[rackt](https://github.com/rackt) is trying to keep a standard style across its various projects, which can be found over in [eslint-config-rackt](https://github.com/rackt/eslint-config-rackt). If you have a style change proposal, it should first be proposed there. If accepted, we will be happy to accept a PR to implement it here.
+
+## Submitting Changes
+* Open a new issue in the [Issue tracker](https://github.com/rackt/redux/issues).
+* Fork the repo.
+* Create a new feature branch based off the `master` branch.
+* Make sure all tests pass and there are no linting errors.
+* Submit a pull request, referencing any issues it addresses.
+
+Please try to keep your pull request focused in scope and avoid including unrelated commits.
+
+After you have submitted your pull request, we'll try to get back to you as soon as possible. We may suggest some changes or improvements.
+
+Thank you for contributing!

README.md

@@ -12,7 +12,10 @@ It is tiny (2kB) and has no dependencies.
 [![npm downloads](https://img.shields.io/npm/dm/redux.svg?style=flat-square)](https://www.npmjs.com/package/redux)
 [![redux channel on discord](https://img.shields.io/badge/discord-%23redux%20%40%20reactiflux-61dafb.svg?style=flat-square)](https://discord.gg/0ZcbPKXt5bZ6au5t)
 [![#rackt on freenode](https://img.shields.io/badge/irc-%23rackt%20%40%20freenode-61DAFB.svg?style=flat-square)](https://webchat.freenode.net/)
+[![Changelog #187](https://img.shields.io/badge/changelog-%23187-lightgrey.svg?style=flat-square)](https://changelog.com/187)
 
+>**New! Learn Redux from its creator:  
+>[Getting Started with Redux](https://egghead.io/series/getting-started-with-redux) (30 free videos)**
 
 ### Testimonials
 
@@ -111,6 +114,31 @@ If you’re coming from Flux, there is a single important difference you need to
 
 This architecture might seem like an overkill for a counter app, but the beauty of this pattern is how well it scales to large and complex apps. It also enables very powerful developer tools, because it is possible to trace every mutation to the action that caused it. You can record user sessions and reproduce them just by replaying every action.
 
+### Learn Redux from Its Creator
+
+[Getting Started with Redux](https://egghead.io/series/getting-started-with-redux) is a video course consisting of 30 videos narrated by Dan Abramov, author of Redux. It is designed to complement the “Basics” part of the docs while bringing additional insights about immutability, testing, Redux best practices, and using Redux with React. **This course is free and will always be.**
+
+>[“Great course on egghead.io by @dan_abramov - instead of just showing you how to use #redux, it also shows how and why redux was built!”](https://twitter.com/sandrinodm/status/670548531422326785)  
+>Sandrino Di Mattia
+
+>[“Plowing through @dan_abramov 'Getting Started with Redux' - its amazing how much simpler concepts get with video.”](https://twitter.com/chrisdhanaraj/status/670328025553219584)  
+>Chris Dhanaraj
+
+>[“This video series on Redux by @dan_abramov on @eggheadio is spectacular!”](https://twitter.com/eddiezane/status/670333133242408960)  
+>Eddie Zaneski
+
+>[“Come for the name hype. Stay for the rock solid fundamentals. (Thanks, and great job @dan_abramov and @eggheadio!)”](https://twitter.com/danott/status/669909126554607617)  
+>Dan
+
+>[“This series of videos on Redux by @dan_abramov is repeatedly blowing my mind - gunna do some serious refactoring”](https://twitter.com/gelatindesign/status/669658358643892224)  
+>Laurence Roberts
+
+So, what are you waiting for?
+
+#### [Watch the 30 Free Videos!](https://egghead.io/series/getting-started-with-redux) 
+
+If you enjoyed my course, consider supporting Egghead by [buying a subscription](https://egghead.io/pricing). Subscribers have access to the source code for the example in every one of my videos, as well as to tons of advanced lessons on other topics, including JavaScript in depth, React, Angular, and more. Many [Egghead instructors](https://egghead.io/instructors) are also open source library authors, so buying a subscription is a nice way to thank them for the work that they’ve done.
+
 ### Documentation
 
 * [Introduction](http://rackt.github.io/redux/docs/introduction/index.html)

docs/Troubleshooting.md

@@ -20,18 +20,20 @@ For example, a reducer like this is wrong because it mutates the state:
 ```js
 function todos(state = [], action) {
   switch (action.type) {
-  case 'ADD_TODO':
-    // Wrong! This mutates state
-    state.push({
-      text: action.text,
-      completed: false
-    })
-  case 'COMPLETE_TODO':
-    // Wrong! This mutates state[action.index].
-    state[action.index].completed = true
+    case 'ADD_TODO':
+      // Wrong! This mutates state
+      state.push({
+        text: action.text,
+        completed: false
+      })
+      return state
+    case 'COMPLETE_TODO':
+      // Wrong! This mutates state[action.index].
+      state[action.index].completed = true
+      return state
+    default:
+      return state
   }
-
-  return state
 }
 ```
 
@@ -43,7 +45,7 @@ function todos(state = [], action) {
     case 'ADD_TODO':
       // Return a new array
       return [
-        ...state, 
+        ...state,
         {
           text: action.text,
           completed: false