Skip to content

Commit 5b4233c

Browse files
pyphiliapyphilia
committed
build: update dependencies
1 parent f16b7fb commit 5b4233c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1822
-2066
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,6 @@ test/tmp
6767

6868
# exclude app update file
6969
dev-app-update.yml
70+
71+
# exclude eslint cache
72+
.eslintcache

‎package.json

+33-33
Original file line numberDiff line numberDiff line change
@@ -71,62 +71,62 @@
7171
"mocha": "mkdirp test/tmp && concurrently \"env-cmd -f ./.env.test react-scripts start\" \"wait-on http://localhost:3000 && yarn mocha:run\""
7272
},
7373
"dependencies": {
74-
"@material-ui/core": "4.11.0",
75-
"@material-ui/icons": "4.9.1",
76-
"@sentry/browser": "5.27.4",
77-
"@sentry/electron": "2.0.3",
74+
"@material-ui/core": "4.11.2",
75+
"@material-ui/icons": "4.11.2",
76+
"@sentry/browser": "6.0.0",
77+
"@sentry/electron": "2.1.0",
7878
"about-window": "1.13.4",
79-
"archiver": "5.0.2",
79+
"archiver": "5.2.0",
8080
"bson-objectid": "1.3.1",
8181
"chai": "4.2.0",
82-
"cheerio": "1.0.0-rc.3",
82+
"cheerio": "1.0.0-rc.5",
8383
"classnames": "2.2.6",
8484
"clsx": "1.1.1",
8585
"connected-react-router": "6.8.0",
8686
"download": "8.0.0",
8787
"electron-devtools-installer": "3.1.1",
8888
"electron-is-dev": "1.2.0",
89-
"electron-log": "4.3.0",
89+
"electron-log": "4.3.1",
9090
"electron-publisher-s3": "20.17.2",
9191
"electron-updater": "4.3.5",
9292
"enzyme": "3.11.0",
93-
"enzyme-adapter-react-16": "1.15.5",
93+
"enzyme-adapter-react-16": "1.15.6",
9494
"extract-zip": "2.0.1",
95-
"fs-extra": "9.0.1",
95+
"fs-extra": "9.1.0",
9696
"history": "5.0.0",
97-
"i18next": "19.8.3",
97+
"i18next": "19.8.4",
9898
"immutable": "4.0.0-rc.12",
9999
"is-online": "9.0.0",
100100
"katex": "0.12.0",
101101
"lodash": "4.17.20",
102102
"lowdb": "1.0.0",
103103
"md5": "2.3.0",
104-
"mime-types": "2.1.27",
104+
"mime-types": "2.1.28",
105105
"mkdirp": "1.0.4",
106106
"mocha": "8.2.1",
107107
"node-machine-id": "1.1.12",
108108
"prop-types": "15.7.2",
109-
"qs": "6.9.4",
109+
"qs": "6.9.6",
110110
"re-resizable": "6.9.0",
111111
"react": "17.0.1",
112112
"react-countup": "4.3.3",
113-
"react-detect-offline": "2.4.0",
114-
"react-dev-utils": "11.0.0",
113+
"react-detect-offline": "2.4.1",
114+
"react-dev-utils": "11.0.1",
115115
"react-diff-viewer": "3.1.1",
116116
"react-dom": "17.0.1",
117-
"react-i18next": "11.7.3",
117+
"react-i18next": "11.8.5",
118118
"react-immutable-proptypes": "2.2.0",
119-
"react-joyride": "2.2.1",
120-
"react-json-view": "1.19.1",
119+
"react-joyride": "2.3.0",
120+
"react-json-view": "1.20.2",
121121
"react-loading": "2.0.3",
122122
"react-quill": "1.3.5",
123123
"react-redux": "7.2.2",
124124
"react-redux-toastr": "7.6.5",
125125
"react-router": "5.2.0",
126126
"react-router-dom": "5.2.0",
127-
"react-select": "3.1.0",
127+
"react-select": "3.2.0",
128128
"react-split-pane": "0.1.92",
129-
"recharts": "1.8.5",
129+
"recharts": "2.0.3",
130130
"redux": "4.0.5",
131131
"redux-devtools-extension": "2.13.8",
132132
"redux-promise": "0.6.0",
@@ -136,32 +136,32 @@
136136
"universal-analytics": "0.4.23"
137137
},
138138
"devDependencies": {
139-
"@babel/cli": "7.12.1",
140-
"@babel/core": "7.12.3",
141-
"@babel/plugin-transform-runtime": "7.12.1",
142-
"@babel/preset-env": "7.12.1",
143-
"@babel/register": "7.12.1",
139+
"@babel/cli": "7.12.10",
140+
"@babel/core": "7.12.10",
141+
"@babel/plugin-transform-runtime": "7.12.10",
142+
"@babel/preset-env": "7.12.11",
143+
"@babel/register": "7.12.10",
144144
"@commitlint/cli": "11.0.0",
145145
"@commitlint/config-conventional": "11.0.0",
146146
"codacy-coverage": "3.4.0",
147147
"concurrently": "5.3.0",
148-
"cross-env": "7.0.2",
149-
"electron": "10.1.5",
148+
"cross-env": "7.0.3",
149+
"electron": "11.2.0",
150150
"electron-builder": "22.9.1",
151151
"env-cmd": "10.1.0",
152152
"enzyme-to-json": "3.6.1",
153153
"eslint-config-airbnb": "18.2.1",
154-
"eslint-config-prettier": "6.15.0",
154+
"eslint-config-prettier": "7.2.0",
155155
"eslint-plugin-mocha": "8.0.0",
156-
"husky": "4.3.0",
156+
"husky": "4.3.8",
157157
"npm-run-all": "4.1.5",
158-
"prettier": "2.1.2",
158+
"prettier": "2.2.1",
159159
"pretty-quick": "3.1.0",
160-
"react-scripts": "4.0.0",
160+
"react-scripts": "4.0.1",
161161
"redux-mock-store": "1.5.4",
162-
"spectron": "12.0.0",
163-
"standard-version": "9.0.0",
164-
"wait-on": "5.2.0"
162+
"spectron": "13.0.0",
163+
"standard-version": "9.1.0",
164+
"wait-on": "5.2.1"
165165
},
166166
"build": {
167167
"appId": "com.graasp",

‎public/app/config/config.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ const DOWNLOADABLE_MIME_TYPES = [
3434
];
3535

3636
// resolve path for windows '\'
37-
const escapeEscapeCharacter = (str) => {
38-
return isWindows() ? str.replace(/\\/g, '\\\\') : str;
39-
};
37+
const escapeEscapeCharacter = (str) =>
38+
isWindows() ? str.replace(/\\/g, '\\\\') : str;
4039

4140
// categories
4241
const RESOURCE = 'Resource';

‎public/electron.js

+5-9
Original file line numberDiff line numberDiff line change
@@ -157,23 +157,19 @@ Object.keys(env).forEach((key) => {
157157
if (process.env.NODE_ENV === 'test') {
158158
if (process.env.SHOW_MESSAGE_DIALOG_RESPONSE) {
159159
const response = JSON.parse(process.env.SHOW_MESSAGE_DIALOG_RESPONSE);
160-
dialog.showMessageBox = () => {
161-
return Promise.resolve({ response });
162-
};
160+
dialog.showMessageBox = () => Promise.resolve({ response });
163161
}
164162
if (process.env.SHOW_SAVE_DIALOG_RESPONSE) {
165-
dialog.showSaveDialog = () => {
166-
return Promise.resolve({
163+
dialog.showSaveDialog = () =>
164+
Promise.resolve({
167165
filePath: process.env.SHOW_SAVE_DIALOG_RESPONSE,
168166
});
169-
};
170167
}
171168
if (process.env.SHOW_OPEN_DIALOG_RESPONSE) {
172-
dialog.showOpenDialog = () => {
173-
return Promise.resolve({
169+
dialog.showOpenDialog = () =>
170+
Promise.resolve({
174171
filePaths: process.env.SHOW_OPEN_DIALOG_RESPONSE,
175172
});
176-
};
177173
}
178174
}
179175

‎src/actions/syncSpace.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { DEFAULT_GET_REQUEST } from '../config/rest';
2626

2727
const flagSyncingSpace = createFlag(FLAG_SYNCING_SPACE);
2828

29-
export const syncSpace = async ({ id }) => async dispatch => {
29+
export const syncSpace = async ({ id }) => async (dispatch) => {
3030
try {
3131
const url = generateGetSpaceEndpoint(id);
3232
const response = await fetch(url, DEFAULT_GET_REQUEST);
@@ -65,33 +65,31 @@ export const syncSpace = async ({ id }) => async dispatch => {
6565
}
6666
};
6767

68-
export const getRemoteSpaceForSync = payload =>
68+
export const getRemoteSpaceForSync = (payload) =>
6969
createGetRemoteSpace(
7070
payload,
7171
GET_SYNC_REMOTE_SPACE_SUCCEEDED,
7272
FLAG_GETTING_SYNC_REMOTE_SPACE
7373
);
7474

75-
export const getLocalSpaceForSync = payload =>
75+
export const getLocalSpaceForSync = (payload) =>
7676
createGetLocalSpace(
7777
payload,
7878
GET_SYNC_LOCAL_SPACE_SUCCEEDED,
7979
FLAG_GETTING_SYNC_LOCAL_SPACE
8080
);
8181

82-
export const clearSpacesForSync = () => dispatch => {
83-
return dispatch({
82+
export const clearSpacesForSync = () => (dispatch) =>
83+
dispatch({
8484
type: CLEAR_SYNC_SPACES,
8585
});
86-
};
8786

88-
export const clearPhasesForSync = () => dispatch => {
89-
return dispatch({
87+
export const clearPhasesForSync = () => (dispatch) =>
88+
dispatch({
9089
type: CLEAR_SYNC_PHASES,
9190
});
92-
};
9391

94-
export const selectPhaseForSync = phase => dispatch => {
92+
export const selectPhaseForSync = (phase) => (dispatch) => {
9593
dispatch({
9694
type: SELECT_SYNC_PHASE,
9795
payload: phase,

‎src/components/Settings.test.js

+28-30
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,34 @@ import DeveloperSwitch from './common/DeveloperSwitch';
77
import GeolocationControl from './common/GeolocationControl';
88
import { USER_MODES } from '../config/constants';
99

10-
const createSettingsProps = () => {
11-
return {
12-
t: (text) => text,
13-
classes: {
14-
appBar: '',
15-
root: '',
16-
appBarShift: '',
17-
menuButton: '',
18-
hide: '',
19-
drawer: '',
20-
drawerPaper: '',
21-
drawerHeader: '',
22-
content: '',
23-
contentShift: '',
24-
settings: '',
25-
divider: '',
26-
},
27-
theme: {
28-
direction: 'ltr',
29-
},
30-
history: {
31-
replace: jest.fn(),
32-
},
33-
i18n: {
34-
changeLanguage: jest.fn(),
35-
},
36-
userMode: USER_MODES.TEACHER,
37-
authenticated: true,
38-
};
39-
};
10+
const createSettingsProps = () => ({
11+
t: (text) => text,
12+
classes: {
13+
appBar: '',
14+
root: '',
15+
appBarShift: '',
16+
menuButton: '',
17+
hide: '',
18+
drawer: '',
19+
drawerPaper: '',
20+
drawerHeader: '',
21+
content: '',
22+
contentShift: '',
23+
settings: '',
24+
divider: '',
25+
},
26+
theme: {
27+
direction: 'ltr',
28+
},
29+
history: {
30+
replace: jest.fn(),
31+
},
32+
i18n: {
33+
changeLanguage: jest.fn(),
34+
},
35+
userMode: USER_MODES.TEACHER,
36+
authenticated: true,
37+
});
4038

4139
describe('<Settings />', () => {
4240
let wrapper;

‎src/components/classrooms/ActionIcon.js

+6-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ import PropTypes from 'prop-types';
33
import Icon from '@material-ui/icons/Assessment';
44
import { withTranslation } from 'react-i18next';
55

6-
const ActionIcon = ({ className, text, t }) => {
7-
return (
8-
<>
9-
<Icon className={className} />
10-
{text && <span>{t('Actions')}</span>}
11-
</>
12-
);
13-
};
6+
const ActionIcon = ({ className, text, t }) => (
7+
<>
8+
<Icon className={className} />
9+
{text && <span>{t('Actions')}</span>}
10+
</>
11+
);
1412

1513
ActionIcon.propTypes = {
1614
className: PropTypes.string,

‎src/components/classrooms/ClassroomLegend.js

+7-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { withStyles } from '@material-ui/core';
44
import ResourceIcon from './ResourceIcon';
55
import ActionIcon from './ActionIcon';
66

7-
const styles = theme => ({
7+
const styles = (theme) => ({
88
legend: {
99
display: 'flex',
1010
justifyContent: 'flex-end',
@@ -17,14 +17,12 @@ const styles = theme => ({
1717
},
1818
});
1919

20-
const ClassroomLegend = ({ classes }) => {
21-
return (
22-
<div className={classes.legend}>
23-
<ResourceIcon text />
24-
<ActionIcon text />
25-
</div>
26-
);
27-
};
20+
const ClassroomLegend = ({ classes }) => (
21+
<div className={classes.legend}>
22+
<ResourceIcon text />
23+
<ActionIcon text />
24+
</div>
25+
);
2826

2927
ClassroomLegend.propTypes = {
3028
classes: PropTypes.shape({

0 commit comments

Comments
 (0)