Skip to content

Commit 503be15

Browse files
committed
Fixing linting rules and CI configuration.
1 parent 0adf098 commit 503be15

File tree

8 files changed

+66
-25
lines changed

8 files changed

+66
-25
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
".less$"
6666
],
6767
"react": {
68-
"version": 16.2.0
68+
"version": 17.0.2
6969
}
7070
},
7171
"globals": {

.github/workflows/ci.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,31 @@ on: [push, pull_request]
44

55
jobs:
66
tests:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-22.04
88
strategy:
99
matrix:
10-
node-version: ['14']
10+
node-version: ['18']
1111
steps:
1212
- uses: actions/checkout@v2
1313
- uses: actions/setup-node@v1
1414
with:
1515
node-version: ${{ matrix.node-version }}
16-
17-
- run: npm install
18-
- run: npm test
16+
- run: npm install -g yarn
17+
- run: corepack enable
18+
- run: yarn install
19+
- run: yarn test
1920

2021
lint:
21-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-22.04
2223
strategy:
2324
matrix:
24-
node-version: ['14']
25+
node-version: ['18']
2526
steps:
2627
- uses: actions/checkout@v2
2728
- uses: actions/setup-node@v1
2829
with:
2930
node-version: ${{ matrix.node-version }}
30-
31-
- run: npm install
32-
- run: npm run lint
31+
- run: npm install -g yarn
32+
- run: corepack enable
33+
- run: yarn install
34+
- run: yarn lint

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
"eslint-config-standard-react": "11.0.1",
127127
"eslint-plugin-babel": "^5.3.1",
128128
"eslint-plugin-import": "^2.26.0",
129+
"eslint-plugin-n": "latest",
129130
"eslint-plugin-node": "11.1.0",
130131
"eslint-plugin-promise": "^6.0.0",
131132
"eslint-plugin-react": "^7.30.1",

src/components/Groups/ResultsTable/ResultsTable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ class ResultsTable extends Component {
405405
const data = {
406406
id: user.id,
407407
selected: !showOnlyMe && user.id === loggedUser.id,
408-
user: user,
408+
user,
409409
total: userStats && userStats.points,
410410
buttons: renderActions && hasPermissions(group, 'update') ? renderActions(user.id) : '',
411411
// actually 'update' is not the right premission, but its sufficiently close :)

src/components/SystemMessages/MessagesList/MessagesList.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@ class MessagesList extends Component {
9898
<>
9999
<FilterSystemMessagesForm
100100
onSubmit={({ showAll }) => {
101-
this.setState({
102-
showAll: showAll,
103-
});
101+
this.setState({ showAll });
104102
return Promise.resolve();
105103
}}
106104
initialValues={{ showAll: this.state.showAll }}

src/components/icons/Icon.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const Icon = ({
3131
[style.largeGapLeft]: largeGapLeft,
3232
[style.largeGapRight]: largeGapRight,
3333
[style.disabled]: disabled,
34-
timid: timid,
34+
timid,
3535
clickable: Boolean(onClick || onDoubleClick),
3636
})}
3737
onClick={onClick}

src/redux/modules/auth.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ const auth = (accessToken, instanceId, now = Date.now()) => {
151151
jwt: accessToken,
152152
accessToken: decodedToken,
153153
userId: getUserId(decodedToken),
154-
instanceId: instanceId,
154+
instanceId,
155155
})
156156
: fromJS({
157157
status: {},

yarn.lock

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4711,6 +4711,15 @@ __metadata:
47114711
languageName: node
47124712
linkType: hard
47134713

4714+
"builtins@npm:^5.0.1":
4715+
version: 5.0.1
4716+
resolution: "builtins@npm:5.0.1"
4717+
dependencies:
4718+
semver: ^7.0.0
4719+
checksum: 66d204657fe36522822a95b288943ad11b58f5eaede235b11d8c4edaa28ce4800087d44a2681524c340494aadb120a0068011acabe99d30e8f11a7d826d83515
4720+
languageName: node
4721+
linkType: hard
4722+
47144723
"bytes@npm:3.0.0":
47154724
version: 3.0.0
47164725
resolution: "bytes@npm:3.0.0"
@@ -6885,6 +6894,18 @@ __metadata:
68856894
languageName: node
68866895
linkType: hard
68876896

6897+
"eslint-plugin-es@npm:^4.1.0":
6898+
version: 4.1.0
6899+
resolution: "eslint-plugin-es@npm:4.1.0"
6900+
dependencies:
6901+
eslint-utils: ^2.0.0
6902+
regexpp: ^3.0.0
6903+
peerDependencies:
6904+
eslint: ">=4.19.1"
6905+
checksum: 26b87a216d3625612b1d3ca8653ac8a1d261046d2a973bb0eb2759070267d2bfb0509051facdeb5ae03dc8dfb51a434be23aff7309a752ca901d637da535677f
6906+
languageName: node
6907+
linkType: hard
6908+
68886909
"eslint-plugin-import@npm:^2.26.0":
68896910
version: 2.26.0
68906911
resolution: "eslint-plugin-import@npm:2.26.0"
@@ -6908,6 +6929,24 @@ __metadata:
69086929
languageName: node
69096930
linkType: hard
69106931

6932+
"eslint-plugin-n@npm:latest":
6933+
version: 15.2.4
6934+
resolution: "eslint-plugin-n@npm:15.2.4"
6935+
dependencies:
6936+
builtins: ^5.0.1
6937+
eslint-plugin-es: ^4.1.0
6938+
eslint-utils: ^3.0.0
6939+
ignore: ^5.1.1
6940+
is-core-module: ^2.9.0
6941+
minimatch: ^3.1.2
6942+
resolve: ^1.10.1
6943+
semver: ^7.3.7
6944+
peerDependencies:
6945+
eslint: ">=7.0.0"
6946+
checksum: dd651651ab76120e45707ee968d846e3ffffb42d1035792fdef6d3b0dcfddf3673bc6a09cb2fac8c5f1d081f14f2a67fc52295d5ed1d2edfb5beead93284eaac
6947+
languageName: node
6948+
linkType: hard
6949+
69116950
"eslint-plugin-node@npm:11.1.0":
69126951
version: 11.1.0
69136952
resolution: "eslint-plugin-node@npm:11.1.0"
@@ -12571,6 +12610,7 @@ __metadata:
1257112610
eslint-config-standard-react: 11.0.1
1257212611
eslint-plugin-babel: ^5.3.1
1257312612
eslint-plugin-import: ^2.26.0
12613+
eslint-plugin-n: latest
1257412614
eslint-plugin-node: 11.1.0
1257512615
eslint-plugin-promise: ^6.0.0
1257612616
eslint-plugin-react: ^7.30.1
@@ -13392,25 +13432,25 @@ __metadata:
1339213432
languageName: node
1339313433
linkType: hard
1339413434

13395-
"semver@npm:^7.3.5":
13396-
version: 7.3.5
13397-
resolution: "semver@npm:7.3.5"
13435+
"semver@npm:^7.0.0, semver@npm:^7.3.7":
13436+
version: 7.3.7
13437+
resolution: "semver@npm:7.3.7"
1339813438
dependencies:
1339913439
lru-cache: ^6.0.0
1340013440
bin:
1340113441
semver: bin/semver.js
13402-
checksum: 5eafe6102bea2a7439897c1856362e31cc348ccf96efd455c8b5bc2c61e6f7e7b8250dc26b8828c1d76a56f818a7ee907a36ae9fb37a599d3d24609207001d60
13442+
checksum: 2fa3e877568cd6ce769c75c211beaed1f9fce80b28338cadd9d0b6c40f2e2862bafd62c19a6cff42f3d54292b7c623277bcab8816a2b5521cf15210d43e75232
1340313443
languageName: node
1340413444
linkType: hard
1340513445

13406-
"semver@npm:^7.3.7":
13407-
version: 7.3.7
13408-
resolution: "semver@npm:7.3.7"
13446+
"semver@npm:^7.3.5":
13447+
version: 7.3.5
13448+
resolution: "semver@npm:7.3.5"
1340913449
dependencies:
1341013450
lru-cache: ^6.0.0
1341113451
bin:
1341213452
semver: bin/semver.js
13413-
checksum: 2fa3e877568cd6ce769c75c211beaed1f9fce80b28338cadd9d0b6c40f2e2862bafd62c19a6cff42f3d54292b7c623277bcab8816a2b5521cf15210d43e75232
13453+
checksum: 5eafe6102bea2a7439897c1856362e31cc348ccf96efd455c8b5bc2c61e6f7e7b8250dc26b8828c1d76a56f818a7ee907a36ae9fb37a599d3d24609207001d60
1341413454
languageName: node
1341513455
linkType: hard
1341613456

0 commit comments

Comments
 (0)