changes requested by @timdorr

* export Context instead of just Consumer/Provider
* fix error messages for removed functionality
* minor displayName change

Author: cellog

src/components/Context.js

@@ -1,5 +1,5 @@
 import React from 'react'
 
-const { Provider, Consumer } = React.createContext(null)
+const Context = React.createContext(null)
 
-export { Provider, Consumer }
+export default Context

src/components/Provider.js

@@ -1,6 +1,8 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import { Provider as ContextProvider } from './Context'
+import Context from './Context'
+
+const ContextProvider = Context.Provider
 
 class Provider extends Component {
   constructor(props) {

src/components/connectAdvanced.js

@@ -5,7 +5,9 @@ import propTypes from 'prop-types'
 import shallowEqual from 'shallow-equals'
 import { isValidElementType } from 'react-is'
 
-import { Consumer } from './Context'
+import Context from './Context'
+
+const Consumer = Context.Consumer
 
 export default function connectAdvanced(
   /*
@@ -61,7 +63,7 @@ export default function connectAdvanced(
   )
 
   invariant(storeKey === 'store',
-    'storeKey is deprecated and does not do anything. To use a custom redux store for a single component, ' +
+    'storeKey has been removed and does not do anything. To use a custom redux store for a single component, ' +
     'create a custom React context with React.createContext() and pass the Provider to react-redux\'s provider ' +
     'and the Consumer to this component as in <Provider context={context.Provider}><' +
     'ConnectedComponent consumer={context.Consumer} /></Provider>'
@@ -110,7 +112,7 @@ export default function connectAdvanced(
       constructor(props) {
         super(props)
         invariant(!props[storeKey],
-          'passing redux store in props is deprecated and does not do anything. ' +
+          'Passing redux store in props has been removed and does not do anything. ' +
           'To use a custom redux store for a single component, ' +
           'create a custom React context with React.createContext() and pass the Provider to react-redux\'s provider ' +
           'and the Consumer to this component as in <Provider context={context.Provider}><' +
@@ -196,7 +198,6 @@ export default function connectAdvanced(
       return <Connect {...props} forwardRef={ref} />
     }
 
-    forwardRef.displayName = Connect.displayName
     const forwarded = React.forwardRef(forwardRef)
     forwarded.displayName = Connect.displayName
     forwarded.WrappedComponent = WrappedComponent

src/index.js

@@ -1,6 +1,6 @@
 import Provider from './components/Provider'
 import connectAdvanced from './components/connectAdvanced'
-import { Provider as ReduxContextProvider, Consumer as ReduxContextConsumer } from './components/Context'
+import Context from './components/Context'
 import connect from './connect/connect'
 
-export { Provider, connectAdvanced, ReduxContextConsumer, ReduxContextProvider, connect }
+export { Provider, connectAdvanced, Context, connect }

test/components/Provider.spec.js

@@ -3,10 +3,12 @@
 import React, { Component } from 'react'
 import { createStore } from 'redux'
 import { Provider, connect } from '../../src/index.js'
-import { Consumer } from '../../src/components/Context.js'
+import Context from '../../src/components/Context.js'
 import * as rtl from 'react-testing-library'
 import 'jest-dom/extend-expect'
 
+const Consumer = Context.Consumer
+
 describe('React', () => {
   describe('Provider', () => {
     afterEach(() => rtl.cleanup())

test/components/connect.spec.js

@@ -2255,7 +2255,7 @@ describe('React', () => {
           }
         }
         new Container()
-      }).toThrow(/storeKey is deprecated/)
+      }).toThrow(/storeKey has been removed/)
     })
 
     it('should error on withRef', () => {
@@ -2279,7 +2279,7 @@ describe('React', () => {
       }
       expect(() => {
         rtl.render(<Oops />)
-      }).toThrow(/passing redux store/)
+      }).toThrow(/Passing redux store/)
     })
 
     it('should add a renderCount prop if specified in connect options', () => {