Skip to content

Commit fb1dcb8

Browse files
hlollihlolli
committed
chore(dependencies): update eslint 8->9
1 parent 3415a8b commit fb1dcb8

14 files changed

+414
-295
lines changed

‎.eslintrc

-45
This file was deleted.

‎eslint.config.mjs

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
import typescriptEslint from '@typescript-eslint/eslint-plugin';
2+
import header from 'eslint-plugin-header';
3+
import jestFormatting from 'eslint-plugin-jest-formatting';
4+
import prettier from 'eslint-plugin-prettier';
5+
import unicorn from 'eslint-plugin-unicorn';
6+
import tsParser from '@typescript-eslint/parser';
7+
import path from 'node:path';
8+
import { fileURLToPath } from 'node:url';
9+
import js from '@eslint/js';
10+
import { FlatCompat } from '@eslint/eslintrc';
11+
12+
const __filename = fileURLToPath(import.meta.url);
13+
const __dirname = path.dirname(__filename);
14+
15+
// workaround: https://github.com/Stuk/eslint-plugin-header/issues/57#issuecomment-2378485611
16+
header.rules.header.meta.schema = false;
17+
const compat = new FlatCompat({
18+
baseDirectory: __dirname,
19+
recommendedConfig: js.configs.recommended,
20+
allConfig: js.configs.all,
21+
});
22+
23+
export default [
24+
...compat.extends(
25+
'eslint:recommended',
26+
'plugin:@typescript-eslint/eslint-recommended',
27+
'plugin:@typescript-eslint/recommended',
28+
'prettier',
29+
),
30+
{
31+
plugins: {
32+
'@typescript-eslint': typescriptEslint,
33+
header,
34+
'jest-formatting': jestFormatting,
35+
prettier,
36+
unicorn,
37+
},
38+
39+
languageOptions: {
40+
parser: tsParser,
41+
ecmaVersion: 5,
42+
sourceType: 'script',
43+
44+
parserOptions: {
45+
project: 'tsconfig.json',
46+
},
47+
},
48+
49+
rules: {
50+
'@typescript-eslint/no-explicit-any': ['off'],
51+
'@typescript-eslint/no-unused-vars': ['off'],
52+
53+
'@typescript-eslint/strict-boolean-expressions': [
54+
2,
55+
{
56+
allowNullableObject: true,
57+
allowNullableBoolean: true,
58+
allowAny: true,
59+
},
60+
],
61+
62+
eqeqeq: ['error', 'smart'],
63+
'jest-formatting/padding-around-describe-blocks': 2,
64+
'jest-formatting/padding-around-test-blocks': 2,
65+
'header/header': [2, './resources/license.header.js'],
66+
'mocha/max-top-level-suites': 'off',
67+
'mocha/no-exports': 'off',
68+
'mocha/no-mocha-arrows': 'off',
69+
'no-console': 0,
70+
'no-return-await': 2,
71+
'no-unneeded-ternary': 2,
72+
'no-unused-vars': 'off',
73+
74+
'prettier/prettier': [
75+
'error',
76+
{
77+
endOfLine: 'auto',
78+
},
79+
],
80+
81+
'unicorn/prefer-node-protocol': 2,
82+
},
83+
},
84+
];

