refactor(react-hot-loader): simplify code

Author: gregberge

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

@@ -1,14 +1,14 @@
 import React, { Component } from 'react'
 import hoistNonReactStatic from 'hoist-non-react-statics'
+import { getComponentDisplayName } from './internal/reactUtils'
 import AppContainer from './AppContainer.dev'
 import reactHotLoader from './reactHotLoader'
 
-const getDisplayName = WrappedComponent =>
-  WrappedComponent.displayName || WrappedComponent.name || 'Component'
-
 const createHoc = (SourceComponent, TargetComponent) => {
   hoistNonReactStatic(TargetComponent, SourceComponent)
-  TargetComponent.displayName = `HotExported${getDisplayName(SourceComponent)}`
+  TargetComponent.displayName = `HotExported${getComponentDisplayName(
+    SourceComponent,
+  )}`
   return TargetComponent
 }
 
@@ -43,7 +43,7 @@ const hot = sourceModule => {
     // register proxy for wrapped component
     reactHotLoader.register(
       WrappedComponent,
-      getDisplayName(WrappedComponent),
+      getComponentDisplayName(WrappedComponent),
       `RHL${sourceModule.id}`,
     )
 

packages/react-hot-loader/src/internal/getReactStack.js

@@ -63,11 +63,13 @@ function hydrateTree(root) {
   return stack
 }
 
-export default function getReactStack(instance) {
+function getReactStack(instance) {
   const root = getReactInstance(instance)
   if (typeof root.tag !== 'number') {
     // Traverse stack-based React tree.
     return hydrateStack(instance)
   }
   return hydrateTree(root)
 }
+
+export default getReactStack

packages/react-hot-loader/src/internal/reactUtils.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-underscore-dangle */
 
 export const getComponentDisplayName = type =>
-  type.displayName || type.name || 'Unknown'
+  type.displayName || type.name || 'Component'
 
 export const getReactInstance = instance =>
   instance._reactInternalFiber ||

packages/react-hot-loader/src/reactHotLoader.js

@@ -12,20 +12,12 @@ function resolveType(type, disableComponentProxy) {
     return type
   }
 
-  // always could...
-  const couldWrapWithProxy = true
-
   // is proxing is disabled - do not create auto proxies, but use the old ones
-  const proxy =
-    !disableComponentProxy && couldWrapWithProxy
-      ? createProxyForType(type)
-      : getProxyByType(type)
+  const proxy = disableComponentProxy
+    ? getProxyByType(type)
+    : createProxyForType(type)
 
-  if (!proxy) {
-    return type
-  }
-
-  return proxy.get()
+  return proxy ? proxy.get() : type
 }
 
 const reactHotLoader = {
@@ -41,14 +33,11 @@ const reactHotLoader = {
     if (typeof uniqueLocalName !== 'string' || typeof fileName !== 'string') {
       return
     }
-    const id = fileName + '#' + uniqueLocalName // eslint-disable-line prefer-template
 
-    updateProxyById(id, type)
+    updateProxyById(`${fileName}#${uniqueLocalName}`, type)
   },
 
-  reset(useWeakMap) {
-    resetProxies(useWeakMap)
-  },
+  reset: resetProxies,
 
   patch(React) {
     if (!React.createElement.isPatchedByReactHotLoader) {