Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/loud-worms-film.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@drivenets/eslint-plugin-design-system': patch
---

Add support for ESLint 10
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
"@commitlint/types": "^20.4.0",
"@drivenets/commitlint-plugin-design-system": "workspace:*",
"@eslint/core": "^1.1.0",
"@eslint/js": "^9.39.3",
"@eslint/js": "^10.0.1",
"@types/node": "^25.3.0",
"@vitest/eslint-plugin": "^1.6.9",
"cspell": "^9.6.4",
"eslint": "^9.39.3",
"eslint": "^10.0.1",
"eslint-import-resolver-typescript": "^4.4.4",
"eslint-plugin-import-x": "^4.16.1",
"eslint-plugin-unicorn": "^63.0.0",
Expand Down Expand Up @@ -77,7 +77,8 @@
"string.prototype.includes": "npm:@nolyfill/string.prototype.includes@^1",
"string.prototype.matchall": "npm:@nolyfill/string.prototype.matchall@^1",
"string.prototype.repeat": "npm:@nolyfill/string.prototype.repeat@^1",
"esbuild@<=0.24.2": ">=0.25.0"
"esbuild@<=0.24.2": ">=0.25.0",
"eslint": "^10.0.1"
}
}
}
2 changes: 1 addition & 1 deletion packages/commitlint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@commitlint/types": "^20.2.0"
},
"devDependencies": {
"eslint": "^9.39.3",
"eslint": "^10.0.1",
"typescript": "^5.9.3"
}
}
17 changes: 14 additions & 3 deletions packages/design-system/eslint.config.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
import baseConfig from '../../eslint.config.base';
import { defineConfig, globalIgnores, type Config } from 'eslint/config';
import react from 'eslint-plugin-react';
import { fixupPluginRules } from '@eslint/compat';
import _react from 'eslint-plugin-react';
import reactHooks from 'eslint-plugin-react-hooks';
import jsxA11y from 'eslint-plugin-jsx-a11y';
import storybook from 'eslint-plugin-storybook';

// Fix `eslint-plugin-react` to be compatible with ESLint 10.
// Waiting until https://github.com/jsx-eslint/eslint-plugin-react/pull/3979 is merged.
const react = fixupPluginRules(_react);

export default defineConfig(
...baseConfig,

// React rules.
react.configs.flat.recommended as Config,
react.configs.flat['jsx-runtime'] as Config,
{
..._react.configs.flat.recommended,
plugins: { react },
},
{
..._react.configs.flat['jsx-runtime'],
plugins: { react },
},

reactHooks.configs.flat.recommended,

Expand Down
3 changes: 2 additions & 1 deletion packages/design-system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"devDependencies": {
"@arethetypeswrong/cli": "^0.18.2",
"@drivenets/vite-plugin-design-system": "workspace:*",
"@eslint/compat": "^2.0.2",
"@faker-js/faker": "^10.3.0",
"@hookform/resolvers": "^5.2.2",
"@rollup/plugin-babel": "^6.1.0",
Expand All @@ -94,7 +95,7 @@
"@vitest/browser-playwright": "^4.0.18",
"@vitest/coverage-v8": "^4.0.18",
"babel-plugin-react-compiler": "^1.0.0",
"eslint": "^9.39.3",
"eslint": "^10.0.1",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@
"devDependencies": {
"@arethetypeswrong/cli": "^0.18.2",
"@vitest/coverage-v8": "^4.0.18",
"eslint": "^9.39.3",
"eslint": "^10.0.1",
"publint": "^0.3.17",
"tsdown": "^0.20.3",
"typescript": "^5.9.3",
"vitest": "^4.0.18"
},
"peerDependencies": {
"@typescript-eslint/parser": "^8.50.0",
"eslint": "^9.0.0",
"eslint": "^9.0.0 || ^10.0.0",
"typescript": "^5.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/vite-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"devDependencies": {
"@arethetypeswrong/cli": "^0.18.2",
"@vitest/coverage-v8": "^4.0.18",
"eslint": "^9.39.3",
"eslint": "^10.0.1",
"memfs": "^4.56.10",
"publint": "^0.3.17",
"tsdown": "^0.20.3",
Expand Down
Loading