Skip to content

Commit

Permalink
Update deps and switch rtl to tlr.
Browse files Browse the repository at this point in the history
  • Loading branch information
timdorr committed Jun 11, 2019
1 parent 93d731b commit 316467a
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 109 deletions.
163 changes: 73 additions & 90 deletions package-lock.json

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

13 changes: 6 additions & 7 deletions package.json
Expand Up @@ -56,7 +56,7 @@
"@babel/plugin-transform-react-jsx": "^7.3.0",
"@babel/plugin-transform-runtime": "^7.4.4",
"@babel/preset-env": "^7.4.5",
"babel-core": "^7.0.0-bridge.0",
"@testing-library/react": "^8.0.1",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.8.0",
"codecov": "^3.5.0",
Expand All @@ -70,19 +70,18 @@
"eslint-plugin-react": "^7.13.0",
"glob": "^7.1.4",
"jest": "^24.8.0",
"jest-dom": "^3.4.0",
"prettier": "^1.17.1",
"jest-dom": "^3.5.0",
"prettier": "^1.18.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-hooks-testing-library": "^0.5.0",
"react-hooks-testing-library": "^0.5.1",
"react-test-renderer": "^16.8.6",
"react-testing-library": "^7.0.1",
"redux": "^4.0.1",
"rimraf": "^2.6.3",
"rollup": "^1.12.4",
"rollup": "^1.14.6",
"rollup-plugin-babel": "^4.3.2",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^5.0.0",
"rollup-plugin-node-resolve": "^5.0.1",
"rollup-plugin-replace": "^2.2.0",
"rollup-plugin-terser": "^5.0.0"
},
Expand Down
8 changes: 2 additions & 6 deletions src/hooks/useSelector.js
Expand Up @@ -66,14 +66,10 @@ export function useSelector(selector, equalityFn = refEquality) {
selectedState = latestSelectedState.current
}
} catch (err) {
let errorMessage = `An error occured while selecting the store state: ${
err.message
}.`
let errorMessage = `An error occured while selecting the store state: ${err.message}.`

if (latestSubscriptionCallbackError.current) {
errorMessage += `\nThe error may be correlated with this previous error:\n${
latestSubscriptionCallbackError.current.stack
}\n\nOriginal stack trace:`
errorMessage += `\nThe error may be correlated with this previous error:\n${latestSubscriptionCallbackError.current.stack}\n\nOriginal stack trace:`
}

throw new Error(errorMessage)
Expand Down
2 changes: 1 addition & 1 deletion test/components/Provider.spec.js
Expand Up @@ -4,7 +4,7 @@ import React, { Component } from 'react'
import ReactDOM from 'react-dom'
import { createStore } from 'redux'
import { Provider, connect, ReactReduxContext } from '../../src/index.js'
import * as rtl from 'react-testing-library'
import * as rtl from '@testing-library/react'
import 'jest-dom/extend-expect'

const createExampleTextReducer = () => (state = 'example text') => state
Expand Down
2 changes: 1 addition & 1 deletion test/components/connect.spec.js
Expand Up @@ -6,7 +6,7 @@ import PropTypes from 'prop-types'
import ReactDOM from 'react-dom'
import { createStore, applyMiddleware } from 'redux'
import { Provider as ProviderMock, connect } from '../../src/index.js'
import * as rtl from 'react-testing-library'
import * as rtl from '@testing-library/react'
import 'jest-dom/extend-expect'

describe('React', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/components/connectAdvanced.spec.js
@@ -1,5 +1,5 @@
import React, { Component } from 'react'
import * as rtl from 'react-testing-library'
import * as rtl from '@testing-library/react'
import { Provider as ProviderMock, connectAdvanced } from '../../src/index.js'
import { createStore } from 'redux'
import 'jest-dom/extend-expect'
Expand Down
2 changes: 1 addition & 1 deletion test/components/hooks.spec.js
Expand Up @@ -3,7 +3,7 @@
import React from 'react'
import { createStore } from 'redux'
import { Provider as ProviderMock, connect } from '../../src/index.js'
import * as rtl from 'react-testing-library'
import * as rtl from '@testing-library/react'
import 'jest-dom/extend-expect'

describe('React', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/hooks/useSelector.spec.js
Expand Up @@ -3,7 +3,7 @@
import React, { useCallback, useReducer } from 'react'
import { createStore } from 'redux'
import { renderHook, act } from 'react-hooks-testing-library'
import * as rtl from 'react-testing-library'
import * as rtl from '@testing-library/react'
import {
Provider as ProviderMock,
useSelector,
Expand Down
2 changes: 1 addition & 1 deletion test/integration/dynamic-reducers.spec.js
Expand Up @@ -4,7 +4,7 @@ import React from 'react'
import ReactDOMServer from 'react-dom/server'
import { createStore, combineReducers } from 'redux'
import { connect, Provider, ReactReduxContext } from '../../src/index.js'
import * as rtl from 'react-testing-library'
import * as rtl from '@testing-library/react'

describe('React', () => {
/*
Expand Down

0 comments on commit 316467a

Please sign in to comment.