Skip to content

Commit

Permalink
Merge pull request #392 from smooth-code/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade deps & small fix
  • Loading branch information
gregberge authored Jul 15, 2019
2 parents 0bf05ac + c88cd82 commit 8f36a7c
Show file tree
Hide file tree
Showing 4 changed files with 890 additions and 842 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@
"@babel/plugin-transform-runtime": "^7.4.4",
"@babel/preset-env": "^7.4.4",
"@babel/preset-react": "^7.0.0",
"@testing-library/jest-dom": "^4.0.0",
"@testing-library/react": "^8.0.1",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.8.0",
"babel-plugin-annotate-pure-calls": "^0.4.0",
"bundlesize": "^0.17.1",
"bundlesize": "^0.18.0",
"conventional-github-releaser": "^3.1.2",
"cross-env": "^5.2.0",
"eslint": "^5.16.0",
"eslint": "^6.0.1",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^4.2.0",
"eslint-config-prettier": "^6.0.0",
"eslint-plugin-import": "^2.17.2",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-react": "^7.13.0",
"jest": "^24.8.0",
"jest-dom": "^3.2.2",
"lerna": "^3.13.4",
"prettier": "^1.17.0",
"react": "^16.8.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/component/src/createLoadable.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function createLoadable({ resolve = identity, render, onLoad }) {

componentDidUpdate(prevProps, prevState) {
// Component is reloaded if the cacheKey has changed
if (!Object.is(prevState.cacheKey, this.state.cacheKey)) {
if (prevState.cacheKey !== this.state.cacheKey) {
this.promise = null
this.loadAsync()
}
Expand Down
2 changes: 1 addition & 1 deletion packages/component/src/loadable.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable import/no-extraneous-dependencies, react/no-multi-comp */
import 'regenerator-runtime/runtime'
import 'jest-dom/extend-expect'
import '@testing-library/jest-dom/extend-expect'
import React from 'react'
import { render, cleanup, wait } from '@testing-library/react'
import loadable, { lazy } from './index'
Expand Down
Loading

0 comments on commit 8f36a7c

Please sign in to comment.