From 79ea2b6da160b24f03d5d63ea696e7f8b1507041 Mon Sep 17 00:00:00 2001 From: codeBelt Date: Sat, 24 Mar 2018 18:34:18 -0500 Subject: [PATCH] update react-async-bootstrapper --- package.json | 2 +- src/client.tsx | 4 ++-- src/server/controllers/ReactController.tsx | 4 ++-- yarn.lock | 14 +++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 308636f..ac2198e 100755 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/client.tsx b/src/client.tsx index b3bd04d..7876463 100755 --- a/src/client.tsx +++ b/src/client.tsx @@ -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'; @@ -47,7 +47,7 @@ const renderApp = () => { ); }; -asyncBootstrapper(composeApp(RouterWrapper)).then(renderApp); +bootstrap(composeApp(RouterWrapper)).then(renderApp); if (module.hot) { module.hot.accept('./RouterWrapper', renderApp); diff --git a/src/server/controllers/ReactController.tsx b/src/server/controllers/ReactController.tsx index 5e0fe9a..2247210 100644 --- a/src/server/controllers/ReactController.tsx +++ b/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'; @@ -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 = store.runSaga(rootSaga).done; diff --git a/yarn.lock b/yarn.lock index abe1328..ad049ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -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"