Skip to content

Commit 5f5813b

Browse files
authored
Merge pull request #491 from AllyMurray/master
React package updates
2 parents ea01ef0 + 710bb54 commit 5f5813b

File tree

7 files changed

+3729
-3489
lines changed

7 files changed

+3729
-3489
lines changed

reactjs/package-lock.json

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

reactjs/package.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,26 @@
44
"private": true,
55
"dependencies": {
66
"@aspnet/signalr": "^1.1.4",
7-
"@craco/craco": "^5.2.1",
8-
"@types/classnames": "^2.2.8",
9-
"@types/moment": "^2.13.0",
10-
"@types/moment-timezone": "^0.5.12",
11-
"@types/react-document-title": "^2.0.3",
12-
"@types/react-loadable": "^5.5.1",
13-
"@types/recharts": "^1.1.16",
14-
"abp-web-resources": "^3.8.5",
15-
"antd": "^3.19.2",
7+
"@craco/craco": "^5.6.2",
8+
"abp-web-resources": "^4.1.0",
9+
"antd": "^3.26.0",
1610
"axios": "^0.19.0",
1711
"classnames": "^2.2.6",
18-
"craco-antd": "^1.11.0",
12+
"craco-antd": "^1.14.1",
1913
"famfamfam-flags": "^1.0.0",
20-
"lodash": "^4.17.11",
21-
"mobx": "^5.10.1",
22-
"mobx-react": "^6.0.3",
14+
"lodash": "^4.17.15",
15+
"mobx": "^5.15.0",
16+
"mobx-react": "^6.1.4",
2317
"moment": "^2.24.0",
24-
"moment-timezone": "^0.5.25",
25-
"query-string": "^6.7.0",
26-
"react": "^16.8.6",
18+
"moment-timezone": "^0.5.27",
19+
"query-string": "^6.9.0",
20+
"react": "^16.12.0",
2721
"react-document-title": "^2.0.3",
28-
"react-dom": "^16.8.6",
22+
"react-dom": "^16.12.0",
2923
"react-loadable": "^5.5.0",
30-
"react-router-dom": "^5.0.1",
31-
"react-scripts": "^3.0.1",
32-
"recharts": "^1.6.2"
24+
"react-router-dom": "^5.1.2",
25+
"react-scripts": "^3.2.0",
26+
"recharts": "^1.8.5"
3327
},
3428
"scripts": {
3529
"start": "craco start",
@@ -38,14 +32,20 @@
3832
"eject": "react-scripts eject"
3933
},
4034
"devDependencies": {
41-
"@types/jest": "^24.0.13",
42-
"@types/node": "^12.0.7",
43-
"@types/react": "^16.8.19",
44-
"@types/react-dom": "^16.8.4",
45-
"@types/react-router-dom": "^4.3.3",
46-
"copy-webpack-plugin": "^5.0.3",
47-
"ts-import-plugin": "^1.5.5",
48-
"typescript": "^3.5.1"
35+
"@types/classnames": "^2.2.9",
36+
"@types/jest": "^24.0.23",
37+
"@types/moment": "^2.13.0",
38+
"@types/moment-timezone": "^0.5.12",
39+
"@types/node": "^12.12.14",
40+
"@types/react": "^16.9.13",
41+
"@types/react-document-title": "^2.0.3",
42+
"@types/react-dom": "^16.9.4",
43+
"@types/react-loadable": "^5.5.2",
44+
"@types/react-router-dom": "^5.1.3",
45+
"@types/recharts": "^1.8.3",
46+
"copy-webpack-plugin": "^5.0.5",
47+
"ts-import-plugin": "^1.6.1",
48+
"typescript": "^3.7.2"
4949
},
5050
"browserslist": {
5151
"production": [

reactjs/src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export interface IAppProps {
1414

1515
@inject(Stores.SessionStore)
1616
class App extends React.Component<IAppProps> {
17-
async componentWillMount() {
17+
async componentDidMount() {
1818
await this.props.sessionStore!.getCurrentLoginInformations();
1919

2020
if (!!this.props.sessionStore!.currentLogin.user && this.props.sessionStore!.currentLogin.application.features['SignalR']) {

0 commit comments

Comments
 (0)