Skip to content

Commit 3f2a060

Browse files
committed
feat(upgrade to latest webpack that finally supports dynamic expressions within resolveWeak!):
1 parent 3534c01 commit 3f2a060

File tree

10 files changed

+240
-83
lines changed

10 files changed

+240
-83
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@
2828
"react": "^15.4.2",
2929
"react-dom": "^15.4.2",
3030
"react-redux": "^5.0.5",
31-
"react-universal-component": "^2.0.20",
31+
"react-universal-component": "^2.4.0",
3232
"redux": "^3.7.0",
3333
"redux-devtools-extension": "^2.13.2",
34-
"redux-first-router": "^1.9.6",
35-
"redux-first-router-link": "^1.1.3",
34+
"redux-first-router": "^1.9.15",
35+
"redux-first-router-link": "^1.1.4",
3636
"reselect": "^3.0.1",
3737
"transition-group": "^0.0.1",
38-
"webpack-dev-middleware": "^1.11.0",
39-
"webpack-flush-chunks": "^1.1.16"
38+
"webpack-flush-chunks": "^1.1.22"
4039
},
4140
"devDependencies": {
4241
"autodll-webpack-plugin": "^0.0.7",
@@ -67,8 +66,9 @@
6766
"rimraf": "^2.6.1",
6867
"stats-webpack-plugin": "^0.5.0",
6968
"travis-github-status": "^1.4.0",
70-
"webpack": "^3.0.0",
71-
"webpack-hot-middleware": "^2.17.1",
69+
"webpack": "^3.5.4",
70+
"webpack-dev-middleware": "^1.12.0",
71+
"webpack-hot-middleware": "^2.18.2",
7272
"webpack-hot-server-middleware": "^0.1.0",
7373
"write-file-webpack-plugin": "^4.1.0"
7474
},

src/components/Admin.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import React from 'react'
2+
import { admin } from '../css/Switcher'
3+
4+
export default () => <div className={admin}>U FIGURED OUT HOW TO DO AUTH!</div>

src/components/Error.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import React from 'react'
2+
import { notFound } from '../css/Switcher'
3+
4+
export default error =>
5+
<div className={notFound}>
6+
ERROR: {error.message}
7+
</div>

src/components/Loading.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import React from 'react'
2+
import { spinner } from '../css/Switcher'
3+
4+
export default () => <div className={spinner}><div /></div>

src/components/Login.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import React from 'react'
2+
import { login } from '../css/Switcher'
3+
4+
export default () => <div className={login}>YOU ARE NOT ALLOWED IN!</div>

src/components/NotFound.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import React from 'react'
2+
import { notFound } from '../css/Switcher'
3+
4+
export default () => <div className={notFound}>PAGE NOT FOUND - 404</div>

src/components/Switcher.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
import React from 'react'
22
import { connect } from 'react-redux'
33
import { TransitionGroup, Transition } from 'transition-group'
4-
import UniversalComponent from './UniversalComponent'
4+
import universal from 'react-universal-component'
55

6+
import Loading from './Loading'
67
import isLoading from '../selectors/isLoading'
78
import styles from '../css/Switcher'
89

10+
const UniversalComponent = universal(({ page }) => import(`./${page}`), {
11+
minDelay: 500,
12+
loading: Loading,
13+
error: Error
14+
})
15+
916
const Switcher = ({ page, direction, isLoading }) =>
1017
<TransitionGroup
1118
className={`${styles.switcher} ${direction}`}

src/components/UniversalComponent.js

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/css/Switcher.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
border: 1px solid rgb(30,30,30);
220220
box-sizing: border-box;
221221
padding: 10px;
222-
color: red;
222+
color: red !important;
223223
font-size: 32px;
224224
text-shadow: 1px 1px 1px black;
225225
display: flex;

0 commit comments

Comments
 (0)