Fix loading showing before pastDelay (#6628)

vercel · Mar 12, 2019 · e2944c0 · e2944c0
1 parent 8cf6ef5
commit e2944c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/packages/next-server/lib/dynamic.js b/packages/next-server/lib/dynamic.js
@@ -25,7 +25,8 @@ export default function dynamic (dynamicOptions, options) {
   let loadableFn = Loadable
   let loadableOptions = {
     // A loading component is not required, so we default it
-    loading: ({ error, isLoading }) => {
+    loading: ({ error, isLoading, pastDelay }) => {
+      if (!pastDelay) return null
       if (process.env.NODE_ENV === 'development') {
         if (isLoading) {
           return <DefaultLoading />

diff --git a/test/integration/basic/test/dynamic.js b/test/integration/basic/test/dynamic.js
@@ -74,10 +74,10 @@ export default (context, render) => {
       })
     })
     describe('ssr:false option', () => {
-      it('should render loading on the server side', async () => {
+      it('should not render loading on the server side', async () => {
         const $ = await get$('/dynamic/no-ssr')
         expect($('body').html()).not.toContain('"dynamicIds"')
-        expect($('p').text()).toBe('loading...')
+        expect($('body').text()).not.toMatch('loading...')
       })
 
       it('should render the component on client side', async () => {

diff --git a/test/integration/production/test/dynamic.js b/test/integration/production/test/dynamic.js
@@ -30,9 +30,9 @@ export default (context, render) => {
       })
     })
     describe('ssr:false option', () => {
-      it('should render loading on the server side', async () => {
+      it('should not render loading on the server side', async () => {
         const $ = await get$('/dynamic/no-ssr')
-        expect($('p').text()).toBe('loading...')
+        expect($('body').text()).not.toMatch('loading...')
       })
 
       it('should render the component on client side', async () => {