fix: break cyclic dependency (#822)

Fixes #820
gaearon · Jan 25, 2018 · 328d793 · 328d793
1 parent 2f2e01f
commit 328d793
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/packages/react-hot-loader/src/reconciler/proxies.js b/packages/react-hot-loader/src/reconciler/proxies.js
@@ -1,13 +1,10 @@
-import createProxy, { setConfig } from 'react-stand-in'
-import logger from '../logger'
+import createProxy from 'react-stand-in'
 
 let proxiesByID
 let idsByType
 
 let elementCount = 0
 
-setConfig({ logger })
-
 const generateTypeId = () => `auto-${elementCount++}`
 
 export const getIdByType = type => idsByType.get(type)

diff --git a/packages/react-hot-loader/src/utils.dev.js b/packages/react-hot-loader/src/utils.dev.js
@@ -1,9 +1,11 @@
 import { getProxyByType } from './reconciler/proxies'
 import reactHotLoader from './reactHotLoader'
+import logger from './logger'
+import { setConfig as setProxyConfig } from 'react-stand-in'
+
+setProxyConfig({ logger })
 
 export const areComponentsEqual = (a, b) =>
   getProxyByType(a) === getProxyByType(b)
 
-export const setConfig = config => {
-  Object.assign(reactHotLoader.config, config)
-}
+export const setConfig = config => Object.assign(reactHotLoader.config, config)