Skip to content

Commit 0fabf67

Browse files
Upgrade to ESLint 10 (#1297)
* Start upgrade to eslint 10 * eslint 10 in package.json * Upgrade eslint-config-godaddy-typescript to eslint 10 * Convert eslint-config-godaddy-react-typescript to eslint 10 * Upgrade @babel/eslint-parser * @eslint/js v10 * Upgrade @eslint/eslintrc * Changeset * Try to fix tests * Changes brought up in code review * Forgotten one update to eslint
1 parent badbae9 commit 0fabf67

8 files changed

Lines changed: 331 additions & 301 deletions

File tree

.changeset/two-coins-allow.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"eslint-config-godaddy-react-typescript": major
3+
"eslint-config-godaddy-typescript": major
4+
"eslint-config-godaddy-react": major
5+
"eslint-config-godaddy": major
6+
---
7+
8+
Upgrade to ESLint 10

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
},
4343
"devDependencies": {
4444
"@changesets/cli": "^2.29.5",
45-
"@eslint/eslintrc": "^3.3.1",
46-
"@eslint/js": "^9.24.0",
47-
"@typescript-eslint/eslint-plugin": "^8.35.0",
48-
"@typescript-eslint/parser": "^8.30.1",
49-
"eslint": "^9.24.0",
45+
"@eslint/eslintrc": "^3.3.4",
46+
"@eslint/js": "^10.0.0",
47+
"@typescript-eslint/eslint-plugin": "^8.54.0",
48+
"@typescript-eslint/parser": "^8.54.0",
49+
"eslint": "^10.0.2",
5050
"eslint-plugin-json": "^4.0.1",
5151
"eslint-plugin-jsx-a11y": "^6.10.2",
5252
"eslint-plugin-mocha": "^10.5.0",

packages/eslint-config-godaddy-react-typescript/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
],
2828
"license": "MIT",
2929
"dependencies": {
30-
"@typescript-eslint/eslint-plugin": "^8.35.0",
31-
"@typescript-eslint/parser": "^8.30.1",
30+
"@typescript-eslint/eslint-plugin": "^8.54.0",
31+
"@typescript-eslint/parser": "^8.54.0",
3232
"eslint-config-godaddy-react": "workspace:^",
3333
"eslint-plugin-react-hooks": "^5.2.0"
3434
},
3535
"peerDependencies": {
36-
"eslint": "^9",
36+
"eslint": "^10",
3737
"typescript": ">=5"
3838
},
3939
"devDependencies": {
40-
"eslint": "^9.24.0"
40+
"eslint": "^10.0.2"
4141
},
4242
"exports": {
4343
".": "./index.js"

packages/eslint-config-godaddy-react/index.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import gdConfig from 'eslint-config-godaddy';
22
import react from 'eslint-plugin-react';
33
import jsxA11y from 'eslint-plugin-jsx-a11y';
44

5+
import { fixupConfigRules, fixupPluginRules } from '@eslint/compat';
56
import { FlatCompat } from '@eslint/eslintrc';
67
import path from 'path';
78
import { fileURLToPath } from 'url';
@@ -14,9 +15,12 @@ const compat = new FlatCompat({
1415
baseDirectory: __dirname
1516
});
1617

18+
// Wrap react plugin for ESLint 10 compatibility (context.getFilename etc.)
19+
const reactCompat = fixupPluginRules(react);
20+
1721
const config = [
1822
...gdConfig,
19-
react.configs.flat.recommended,
23+
...fixupConfigRules([react.configs.flat.recommended]),
2024
// This is needed due to react-hooks not being Flat Config compatible there is an open
2125
// issue for this https://github.com/facebook/react/issues/28313 and PR for this change
2226
// https://github.com/facebook/react/pull/30774
@@ -33,7 +37,7 @@ const config = [
3337
}
3438
},
3539
plugins: {
36-
react,
40+
react: reactCompat,
3741
jsxA11y
3842
},
3943
rules: {

packages/eslint-config-godaddy-react/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,18 @@
2828
],
2929
"peerDependencies": {
3030
"@babel/core": ">=7",
31-
"eslint": "^9"
31+
"eslint": "^10"
3232
},
3333
"dependencies": {
34-
"@babel/eslint-parser": "^7.27.0",
34+
"@babel/eslint-parser": "^7.28.6",
35+
"@eslint/compat": "^2.0.2",
3536
"eslint-config-godaddy": "workspace:^",
3637
"eslint-plugin-jsx-a11y": "^6.10.2",
3738
"eslint-plugin-react": "^7.37.5",
3839
"eslint-plugin-react-hooks": "^5.2.0"
3940
},
4041
"devDependencies": {
41-
"eslint": "^9.24.0"
42+
"eslint": "^10.0.2"
4243
},
4344
"exports": {
4445
".": "./index.js"

packages/eslint-config-godaddy-typescript/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626
],
2727
"license": "MIT",
2828
"dependencies": {
29-
"@typescript-eslint/eslint-plugin": "^8.35.0",
30-
"@typescript-eslint/parser": "^8.30.1",
29+
"@typescript-eslint/eslint-plugin": "^8.54.0",
30+
"@typescript-eslint/parser": "^8.54.0",
3131
"eslint-config-godaddy": "workspace:^"
3232
},
3333
"peerDependencies": {
34-
"eslint": "^9",
34+
"eslint": "^10",
3535
"typescript": ">=5"
3636
},
3737
"devDependencies": {
38-
"eslint": "^9.24.0"
38+
"eslint": "^10.0.2"
3939
},
4040
"exports": {
4141
".": "./index.js"

packages/eslint-config-godaddy/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
"eslint"
2525
],
2626
"peerDependencies": {
27-
"eslint": "^9"
27+
"eslint": "^10"
2828
},
2929
"dependencies": {
30+
"@eslint/js": "^10.0.0",
3031
"eslint-plugin-jsdoc": "^50.6.9",
3132
"eslint-plugin-json": "^4.0.1",
3233
"eslint-plugin-mocha": "^10.5.0",
3334
"globals": "^16.0.0"
3435
},
3536
"devDependencies": {
36-
"@eslint/js": "^9.24.0",
37-
"eslint": "^9.24.0"
37+
"eslint": "^10.0.0"
3838
},
3939
"exports": {
4040
".": "./index.js"

0 commit comments

Comments
 (0)