Version v1.4.0-rc.3 (prescottprue#128) (prescottprue#134)

* Switched back to importing PropTypes from react due to (prescottprue#128)
* Roadmap updated with population features coming in `v1.5.0`

Author: prescottprue

README.md

@@ -110,8 +110,7 @@ const store = createStoreWithFirebase(rootReducer, initialState)
 
 In components:
 ```javascript
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
+import React, { Component, PropTypes } from 'react'
 import { connect } from 'react-redux'
 import {
   firebaseConnect,

docs/api/helpers.md

@@ -9,8 +9,7 @@ Detect whether items are loaded yet or not
 **Examples**
 
 ```javascript
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
+import React, { Component, PropTypes } from 'react'
 import { connect } from 'react-redux'
 import { firebaseConnect, isLoaded, dataToJS } from 'react-redux-firebase'
 ```
@@ -29,8 +28,7 @@ Detect whether items are empty or not
 **Examples**
 
 ```javascript
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
+import React, { Component, PropTypes } from 'react'
 import { connect } from 'react-redux'
 import { firebaseConnect, isEmpty, dataToJS } from 'react-redux-firebase'
 ```

docs/recipes/auth.md

@@ -5,8 +5,7 @@
 Here is an example of a component that shows a Google login button if the user is not logged in, and a welcome message if they are. The initial loading state is handled with a simple "loading" message
 
 ```js
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
+import React, { Component, PropTypes } from 'react'
 import GoogleButton from 'react-google-button'
 import { connect } from 'react-redux'
 import {

docs/roadmap.md

@@ -1,15 +1,16 @@
 # Roadmap
 
-## Recent Minor Version (`v1.4.0`)
+## Current Minor Version (`v1.4.0`)
+
+**NOTE**: `v1.4.0` is still in pre-release, please check the [releases page](https://github.com/prescottprue/react-redux-firebase/releases) for the most up to date release information
 
 #### Features
 * `react-native` support (including [complete example](https://github.com/prescottprue/react-redux-firebase/tree/v1.4.0-beta/examples/complete/react-native) app as well as a [create your own recipe](/docs/recipes/react-native.md))
-* Server Side Rendering Support ([#72](https://github.com/prescottprue/react-redux-firebase/issues/72))
-* Support for Boilerplates ([#53](https://github.com/prescottprue/react-redux-firebase/issues/53))
-* Use `prop-types` package instead of `React.PropTypes` [#122](https://github.com/prescottprue/react-redux-firebase/pull/122) - thanks [@petetnt](https://github.com/petetnt)
+* Server Side Rendering Support - [#72](https://github.com/prescottprue/react-redux-firebase/issues/72)
+* Support for Boilerplates  - [#53](https://github.com/prescottprue/react-redux-firebase/issues/53)
 * `pushWithMeta`, `setWithMeta`, and `updateWithMeta` methods added - write to firebase with createdAt/updatedAt and createdBy/updatedBy
-* Fix for `unWatchEvent` helper dispatch mapping (#82)
-* `populatedDataToJS` triggers `isLoaded` to be true only when all data is populated (instead of once for unpopulated data) [#121](https://github.com/prescottprue/react-redux-firebase/issues/121)
+* Fix for `unWatchEvent` helper dispatch mapping - #82
+* `populatedDataToJS` triggers `isLoaded` to be true only when all data is populated (instead of once for unpopulated data) - [#121](https://github.com/prescottprue/react-redux-firebase/issues/121)
 * Support for `provider.setCustomParameters` on external auth providers (i.e. `provider.setCustomParameters({ prompt: 'select_account' })`)
 * `notParsed` query param option added for not parsing when using `equalTo` (for searching numbers stored as strings)
 * `profileParamsToPopulate` now works for `$key: true` lists - thanks [@fej-snikduj](https://github.com/fej-snikduj)
@@ -21,22 +22,25 @@
   * Todos list only displays first 8 (first at the top) - shows using ordering query params
   * Most main routes are now sync (more simple)
 * Firebase Library dependency updated to [`v3.9.0`](https://firebase.google.com/support/release-notes/js)
-* Fix for `unWatchEvent` helper dispatch mapping ([#82](https://github.com/prescottprue/react-redux-firebase/issues/82))
-* Firebase version is no longer fixed ([#109](https://github.com/prescottprue/react-redux-firebase/issues/109))
+* Fix for `unWatchEvent` helper dispatch mapping  - [#82](https://github.com/prescottprue/react-redux-firebase/issues/82)
+* Firebase version is no longer fixed  - [#109](https://github.com/prescottprue/react-redux-firebase/issues/109)
 * Only used parts of Firebase Library imported (shrinks bundle size)
-* `build:size` npm script added to generate size report for minified bundle ([#107](https://github.com/prescottprue/react-redux-firebase/issues/107))
-* `user` and `credential` are now returned from login method ([#106](https://github.com/prescottprue/react-redux-firebase/issues/106))
+* `build:size` npm script added to generate size report for minified bundle - [#107](https://github.com/prescottprue/react-redux-firebase/issues/107)
+* `user` and `credential` are now returned from login method  - [#106](https://github.com/prescottprue/react-redux-firebase/issues/106)
 * `yarn.lock` file added
 * Compose tests improved promise handling (better use of chai-as-promised)
 * Fix `profileParamsToPopulate` with `key: true` lists - thanks [@fej-snikduj](https://github.com/fej-snikduj)
 
 
 ## Next Minor Version (`v1.5.0`)
-* Setting that allows for `waitForPopulate` to be turned off (i.e. return populated data as in becomes available). As of `v1.4.0-rc.2`, populate only sets `isLoaded` to true after all children are loaded ([#121](https://github.com/prescottprue/react-redux-firebase/issues/121)), `waitForPopulate` would make this optional.
+* Use `prop-types` package instead of `React.PropTypes` - [#122](https://github.com/prescottprue/react-redux-firebase/pull/122) - thanks [@petetnt](https://github.com/petetnt)
+* New Features for Population - [#132](https://github.com/prescottprue/react-redux-firebase/pull/132) - thanks [@javamonn](https://github.com/javamonn)
+  * Lodash supported path syntax for `populates.child`
+  * Dynamic populates configurations (passing a function that generates populates config based on top level `(key, item)` tuple)
+  * Use `storeAs` with populates - [#130](https://github.com/prescottprue/react-redux-firebase/issues/130)
 * `updateUser` method for updating currently authenticated user's user object (`/users/${uid}`)
-* `updateAuth` method for updating currently authenticated user's auth object [as seen in the Firebase docs](https://firebase.google.com/docs/auth/web/manage-users#get_a_users_provider-specific_profile_information)
-* Option to not remove all data on logout (potential config syntax: `preserveOnLogout: ['todos']`)
-* Option for populated items updating when changed ([#69](https://github.com/prescottprue/react-redux-firebase/issues/69))
+* `updateAuth` method for updating currently authenticated user's auth object [as seen in the Firebase docs](https://firebase.google.com/docs/auth/web/manage-users#get_a_users_provider-specific_profile_information) - [#129](https://github.com/prescottprue/react-redux-firebase/issues/129)
+* Setting that allows for `waitForPopulate` to be turned off (i.e. return populated data as in becomes available). As of `v1.4.0-rc.2`, populate only sets `isLoaded` to true after all children are loaded, `waitForPopulate` would make this optional - [#121](https://github.com/prescottprue/react-redux-firebase/issues/121)
 
 ## Future Minor Versions (`v1.6.0 - v1.*.*`)
 
@@ -46,9 +50,11 @@
  *None Yet Planned*
 
 #### Features
+* Config option for populated items updating when changed - [#69](https://github.com/prescottprue/react-redux-firebase/issues/69)
+* Config option to not remove all data on logout (potential config syntax: `preserveOnLogout: ['todos']`)
 * Integration for [`react-native-firebase`](https://github.com/invertase/react-native-firebase) for using Firebase native modules instead of JS library
 * Integration for [`react-native-google-signin`](https://github.com/devfd/react-native-google-signin) to simplify react-native authentication implementation
-* Nested populates ([#85](https://github.com/prescottprue/react-redux-firebase/issues/85))
+* Nested populates - [#85](https://github.com/prescottprue/react-redux-firebase/issues/85)
 
 #### Enhancements/Fixes
  *None Yet Planned*
@@ -65,20 +71,20 @@
 * 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)
+  * Improved rendering/update performance for `react` - [#84](https://github.com/prescottprue/react-redux-firebase/issues/84)
 
 #### Features
 * `react-native` index file referenced in `package.json` that makes it no longer necessary to pass `ReactNative` in config
 * `AuthRequired` decorator (or decorator factory) that forces auth to exist before rendering component
-* Possibility of delayed initialization as mentioned in [#70](https://github.com/prescottprue/react-redux-firebase/issues/70) (more research needed)
+* Possibility of delayed initialization - [#70](https://github.com/prescottprue/react-redux-firebase/issues/70) (more research needed)
 
 #### Enhancements/Fixes
 * 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)
-* `geoFire` integration described in [#32](https://github.com/prescottprue/react-redux-firebase/issues/32)
 * Optional Built in Role Management
 * Multi-level population
 * Population rules suggestion/generation
+* Routing decorators (most likely to include `@AuthRequired`, `@DataLoaded` and `@RedirectOnAuth`)
+* `firebase-admin` integration - [#22](https://github.com/prescottprue/react-redux-firebase/issues/22)
+* `geoFire` integration - [#32](https://github.com/prescottprue/react-redux-firebase/issues/32)

examples/complete/material/package.json

@@ -62,7 +62,6 @@
     "lodash": "^4.17.2",
     "material-ui": "0.16.0",
     "normalize.css": "^4.1.1",
-    "prop-types": "^15.5.8",
     "react": "15.3.2",
     "react-dom": "15.3.2",
     "react-google-button": "^0.1.0",

examples/complete/material/src/components/LoadingSpinner/LoadingSpinner.js

@@ -1,5 +1,4 @@
-import React from 'react'
-import PropTypes from 'prop-types'
+import React, { PropTypes } from 'react'
 import CircularProgress from 'material-ui/CircularProgress'
 import classes from './LoadingSpinner.scss'
 

examples/complete/material/src/components/TextField/TextField.js

@@ -1,5 +1,4 @@
-import React from 'react'
-import PropTypes from 'prop-types'
+import React, { PropTypes } from 'react'
 import MaterialTextField from 'material-ui/TextField'
 
 export const TextField = ({ input, label, meta: { touched, error }, ...custom }) => (

examples/complete/material/src/containers/App/App.js

@@ -1,5 +1,4 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
+import React, { Component, PropTypes } from 'react'
 import { browserHistory, Router } from 'react-router'
 import { Provider } from 'react-redux'
 

examples/complete/material/src/containers/Navbar/Navbar.js

@@ -1,5 +1,4 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
+import React, { Component, PropTypes } from 'react'
 import classes from './Navbar.scss'
 import { Link } from 'react-router'
 import { connect } from 'react-redux'

examples/complete/material/src/routes/Account/components/AccountForm/AccountForm.js

@@ -1,5 +1,4 @@
-import React from 'react'
-import PropTypes from 'prop-types'
+import React, { PropTypes } from 'react'
 import { Field, reduxForm } from 'redux-form'
 import RaisedButton from 'material-ui/RaisedButton'
 import TextField from 'components/TextField'