Page MenuHomePhabricator
Files F3523267

D5983.diff
No OneTemporary
Actions

D5983.diff
View Options

diff --git a/keyserver/src/responders/website-responders.js b/keyserver/src/responders/website-responders.js
--- a/keyserver/src/responders/website-responders.js
+++ b/keyserver/src/responders/website-responders.js
@@ -6,9 +6,6 @@
import _keyBy from 'lodash/fp/keyBy';
import * as React from 'react';
import ReactDOMServer from 'react-dom/server';
-import { Provider } from 'react-redux';
-import { Route, StaticRouter } from 'react-router';
-import { createStore, type Store } from 'redux';
import { promisify } from 'util';
import { daysToEntriesFromEntryInfos } from 'lib/reducers/entry-reducer';
@@ -31,8 +28,6 @@
import { currentDateInTimeZone } from 'lib/utils/date-utils';
import { ServerError } from 'lib/utils/errors';
import { promiseAll } from 'lib/utils/promises';
-import { reducer } from 'web/redux/redux-setup';
-import type { AppState, Action } from 'web/redux/redux-setup';
import getTitle from 'web/title/getTitle';
import { navInfoFromURL } from 'web/url-utils';
@@ -131,7 +126,7 @@
const baseURL = basePath.replace(/\/$/, '');
const baseHref = baseDomain + baseURL;
- const appPromise = getWebpackCompiledRootComponentForSSR();
+ const loadingPromise = getWebpackCompiledRootComponentForSSR();
let initialNavInfo;
try {
@@ -303,7 +298,18 @@
<div id="react-root">
`);
- const statePromises = {
+ const Loading = await loadingPromise;
+ const reactStream = renderToNodeStream(<Loading />);
+ reactStream.pipe(res, { end: false });
+
+ await waitForStream(reactStream);
+ res.write(html`
+ </div>
+ <script>
+ var preloadedState =
+ `);
+
+ const initialReduxState: any = await promiseAll({
navInfo: navInfoPromise,
deviceID: null,
currentUserInfo: ((currentUserInfoPromise: any): Promise<CurrentUserInfo>),
@@ -332,53 +338,15 @@
queuedReports: [],
},
nextLocalID: 0,
- timeZone: viewer.timeZone,
- userAgent: viewer.userAgent,
cookie: undefined,
deviceToken: undefined,
dataLoaded: viewer.loggedIn,
windowActive: true,
userPolicies: {},
_persist: null,
- };
-
- const [stateResult, App] = await Promise.all([
- promiseAll(statePromises),
- appPromise,
- ]);
- const state: AppState = { ...stateResult };
- const store: Store<AppState, Action> = createStore(reducer, state);
+ });
+ const jsonStream = streamJSON(res, initialReduxState);
- const routerContext = {};
- const clientPath = baseURL + req.url;
- const reactStream = renderToNodeStream(
- <Provider store={store}>
- <StaticRouter
- location={clientPath}
- basename={baseURL}
- context={routerContext}
- >
- <Route path="*" component={App} />
- </StaticRouter>
- </Provider>,
- );
- if (routerContext.url) {
- throw new ServerError('URL modified during server render!');
- }
- reactStream.pipe(res, { end: false });
- await waitForStream(reactStream);
- res.write(html`
- </div>
- <script>
- var preloadedState =
- `);
-
- const filteredStatePromises = {
- ...statePromises,
- timeZone: null,
- userAgent: null,
- };
- const jsonStream = streamJSON(res, filteredStatePromises);
await waitForStream(jsonStream);
res.end(html`
;
diff --git a/web/webpack.config.cjs b/web/webpack.config.cjs
--- a/web/webpack.config.cjs
+++ b/web/webpack.config.cjs
@@ -55,7 +55,7 @@
const baseNodeServerRenderingConfig = {
externals: ['react', 'react-dom', 'react-redux'],
entry: {
- keyserver: ['./app.react.js'],
+ keyserver: ['./loading.react.js'],
},
output: {
filename: 'app.build.cjs',

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 24, 8:50 AM (17 h, 1 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2699302
Default Alt Text
D5983.diff (3 KB)

Event Timeline