Skip to content

Commit d9a09be

Browse files
author
Sven
committed
refactor: upgrade react 16.0.0 react-dom 16.0.0🦊
1 parent 40eafc9 commit d9a09be

File tree

4 files changed

+44
-35
lines changed

4 files changed

+44
-35
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"object-assign": "^4.1.1",
2626
"promise": "^8.0.1",
2727
"prop-types": "^15.5.10",
28-
"react": "^15.6.1",
29-
"react-dom": "^15.5.4",
28+
"react": "^16.0.0",
29+
"react-dom": "^16.0.0",
3030
"react-loadable": "^4.0.5",
3131
"react-redux": "^5.0.6",
3232
"react-router-dom": "^4.2.2",

src/components/Loading.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function Loading(props) {
77
// While our other component is loading...
88
if (props.timedOut) {
99
// In case we've timed out loading our other component.
10-
return <div>Loader timed out!</div>
10+
return 'Loader timed out!'
1111
} else if (props.pastDelay) {
1212
// Display a loading screen after a set delay.
1313
return <Spinner name="cube-grid" color="purple" style={{ margin: 'auto' }} />
@@ -17,7 +17,7 @@ function Loading(props) {
1717
}
1818
} else if (props.error) {
1919
// If we aren't loading, maybe
20-
return <div>Error! Component failed to load</div>
20+
return 'Error! Component failed to load'
2121
} else {
2222
// This case shouldn't happen... but we'll return null anyways.
2323
return null

src/routes/Zen/components/Zen.jsx

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ import PropTypes from 'prop-types'
33
import Spinner from 'react-spinkit'
44
import { Button } from 'reactstrap'
55

6-
const propTypes = {
7-
fetchZen: PropTypes.func.isRequired,
8-
clearZen: PropTypes.func.isRequired,
9-
zen: PropTypes.shape({
10-
fetching: PropTypes.bool.isRequired,
11-
text: PropTypes.array,
12-
}).isRequired,
13-
}
14-
156
function Zen({ fetchZen, clearZen, zen: { fetching, text } }) {
167
return (
178
<div>
@@ -32,6 +23,13 @@ function Zen({ fetchZen, clearZen, zen: { fetching, text } }) {
3223
</div>)
3324
}
3425

35-
Zen.propTypes = propTypes
26+
Zen.propTypes = {
27+
fetchZen: PropTypes.func.isRequired,
28+
clearZen: PropTypes.func.isRequired,
29+
zen: PropTypes.shape({
30+
fetching: PropTypes.bool.isRequired,
31+
text: PropTypes.array,
32+
}).isRequired,
33+
}
3634

3735
export default Zen

yarn.lock

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,14 +1392,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
13921392
safe-buffer "^5.0.1"
13931393
sha.js "^2.4.8"
13941394

1395-
create-react-class@^15.6.0:
1396-
version "15.6.0"
1397-
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.0.tgz#ab448497c26566e1e29413e883207d57cfe7bed4"
1398-
dependencies:
1399-
fbjs "^0.8.9"
1400-
loose-envify "^1.3.1"
1401-
object-assign "^4.1.1"
1402-
14031395
cross-env@^5.0.5:
14041396
version "5.0.5"
14051397
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.0.5.tgz#4383d364d9660873dd185b398af3bfef5efffef3"
@@ -2142,6 +2134,18 @@ fastparse@^1.1.1:
21422134
version "1.1.1"
21432135
resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
21442136

2137+
fbjs@^0.8.16:
2138+
version "0.8.16"
2139+
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
2140+
dependencies:
2141+
core-js "^1.0.0"
2142+
isomorphic-fetch "^2.1.1"
2143+
loose-envify "^1.0.0"
2144+
object-assign "^4.1.0"
2145+
promise "^7.1.1"
2146+
setimmediate "^1.0.5"
2147+
ua-parser-js "^0.7.9"
2148+
21452149
fbjs@^0.8.9:
21462150
version "0.8.14"
21472151
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.14.tgz#d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c"
@@ -4058,6 +4062,14 @@ prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8:
40584062
fbjs "^0.8.9"
40594063
loose-envify "^1.3.1"
40604064

4065+
prop-types@^15.6.0:
4066+
version "15.6.0"
4067+
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
4068+
dependencies:
4069+
fbjs "^0.8.16"
4070+
loose-envify "^1.3.1"
4071+
object-assign "^4.1.1"
4072+
40614073
proxy-addr@~1.1.5:
40624074
version "1.1.5"
40634075
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918"
@@ -4144,14 +4156,14 @@ rc@^1.1.7:
41444156
minimist "^1.2.0"
41454157
strip-json-comments "~2.0.1"
41464158

4147-
react-dom@^15.5.4:
4148-
version "15.6.1"
4149-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.1.tgz#2cb0ed4191038e53c209eb3a79a23e2a4cf99470"
4159+
react-dom@^16.0.0:
4160+
version "16.0.0"
4161+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0.tgz#9cc3079c3dcd70d4c6e01b84aab2a7e34c303f58"
41504162
dependencies:
4151-
fbjs "^0.8.9"
4163+
fbjs "^0.8.16"
41524164
loose-envify "^1.1.0"
4153-
object-assign "^4.1.0"
4154-
prop-types "^15.5.10"
4165+
object-assign "^4.1.1"
4166+
prop-types "^15.6.0"
41554167

41564168
react-loadable@^4.0.5:
41574169
version "4.0.5"
@@ -4214,15 +4226,14 @@ react-transition-group@^1.1.2:
42144226
prop-types "^15.5.6"
42154227
warning "^3.0.0"
42164228

4217-
react@^15.6.1:
4218-
version "15.6.1"
4219-
resolved "https://registry.yarnpkg.com/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df"
4229+
react@^16.0.0:
4230+
version "16.0.0"
4231+
resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d"
42204232
dependencies:
4221-
create-react-class "^15.6.0"
4222-
fbjs "^0.8.9"
4233+
fbjs "^0.8.16"
42234234
loose-envify "^1.1.0"
4224-
object-assign "^4.1.0"
4225-
prop-types "^15.5.10"
4235+
object-assign "^4.1.1"
4236+
prop-types "^15.6.0"
42264237

42274238
reactstrap-tether@1.3.4:
42284239
version "1.3.4"

0 commit comments

Comments
 (0)