‎package.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@
5555
},
5656
"devDependencies": {
5757
"@aws-lite/s3-types": "^0.2.6",
58+
"@eslint/eslintrc": "^3.2.0",
59+
"@eslint/js": "^9.19.0",
5860
"@smithy/types": "^3.7.2",
5961
"@swc/core": "^1.10.12",
6062
"@testcontainers/localstack": "^10.17.2",
@@ -72,16 +74,16 @@
7274
"@types/stream-json": "^1.7.8",
7375
"@types/supertest": "^2.0.16",
7476
"@types/swagger-ui-express": "^4.1.7",
75-
"@typescript-eslint/eslint-plugin": "^5.62.0",
76-
"@typescript-eslint/parser": "^5.62.0",
77+
"@typescript-eslint/eslint-plugin": "^8.22.0",
78+
"@typescript-eslint/parser": "^8.22.0",
7779
"c8": "^8.0.1",
7880
"copyfiles": "^2.4.1",
79-
"eslint": "^8.55.0",
80-
"eslint-config-prettier": "^9.1.0",
81+
"eslint": "^9.19.0",
82+
"eslint-config-prettier": "^10.0.1",
8183
"eslint-plugin-header": "^3.1.1",
8284
"eslint-plugin-jest-formatting": "^3.1.0",
8385
"eslint-plugin-prettier": "^5.2.3",
84-
"eslint-plugin-unicorn": "^49.0.0",
86+
"eslint-plugin-unicorn": "^56.0.1",
8587
"msgpack-lite": "^0.1.26",
8688
"nodemon": "^2.0.22",
8789
"npm-check-updates": "^16.14.20",

‎src/data/ar-io-data-source.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ export class ArIODataSource implements ContiguousDataSource {
8484
}
8585

8686
stopUpdatingPeers() {
87-
this.intervalId && clearInterval(this.intervalId);
87+
if (this.intervalId) {
88+
clearInterval(this.intervalId);
89+
}
8890
}
8991

9092
async updatePeerList() {

‎src/data/gateways-data-source.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import { Readable } from 'node:stream';
2727

2828
const axiosMockCommonParams = (config: any) => ({
2929
interceptors: {
30-
request: { use: () => {} }, // eslint-disable-line @typescript-eslint/no-empty-function
31-
response: { use: () => {} }, // eslint-disable-line @typescript-eslint/no-empty-function
30+
request: { use: () => {} },
31+
response: { use: () => {} },
3232
},
3333
defaults: config,
3434
});

‎src/data/read-through-data-cache.test.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ describe('ReadThroughDataCache', function () {
173173
123,
174174
);
175175

176-
assert.deepEqual(calledWithArgument!, 'test-hash'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
176+
assert.deepEqual(calledWithArgument!, 'test-hash');
177177
assert.deepEqual(result?.stream, mockStream);
178178
assert.deepEqual(result?.size, 123);
179179
});
@@ -192,7 +192,7 @@ describe('ReadThroughDataCache', function () {
192192
123,
193193
);
194194

195-
assert.deepEqual(calledWithArgument!, 'test-hash'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
195+
assert.deepEqual(calledWithArgument!, 'test-hash');
196196

197197
assert.deepEqual(result, undefined);
198198
});
@@ -227,9 +227,9 @@ describe('ReadThroughDataCache', function () {
227227
20,
228228
);
229229

230-
assert.deepEqual(calledWithArgument!, 'test-hash'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
230+
assert.deepEqual(calledWithArgument!, 'test-hash');
231231

232-
assert.deepEqual(calledWithParentArgument!, 'test-parent-hash'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
232+
assert.deepEqual(calledWithParentArgument!, 'test-parent-hash');
233233

234234
assert.deepEqual(result?.stream, mockStream);
235235
assert.deepEqual(result?.size, 20);
@@ -278,7 +278,7 @@ describe('ReadThroughDataCache', function () {
278278
origin: 'node-url',
279279
},
280280
});
281-
assert.equal(calledWithArgument!, 'test-hash'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
281+
assert.equal(calledWithArgument!, 'test-hash');
282282

283283
let receivedData = '';
284284

@@ -381,7 +381,6 @@ describe('ReadThroughDataCache', function () {
381381
requestAttributes,
382382
});
383383

384-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
385384
assert.deepEqual(calledWithArgument!, {
386385
id: 'test-id',
387386
dataAttributes: undefined,

‎src/lib/validation.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export function sanityCheckBlock(block: PartialJsonBlock) {
4444
throw new Error("Invalid block: invalid 'indep_hash' format");
4545
}
4646

47-
if (!block.height === undefined) {
47+
if (!block.height === false) {
4848
throw new Error("Invalid block: missing 'height'");
4949
}
5050

‎src/store/kv-debounce-store.test.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ describe('KvDebounceCache', () => {
5656
await kvDebounceCache.set(key, Buffer.from('test2', 'base64url'));
5757
const result = await kvDebounceCache.get(key);
5858
assert.notEqual(result, undefined);
59-
assert.equal(toB64Url(result!), 'test'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
59+
assert.equal(toB64Url(result!), 'test');
6060
});
6161

6262
describe('debounceFn', () => {
@@ -78,7 +78,7 @@ describe('KvDebounceCache', () => {
7878
});
7979
await kvDebounceStore.get(key);
8080
const result = await kvBufferStore.get(key);
81-
assert.equal(result!.toString('utf-8'), 'test'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
81+
assert.equal(result!.toString('utf-8'), 'test');
8282
assert.equal(callCount, 1);
8383
});
8484

@@ -101,7 +101,7 @@ describe('KvDebounceCache', () => {
101101
},
102102
});
103103
const result = await kvBufferStore.get(key);
104-
assert.equal(result, undefined); // eslint-disable-line @typescript-eslint/no-non-null-assertion
104+
assert.equal(result, undefined);
105105
assert.equal(callCount, 0);
106106
assert.equal(lastCallTimestamp, 0);
107107
});
@@ -138,7 +138,7 @@ describe('KvDebounceCache', () => {
138138
const result = await kvDebounceStore.get(key);
139139
assert.equal(callCount, 2);
140140
assert.ok(lastCallTimestamp >= Date.now() - 10);
141-
assert.equal(result!.toString('utf-8'), '1'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
141+
assert.equal(result!.toString('utf-8'), '1');
142142
});
143143

144144
it('should call debounceFn on cache hit after the cache hit debounce ttl expires', async () => {
@@ -163,7 +163,7 @@ describe('KvDebounceCache', () => {
163163

164164
// should hydrate immediately
165165
const result = await kvDebounceStore.get(key);
166-
assert.equal(result!.toString('utf-8'), 'test0'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
166+
assert.equal(result!.toString('utf-8'), 'test0');
167167
assert.ok(lastCallTimestamp <= Date.now());
168168
assert.equal(callCount, 1);
169169

@@ -172,7 +172,7 @@ describe('KvDebounceCache', () => {
172172
assert.equal(callCount, 2);
173173
assert.ok(lastCallTimestamp >= Date.now() - 100);
174174
const result2 = await kvDebounceStore.get(key);
175-
assert.equal(result2!.toString('utf-8'), 'test1'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
175+
assert.equal(result2!.toString('utf-8'), 'test1');
176176
});
177177

178178
// intentional design choice to bubble up errors from debounceFn and let the caller handle them appropriately

‎src/store/lmdb-kv-store.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('LmdbKvStore', () => {
4141
await lmdbKvStore.set(key, value);
4242
const result = await lmdbKvStore.get(key);
4343
assert.notEqual(result, undefined);
44-
assert.equal(toB64Url(result!), 'test'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
44+
assert.equal(toB64Url(result!), 'test');
4545
});
4646

4747
it('should properly delete buffer', async () => {
@@ -59,9 +59,9 @@ describe('LmdbKvStore', () => {
5959
await lmdbKvStore.set(key, value);
6060
await lmdbKvStore.set(key, Buffer.from('test2', 'base64url'));
6161
const result = await lmdbKvStore.get(key);
62-
assert.notEqual(result, undefined); // eslint-disable-line @typescript-eslint/no-non-null-assertion
62+
assert.notEqual(result, undefined);
6363

64-
assert.equal(toB64Url(result!), 'test'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
64+
assert.equal(toB64Url(result!), 'test');
6565
});
6666

6767
it('should return a buffer when a Uint8Array is stored in the cache', async () => {
@@ -74,6 +74,6 @@ describe('LmdbKvStore', () => {
7474
const result = await lmdbKvStore.get(key);
7575
assert.notEqual(result, undefined);
7676
assert.equal(Buffer.isBuffer(result), true);
77-
assert.equal(toB64Url(result!), 'test'); // eslint-disable-line @typescript-eslint/no-non-null-assertion
77+
assert.equal(toB64Url(result!), 'test');
7878
});
7979
});

‎src/workers/sqlite-wal-cleanup-worker.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ export class SQLiteWalCleanupWorker {
4949
}
5050

5151
stop(): void {
52-
this.intervalId && clearInterval(this.intervalId);
52+
if (this.intervalId) {
53+
clearInterval(this.intervalId);
54+
}
5355
this.log.info(
5456
`Stopped SQLite WAL cleanup worker for ${this.dbName} database`,
5557
);

‎src/workers/transaction-offset-repair-worker.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ export class TransactionOffsetRepairWorker {
5151
async stop(): Promise<void> {
5252
const log = this.log.child({ method: 'stop' });
5353

54-
this.intervalId && clearInterval(this.intervalId);
54+
if (this.intervalId) {
55+
clearInterval(this.intervalId);
56+
}
5557

5658
log.debug('Stopped successfully.');
5759
}

‎src/workers/transaction-repair-worker.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ export class TransactionRepairWorker {
5454
async stop(): Promise<void> {
5555
const log = this.log.child({ method: 'stop' });
5656

57-
this.intervalId && clearInterval(this.intervalId);
57+
if (this.intervalId) {
58+
clearInterval(this.intervalId);
59+
}
5860

5961
log.debug('Stopped successfully.');
6062
}

‎test/sqlite-helpers.ts

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export let dataDb: Sqlite.Database;
3030
export let moderationDb: Sqlite.Database;
3131
export let bundlesDb: Sqlite.Database;
3232

33-
/* eslint-disable */
3433
before(async () => {
3534
log.transports.forEach((t) => (t.silent = true));
3635
fs.readdirSync('test/tmp').forEach((file) => {

0 commit comments

Comments
 (0)