Skip to content
This repository was archived by the owner on Nov 16, 2018. It is now read-only.

update react-async-bootstrapper #35

Merged
merged 1 commit into from
Mar 24, 2018
Merged

update react-async-bootstrapper #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,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",
Copy link

@ctrlplusb ctrlplusb Mar 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to update to the latest react-async-component otherwise you will get deprecation warnings 👍

"react-dom": "16.2.0",
"react-hot-loader": "3.1.3",
Expand Down
4 changes: 2 additions & 2 deletions src/client.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ReactDOM from 'react-dom';
import {createBrowserHistory} from 'history';
import {AppContainer as ReactHotLoader} from 'react-hot-loader';
import {AsyncComponentProvider} from 'react-async-component';
import asyncBootstrapper from 'react-async-bootstrapper';
import bootstrap from 'react-async-bootstrapper';
import RouterWrapper from './RouterWrapper';
import ProviderService from './services/ProviderService';

Expand Down Expand Up @@ -44,7 +44,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.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {renderToString} from 'react-dom/server';
import {AsyncComponentProvider, createAsyncContext} from 'react-async-component';
import asyncBootstrapper from 'react-async-bootstrapper';
import bootstrap from 'react-async-bootstrapper';
import serialize from 'serialize-javascript';
import path from 'path';
import fse from 'fs-extra';
Expand Down Expand Up @@ -34,7 +34,7 @@ class ReactController {

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

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

const sagaDone = store.runSaga(rootSaga).done;

Expand Down
14 changes: 7 additions & 7 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5890,11 +5890,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 @@ -5971,9 +5971,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