Finished removing rest of immutable stuff from reducer.

CONTRIBUTING.md

@@ -1,12 +1,12 @@
 # Contributing Guidelines
 
-Some basic conventions for contributing to this project.
+Thanks for taking the time to look into contributing! Below are some basic conventions for contributing to this project.
 
 ### General
 
-Please make sure that there aren't existing pull requests attempting to address the issue mentioned. Likewise, please check for issues related to update, as someone else may be working on the issue in a branch or fork.
+Please make sure that there aren't existing pull requests or [plans on the roadmap](http://react-redux-firebase.com/docs/roadmap.html) attempting to address the issue mentioned. Likewise, please check for issues related to update, as someone else may be working on the issue in a branch or fork.
 
-* Non-trivial changes should be discussed in an issue first
+* Non-trivial changes should be discussed in an issue or on [gitter](https://gitter.im/redux-firebase/Lobby) first
 * Develop in a topic branch, not master
 * Squash your commits
 

docs/roadmap.md

@@ -10,7 +10,7 @@
 * `INIT_BY_PATH` action type no longer exists (replaced with `UNSET_LISTENER`)
 * Action is no longer automatically fired when removing listeners (not enabled by default as it removes data from redux)
 
-### Enhancements
+### Features
 * Webpack 2 support (fixes [#64](https://github.com/prescottprue/react-redux-firebase/issues/64))
 * Helpers are available as imports from top level:
 ```js
@@ -29,28 +29,45 @@ import { pathToJS, dataToJS, populatedDataToJS } from 'react-redux-firebase'
 
 ## Upcoming Minor Version (`v1.4.0`)
 
-**Note:** These changes are subject to change
+**Note:** Subject to change
 
 #### Breaking Changes
  *None Yet Planned*
 
-#### Enhancements
+#### Features
+* `react-native` support
+* Server Side Rendering Support described in [#72](https://github.com/prescottprue/react-redux-firebase/issues/72))
 * Option for populated items updating when changed [#69](https://github.com/prescottprue/react-redux-firebase/issues/69)
 * Support for Boilerplates ([#53](https://github.com/prescottprue/react-redux-firebase/issues/53))
 
+## Future Minor Versions (`v1.*.*`)
+
+**Note:** Subject to change
+
+#### Breaking Changes
+ *None Yet Planned*
+
+#### Features
+* Nested populates [#85](https://github.com/prescottprue/react-redux-firebase/issues/85))
+
 ## Upcoming Major Version (`v2.0.0`)
 
 **NOTE:** The changes are unconfirmed and will most likely change
 
 #### Breaking Changes
 * Remove usage of Immutable Maps (no more need for `pathToJS()` and `dataToJS()` to load data from redux)
-* reducer split into multiple nested reducers (follows [standard for nesting of reducers using combine reducers](http://redux.js.org/docs/recipes/reducers/UpdatingNormalizedData.html))
+* reducer split into multiple nested reducers for a few reasons:
+  * follows [standard for nesting of reducers using combine reducers](http://redux.js.org/docs/recipes/reducers/UpdatingNormalizedData.html)).
+  * allows for separately importable reducers (for placing in other parts of redux other than `state.firebase`)
+  * Improved rendering/update performance for `react` as described in [#84](https://github.com/prescottprue/react-redux-firebase/issues/84)
 
-#### Enhancements
+#### Features
 * `AuthRequired` decorator (or decorator factory) that forces auth to exist before rendering component
-* Implement [`firebase-server`](https://github.com/urish/firebase-server) for tests instead of using demo firebase instance
 * Possibility of delayed initialization as mentioned in [#70](https://github.com/prescottprue/react-redux-firebase/issues/70) (more research needed)
 
+#### Enhancements
+* Implement [`firebase-server`](https://github.com/urish/firebase-server) for tests instead of using demo firebase instance
+
 ### Long Term Goals
 * Routing decorators (most likely to include `@AuthRequired`, `@DataLoaded` and `@RedirectOnAuth`)
 * `firebase-admin` integration described in [#22](https://github.com/prescottprue/react-redux-firebase/issues/22)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-redux-firebase",
-  "version": "1.3.3",
+  "version": "2.0.0-alpha",
   "description": "Redux integration for Firebase. Comes with a Higher Order Component for use with React.",
   "browser": "dist/react-redux-firebase.js",
   "main": "lib/index.js",

src/constants.js

@@ -13,6 +13,7 @@ export const actionsPrefix = '@@reactReduxFirebase'
  * @description Object containing all action types
  * @property {String} START - `@@reactReduxFirebase/START`
  * @property {String} SET - `@@reactReduxFirebase/SET`
+ * @property {String} SET_ORDERED - `@@reactReduxFirebase/SET_ORDERED`
  * @property {String} SET_PROFILE - `@@reactReduxFirebase/SET_PROFILE`
  * @property {String} LOGIN - `@@reactReduxFirebase/LOGIN`
  * @property {String} LOGOUT - `@@reactReduxFirebase/LOGOUT`