Merge pull request #89 from smooth-code/fix-ssr

chore: properly fix SSR
gregberge · May 23, 2018 · 7292e22 · 7292e22
2 parents c66702c + cd13658
commit 7292e22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/server/index.js b/src/server/index.js
@@ -1,7 +1,8 @@
 /* eslint-disable react/no-danger, no-underscore-dangle */
 import React from 'react'
+// eslint-disable-next-line import/no-unresolved, import/extensions
+import { componentTracker } from 'loadable-components'
 import { LOADABLE } from '../constants'
-import { reset as resetTracker } from '../componentTracker'
 import DeferredState from './DeferredState'
 
 function isReactElement(element) {
@@ -174,7 +175,7 @@ export function getLoadableState(
   tree = {},
 ) {
   // Prevent duplicated components
-  resetTracker()
+  componentTracker.reset()
 
   const queries = getQueriesFromTree({ rootElement, rootContext }, fetchRoot)
 

diff --git a/src/server/index.test.js b/src/server/index.test.js
@@ -44,7 +44,7 @@ describe('server side rendering', () => {
       app = <App />
     })
 
-    it.only('should traverse context', async () => {
+    it('should traverse context', async () => {
       const loadableState = await getLoadableState(app)
       expect(loadableState.tree).toEqual({
         children: [{ children: [{ id: './Book' }], id: './Books' }],