From a0d229d808b071c4ef808b76444eb04d9e622dbd Mon Sep 17 00:00:00 2001 From: Endilie Yacop Sucipto Date: Thu, 8 Nov 2018 11:19:37 +0800 Subject: [PATCH] feat(v2): better UX to avoid flashing screen on first page reload (#1100) --- v2/lib/core/clientEntry.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/v2/lib/core/clientEntry.js b/v2/lib/core/clientEntry.js index 001eaea047..8e32531fde 100644 --- a/v2/lib/core/clientEntry.js +++ b/v2/lib/core/clientEntry.js @@ -6,15 +6,16 @@ */ import React from 'react'; -import Loadable from 'react-loadable'; import {BrowserRouter} from 'react-router-dom'; import ReactDOM from 'react-dom'; import App from './App'; +import preload from './preload'; +import routes from '@generated/routes'; // eslint-disable-line // Client side render (e.g: running in browser) to become single-page application (SPA) -if (typeof document !== 'undefined') { - Loadable.preloadReady().then(() => { +if (typeof window !== 'undefined' && typeof document !== 'undefined') { + preload(routes, window.location.pathname).then(() => { ReactDOM.render(