chore: cleanup tests, upgrade deps

Author: gregberge

package.json

@@ -25,8 +25,8 @@
   "devDependencies": {
     "babel-cli": "^6.7.5",
     "babel-core": "^6.7.6",
-    "babel-eslint": "^8.1.2",
-    "babel-jest": "^22.0.4",
+    "babel-eslint": "^8.2.1",
+    "babel-jest": "^22.1.0",
     "babel-plugin-dynamic-import-node": "^1.2.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
@@ -38,22 +38,22 @@
     "conventional-github-releaser": "^2.0.0",
     "create-react-class": "^15.6.2",
     "cross-env": "^5.1.3",
-    "enzyme": "^3.1.0",
+    "enzyme": "^3.3.0",
     "enzyme-adapter-react-15": "^1.0.5",
     "enzyme-adapter-react-16": "^1.1.1",
-    "eslint": "^4.14.0",
+    "eslint": "^4.16.0",
     "eslint-config-airbnb": "^16.0.0",
     "eslint-config-prettier": "^2.6.0",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.4.0",
     "husky": "^0.14.3",
-    "jest": "^22.0.4",
-    "lerna": "^2.4.0",
+    "jest": "^22.1.4",
+    "lerna": "^2.8.0",
     "lerna-tools": "^1.0.0",
-    "lint-staged": "^6.0.0",
+    "lint-staged": "^6.0.1",
     "mocha": "^4.0.1",
-    "prettier": "^1.9.2",
+    "prettier": "^1.10.2",
     "react": "16",
     "react-dom": "16",
     "react-mount": "^0.1.3",

packages/react-hot-loader/src/AppContainer.dev.js

@@ -1,5 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
+import logger from './logger'
 import { get as getGeneration } from './global/generation'
 import getReactStack from './internal/getReactStack'
 import hotReplacementRender from './reconciler/hotReplacementRender'
@@ -41,17 +42,15 @@ class AppContainer extends React.Component {
   }
 
   componentDidCatch(error) {
+    logger.error(error)
     this.setState({ error })
   }
 
   render() {
     const { error } = this.state
 
     if (this.props.errorReporter && error) {
-      console.error(error)
       return <this.props.errorReporter error={error} />
-    } else if (error) {
-      console.error(error)
     }
 
     return React.Children.only(this.props.children)

packages/react-hot-loader/test/reconciler.test.js

@@ -231,35 +231,45 @@ describe('reconciler', () => {
       expect(wrapper.text()).toContain(43)
     })
 
-    it('should handle error on render', () => {
-      const App = () => <div>Normal application</div>
-      reactHotLoader.register(App, 'App', 'test.js')
+    describe('when an error occurs in render', () => {
+      beforeEach(() => {
+        jest.spyOn(console, 'error').mockImplementation(() => {})
+      })
 
-      const TestCase = props => (
-        <AppContainer>
-          <App {...props} />
-        </AppContainer>
-      )
+      afterEach(() => {
+        console.error.mockRestore()
+      })
 
-      const wrapper = mount(<TestCase />)
+      it('should catch error', () => {
+        const App = () => <div>Normal application</div>
+        reactHotLoader.register(App, 'App', 'test.js')
 
-      {
-        const App = ({ update = '42' }) => (
-          <div>
-            Normal application{' '}
-            <span>{update ? update.not.existing : '42'}</span>
-          </div>
+        const TestCase = () => (
+          <AppContainer>
+            <App active />
+          </AppContainer>
         )
-        reactHotLoader.register(App, 'App', 'test.js')
 
-        expect(() => wrapper.setProps({ children: <App /> })).toThrow()
-        expect(reactHotLoader.disableProxyCreation).toBe(false)
-      }
+        const wrapper = mount(<TestCase />)
 
-      expect(logger.warn).toHaveBeenCalledWith(
-        `React-hot-loader: reconcilation failed due to error`,
-        expect.any(Error),
-      )
+        {
+          const App = ({ active }) => (
+            <div>
+              Normal application
+              <span>{active ? active.not.existing : null}</span>
+            </div>
+          )
+          reactHotLoader.register(App, 'App', 'test.js')
+
+          expect(() => wrapper.setProps({ children: <App /> })).toThrow()
+          expect(reactHotLoader.disableProxyCreation).toBe(false)
+        }
+
+        expect(logger.warn).toHaveBeenCalledWith(
+          `React-hot-loader: reconcilation failed due to error`,
+          expect.any(Error),
+        )
+      })
     })
   })
 })

packages/react-stand-in/test/lifecycle-method.test.js

@@ -1,7 +1,13 @@
 /* eslint-env jest */
 import React, { Component } from 'react'
 import { createMounter } from './helper'
-import createProxy from '../lib'
+import createProxy, { setConfig } from '../lib'
+
+setConfig({
+  logger: {
+    warn: jest.fn(),
+  },
+})
 
 describe('lifecycle method', () => {
   const { mount } = createMounter()