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

update react-async-bootstrapper #19

Merged
merged 1 commit into from Mar 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -118,7 +118,7 @@
"inert": "5.1.0",
"node-notifier": "5.2.1",
"react": "16.2.0",
"react-async-bootstrapper": "1.1.2",
"react-async-bootstrapper": "2.1.0",
"react-async-component": "1.0.2",
"react-dom": "16.2.0",
"react-hot-loader": "3.1.3",
Expand Down
4 changes: 2 additions & 2 deletions src/client.tsx
Expand Up @@ -2,12 +2,12 @@ import 'bootstrap/dist/css/bootstrap.css';
import './assets/styles/screen.scss';

import 'fetch-everywhere';
import * as bootstrap from 'react-async-bootstrapper';
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import {History, createBrowserHistory} from 'history';
import {AppContainer as ReactHotLoader} from 'react-hot-loader';
import {AsyncComponentProvider} from 'react-async-component';
import asyncBootstrapper from 'react-async-bootstrapper';
import RouterWrapper from './RouterWrapper';
import ProviderService from './services/ProviderService';
import IStore from './stores/IStore';
Expand Down Expand Up @@ -47,7 +47,7 @@ const renderApp = () => {
);
};

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

if (module.hot) {
module.hot.accept('./RouterWrapper', renderApp);
Expand Down
4 changes: 2 additions & 2 deletions src/server/controllers/ReactController.tsx
@@ -1,6 +1,6 @@
import {renderToString} from 'react-dom/server';
import {AsyncComponentProvider, createAsyncContext} from 'react-async-component';
import asyncBootstrapper from 'react-async-bootstrapper';
import * as bootstrap from 'react-async-bootstrapper';
import * as serialize from 'serialize-javascript';
import * as path from 'path';
import * as fse from 'fs-extra';
Expand Down Expand Up @@ -38,7 +38,7 @@ class ReactController implements IController {

this._html = (this._html === null) ? await this._loadHtmlFile() : this._html;

await asyncBootstrapper(app);
await bootstrap(app);

const sagaDone: Promise<any> = store.runSaga(rootSaga).done;

Expand Down
14 changes: 7 additions & 7 deletions yarn.lock
Expand Up @@ -5412,11 +5412,11 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

react-async-bootstrapper@1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/react-async-bootstrapper/-/react-async-bootstrapper-1.1.2.tgz#3e255a9981b6fbac3553089846eb7a8632c47797"
react-async-bootstrapper@2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/react-async-bootstrapper/-/react-async-bootstrapper-2.1.0.tgz#a3f593881bf5b262b06309eb9158c6c9fc5dc6fa"
dependencies:
react-tree-walker "^2.1.3"
react-tree-walker "^4.0.2"

react-async-component@1.0.2:
version "1.0.2"
Expand Down Expand Up @@ -5493,9 +5493,9 @@ react-router@4.2.0, react-router@^4.2.0:
prop-types "^15.5.4"
warning "^3.0.0"

react-tree-walker@^2.1.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/react-tree-walker/-/react-tree-walker-2.1.3.tgz#e781dd7ba9b5c50cc6300e3388b490f2b43b6295"
react-tree-walker@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/react-tree-walker/-/react-tree-walker-4.0.2.tgz#a50df477ba9f0559584d19944b669fefa2a5669f"

react@16.2.0:
version "16.2.0"
Expand Down