Skip to content

Commit

Permalink
Merge branch 'canary' into static/indicator
Browse files Browse the repository at this point in the history
  • Loading branch information
ijjk committed Jun 28, 2019
2 parents bc443ae + ec958a3 commit b5fe3af
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions packages/next-server/lib/dynamic.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ export function noSSR<P = {}>(
)
}

function DefaultLoading() {
return <p>loading...</p>
}

// function dynamic<P = {}, O extends DynamicOptions>(options: O):

export default function dynamic<P = {}>(
Expand All @@ -83,7 +79,7 @@ export default function dynamic<P = {}>(
if (!pastDelay) return null
if (process.env.NODE_ENV === 'development') {
if (isLoading) {
return <DefaultLoading />
return null
}
if (error) {
return (
Expand All @@ -96,7 +92,7 @@ export default function dynamic<P = {}>(
}
}

return <DefaultLoading />
return null
},
}

Expand Down

0 comments on commit b5fe3af

Please sign in to comment.