Use Hooks internally (aka 7.0)

.gitignore

@@ -12,6 +12,7 @@ test/react/*/test/**/*.spec.js
 test/react/**/src
 test/jest-config.json
 lcov.info
+.idea/
 
 lib/core/metadata.js
 lib/core/MetadataBlog.js

.travis.yml

@@ -2,9 +2,6 @@ language: node_js
 node_js: node
 cache: npm
 env:
-  - REACT=16.4
-  - REACT=16.5
-  - REACT=16.6
   - REACT=16.8
 script:
   - npm test

docs/api/connect.md

@@ -121,7 +121,7 @@ The second parameter is normally referred to as `ownProps` by convention.
 
 ```js
 // binds on component re-rendering
-<button onClick={() => this.props.toggleTodo(this.props.todoId)} />
+;<button onClick={() => this.props.toggleTodo(this.props.todoId)} />
 
 // binds on `props` change
 const mapDispatchToProps = (dispatch, ownProps) => {

docs/introduction/quick-start.md

@@ -75,7 +75,6 @@ export default connect(
 )(Counter)
 ```
 
-
 ## Help and Discussion
 
 The **[#redux channel](https://discord.gg/0ZcbPKXt5bZ6au5t)** of the **[Reactiflux Discord community](http://www.reactiflux.com)** is our official resource for all questions related to learning and using Redux. Reactiflux is a great place to hang out, ask questions, and learn - come join us!

docs/using-react-redux/accessing-store.md

@@ -47,16 +47,16 @@ export default connect(
   mapDispatch,
   null,
   { context: MyContext }
-)(MyComponent);
+)(MyComponent)
 
 // or, call connect as normal to start
 const ConnectedComponent = connect(
   mapState,
   mapDispatch
-)(MyComponent);
+)(MyComponent)
 
 // Later, pass the custom context as a prop to the connected component
-<ConnectedComponent context={MyContext} />
+;<ConnectedComponent context={MyContext} />
 ```
 
 The following runtime error occurs when React Redux does not find a store in the context it is looking. For example:
@@ -132,7 +132,7 @@ function MyConnectedComponent() {
         // component where it can be used in lifecycle methods
       }}
     </ReactReduxContext.Consumer>
-  );
+  )
 }
 ```
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-redux",
-  "version": "6.0.1",
+  "version": "7.0.0-beta.1",
   "description": "Official React bindings for Redux",
   "keywords": [
     "react",
@@ -36,7 +36,7 @@
     "coverage": "codecov"
   },
   "peerDependencies": {
-    "react": "^16.4.0-0",
+    "react": "^16.8.4",
     "redux": "^2.0.0 || ^3.0.0 || ^4.0.0-0"
   },
   "dependencies": {

rollup.config.js

@@ -9,13 +9,14 @@ const env = process.env.NODE_ENV
 
 const config = {
   input: 'src/index.js',
-  external: Object.keys(pkg.peerDependencies || {}),
+  external: Object.keys(pkg.peerDependencies || {}).concat('react-dom'),
   output: {
     format: 'umd',
     name: 'ReactRedux',
     globals: {
       react: 'React',
-      redux: 'Redux'
+      redux: 'Redux',
+      'react-dom': 'ReactDOM'
     }
   },
   plugins: [
@@ -32,7 +33,8 @@ const config = {
         'node_modules/react-is/index.js': [
           'isValidElementType',
           'isContextConsumer'
-        ]
+        ],
+        'node_modules/react-dom/index.js': ['unstable_batchedUpdates']
       }
     })
   ]

src/alternate-renderers.js

@@ -0,0 +1,11 @@
+import Provider from './components/Provider'
+import connectAdvanced from './components/connectAdvanced'
+import { ReactReduxContext } from './components/Context'
+import connect from './connect/connect'
+
+import { getBatch } from './utils/batch'
+
+// For other renderers besides ReactDOM and React Native, use the default noop batch function
+const batch = getBatch()
+
+export { Provider, connectAdvanced, ReactReduxContext, connect, batch }

src/components/Provider.js

@@ -1,63 +1,55 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import { ReactReduxContext } from './Context'
+import Subscription from '../utils/Subscription'
 
 class Provider extends Component {
   constructor(props) {
     super(props)
 
     const { store } = props
 
+    this.notifySubscribers = this.notifySubscribers.bind(this)
+    const subscription = new Subscription(store)
+    subscription.onStateChange = this.notifySubscribers
+
     this.state = {
-      storeState: store.getState(),
-      store
+      store,
+      subscription
     }
+
+    this.previousState = store.getState()
   }
 
   componentDidMount() {
     this._isMounted = true
-    this.subscribe()
+
+    this.state.subscription.trySubscribe()
+
+    if (this.previousState !== this.props.store.getState()) {
+      this.state.subscription.notifyNestedSubs()
+    }
   }
 
   componentWillUnmount() {
     if (this.unsubscribe) this.unsubscribe()
 
+    this.state.subscription.tryUnsubscribe()
+
     this._isMounted = false
   }
 
   componentDidUpdate(prevProps) {
     if (this.props.store !== prevProps.store) {
-      if (this.unsubscribe) this.unsubscribe()
-
-      this.subscribe()
+      this.state.subscription.tryUnsubscribe()
+      const subscription = new Subscription(this.props.store)
+      subscription.onStateChange = this.notifySubscribers
+      this.setState({ store: this.props.store, subscription })
     }
   }
 
-  subscribe() {
-    const { store } = this.props
-
-    this.unsubscribe = store.subscribe(() => {
-      const newStoreState = store.getState()
-
-      if (!this._isMounted) {
-        return
-      }
-
-      this.setState(providerState => {
-        // If the value is the same, skip the unnecessary state update.
-        if (providerState.storeState === newStoreState) {
-          return null
-        }
-
-        return { storeState: newStoreState }
-      })
-    })
-
-    // Actions might have been dispatched between render and mount - handle those
-    const postMountStoreState = store.getState()
-    if (postMountStoreState !== this.state.storeState) {
-      this.setState({ storeState: postMountStoreState })
-    }
+  notifySubscribers() {
+    this.state.subscription.notifyNestedSubs()
   }
 
   render() {