Skip to content

Commit 691d0cd

Browse files
committed
remove redundant react-loadable
1 parent 1ab1326 commit 691d0cd

File tree

2 files changed

+14
-32
lines changed

2 files changed

+14
-32
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"react-app-polyfill": "^0.2.1",
3131
"react-chartjs-2": "^2.7.4",
3232
"react-dom": "^16.8.4",
33-
"react-loadable": "^5.5.0",
3433
"react-router-config": "^4.4.0-beta.6",
3534
"react-router-dom": "^4.3.1",
3635
"react-test-renderer": "^16.8.4",

src/App.js

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,33 @@
11
import React, { Component } from 'react';
22
import { HashRouter, Route, Switch } from 'react-router-dom';
33
// import { renderRoutes } from 'react-router-config';
4-
import Loadable from 'react-loadable';
54
import './App.scss';
65

76
const loading = () => <div className="animated fadeIn pt-3 text-center">Loading...</div>;
87

98
// Containers
10-
const DefaultLayout = Loadable({
11-
loader: () => import('./containers/DefaultLayout'),
12-
loading
13-
});
9+
const DefaultLayout = React.lazy(() => import('./containers/DefaultLayout'));
1410

1511
// Pages
16-
const Login = Loadable({
17-
loader: () => import('./views/Pages/Login'),
18-
loading
19-
});
20-
21-
const Register = Loadable({
22-
loader: () => import('./views/Pages/Register'),
23-
loading
24-
});
25-
26-
const Page404 = Loadable({
27-
loader: () => import('./views/Pages/Page404'),
28-
loading
29-
});
30-
31-
const Page500 = Loadable({
32-
loader: () => import('./views/Pages/Page500'),
33-
loading
34-
});
12+
const Login = React.lazy(() => import('./views/Pages/Login'));
13+
const Register = React.lazy(() => import('./views/Pages/Register'));
14+
const Page404 = React.lazy(() => import('./views/Pages/Page404'));
15+
const Page500 = React.lazy(() => import('./views/Pages/Page500'));
3516

3617
class App extends Component {
3718

3819
render() {
3920
return (
4021
<HashRouter>
41-
<Switch>
42-
<Route exact path="/login" name="Login Page" component={Login} />
43-
<Route exact path="/register" name="Register Page" component={Register} />
44-
<Route exact path="/404" name="Page 404" component={Page404} />
45-
<Route exact path="/500" name="Page 500" component={Page500} />
46-
<Route path="/" name="Home" component={DefaultLayout} />
47-
</Switch>
22+
<React.Suspense fallback={loading()}>
23+
<Switch>
24+
<Route exact path="/login" name="Login Page" component={Login} />
25+
<Route exact path="/register" name="Register Page" component={Register} />
26+
<Route exact path="/404" name="Page 404" component={Page404} />
27+
<Route exact path="/500" name="Page 500" component={Page500} />
28+
<Route path="/" name="Home" component={DefaultLayout} />
29+
</Switch>
30+
</React.Suspense>
4831
</HashRouter>
4932
);
5033
}

0 commit comments

Comments
 (0)