Skip to content

Commit db9f8f5

Browse files
authored
Merge pull request #60 from shelfio/feature/OPS-4841-eslint-9x
OPS-4841 Upgrade ESLint to 9x
2 parents d089cf1 + c42e0b7 commit db9f8f5

File tree

8 files changed

+32
-23
lines changed

8 files changed

+32
-23
lines changed

Diff for: .circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ orbs:
66
parameters:
77
node_version:
88
type: string
9-
default: '16.15.0'
9+
default: '20.12.0'
1010

1111
commands:
1212
install_deps:
1313
steps:
1414
- node/install-packages:
1515
pkg-manager: yarn
16-
cache-version: v1-all
16+
cache-version: v2-all
1717
cache-only-lockfile: true
1818
app-dir: ~/repo
1919
override-ci-command: yarn install --pure-lockfile --no-progress

Diff for: .eslintignore

-5
This file was deleted.

Diff for: .eslintrc

-9
This file was deleted.

Diff for: eslint.config.mjs

+20
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+
];

Diff for: jest-es-config.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// eslint-disable-next-line @typescript-eslint/no-var-requires
12
const documentsMapping = require('./index-mapping');
23

34
module.exports = function getClusterSetting() {

Diff for: jest-preset.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// eslint-disable-next-line @typescript-eslint/no-var-requires
12
const preset = require('./lib');
23

34
module.exports = preset;

Diff for: package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"scripts": {
2626
"build": "rm -rf lib/ && tsc --declaration",
2727
"coverage": "jest --coverage",
28-
"lint": "eslint . --ext .js,.ts,.json --fix",
29-
"lint:ci": "eslint . --ext .js,.ts,.json",
28+
"lint": "yarn lint:ci --fix",
29+
"lint:ci": "eslint . --quiet",
3030
"prepack": "yarn build",
3131
"test": "export ENVIRONMENT=local && jest tests",
3232
"type-check": "tsc --noEmit",
@@ -53,22 +53,22 @@
5353
},
5454
"devDependencies": {
5555
"@elastic/elasticsearch": "8.4.0",
56-
"@shelf/eslint-config": "2.29.0",
56+
"@shelf/eslint-config": "4.2.1",
5757
"@shelf/prettier-config": "0.0.7",
5858
"@shelf/tsconfig": "0.0.8",
5959
"@types/cwd": "^0.10.0",
6060
"@types/jest": "28.1.8",
61-
"@types/node": "16",
62-
"eslint": "8.48.0",
61+
"@types/node": "20",
62+
"eslint": "9.17.0",
6363
"husky": "8.0.3",
6464
"jest": "28.1.3",
6565
"lint-staged": "13.3.0",
66-
"prettier": "2.8.8",
66+
"prettier": "3.4.2",
6767
"ts-jest": "28.0.8",
6868
"typescript": "5.1.6"
6969
},
7070
"engines": {
71-
"node": ">=16"
71+
"node": ">=20"
7272
},
7373
"publishConfig": {
7474
"access": "public"

Diff for: src/setup.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/no-var-requires */
12
import {resolve} from 'path';
23
import {start} from '@shelf/elasticsearch-local';
34

0 commit comments

Comments
 (0)