stable

Author: theKashey

src/internal/stack/hydrateFiberStack.js

@@ -1,7 +1,8 @@
 /* eslint-disable no-underscore-dangle */
 import ReactDOM from 'react-dom'
 
-const hotRenderWithHooks = ReactDOM.hotRenderWithHooks || (() => null)
+const hotRenderWithHooks =
+  ReactDOM.hotRenderWithHooks || ((fiber, render) => render())
 
 function pushStack(stack, node) {
   stack.type = node.type
@@ -14,9 +15,8 @@ function pushStack(stack, node) {
     stack.instance = {
       SFC_fake: stack.type,
       props: {},
-      render: () => {
-        hotRenderWithHooks(node, () => stack.type(stack.instance.props))
-      },
+      render: () =>
+        hotRenderWithHooks(node, () => stack.type(stack.instance.props)),
     }
   }
 }

src/proxy/createClassProxy.js

@@ -220,11 +220,13 @@ function createClassProxy(InitialComponent, proxyKey, options = {}) {
       result = CurrentComponent(this.props, this.context)
     } else {
       const renderMethod = CurrentComponent.prototype.render || this.render
+      /* eslint-disable no-use-before-define */
       if (renderMethod === proxiedRender) {
         throw new Error(
           'React-Hot-Loader: you are trying to render Component without .render method',
         )
       }
+      /* eslint-enable */
       result = renderMethod.apply(
         this,
         // eslint-disable-next-line prefer-rest-params

test/reconciler.test.js

@@ -120,7 +120,7 @@ describe('reconciler', () => {
       currentProps.newProp = true
       incrementGeneration()
       wrapper.setProps({ update: 'now' })
-      // not react-stand-in merge them together
+      // now react-stand-in merge them together
       expect(areComponentsEqual(first.Component, second.Component)).toBe(true)
       expect(wrapper.find(<first.Component />.type).length).toBe(1)
       expect(wrapper.find(<second.Component />.type).length).toBe(1)