Skip to content

Commit e2a8590

Browse files
authored
Merge pull request #316 from carlosms/frontend-dep-update
Update frontend dependencies
2 parents 0a389d7 + 6e09826 commit e2a8590

7 files changed

Lines changed: 2288 additions & 352 deletions

File tree

frontend/.eslintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,9 @@ module.exports = {
2222
'class-methods-use-this': 0, // strange rule. It doesn't allow to create method render() without this
2323
'no-case-declarations': 0, // otherwise code is very ugly
2424
},
25+
settings: {
26+
"react": {
27+
"version": "detect",
28+
},
29+
}
2530
};

frontend/package.json

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
"version": "0.1.0",
55
"private": true,
66
"dependencies": {
7-
"abortcontroller-polyfill": "^1.1.9",
7+
"abortcontroller-polyfill": "^1.2.3",
88
"bootstrap": "3",
9-
"codemirror": "^5.37.0",
10-
"nanoid": "^1.0.3",
11-
"prop-types": "^15.6.1",
12-
"react": "^16.3.2",
9+
"codemirror": "^5.43.0",
10+
"nanoid": "^2.0.1",
11+
"prop-types": "^15.7.2",
12+
"react": "^16.8.2",
1313
"react-bootstrap": "^0.32.1",
1414
"react-codemirror2": "^5.0.1",
15-
"react-dom": "^16.3.2",
15+
"react-dom": "^16.8.2",
1616
"react-helmet": "^5.2.0",
1717
"react-scripts": "1.1.4",
18-
"react-split-pane": "^0.1.77",
19-
"react-switch": "^3.0.4",
20-
"react-table": "^6.8.2",
18+
"react-split-pane": "^0.1.85",
19+
"react-switch": "^4.0.1",
20+
"react-table": "^6.9.2",
2121
"uast-viewer": "^0.2.0"
2222
},
2323
"scripts": {
@@ -30,20 +30,23 @@
3030
},
3131
"devDependencies": {
3232
"@ungap/url-search-params": "^0.1.2",
33-
"enzyme": "^3.7.0",
34-
"enzyme-adapter-react-16": "^1.7.0",
35-
"eslint-config-airbnb-base": "^12.1.0",
36-
"eslint-config-prettier": "^2.9.0",
37-
"eslint-plugin-jest": "^21.15.1",
38-
"eslint-plugin-prettier": "^2.6.0",
39-
"jest-fetch-mock": "^1.5.0",
33+
"enzyme": "^3.8.0",
34+
"enzyme-adapter-react-16": "^1.9.1",
35+
"eslint": "^5.13.0",
36+
"eslint-config-airbnb-base": "^13.1.0",
37+
"eslint-config-prettier": "^4.0.0",
38+
"eslint-plugin-import": "^2.16.0",
39+
"eslint-plugin-jest": "^22.3.0",
40+
"eslint-plugin-prettier": "^3.0.1",
41+
"eslint-plugin-react": "^7.12.4",
42+
"jest-fetch-mock": "^2.1.0",
4043
"node-localstorage": "^1.3.1",
41-
"prettier": "^1.12.1",
44+
"prettier": "^1.16.4",
4245
"react-app-rewire-less": "^2.1.1",
4346
"react-app-rewire-svg-react-loader": "codebandits/react-app-rewire-svg-react-loader",
4447
"react-app-rewired": "^1.5.2",
45-
"react-test-renderer": "^16.4.0",
46-
"whatwg-url": "^6.4.1"
48+
"react-test-renderer": "^16.8.2",
49+
"whatwg-url": "^7.0.0"
4750
},
4851
"proxy": {
4952
"/query": {

frontend/src/App.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -376,12 +376,14 @@ FROM ( SELECT MONTH(committer_when) as month,
376376
this.stopInactiveTimer(key);
377377

378378
const hiddenKeys = Array.from(results.keys()).filter(k => k !== key);
379-
hiddenKeys.filter(k => !this.timers[k]).forEach(k => {
380-
this.timers[k] = window.setTimeout(
381-
() => this.removeResultContent(k),
382-
INACTIVE_TIMEOUT
383-
);
384-
});
379+
hiddenKeys
380+
.filter(k => !this.timers[k])
381+
.forEach(k => {
382+
this.timers[k] = window.setTimeout(
383+
() => this.removeResultContent(k),
384+
INACTIVE_TIMEOUT
385+
);
386+
});
385387
}
386388

387389
stopInactiveTimer(key) {

frontend/src/components/QueryBox.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ class QueryBox extends Component {
117117
bsStyle="gbpl-primary-tint-2-link"
118118
onClick={this.showHelpModal}
119119
>
120-
<HelpIcon className="big-icon" />HELP
120+
<HelpIcon className="big-icon" />
121+
HELP
121122
</Button>
122123
</Col>
123124
</Row>

frontend/src/components/TabbedResults.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ function ResultInfo({ result }) {
138138
if (result.errorMsg) {
139139
return (
140140
<span className="meta meta-error">
141-
<ErrorIcon className="big-icon" />Query Failed - {result.errorMsg}
141+
<ErrorIcon className="big-icon" />
142+
Query Failed - {result.errorMsg}
142143
</span>
143144
);
144145
}

frontend/src/components/__snapshots__/ResultsTable.test.js.snap

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ exports[`ResultsTable text with new lines should be shown as code 1`] = `
160160
className="-pageJump"
161161
>
162162
<input
163+
aria-label="jump to page"
163164
onBlur={[Function]}
164165
onChange={[Function]}
165166
onKeyPress={[Function]}
@@ -180,50 +181,39 @@ exports[`ResultsTable text with new lines should be shown as code 1`] = `
180181
className="select-wrap -pageSizeOptions"
181182
>
182183
<select
184+
aria-label="rows per page"
183185
onChange={[Function]}
184186
value={10}
185187
>
186188
<option
187189
value={5}
188190
>
189-
5
190-
191-
rows
191+
5 rows
192192
</option>
193193
<option
194194
value={10}
195195
>
196-
10
197-
198-
rows
196+
10 rows
199197
</option>
200198
<option
201199
value={20}
202200
>
203-
20
204-
205-
rows
201+
20 rows
206202
</option>
207203
<option
208204
value={25}
209205
>
210-
25
211-
212-
rows
206+
25 rows
213207
</option>
214208
<option
215209
value={50}
216210
>
217-
50
218-
219-
rows
211+
50 rows
220212
</option>
221213
<option
222214
value={100}
223215
>
224-
100
225-
226-
rows
216+
100 rows
227217
</option>
228218
</select>
229219
</span>

0 commit comments

Comments
 (0)