Skip to content
This repository was archived by the owner on Dec 9, 2021. It is now read-only.

Rename #20

Merged
merged 3 commits into from
Apr 15, 2018
Merged

Rename #20

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89fccd9
rename services to utilities because there is already services in the…
codeBelt Apr 15, 2018
4f19db9
make client.tsx async ready
codeBelt Apr 15, 2018
90f9295
update packages
codeBelt Apr 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
make client.tsx async ready
  • Loading branch information
@codeBelt
codeBelt committed Apr 15, 2018
commit 4f19db901b6d5ca750d090cf56cb63c4885725e0
76 changes: 40 additions & 36 deletions src/client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,46 @@ import ProviderUtility from './utilities/ProviderUtility';
import IStore from './stores/IStore';
import ISagaStore from './stores/ISagaStore';

const codeSplittingState = window.__ASYNC_COMPONENTS_STATE__;
const serverState: IStore = window.__STATE__;
const initialState: IStore = {
...serverState,
renderReducer: {
...serverState.renderReducer,
isServerSide: false,
},
};

const history: History = createBrowserHistory();
const store: ISagaStore<IStore> = ProviderUtility.createProviderStore(initialState, history);
const rootEl: HTMLElement = document.getElementById('root');

delete window.__STATE__;
delete window.__ASYNC_COMPONENTS_STATE__;

const composeApp = (Component: any) => (
<ReactHotLoader key={Math.random()}>
<AsyncComponentProvider rehydrateState={codeSplittingState}>
<Component store={store} history={history} />
</AsyncComponentProvider>
</ReactHotLoader>
);

const renderApp = () => {
const routerWrapper = require('./RouterWrapper').default; // tslint:disable-line:no-require-imports

ReactDOM.hydrate(
composeApp(routerWrapper),
rootEl,
(async (window: Window) => {

const codeSplittingState = window.__ASYNC_COMPONENTS_STATE__;
const serverState: IStore = window.__STATE__;
const initialState: IStore = {
...serverState,
renderReducer: {
...serverState.renderReducer,
isServerSide: false,
},
};

const history: History = createBrowserHistory();
const store: ISagaStore<IStore> = ProviderUtility.createProviderStore(initialState, history);
const rootEl: HTMLElement = document.getElementById('root');

delete window.__STATE__;
delete window.__ASYNC_COMPONENTS_STATE__;

const composeApp = (Component: any) => (
<ReactHotLoader key={Math.random()}>
<AsyncComponentProvider rehydrateState={codeSplittingState}>
<Component store={store} history={history} />
</AsyncComponentProvider>
</ReactHotLoader>
);
};

bootstrap(composeApp(RouterWrapper)).then(renderApp);
const renderApp = () => {
const routerWrapper = require('./RouterWrapper').default; // tslint:disable-line:no-require-imports

if (module.hot) {
module.hot.accept('./RouterWrapper', renderApp);
}
ReactDOM.hydrate(
composeApp(routerWrapper),
rootEl,
);
};

bootstrap(composeApp(RouterWrapper)).then(renderApp);

if (module.hot) {
module.hot.accept('./RouterWrapper', renderApp);
}

})(window);