Skip to content

Commit

Permalink
Remove invariant in favor of doing NODE_ENV checks directly (#1472)
Browse files Browse the repository at this point in the history
  • Loading branch information
Andarist authored and timdorr committed Nov 23, 2019
1 parent 9fc5993 commit 9ebd1a9
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 41 deletions.
1 change: 1 addition & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
"dependencies": {
"@babel/runtime": "^7.5.5",
"hoist-non-react-statics": "^3.3.0",
"invariant": "^2.2.4",
"loose-envify": "^1.4.0",
"prop-types": "^15.7.2",
"react-is": "^16.9.0"
Expand Down
74 changes: 42 additions & 32 deletions src/components/connectAdvanced.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import hoistStatics from 'hoist-non-react-statics'
import invariant from 'invariant'
import React, { useContext, useMemo, useRef, useReducer } from 'react'
import { isValidElementType, isContextConsumer } from 'react-is'
import Subscription from '../utils/Subscription'
Expand Down Expand Up @@ -78,34 +77,40 @@ export default function connectAdvanced(
...connectOptions
} = {}
) {
invariant(
renderCountProp === undefined,
`renderCountProp is removed. render counting is built into the latest React Dev Tools profiling extension`
)

invariant(
!withRef,
'withRef is removed. To access the wrapped instance, use a ref on the connected component'
)

const customStoreWarningMessage =
'To use a custom Redux store for specific components, create a custom React context with ' +
"React.createContext(), and pass the context object to React Redux's Provider and specific components" +
' like: <Provider context={MyContext}><ConnectedComponent context={MyContext} /></Provider>. ' +
'You may also pass a {context : MyContext} option to connect'

invariant(
storeKey === 'store',
'storeKey has been removed and does not do anything. ' +
customStoreWarningMessage
)
if (process.env.NODE_ENV !== 'production') {
if (renderCountProp !== undefined) {
throw new Error(
`renderCountProp is removed. render counting is built into the latest React Dev Tools profiling extension`
)
}
if (withRef) {
throw new Error(
'withRef is removed. To access the wrapped instance, use a ref on the connected component'
)
}

const customStoreWarningMessage =
'To use a custom Redux store for specific components, create a custom React context with ' +
"React.createContext(), and pass the context object to React Redux's Provider and specific components" +
' like: <Provider context={MyContext}><ConnectedComponent context={MyContext} /></Provider>. ' +
'You may also pass a {context : MyContext} option to connect'

if (storeKey !== 'store') {
throw new Error(
'storeKey has been removed and does not do anything. ' +
customStoreWarningMessage
)
}
}

const Context = context

return function wrapWithConnect(WrappedComponent) {
if (process.env.NODE_ENV !== 'production') {
invariant(
isValidElementType(WrappedComponent),
if (
process.env.NODE_ENV !== 'production' &&
!isValidElementType(WrappedComponent)
) {
throw new Error(
`You must pass a component to the function returned by ` +
`${methodName}. Instead received ${stringifyComponent(
WrappedComponent
Expand Down Expand Up @@ -173,13 +178,18 @@ export default function connectAdvanced(
const didStoreComeFromContext =
Boolean(contextValue) && Boolean(contextValue.store)

invariant(
didStoreComeFromProps || didStoreComeFromContext,
`Could not find "store" in the context of ` +
`"${displayName}". Either wrap the root component in a <Provider>, ` +
`or pass a custom React context provider to <Provider> and the corresponding ` +
`React context consumer to ${displayName} in connect options.`
)
if (
process.env.NODE_ENV !== 'production' &&
!didStoreComeFromProps &&
!didStoreComeFromContext
) {
throw new Error(
`Could not find "store" in the context of ` +
`"${displayName}". Either wrap the root component in a <Provider>, ` +
`or pass a custom React context provider to <Provider> and the corresponding ` +
`React context consumer to ${displayName} in connect options.`
)
}

// Based on the previous check, one of these must be true
const store = didStoreComeFromProps ? props.store : contextValue.store
Expand Down
10 changes: 5 additions & 5 deletions src/hooks/useReduxContext.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useContext } from 'react'
import invariant from 'invariant'
import { ReactReduxContext } from '../components/Context'

/**
Expand All @@ -21,10 +20,11 @@ import { ReactReduxContext } from '../components/Context'
export function useReduxContext() {
const contextValue = useContext(ReactReduxContext)

invariant(
contextValue,
'could not find react-redux context value; please ensure the component is wrapped in a <Provider>'
)
if (process.env.NODE_ENV !== 'production' && !contextValue) {
throw new Error(
'could not find react-redux context value; please ensure the component is wrapped in a <Provider>'
)
}

return contextValue
}
6 changes: 3 additions & 3 deletions src/hooks/useSelector.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useReducer, useRef, useMemo, useContext } from 'react'
import invariant from 'invariant'
import { useReduxContext as useDefaultReduxContext } from './useReduxContext'
import Subscription from '../utils/Subscription'
import { useIsomorphicLayoutEffect } from '../utils/useIsomorphicLayoutEffect'
Expand Down Expand Up @@ -95,8 +94,9 @@ export function createSelectorHook(context = ReactReduxContext) {
? useDefaultReduxContext
: () => useContext(context)
return function useSelector(selector, equalityFn = refEquality) {
invariant(selector, `You must pass a selector to useSelectors`)

if (process.env.NODE_ENV !== 'production' && !selector) {
throw new Error(`You must pass a selector to useSelectors`)
}
const { store, subscription: contextSub } = useReduxContext()

return useSelectorWithStoreAndSubscription(
Expand Down

0 comments on commit 9ebd1a9

Please sign in to comment.