Skip to content

Commit 444235d

Browse files
authored
Merge pull request #383 from shelfio/feature/OPS-4841-eslint-9x
OPS-4841 Upgrade ESLint to 9x
2 parents 73d979a + 1c71e77 commit 444235d

File tree

5 files changed

+26
-13
lines changed

5 files changed

+26
-13
lines changed

.eslintignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

.eslintrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

eslint.config.mjs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import rules from '@shelf/eslint-config/typescript.js';
2+
3+
export default [
4+
...rules,
5+
{files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx', '**/*.json']},
6+
{
7+
ignores: [
8+
'.idea/',
9+
'coverage/',
10+
'draft.js',
11+
'lib/',
12+
'dist/',
13+
'node_modules/',
14+
'packages/**/tsconfig.types.json',
15+
'packages/**/node_modules/**',
16+
'packages/**/lib/**',
17+
'renovate.json',
18+
],
19+
},
20+
];

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"build:types": "tsc --emitDeclarationOnly --declaration --isolatedModules false --declarationDir lib",
2727
"coverage": "jest --coverage",
2828
"lint": "yarn lint:ci --fix",
29-
"lint:ci": "eslint . --ext .js,.ts,.json",
29+
"lint:ci": "eslint . --quiet",
3030
"prepack": "yarn build",
3131
"test": "TZ=UTC jest src",
3232
"type-check": "tsc --noEmit",
@@ -46,15 +46,15 @@
4646
"tar": "7.4.3"
4747
},
4848
"devDependencies": {
49-
"@shelf/eslint-config": "3.15.1",
49+
"@shelf/eslint-config": "4.2.1",
5050
"@shelf/prettier-config": "1.0.0",
5151
"@swc/core": "1.7.11",
5252
"@swc/jest": "0.2.36",
5353
"@types/jest": "29.5.14",
5454
"@types/node": "18",
5555
"@types/tar": "6.1.13",
5656
"esbuild": "0.23.1",
57-
"eslint": "8.57.1",
57+
"eslint": "9.17.0",
5858
"husky": "9.1.4",
5959
"jest": "29.7.0",
6060
"lint-staged": "15.2.11",

test.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/no-var-requires */
12
const {execSync} = require('child_process');
23
const {getTextFromImage} = require('./lib/index.js');
34

@@ -6,5 +7,5 @@ module.exports = {
67
execSync(`cp ./test.png /tmp/test.png`);
78

89
return getTextFromImage('/tmp/test.png');
9-
}
10-
}
10+
},
11+
};

0 commit comments

Comments
 (0)