Skip to content

Commit b98f197

Browse files
authored
Update to latest versions of React, Material-UI (#68)
* Bump all dependencies * Update version * Update grid properties * Remove material lab package * Remove duplicate copy of react from docs * Cast available assets * Capture and print React errors * Fix newline wrapping of circular progress with container div * Remove three and material UI as dependencies of docs
1 parent e3bc0d3 commit b98f197

File tree

13 files changed

+3403
-4495
lines changed

13 files changed

+3403
-4495
lines changed

docs/package-lock.json

Lines changed: 2241 additions & 3162 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/package.json

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,16 @@
1414
],
1515
"author": "Saltie",
1616
"license": "MIT",
17-
"dependencies": {
18-
"@material-ui/core": "^3.9.3",
19-
"@material-ui/lab": "^3.0.0-alpha.30",
20-
"react": "^16.8.6",
21-
"react-dom": "^16.8.6",
22-
"three": "^0.108.0"
23-
},
17+
"dependencies": {},
2418
"devDependencies": {
25-
"@types/react-dom": "^16.8.4",
19+
"@types/react-dom": "^16.9.4",
2620
"autodll-webpack-plugin": "^0.4.2",
2721
"awesome-typescript-loader": "^5.2.1",
28-
"file-loader": "^3.0.1",
22+
"file-loader": "^4.2.0",
2923
"html-webpack-plugin": "^3.2.0",
30-
"typescript": "^3.4.5",
31-
"webpack": "^4.30.0",
32-
"webpack-dev-server": "^3.3.1"
24+
"typescript": "^3.7.2",
25+
"webpack": "^4.41.2",
26+
"webpack-dev-server": "^3.9.0"
3327
},
3428
"browserslist": [
3529
">0.2%",

docs/src/components/CompactViewer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class CompactViewer extends Component<Props, State> {
3131
}
3232

3333
return (
34-
<Grid container direction="column" justify="center" spacing={24}>
34+
<Grid container direction="column" justify="center" spacing={3}>
3535
<Grid item style={{ minHeight: 0, maxWidth: 900, width: "100%" }}>
3636
<ReplayViewer gameManager={gameManager}>
3737
<CompactPlayControls />

docs/src/components/Main.tsx

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
import React, { Component } from "react"
2-
3-
import {
4-
FPSClock,
5-
GameBuilderOptions,
6-
loadReplay,
7-
ReplayData,
8-
ReplayMetadata,
9-
} from "../../../src"
1+
import React, { Component, ErrorInfo } from "react"
2+
3+
import { FPSClock, GameBuilderOptions, loadReplay } from "../../../src"
104
import CompactViewer from "./CompactViewer"
115
import Viewer from "./Viewer"
126

@@ -16,6 +10,8 @@ interface Props {
1610

1711
interface State {
1812
options?: GameBuilderOptions
13+
error?: Error
14+
errorInfo?: ErrorInfo
1915
}
2016

2117
class Main extends Component<Props, State> {
@@ -38,12 +34,19 @@ class Main extends Component<Props, State> {
3834
})
3935
}
4036

37+
componentDidCatch(error: Error, errorInfo: ErrorInfo) {
38+
this.setState({ error, errorInfo })
39+
}
40+
4141
render() {
42-
const { options } = this.state
42+
const { options, error, errorInfo } = this.state
4343

4444
if (!options) {
4545
return "Loading..."
46+
} else if (error || errorInfo) {
47+
return JSON.stringify(error)
4648
}
49+
4750
return this.props.compact ? (
4851
<CompactViewer options={options} />
4952
) : (

docs/src/components/Viewer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Viewer extends Component<Props, State> {
4141
className={root}
4242
direction="column"
4343
justify="center"
44-
spacing={24}
44+
spacing={3}
4545
>
4646
<Grid item style={{ minHeight: 0, maxWidth: 900, width: "100%" }}>
4747
<ReplayViewer gameManager={gameManager} autoplay />
@@ -51,7 +51,7 @@ class Viewer extends Component<Props, State> {
5151
container
5252
justify="space-between"
5353
alignItems="center"
54-
spacing={24}
54+
spacing={3}
5555
>
5656
<Grid item>
5757
<PlayControls />

0 commit comments

Comments
 (0)