suppress warnings, #804

gaearon · Jan 19, 2018 · 8e25a76 · 8e25a76
1 parent 8802f03
commit 8e25a76
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 12 deletions.
diff --git a/examples/styled-components/src/App.js b/examples/styled-components/src/App.js
@@ -1,4 +1,4 @@
-import { hot } from 'react-hot-loader'
+import { hot, setConfig } from 'react-hot-loader'
 import * as React from 'react'
 import styled from 'styled-components'
 import emoStyled from 'react-emotion'
@@ -12,14 +12,27 @@ const SmallText = emoStyled('div')`
   font-size: 22px;
 `
 
+const indirect = {
+  element: () => (
+    <SmallText>
+      hidden2 <Counter />
+    </SmallText>
+  ),
+}
+
+const aNumber = 10
+
 const App = () => (
   <h1>
-    <BigText>Hello, world.</BigText>
+    <BigText>1.Hello, world!! {aNumber} </BigText>
     <br />
-    <SmallText>Hello, world.</SmallText>
+    <SmallText>2.Hello, world---.</SmallText>
     <br />
     <Counter />
+    <indirect.element />
   </h1>
 )
 
+setConfig({ logLevel: 'debug' })
+
 export default hot(module)(App)
diff --git a/packages/react-hot-loader/src/reconciler/hotReplacementRender.js b/packages/react-hot-loader/src/reconciler/hotReplacementRender.js
@@ -147,12 +147,20 @@ const mergeInject = (a, b, instance) => {
   if (flatA.length === flatB.length) {
     return mapChildren(flatA, flatB)
   }
-  logger.warn(
-    `React-hot-loader: unable to merge `,
-    a,
-    'and children of ',
-    instance,
-  )
+  if (
+    flatB.length === 0 &&
+    flatA.length === 1 &&
+    typeof flatA[0] !== 'object'
+  ) {
+    // terminal node
+  } else {
+    logger.warn(
+      `React-hot-loader: unable to merge `,
+      a,
+      'and children of ',
+      instance,
+    )
+  }
   return NO_CHILDREN
 }
 

diff --git a/packages/react-stand-in/src/createClassProxy.js b/packages/react-stand-in/src/createClassProxy.js
@@ -198,9 +198,11 @@ function createClassProxy(InitialComponent, proxyKey, wrapResult = identity) {
     const displayName = getDisplayName(CurrentComponent)
     ProxyFacade.displayName = displayName
 
-    safeDefineProperty(ProxyComponent, 'name', {
-      value: displayName,
-    })
+    if (ProxyComponent) {
+      safeDefineProperty(ProxyComponent, 'name', {
+        value: displayName,
+      })
+    }
 
     savedDescriptors = transferStaticProps(
       ProxyFacade,

diff --git a/packages/react-stand-in/test/static-descriptor.test.js b/packages/react-stand-in/test/static-descriptor.test.js
@@ -222,3 +222,18 @@ describe('static descriptor', () => {
     })
   })
 })
+
+describe('static functional descriptor', () => {
+  it('shout pass propTypes', () => {
+    const TestComponent = () => <div />
+    TestComponent.propTypes = {
+      property: 42,
+    }
+    TestComponent.displayName = 'Testing'
+    const proxy = createProxy(TestComponent)
+    const Proxy = proxy.get()
+
+    expect(Proxy.propTypes.property).toBe(42)
+    expect(Proxy.displayName).toBe('Testing')
+  })
+})