Merge branch 'master' into next

Author: Scott Prue

README.md

@@ -11,15 +11,14 @@
 
 [![Gitter][gitter-image]][gitter-url]
 
-
 > Redux bindings for Firebase. Includes Higher Order Component (HOC) for use with React.
 
 ## [Demo](https://demo.react-redux-firebase.com)
 
 The [Material Example](https://github.com/prescottprue/react-redux-firebase/tree/master/examples/complete/material) is deployed to [demo.react-redux-firebase.com](https://demo.react-redux-firebase.com).
 
 ## Features
-- Integrated into redux
+
 - Out of the box support for authentication (with auto load user profile)
 - Full Firebase Platform Support Including Real Time Database, Firestore, and Storage
 - Automatic binding/unbinding of listeners through React Higher Order Components (`firebaseConnect`  and `firestoreConnect`)
@@ -32,6 +31,8 @@ The [Material Example](https://github.com/prescottprue/react-redux-firebase/tree
 
 ## Installation
 
+Interested in support for [`react-redux@^6`](https://github.com/reduxjs/react-redux) or the [new react context API](https://reactjs.org/docs/context.html)? Checkout [the `next` branch which contains the next upcoming major version](https://github.com/prescottprue/react-redux-firebase/tree/next) (installed through `npm i --save react-redux-firebase@next`).
+
 ```bash
 npm install --save react-redux-firebase
 ```

book.json

@@ -19,13 +19,17 @@
       "token": "UA-102355407-1"
     },
     "versions": {
-      "gitbookConfigURL": "https://raw.githubusercontent.com/prescottprue/react-redux-firebase/master/book.json",
+      "gitbookConfigURL": "https://storage.googleapis.com/docs.react-redux-firebase.com/book.json",
       "options": [
         {
             "value": "http://docs.react-redux-firebase.com/history/v2.0.0/",
             "text": "Version 2.0.0",
             "selected": true
         },
+        {
+          "value": "http://docs.react-redux-firebase.com/history/v3.0.0/",
+          "text": "Version 3.0.0"
+        },
         {
             "value": "http://docs.react-redux-firebase.com/history/v1.5.0/",
             "text": "Version 1.5.0"

docs/integrations/react-native.md

@@ -6,11 +6,22 @@ Regardless of which path you want to take, initial setup is the same, so we will
 
 **NOTE:** Make sure you include `enableRedirectHandling: false` when using react-native with `v2.0.0`. This is required to disable redirect handling (which uses http) since it is not supported in react-native. There has been discussion of a way to make this happen automatically, but for now it is required.
 
+## JS/Web
+
+Setup and use `react-redux-firebase` as normal (described in the [use section of the README](https://github.com/prescottprue/react-redux-firebase#use)). Since Firebase is initialized outside of react-redux-firebase, the automatic handling of react-native done by Firebase works.
+
+[react-native complete example app](https://github.com/prescottprue/react-redux-firebase/tree/master/examples/complete/react-native)
+
+**NOTES**
+
+* Only works for versions `v2.0.0` and higher. For older versions please view the docs associated with previous version.
+* Will not perform as well as using native modules since the render thread is used for all JS
+
 ## Native Modules
 
 Passing in an instance also allows for libraries with similar APIs (such as [`react-native-firebase`](https://github.com/invertase/react-native-firebase)) to be used instead:
 
-1. Follow [use instructions in README](http://react-redux-firebase.com/#use)
+1. Follow [use instructions in README](https://github.com/prescottprue/react-redux-firebase#use)
 1. When creating redux store pass `react-native-firebase` App instance into `reactReduxFirebase` when creating store:
 
   **createStore.js**
@@ -48,40 +59,12 @@ Passing in an instance also allows for libraries with similar APIs (such as [`re
 
 Full `react-native-firebase` example app source with styling available [in the react-native-firebase complete example](https://github.com/prescottprue/react-redux-firebase/tree/master/examples/complete/react-native-firebase).
 
-### Setup
-1. Run `create-react-native-app my-app`
-1. Enter the app folder `cd my-app`
-1. Run the eject command `yarn run eject` or `npm run eject` and choose "Regular React Native App"
-1. Run `npm i --save redux react-redux react-redux-firebase@canary redux-thunk`
-1. Open the xcode project in ios/myapp
-  * Drag the `GoogleService-Info.plist` into the project -> check box saying copy
-  * switch the identifier to the one you just gave Firebase
-1. Follow the [react-native-firebase initial setup guide](http://invertase.io/react-native-firebase/#/initial-setup)
-
-## JS/Web
-
-**NOTE**: Only works for versions `v2.0.0-alpha` and higher. For older versions please view the docs associated with previous version.
-
-[react-native complete example app](/examples/complete/react-native)
-
-Instantiate a Firebase instance outside of `react-redux-firebase` then pass it in as the first argument like so:
-
-**NOTE**: If you are looking to use native modules (`react-native-firebase` or other), [visit the `v2.0.0` docs](http://docs.react-redux-firebase.com/history/v2.0.0/docs/recipes/react-native.html#native-modules)
-
-## Setup
-
-1. Click "Add Firebase To iOS"
-<!-- TODO: Confirm this and get a picture -->
-1. Download `GoogleService-info.plist`
-1. Place `GoogleService-info.plist` in the folder of whichever platform you are using (i.e. `/ios`)
-1. Copy your client id out of the `GoogleService-info.plist` file (should end in `.apps.googleusercontent.com`)
-1. Place the client id into `iosClientId` variable within the example
-
 ## Creating Your Own
 
 We are going to use the project name Devshare for example here. For your project, use your project name everywhere where Devshare is used.
 
 ### Start
+
 1. Make sure you have [`create-react-native-app`](https://github.com/react-community/create-react-native-app) installed, or install it using `npm install -g create-react-native-app`.
 1. Run `create-react-native-app Devshare` (again replace Devshare with the name of your project)
 1. After that is complete, eject using `yarn eject` or `npm run eject`

src/constants.js

@@ -239,6 +239,16 @@ export const supportedAuthProviders = [
  */
 export const topLevelPaths = ['auth', 'profile', 'ordered', 'data']
 
+/**
+ * @constant
+ * @description Error message shown if runnning react-redux v6 with a v2.0.0 version
+ * of react-redux-firebase
+ * @type {String}
+ * @private
+ */
+export const v3ErrorMessage =
+  'Context from react-redux not found. If you are using react-redux v6 a v3.*.* version of react-redux-firebase is required. Please checkout the v3 migration guide: http://bit.ly/2SRNdiO'
+
 export default {
   actionTypes,
   defaultConfig