Skip to content

Commit 83e7f98

Browse files
notbakanekonotbakaneko
authored
Merge pull request #11716 from agatemosu/eslint
Upgrade ESLint
2 parents bf617d3 + 3051738 commit 83e7f98

Some content is hidden

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

45 files changed

+1269
-723
lines changed

‎.eslintrc.js

+51-53
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ module.exports = {
2525
'typescript-sort-keys',
2626
],
2727
rules: {
28+
'@stylistic/member-delimiter-style': 'error',
29+
'@stylistic/type-annotation-spacing': 'error',
2830
'@typescript-eslint/array-type': [
2931
'error',
3032
{
@@ -41,20 +43,6 @@ module.exports = {
4143
},
4244
],
4345
'@typescript-eslint/explicit-module-boundary-types': 'off',
44-
'@typescript-eslint/indent': [
45-
'error',
46-
2,
47-
{
48-
FunctionDeclaration: {
49-
parameters: 'first',
50-
},
51-
FunctionExpression: {
52-
parameters: 'first',
53-
},
54-
SwitchCase: 1,
55-
},
56-
],
57-
'@typescript-eslint/member-delimiter-style': 'error',
5846
'@typescript-eslint/member-ordering': [
5947
'error',
6048
{
@@ -101,17 +89,17 @@ module.exports = {
10189
'@typescript-eslint/no-unsafe-member-access': 'warn',
10290
'@typescript-eslint/no-unsafe-return': 'warn',
10391
'@typescript-eslint/no-unused-expressions': 'error',
104-
'@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_', ignoreRestSiblings: true }],
92+
'@typescript-eslint/no-unused-vars': [
93+
'error', {
94+
argsIgnorePattern: '^_',
95+
caughtErrorsIgnorePattern: '^_',
96+
ignoreRestSiblings: true,
97+
},
98+
],
10599
'@typescript-eslint/no-use-before-define': 'off',
106-
'@typescript-eslint/object-curly-spacing': ['error', 'always'],
107100
'@typescript-eslint/prefer-for-of': 'error',
108101
'@typescript-eslint/prefer-function-type': 'error',
109102
'@typescript-eslint/prefer-readonly': 'error',
110-
'@typescript-eslint/quotes': [
111-
'error',
112-
'single',
113-
{ avoidEscape: true },
114-
],
115103
'@typescript-eslint/restrict-template-expressions': [
116104
'error',
117105
{
@@ -121,21 +109,17 @@ module.exports = {
121109
allowNumber: true,
122110
},
123111
],
124-
'@typescript-eslint/semi': ['error', 'always'],
125112
// TODO: make more strict.
126113
'@typescript-eslint/strict-boolean-expressions': [
127114
'error',
128115
{
129116
allowNullableBoolean: true,
130117
},
131118
],
132-
'@typescript-eslint/type-annotation-spacing': 'error',
133119
'@typescript-eslint/unified-signatures': 'error',
134120
'dot-notation': 'off',
135121
'no-invalid-this': 'off',
136122
'no-shadow': 'off',
137-
'object-curly-spacing': 'off',
138-
quotes: 'off',
139123
'react-hooks/exhaustive-deps': 'error',
140124
'react/jsx-boolean-value': 'error',
141125
'react/jsx-curly-spacing': 'error',
@@ -190,22 +174,57 @@ module.exports = {
190174
sourceType: 'module',
191175
},
192176
plugins: [
177+
'@stylistic',
193178
'eslint-plugin-jsdoc',
194179
'eslint-plugin-import',
195180
],
196181
rules: {
182+
'@stylistic/arrow-parens': 'error',
183+
'@stylistic/arrow-spacing': 'error',
184+
'@stylistic/brace-style': 'error',
185+
'@stylistic/comma-dangle': ['error', 'always-multiline'],
186+
'@stylistic/eol-last': 'error',
187+
'@stylistic/indent': [
188+
'error',
189+
2,
190+
{
191+
FunctionDeclaration: {
192+
parameters: 'first',
193+
},
194+
FunctionExpression: {
195+
parameters: 'first',
196+
},
197+
SwitchCase: 1,
198+
},
199+
],
200+
'@stylistic/max-len': 'off',
201+
'@stylistic/new-parens': 'error',
202+
'@stylistic/no-multiple-empty-lines': 'error',
203+
'@stylistic/no-trailing-spaces': 'error',
204+
'@stylistic/object-curly-spacing': ['error', 'always'],
205+
'@stylistic/quote-props': ['error', 'as-needed'],
206+
'@stylistic/quotes': [
207+
'error',
208+
'single',
209+
{ avoidEscape: true },
210+
],
211+
'@stylistic/semi': ['error', 'always'],
212+
'@stylistic/space-before-function-paren': [
213+
'error',
214+
{
215+
anonymous: 'never',
216+
asyncArrow: 'always',
217+
named: 'never',
218+
},
219+
],
220+
'@stylistic/spaced-comment': 'error',
197221
'arrow-body-style': 'error',
198-
'arrow-parens': 'error',
199-
'arrow-spacing': 'error',
200-
'brace-style': 'error',
201-
'comma-dangle': ['error', 'always-multiline'],
202222
complexity: 'off',
203223
curly: ['error', 'multi-line'],
204224
'dot-notation': 'error',
205-
'eol-last': 'error',
206225
eqeqeq: ['error', 'smart'],
207226
'guard-for-in': 'error',
208-
'id-blacklist': [
227+
'id-denylist': [
209228
'error',
210229
'any',
211230
'Number',
@@ -221,43 +240,22 @@ module.exports = {
221240
'import/order': ['error', { alphabetize: { order: 'asc' } }],
222241
'jsdoc/check-alignment': 'error',
223242
'jsdoc/check-indentation': 'error',
224-
'jsdoc/newline-after-description': 'error',
243+
'jsdoc/tag-lines': ['error', 'never', { startLines: 1 }],
225244
'max-classes-per-file': 'error',
226-
'max-len': 'off',
227-
'new-parens': 'error',
228245
'no-bitwise': 'error',
229246
'no-caller': 'error',
230247
'no-console': ['error', { allow: ['error', 'warn'] }],
231248
'no-empty-function': 'error',
232249
'no-eval': 'error',
233250
'no-invalid-this': 'error',
234-
'no-multiple-empty-lines': 'error',
235251
'no-new-wrappers': 'error',
236252
'no-shadow': ['error', { hoist: 'all' }],
237253
'no-throw-literal': 'error',
238-
'no-trailing-spaces': 'error',
239254
'no-undef-init': 'error',
240255
'no-unsafe-finally': 'error',
241-
'object-curly-spacing': ['error', 'always'],
242256
'object-shorthand': 'error',
243257
'one-var': ['error', 'never'],
244-
'quote-props': ['error', 'as-needed'],
245-
quotes: [
246-
'error',
247-
'single',
248-
{ avoidEscape: true },
249-
],
250258
radix: 'error',
251-
semi: ['error', 'always'],
252259
'sort-keys': ['error', 'asc', { caseSensitive: false }],
253-
'space-before-function-paren': [
254-
'error',
255-
{
256-
anonymous: 'never',
257-
asyncArrow: 'always',
258-
named: 'never',
259-
},
260-
],
261-
'spaced-comment': 'error',
262260
},
263261
};

‎.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: Install js dependencies
5050
run: yarn --frozen-lockfile
5151

52-
- run: 'yarn lint --max-warnings 87 > /dev/null'
52+
- run: 'yarn lint --max-warnings 86 > /dev/null'
5353

5454
- run: yarn pretty
5555

‎package.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,16 @@
102102
"ziggy-js": "^1.8.1"
103103
},
104104
"devDependencies": {
105-
"@typescript-eslint/eslint-plugin": "^6.6.0",
106-
"@typescript-eslint/parser": "^6.6.0",
105+
"@stylistic/eslint-plugin": "^2.11.0",
106+
"@typescript-eslint/eslint-plugin": "^8.17.0",
107+
"@typescript-eslint/parser": "^8.17.0",
107108
"clean-webpack-plugin": "^4.0.0",
108-
"eslint": "^7.15.0",
109-
"eslint-plugin-import": "^2.22.1",
110-
"eslint-plugin-jsdoc": "^30.7.8",
111-
"eslint-plugin-react": "^7.29.4",
112-
"eslint-plugin-react-hooks": "^4.3.0",
113-
"eslint-plugin-typescript-sort-keys": "^3.0.0",
109+
"eslint": "^8.57.1",
110+
"eslint-plugin-import": "^2.31.0",
111+
"eslint-plugin-jsdoc": "^50.6.0",
112+
"eslint-plugin-react": "^7.37.2",
113+
"eslint-plugin-react-hooks": "^5.0.0",
114+
"eslint-plugin-typescript-sort-keys": "^3.3.0",
114115
"jasmine-core": "^4.1.0",
115116
"karma": "^6.4.1",
116117
"karma-chrome-launcher": "^3.1.1",

‎resources/js/artist-tracks-index/search-form.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ export type ArtistTrackSort = `${ArtistTrackSortField}_${ArtistTrackSortOrder}`;
3939
export const artistTrackSearchRelevanceParams = ['album', 'artist', 'query'] as const;
4040
type ArtistTrackSearchRelevanceParam = typeof artistTrackSearchRelevanceParams[number];
4141

42-
const artistTrackSearchNumberRangeParams = ['bpm', 'length'] as const;
43-
type ArtistTrackSearchNumberRangeParam = typeof artistTrackSearchNumberRangeParams[number];
42+
type ArtistTrackSearchNumberRangeParam = 'bpm' | 'length';
4443

4544
export type ArtistTrackSearch = {
4645
exclusive_only: boolean;

‎resources/js/beatmap-discussions/discussion-mode.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
import DiscussionPage from './discussion-page';
55

66
type DiscussionMode = Exclude<DiscussionPage, 'events'>;
7-
export const discussionModes: Readonly<DiscussionMode[]> = ['reviews', 'generalAll', 'general', 'timeline'] as const;
7+
export const discussionModes: readonly DiscussionMode[] = ['reviews', 'generalAll', 'general', 'timeline'] as const;
88

99
export default DiscussionMode;

‎resources/js/beatmap-discussions/editor.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export default class Editor extends React.Component<Props, State> {
124124
if (saved != null) {
125125
try {
126126
this.initialValue = JSON.parse(saved) as SlateElement[];
127-
} catch (error) {
127+
} catch (_error) {
128128
console.error('invalid json in localStorage, ignoring');
129129
localStorage.removeItem(this.localStorageKey);
130130
}

‎resources/js/beatmap-discussions/new-discussion.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ export class NewDiscussion extends React.Component<Props> {
501501
private readonly updateStickToHeight = () => this.stickToHeight = this.props.stickTo?.current?.getBoundingClientRect().height;
502502

503503
private validPost(type: string): type is DiscussionType {
504-
if (!(discussionTypes as Readonly<string[]>).includes(type)) return false;
504+
if (!(discussionTypes as readonly string[]).includes(type)) return false;
505505
if (!validMessageLength(this.message, this.isTimeline)) return false;
506506
if (!this.isTimeline) return true;
507507

‎resources/js/beatmap-discussions/review-post.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export class ReviewPost extends React.Component<Props> {
3434
break;
3535
}
3636
});
37-
} catch (e) {
37+
} catch (_error) {
3838
docBlocks.push(<div key={null}>[error parsing review]</div>);
3939
}
4040

‎resources/js/beatmapsets-show/hype.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ export default class Hype extends React.Component<Props> {
8181
</p>
8282
) : (
8383
<p
84-
className={`${bn}__description-row ${bn}__description-row--action`}
8584
dangerouslySetInnerHTML={{
8685
__html: trans('beatmapsets.show.hype.action'),
8786
}}
87+
className={`${bn}__description-row ${bn}__description-row--action`}
8888
/>
8989
)}
9090
</div>

‎resources/js/beatmapsets-show/info.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ export default class Info extends React.Component<Props> {
126126
</h3>
127127

128128
<div
129-
className='beatmapset-info__value-overflow'
130129
dangerouslySetInnerHTML={{
131130
__html: this.controller.beatmapset.description.description ?? '',
132131
}}
132+
className='beatmapset-info__value-overflow'
133133
/>
134134
</div>
135135
</div>

‎resources/js/components/comment.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export default class Comment extends React.Component<Props> {
130130

131131
const replies = this.replies;
132132

133-
return replies.length > 0 && replies.some((reply) => reply.isVisible);
133+
return replies.some((reply) => reply.isVisible);
134134
}
135135

136136
@computed
@@ -510,10 +510,10 @@ export default class Comment extends React.Component<Props> {
510510
: this.shouldRenderContent &&
511511
<>
512512
<div
513-
className='comment__message'
514513
dangerouslySetInnerHTML={{
515514
__html: this.props.comment.messageHtml ?? '',
516515
}}
516+
className='comment__message'
517517
/>
518518
{this.isLongContent && this.renderToggleClipButton()}
519519
</>

‎resources/js/components/sort.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ interface Props {
1313
showTitle?: boolean;
1414
title?: string;
1515
transPrefix: string;
16-
values: Readonly<string[]>;
16+
values: readonly string[];
1717
}
1818

1919
export class Sort extends React.PureComponent<Props> {

‎resources/js/core/click-menu.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default class ClickMenu {
4747
}
4848
};
4949

50-
show = (target?: string | null | undefined) => {
50+
show = (target?: string | null) => {
5151
const previousTree = this.tree();
5252

5353
this.current = target;

‎resources/js/core/osu-audio/main.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export default class Main {
170170
this.setState('loading');
171171
const promise = this.audio.play();
172172
// old api returns undefined
173-
promise?.catch((error: { name: string }) => {
173+
promise?.catch((error: DOMException) => {
174174
if (Main.ignoredErrors.includes(error.name)) {
175175
console.error('playback failed:', error.name);
176176
this.stop();
@@ -213,7 +213,7 @@ export default class Main {
213213
if (node.classList.contains('js-audio--player')) {
214214
newPlayers.push(node);
215215
} else {
216-
for (const player of [...node.querySelectorAll('.js-audio--player')]) {
216+
for (const player of node.querySelectorAll('.js-audio--player')) {
217217
if (player instanceof HTMLElement) {
218218
newPlayers.push(player);
219219
}

‎resources/js/core/twitch-embed-player.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ declare module 'twitch-embed-player' {
66
export default class TwitchEmbedPlayer {
77
static PLAY: string;
88

9-
constructor (id: string, options: Record<string, unknown>);
9+
constructor(id: string, options: Record<string, unknown>);
1010
addEventListener(action: string, callback: () => void): void;
1111
}
1212
}

‎resources/js/entrypoints/notifications-index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// See the LICENCE file in the repository root for full licence text.
33

44
import { dispatch } from 'app-dispatcher';
5-
import { Main } from 'notifications-index/main';
65
import { NotificationEventMoreLoaded } from 'notifications/notification-events';
6+
import { Main } from 'notifications-index/main';
77
import core from 'osu-core-singleton';
88
import * as React from 'react';
99
import { parseJson } from 'utils/json';

‎resources/js/interfaces/beatmap-discussion-review.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ export type PersistedBeatmapReviewBlock = DocumentParagraph | PersistedDocumentI
3232
export type PersistedBeatmapDiscussionReview = PersistedBeatmapReviewBlock[];
3333

3434
export function isBeatmapReviewDiscussionType(type: string): type is BeatmapReviewDiscussionType {
35-
return (beatmapReviewDiscussionTypes as Readonly<string[]>).includes(type);
35+
return (beatmapReviewDiscussionTypes as readonly string[]).includes(type);
3636
}

‎resources/js/interfaces/beatmapset-discussion-json.ts

+4-8
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,10 @@ export default BeatmapsetDiscussionJson;
5252

5353
// bundle versions; beatmap is only on modding history events version
5454
export type BeatmapsetDiscussionJsonForBundle =
55-
Omit<BeatmapsetDiscussionJson, 'posts'> // bundle explicitly does not include posts; need this for type discrimination.
56-
& Required<Pick<BeatmapsetDiscussionJson,
57-
'starting_post'
58-
>>;
55+
Omit<BeatmapsetDiscussionJson, 'posts'> // bundle explicitly does not include posts; need this for type discrimination.
56+
& Required<Pick<BeatmapsetDiscussionJson, 'starting_post'>>;
5957

6058
// discussions page version
6159
export type BeatmapsetDiscussionJsonForShow =
62-
BeatmapsetDiscussionJson & Required<Pick<BeatmapsetDiscussionJson,
63-
'posts'
64-
| 'votes'
65-
>>;
60+
BeatmapsetDiscussionJson
61+
& Required<Pick<BeatmapsetDiscussionJson, 'posts' | 'votes'>>;

‎resources/js/interfaces/chat/channel-event-json.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const channelEvents = ['chat.channel.join', 'chat.channel.part'] as const;
88
type ChannelEvent = (typeof channelEvents)[number];
99

1010
export function isChannelEvent(arg: SocketEventData): arg is ChannelEventJson {
11-
return arg.event != null && (channelEvents as Readonly<string[]>).includes(arg.event);
11+
return arg.event != null && (channelEvents as readonly string[]).includes(arg.event);
1212
}
1313

1414
export default interface ChannelEventJson {

0 commit comments

Comments
 (0)