diff --git a/config/eslint/index.mjs b/config/eslint/index.mjs index d0a71b9..a82e426 100644 --- a/config/eslint/index.mjs +++ b/config/eslint/index.mjs @@ -4,7 +4,7 @@ import tsEslint from 'typescript-eslint'; import reactPlugin from 'eslint-plugin-react'; import reactHooksPlugin from 'eslint-plugin-react-hooks'; import reactRefreshPlugin from 'eslint-plugin-react-refresh'; -import importPlugin from 'eslint-plugin-import'; +import { importX } from 'eslint-plugin-import-x'; import prettierConfig from 'eslint-config-prettier'; /** @type {import('eslint').Linter.Config[]} */ @@ -12,7 +12,7 @@ export default [ { files: ['**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts}'], rules: { - 'import/order': [ + 'import-x/order': [ 'error', { groups: [ @@ -28,19 +28,8 @@ export default [ ], }, settings: { - 'import/internal-regex': '^@/', - 'import/ignore': ['node_modules/'], - 'import/resolver': { - typescript: { - alwaysTryTypes: true, - project: [ - 'tsconfig.json', - 'tsconfig.*.json', - 'packages/*/tsconfig.json', - 'packages/*/tsconfig.*.json', - ], - }, - }, + 'import-x/internal-regex': '^@/', + 'import-x/ignore': ['node_modules/'], }, }, { @@ -105,11 +94,11 @@ export default [ }, { files: ['**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts}'], - ...importPlugin.flatConfigs.recommended, + ...importX.flatConfigs.recommended, }, { files: ['**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts}'], - ...importPlugin.flatConfigs.typescript, + ...importX.flatConfigs.typescript, }, { files: ['**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts}'], diff --git a/package.json b/package.json index e6b21be..9ce3439 100644 --- a/package.json +++ b/package.json @@ -18,19 +18,20 @@ "./typescript": "./config/typescript/tsconfig.json" }, "dependencies": { - "@eslint/js": "^9.17.0", - "eslint-config-prettier": "^9.1.0", + "@eslint/js": "^10.0.1", + "eslint": "^10.0.2", + "eslint-config-prettier": "^10.1.8", "eslint-import-resolver-typescript": "^3.7.0", - "eslint-plugin-import": "^2.31.0", - "eslint-plugin-react": "^7.37.3", + "eslint-plugin-import-x": "^4.16.1", + "eslint-plugin-react": "^7.37.5", "eslint-plugin-react-hooks": "^5.1.0", "eslint-plugin-react-refresh": "^0.4.16", "globals": "^15.14.0", - "stylelint-prettier": "^5.0.2", - "typescript-eslint": "^8.18.2" + "stylelint-prettier": "^5.0.3", + "typescript-eslint": "^8.56.1" }, "devDependencies": { "@types/eslint": "^9.6.1", - "typescript": "^5.7.2" + "typescript": "^5.9.3" } }